bmad-plus 0.12.2 → 0.13.0

package/tools/cli/commands/install.js

@@ -12,59 +12,18 @@ const fsExtra = require('fs-extra');
 const clack = require('@clack/prompts');
 const pc = require('picocolors');
 const { t, getLanguageOptions, getCommLanguageOptions } = require('../i18n');
-const { PACKS } = require('../lib/packs');
-const { copyPackFiles } = require('../lib/pack-copy');
+const { PACKS, DERIVED } = require('../lib/packs');
+const { copyPackFiles, copyManagedFile } = require('../lib/pack-copy');
+const { acquireProjectLock, inventoryOf, collectManagedFiles } = require('../lib/update-transaction');
 const { initMemory } = require('../lib/memory-init');
-const { generateIDEConfig, IDE_CONFIGS } = require('../lib/ide-config');
+const { generateUserFiles, IDE_CONFIGS } = require('../../build/generate-adapters');
+const { writeIDEConfigs, safeAdapterPath } = require('../lib/installed-adapters');
+const { readInstallManifest } = require('../lib/install-manifest');
+const yaml = require('js-yaml');
 const { validateUserName } = require('../lib/validate');
 const { provisionPack } = require('../lib/python-provision');
 
-// Packs whose runtime includes Python (registry.yaml: runtime includes "python").
-// Provisioned only when the user opts in with --provision-python, so the default
-// install (and the test suite) never spawns Python. Kills SEO "broken on arrival".
-// Paths are resolved relative to the PACKAGE root (projectRoot below), so they
-// must live under a directory shipped in package.json "files". The SEO toolkit
-// is embarked in-pack (src/bmad-plus/packs/pack-seo) precisely so npm consumers
-// receive the scripts + requirements the SKILL.md commands them to run.
-const PYTHON_PACKS = {
-  seo: {
-    requirements: ['src', 'bmad-plus', 'packs', 'pack-seo', 'requirements.txt'],
-    verifyModules: ['requests', 'bs4', 'defusedxml', 'lxml'],
-  },
-  memory: {
-    // NOTE: mcp-server is not in package.json "files" → this still warn-skips for
-    // npm consumers (memory RAG provisioning is a separate, pre-existing gap).
-    requirements: ['mcp-server', 'requirements.txt'],
-    verifyModules: ['chromadb'],
-  },
-};
-
-// Pack definitions are imported from the shared module: require('../lib/packs').PACKS
-
-// ── Root-config ownership markers (PROD-01) ──
-//
-// install writes CLAUDE.md / GEMINI.md / AGENTS.md, but TWO producers own those
-// same paths, each stamping its own marker:
-//   - lib/ide-config.js                 → INSTALLER_MARKER (this installer's template)
-//   - tools/build/generate-adapters.js  → GENERATED_MARKER (registry-generated spine)
-// Recognizing only the first is what let `install --yes` clobber a generated spine.
-const INSTALLER_MARKER = 'BMAD+ — AI Agent Configuration';
-const GENERATOR_MARKER_FALLBACK = 'AUTO-GENERATED by tools/build/generate-adapters.js';
-
-/**
- * The marker the adapter generator stamps on every root file it owns.
- * Read from the generator's own export so the two cannot drift apart — a
- * hand-typed copy is how INSTALLER_MARKER drifted from the spine in the first
- * place. The fallback only covers trees published without the build tooling;
- * tests/unit/install-spine.test.js pins both values to their real producer.
- */
-function resolveGeneratorMarker() {
-  try {
-    return require('../../build/generate-adapters').GENERATED_MARKER || GENERATOR_MARKER_FALLBACK;
-  } catch {
-    return GENERATOR_MARKER_FALLBACK;
-  }
-}
+const PYTHON_PACKS = DERIVED.pythonPacks;
 
 module.exports = {
   command: 'install',
@@ -74,12 +33,34 @@ module.exports = {
     ['-p, --packs <packs>', 'Comma-separated pack IDs: core,osint,all (default: interactive)'],
     ['-y, --yes', 'Accept all defaults, skip prompts'],
     ['-l, --lang <code>', 'Language code: en, fr, es, de, pt-br, ru, zh, he, ja, it (overrides auto-detection)'],
-    ['--tools <tools>', 'Comma-separated IDE IDs (default: auto-detect)'],
+    ['--tools <tools>', 'Comma-separated IDE IDs, all, or none (default: auto-detect)'],
+    ['--mode <mode>', 'Execution mode: manual, autopilot, hybrid (default: manual)'],
     ['--provision-python', 'Provision an isolated Python env for packs that need one (seo, memory)'],
   ],
   action: async (options) => {
+    // A closed/piped stdin cannot answer prompts. Require explicit defaults
+    // before creating files, instead of silently exiting halfway through UI.
+    if (!options.yes && !process.stdin.isTTY) {
+      const i = t(options.lang || 'en');
+      clack.log.error(i.noninteractive_requires_yes('install'));
+      process.exitCode = 1;
+      return;
+    }
+
     const projectDir = path.resolve(options.directory || process.cwd());
     const bmadSrc = path.join(__dirname, '..', '..', '..', 'src', 'bmad-plus');
+    const previousManifestPath = safeAdapterPath(projectDir, '_bmad/.bmad-plus-install.json');
+    const previousManifestBytes = fs.existsSync(previousManifestPath) ? fs.readFileSync(previousManifestPath) : null;
+    let previousManifest = null;
+    let manifestError;
+    if (fs.existsSync(previousManifestPath)) {
+      try {
+        previousManifest = readInstallManifest(previousManifestPath);
+      } catch (error) {
+        manifestError = error;
+      }
+    }
+    if (options.mode && !['manual', 'autopilot', 'hybrid'].includes(options.mode)) throw new Error('Unknown execution mode: ' + options.mode);
 
     // ── Step 0: Language Selection ──
     const pkgJson = require('../../../package.json');
@@ -151,6 +132,8 @@ module.exports = {
     if (options.tools) {
       if (options.tools === 'none' || options.tools === 'skip') {
         detectedIDEs = [];
+      } else if (options.tools === 'all') {
+        detectedIDEs = Object.keys(IDE_CONFIGS);
       } else {
         detectedIDEs = options.tools.split(',').map(t => t.trim()).filter(t => IDE_CONFIGS[t]);
       }
@@ -196,6 +179,7 @@ module.exports = {
     // ── Step 3: User Config ──
     let userName = process.env.USER || process.env.USERNAME || 'Developer';
     let commLang = 'French';
+    let execMode = options.mode || 'manual';
 
     if (!options.yes) {
       const userConfig = await clack.group({
@@ -230,6 +214,37 @@ module.exports = {
       for (const w of warnings) clack.log.warn(w);
       userName = validatedName;
       commLang = userConfig.commLang;
+      execMode = options.mode || userConfig.execMode;
+    }
+
+    const releaseLock = acquireProjectLock(projectDir);
+    try {
+    const { safeTarget } = require('../../build/generate-adapters');
+    const plannedFiles = collectManagedFiles({ projectDir, packs: selectedPacks });
+    if (detectedIDEs.length) plannedFiles.push(...generateUserFiles(DERIVED, {
+      packs: selectedPacks, tools: detectedIDEs, userName, language: commLang,
+    }));
+    for (const { file } of plannedFiles) safeTarget(projectDir, file);
+    safeTarget(projectDir, '_bmad/config.yaml');
+    safeTarget(projectDir, '_bmad/.bmad-plus-install.json');
+    for (const directory of ['.agents/skills', '.agents/data', '_bmad', '_bmad-output/discovery', '_bmad-output/build', 'docs']) {
+      safeTarget(projectDir, directory + '/.bmad-preflight');
+    }
+    const currentManifestBytes = fs.existsSync(previousManifestPath) ? fs.readFileSync(previousManifestPath) : null;
+    if (previousManifestBytes === null ? currentManifestBytes !== null :
+      currentManifestBytes === null || !previousManifestBytes.equals(currentManifestBytes)) {
+      throw new Error('Installation changed while preparing install. Please retry.');
+    }
+    // Preserve the unreadable manifest before repair; do not trust its ownership
+    // hashes. The adapter writer will retain locally edited user instructions.
+    if (manifestError) {
+      const backupBase = '_bmad/.bmad-plus-install.json.corrupt.bak';
+      let backupFile = backupBase;
+      let index = 1;
+      while (fs.existsSync(safeAdapterPath(projectDir, backupFile))) backupFile = `${backupBase}.${index++}`;
+      const backupPath = safeAdapterPath(projectDir, backupFile);
+      fs.copyFileSync(safeAdapterPath(projectDir, '_bmad/.bmad-plus-install.json'), backupPath, fs.constants.COPYFILE_EXCL);
+      clack.log.warn(`${i.manifest_invalid(manifestError.message)}\nBackup: ${backupPath}`);
     }
 
     // ── Step 4: Install Files ──
@@ -248,6 +263,13 @@ module.exports = {
     let copiedAgents = 0;
     let copiedSkills = 0;
     let copiedFiles = 0;
+    const previousInventory = inventoryOf(previousManifest || {}) || {};
+    const fileInventory = { ...previousInventory };
+    let inventoryComplete = true;
+    const onFileConflict = file => {
+      if (!previousInventory[file]) inventoryComplete = false;
+      clack.log.warn(`${file}: locally changed or unowned content preserved.`);
+    };
 
     const projectRoot = path.join(bmadSrc, '..', '..');
 
@@ -261,6 +283,7 @@ module.exports = {
         targetDataDir,
         projectRoot,
         pack,
+        projectDir, inventory: fileInventory, previousInventory, onConflict: onFileConflict,
       });
       copiedAgents += result.copiedAgents;
       copiedSkills += result.copiedSkills;
@@ -311,35 +334,39 @@ module.exports = {
     // Copy module config
     const moduleYaml = path.join(bmadSrc, 'module.yaml');
     if (fs.existsSync(moduleYaml)) {
-      fsExtra.copySync(moduleYaml, path.join(targetBmadDir, 'module.yaml'));
+      copyManagedFile({ source: moduleYaml, target: path.join(targetBmadDir, 'module.yaml'),
+        projectDir, inventory: fileInventory, previousInventory, onConflict: onFileConflict });
       copiedFiles++;
     }
 
     const helpCsv = path.join(bmadSrc, 'module-help.csv');
     if (fs.existsSync(helpCsv)) {
-      fsExtra.copySync(helpCsv, path.join(targetBmadDir, 'module-help.csv'));
+      copyManagedFile({ source: helpCsv, target: path.join(targetBmadDir, 'module-help.csv'),
+        projectDir, inventory: fileInventory, previousInventory, onConflict: onFileConflict });
       copiedFiles++;
     }
 
     spinner.stop(i.installed_summary(copiedAgents, copiedSkills, copiedFiles));
 
     // ── Step 5: Generate IDE Configs ──
+    let adapterHashes = previousManifest?.adapterHashes || {};
     if (detectedIDEs.length > 0) {
       const ideSpinner = clack.spinner();
       ideSpinner.start(i.configuring_ides);
 
-      writeIDEConfigs({
+      const outcome = writeIDEConfigs({
         projectDir,
-        detectedIDEs,
-        configContent: generateIDEConfig(userName, commLang, selectedPacks),
+        files: generateUserFiles(DERIVED, { packs: selectedPacks, userName, language: commLang, tools: detectedIDEs }),
+        adapterHashes,
         yes: options.yes,
       });
+      adapterHashes = { ...adapterHashes, ...outcome.adapterHashes };
 
       ideSpinner.stop(i.ide_configured(detectedIDEs.length));
     }
 
     // ── Step 6: Create config.yaml ──
-    const configYaml = generateConfigYaml(userName, commLang, projectDir);
+    const configYaml = generateConfigYaml(userName, commLang, projectDir, execMode);
     const configPath = path.join(targetBmadDir, 'config.yaml');
     fs.writeFileSync(configPath, configYaml, 'utf8');
 
@@ -357,6 +384,9 @@ module.exports = {
       installed: new Date().toISOString(),
       packs: selectedPacks,
       ides: detectedIDEs,
+      adapterHashes,
+      fileInventory: { schemaVersion: 1, complete: inventoryComplete, files: fileInventory },
+      executionMode: execMode,
       user: userName,
       language: commLang,
     };
@@ -484,115 +514,30 @@ module.exports = {
     clack.note(agentGuide.join('\n'), i.guide_title);
 
     clack.outro(pc.green(i.guide_ready));
+    } finally {
+      releaseLock();
+    }
   },
   // Exported for functional testing (not part of the public API)
-  _internal: {
-    INSTALLER_MARKER,
-    GENERATOR_MARKER_FALLBACK,
-    resolveGeneratorMarker,
-    writeIDEConfigs,
-  },
+  _internal: { writeIDEConfigs, generateConfigYaml },
 };
 
-
-// ── Helpers ──
-
-/**
- * Write the IDE config files, never destroying one this installer does not own.
- *
- * An existing config falls into one of three classes, tested in this order:
- *
- *  1. GENERATOR-MANAGED (carries the adapter generator's marker) — SKIPPED, even
- *     under --yes. Such a file is a pure function of registry.yaml +
- *     tools/build/adapters.config.js, and the installer template is a strict
- *     subset of it (no registry facts), so overwriting is a downgrade that also
- *     breaks the `generate-adapters.js --check` drift gate. A .bak does not
- *     rescue it: every tool reads the live path, not the backup. The repair is
- *     regeneration, not merging — so install defers and points at the generator.
- *  2. HAND-AUTHORED (no BMAD+ marker) — kept as-is interactively; backed up then
- *     overwritten under --yes (NODE-02).
- *  3. INSTALLER-GENERATED (carries INSTALLER_MARKER) — refreshed in place.
- *
- * @param {object} args
- * @param {string} args.projectDir - Absolute path to the target project
- * @param {string[]} args.detectedIDEs - IDE ids to configure (keys of IDE_CONFIGS)
- * @param {string} args.configContent - Rendered config body to write
- * @param {boolean} [args.yes] - Non-interactive mode (--yes)
- * @returns {{written: string[], skipped: string[], backedUp: string[]}} config file names per outcome
- */
-function writeIDEConfigs({ projectDir, detectedIDEs, configContent, yes }) {
-  const generatorMarker = resolveGeneratorMarker();
-  // Several IDEs share one file (gemini-cli + antigravity → GEMINI.md): dedupe
-  // outcomes by file name so a shared file is reported — and warned about — once.
-  const outcome = { written: new Set(), skipped: new Set(), backedUp: new Set() };
-
-  for (const ideId of detectedIDEs) {
-    const ide = IDE_CONFIGS[ideId];
-    if (!ide) continue;
-
-    const configPath = path.join(projectDir, ide.configFile);
-
-    if (fs.existsSync(configPath)) {
-      const existing = fs.readFileSync(configPath, 'utf8');
-
-      // PROD-01: the adapter generator owns this file — defer to it.
-      if (existing.includes(generatorMarker)) {
-        if (!outcome.skipped.has(ide.configFile)) {
-          clack.log.warn(
-            `⚠️  ${ide.configFile} is generated by tools/build/generate-adapters.js — left untouched. ` +
-              `Run \`node tools/build/generate-adapters.js --adopt\` to refresh it from registry.yaml.`
-          );
-        }
-        outcome.skipped.add(ide.configFile);
-        continue;
-      }
-
-      // NODE-02: never clobber a hand-authored config without protecting it.
-      if (!existing.includes(INSTALLER_MARKER)) {
-        if (!yes) {
-          // Interactive: keep the user's file untouched.
-          if (!outcome.skipped.has(ide.configFile)) {
-            clack.log.warn(`⚠️  ${ide.configFile} already exists and was not created by BMAD+ — kept your file (skipped). Re-run with --yes to back it up and overwrite.`);
-          }
-          outcome.skipped.add(ide.configFile);
-          continue;
-        }
-        // Non-interactive: back up before overwriting, never destroy data.
-        if (!outcome.backedUp.has(ide.configFile)) {
-          let backupPath = `${configPath}.bak`;
-          if (fs.existsSync(backupPath)) backupPath = `${configPath}.${Date.now()}.bak`;
-          fs.copyFileSync(configPath, backupPath);
-          clack.log.warn(`⚠️  Backed up existing ${ide.configFile} → ${path.basename(backupPath)}`);
-          outcome.backedUp.add(ide.configFile);
-        }
-      }
-    }
-
-    fs.writeFileSync(configPath, configContent, 'utf8');
-    outcome.written.add(ide.configFile);
-  }
-
-  return {
-    written: [...outcome.written],
-    skipped: [...outcome.skipped],
-    backedUp: [...outcome.backedUp],
-  };
-}
-
-function generateConfigYaml(userName, language, projectDir) {
-  const projectName = path.basename(projectDir);
-  return `# BMAD+ Project Configuration
-# Generated by bmad-plus install
-
-user_name: "${userName}"
-communication_language: "${language}"
-document_output_language: "${language}"
-output_folder: "_bmad-output"
-project_name: "${projectName}"
-
-# Execution settings
-execution_mode: "manual"
-auto_role_activation: true
-parallel_execution: true
-`;
+function generateConfigYaml(userName, language, projectDir, execMode = 'manual') {
+  if (!['manual', 'autopilot', 'hybrid'].includes(execMode)) throw new Error('Unknown execution mode: ' + execMode);
+  return '# BMAD+ Project Configuration\n# Generated by bmad-plus install\n\n' + yaml.dump({
+    user_name: userName,
+    communication_language: language,
+    document_output_language: language,
+    output_folder: '_bmad-output',
+    project_name: path.basename(projectDir),
+    execution_mode: execMode,
+    auto_role_activation: true,
+    parallel_execution: true,
+    checkpoints: {
+      discovery: 'require_approval',
+      architecture: 'require_approval',
+      story: execMode === 'autopilot' ? 'notify_only' : 'require_approval',
+      delivery: 'require_approval',
+    },
+  }, { lineWidth: -1, forceQuotes: true, quotingType: '"' });
 }

package/tools/cli/commands/uninstall.js

@@ -1,101 +1,209 @@
 /**
  * BMAD+ Uninstall Command
- * Removes BMAD+ agents, skills, and configs from the current project
- * Internationalized — uses i18n system
- *
+ * Removes identifiable BMAD+ files while preserving project memory and edits.
  * Author: Laurent Rochetta
  */
 
 const path = require('node:path');
 const fs = require('node:fs');
-const fsExtra = require('fs-extra');
 const clack = require('@clack/prompts');
 const pc = require('picocolors');
 const { t } = require('../i18n');
+const { PACKS, DERIVED } = require('../lib/packs');
+const { readInstallManifest } = require('../lib/install-manifest');
+const { generateUserFiles, USER_CONFIG_MARKER } = require('../../build/generate-adapters');
+const { contentHash } = require('../lib/installed-adapters');
+
+// Never follow a junction/symlink in a path used for deletion, including parents.
+function safeStat(projectDir, target) {
+  const relative = path.relative(projectDir, target);
+  if (!relative || relative === '..' || relative.startsWith('..' + path.sep) || path.isAbsolute(relative)) {
+    throw new Error('Path outside the project: ' + target);
+  }
+  let current = projectDir;
+  let stat;
+  for (const part of relative.split(path.sep)) {
+    current = path.join(current, part);
+    try {
+      stat = fs.lstatSync(current);
+    } catch (err) {
+      if (err.code === 'ENOENT') return undefined;
+      throw err;
+    }
+    if (stat.isSymbolicLink()) {
+      const error = new Error('Symbolic link or junction: ' + current);
+      error.code = 'BMAD_UNSAFE_LINK';
+      throw error;
+    }
+  }
+  return stat;
+}
+
+function removalPlan(projectDir, manifest, manifestPath) {
+  const packageRoot = path.join(__dirname, '..', '..', '..');
+  const sourceRoot = path.join(packageRoot, 'src', 'bmad-plus');
+  const files = new Map();
+  const directories = new Set();
+  const targetPath = (...parts) => path.join(projectDir, ...parts);
+
+  // Old manifests contain pack IDs, not file hashes. Match shipped files byte for
+  // byte; anything unknown or modified stays, including files inside a pack.
+  function matchSource(source, target) {
+    const targetStat = safeStat(projectDir, target);
+    if (!targetStat || !fs.existsSync(source)) return;
+    const sourceStat = fs.lstatSync(source);
+    if (sourceStat.isDirectory() && targetStat.isDirectory()) {
+      directories.add(target);
+      for (const name of fs.readdirSync(source)) matchSource(path.join(source, name), path.join(target, name));
+    } else if (sourceStat.isFile() && targetStat.isFile()) {
+      const expected = fs.readFileSync(source);
+      if (fs.readFileSync(target).equals(expected)) files.set(target, expected);
+    }
+  }
+
+  for (const relative of ['.agents', '.agents/skills', '.agents/data', '_bmad', '_bmad-output']) {
+    const target = targetPath(relative);
+    if (safeStat(projectDir, target)?.isDirectory()) directories.add(target);
+  }
+
+  for (const packId of manifest.packs) {
+    if (!Object.hasOwn(PACKS, packId)) throw new Error('Unknown installed pack: ' + packId);
+    const pack = PACKS[packId];
+    for (const name of pack.agents || []) matchSource(path.join(sourceRoot, 'agents', name), targetPath('.agents', 'skills', name));
+    for (const name of pack.skills || []) matchSource(path.join(sourceRoot, 'skills', name), targetPath('.agents', 'skills', name));
+    for (const name of pack.data || []) matchSource(path.join(sourceRoot, 'data', name), targetPath('.agents', 'data', name));
+    if (pack.packDir) matchSource(path.join(sourceRoot, pack.packSrcDir || 'agents', pack.packDir), targetPath('.agents', 'skills', pack.packDir));
+    if (pack.externalPackage) matchSource(path.join(packageRoot, pack.externalPackage, 'skills'), targetPath('.agents', 'skills'));
+  }
+  for (const name of ['module.yaml', 'module-help.csv']) matchSource(path.join(sourceRoot, name), targetPath('_bmad', name));
+  const renderOptions = {
+    packs: manifest.packs,
+    userName: typeof manifest.user === 'string' ? manifest.user : 'Developer',
+    language: typeof manifest.language === 'string' ? manifest.language : 'English',
+  };
+  const expectedFiles = new Map(generateUserFiles(DERIVED, renderOptions).map(entry => [entry.file, entry.content]));
+  const hashes = manifest.adapterHashes && typeof manifest.adapterHashes === 'object' && !Array.isArray(manifest.adapterHashes)
+    ? manifest.adapterHashes : {};
+  // Only registry-declared paths can become deletion candidates, even when the
+  // manifest contains arbitrary hash keys. Keep previously owned tool targets.
+  const claimed = new Set(Object.keys(hashes).filter(file => expectedFiles.has(file)));
+  if (Array.isArray(manifest.ides)) {
+    const tools = manifest.ides.filter(id => DERIVED.targets.adapters.some(adapter => adapter.tool === id));
+    if (tools.length) {
+      for (const entry of generateUserFiles(DERIVED, { ...renderOptions, tools })) {
+        claimed.add(entry.file);
+        expectedFiles.set(entry.file, entry.content);
+      }
+    }
+  }
+  const legacyFallback = !Array.isArray(manifest.ides) && Object.keys(hashes).length === 0;
+  for (const [file, rendered] of expectedFiles) {
+    if (!legacyFallback && !claimed.has(file)) continue;
+    const target = targetPath(file);
+    let stat;
+    try {
+      stat = safeStat(projectDir, target);
+    } catch (error) {
+      // A link with no ownership evidence is user content, not an uninstall target.
+      if (legacyFallback && error.code === 'BMAD_UNSAFE_LINK') continue;
+      throw error;
+    }
+    if (stat?.isFile()) {
+      const content = fs.readFileSync(target);
+      const text = content.toString('utf8');
+      const expectedHash = hashes[file];
+      const matches = expectedHash ? contentHash(text) === expectedHash : text === rendered;
+      if (text.includes(USER_CONFIG_MARKER) && matches) {
+        files.set(target, content);
+        let parent = path.dirname(target);
+        while (parent !== projectDir) {
+          directories.add(parent);
+          parent = path.dirname(parent);
+        }
+      }
+    }
+  }
+  // Keep config.yaml: it contains the user's settings and has no ownership hash.
+  files.set(manifestPath, fs.readFileSync(manifestPath));
+  return { files, directories };
+}
 
 module.exports = {
   command: 'uninstall',
   description: 'Remove BMAD+ from your project',
   options: [
+    ['-y, --yes', 'Confirm removal without prompting'],
     ['-l, --lang <code>', 'Language code: en, fr, es, de, pt-br, ru, zh, he, ja, it'],
   ],
   action: async (options) => {
-    const projectDir = process.cwd();
-
+    const projectDir = fs.realpathSync(process.cwd());
+    let i = t(options.lang || 'en');
     clack.intro(pc.bgRed(pc.white(' BMAD+ Uninstaller ')));
 
-    // Check if installed
     const manifestPath = path.join(projectDir, '_bmad', '.bmad-plus-install.json');
-    if (!fs.existsSync(manifestPath)) {
-      clack.log.warn('BMAD+ is not installed in this directory.');
-      clack.outro('Nothing to remove.');
+    let manifest;
+    try {
+      if (!safeStat(projectDir, manifestPath)) {
+        clack.log.warn(i.uninstall_not_installed);
+        return;
+      }
+      manifest = readInstallManifest(manifestPath);
+    } catch (err) {
+      clack.log.error(i.manifest_invalid(err.message));
+      clack.outro(pc.red(i.manifest_repair));
+      process.exitCode = 1;
       return;
     }
-
-    const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-
-    // Use --lang flag, or fall back to manifest language
-    let lang = options.lang || manifest.uiLanguage || 'en';
-    const i = t(lang);
-
-    clack.log.info(`BMAD+ v${manifest.version} (${i.installed_on || 'installed'} ${manifest.installed.split('T')[0]})`);
-    clack.log.info(`${i.selected_packs}: ${(manifest.packs || ['core']).join(', ')}`);
-
-    const confirm = await clack.confirm({
-      message: i.uninstall_confirm || 'Remove BMAD+ from this project?',
-    });
-
-    if (!confirm || clack.isCancel(confirm)) {
-      clack.cancel(i.cancelled);
+    i = t(options.lang || manifest.uiLanguage || 'en');
+    if (!options.yes && !process.stdin.isTTY) {
+      clack.log.error(i.noninteractive_requires_yes('uninstall'));
+      process.exitCode = 1;
       return;
     }
 
-    const spinner = clack.spinner();
-    spinner.start(i.uninstall_removing || 'Removing...');
-
-    let removed = 0;
-
-    // Remove .agents/skills/ (BMAD+ agents & skills)
-    const agentsDir = path.join(projectDir, '.agents');
-    if (fs.existsSync(agentsDir)) {
-      fsExtra.removeSync(agentsDir);
-      removed++;
-    }
-
-    // Remove _bmad/ config
-    const bmadDir = path.join(projectDir, '_bmad');
-    if (fs.existsSync(bmadDir)) {
-      fsExtra.removeSync(bmadDir);
-      removed++;
+    let plan;
+    try {
+      plan = removalPlan(projectDir, manifest, manifestPath);
+    } catch (err) {
+      clack.log.error(i.uninstall_aborted(err.message));
+      process.exitCode = 1;
+      return;
     }
-
-    // Remove _bmad-output/ (only if empty)
-    const outputDir = path.join(projectDir, '_bmad-output');
-    if (fs.existsSync(outputDir)) {
-      const contents = fs.readdirSync(outputDir, { recursive: true }).filter(f => !f.startsWith('.'));
-      if (contents.length === 0) {
-        fsExtra.removeSync(outputDir);
-        removed++;
-      } else {
-        clack.log.info(i.uninstall_output_kept || '📁 _bmad-output/ kept (contains files)');
+    clack.log.info('BMAD+ v' + manifest.version + ' (' + i.installed_on + ' ' + manifest.installed.split('T')[0] + ')');
+    clack.log.info(i.selected_packs + ': ' + manifest.packs.join(', '));
+    if (!options.yes) {
+      const confirm = await clack.confirm({ message: i.uninstall_confirm });
+      if (!confirm || clack.isCancel(confirm)) {
+        clack.cancel(i.cancelled);
+        return;
       }
     }
 
-    // Remove IDE configs (only BMAD+-generated ones)
-    for (const configFile of ['CLAUDE.md', 'GEMINI.md', 'AGENTS.md', 'OPENCODE.md']) {
-      const p = path.join(projectDir, configFile);
-      if (fs.existsSync(p)) {
-        const content = fs.readFileSync(p, 'utf8');
-        // NODE-05: only remove a config BMAD+ actually generated (it carries the
-        // marker below). A hand-authored file that merely mentions "BMAD+" is kept.
-        if (content.includes('BMAD+ — AI Agent Configuration')) {
-          fs.unlinkSync(p);
+    const spinner = clack.spinner();
+    spinner.start(i.uninstall_removing);
+    let removed = 0;
+    try {
+      // Revalidate after the prompt, before deleting any file.
+      for (const target of [...plan.files.keys(), ...plan.directories]) safeStat(projectDir, target);
+      for (const [target, expected] of plan.files) {
+        if (safeStat(projectDir, target)?.isFile() && fs.readFileSync(target).equals(expected)) {
+          fs.unlinkSync(target);
           removed++;
         }
       }
+      // No recursive deletion: hidden files, nested user content, and memory stay.
+      for (const target of [...plan.directories].sort((a, b) => b.length - a.length)) {
+        if (safeStat(projectDir, target)?.isDirectory() && fs.readdirSync(target).length === 0) {
+          fs.rmdirSync(target);
+          removed++;
+        }
+      }
+    } catch (err) {
+      spinner.stop(i.uninstall_aborted(err.message));
+      process.exitCode = 1;
+      return;
     }
-
-    spinner.stop(i.uninstall_done ? i.uninstall_done(removed) : `✅ BMAD+ removed (${removed} items)`);
-    clack.outro(pc.green(i.guide_ready ? '👋 Done!' : 'Done!'));
+    spinner.stop(i.uninstall_done(removed));
+    clack.outro(i.uninstall_preserved);
   },
 };