ma-agents 3.0.0 → 3.1.0

package/lib/installer.js

@@ -138,9 +138,10 @@ async function generateSkillsManifest(installPath) {
  * Generate project-context.md content by stamping the template with installed agent MANIFEST paths.
  * @param {string} projectRoot - Absolute path to project root (unused for path generation but part of API)
  * @param {Array<{skillsDir: string}>} installedAgents - Agent objects with skillsDir property
+ * @param {Object|null} [layout=null] - Repository layout from collectRepoLayout() (null for single-repo)
  * @returns {Promise<string>} Stamped template content string (does NOT write any file)
  */
-async function generateProjectContext(projectRoot, installedAgents) {
+async function generateProjectContext(projectRoot, installedAgents, layout = null) {
   let template;
   try {
     template = await fs.readFile(TEMPLATE_PATH, 'utf8');
@@ -158,7 +159,111 @@ async function generateProjectContext(projectRoot, installedAgents) {
       .join('\n');
   }
 
-  return template.replace('{{MANIFEST_PATHS_LIST}}', manifestList);
+  let content = template.replace('{{MANIFEST_PATHS_LIST}}', manifestList);
+
+  // Replace repo layout placeholder (Story 16.3)
+  const layoutSection = generateRepoLayoutSection(layout);
+  if (layoutSection) {
+    content = content.replace('{{REPO_LAYOUT_SECTION}}', '\n' + layoutSection + '\n');
+  } else {
+    // Clean removal: remove placeholder and avoid double blank lines
+    content = content.replace(/\{\{REPO_LAYOUT_SECTION\}\}\r?\n/, '');
+  }
+
+  return content;
+}
+
+/**
+ * Generate the Repository Layout markdown section for project-context.md.
+ * Returns the section with markers for multi-repo, or empty string for single-repo/null layout.
+ * @param {Object|null} layout - Layout object from collectRepoLayout()
+ * @returns {string} Markdown section with markers, or empty string
+ */
+function generateRepoLayoutSection(layout) {
+  if (!layout || !layout.knowledgebase || !layout.sprintManagement) return '';
+  if (layout.knowledgebase.mode === 'same' && layout.sprintManagement.mode === 'same') return '';
+
+  const normPath = (p) => (p || '.').replace(/\\/g, '/');
+  const kbDisplay = layout.knowledgebase.mode === 'same'
+    ? 'current repository (default)'
+    : normPath(layout.knowledgebase.path);
+  const spDisplay = layout.sprintManagement.mode === 'same'
+    ? 'current repository (default)'
+    : normPath(layout.sprintManagement.path);
+
+  let lines = [
+    '<!-- ma-agents:repo-layout-start -->',
+    '### Repository Layout',
+    `- **Knowledgebase:** ${kbDisplay}`,
+    `- **Sprint Management:** ${spDisplay}`,
+  ];
+
+  if (layout.knowledgebase.mode !== 'same') {
+    lines.push('- When creating or reading planning artifacts, use the knowledgebase path');
+  }
+  if (layout.sprintManagement.mode !== 'same') {
+    lines.push('- When creating or reading sprint/story artifacts, use the sprint management path');
+  }
+
+  lines.push('<!-- ma-agents:repo-layout-end -->');
+  return lines.join('\n');
+}
+
+/**
+ * Update the Repository Layout section in an existing project-context.md.
+ * Uses marker-based update pattern (same as manifest paths).
+ * @param {string} outputPath - Absolute path to existing project-context.md
+ * @param {Object|null} layout - Layout object from collectRepoLayout()
+ * @returns {Promise<boolean>} true if file was written, false otherwise
+ */
+async function updateProjectContextRepoLayout(outputPath, layout) {
+  let content;
+  try {
+    content = await fs.readFile(outputPath, 'utf8');
+  } catch {
+    return false;
+  }
+
+  const newSection = generateRepoLayoutSection(layout);
+  const START = '<!-- ma-agents:repo-layout-start -->';
+  const END = '<!-- ma-agents:repo-layout-end -->';
+  const startIdx = content.indexOf(START);
+  const endIdx = content.indexOf(END);
+
+  if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
+    // Markers exist — replace content between them
+    if (newSection) {
+      const newContent = content.slice(0, startIdx) + newSection + content.slice(endIdx + END.length);
+      if (newContent === content) return false;
+      await fs.writeFile(outputPath, newContent, 'utf8');
+      return true;
+    } else {
+      // Single-repo: remove the entire section including markers and surrounding blank lines
+      let before = content.slice(0, startIdx);
+      let after = content.slice(endIdx + END.length);
+      // Clean up trailing newline from before and leading newline from after
+      if (before.endsWith('\n')) before = before.slice(0, -1);
+      if (after.startsWith('\n')) after = after.slice(1);
+      const newContent = before + '\n' + after;
+      if (newContent === content) return false;
+      await fs.writeFile(outputPath, newContent, 'utf8');
+      return true;
+    }
+  }
+
+  // Markers don't exist
+  if (!newSection) return false; // single-repo, nothing to insert
+
+  // Find insertion point: before "## Technology Stack"
+  const techStackIdx = content.indexOf('## Technology Stack');
+  if (techStackIdx === -1) {
+    // Can't find expected structure — skip with info
+    return false;
+  }
+
+  const newContent = content.slice(0, techStackIdx) + newSection + '\n\n' + content.slice(techStackIdx);
+  await fs.writeFile(outputPath, newContent, 'utf8');
+  return true;
 }
 
 /**
@@ -949,6 +1054,8 @@ module.exports = {
   ensureBmadOutputTracked,
   generateSkillsManifest,
   generateProjectContext,
+  generateRepoLayoutSection,
+  updateProjectContextRepoLayout,
   _updateProjectContextManifestPaths: updateProjectContextManifestPaths,
   _testUpdateAgentInstructions: updateAgentInstructions,
   _MA_AGENTS_SOURCE: MA_AGENTS_SOURCE

package/lib/templates/project-context.template.md

@@ -37,7 +37,7 @@
 6. **Human review gate:** Await approval — do NOT auto-merge under any circumstance
 7. **Merge + cleanup:** After approval: merge, `git worktree remove`, delete branch
 8. **Post-mission:** Update story status to done, append session to AiAudit.md
-
+{{REPO_LAYOUT_SECTION}}
 ## Technology Stack
 <!-- TODO: Populated after architecture phase via /bmad-generate-project-context -->
 <!-- Run: /bmad-generate-project-context to auto-detect your stack -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ma-agents",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "NPX tool to install skills for AI coding agents (Claude Code, Gemini, Copilot, Kilocode, Cline, Cursor)",
   "main": "index.js",
   "bin": {
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "start": "node bin/cli.js",
-    "test": "node test/yes-flag.test.js && node test/skill-authoring.test.js && node test/skill-validation.test.js && node test/skill-mandatory.test.js && node test/skill-customize-agent.test.js && node test/create-agent.test.js && node test/generate-project-context.test.js && node test/build-bmad-args.test.js && node test/bmad-version-bump.test.js && node test/extension-module-restructure.test.js && node test/convert-agents-to-skills.test.js && node test/migration.test.js && node test/migration-validation.test.js && node test/story-15-5-workflow-skills.test.js",
+    "test": "node test/yes-flag.test.js && node test/skill-authoring.test.js && node test/skill-validation.test.js && node test/skill-mandatory.test.js && node test/skill-customize-agent.test.js && node test/create-agent.test.js && node test/generate-project-context.test.js && node test/build-bmad-args.test.js && node test/bmad-version-bump.test.js && node test/extension-module-restructure.test.js && node test/convert-agents-to-skills.test.js && node test/migration.test.js && node test/migration-validation.test.js && node test/story-15-5-workflow-skills.test.js && node test/repo-layout.test.js && node test/config-storage.test.js && node test/cross-repo-validation.test.js && node test/config-lost-on-update.test.js && node test/portable-paths.test.js && node test/cicd-remote-mode.test.js && node test/config-layout.test.js",
     "build:bmad-cache": "node scripts/build-bmad-cache.js"
   },
   "keywords": [

package/test/cicd-remote-mode.test.js

@@ -0,0 +1,224 @@
+#!/usr/bin/env node
+/**
+ * Tests for Story 16.8: CI/CD Remote Repository Mode
+ * Tests collectRepoLayout() with git URL env vars, ciCloneIfNeeded()
+ */
+'use strict';
+
+const assert = require('assert');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+
+let passed = 0;
+let failed = 0;
+const errors = [];
+
+function test(name, fn) {
+  try {
+    fn();
+    console.log(`  \u2713 ${name}`);
+    passed++;
+  } catch (err) {
+    console.error(`  \u2717 ${name}: ${err.message}`);
+    failed++;
+    errors.push({ name, error: err.message });
+  }
+}
+
+async function asyncTest(name, fn) {
+  try {
+    await fn();
+    console.log(`  \u2713 ${name}`);
+    passed++;
+  } catch (err) {
+    console.error(`  \u2717 ${name}: ${err.message}`);
+    failed++;
+    errors.push({ name, error: err.message });
+  }
+}
+
+// ─── Load module ─────────────────────────────────────────────────────────────
+let collectRepoLayout, ciCloneIfNeeded;
+try {
+  ({ collectRepoLayout, ciCloneIfNeeded } = require('../bin/cli.js'));
+} catch (e) {
+  console.error('\n  FATAL: Cannot load exports from cli.js');
+  console.error(' ', e.message);
+  process.exit(1);
+}
+
+// Helper: save and restore env vars
+function withEnv(vars, fn) {
+  const saved = {};
+  const envKeys = [
+    'MA_KNOWLEDGEBASE_PATH', 'MA_SPRINT_PATH',
+    'MA_KNOWLEDGEBASE_GIT_URL', 'MA_SPRINT_GIT_URL'
+  ];
+  for (const k of envKeys) {
+    saved[k] = process.env[k];
+    delete process.env[k];
+  }
+  for (const [k, v] of Object.entries(vars)) {
+    process.env[k] = v;
+  }
+  try {
+    return fn();
+  } finally {
+    for (const k of envKeys) {
+      if (saved[k] !== undefined) process.env[k] = saved[k];
+      else delete process.env[k];
+    }
+  }
+}
+
+// ─── collectRepoLayout: remote mode via env vars ───────────────────────────
+console.log('\ncollectRepoLayout: CI/CD remote mode');
+
+asyncTest('--yes + git URL + path returns remote mode', async () => {
+  await withEnv({
+    MA_KNOWLEDGEBASE_PATH: os.tmpdir(),
+    MA_KNOWLEDGEBASE_GIT_URL: 'https://git.example.com/kb.git',
+  }, async () => {
+    // Create a fake .git dir at tmpdir so clone is skipped
+    const gitDir = path.join(os.tmpdir(), '.git');
+    const hadGitDir = fs.existsSync(gitDir);
+    if (!hadGitDir) fs.mkdirSync(gitDir, { recursive: true });
+    try {
+      const result = await collectRepoLayout({ yes: true }, null);
+      assert.strictEqual(result.knowledgebase.mode, 'remote');
+      assert.strictEqual(result.knowledgebase.gitUrl, 'https://git.example.com/kb.git');
+      assert.strictEqual(result.knowledgebase.path, path.resolve(os.tmpdir()));
+    } finally {
+      if (!hadGitDir && fs.existsSync(gitDir)) fs.rmdirSync(gitDir);
+    }
+  });
+});
+
+asyncTest('--yes + path only (no git URL) returns local mode (backward compat)', async () => {
+  await withEnv({
+    MA_KNOWLEDGEBASE_PATH: '/some/local/path',
+  }, async () => {
+    const result = await collectRepoLayout({ yes: true }, null);
+    assert.strictEqual(result.knowledgebase.mode, 'local');
+    assert.strictEqual(result.knowledgebase.path, path.resolve('/some/local/path'));
+    assert.strictEqual(result.knowledgebase.gitUrl, undefined, 'should not have gitUrl');
+  });
+});
+
+asyncTest('--yes + no env vars defaults to single-repo', async () => {
+  await withEnv({}, async () => {
+    const result = await collectRepoLayout({ yes: true }, null);
+    assert.strictEqual(result.knowledgebase.mode, 'same');
+    assert.strictEqual(result.sprintManagement.mode, 'same');
+  });
+});
+
+asyncTest('--yes + sprint git URL + path returns remote for sprint', async () => {
+  await withEnv({
+    MA_SPRINT_PATH: os.tmpdir(),
+    MA_SPRINT_GIT_URL: 'https://git.example.com/sprint.git',
+  }, async () => {
+    const gitDir = path.join(os.tmpdir(), '.git');
+    const hadGitDir = fs.existsSync(gitDir);
+    if (!hadGitDir) fs.mkdirSync(gitDir, { recursive: true });
+    try {
+      const result = await collectRepoLayout({ yes: true }, null);
+      assert.strictEqual(result.sprintManagement.mode, 'remote');
+      assert.strictEqual(result.sprintManagement.gitUrl, 'https://git.example.com/sprint.git');
+      assert.strictEqual(result.knowledgebase.mode, 'same', 'kb should default when not set');
+    } finally {
+      if (!hadGitDir && fs.existsSync(gitDir)) fs.rmdirSync(gitDir);
+    }
+  });
+});
+
+// ─── ciCloneIfNeeded ───────────────────────────────────────────────────────
+console.log('\nciCloneIfNeeded');
+
+test('skips clone when .git directory exists at destination', () => {
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ma-test-'));
+  try {
+    fs.mkdirSync(path.join(tmpDir, '.git'));
+    const clonedRepos = new Map();
+    // Should not throw — just logs and returns
+    ciCloneIfNeeded(tmpDir, 'https://git.example.com/repo.git', clonedRepos);
+    assert.ok(clonedRepos.has(`https://git.example.com/repo.git::${tmpDir}`), 'should mark as cloned');
+  } finally {
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('deduplicates: same URL+path only processed once', () => {
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ma-test-'));
+  try {
+    fs.mkdirSync(path.join(tmpDir, '.git'));
+    const clonedRepos = new Map();
+    ciCloneIfNeeded(tmpDir, 'https://git.example.com/repo.git', clonedRepos);
+    // Second call should be a no-op
+    ciCloneIfNeeded(tmpDir, 'https://git.example.com/repo.git', clonedRepos);
+    assert.strictEqual(clonedRepos.size, 1, 'should only have one entry');
+  } finally {
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('throws error when destination exists but is not a git repo', () => {
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ma-test-'));
+  try {
+    // tmpDir exists but has no .git/ — should throw
+    try {
+      ciCloneIfNeeded(tmpDir, 'https://git.example.com/repo.git', new Map());
+      assert.fail('should have thrown');
+    } catch (e) {
+      assert.ok(e.message.includes('not a git repo'), `error should mention "not a git repo", got: ${e.message}`);
+    }
+  } finally {
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  }
+});
+
+// ─── git URL without path env var ──────────────────────────────────────────
+console.log('\ncollectRepoLayout: validation errors');
+
+asyncTest('git URL without path env var throws error (knowledgebase)', async () => {
+  try {
+    await withEnv({
+      MA_KNOWLEDGEBASE_GIT_URL: 'https://git.example.com/kb.git',
+      // MA_KNOWLEDGEBASE_PATH deliberately NOT set
+    }, async () => {
+      await collectRepoLayout({ yes: true }, null);
+    });
+    assert.fail('should have thrown');
+  } catch (e) {
+    assert.ok(e.message.includes('MA_KNOWLEDGEBASE_GIT_URL requires MA_KNOWLEDGEBASE_PATH'),
+      `should mention required PATH, got: ${e.message}`);
+  }
+});
+
+asyncTest('git URL without path env var throws error (sprint)', async () => {
+  try {
+    await withEnv({
+      MA_SPRINT_GIT_URL: 'https://git.example.com/sprint.git',
+    }, async () => {
+      await collectRepoLayout({ yes: true }, null);
+    });
+    assert.fail('should have thrown');
+  } catch (e) {
+    assert.ok(e.message.includes('MA_SPRINT_GIT_URL requires MA_SPRINT_PATH'),
+      `should mention required PATH, got: ${e.message}`);
+  }
+});
+
+// ─── Summary ───────────────────────────────────────────────────────────────
+async function runAll() {
+  await new Promise(resolve => setTimeout(resolve, 100));
+  console.log(`\n${passed} passed, ${failed} failed`);
+  if (errors.length > 0) {
+    console.log('\nFailed tests:');
+    errors.forEach(e => console.log(`  - ${e.name}: ${e.error}`));
+  }
+  if (failed > 0) process.exit(1);
+}
+
+runAll();

package/test/config-layout.test.js

@@ -0,0 +1,230 @@
+#!/usr/bin/env node
+/**
+ * Tests for Story 16.9: Reconfigure Layout Workflow
+ * Tests showCurrentLayout(), handleConfigLayout(), and CLI command routing
+ */
+'use strict';
+
+const assert = require('assert');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+
+let passed = 0;
+let failed = 0;
+const errors = [];
+
+function test(name, fn) {
+  try {
+    fn();
+    console.log(`  \u2713 ${name}`);
+    passed++;
+  } catch (err) {
+    console.error(`  \u2717 ${name}: ${err.message}`);
+    failed++;
+    errors.push({ name, error: err.message });
+  }
+}
+
+async function asyncTest(name, fn) {
+  try {
+    await fn();
+    console.log(`  \u2713 ${name}`);
+    passed++;
+  } catch (err) {
+    console.error(`  \u2717 ${name}: ${err.message}`);
+    failed++;
+    errors.push({ name, error: err.message });
+  }
+}
+
+// ─── Load module ─────────────────────────────────────────────────────────────
+let showCurrentLayout, handleConfigLayout, writeProjectLayoutYaml, writeRepoLayoutConfig, readExistingLayout;
+try {
+  ({ showCurrentLayout, handleConfigLayout, writeProjectLayoutYaml, writeRepoLayoutConfig, readExistingLayout } = require('../bin/cli.js'));
+} catch (e) {
+  console.error('\n  FATAL: Cannot load exports from cli.js');
+  console.error(' ', e.message);
+  process.exit(1);
+}
+
+function withTmpDir() {
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ma-test-'));
+  const origCwd = process.cwd();
+  process.chdir(tmpDir);
+  return { tmpDir, cleanup() { process.chdir(origCwd); fs.rmSync(tmpDir, { recursive: true, force: true }); } };
+}
+
+// ─── showCurrentLayout ─────────────────────────────────────────────────────
+console.log('\nshowCurrentLayout');
+
+test('--show with no config displays single-repo default', () => {
+  const { cleanup } = withTmpDir();
+  try {
+    // Capture console output
+    const logs = [];
+    const origLog = console.log;
+    console.log = (...args) => logs.push(args.join(' '));
+    showCurrentLayout();
+    console.log = origLog;
+    const output = logs.join('\n');
+    assert.ok(output.includes('Single-repo') || output.includes('single-repo') || output.includes('.'),
+      `should mention single-repo, got: ${output}`);
+  } finally {
+    cleanup();
+  }
+});
+
+test('--show with multi-repo config displays current layout', () => {
+  const { tmpDir, cleanup } = withTmpDir();
+  try {
+    // Write a layout file
+    const dir = path.join(tmpDir, '_bmad-output');
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(path.join(dir, 'project-layout.yaml'), [
+      'knowledgebase:',
+      '  mode: local',
+      '  path: "../kb-repo"',
+      'sprint_management:',
+      '  mode: same',
+      '  path: "."',
+    ].join('\n'));
+
+    const logs = [];
+    const origLog = console.log;
+    console.log = (...args) => logs.push(args.join(' '));
+    showCurrentLayout();
+    console.log = origLog;
+    const output = logs.join('\n');
+    assert.ok(output.includes('Knowledgebase') || output.includes('knowledgebase'),
+      `should display knowledgebase, got: ${output}`);
+    assert.ok(output.includes('local'), `should display mode, got: ${output}`);
+  } finally {
+    cleanup();
+  }
+});
+
+// ─── CLI routing ───────────────────────────────────────────────────────────
+console.log('\nCLI routing');
+
+test('config command without subcommand exits with error', () => {
+  const { execFileSync } = require('child_process');
+  try {
+    execFileSync('node', [path.join(__dirname, '..', 'bin', 'cli.js'), 'config'], { stdio: 'pipe' });
+    assert.fail('should have exited with error');
+  } catch (e) {
+    assert.ok(e.status === 1, `should exit with code 1, got ${e.status}`);
+    assert.ok(e.stderr.toString().includes('Unknown config subcommand'), `should mention unknown subcommand`);
+  }
+});
+
+test('config layout --show does not modify files', () => {
+  const { tmpDir, cleanup } = withTmpDir();
+  try {
+    // Note: this just tests that the command runs without error in single-repo mode
+    const { execFileSync } = require('child_process');
+    const result = execFileSync('node', [
+      path.join(__dirname, '..', 'bin', 'cli.js'), 'config', 'layout', '--show'
+    ], { stdio: 'pipe', cwd: tmpDir });
+    const output = result.toString();
+    assert.ok(output.includes('Single-repo') || output.includes('single-repo') || output.includes('.'),
+      `should display layout info, got: ${output}`);
+  } finally {
+    cleanup();
+  }
+});
+
+// ─── Sequential async runner ───────────────────────────────────────────────
+(async () => {
+  // Run async tests sequentially to avoid cwd conflicts
+  console.log('\nhandleConfigLayout --yes mode (sequential)');
+
+  // Test: --yes reconfigure writes updated config files
+  await asyncTest('--yes reconfigure writes updated config files', async () => {
+    const tmpDir2 = fs.mkdtempSync(path.join(os.tmpdir(), 'ma-test-'));
+    const origCwd2 = process.cwd();
+    process.chdir(tmpDir2);
+    const origKb = process.env.MA_KNOWLEDGEBASE_PATH;
+    const origSp = process.env.MA_SPRINT_PATH;
+    const origKbGit = process.env.MA_KNOWLEDGEBASE_GIT_URL;
+    const origSpGit = process.env.MA_SPRINT_GIT_URL;
+    try {
+      const configDir = path.join(tmpDir2, '_bmad', 'bmm');
+      fs.mkdirSync(configDir, { recursive: true });
+      fs.writeFileSync(path.join(configDir, 'config.yaml'), '# config\nknowledgebase_path: "."\nsprint_management_path: "."');
+
+      const kbPath = path.join(path.dirname(tmpDir2), 'kb-repo');
+      process.env.MA_KNOWLEDGEBASE_PATH = kbPath;
+      delete process.env.MA_SPRINT_PATH;
+      delete process.env.MA_KNOWLEDGEBASE_GIT_URL;
+      delete process.env.MA_SPRINT_GIT_URL;
+
+      await handleConfigLayout(['--yes']);
+
+      const config = fs.readFileSync(path.join(configDir, 'config.yaml'), 'utf-8');
+      assert.ok(config.includes('kb-repo'), `kb path should reference kb-repo, got: ${config}`);
+      assert.ok(fs.existsSync(path.join(tmpDir2, '_bmad-output', 'project-layout.yaml')),
+        'project-layout.yaml should be created');
+    } finally {
+      if (origKb !== undefined) process.env.MA_KNOWLEDGEBASE_PATH = origKb;
+      else delete process.env.MA_KNOWLEDGEBASE_PATH;
+      if (origSp !== undefined) process.env.MA_SPRINT_PATH = origSp;
+      else delete process.env.MA_SPRINT_PATH;
+      if (origKbGit !== undefined) process.env.MA_KNOWLEDGEBASE_GIT_URL = origKbGit;
+      else delete process.env.MA_KNOWLEDGEBASE_GIT_URL;
+      if (origSpGit !== undefined) process.env.MA_SPRINT_GIT_URL = origSpGit;
+      else delete process.env.MA_SPRINT_GIT_URL;
+      process.chdir(origCwd2);
+      fs.rmSync(tmpDir2, { recursive: true, force: true });
+    }
+  });
+
+  // Test: --yes preserves existing layout
+  await asyncTest('--yes preserves existing layout when no env vars', async () => {
+    const tmpDir3 = fs.mkdtempSync(path.join(os.tmpdir(), 'ma-test-'));
+    const origCwd3 = process.cwd();
+    process.chdir(tmpDir3);
+    const origKb = process.env.MA_KNOWLEDGEBASE_PATH;
+    const origSp = process.env.MA_SPRINT_PATH;
+    const origKbGit = process.env.MA_KNOWLEDGEBASE_GIT_URL;
+    const origSpGit = process.env.MA_SPRINT_GIT_URL;
+    try {
+      const configDir = path.join(tmpDir3, '_bmad', 'bmm');
+      fs.mkdirSync(configDir, { recursive: true });
+      fs.writeFileSync(path.join(configDir, 'config.yaml'), '# config\nknowledgebase_path: "../kb"\nsprint_management_path: "."');
+      const outDir = path.join(tmpDir3, '_bmad-output');
+      fs.mkdirSync(outDir, { recursive: true });
+      fs.writeFileSync(path.join(outDir, 'project-layout.yaml'), 'knowledgebase:\n  mode: local\n  path: "../kb"\nsprint_management:\n  mode: same\n  path: "."');
+
+      delete process.env.MA_KNOWLEDGEBASE_PATH;
+      delete process.env.MA_SPRINT_PATH;
+      delete process.env.MA_KNOWLEDGEBASE_GIT_URL;
+      delete process.env.MA_SPRINT_GIT_URL;
+
+      await handleConfigLayout(['--yes']);
+
+      assert.ok(fs.existsSync(path.join(outDir, 'project-layout.yaml')),
+        'project-layout.yaml should still exist');
+      const config = fs.readFileSync(path.join(configDir, 'config.yaml'), 'utf-8');
+      assert.ok(config.includes('kb'), `kb path should be preserved, got: ${config}`);
+    } finally {
+      if (origKb !== undefined) process.env.MA_KNOWLEDGEBASE_PATH = origKb;
+      else delete process.env.MA_KNOWLEDGEBASE_PATH;
+      if (origSp !== undefined) process.env.MA_SPRINT_PATH = origSp;
+      else delete process.env.MA_SPRINT_PATH;
+      if (origKbGit !== undefined) process.env.MA_KNOWLEDGEBASE_GIT_URL = origKbGit;
+      else delete process.env.MA_KNOWLEDGEBASE_GIT_URL;
+      if (origSpGit !== undefined) process.env.MA_SPRINT_GIT_URL = origSpGit;
+      else delete process.env.MA_SPRINT_GIT_URL;
+      process.chdir(origCwd3);
+      fs.rmSync(tmpDir3, { recursive: true, force: true });
+    }
+  });
+
+  console.log(`\n${passed} passed, ${failed} failed`);
+  if (errors.length > 0) {
+    console.log('\nFailed tests:');
+    errors.forEach(e => console.log(`  - ${e.name}: ${e.error}`));
+  }
+  if (failed > 0) process.exit(1);
+})();