create-merlin-brain 2.1.6 → 2.1.8

package/bin/install.cjs

@@ -1,5 +1,29 @@
 #!/usr/bin/env node
 
+// =============================================================================
+// CRITICAL: Detect if this is being run as MCP server (with 'serve' argument)
+// If so, hand off to the actual MCP server instead of running the installer.
+// This prevents the installer from reading MCP protocol messages as user input!
+// =============================================================================
+const isServeMode = process.argv.includes('serve');
+
+if (isServeMode) {
+  // Hand off to the MCP server using dynamic import (works in CommonJS with Node 14+)
+  import('../dist/server/index.js').catch((err) => {
+    console.error('Failed to start Merlin MCP server:', err.message);
+    process.exit(1);
+  });
+  // The import runs the server module which keeps the process alive.
+  // We don't need to do anything else here - the code below won't
+  // execute until the server exits (which it won't during normal operation).
+}
+
+// =============================================================================
+// INSTALLER CODE BELOW - Only runs when NOT in serve mode
+// =============================================================================
+
+if (!isServeMode) {
+
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
@@ -475,6 +499,39 @@ function cleanupLegacy() {
     } catch (e) { /* ignore */ }
   }
 
+  // ═══════════════════════════════════════════════════════════════
+  // FIX ~/.claude.json MCP REGISTRY (update old merlin-mcp to create-merlin-brain)
+  // ═══════════════════════════════════════════════════════════════
+  const claudeJsonPath = path.join(os.homedir(), '.claude.json');
+  if (fs.existsSync(claudeJsonPath)) {
+    try {
+      let claudeJson = JSON.parse(fs.readFileSync(claudeJsonPath, 'utf8'));
+      let modified = false;
+
+      // Check if merlin MCP server uses old package name
+      if (claudeJson.mcpServers?.merlin) {
+        const args = claudeJson.mcpServers.merlin.args;
+        if (args && (args[0] === 'merlin-mcp' || args[0] === 'merlin-mcp@latest' || args[0] === 'ccwiki-mcp')) {
+          // Update to new package name
+          claudeJson.mcpServers.merlin.args = ['create-merlin-brain@latest', 'serve'];
+          modified = true;
+          cleaned.push('~/.claude.json (updated merlin-mcp → create-merlin-brain)');
+        }
+      }
+
+      // Remove old 'briefed' server if exists
+      if (claudeJson.mcpServers?.briefed) {
+        delete claudeJson.mcpServers.briefed;
+        modified = true;
+        cleaned.push('~/.claude.json (removed deprecated briefed server)');
+      }
+
+      if (modified) {
+        fs.writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2));
+      }
+    } catch (e) { /* ignore */ }
+  }
+
   // ═══════════════════════════════════════════════════════════════
   // PATTERN-BASED CLEANUP IN AGENTS DIR
   // ═══════════════════════════════════════════════════════════════
@@ -745,6 +802,43 @@ async function install() {
     };
     fs.writeFileSync(claudeDirDesktopConfig, JSON.stringify(claudeDirConfig, null, 2));
     logSuccess('Merlin Sights configured for ~/.claude/claude_desktop_config.json');
+
+    // CRITICAL: Also update ~/.claude.json (Claude MCP registry - this is what Claude Code actually uses!)
+    const claudeJsonPath = path.join(os.homedir(), '.claude.json');
+    if (fs.existsSync(claudeJsonPath)) {
+      try {
+        let claudeJson = JSON.parse(fs.readFileSync(claudeJsonPath, 'utf8'));
+        claudeJson.mcpServers = claudeJson.mcpServers || {};
+        claudeJson.mcpServers.merlin = {
+          type: 'stdio',
+          command: 'npx',
+          args: ['create-merlin-brain@latest', 'serve'],
+          env: { MERLIN_API_KEY: apiKey }
+        };
+        fs.writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2));
+        logSuccess('Merlin Sights configured for ~/.claude.json (Claude MCP registry)');
+      } catch (e) {
+        logWarn('Could not update ~/.claude.json - you may need to run: claude mcp remove merlin && claude mcp add merlin ...');
+      }
+    } else {
+      // Create ~/.claude.json with MCP config if it doesn't exist
+      try {
+        const claudeJson = {
+          mcpServers: {
+            merlin: {
+              type: 'stdio',
+              command: 'npx',
+              args: ['create-merlin-brain@latest', 'serve'],
+              env: { MERLIN_API_KEY: apiKey }
+            }
+          }
+        };
+        fs.writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2));
+        logSuccess('Merlin Sights configured for ~/.claude.json (Claude MCP registry - created)');
+      } catch (e) {
+        logWarn('Could not create ~/.claude.json');
+      }
+    }
   } else {
     logWarn('Skipped Merlin Sights (you can configure it later)');
   }
@@ -794,3 +888,5 @@ install().catch((err) => {
   console.error('Installation failed:', err);
   process.exit(1);
 });
+
+} // End of if (!isServeMode)

package/dist/server/version.d.ts

@@ -2,5 +2,5 @@
  * Merlin Brain Version
  * Single source of truth for version number
  */
-export declare const VERSION = "2.1.6";
+export declare const VERSION = "2.1.8";
 //# sourceMappingURL=version.d.ts.map

package/dist/server/version.js

@@ -2,5 +2,5 @@
  * Merlin Brain Version
  * Single source of truth for version number
  */
-export const VERSION = '2.1.6';
+export const VERSION = '2.1.8';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-merlin-brain",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "Merlin - The Ultimate AI Brain for Claude Code. Installs workflows, agents, and Sights MCP server.",
   "type": "module",
   "main": "./dist/server/index.js",