Merge 26050b3d5f into b9431d6d99

test/test-installation-components.js

@@ -3273,189 +3273,6 @@ async function runTests() {
 
   console.log('');
 
-  // ============================================================
-  // Test Suite 45: _cleanupSkillDirs prunes empty parent dirs (#empty-bmm-folders)
-  // ============================================================
-  console.log(`${colors.yellow}Test Suite 45: cleanup prunes empty skill-group dirs${colors.reset}\n`);
-
-  let root45;
-  try {
-    root45 = await fs.mkdtemp(path.join(os.tmpdir(), 'bmad-cleanup-test-'));
-    const bmadDir45 = path.join(root45, '_bmad');
-    await fs.ensureDir(path.join(bmadDir45, '_config'));
-
-    // Two skills nested under the same grouping dir (1-analysis), plus a
-    // module-level file that must survive the cleanup.
-    await fs.writeFile(
-      path.join(bmadDir45, '_config', 'skill-manifest.csv'),
-      [
-        'canonicalId,name,description,module,path',
-        '"bmad-agent-analyst","bmad-agent-analyst","fixture","bmm","_bmad/bmm/1-analysis/bmad-agent-analyst/SKILL.md"',
-        '"bmad-research","bmad-research","fixture","bmm","_bmad/bmm/1-analysis/research/bmad-research/SKILL.md"',
-        '',
-      ].join('\n'),
-    );
-    await fs.ensureDir(path.join(bmadDir45, 'bmm', '1-analysis', 'bmad-agent-analyst'));
-    await fs.writeFile(path.join(bmadDir45, 'bmm', '1-analysis', 'bmad-agent-analyst', 'SKILL.md'), 'x');
-    await fs.ensureDir(path.join(bmadDir45, 'bmm', '1-analysis', 'research', 'bmad-research'));
-    await fs.writeFile(path.join(bmadDir45, 'bmm', '1-analysis', 'research', 'bmad-research', 'SKILL.md'), 'x');
-    await fs.writeFile(path.join(bmadDir45, 'bmm', 'config.yaml'), 'module: bmm\n');
-
-    const installer45 = new Installer();
-    await installer45._cleanupSkillDirs(bmadDir45);
-
-    assert(!(await fs.pathExists(path.join(bmadDir45, 'bmm', '1-analysis'))), 'empty skill-group dir is pruned after cleanup');
-    assert(!(await fs.pathExists(path.join(bmadDir45, 'bmm', '1-analysis', 'research'))), 'empty nested skill-group dir is pruned');
-    assert(await fs.pathExists(path.join(bmadDir45, 'bmm', 'config.yaml')), 'module-level files are preserved');
-    assert(await fs.pathExists(bmadDir45), 'bmad root is never removed');
-  } catch (error) {
-    console.log(`${colors.red}Test Suite 45 setup failed: ${error.message}${colors.reset}`);
-    console.log(error.stack);
-    failed++;
-  } finally {
-    if (root45) await fs.remove(root45).catch(() => {});
-  }
-
-  console.log('');
-
-  // ============================================================
-  // Test Suite 46: Python environment check (version parsing + classification)
-  // ============================================================
-  console.log(`${colors.yellow}Test Suite 46: python-check version parsing and classification${colors.reset}\n`);
-
-  try {
-    const { parsePythonVersion, classifyPython, detectPython } = require('../tools/installer/core/python-check');
-
-    // Version parsing
-    const v312 = parsePythonVersion('Python 3.12.1');
-    assert(v312 && v312.major === 3 && v312.minor === 12 && v312.patch === 1, 'parses "Python 3.12.1"');
-    const v311 = parsePythonVersion('Python 3.11.0\n');
-    assert(v311 && v311.raw === '3.11.0', 'parses with trailing newline');
-    const v2 = parsePythonVersion('\nPython 2.7.18');
-    assert(v2 && v2.major === 2, 'parses Python 2 output (stderr-style)');
-    const noPatch = parsePythonVersion('Python 3.13');
-    assert(noPatch && noPatch.patch === 0, 'missing patch defaults to 0');
-    assert(parsePythonVersion('') === null, 'empty output returns null');
-    assert(parsePythonVersion('command not found: python3') === null, 'non-version output returns null');
-    assert(parsePythonVersion(null) === null, 'null output returns null');
-
-    // Classification against feature requirements
-    assert(classifyPython({ major: 3, minor: 11 }) === 'full', '3.11 is full support (tomllib floor)');
-    assert(classifyPython({ major: 3, minor: 13 }) === 'full', '3.13 is full support');
-    assert(classifyPython({ major: 4, minor: 0 }) === 'full', 'hypothetical 4.0 is full support');
-    assert(classifyPython({ major: 3, minor: 10 }) === 'partial', '3.10 is partial (memlog yes, tomllib no)');
-    assert(classifyPython({ major: 3, minor: 8 }) === 'partial', '3.8 is partial (memlog floor)');
-    assert(classifyPython({ major: 3, minor: 7 }) === 'unsupported', '3.7 is unsupported');
-    assert(classifyPython({ major: 2, minor: 7 }) === 'unsupported', '2.7 is unsupported');
-    assert(classifyPython(null) === 'none', 'no python is none');
-
-    // Detection smoke test — must not throw, and if it finds a Python the
-    // result must be well-formed. (CI machines may or may not have Python.)
-    const detected = detectPython();
-    assert(
-      detected === null ||
-        (typeof detected.command === 'string' &&
-          typeof detected.version.raw === 'string' &&
-          typeof detected.isRuntimeCommand === 'boolean'),
-      'detectPython returns null or a well-formed result',
-    );
-
-    // checkPythonEnvironment branch coverage — stub detection, prompts, and
-    // process.exit so the assertions are deterministic regardless of the
-    // machine's Python. python-check resolves detectPython via module.exports
-    // and prompts via the shared module object, so swapping properties works.
-    const pythonCheck = require('../tools/installer/core/python-check');
-    const promptsModule = require('../tools/installer/prompts');
-    const real = {
-      detectPython: pythonCheck.detectPython,
-      log: promptsModule.log,
-      note: promptsModule.note,
-      select: promptsModule.select,
-      cancel: promptsModule.cancel,
-      exit: process.exit,
-    };
-    const stub = (detectResult, selectAnswer) => {
-      const seen = { success: [], warn: [], info: [], note: [], select: [], cancel: [], exit: [] };
-      pythonCheck.detectPython = () => detectResult;
-      promptsModule.log = {
-        success: async (m) => void seen.success.push(m),
-        warn: async (m) => void seen.warn.push(m),
-        info: async (m) => void seen.info.push(m),
-        error: async () => {},
-      };
-      promptsModule.note = async (m, t) => void seen.note.push(t || m);
-      promptsModule.select = async (opts) => {
-        seen.select.push(opts.message);
-        return selectAnswer;
-      };
-      promptsModule.cancel = async (m) => void seen.cancel.push(m);
-      process.exit = (code) => {
-        seen.exit.push(code);
-        throw new Error('__stub_exit__');
-      };
-      return seen;
-    };
-
-    try {
-      const v = (major, minor, patch) => ({ major, minor, patch, raw: `${major}.${minor}.${patch}` });
-
-      // Branch: full support via the runtime command — success, no prompt.
-      let seen = stub({ command: 'python3', version: v(3, 12, 1), isRuntimeCommand: true }, 'continue');
-      let result = await pythonCheck.checkPythonEnvironment();
-      assert(result.status === 'full' && seen.success.length === 1, 'full support via python3 logs success');
-      assert(seen.select.length === 0 && seen.warn.length === 0, 'full support via python3 skips warning and ack prompt');
-
-      // Branch: modern Python found, but not as `python3` — runtime mismatch.
-      seen = stub({ command: 'py -3', version: v(3, 12, 0), isRuntimeCommand: false }, 'continue');
-      result = await pythonCheck.checkPythonEnvironment();
-      assert(seen.success.length === 0, 'python3-mismatch never reports full support');
-      assert(
-        seen.warn.length === 1 && seen.warn[0].includes('python3') && seen.warn[0].includes('py -3'),
-        'python3-mismatch warns that scripts invoke python3',
-      );
-      assert(seen.select.length === 1 && result.status === 'full', 'python3-mismatch still requires the ack prompt');
-
-      // Branch: partial support (3.8–3.10) — warn + ack, continue returns.
-      seen = stub({ command: 'python3', version: v(3, 9, 5), isRuntimeCommand: true }, 'continue');
-      result = await pythonCheck.checkPythonEnvironment();
-      assert(
-        result.status === 'partial' && seen.warn.length === 1 && seen.warn[0].includes('3.11+'),
-        'partial support warns about tomllib floor',
-      );
-      assert(seen.select.length === 1 && seen.exit.length === 0, 'partial support prompts and continue proceeds');
-
-      // Branch: no Python, non-interactive — warn + info, never prompts.
-      seen = stub(null, 'continue');
-      result = await pythonCheck.checkPythonEnvironment({ nonInteractive: true });
-      assert(result.status === 'none' && seen.warn[0].includes('No Python found'), 'non-interactive with no Python warns');
-      assert(seen.select.length === 0 && seen.info.length === 1, 'non-interactive skips the ack prompt and logs continuation');
-
-      // Branch: no Python, interactive, user quits — cancel message + exit 0.
-      seen = stub(null, 'quit');
-      let threw = false;
-      try {
-        await pythonCheck.checkPythonEnvironment();
-      } catch (error) {
-        threw = error.message === '__stub_exit__';
-      }
-      assert(threw && seen.exit.length === 1 && seen.exit[0] === 0, 'quit choice exits 0 (user-cancel convention)');
-      assert(seen.cancel.length === 1, 'quit choice shows the cancel guidance');
-    } finally {
-      pythonCheck.detectPython = real.detectPython;
-      promptsModule.log = real.log;
-      promptsModule.note = real.note;
-      promptsModule.select = real.select;
-      promptsModule.cancel = real.cancel;
-      process.exit = real.exit;
-    }
-  } catch (error) {
-    console.log(`${colors.red}Test Suite 46 setup failed: ${error.message}${colors.reset}`);
-    console.log(error.stack);
-    failed++;
-  }
-
-  console.log('');
-
   // ============================================================
   // Summary
   // ============================================================

tools/installer/core/installer.js

@@ -419,35 +419,10 @@ class Installer {
       const sourceDir = path.dirname(path.join(bmadDir, relativePath));
       if (await fs.pathExists(sourceDir)) {
         await fs.remove(sourceDir);
-        await this._removeEmptyParents(path.dirname(sourceDir), bmadDir);
       }
     }
   }
 
-  /**
-   * Remove now-empty parent directories left behind after skill dir cleanup.
-   * Walks up from dir, stopping at (and never removing) bmadDir. Best-effort:
-   * a directory that vanishes or fills in mid-walk just ends the walk.
-   * @param {string} dir - Directory to start walking up from
-   * @param {string} bmadDir - BMAD installation directory (boundary)
-   */
-  async _removeEmptyParents(dir, bmadDir) {
-    let current = dir;
-    while (true) {
-      // Path-boundary check (not a string prefix, so siblings like _bmad2 don't match).
-      const rel = path.relative(bmadDir, current);
-      if (rel === '' || rel.startsWith('..') || path.isAbsolute(rel)) break;
-      try {
-        const entries = await fs.readdir(current);
-        if (entries.length > 0) break;
-        await fs.rmdir(current);
-      } catch {
-        break;
-      }
-      current = path.dirname(current);
-    }
-  }
-
   async _readSkillManifestRows(bmadDir) {
     const csvPath = path.join(bmadDir, '_config', 'skill-manifest.csv');
     if (!(await fs.pathExists(csvPath))) return [];

tools/installer/core/python-check.js

@@ -1,199 +0,0 @@
-const { spawnSync } = require('node:child_process');
-const prompts = require('../prompts');
-
-// Python 3.11 added stdlib `tomllib` (PEP 680), which the shared scripts in
-// src/scripts/ (resolve_config.py, resolve_customization.py) require to read
-// BMAD's TOML config files. memlog.py is more lenient and runs on 3.8+.
-const PYTHON_FULL_SUPPORT = { major: 3, minor: 11 };
-const PYTHON_PARTIAL_SUPPORT = { major: 3, minor: 8 };
-
-// Every runtime call site (skill steps, on_complete hooks) invokes a literal
-// `python3`, so only that command's version vouches for BMAD features. The
-// fallback probes exist to tell the user "Python is installed, but not under
-// the name BMAD uses" instead of a misleading "No Python found".
-const RUNTIME_COMMAND = 'python3';
-const PROBE_CANDIDATES =
-  process.platform === 'win32'
-    ? [
-        { command: 'python3', args: ['--version'] },
-        { command: 'py', args: ['-3', '--version'] },
-        { command: 'python', args: ['--version'] },
-      ]
-    : [
-        { command: 'python3', args: ['--version'] },
-        { command: 'python', args: ['--version'] },
-      ];
-
-/**
- * Parse a `python --version` output line into version parts.
- * Python 3 prints to stdout; Python 2 printed to stderr — callers pass both.
- * @param {string} output - Combined stdout/stderr from `python --version`
- * @returns {{major: number, minor: number, patch: number, raw: string}|null}
- */
-function parsePythonVersion(output) {
-  if (!output) return null;
-  const match = output.match(/Python\s+(\d+)\.(\d+)(?:\.(\d+))?/);
-  if (!match) return null;
-  return {
-    major: Number(match[1]),
-    minor: Number(match[2]),
-    patch: Number(match[3] || 0),
-    raw: `${match[1]}.${match[2]}.${match[3] || 0}`,
-  };
-}
-
-/**
- * Classify a detected Python version against BMAD's feature requirements.
- * @param {{major: number, minor: number}|null} version
- * @returns {'full'|'partial'|'unsupported'|'none'}
- */
-function classifyPython(version) {
-  if (!version) return 'none';
-  const { major, minor } = version;
-  if (major > PYTHON_FULL_SUPPORT.major || (major === PYTHON_FULL_SUPPORT.major && minor >= PYTHON_FULL_SUPPORT.minor)) {
-    return 'full';
-  }
-  if (major === PYTHON_PARTIAL_SUPPORT.major && minor >= PYTHON_PARTIAL_SUPPORT.minor) {
-    return 'partial';
-  }
-  return 'unsupported';
-}
-
-/**
- * Run one probe candidate and return its parsed version, or null.
- * @param {{command: string, args: string[]}} candidate
- * @returns {{major: number, minor: number, patch: number, raw: string}|null}
- */
-function probeVersion(candidate) {
-  const run = (extra = {}) =>
-    spawnSync(candidate.command, candidate.args, {
-      encoding: 'utf8',
-      timeout: 5000,
-      windowsHide: true,
-      ...extra,
-    });
-  let result = run();
-  // Node >=18.20/20.12 refuses to spawn .bat/.cmd without a shell
-  // (CVE-2024-27980 hardening) and reports EINVAL — pyenv-win ships its
-  // python shims as .bat. Args here are static literals, so a shell retry
-  // is injection-safe.
-  if (result.error && result.error.code === 'EINVAL' && process.platform === 'win32') {
-    result = run({ shell: true });
-  }
-  if (result.error) return null;
-  return parsePythonVersion(`${result.stdout || ''}\n${result.stderr || ''}`);
-}
-
-/**
- * Probe the local environment for a Python interpreter.
- * Tries each candidate command and returns the first that reports a version.
- * `isRuntimeCommand` is true only when the match is `python3` — the command
- * BMAD scripts actually invoke.
- * @returns {{command: string, version: {major: number, minor: number, patch: number, raw: string}, isRuntimeCommand: boolean}|null}
- */
-function detectPython() {
-  for (const candidate of PROBE_CANDIDATES) {
-    try {
-      const version = probeVersion(candidate);
-      if (version) {
-        const display = candidate.args.length > 1 ? `${candidate.command} ${candidate.args.slice(0, -1).join(' ')}` : candidate.command;
-        return { command: display, version, isRuntimeCommand: candidate.command === RUNTIME_COMMAND };
-      }
-    } catch {
-      // Candidate not runnable — try the next one.
-    }
-  }
-  return null;
-}
-
-function upgradeHints() {
-  return [
-    'How to get Python 3.11+ (as `python3`):',
-    '  macOS:        brew install python3',
-    '  Windows:      winget install Python.Python.3.12  (then ensure `python3` resolves, e.g. enable the python3 alias)',
-    '  Linux/WSL:    sudo apt install python3  (Ubuntu 24.04+ ships 3.12; older distros: use pyenv or deadsnakes)',
-    '  Docker:       add python3 to your image (e.g. apk add python3 / apt-get install -y python3)',
-  ].join('\n');
-}
-
-/**
- * Check the local Python environment and warn about degraded BMAD features.
- *
- * Warn-don't-block: most of BMAD works without Python, so the install always
- * may proceed — but the user must explicitly acknowledge the warning so it
- * can't scroll past unseen. In non-interactive runs (--yes, or stdin is not
- * a TTY) the warning is logged and the install continues without a prompt.
- *
- * @param {Object} [options]
- * @param {boolean} [options.nonInteractive=false] - Skip the ack prompt (--yes, or no TTY)
- * @returns {Promise<{status: string, detected: Object|null}>}
- */
-async function checkPythonEnvironment({ nonInteractive = false } = {}) {
-  // Called via module.exports so tests can stub detection.
-  const detected = module.exports.detectPython();
-  const status = classifyPython(detected ? detected.version : null);
-
-  if (status === 'full' && detected.isRuntimeCommand) {
-    await prompts.log.success(`Python ${detected.version.raw} detected (${detected.command}) — all BMAD features supported.`);
-    return { status, detected };
-  }
-
-  if (detected && !detected.isRuntimeCommand) {
-    await prompts.log.warn(
-      `Python ${detected.version.raw} found via \`${detected.command}\`, but BMAD scripts invoke \`python3\`, which is not on PATH.\n` +
-        `Python-powered features (memlog session memory, TOML config resolution) won't run until \`python3\` resolves —\n` +
-        `add a python3 alias/shim, or reinstall Python with the python3 launcher enabled.`,
-    );
-  } else if (status === 'partial') {
-    await prompts.log.warn(
-      `Python ${detected.version.raw} detected (${detected.command}) — BMAD's TOML config tools need Python 3.11+ (stdlib tomllib).\n` +
-        `Works: memlog session memory. Won't work: config/customization resolution scripts.`,
-    );
-  } else {
-    const found =
-      status === 'unsupported' ? `Python ${detected.version.raw} detected (${detected.command}) — too old.` : 'No Python found on PATH.';
-    await prompts.log.warn(
-      `${found} BMAD installs fine without it, but Python-powered features\n` +
-        `(memlog session memory, TOML config resolution) won't run until Python 3.11+ is available.`,
-    );
-  }
-  await prompts.note(upgradeHints(), 'Python 3.11+ recommended');
-
-  if (nonInteractive) {
-    await prompts.log.info('Continuing anyway (non-interactive run). You can fix Python later — no reinstall needed.');
-    return { status, detected };
-  }
-
-  const choice = await prompts.select({
-    message: "BMAD's Python-powered features won't work yet. How do you want to proceed?",
-    choices: [
-      {
-        name: 'Continue install',
-        value: 'continue',
-        hint: 'BMAD works without Python — you can fix Python later, no reinstall needed',
-      },
-      {
-        name: 'Quit and fix Python first',
-        value: 'quit',
-        hint: 'make Python 3.11+ available as python3, then re-run the installer',
-      },
-    ],
-    default: 'continue',
-  });
-
-  if (choice === 'quit') {
-    await prompts.cancel('Make Python 3.11+ available as `python3` (see hints above), then re-run the installer.');
-    process.exit(0);
-  }
-
-  return { status, detected };
-}
-
-module.exports = {
-  checkPythonEnvironment,
-  detectPython,
-  parsePythonVersion,
-  classifyPython,
-  PYTHON_FULL_SUPPORT,
-  PYTHON_PARTIAL_SUPPORT,
-};

tools/installer/ui.js

@@ -161,16 +161,6 @@ class UI {
     const messageLoader = new MessageLoader();
     await messageLoader.displayStartMessage();
 
-    // Probe the local Python before any other prompts: several BMAD features
-    // (memlog session memory, TOML config resolution) need Python 3.11+ at
-    // runtime. Warn-don't-block, but require an explicit ack so the warning
-    // can't scroll past unseen. The installer runs in the destination
-    // environment, so probing PATH here tests the right machine.
-    // Skip the ack when stdin isn't a TTY (CI/Docker/piped): clack's select
-    // on closed stdin resolves to cancel, which would silently exit 0.
-    const { checkPythonEnvironment } = require('./core/python-check');
-    await checkPythonEnvironment({ nonInteractive: !!options.yes || !process.stdin.isTTY });
-
     // Parse channel flags (--channel/--all-*/--next=/--pin) once. Warnings
     // are surfaced immediately so the user sees them before any git ops run.
     const channelOptions = parseChannelOptions(options);