diff --git a/docs/how-to/install-bmad.md b/docs/how-to/install-bmad.md
index 3789c6fa9..2bdb84c03 100644
--- a/docs/how-to/install-bmad.md
+++ b/docs/how-to/install-bmad.md
@@ -89,7 +89,10 @@ your-project/
 │       ├── bmad-help/
 │       ├── bmad-persona/
 │       └── ...
-└── .cursor/            # Cursor skills (if using Cursor)
+├── .cursor/            # Cursor skills (if using Cursor)
+│   └── skills/
+│       └── ...
+└── .vibe/              # Mistral Vibe skills (if using Mistral Vibe)
     └── skills/
         └── ...
 ```
diff --git a/docs/how-to/non-interactive-installation.md b/docs/how-to/non-interactive-installation.md
index 62b3090d8..b0b124308 100644
--- a/docs/how-to/non-interactive-installation.md
+++ b/docs/how-to/non-interactive-installation.md
@@ -61,6 +61,8 @@ Available tool IDs for the `--tools` flag:
 
 **Preferred:** `claude-code`, `cursor`
 
+**Other CLIs:** `mistral`, `gemini`, `codex`, `auggie`, `pi`
+
 Run `npx bmad-method install` interactively once to see the full current list of supported tools, or check the [platform codes configuration](https://github.com/bmad-code-org/BMAD-METHOD/blob/main/tools/cli/installers/lib/ide/platform-codes.yaml).
 
 ## Installation Modes
diff --git a/test/test-installation-components.js b/test/test-installation-components.js
index c5b04a1ee..114a4d7fa 100644
--- a/test/test-installation-components.js
+++ b/test/test-installation-components.js
@@ -1511,7 +1511,7 @@ async function runTests() {
   // ============================================================
   // Suite 29: Unified Skill Scanner — collectSkills
   // ============================================================
-  console.log(`${colors.yellow}Test Suite 29: Unified Skill Scanner${colors.reset}\n`);
+  console.log(`${colors.yellow}Test Suite 30: Unified Skill Scanner${colors.reset}\n`);
 
   let tempFixture29;
   try {
@@ -1658,7 +1658,7 @@ async function runTests() {
   // ============================================================
   // Suite 30: parseSkillMd validation (negative cases)
   // ============================================================
-  console.log(`${colors.yellow}Test Suite 30: parseSkillMd Validation${colors.reset}\n`);
+  console.log(`${colors.yellow}Test Suite 31: parseSkillMd Validation${colors.reset}\n`);
 
   let tempFixture30;
   try {
@@ -1760,6 +1760,99 @@ async function runTests() {
 
   console.log('');
 
+  // ============================================================
+  // Suite 31: Mistral Vibe CLI Native Skills
+  // ============================================================
+  console.log(`${colors.yellow}Test Suite 31: Mistral Vibe CLI Native Skills${colors.reset}\n`);
+
+  let tempProjectDirMistral;
+  let installedBmadDirMistral;
+  try {
+    clearCache();
+    const platformCodesMistral = await loadPlatformCodes();
+    const mistralInstaller = platformCodesMistral.platforms.mistral?.installer;
+
+    assert(mistralInstaller?.target_dir === '.vibe/skills', 'Mistral Vibe target_dir uses native skills path');
+    assert(mistralInstaller?.skill_format === true, 'Mistral Vibe installer enables native skill output');
+    assert(mistralInstaller?.template_type === 'default', 'Mistral Vibe installer uses default skill template');
+    assert(mistralInstaller?.legacy_targets === undefined, 'Mistral Vibe installer has no legacy_targets');
+
+    tempProjectDirMistral = await fs.mkdtemp(path.join(os.tmpdir(), 'bmad-mistral-test-'));
+    installedBmadDirMistral = await createTestBmadFixture();
+
+    const ideManagerMistral = new IdeManager();
+    await ideManagerMistral.ensureInitialized();
+
+    // Verify Mistral Vibe is selectable in an available IDEs list
+    const availableIdesMistral = ideManagerMistral.getAvailableIdes();
+    assert(
+      availableIdesMistral.some((ide) => ide.value === 'mistral'),
+      'Mistral Vibe appears in available IDEs list',
+    );
+
+    // Verify Mistral Vibe is NOT detected before install
+    const detectedBeforeMistral = await ideManagerMistral.detectInstalledIdes(tempProjectDirMistral);
+    assert(!detectedBeforeMistral.includes('mistral'), 'Mistral Vibe is not detected before install');
+
+    const resultMistral = await ideManagerMistral.setup('mistral', tempProjectDirMistral, installedBmadDirMistral, {
+      silent: true,
+      selectedModules: ['bmm'],
+    });
+
+    assert(resultMistral.success === true, 'Mistral Vibe setup succeeds against temp project');
+
+    // Verify Mistral Vibe IS detected after install
+    const detectedAfterMistral = await ideManagerMistral.detectInstalledIdes(tempProjectDirMistral);
+    assert(detectedAfterMistral.includes('mistral'), 'Mistral Vibe is detected after install');
+
+    const skillFileMistral = path.join(tempProjectDirMistral, '.vibe', 'skills', 'bmad-master', 'SKILL.md');
+    assert(await fs.pathExists(skillFileMistral), 'Mistral Vibe install writes SKILL.md directory output');
+
+    // Parse YAML frontmatter between --- markers
+    const skillContentMistral = await fs.readFile(skillFileMistral, 'utf8');
+    const fmMatchMistral = skillContentMistral.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
+    assert(fmMatchMistral, 'Mistral Vibe SKILL.md contains valid frontmatter delimiters');
+
+    const frontmatterMistral = fmMatchMistral[1];
+    const bodyMistral = fmMatchMistral[2];
+
+    // Verify the name in the frontmatter matches the directory name
+    const fmNameMistral = frontmatterMistral.match(/^name:\s*(.+)$/m);
+    assert(
+      fmNameMistral && fmNameMistral[1].trim() === 'bmad-master',
+      'Mistral Vibe skill name frontmatter matches directory name exactly',
+    );
+
+    // Verify description exists and is non-empty
+    const fmDescMistral = frontmatterMistral.match(/^description:\s*(.+)$/m);
+    assert(fmDescMistral && fmDescMistral[1].trim().length > 0, 'Mistral Vibe skill description frontmatter is present and non-empty');
+
+    // Verify frontmatter contains only name and description keys
+    const fmKeysMistral = [...frontmatterMistral.matchAll(/^([a-zA-Z0-9_-]+):/gm)].map((m) => m[1]);
+    assert(
+      fmKeysMistral.length === 2 && fmKeysMistral.includes('name') && fmKeysMistral.includes('description'),
+      'Mistral Vibe skill frontmatter contains only name and description keys',
+    );
+
+    // Verify body content is non-empty
+    assert(bodyMistral.trim().length > 0, 'Mistral Vibe skill body content is non-empty');
+
+    // Reinstall/upgrade: run setup again over existing output
+    const resultMistralb = await ideManagerMistral.setup('mistral', tempProjectDirMistral, installedBmadDirMistral, {
+      silent: true,
+      selectedModules: ['bmm'],
+    });
+    assert(resultMistralb.success === true, 'Mistral Vibe reinstall/upgrade succeeds over existing skills');
+    assert(await fs.pathExists(skillFileMistral), 'Mistral Vibe reinstall preserves SKILL.md output');
+  } catch (error) {
+    assert(false, 'Mistral Vibe native skills test succeeds', error.message);
+  } finally {
+    if (tempProjectDirMistral) await fs.remove(tempProjectDirMistral).catch(() => {});
+    if (installedBmadDirMistral) await fs.remove(installedBmadDirMistral).catch(() => {});
+  }
+
+  console.log('');
+
   // ============================================================
   // Suite 32: Ona Native Skills
   // ============================================================
diff --git a/tools/cli/installers/lib/ide/platform-codes.yaml b/tools/cli/installers/lib/ide/platform-codes.yaml
index 2c4d2e920..2871c526f 100644
--- a/tools/cli/installers/lib/ide/platform-codes.yaml
+++ b/tools/cli/installers/lib/ide/platform-codes.yaml
@@ -176,6 +176,16 @@ platforms:
       template_type: kiro
       skill_format: true
 
+  mistral:
+    name: "Mistral Vibe"
+    preferred: false
+    category: cli
+    description: "Mistral's AI coding CLI"
+    installer:
+      target_dir: .vibe/skills
+      template_type: default
+      skill_format: true
+
   ona:
     name: "Ona"
     preferred: false