create-merlin-brain 3.4.4 → 3.4.6

package/bin/install.cjs

@@ -794,7 +794,10 @@ async function install() {
   const merlinSrc = path.join(filesDir, 'merlin');
   if (fs.existsSync(merlinSrc)) {
     const count = copyDirRecursive(merlinSrc, MERLIN_DIR);
-    logSuccess(`Installed ${count} workflow files`);
+    // Always write VERSION from package.json (the static file may be stale)
+    const currentVersion = require('../package.json').version;
+    fs.writeFileSync(path.join(MERLIN_DIR, 'VERSION'), currentVersion);
+    logSuccess(`Installed ${count} workflow files (v${currentVersion})`);
   } else {
     logWarn('Merlin workflows not found in package');
   }
@@ -944,36 +947,48 @@ async function install() {
     });
 
     // --- Prompt-based hooks (LLM evaluates .md content) ---
-    const addPromptHookIfMissing = (hookArray, hookConfig) => {
-      const exists = hookArray.some(h => h.type === 'prompt' && h.prompt === hookConfig.prompt);
-      if (!exists) hookArray.push(hookConfig);
-      return hookArray;
+    // On update, old prompt hooks have stale content. Remove all Merlin prompt hooks
+    // first (identified by containing 'merlin' or 'Merlin' in their prompt text),
+    // then re-add fresh ones. This prevents duplicate hooks across version upgrades.
+    const removeMerlinPromptHooks = (hookArray) => {
+      return hookArray.filter(h => {
+        if (h.type !== 'prompt') return true; // keep non-prompt hooks
+        const prompt = (h.prompt || '').toLowerCase();
+        // Merlin prompt hooks contain these markers
+        return !(prompt.includes('merlin') || prompt.includes('sights'));
+      });
     };
 
+    settings.hooks.SessionStart = removeMerlinPromptHooks(settings.hooks.SessionStart);
+    settings.hooks.PreToolUse = removeMerlinPromptHooks(settings.hooks.PreToolUse);
+    settings.hooks.Stop = removeMerlinPromptHooks(settings.hooks.Stop);
+    settings.hooks.Notification = settings.hooks.Notification || [];
+    settings.hooks.Notification = removeMerlinPromptHooks(settings.hooks.Notification);
+
+    // Now add fresh prompt hooks
     // Prompt-based SessionStart hook: FULL Merlin boot sequence
     // This is the key hook that makes every session feel like Loop
-    addPromptHookIfMissing(settings.hooks.SessionStart, {
+    settings.hooks.SessionStart.push({
       type: 'prompt',
       prompt: fs.readFileSync(path.join(HOOKS_DIR, 'session-start-boot.md'), 'utf8')
     });
 
     // Prompt-based PreToolUse hook: enforce Sights check before edits
     // This is the Sights guarantee — no edit without context
-    addPromptHookIfMissing(settings.hooks.PreToolUse, {
+    settings.hooks.PreToolUse.push({
       type: 'prompt',
       prompt: fs.readFileSync(path.join(HOOKS_DIR, 'pre-edit-sights-enforce.md'), 'utf8'),
       matcher: 'Edit|Write'
     });
 
     // Prompt-based Stop hook: quality gate before session ends
-    addPromptHookIfMissing(settings.hooks.Stop, {
+    settings.hooks.Stop.push({
       type: 'prompt',
       prompt: fs.readFileSync(path.join(HOOKS_DIR, 'stop-check.md'), 'utf8')
     });
 
     // Prompt-based Notification hook: verify task completion quality
-    settings.hooks.Notification = settings.hooks.Notification || [];
-    addPromptHookIfMissing(settings.hooks.Notification, {
+    settings.hooks.Notification.push({
       type: 'prompt',
       prompt: fs.readFileSync(path.join(HOOKS_DIR, 'task-completed-verify.md'), 'utf8'),
       matcher: 'task_completed'
@@ -996,11 +1011,32 @@ async function install() {
   }
 
   // Step 9: Optional Merlin Sights configuration
-  logStep('9/10', 'Optional: Merlin Sights configuration...');
-  console.log(`Merlin Sights provides instant codebase context.`);
-  console.log(`Get your API key at: ${colors.cyan}https://merlin.build${colors.reset}`);
+  logStep('9/10', 'Merlin Sights configuration...');
 
-  const apiKey = await promptApiKey();
+  // Check if API key is already configured (skip prompt on updates)
+  let existingApiKey = '';
+  const configCheckPaths = [
+    path.join(CLAUDE_DIR, 'config.json'),
+    path.join(os.homedir(), '.claude.json'),
+  ];
+  for (const cfgPath of configCheckPaths) {
+    if (existingApiKey) break;
+    if (fs.existsSync(cfgPath)) {
+      try {
+        const cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
+        existingApiKey = cfg.mcpServers?.merlin?.env?.MERLIN_API_KEY || '';
+      } catch (e) { /* ignore */ }
+    }
+  }
+
+  let apiKey = existingApiKey;
+  if (existingApiKey) {
+    logSuccess(`Sights API key already configured (skipping prompt)`);
+  } else {
+    console.log(`Merlin Sights provides instant codebase context.`);
+    console.log(`Get your API key at: ${colors.cyan}https://merlin.build${colors.reset}`);
+    apiKey = await promptApiKey();
+  }
 
   if (apiKey) {
     const configPath = path.join(CLAUDE_DIR, 'config.json');

package/dist/server/server.js

@@ -41,7 +41,7 @@ function loadSavedConfig() {
 export function createServer() {
     const server = new McpServer({
         name: 'merlin',
-        version: '3.2.0',
+        version: VERSION,
         description: 'Merlin - AI-powered codebase intelligence. Syncs every 5 min. ALWAYS fetch fresh context before coding.',
     });
     const client = getClient();

package/dist/server/version.d.ts

@@ -1,6 +1,2 @@
-/**
- * Merlin Brain Version
- * Single source of truth for version number
- */
-export declare const VERSION = "3.2.0";
+export declare const VERSION: string;
 //# sourceMappingURL=version.d.ts.map

package/dist/server/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/server/version.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,OAAO,UAAU,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/server/version.ts"],"names":[],"mappings":"AA2BA,eAAO,MAAM,OAAO,QAAe,CAAC"}

package/dist/server/version.js

@@ -1,6 +1,29 @@
 /**
  * Merlin Brain Version
- * Single source of truth for version number
+ * Reads from package.json at runtime so it's always correct after npm publish.
  */
-export const VERSION = '3.2.0';
+import { readFileSync } from 'fs';
+import { resolve, dirname } from 'path';
+import { fileURLToPath } from 'url';
+function getVersion() {
+    try {
+        // Walk up from dist/server/ or src/server/ to find package.json
+        const __filename = fileURLToPath(import.meta.url);
+        const __dirname = dirname(__filename);
+        // Try two levels up (dist/server -> package root, or src/server -> package root)
+        for (const rel of ['../..', '../../..']) {
+            const pkgPath = resolve(__dirname, rel, 'package.json');
+            try {
+                const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+                if (pkg.name === 'create-merlin-brain' && pkg.version) {
+                    return pkg.version;
+                }
+            }
+            catch { /* try next */ }
+        }
+    }
+    catch { /* fallback */ }
+    return '0.0.0'; // Should never happen — means package.json is missing
+}
+export const VERSION = getVersion();
 //# sourceMappingURL=version.js.map

package/dist/server/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/server/version.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/server/version.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,SAAS,UAAU;IACjB,IAAI,CAAC;QACH,gEAAgE;QAChE,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACtC,iFAAiF;QACjF,KAAK,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;YACxD,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;gBACtD,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;oBACtD,OAAO,GAAG,CAAC,OAAO,CAAC;gBACrB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;IAC1B,OAAO,OAAO,CAAC,CAAC,sDAAsD;AACxE,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC"}

package/files/merlin/VERSION

@@ -1 +1 @@
-3.2.0
+3.4.6

package/package.json

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