agentvibes 5.1.4 → 5.2.1

package/src/installer.js

@@ -3771,18 +3771,31 @@ async function copyConfigFiles(targetDir, spinner) {
       const stat = await fs.stat(srcPath);
 
       if (stat.isFile()) {
-        // Don't overwrite existing config files (except audio-effects.cfg which is required)
-        try {
-          await fs.access(destPath);
-          if (file !== 'audio-effects.cfg') {
-            continue; // Skip if file exists and it's not audio-effects.cfg
+        // For .sample files: copy as the real config name if it doesn't exist yet
+        // e.g. audio-effects.cfg.sample → audio-effects.cfg (only if absent)
+        let finalDest = destPath;
+        let finalName = file;
+        if (file.endsWith('.sample')) {
+          finalName = file.replace(/\.sample$/, '');
+          finalDest = path.join(destConfigDir, finalName);
+          try {
+            await fs.access(finalDest);
+            continue; // Real config already exists, don't overwrite
+          } catch {
+            // Real config doesn't exist, install from sample
+          }
+        } else {
+          // Non-sample files: skip if already exists
+          try {
+            await fs.access(destPath);
+            continue;
+          } catch {
+            // File doesn't exist, proceed with copy
           }
-        } catch {
-          // File doesn't exist, proceed with copy
         }
 
-        await fs.copyFile(srcPath, destPath);
-        copiedFiles.push(file);
+        await fs.copyFile(srcPath, finalDest);
+        copiedFiles.push(finalName);
       }
     }
 
@@ -4297,239 +4310,92 @@ function isPathSafe(targetPath, basePath) {
 async function handleMcpConfiguration(targetDir, options) {
   const mcpConfigPath = path.join(targetDir, '.mcp.json');
 
-  // MCP server configuration for AgentVibes.
+  // .mcp.json registers the AgentVibes MCP server for Claude Code, enabling
+  // natural language control (text_to_speech, get_config, set_voice, etc.).
   //
-  // No `env.AGENTVIBES_LLM` block: GitHub Copilot CLI also reads project
-  // `.mcp.json` with precedence over its own `~/.copilot/mcp-config.json`,
-  // so setting `claude-code` here would mis-route Copilot CLI too.
-  // Instead, the MCP server auto-detects Claude Code via the `CLAUDECODE=1`
-  // env var that Claude Code sets on every subprocess it spawns.
+  // AGENTVIBES_MCP_FALLBACK=copilot is the identity for non-Claude-Code tools
+  // that read .mcp.json (primarily VS Code Copilot, which reads .mcp.json
+  // with precedence over its own .vscode/mcp.json).  Claude Code is
+  // auto-detected via CLAUDECODE=1 which takes priority over the fallback.
   const mcpConfig = {
     mcpServers: {
       agentvibes: {
         command: 'npx',
-        args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server']
+        args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server'],
+        env: { AGENTVIBES_MCP_FALLBACK: 'copilot' }
       }
     }
   };
 
-  // Check if .mcp.json already exists
   let mcpExists = false;
   try {
     await fs.access(mcpConfigPath);
     mcpExists = true;
-  } catch {
-    // File doesn't exist
-  }
+  } catch { /* doesn't exist */ }
 
   if (mcpExists) {
-    // Existing config: upgrade it in-place.  Two jobs:
-    //   1. Ensure the agentvibes server entry exists.
-    //   2. STRIP any stale `env.AGENTVIBES_LLM` from earlier versions
-    //      (v5.1.2..v5.1.4) — setting it in `.mcp.json` broke Copilot CLI
-    //      routing because Copilot CLI also reads `.mcp.json` and would
-    //      adopt claude-code's env.  Claude Code is now auto-detected
-    //      downstream via the CLAUDECODE=1 env var.
-    let migrated = false;
-    let migrationError = null;
+    // Upgrade: ensure agentvibes entry exists with fallback env
+    let parseFailed = false;
     try {
-      const existingRaw = await fs.readFile(mcpConfigPath, 'utf8');
-      const existingCfg = JSON.parse(existingRaw);
-      if (existingCfg && typeof existingCfg === 'object') {
-        if (!existingCfg.mcpServers || typeof existingCfg.mcpServers !== 'object') {
-          existingCfg.mcpServers = {};
-        }
-        const current = existingCfg.mcpServers.agentvibes;
-        const hasStaleEnv = current?.env?.AGENTVIBES_LLM !== undefined;
-        const needsWrite = !current || hasStaleEnv;
-        if (needsWrite) {
-          // Preserve any OTHER env keys the user added manually (rare) but
-          // drop AGENTVIBES_LLM so Copilot CLI doesn't mis-route.
-          const cleanEnv = { ...(current?.env ?? {}) };
-          delete cleanEnv.AGENTVIBES_LLM;
-          const newEntry = {
-            command: 'npx',
-            args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server'],
-          };
-          if (Object.keys(cleanEnv).length > 0) {
-            newEntry.env = cleanEnv;
-          }
-          existingCfg.mcpServers.agentvibes = newEntry;
-          await fs.writeFile(mcpConfigPath, JSON.stringify(existingCfg, null, 2) + '\n');
-          migrated = true;
-        }
+      const existing = JSON.parse(await fs.readFile(mcpConfigPath, 'utf8'));
+      // Guard: non-object root (arrays/primitives are valid JSON but wrong shape)
+      if (!existing || typeof existing !== 'object' || Array.isArray(existing)) {
+        console.log(chalk.yellow(
+          `⚠️  ${mcpConfigPath} has a non-object root — skipping MCP registration. Fix the file manually and re-run.`
+        ));
+        return;
+      }
+      // Guard: mcpServers must be a plain object
+      if (!existing.mcpServers || typeof existing.mcpServers !== 'object' || Array.isArray(existing.mcpServers)) {
+        existing.mcpServers = {};
       }
+      const current = existing.mcpServers.agentvibes;
+      // Strip AGENTVIBES_LLM if present (causes identity collisions)
+      if (current?.env?.AGENTVIBES_LLM) {
+        delete current.env.AGENTVIBES_LLM;
+      }
+      // Ensure fallback is set
+      const mergedEnv = { ...(current?.env ?? {}), AGENTVIBES_MCP_FALLBACK: 'copilot' };
+      existing.mcpServers.agentvibes = {
+        command: 'npx',
+        args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server'],
+        env: mergedEnv,
+      };
+      await fs.writeFile(mcpConfigPath, JSON.stringify(existing, null, 2) + '\n');
     } catch (err) {
-      migrationError = err;
-    }
-
-    if (migrated) {
-      console.log(
-        boxen(
-          chalk.green.bold('✅ MCP Configuration Updated\n\n') +
-          chalk.white('Your existing ') + chalk.cyan('.mcp.json') + chalk.white(' has been updated.\n') +
-          chalk.white('Claude Code is auto-detected via ') + chalk.cyan('CLAUDECODE=1') + chalk.white(' at runtime.'),
-          {
-            padding: 1,
-            margin: { top: 1, bottom: 1, left: 0, right: 0 },
-            borderStyle: 'double',
-            borderColor: 'green',
-          }
-        )
-      );
-      return;
+      parseFailed = true;
+      console.log(chalk.yellow(
+        `⚠️  Could not update ${mcpConfigPath}: ${err.message}\n` +
+        `   AgentVibes MCP server was NOT registered. Fix the file manually and re-run.`
+      ));
     }
-
-    // Migration was not needed (already correct) or failed — fall through
-    // to the manual-instructions box.
-    console.log(
-      boxen(
-        chalk.yellow.bold('ℹ️  MCP Configuration Already Exists\n\n') +
-        chalk.white('An ') + chalk.cyan('.mcp.json') + chalk.white(' file already exists in this project.\n\n') +
-        (migrationError
-          ? chalk.red('Could not auto-update it: ' + migrationError.message + '\n\n')
-          : chalk.gray('It already has the correct AgentVibes entry.\n\n')) +
-        chalk.white('To add or fix the AgentVibes MCP server manually, use:'),
-        {
-          padding: 1,
-          margin: { top: 1, bottom: 1, left: 0, right: 0 },
-          borderStyle: 'round',
-          borderColor: migrationError ? 'red' : 'yellow',
-        }
-      )
-    );
-
-    // Display the snippet to add
-    console.log(
-      '\n"agentvibes": {\n' +
-      '  "command": "npx",\n' +
-      '  "args": ["-y", "--package=agentvibes", "agentvibes-mcp-server"]\n' +
-      '}\n'
-    );
-
-    console.log(
-      boxen(
-        chalk.cyan('To use with Claude Code:\n') +
-        chalk.white('   claude --mcp-config .mcp.json\n\n') +
-        chalk.cyan('📖 Full Guide:\n') +
-        chalk.cyan.bold('https://github.com/paulpreibisch/AgentVibes#mcp-server'),
-        {
-          padding: 1,
-          margin: { top: 1, bottom: 1, left: 0, right: 0 },
-          borderStyle: 'round',
-          borderColor: 'cyan',
-        }
-      )
-    );
+    if (!parseFailed) return;
     return;
   }
 
-  // Scenario 1 & 2: Config doesn't exist - offer to create
-  console.log(
-    boxen(
-      chalk.cyan.bold('🎙️ MCP Server Configuration\n\n') +
-      chalk.white.bold('AgentVibes MCP Server - Control TTS with Natural Language!\n\n') +
-      chalk.gray('Use natural language instead of slash commands:\n') +
-      chalk.gray('   "Switch to Aria voice" instead of /agent-vibes:switch "Aria"\n') +
-      chalk.gray('   "Set personality to sarcastic" instead of /agent-vibes:personality sarcastic\n\n') +
-      chalk.white('No ') + chalk.cyan('.mcp.json') + chalk.white(' found in this project.'),
-      {
-        padding: 1,
-        margin: { top: 1, bottom: 1, left: 0, right: 0 },
-        borderStyle: 'round',
-        borderColor: 'cyan',
-      }
-    )
-  );
-
-  let createConfig = options.yes; // Auto-create if --yes flag
-
+  // New install — create .mcp.json
   if (!options.yes) {
-    const { confirmCreate } = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'confirmCreate',
-        message: chalk.cyan('Would you like to create .mcp.json for this project?'),
-        default: true,
-      },
-    ]);
-    createConfig = confirmCreate;
-  }
-
-  if (createConfig) {
-    // Scenario 1: User says YES - create the config
-    try {
-      await fs.writeFile(mcpConfigPath, JSON.stringify(mcpConfig, null, 2) + '\n');
-
-      console.log(
-        boxen(
-          chalk.green.bold('✅ MCP Configuration Created!\n\n') +
-          chalk.white('Your ') + chalk.cyan('.mcp.json') + chalk.white(' has been created in this project.\n\n') +
-          chalk.white('To use AgentVibes MCP server with Claude, run:\n') +
-          chalk.cyan.bold('   claude --mcp-config .mcp.json\n\n') +
-          chalk.green('The MCP server is now installed and ready to use!'),
-          {
-            padding: 1,
-            margin: { top: 1, bottom: 1, left: 0, right: 0 },
-            borderStyle: 'double',
-            borderColor: 'green',
-          }
-        )
-      );
-
-      // Show the installed JSON so users can see exactly what was written
-      console.log(chalk.gray(JSON.stringify(mcpConfig, null, 2)) + '\n');
-    } catch (error) {
-      console.log(chalk.red(`\n✗ Failed to create .mcp.json: ${error.message}`));
-      console.log(chalk.gray('   You can create it manually with the config shown below.\n'));
-      // Fall through to show manual instructions
-      createConfig = false;
-    }
+    const { confirmCreate } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'confirmCreate',
+      message: chalk.cyan('Create .mcp.json for AgentVibes MCP server? (enables natural language voice control)'),
+      default: true,
+    }]);
+    if (!confirmCreate) return;
   }
 
-  if (!createConfig) {
-    // Scenario 2: User says NO - show manual instructions
-    console.log(
-      boxen(
-        chalk.cyan.bold('📋 Manual MCP Configuration\n\n') +
-        chalk.white('Create a ') + chalk.cyan('.mcp.json') + chalk.white(' file in your project with:'),
-        {
-          padding: 1,
-          margin: { top: 1, bottom: 1, left: 0, right: 0 },
-          borderStyle: 'round',
-          borderColor: 'cyan',
-        }
-      )
-    );
-
-    // Display JSON config
-    console.log(
-      '\n{\n' +
-      '  "mcpServers": {\n' +
-      '    "agentvibes": {\n' +
-      '      "command": "npx",\n' +
-      '      "args": ["-y", "--package=agentvibes", "agentvibes-mcp-server"]\n' +
-      '    }\n' +
-      '  }\n' +
-      '}\n'
-    );
-
+  try {
+    await fs.writeFile(mcpConfigPath, JSON.stringify(mcpConfig, null, 2) + '\n');
     console.log(
       boxen(
-        chalk.cyan('To use with Claude Code:\n') +
-        chalk.white('   claude --mcp-config .mcp.json\n\n') +
-        chalk.cyan('📱 Claude Desktop / Warp Terminal:\n') +
-        chalk.white('   npx agentvibes setup-mcp-for-claude-desktop\n\n') +
-        chalk.cyan('📖 Full Guide:\n') +
-        chalk.cyan.bold('https://github.com/paulpreibisch/AgentVibes#mcp-server'),
-        {
-          padding: 1,
-          margin: { top: 1, bottom: 1, left: 0, right: 0 },
-          borderStyle: 'round',
-          borderColor: 'cyan',
-        }
+        chalk.green.bold('✅ MCP Configuration Created!\n\n') +
+        chalk.white('AgentVibes MCP server registered in ') + chalk.cyan('.mcp.json') + chalk.white('.\n') +
+        chalk.green('Natural language voice control is ready!'),
+        { padding: 1, margin: { top: 1, bottom: 1 }, borderStyle: 'double', borderColor: 'green' }
       )
     );
+  } catch (err) {
+    console.log(chalk.red(`\n✗ Failed to create .mcp.json: ${err.message}`));
   }
 }
 

package/src/services/llm-provider-service.js

@@ -125,53 +125,78 @@ export async function checkCodexInstalled(targetDir) {
 // ── Claude Code install ────────────────────────────────────────────────────
 
 /**
- * Create .mcp.json in target directory if it doesn't exist.
+ * Install AgentVibes for Claude Code.
+ *
+ * Writes .mcp.json to register the AgentVibes MCP server (enables natural
+ * language control: text_to_speech, get_config, set_voice, etc.).
+ *
+ * .mcp.json does NOT set AGENTVIBES_LLM because Copilot also reads it.
+ * Claude Code is auto-detected via CLAUDECODE=1 env var at runtime.
+ *
  * Also copies hooks, commands, config, personality, plugin, and bmad config files.
  */
 export async function installClaudeMcp(targetDir) {
   const mcpConfigPath = path.join(targetDir, '.mcp.json');
 
-  // The agentvibes server entry for Claude Code's .mcp.json.
-  //
-  // IMPORTANT: no `env.AGENTVIBES_LLM` block here.  GitHub Copilot CLI
-  // also reads project-level `.mcp.json` with precedence over its own
-  // `~/.copilot/mcp-config.json` — so if we set `AGENTVIBES_LLM=claude-code`
-  // in `.mcp.json`, Copilot CLI picks up that value too and mis-routes.
-  // Instead, the MCP server (mcp-server/server.py) auto-detects Claude
-  // Code via the `CLAUDECODE=1` env var that Claude Code sets on every
-  // subprocess it spawns.  Copilot CLI does NOT set that var, so its
-  // spawned MCP server correctly falls back to its own config.
+  // AGENTVIBES_MCP_FALLBACK=copilot is the fallback identity for non-Claude-Code
+  // tools reading .mcp.json (primarily VS Code Copilot, which reads .mcp.json
+  // with precedence over .vscode/mcp.json).  Claude Code auto-detects via
+  // CLAUDECODE=1 which takes priority over the fallback in server.py.
   const agentvibesServer = {
     command: 'npx',
     args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server'],
+    env: { AGENTVIBES_MCP_FALLBACK: 'copilot' },
   };
 
-  const mcpConfig = {
-    mcpServers: {
-      agentvibes: agentvibesServer,
-    },
-  };
-
+  // MCP config and file copies are independent — report partial success
+  // when one succeeds but the other fails.
+  let mcpCreated = false;
+  let mcpError = null;
   try {
-    let mcpCreated = false;
+    let existing = null;
+    let parseError = null;
     try {
-      await fs.access(mcpConfigPath);
-      // Already exists — merge / upgrade the agentvibes entry.  This also
-      // STRIPS any stale AGENTVIBES_LLM env block left over from v5.1.2..4
-      // so Copilot CLI stops mis-routing.
-      try {
-        const existing = JSON.parse(await fs.readFile(mcpConfigPath, 'utf8'));
-        existing.mcpServers = existing.mcpServers || {};
-        existing.mcpServers.agentvibes = { ...agentvibesServer };
-        await fs.writeFile(mcpConfigPath, JSON.stringify(existing, null, 2) + '\n');
-        mcpCreated = true;
-      } catch { /* parse error — don't corrupt */ }
-    } catch {
-      // File doesn't exist — create it
-      await fs.writeFile(mcpConfigPath, JSON.stringify(mcpConfig, null, 2) + '\n');
-      mcpCreated = true;
+      const raw = await fs.readFile(mcpConfigPath, 'utf8');
+      existing = JSON.parse(raw);
+    } catch (err) {
+      // ENOENT = new file (fine); anything else = malformed (report to caller)
+      if (err.code !== 'ENOENT') parseError = err;
+    }
+
+    if (parseError) {
+      throw new Error(`Existing ${mcpConfigPath} is malformed: ${parseError.message}`);
+    }
+
+    // Guard: non-object root
+    if (existing && (typeof existing !== 'object' || Array.isArray(existing))) {
+      throw new Error(`${mcpConfigPath} has a non-object root — please fix manually.`);
+    }
+
+    if (existing) {
+      // Guard: mcpServers must be a plain object
+      if (!existing.mcpServers || typeof existing.mcpServers !== 'object' || Array.isArray(existing.mcpServers)) {
+        existing.mcpServers = {};
+      }
+      const current = existing.mcpServers.agentvibes;
+      // Strip any stale AGENTVIBES_LLM (from older versions — causes collisions)
+      if (current?.env?.AGENTVIBES_LLM) delete current.env.AGENTVIBES_LLM;
+      // Preserve user's other env keys, ensure AGENTVIBES_MCP_FALLBACK is set
+      const mergedEnv = { ...(current?.env ?? {}), AGENTVIBES_MCP_FALLBACK: 'copilot' };
+      existing.mcpServers.agentvibes = {
+        command: 'npx',
+        args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server'],
+        env: mergedEnv,
+      };
+      await fs.writeFile(mcpConfigPath, JSON.stringify(existing, null, 2) + '\n');
+    } else {
+      await fs.writeFile(mcpConfigPath, JSON.stringify({ mcpServers: { agentvibes: agentvibesServer } }, null, 2) + '\n');
     }
+    mcpCreated = true;
+  } catch (err) {
+    mcpError = err.message;
+  }
 
+  try {
     // Copy hooks, commands, config, personality, plugin, bmad config files
     const silentSpinner = { start: () => {}, succeed: () => {}, fail: () => {} };
     const installer = await import('../installer.js');
@@ -184,20 +209,20 @@ export async function installClaudeMcp(targetDir) {
     await installer.copyBackgroundMusicFiles(targetDir, silentSpinner);
     ensureDefaultLlmConfigSync('claude-code', targetDir);
 
-    return { success: true, mcpCreated };
+    return { success: true, mcpCreated, mcpError };
   } catch (err) {
-    return { success: false, error: err.message };
+    return { success: false, error: err.message, mcpError };
   }
 }
 
 export async function removeClaudeMcp(targetDir) {
-  const mcpConfigPath = path.join(targetDir, '.mcp.json');
+  // Clean up .mcp.json agentvibes entry (legacy from older versions)
   try {
+    const mcpConfigPath = path.join(targetDir, '.mcp.json');
     const content = await fs.readFile(mcpConfigPath, 'utf8');
     const parsed = JSON.parse(content);
     if (parsed.mcpServers?.agentvibes) {
       delete parsed.mcpServers.agentvibes;
-      // Only delete file if mcpServers is empty AND no other top-level keys
       const noServers = Object.keys(parsed.mcpServers).length === 0;
       const noOtherKeys = Object.keys(parsed).length === 1;
       if (noServers && noOtherKeys) {
@@ -217,9 +242,9 @@ export async function removeClaudeMcp(targetDir) {
 export async function uninstallClaude(targetDir) {
   const removed = [];
 
-  // 1. Remove MCP entry
+  // 1. Remove legacy .mcp.json agentvibes entry if present
   await removeClaudeMcp(targetDir);
-  removed.push('.mcp.json (agentvibes entry)');
+  removed.push('.mcp.json agentvibes entry (if present)');
 
   // 2. Remove AgentVibes directories
   const dirs = [
@@ -304,6 +329,7 @@ export async function installCopilotMcp(targetDir) {
     env: { AGENTVIBES_LLM: 'copilot' },
   };
 
+  let mcpError = null;
   try {
     await fs.mkdir(vscodeDir, { recursive: true });
     let mcpConfig = { servers: {} };
@@ -316,6 +342,8 @@ export async function installCopilotMcp(targetDir) {
       }
     } catch { /* new file */ }
 
+    // Clean up any old "agentvibes-copilot" entry from a prior attempt.
+    delete mcpConfig.servers['agentvibes-copilot'];
     mcpConfig.servers.agentvibes = agentvibesServer;
     await fs.writeFile(mcpJsonPath, JSON.stringify(mcpConfig, null, 2) + '\n');
 
@@ -325,34 +353,45 @@ export async function installCopilotMcp(targetDir) {
     // CLI reads ONLY from ~/.copilot/mcp-config.json per docs:
     // https://docs.github.com/en/copilot/how-tos/copilot-cli/customize-copilot/add-mcp-servers
     try {
-      const copilotHome = process.env.COPILOT_HOME ||
-        path.join(process.env.USERPROFILE || process.env.HOME || '', '.copilot');
-      const copilotMcpPath = path.join(copilotHome, 'mcp-config.json');
-      await fs.mkdir(copilotHome, { recursive: true });
-      let cliConfig = { mcpServers: {} };
-      try {
-        const existingCli = await fs.readFile(copilotMcpPath, 'utf8');
-        const parsedCli = JSON.parse(existingCli);
-        if (parsedCli && typeof parsedCli === 'object') {
-          cliConfig = parsedCli;
-          if (!cliConfig.mcpServers) cliConfig.mcpServers = {};
-        }
-      } catch { /* new file */ }
-      cliConfig.mcpServers.agentvibes = {
-        type: 'local',
-        command: 'npx',
-        args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server'],
-        env: { AGENTVIBES_LLM: 'copilot' },
-        tools: ['*'],
-      };
-      await fs.writeFile(copilotMcpPath, JSON.stringify(cliConfig, null, 2) + '\n');
-    } catch { /* best effort — CLI might not be installed */ }
-
-    ensureDefaultLlmConfigSync('copilot', targetDir);
-    return { success: true };
+      // If neither USERPROFILE nor HOME is set, skip — writing to a
+      // relative `.copilot/` path would pollute the project dir.
+      const home = process.env.COPILOT_HOME ||
+        process.env.USERPROFILE || process.env.HOME;
+      if (home) {
+        const copilotHome = process.env.COPILOT_HOME || path.join(home, '.copilot');
+        const copilotMcpPath = path.join(copilotHome, 'mcp-config.json');
+        await fs.mkdir(copilotHome, { recursive: true });
+        let cliConfig = { mcpServers: {} };
+        try {
+          const existingCli = await fs.readFile(copilotMcpPath, 'utf8');
+          const parsedCli = JSON.parse(existingCli);
+          if (parsedCli && typeof parsedCli === 'object' && !Array.isArray(parsedCli)) {
+            cliConfig = parsedCli;
+            if (!cliConfig.mcpServers || typeof cliConfig.mcpServers !== 'object' || Array.isArray(cliConfig.mcpServers)) {
+              cliConfig.mcpServers = {};
+            }
+          }
+        } catch { /* new file or malformed — start fresh */ }
+        cliConfig.mcpServers.agentvibes = {
+          type: 'local',
+          command: 'npx',
+          args: ['-y', '--package=agentvibes', 'agentvibes-mcp-server'],
+          env: { AGENTVIBES_LLM: 'copilot' },
+          tools: ['*'],
+        };
+        await fs.writeFile(copilotMcpPath, JSON.stringify(cliConfig, null, 2) + '\n');
+      }
+    } catch (err) {
+      // Best effort — CLI might not be installed.  Log to stderr so users
+      // with COPILOT_HOME set but write failures (EACCES) can diagnose.
+      console.error(`[agentvibes] Warning: could not write ~/.copilot/mcp-config.json: ${err.message}`);
+    }
   } catch (err) {
-    return { success: false, error: err.message };
+    mcpError = err.message;
   }
+
+  ensureDefaultLlmConfigSync('copilot', targetDir);
+  return { success: true, mcpError };
 }
 
 export async function removeCopilotMcp(targetDir) {
@@ -360,13 +399,23 @@ export async function removeCopilotMcp(targetDir) {
   try {
     const content = await fs.readFile(mcpJsonPath, 'utf8');
     const parsed = JSON.parse(content);
-    if (parsed?.servers?.agentvibes) {
-      delete parsed.servers.agentvibes;
-      if (Object.keys(parsed.servers).length === 0) {
-        await fs.unlink(mcpJsonPath);
-      } else {
-        await fs.writeFile(mcpJsonPath, JSON.stringify(parsed, null, 2) + '\n');
-      }
+    // Guard against non-object root or non-object servers (malformed config)
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+      return { success: true };
+    }
+    const servers = parsed.servers;
+    if (!servers || typeof servers !== 'object' || Array.isArray(servers)) {
+      return { success: true };
+    }
+    // Remove both old ("agentvibes") and new ("agentvibes-copilot") names
+    delete servers.agentvibes;
+    delete servers['agentvibes-copilot'];
+    const noServers = Object.keys(servers).length === 0;
+    const noOtherKeys = Object.keys(parsed).length === 1;  // only "servers"
+    if (noServers && noOtherKeys) {
+      await fs.unlink(mcpJsonPath);
+    } else {
+      await fs.writeFile(mcpJsonPath, JSON.stringify(parsed, null, 2) + '\n');
     }
     return { success: true };
   } catch {
@@ -396,17 +445,19 @@ export async function installCodexMcp(targetDir) {
   const codexDir = path.join(targetDir, '.codex');
   const tomlPath = path.join(codexDir, 'config.toml');
 
+  let mcpError = null;
   try {
     await fs.mkdir(codexDir, { recursive: true });
     let existing = '';
     try { existing = await fs.readFile(tomlPath, 'utf8'); } catch { /* new file */ }
     const content = buildCodexToml(existing);
     await fs.writeFile(tomlPath, content);
-    ensureDefaultLlmConfigSync('codex', targetDir);
-    return { success: true };
   } catch (err) {
-    return { success: false, error: err.message };
+    mcpError = err.message;
   }
+
+  ensureDefaultLlmConfigSync('codex', targetDir);
+  return { success: true, mcpError };
 }
 
 export async function removeCodexMcp(targetDir) {