create-merlin-brain 3.5.7 → 3.5.9

package/bin/install.cjs

@@ -1077,7 +1077,15 @@ async function install() {
   }
   const inputKey = await promptApiKey(!!existingApiKey);
   if (inputKey) {
-    apiKey = inputKey;
+    // If user has an existing key and typed a confirmation like "y" or "yes",
+    // they meant "keep existing" — don't store the literal string as the key.
+    const isConfirmation = /^(y|yes|yeah|yep|sure|ok|keep)$/i.test(inputKey);
+    if (isConfirmation && existingApiKey) {
+      // Keep the existing key — user confirmed they want to keep it
+      logSuccess('Keeping existing API key');
+    } else {
+      apiKey = inputKey;
+    }
   }
 
   if (apiKey) {

package/bin/merlin-cli.cjs

@@ -20,7 +20,32 @@ const fs = require('fs');
 const path = require('path');
 
 const API_URL = process.env.MERLIN_API_URL || 'https://auth.merlin.build';
-const API_KEY = process.env.MERLIN_API_KEY || '';
+
+/**
+ * Resolve API key: env var first, then ~/.claude/config.json (where the MCP server stores it).
+ * This lets the CLI work even when MERLIN_API_KEY isn't exported in the shell.
+ */
+function resolveApiKey() {
+  if (process.env.MERLIN_API_KEY) return process.env.MERLIN_API_KEY;
+
+  // Fallback: read from Claude Code MCP config
+  const configPaths = [
+    path.join(require('os').homedir(), '.claude', 'config.json'),
+    path.join(require('os').homedir(), '.claude', 'claude_desktop_config.json'),
+  ];
+  for (const configPath of configPaths) {
+    try {
+      if (fs.existsSync(configPath)) {
+        const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        const key = config?.mcpServers?.merlin?.env?.MERLIN_API_KEY;
+        if (key) return key;
+      }
+    } catch { /* ignore parse errors */ }
+  }
+
+  return '';
+}
+const API_KEY = resolveApiKey();
 
 // ============================================================
 // Helpers
@@ -76,11 +101,12 @@ async function apiRequest(path, method = 'GET', body = null) {
 
 async function findRepoId(repoUrl) {
   try {
-    const repos = await apiRequest('/api/repos');
+    const data = await apiRequest('/api/repos/my/list');
+    const repos = data.repositories || data || [];
     const normalizedUrl = repoUrl.replace(/^https?:\/\//, '').replace(/\.git$/, '').toLowerCase();
 
     const repo = repos.find(r => {
-      const rUrl = r.url.replace(/^https?:\/\//, '').replace(/\.git$/, '').toLowerCase();
+      const rUrl = (r.url || '').replace(/^https?:\/\//, '').replace(/\.git$/, '').toLowerCase();
       return rUrl.includes(normalizedUrl) || normalizedUrl.includes(rUrl);
     });
 

package/files/merlin/VERSION

@@ -1 +1 @@
-3.5.7
+3.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-merlin-brain",
-  "version": "3.5.7",
+  "version": "3.5.9",
   "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",