ma-agents 3.3.0 → 3.4.0

package/lib/bmad.js

@@ -7,6 +7,23 @@ const chalk = require('chalk');
 const BMAD_DIR = '_bmad';
 const CONFIG_DIR = path.join(BMAD_DIR, '_config', 'agents');
 
+/**
+ * Run a shell command, relaying output to stdout/stderr.
+ * When MA_AGENTS_LOG_ACTIVE is set, uses pipe mode so the
+ * tee hooks in cli.js capture subprocess output in the log file.
+ * Otherwise falls back to inherit for direct pass-through.
+ */
+function runCommand(command, options = {}) {
+    if (process.env.MA_AGENTS_LOG_ACTIVE) {
+        const result = execSync(command, { ...options, stdio: 'pipe' });
+        if (result && result.length > 0) {
+            process.stdout.write(result);
+        }
+    } else {
+        execSync(command, { ...options, stdio: 'inherit' });
+    }
+}
+
 function getBmadCommand(args) {
     try {
         const wrapperPath = require.resolve('bmad-method/tools/bmad-npx-wrapper.js');
@@ -63,9 +80,13 @@ function buildBmadArgs(ctx) {
         parts.push('--output-folder', `"${ctx.outputFolder}"`);
     }
 
-    // Extension module — only if directory exists
+    // Extension module — only on fresh installs.
+    // During updates, the cached copy in _bmad/_config/custom/ is used by
+    // bmad-method automatically; passing --custom-content on update causes
+    // "Source for module 'custom' is not available" when the cached directory
+    // name doesn't match the module code.
     const extensionPath = path.join(__dirname, 'bmad-extension');
-    if (fs.existsSync(extensionPath)) {
+    if (ctx.action !== 'update' && fs.existsSync(extensionPath)) {
         parts.push('--custom-content', `"${extensionPath}"`);
     }
 
@@ -101,7 +122,7 @@ async function installBmad(modules = ['bmm', 'bmb'], tools = [], projectRoot = p
 
     console.log(chalk.gray(`  Running: ${command}`));
     try {
-        execSync(command, { stdio: 'inherit', cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
+        runCommand(command, { cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
         await deployMethodology(projectRoot, force);
         return true;
     } catch (error) {
@@ -136,7 +157,7 @@ async function runMigration(modules, tools, projectRoot, force, { userName, comm
 
     console.log(chalk.gray(`  Running: ${command}`));
     try {
-        execSync(command, { stdio: 'inherit', cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
+        runCommand(command, { cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
     } catch (error) {
         // Rollback on failure
         console.error(chalk.red(`  BMAD update failed: ${error.message}`));
@@ -183,7 +204,7 @@ async function updateBmad(modules = ['bmm', 'bmb'], tools = [], projectRoot = pr
 
     console.log(chalk.gray(`  Running: ${command}`));
     try {
-        execSync(command, { stdio: 'inherit', cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
+        runCommand(command, { cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
         await deployMethodology(projectRoot, force);
         return true;
     } catch (error) {
@@ -206,7 +227,8 @@ async function applyCustomizations(projectRoot = process.cwd(), modules = ['bmm'
         'bmm-sre': 'sre.md',
         'bmm-devops': 'devops.md',
         'bmm-cyber': 'cyber.md',
-        'bmm-mil498': 'mil498.md'
+        'bmm-mil498': 'mil498.md',
+        'bmm-demerzel': 'demerzel.md'
     };
 
     // 1. Apply YAML customizations (filtered by selected agents)
@@ -259,7 +281,7 @@ async function applyCustomizations(projectRoot = process.cwd(), modules = ['bmm'
 
     console.log(chalk.gray(`  Running: ${command}`));
     try {
-        execSync(command, { stdio: 'inherit', cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
+        runCommand(command, { cwd: projectRoot, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } });
     } catch (error) {
         console.error(chalk.red(`  BMAD recompile failed: ${error.message}`));
     }
@@ -330,6 +352,11 @@ async function applyCustomizations(projectRoot = process.cwd(), modules = ['bmm'
     if (selectedAgentIds.length === 0 || selectedAgentIds.includes('bmm-mil498')) {
         await registerMilWorkflows(projectRoot);
     }
+
+    // 8. Register ML workflows
+    if (selectedAgentIds.length === 0 || selectedAgentIds.includes('bmm-demerzel')) {
+        await registerMlWorkflows(projectRoot);
+    }
 }
 
 /**
@@ -411,6 +438,55 @@ async function registerMilWorkflows(projectRoot) {
     }
 }
 
+/**
+ * Append ML lifecycle workflow entries to the BMAD CSV registries
+ * so they appear as available slash commands for Demerzel.
+ */
+async function registerMlWorkflows(projectRoot) {
+    const mlEntries = [
+        { name: 'ML Ideation & PRD', code: 'MLI', command: 'ml-ideation', description: 'Frame ML research problem, define requirements, and produce Research Thesis and PRD' },
+        { name: 'ML EDA & Research', code: 'MLE', command: 'ml-eda', description: 'Perform exploratory data analysis, establish baselines, and produce EDA report' },
+        { name: 'ML Architecture Design', code: 'MLA', command: 'ml-architecture', description: 'Design model architecture, stack, and experiment tracking strategy' },
+        { name: 'ML Detailed Design', code: 'MLD', command: 'ml-detailed-design', description: 'Break down infrastructure and experiment tasks from architecture' },
+        { name: 'ML TechSpec (Contract)', code: 'MLS', command: 'ml-techspec', description: 'Lock experiment parameters and performance tiers before training' },
+        { name: 'ML Infra & Sync', code: 'MLNF', command: 'ml-infra', description: 'Build ML infrastructure, manage dependencies, and run smoke tests' },
+        { name: 'ML Experiment', code: 'MLX', command: 'ml-experiment', description: 'Execute training experiments against locked TechSpec and log metrics' },
+        { name: 'ML Results Analysis', code: 'MLAN', command: 'ml-analysis', description: 'Evaluate experiment outcomes against TechSpec success tiers' },
+        { name: 'ML HPO (Tuning)', code: 'MLH', command: 'ml-hparam', description: 'Perform automated hyperparameter optimization' },
+        { name: 'ML Iterative Revision', code: 'MLR', command: 'ml-revision', description: 'Amend hypothesis and requirements based on experiment findings' },
+        { name: 'ML Advise & Search', code: 'MLAD', command: 'ml-advise', description: 'Search past experiments and surface findings or failure warnings' },
+        { name: 'ML Retrospective', code: 'MLRT', command: 'ml-retrospective', description: 'Capture session learnings and update project context' }
+    ];
+
+    // Append or update entries in module-help.csv
+    const moduleHelpPath = path.join(projectRoot, BMAD_DIR, 'bmm', 'module-help.csv');
+    if (fs.existsSync(moduleHelpPath)) {
+        let content = await fs.readFile(moduleHelpPath, 'utf-8');
+        for (const entry of mlEntries) {
+            const row = `bmm,anytime,${entry.name},${entry.code},,skills/${entry.command}/SKILL.md,${entry.command},false,bmm-demerzel,Create Mode,${entry.description},planning_artifacts,document,`;
+            // Remove any existing line for this command, then append the current one
+            const lines = content.split('\n').filter(line => !line.includes(entry.command));
+            content = lines.join('\n').trimEnd() + '\n' + row + '\n';
+        }
+        await fs.writeFile(moduleHelpPath, content, 'utf-8');
+        console.log(chalk.cyan(`    + Registered ML workflows in module-help.csv`));
+    }
+
+    // Append or update entries in bmad-help.csv
+    const bmadHelpPath = path.join(projectRoot, BMAD_DIR, '_config', 'bmad-help.csv');
+    if (fs.existsSync(bmadHelpPath)) {
+        let content = await fs.readFile(bmadHelpPath, 'utf-8');
+        for (const entry of mlEntries) {
+            const row = `bmm,anytime,${entry.name},${entry.code},,skills/${entry.command}/SKILL.md,${entry.command},false,bmm-demerzel,bmad:Machine Learning Lifecycle:agent:demerzel,Demerzel,🧪 ML Scientist,Create Mode,${entry.description},planning_artifacts,document`;
+            // Remove any existing line for this command, then append the current one
+            const lines = content.split('\n').filter(line => !line.includes(entry.command));
+            content = lines.join('\n').trimEnd() + '\n' + row + '\n';
+        }
+        await fs.writeFile(bmadHelpPath, content, 'utf-8');
+        console.log(chalk.cyan(`    + Registered ML workflows in bmad-help.csv`));
+    }
+}
+
 /**
  * Deploy the methodology presentation to the target project's _bmad-output/methodology/ directory.
  * Version-aware: skips if target is same or newer; overwrites only with --force.
@@ -521,7 +597,7 @@ async function prePopulateBmadCache(force = false) {
 
 // ── Migration constants ─────────────────────────────────────────────────────
 
-const BMAD_TARGET_VERSION = '6.2.1';
+const BMAD_TARGET_VERSION = '6.2.2';
 const BMAD_MIGRATION_THRESHOLD = '6.2.0'; // versions below this need migration
 const BACKUP_DIR_NAME = '.backup-pre-migration';
 
@@ -1018,4 +1094,5 @@ module.exports = {
     mergeUserCustomizations,
     cleanupLegacyArtifacts,
     parseCustomizeYaml,
+    registerMlWorkflows,
 };

package/lib/skill-authoring.js

@@ -405,7 +405,7 @@ async function handleSetMandatory(args) {
 
 // ─── Story 3.4: BMAD Persona Customization Tooling ───────────────────────────
 
-const CUSTOM_AGENTS = ['bmm-sre', 'bmm-devops', 'bmm-cyber', 'bmm-mil498'];
+const CUSTOM_AGENTS = ['bmm-sre', 'bmm-devops', 'bmm-cyber', 'bmm-mil498', 'bmm-demerzel'];
 const BUILTIN_AGENTS = ['bmm-pm', 'bmm-architect', 'bmm-dev', 'bmm-qa', 'bmm-sm', 'bmm-tech-writer', 'bmm-ux-designer'];
 
 const MANDATORY_CRITICAL_ACTIONS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ma-agents",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "NPX tool to install skills for AI coding agents (Claude Code, Gemini, Copilot, Kilocode, Cline, Cursor, Roo Code)",
   "main": "index.js",
   "bin": {
@@ -27,7 +27,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "bmad-method": "6.2.1",
+    "bmad-method": "6.2.2",
     "prompts": "^2.4.2",
     "chalk": "^4.1.2",
     "fs-extra": "^11.1.1"

package/test/agent-injection-strategy.test.js

@@ -66,15 +66,15 @@ test('3.3: installer.js contains NO agent-name-specific logic', () => {
 console.log('\nTask 4 — Registry completeness');
 
 const EXPECTED_IDE = ['claude-code', 'gemini', 'copilot', 'kilocode', 'cline', 'cursor', 'antigravity', 'opencode'];
-const EXPECTED_BMAD = ['bmm-sre', 'bmm-devops', 'bmm-cyber', 'bmm-mil498'];
+const EXPECTED_BMAD = ['bmm-sre', 'bmm-devops', 'bmm-cyber', 'bmm-mil498', 'bmm-demerzel'];
 const EXPECTED_ALL = [...EXPECTED_IDE, ...EXPECTED_BMAD];
 
-test('4.1: registry has at least 12 agents (8+ IDE + 4 BMAD)', () => {
-  assert.ok(allAgents.length >= 12, `Expected at least 12 agents, got ${allAgents.length}`);
+test('4.1: registry has at least 13 agents (8+ IDE + 5 BMAD)', () => {
+  assert.ok(allAgents.length >= 13, `Expected at least 13 agents, got ${allAgents.length}`);
   const ideCount = allAgents.filter(a => a.category === 'ide').length;
   const bmadCount = allAgents.filter(a => a.category === 'bmad').length;
   assert.ok(ideCount >= 8, `Expected at least 8 IDE agents, got ${ideCount}`);
-  assert.strictEqual(bmadCount, 4, `Expected 4 BMAD agents, got ${bmadCount}`);
+  assert.strictEqual(bmadCount, 5, `Expected 5 BMAD agents, got ${bmadCount}`);
 });
 
 test('4.2: every agent has well-shaped injectionStrategy property', () => {

package/test/bmad-version-bump.test.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Tests for Story 15.1: Bump bmad-method to 6.2.1 and Update Cache
+ * Tests for Story 15.1: Bump bmad-method to 6.2.2 and Update Cache
  *
  * Task 1: Verify package.json dependency updated
  * Task 2: Verify build:bmad-cache compatibility
@@ -31,22 +31,22 @@ function test(name, fn) {
 
 const projectRoot = path.resolve(__dirname, '..');
 
-console.log('\nStory 15.1: Bump bmad-method to 6.2.1 and Update Cache\n');
+console.log('\nStory 15.1: Bump bmad-method to 6.2.2 and Update Cache\n');
 
 // ---- Task 1: package.json dependency ----
 
 console.log('Task 1: package.json dependency');
 
-test('package.json pins bmad-method at 6.2.1', () => {
+test('package.json pins bmad-method at 6.2.2', () => {
   const pkg = JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'));
-  assert.strictEqual(pkg.dependencies['bmad-method'], '6.2.1');
+  assert.strictEqual(pkg.dependencies['bmad-method'], '6.2.2');
 });
 
-test('installed bmad-method is version 6.2.1', () => {
+test('installed bmad-method is version 6.2.2', () => {
   const bmadPkg = JSON.parse(
     fs.readFileSync(path.join(projectRoot, 'node_modules', 'bmad-method', 'package.json'), 'utf8')
   );
-  assert.strictEqual(bmadPkg.version, '6.2.1');
+  assert.strictEqual(bmadPkg.version, '6.2.2');
 });
 
 test('require.resolve finds bmad-npx-wrapper.js', () => {
@@ -59,13 +59,13 @@ test('require.resolve finds bmad-npx-wrapper.js', () => {
 
 console.log('\nTask 2: build:bmad-cache compatibility');
 
-test('external-official-modules.yaml exists in 6.2.1', () => {
+test('external-official-modules.yaml exists in 6.2.2', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const yamlPath = path.join(bmadDir, 'tools', 'cli', 'external-official-modules.yaml');
   assert.ok(fs.existsSync(yamlPath), `YAML not found at ${yamlPath}`);
 });
 
-test('YAML parser extracts 5 modules from 6.2.1', () => {
+test('YAML parser extracts 5 modules from 6.2.2', () => {
   // Import the parser from build-bmad-cache.js by reading and evaluating it
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const yamlPath = path.join(bmadDir, 'tools', 'cli', 'external-official-modules.yaml');
@@ -133,10 +133,10 @@ test('cache-manifest.json exists and lists 5 modules', () => {
   assert.deepStrictEqual(moduleCodes.sort(), ['bmb', 'cis', 'gds', 'tea', 'wds']);
 });
 
-test('cache-manifest.json records bmadMethodVersion as 6.2.1', () => {
+test('cache-manifest.json records bmadMethodVersion as 6.2.2', () => {
   const manifestPath = path.join(projectRoot, 'lib', 'bmad-cache', 'cache-manifest.json');
   const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-  assert.strictEqual(manifest.bmadMethodVersion, '6.2.1');
+  assert.strictEqual(manifest.bmadMethodVersion, '6.2.2');
 });
 
 test('each cached module has a commit SHA in manifest', () => {
@@ -171,7 +171,7 @@ console.log('\nTask 3: bmad.js CLI compatibility');
 
 const bmad = require('../lib/bmad');
 
-test('getBmadCommand resolves bmad-npx-wrapper.js from 6.2.1', () => {
+test('getBmadCommand resolves bmad-npx-wrapper.js from 6.2.2', () => {
   const result = bmad.buildBmadArgs({
     projectRoot: '/test',
     modules: ['bmm'],
@@ -192,82 +192,82 @@ test('buildBmadArgs generates valid --action update flag', () => {
   assert.ok(result.includes('--action update'), `Expected --action update in: ${result}`);
 });
 
-test('6.2.1 CLI accepts --directory flag', () => {
+test('6.2.2 CLI accepts --directory flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--directory'), '6.2.1 install.js missing --directory flag');
+  assert.ok(content.includes('--directory'), '6.2.2 install.js missing --directory flag');
 });
 
-test('6.2.1 CLI accepts --modules flag', () => {
+test('6.2.2 CLI accepts --modules flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--modules'), '6.2.1 install.js missing --modules flag');
+  assert.ok(content.includes('--modules'), '6.2.2 install.js missing --modules flag');
 });
 
-test('6.2.1 CLI accepts --tools flag', () => {
+test('6.2.2 CLI accepts --tools flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--tools'), '6.2.1 install.js missing --tools flag');
+  assert.ok(content.includes('--tools'), '6.2.2 install.js missing --tools flag');
 });
 
-test('6.2.1 CLI accepts --custom-content flag', () => {
+test('6.2.2 CLI accepts --custom-content flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--custom-content'), '6.2.1 install.js missing --custom-content flag');
+  assert.ok(content.includes('--custom-content'), '6.2.2 install.js missing --custom-content flag');
 });
 
-test('6.2.1 CLI accepts --action flag', () => {
+test('6.2.2 CLI accepts --action flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--action'), '6.2.1 install.js missing --action flag');
+  assert.ok(content.includes('--action'), '6.2.2 install.js missing --action flag');
 });
 
-test('6.2.1 CLI accepts --yes flag', () => {
+test('6.2.2 CLI accepts --yes flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--yes'), '6.2.1 install.js missing --yes flag');
+  assert.ok(content.includes('--yes'), '6.2.2 install.js missing --yes flag');
 });
 
-test('6.2.1 CLI accepts --user-name flag', () => {
+test('6.2.2 CLI accepts --user-name flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--user-name'), '6.2.1 install.js missing --user-name flag');
+  assert.ok(content.includes('--user-name'), '6.2.2 install.js missing --user-name flag');
 });
 
-test('6.2.1 CLI accepts --communication-language flag', () => {
+test('6.2.2 CLI accepts --communication-language flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--communication-language'), '6.2.1 install.js missing --communication-language flag');
+  assert.ok(content.includes('--communication-language'), '6.2.2 install.js missing --communication-language flag');
 });
 
-test('6.2.1 CLI accepts --document-output-language flag', () => {
+test('6.2.2 CLI accepts --document-output-language flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--document-output-language'), '6.2.1 install.js missing --document-output-language flag');
+  assert.ok(content.includes('--document-output-language'), '6.2.2 install.js missing --document-output-language flag');
 });
 
-test('6.2.1 CLI accepts --output-folder flag', () => {
+test('6.2.2 CLI accepts --output-folder flag', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const installCmd = path.join(bmadDir, 'tools', 'cli', 'commands', 'install.js');
   const content = fs.readFileSync(installCmd, 'utf8');
-  assert.ok(content.includes('--output-folder'), '6.2.1 install.js missing --output-folder flag');
+  assert.ok(content.includes('--output-folder'), '6.2.2 install.js missing --output-folder flag');
 });
 
-test('module.yaml custom-content format is accepted by 6.2.1', () => {
+test('module.yaml custom-content format is accepted by 6.2.2', () => {
   const bmadDir = path.dirname(require.resolve('bmad-method/package.json'));
   const handlerPath = path.join(bmadDir, 'tools', 'cli', 'installers', 'lib', 'custom', 'handler.js');
   const content = fs.readFileSync(handlerPath, 'utf8');
-  // 6.2.1 still looks for module.yaml files
-  assert.ok(content.includes('module.yaml'), '6.2.1 handler.js no longer references module.yaml');
+  // 6.2.2 still looks for module.yaml files
+  assert.ok(content.includes('module.yaml'), '6.2.2 handler.js no longer references module.yaml');
 });
 
 // ---- Task 4: prePopulateBmadCache compatibility ----

package/test/build-bmad-args.test.js

@@ -218,7 +218,7 @@ test('buildBmadArgs quotes path with spaces in --directory', () => {
   assert.ok(result.includes('--directory "D:\\My Projects\\test project"'), `Expected quoted path in: ${result}`);
 });
 
-test('buildBmadArgs includes --custom-content when extension exists', () => {
+test('buildBmadArgs includes --custom-content on fresh install when extension exists', () => {
   const fs = require('fs');
   const extensionPath = path.join(__dirname, '..', 'lib', 'bmad-extension');
   // This test requires lib/bmad-extension/ to exist (it does in this repo)
@@ -234,6 +234,16 @@ test('buildBmadArgs includes --custom-content when extension exists', () => {
   assert.ok(result.includes(`"${extensionPath}"`), `Expected quoted extension path in: ${result}`);
 });
 
+test('buildBmadArgs omits --custom-content on update to avoid stale cache conflict', () => {
+  const result = bmad.buildBmadArgs({
+    projectRoot: '/test',
+    modules: ['bmm'],
+    tools: [],
+    action: 'update',
+  });
+  assert.ok(!result.includes('--custom-content'), `Expected NO --custom-content on update, got: ${result}`);
+});
+
 test('buildBmadArgs includes all params in correct combined command', () => {
   const result = bmad.buildBmadArgs({
     projectRoot: '/test/project',
@@ -268,14 +278,11 @@ test('buildBmadArgs starts with node and bmad-npx-wrapper path', () => {
   assert.ok(result.includes('bmad-npx-wrapper.js'), `Expected bmad-npx-wrapper.js in: ${result}`);
 });
 
-// ---- M4: Negative test for --custom-content omission ----
+// ---- M4: --custom-content conditional tests ----
 
 console.log('\nCode review fixes: edge cases');
 
-test('buildBmadArgs omits --custom-content when extension dir missing (simulated via __dirname)', () => {
-  // We can't remove the real dir, but we verify the conditional logic by checking
-  // that the function correctly includes it when present (tested above).
-  // This test validates the conditional branch exists by checking the output format.
+test('buildBmadArgs includes exactly one --custom-content on fresh install', () => {
   const result = bmad.buildBmadArgs({
     projectRoot: '/test',
     modules: ['bmm'],

package/test/convert-agents-to-skills.test.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Tests for Story 15-3: Convert 4 Custom Agents to BMAD 6.2.0 Skill Folders
+ * Tests for Story 15-3: Convert 5 Custom Agents to BMAD 6.2.0 Skill Folders
  *
  * Verifies:
  * - Each agent has SKILL.md and bmad-skill-manifest.yaml
@@ -74,6 +74,16 @@ const AGENTS = [
     oldPaths: ['bmm/workflows/mil498/', '_bmad/bmm/workflows/mil498/'],
     chatTopic: 'MIL-STD-498',
     menuItemCount: 10 // MH, CH, GS, GD, GP, GO, SS, GT, SD, DA
+  },
+  {
+    folder: 'bmad-ma-agent-ml',
+    name: 'bmad-ma-agent-ml',
+    displayName: 'Demerzel',
+    title: 'ML Scientist',
+    skillNames: ['ml-ideation', 'ml-eda', 'ml-architecture', 'ml-detailed-design', 'ml-techspec', 'ml-infra', 'ml-experiment', 'ml-analysis', 'ml-hparam', 'ml-revision', 'ml-advise', 'ml-retrospective'],
+    oldPaths: ['bmm/workflows/ml/', '_bmad/bmm/workflows/ml/'],
+    chatTopic: 'Machine Learning',
+    menuItemCount: 15 // MH, CH, MLI, MLE, MLA, MLD, MLS, MLNF, MLX, MLAN, MLH, MLR, MLAD, MLRT, DA
   }
 ];
 

package/test/extension-module-restructure.test.js

@@ -139,6 +139,7 @@ const expectedAgentSkills = [
   'bmad-ma-agent-devops',
   'bmad-ma-agent-cyber',
   'bmad-ma-agent-mil498',
+  'bmad-ma-agent-ml',
 ];
 
 const expectedMil498Skills = [
@@ -166,6 +167,13 @@ const expectedCyberSkills = [
 const expectedExtensionSkills = [
   'create-bug-story', 'add-sprint', 'modify-sprint',
   'add-to-sprint', 'project-context-expansion', 'sprint-status-view',
+  'cleanup-done', 'generate-backlog', 'prioritize-backlog', 'remove-from-sprint',
+];
+
+const expectedMlSkills = [
+  'ml-ideation', 'ml-eda', 'ml-architecture', 'ml-detailed-design',
+  'ml-techspec', 'ml-infra', 'ml-experiment', 'ml-analysis',
+  'ml-hparam', 'ml-revision', 'ml-advise', 'ml-retrospective',
 ];
 
 const allExpectedSkills = [
@@ -175,16 +183,17 @@ const allExpectedSkills = [
   ...expectedDevopsSkills,
   ...expectedCyberSkills,
   ...expectedExtensionSkills,
+  ...expectedMlSkills,
 ];
 
-test('skills/ has exactly 36 subdirectories', () => {
+test('skills/ has exactly 53 subdirectories', () => {
   const entries = fs.readdirSync(skillsDir).filter(e =>
     fs.statSync(path.join(skillsDir, e)).isDirectory()
   );
-  assert.strictEqual(entries.length, 36, `Expected 36 skill dirs, found ${entries.length}`);
+  assert.strictEqual(entries.length, 53, `Expected 53 skill dirs, found ${entries.length}`);
 });
 
-test('all 4 agent skill directories exist', () => {
+test('all 5 agent skill directories exist', () => {
   for (const skill of expectedAgentSkills) {
     const p = path.join(skillsDir, skill);
     assert.ok(fs.existsSync(p), `Missing agent skill dir: ${skill}`);
@@ -219,7 +228,14 @@ test('all 7 Cyber skill directories exist', () => {
   }
 });
 
-test('all 6 extension workflow skill directories exist', () => {
+test('all 12 ML skill directories exist', () => {
+  for (const skill of expectedMlSkills) {
+    const p = path.join(skillsDir, skill);
+    assert.ok(fs.existsSync(p), `Missing ML skill dir: ${skill}`);
+  }
+});
+
+test('all 10 extension workflow skill directories exist', () => {
   for (const skill of expectedExtensionSkills) {
     const p = path.join(skillsDir, skill);
     assert.ok(fs.existsSync(p), `Missing extension skill dir: ${skill}`);
@@ -259,8 +275,8 @@ test('module-help.csv has correct header columns', () => {
   }
 });
 
-test('module-help.csv has 36 skill entries (excluding header)', () => {
-  assert.strictEqual(csvData.rows.length, 36, `Expected 36 rows, found ${csvData.rows.length}`);
+test('module-help.csv has 53 skill entries (excluding header)', () => {
+  assert.strictEqual(csvData.rows.length, 53, `Expected 53 rows, found ${csvData.rows.length}`);
 });
 
 test('all CSV entries use module code ma-skills', () => {
@@ -310,7 +326,7 @@ test('CSV has entries for all 7 Cyber skills', () => {
   }
 });
 
-test('CSV has entries for all 6 extension workflow skills', () => {
+test('CSV has entries for all 10 extension workflow skills', () => {
   const codeIdx = csvData.headers.indexOf('code');
   const codes = csvData.rows.map(r => r[codeIdx]);
   for (const skill of expectedExtensionSkills) {
@@ -318,6 +334,14 @@ test('CSV has entries for all 6 extension workflow skills', () => {
   }
 });
 
+test('CSV has entries for all 12 ML skills', () => {
+  const codeIdx = csvData.headers.indexOf('code');
+  const codes = csvData.rows.map(r => r[codeIdx]);
+  for (const skill of expectedMlSkills) {
+    assert.ok(codes.includes(skill), `Missing CSV entry for ML skill: ${skill}`);
+  }
+});
+
 // ═══════════════════════════════════════════════════════════════════════════════
 //  Task 4: Directory state after Story 15.6 migration
 // ═══════════════════════════════════════════════════════════════════════════════

package/test/migration-validation.test.js

@@ -348,11 +348,11 @@ test('5.2: module.yaml has extends-module: bmm', () => {
   assert.ok(content.includes('extends-module: bmm'), 'module.yaml must declare extends-module: bmm');
 });
 
-test('5.3: skills/ contains exactly 36 skill folders', () => {
+test('5.3: skills/ contains exactly 53 skill folders', () => {
   const folders = fs.readdirSync(SKILLS_DIR).filter(f =>
     fs.statSync(path.join(SKILLS_DIR, f)).isDirectory());
-  assert.strictEqual(folders.length, 36,
-    `Expected 36 skill folders, found ${folders.length}: ${folders.join(', ')}`);
+  assert.strictEqual(folders.length, 53,
+    `Expected 53 skill folders, found ${folders.length}: ${folders.join(', ')}`);
 });
 
 test('5.4: every skill folder has SKILL.md', () => {
@@ -373,12 +373,12 @@ test('5.5: every skill folder has bmad-skill-manifest.yaml', () => {
   }
 });
 
-test('5.6: module-help.csv exists and lists all 36 skills', () => {
+test('5.6: module-help.csv exists and lists all 53 skills', () => {
   const csv = fs.readFileSync(path.join(EXT_DIR, 'module-help.csv'), 'utf-8');
   const lines = csv.split('\n').filter(l => l.trim() && !l.startsWith('module,'));
-  // Should have a line for each of the 36 skills (header excluded)
-  assert.strictEqual(lines.length, 36,
-    `Expected 36 data rows in module-help.csv, found ${lines.length}`);
+  // Should have a line for each of the 53 skills (header excluded)
+  assert.strictEqual(lines.length, 53,
+    `Expected 53 data rows in module-help.csv, found ${lines.length}`);
 });
 
 test('5.7: module-help.csv references module code ma-skills', () => {
@@ -390,7 +390,7 @@ test('5.7: module-help.csv references module code ma-skills', () => {
   }
 });
 
-test('5.8: skill folder breakdown: 4 agents + 7 mil498 + 7 sre + 5 devops + 7 cyber + 6 extension', () => {
+test('5.8: skill folder breakdown: 5 agents + 7 mil498 + 7 sre + 5 devops + 7 cyber + 12 ml + 10 extension', () => {
   const folders = fs.readdirSync(SKILLS_DIR).filter(f =>
     fs.statSync(path.join(SKILLS_DIR, f)).isDirectory());
 
@@ -399,16 +399,19 @@ test('5.8: skill folder breakdown: 4 agents + 7 mil498 + 7 sre + 5 devops + 7 cy
   const sre = folders.filter(f => f.startsWith('sre-'));
   const devops = folders.filter(f => f.startsWith('devops-'));
   const cyber = folders.filter(f => f.startsWith('cyber-'));
+  const ml = folders.filter(f => f.startsWith('ml-'));
   const ext = folders.filter(f =>
     !f.startsWith('bmad-ma-agent-') && !f.startsWith('mil498-') &&
-    !f.startsWith('sre-') && !f.startsWith('devops-') && !f.startsWith('cyber-'));
+    !f.startsWith('sre-') && !f.startsWith('devops-') && !f.startsWith('cyber-') &&
+    !f.startsWith('ml-'));
 
-  assert.strictEqual(agents.length, 4, `Expected 4 agent folders, found ${agents.length}`);
+  assert.strictEqual(agents.length, 5, `Expected 5 agent folders, found ${agents.length}`);
   assert.strictEqual(mil498.length, 7, `Expected 7 mil498 folders, found ${mil498.length}`);
   assert.strictEqual(sre.length, 7, `Expected 7 sre folders, found ${sre.length}`);
   assert.strictEqual(devops.length, 5, `Expected 5 devops folders, found ${devops.length}`);
   assert.strictEqual(cyber.length, 7, `Expected 7 cyber folders, found ${cyber.length}`);
-  assert.strictEqual(ext.length, 6, `Expected 6 extension folders, found ${ext.length}`);
+  assert.strictEqual(ml.length, 12, `Expected 12 ml folders, found ${ml.length}`);
+  assert.strictEqual(ext.length, 10, `Expected 10 extension folders, found ${ext.length}`);
 });
 
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━