agentvibes 5.2.0 → 5.2.1

package/src/console/tabs/setup-tab.js

@@ -605,12 +605,19 @@ export function createSetupTab(screen, services) {
         }
       });
       btn.key(['down'], () => {
+        // Column-preserving down nav.  If pressing down from Install/Remove
+        // would land on the Default row (which has no Install/Remove — all
+        // three slots are configBtn duplicates), don't move.  Configure
+        // column navigates normally into Default row's Configure.
+        const col = providerFocusIndex % 3;
         const nextIdx = providerFocusIndex + 3;
-        if (nextIdx < providerFocusableItems.length) {
-          providerFocusIndex = nextIdx;
-          providerFocusableItems[providerFocusIndex].focus();
-          screen.render();
-        }
+        if (nextIdx >= providerFocusableItems.length) return;
+        const nextRowIdx = Math.floor(nextIdx / 3);
+        const nextRow = PROVIDERS[nextRowIdx];
+        if (col < 2 && nextRow && nextRow.isDefault) return; // skip Default from Install/Remove
+        providerFocusIndex = nextIdx;
+        providerFocusableItems[providerFocusIndex].focus();
+        screen.render();
       });
     }
 
@@ -1522,7 +1529,6 @@ export function createSetupTab(screen, services) {
     hideAllProviderRows();
     contentBox.hide();
 
-    const mcpPath = path.join(targetDir, '.mcp.json');
     const hooksDir = path.join(targetDir, '.claude', process.platform === 'win32' ? 'hooks-windows' : 'hooks');
     const installed = installedState['claude-code'];
     const verb = wasInstalled ? 'reinstalled' : 'installed';
@@ -1532,9 +1538,14 @@ export function createSetupTab(screen, services) {
     lines.push('');
 
     if (result) {
-      lines.push(result.success
-        ? `{green-fg}AgentVibes for Claude Code ${verb}!{/green-fg}`
-        : `{red-fg}Installation failed{/red-fg}`);
+      if (result.success) {
+        lines.push(`{green-fg}AgentVibes for Claude Code ${verb}!{/green-fg}`);
+        if (result.mcpError) {
+          lines.push(`{yellow-fg}Warning:{/yellow-fg} ${result.mcpError}`);
+        }
+      } else {
+        lines.push(`{red-fg}Installation failed:{/red-fg} ${result.error || 'Unknown error'}`);
+      }
     } else {
       lines.push(installed
         ? '{green-fg}Installed{/green-fg}'
@@ -1543,10 +1554,7 @@ export function createSetupTab(screen, services) {
 
     lines.push('');
     lines.push(`{bold}{cyan-fg}What ${result ? `got ${verb}` : 'gets installed'}:{/cyan-fg}{/bold}`);
-    lines.push('');
-    lines.push('  {yellow-fg}1.{/yellow-fg} {bold}.mcp.json{/bold} (project root)');
-    lines.push(`     Location: ${mcpPath}`);
-    lines.push('     Registers the AgentVibes MCP server for Claude Code.');
+    lines.push('  {yellow-fg}1.{/yellow-fg} {bold}.mcp.json{/bold} (MCP server — natural language voice control)');
     lines.push('');
     lines.push('  {yellow-fg}2.{/yellow-fg} {bold}.claude/hooks/{/bold} (session-start + pre-tool hooks)');
     lines.push(`     Location: ${hooksDir}`);
@@ -1575,9 +1583,14 @@ export function createSetupTab(screen, services) {
     const lines = [];
     lines.push('{bold}{cyan-fg}GitHub Copilot -- AgentVibes Integration{/cyan-fg}{/bold}');
     lines.push('');
-    lines.push(result.success
-      ? `{green-fg}AgentVibes for Copilot ${verb}!{/green-fg}`
-      : `{red-fg}Installation failed:{/red-fg} ${result.error || 'Unknown error'}`);
+    if (result.success) {
+      lines.push(`{green-fg}AgentVibes for Copilot ${verb}!{/green-fg}`);
+      if (result.mcpError) {
+        lines.push(`{yellow-fg}MCP config failed:{/yellow-fg} ${result.mcpError}`);
+      }
+    } else {
+      lines.push(`{red-fg}Installation failed:{/red-fg} ${result.error || 'Unknown error'}`);
+    }
     lines.push('');
     lines.push(`{bold}{cyan-fg}What got ${verb}:{/cyan-fg}{/bold}`);
     lines.push('');
@@ -1604,9 +1617,14 @@ export function createSetupTab(screen, services) {
     const lines = [];
     lines.push('{bold}{cyan-fg}OpenAI Codex -- AgentVibes Integration{/cyan-fg}{/bold}');
     lines.push('');
-    lines.push(result.success
-      ? `{green-fg}AgentVibes for Codex ${verb}!{/green-fg}`
-      : `{red-fg}Installation failed:{/red-fg} ${result.error || 'Unknown error'}`);
+    if (result.success) {
+      lines.push(`{green-fg}AgentVibes for Codex ${verb}!{/green-fg}`);
+      if (result.mcpError) {
+        lines.push(`{yellow-fg}MCP config failed:{/yellow-fg} ${result.mcpError}`);
+      }
+    } else {
+      lines.push(`{red-fg}Installation failed:{/red-fg} ${result.error || 'Unknown error'}`);
+    }
     lines.push('');
     lines.push(`{bold}{cyan-fg}What got ${verb}:{/cyan-fg}{/bold}`);
     lines.push('');
@@ -1679,11 +1697,29 @@ export function createSetupTab(screen, services) {
 
   infoBox.key(['escape', 'enter'], () => {
     // After dismissing the install/remove info page, advance focus to the
-    // NEXT provider row but keep the same column (Install stays on Install,
-    // Remove stays on Remove, Configure stays on Configure).  Each row has
-    // 3 focusable slots so +3 moves one full row down with wraparound.
+    // NEXT provider row but keep the same column (Install/Remove/Configure).
+    // Each row has 3 focusable slots, so +3 moves one full row down.
+    //
+    // Special case: when leaving the LAST installable provider (Codex) from
+    // Install or Remove column, skip the Default row (it has no Install or
+    // Remove) and wrap to the FIRST Configure button (Claude Code Configure).
+    // This lets the user cleanly walk all three installs, then all three
+    // Configures, ending on Default Configure.
     const max = providerFocusableItems.length;
-    const nextIdx = max > 0 ? (_preInfoFocusIndex + 3) % max : 0;
+    if (max === 0) { showProviderListView(0); return; }
+    const col = _preInfoFocusIndex % 3;   // 0=Install, 1=Remove, 2=Configure
+    const row = Math.floor(_preInfoFocusIndex / 3);
+    const nextRow = PROVIDERS[row + 1];
+    const nextRowIsDefault = nextRow && nextRow.isDefault;
+    let nextIdx;
+    if (col < 2 && nextRowIsDefault) {
+      // Last Install/Remove → jump to the FIRST non-default provider's
+      // Configure column (dynamic: don't hardcode PROVIDERS[0]).
+      const firstInstallableIdx = PROVIDERS.findIndex(p => !p.isDefault);
+      nextIdx = firstInstallableIdx >= 0 ? firstInstallableIdx * 3 + 2 : (_preInfoFocusIndex + 3) % max;
+    } else {
+      nextIdx = (_preInfoFocusIndex + 3) % max;
+    }
     showProviderListView(nextIdx);
   });
 

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}`));
   }
 }