create-merlin-brain 1.1.2 → 1.1.4

package/bin/install.js

@@ -185,14 +185,43 @@ _merlin_check_update() {
   fi
 }
 
-# Main claude wrapper with Merlin branding
+# Main claude wrapper with Merlin branding and Sights pre-check
 claude() {
-  # Show Merlin branding
-  echo -e "\\033[35m✦ Merlin\\033[0m"
-
   # Check for updates in background (silent, non-blocking)
   (_merlin_check_update &) 2>/dev/null
 
+  # Pre-flight: Check Sights connection (enforced at terminal level)
+  local status_output=$(merlin status 2>/dev/null)
+  local status_code=$(echo "$status_output" | head -1)
+
+  case "$status_code" in
+    CONNECTED)
+      local repo_name=$(echo "$status_output" | sed -n '2p')
+      echo -e "\\033[35m🔮 Merlin Sights:\\033[0m \\033[32mCONNECTED\\033[0m ✓"
+      echo -e "   Repository: $repo_name"
+      ;;
+    NOT_CONNECTED)
+      local repo_url=$(echo "$status_output" | sed -n '2p')
+      echo -e "\\033[35m🔮 Merlin Sights:\\033[0m \\033[33mNOT CONNECTED\\033[0m"
+      echo ""
+      echo "   This repo isn't in Sights yet: $repo_url"
+      echo ""
+      echo -e "   \\033[36m[1]\\033[0m Connect now (analysis takes 2-5 min)"
+      echo -e "   \\033[36m[2]\\033[0m Skip - work without Sights"
+      echo ""
+      echo -n "   Choice [1/2]: "
+      read -r choice
+      if [ "$choice" = "1" ]; then
+        merlin connect
+        echo ""
+      fi
+      ;;
+    *)
+      # Not in git repo or CLI not available - just show branding
+      echo -e "\\033[35m✦ Merlin\\033[0m"
+      ;;
+  esac
+
   # Run claude with Merlin agent
   command claude --agent merlin "$@"
 }
@@ -284,7 +313,7 @@ function cleanupLegacy() {
         if (apiKey) {
           config.mcpServers.merlin = {
             command: 'npx',
-            args: ['merlin-mcp'],
+            args: ['merlin-mcp@latest'],
             env: { MERLIN_API_KEY: apiKey }
           };
         }
@@ -295,7 +324,7 @@ function cleanupLegacy() {
       if (config.mcpServers?.merlin) {
         const args = config.mcpServers.merlin.args;
         if (args && (args[0] === 'create-merlin-brain' || args[0] === 'ccwiki-mcp')) {
-          config.mcpServers.merlin.args = ['merlin-mcp'];
+          config.mcpServers.merlin.args = ['merlin-mcp@latest'];
           modified = true;
         }
         if (config.mcpServers.merlin.env?.CCWIKI_API_KEY) {
@@ -327,7 +356,7 @@ function cleanupLegacy() {
         if (apiKey) {
           config.mcpServers.merlin = {
             command: 'npx',
-            args: ['merlin-mcp'],
+            args: ['merlin-mcp@latest'],
             env: { MERLIN_API_KEY: apiKey }
           };
         }
@@ -337,7 +366,7 @@ function cleanupLegacy() {
       if (config.mcpServers?.merlin) {
         const args = config.mcpServers.merlin.args;
         if (args && (args[0] === 'create-merlin-brain' || args[0] === 'ccwiki-mcp')) {
-          config.mcpServers.merlin.args = ['merlin-mcp'];
+          config.mcpServers.merlin.args = ['merlin-mcp@latest'];
           modified = true;
         }
         if (config.mcpServers.merlin.env?.CCWIKI_API_KEY) {
@@ -546,14 +575,10 @@ async function install() {
   const claudeMdDest = path.join(CLAUDE_DIR, 'CLAUDE.md');
 
   if (fs.existsSync(claudeMdSrc)) {
-    if (fs.existsSync(claudeMdDest)) {
-      // Backup existing
-      const backup = claudeMdDest + '.backup';
-      fs.copyFileSync(claudeMdDest, backup);
-      logWarn(`Backed up existing CLAUDE.md to CLAUDE.md.backup`);
-    }
+    // Always replace CLAUDE.md - it's managed by Merlin
+    // Old versions are cleaned up by cleanupLegacy()
     fs.copyFileSync(claudeMdSrc, claudeMdDest);
-    logSuccess('Installed CLAUDE.md');
+    logSuccess('Installed CLAUDE.md (Merlin instructions)');
   }
 
   // Step 6: Install Merlin Loop (autonomous orchestration)
@@ -604,7 +629,7 @@ async function install() {
     config.mcpServers = config.mcpServers || {};
     config.mcpServers.merlin = {
       command: 'npx',
-      args: ['merlin-mcp'],
+      args: ['merlin-mcp@latest'],
       env: {
         MERLIN_API_KEY: apiKey
       }

package/bin/merlin-cli.js

@@ -17,7 +17,7 @@
 const https = require('https');
 const { execSync } = require('child_process');
 
-const API_URL = process.env.MERLIN_API_URL || 'https://claude-codeapi-production.up.railway.app';
+const API_URL = process.env.MERLIN_API_URL || 'https://auth.merlin.build';
 const API_KEY = process.env.MERLIN_API_KEY || '';
 
 // ============================================================
@@ -243,21 +243,53 @@ async function connect() {
   }
 }
 
+async function status() {
+  const repoUrl = detectGitRepo();
+  if (!repoUrl) {
+    // Not in a git repo - output for shell parsing
+    console.log('NO_GIT_REPO');
+    process.exit(1);
+  }
+
+  const repoId = await findRepoId(repoUrl);
+  if (!repoId) {
+    // Repo not connected
+    console.log('NOT_CONNECTED');
+    console.log(repoUrl);
+    process.exit(0);
+  }
+
+  // Connected - get repo name
+  try {
+    const overview = await apiRequest(`/api/agent/${repoId}/overview`);
+    const nameMatch = overview.match(/Name:\s*(.+)/);
+    const repoName = nameMatch ? nameMatch[1].trim() : repoUrl.split('/').pop();
+    console.log('CONNECTED');
+    console.log(repoName);
+    console.log(repoId);
+  } catch {
+    console.log('CONNECTED');
+    console.log(repoUrl.split('/').pop());
+    console.log(repoId);
+  }
+}
+
 function showHelp() {
   console.log(`
 Merlin CLI - Universal codebase intelligence for ALL AI agents
 
 Usage:
+  merlin status             Check if current repo is connected to Sights
+  merlin connect            Connect repo to Merlin Sights
   merlin context <task>     Get context for a task
   merlin search <query>     Search the codebase
   merlin brief              Get project overview
   merlin rules              Get coding rules
   merlin files <purpose>    Find files by purpose
-  merlin connect            Connect repo to Merlin Sights
 
 Environment:
   MERLIN_API_KEY            Your merlin.build API key
-  MERLIN_API_URL            API URL (default: https://claude-codeapi-production.up.railway.app)
+  MERLIN_API_URL            API URL (default: https://auth.merlin.build)
 
 Works with: Claude, Cursor, Windsurf, Copilot, Aider, and any AI agent!
 `);
@@ -290,6 +322,9 @@ async function main() {
     case 'connect':
       await connect();
       break;
+    case 'status':
+      await status();
+      break;
     case 'help':
     case '--help':
     case '-h':

package/files/CLAUDE.md

@@ -1,33 +1,40 @@
-# ⚡ MANDATORY FIRST ACTION — EXECUTE BEFORE ANYTHING ELSE
+# ⚡⚡⚡ STOP — READ THIS FIRST ⚡⚡⚡
 
-**THIS IS NON-NEGOTIABLE. DO THIS BEFORE READING THE USER'S MESSAGE.**
+## YOUR VERY FIRST ACTION (BEFORE ANYTHING ELSE)
 
-```
-IMMEDIATELY call: merlin_get_selected_repo
-```
+**DO NOT read the user's message yet. DO NOT start working. FIRST:**
+
+1. **Call this tool NOW:** `merlin_get_selected_repo`
 
-Then respond based on result:
+2. **Then show ONE of these responses:**
 
-**✅ Repo found in Sights:**
+**If repo IS connected:**
 ```
-🔮 Merlin connected: {repo_name} ✓
+🔮 Merlin Sights: CONNECTED ✓
+   Repository: {repo_name}
+
 What would you like to work on?
 ```
 
-**❌ Repo NOT in Sights (or no git repo detected):**
+**If repo is NOT connected:**
 ```
-🔮 This repo isn't connected to Merlin Sights yet.
+🔮 Merlin Sights: NOT CONNECTED
+
+This repository isn't in Sights yet.
 
-[1] Connect now (analysis takes 2-5 min)
+[1] Connect now (2-5 min analysis)
 [2] Skip - work without Sights
 
 Which would you like?
 ```
 
-If user picks [1]: Call `merlin_connect_repo`, then poll `merlin_check_repo_status` until ready.
-If user picks [2]: Proceed without Sights, use traditional file exploration.
+3. **WAIT for user response if not connected**
 
-**ONLY AFTER completing this flow, proceed with the user's actual request.**
+4. **ONLY THEN proceed with their actual request**
+
+---
+
+**WHY THIS MATTERS:** The user needs visual confirmation that Sights is working. Always show the 🔮 status box at session start. Never skip this step.
 
 ---
 
@@ -185,47 +192,54 @@ Merlin Sights is Claude's memory. Use it **throughout every session**, not just
 
 ---
 
-## Visual Sights Indicator
+## 🔮 VISUAL CUES — Show When Merlin Is Used
 
-**ALWAYS announce when Merlin Sights provides context.**
+**ALWAYS show a visual indicator when you query Merlin Sights.**
 
-When you receive useful information from Merlin Sights, visibly indicate it:
+After EVERY Merlin tool call, display a cue box showing what you found and whether it helped:
 
+**Format:**
 ```
-🔮 MERLIN SIGHTS
-├─ Found: AuthService.ts, UserService.ts, SessionManager.ts
-├─ Pattern: JWT with refresh tokens, middleware-based auth
-└─ Rule: max 400 lines per file ✓
+🔮 SIGHTS › [tool_name]
+   [what you searched for]
+
+   [result indicator] [brief summary of what was found]
 ```
 
-**Use this format whenever:**
-- `merlin_get_context` returns relevant files/patterns
-- `merlin_find_files` locates files for a task
-- `merlin_get_conventions` returns coding rules
-- `merlin_get_brief` provides project overview
-- `merlin_search` finds relevant information
+**Result indicators:**
+- ✅ **Helped** — Found useful files, patterns, or context
+- ⚠️ **Partial** — Found something but not exactly what was needed
+- ❌ **No match** — Nothing relevant found, using other methods
 
-**Why:** The user wants to see when Sights is providing value and how frequently it's used. Make it visible.
+**Examples:**
 
-**Quick indicators:**
-- 🔮 = Merlin Sights query
-- ✓ = Rule being followed
-- 📍 = Files located
-- 🧭 = Context provided
+```
+🔮 SIGHTS › get_context("payment processing")
+   ✅ Found PaymentService.ts, StripeClient.ts
+   Pattern: Async handlers with retry logic
+```
 
-**Example in practice:**
+```
+🔮 SIGHTS › find_files("email templates")
+   ⚠️ Partial — Found EmailService but no templates folder
+   Will check manually with Glob
+```
 
 ```
-🔮 MERLIN SIGHTS
-├─ 📍 Found 3 files for "payment logic"
-├─ 🧭 PaymentService uses Stripe SDK
-└─ ✓ test_required: true
+🔮 SIGHTS › search("GraphQL resolvers")
+   ❌ No match — This codebase uses REST, not GraphQL
+```
 
-Based on this context, I'll create the refund method in PaymentService.ts
-and add tests in __tests__/PaymentService.test.ts...
+**Quick format for rapid queries:**
+```
+🔮 get_context → ✅ Found 3 auth files
+🔮 find_files → ⚠️ Partial match
+🔮 conventions → ✅ max 400 lines, always test
 ```
 
-This lets the user see exactly when and how Sights is helping.
+**Why this matters:** The user wants to see Merlin working. Every query should be visible so they know when Sights is providing value (or when it's not and you're falling back to file exploration).
+
+---
 
 **Merlin Sights Tools:**
 - `merlin_get_context` - Task context ("add auth", "fix bug in X")

package/files/loop/config.json

@@ -32,7 +32,7 @@
     "decision": "DECISION:"
   },
   "cloud": {
-    "api_base": "https://api.merlin.build/v1",
+    "api_base": "https://auth.merlin.build/v1",
     "endpoints": {
       "sync": "/loop/sync",
       "state": "/loop/state",

package/files/loop/lib/context.sh

@@ -125,7 +125,7 @@ get_cloud_context() {
   project=$(basename "$PWD")
 
   local cloud_context
-  cloud_context=$(curl -sf "https://api.merlin.build/v1/context/relevant?project=$project&mode=$mode" \
+  cloud_context=$(curl -sf "https://auth.merlin.build/v1/context/relevant?project=$project&mode=$mode" \
     -H "Authorization: Bearer $api_key" 2>/dev/null || echo "")
 
   if [ -n "$cloud_context" ] && [ "$cloud_context" != "{}" ]; then

package/files/loop/lib/state.sh

@@ -331,7 +331,7 @@ sync_to_cloud() {
   project_id=$(get_state_value "project")
 
   # POST state to merlin.build
-  curl -sf -X POST "https://api.merlin.build/v1/loop/sync" \
+  curl -sf -X POST "https://auth.merlin.build/v1/loop/sync" \
     -H "Authorization: Bearer $api_key" \
     -H "Content-Type: application/json" \
     -d @"$STATE_FILE" \
@@ -355,7 +355,7 @@ sync_from_cloud() {
 
   # GET state from merlin.build
   local cloud_state
-  cloud_state=$(curl -sf "https://api.merlin.build/v1/loop/state/$project_id" \
+  cloud_state=$(curl -sf "https://auth.merlin.build/v1/loop/state/$project_id" \
     -H "Authorization: Bearer $api_key" 2>/dev/null || echo "")
 
   if [ -n "$cloud_state" ] && [ "$cloud_state" != "{}" ]; then
@@ -390,7 +390,7 @@ push_memory() {
   fi
 
   # Store in cloud memory for cross-session retrieval
-  curl -sf -X POST "https://api.merlin.build/v1/memory/store" \
+  curl -sf -X POST "https://auth.merlin.build/v1/memory/store" \
     -H "Authorization: Bearer $api_key" \
     -H "Content-Type: application/json" \
     -d "{\"project\":\"$(basename "$PWD")\",\"key\":\"$key\",\"value\":\"$value\"}" \
@@ -407,6 +407,6 @@ pull_memory() {
     return 0
   fi
 
-  curl -sf "https://api.merlin.build/v1/memory/get?project=$(basename "$PWD")&key=$key" \
+  curl -sf "https://auth.merlin.build/v1/memory/get?project=$(basename "$PWD")&key=$key" \
     -H "Authorization: Bearer $api_key" 2>/dev/null || echo ""
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-merlin-brain",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "The Ultimate AI Brain for Claude Code - Install Merlin workflows, agents, and sights integration",
   "main": "index.js",
   "bin": {