create-merlin-brain 3.5.1 → 3.5.3

package/bin/install.cjs

@@ -937,15 +937,18 @@ async function install() {
       return hookArray;
     };
 
-    // SessionStart hooks
+    // SessionStart: single consolidated hook (analytics + agent sync + context injection)
+    // Previously this was 3 separate hooks, causing 3x "startup hook success" messages.
+    // Now consolidated into session-start.sh which handles all three concerns.
     settings.hooks.SessionStart = settings.hooks.SessionStart || [];
-    addHookIfMissing(settings.hooks.SessionStart, {
-      hooks: [{ type: 'command', command: 'bash ~/.claude/hooks/session-start.sh' }]
+    // Remove old separate hooks if present (from previous installs)
+    settings.hooks.SessionStart = settings.hooks.SessionStart.filter(entry => {
+      const cmd = entry.hooks?.[0]?.command || '';
+      if (cmd.includes('agent-sync.sh') || cmd.includes('session-start-context.sh')) return false;
+      return true;
     });
-
-    // SessionStart hook: Agent sync (background, runs at most once/hour)
     addHookIfMissing(settings.hooks.SessionStart, {
-      hooks: [{ type: 'command', command: 'bash ~/.claude/hooks/agent-sync.sh' }]
+      hooks: [{ type: 'command', command: 'bash ~/.claude/hooks/session-start.sh' }]
     });
 
     // PreToolUse hook (Edit/Write only)
@@ -980,54 +983,54 @@ async function install() {
       hooks: [{ type: 'command', command: 'bash ~/.claude/hooks/subagent-context.sh' }]
     });
 
-    // --- Prompt-based hooks (LLM evaluates .md content) ---
-    // 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) => {
+    // --- Prompt-based hooks cleanup & registration ---
+    // Remove ALL prompt-type hooks from Merlin (identified by type: 'prompt').
+    // This prevents duplicates across version upgrades and removes broken hooks.
+    const removeAllPromptHooks = (hookArray) => {
       return hookArray.filter(entry => {
         if (!entry.hooks || !Array.isArray(entry.hooks)) return true;
-        // Remove entry if ALL its hooks are Merlin prompt hooks
-        const allMerlinPrompts = entry.hooks.every(h => {
-          if (h.type !== 'prompt') return false;
-          const prompt = (h.prompt || '').toLowerCase();
-          return prompt.includes('merlin') || prompt.includes('sights');
-        });
-        return !allMerlinPrompts;
+        // Remove entry if ALL its hooks are prompt-type (Merlin is the only
+        // source of prompt hooks in settings.local.json)
+        const allPrompts = entry.hooks.every(h => h.type === 'prompt');
+        return !allPrompts;
       });
     };
 
-    settings.hooks.SessionStart = removeMerlinPromptHooks(settings.hooks.SessionStart);
-    settings.hooks.PreToolUse = removeMerlinPromptHooks(settings.hooks.PreToolUse);
-    settings.hooks.Stop = removeMerlinPromptHooks(settings.hooks.Stop);
+    settings.hooks.SessionStart = removeAllPromptHooks(settings.hooks.SessionStart);
+    settings.hooks.PreToolUse = removeAllPromptHooks(settings.hooks.PreToolUse);
+    settings.hooks.Stop = removeAllPromptHooks(settings.hooks.Stop);
     settings.hooks.Notification = settings.hooks.Notification || [];
-    settings.hooks.Notification = removeMerlinPromptHooks(settings.hooks.Notification);
+    settings.hooks.Notification = removeAllPromptHooks(settings.hooks.Notification);
     settings.hooks.TaskCompleted = settings.hooks.TaskCompleted || [];
-    settings.hooks.TaskCompleted = removeMerlinPromptHooks(settings.hooks.TaskCompleted);
+    settings.hooks.TaskCompleted = removeAllPromptHooks(settings.hooks.TaskCompleted);
 
-    // Now add fresh prompt/command hooks in new format
-    // NOTE: SessionStart does NOT support prompt hooks (only command hooks).
-    // The Merlin boot sequence is handled via CLAUDE.md instructions instead.
-    // We use a command hook to inject additionalContext at session start.
-    addHookIfMissing(settings.hooks.SessionStart, {
-      hooks: [{ type: 'command', command: 'bash ~/.claude/hooks/session-start-context.sh' }]
-    });
+    // NOTE: The PreToolUse prompt hook has been REMOVED. It caused an infinite
+    // rejection loop because the evaluator model cannot see conversation history
+    // to verify whether merlin_get_context was called. The command-type hook
+    // (pre-edit-sights-check.sh) handles advisory logging instead.
+    // Sights enforcement is done via CLAUDE.md instructions, not hook blocking.
 
-    // Prompt-based PreToolUse hook: evaluate Sights check before edits
-    settings.hooks.PreToolUse.push({
-      matcher: 'Edit|Write',
-      hooks: [{ type: 'prompt', prompt: fs.readFileSync(path.join(HOOKS_DIR, 'pre-edit-sights-enforce.md'), 'utf8') }]
-    });
-
-    // Prompt-based Stop hook: evaluate whether stopping is appropriate
-    settings.hooks.Stop.push({
-      hooks: [{ type: 'prompt', prompt: fs.readFileSync(path.join(HOOKS_DIR, 'stop-check.md'), 'utf8') }]
-    });
-
-    // Task completion verification hook (using dedicated TaskCompleted event)
-    settings.hooks.TaskCompleted.push({
-      hooks: [{ type: 'prompt', prompt: fs.readFileSync(path.join(HOOKS_DIR, 'task-completed-verify.md'), 'utf8') }]
-    });
+    // ═══════════════════════════════════════════════════════════════
+    // PROMPT HOOKS PERMANENTLY REMOVED (v3.5.3)
+    // ═══════════════════════════════════════════════════════════════
+    // Stop and TaskCompleted prompt hooks have been REMOVED because:
+    //
+    // 1. The evaluator model (Haiku) frequently wraps JSON responses
+    //    in markdown code fences or adds explanatory text, causing
+    //    "JSON validation failed" errors on every session stop.
+    //
+    // 2. This is inherent to prompt-type hooks — they depend on a
+    //    small model producing byte-perfect JSON output, which is
+    //    unreliable.
+    //
+    // 3. Stop behavior is already governed by CLAUDE.md instructions.
+    //    Task completion verification is handled by the session's own
+    //    Claude instance, which has full conversation context (unlike
+    //    the tiny evaluator model).
+    //
+    // The removeAllPromptHooks() calls above (lines ~996-1002) will
+    // clean up existing prompt hooks from previous installs.
+    // ═══════════════════════════════════════════════════════════════
 
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
     logSuccess('Configured hooks in settings.local.json');

package/files/hooks/pre-edit-sights-enforce.md

@@ -1,12 +1 @@
-You are evaluating whether a file edit should proceed. Context: $ARGUMENTS
-
-Check: Has the assistant recently called merlin_get_context, merlin_find_files, or merlin_search for this file's area in the current conversation? Look at recent tool calls in the transcript.
-
-Rules:
-- If Sights was consulted recently (within the last few messages) for this area: allow the edit
-- If this is a minor/trivial edit (formatting, typo fix, small change): allow the edit
-- If this is a significant edit and Sights was NOT consulted: suggest checking first
-
-Respond with ONLY valid JSON, no other text:
-- Allow the edit: {"ok": true}
-- Suggest Sights check first: {"ok": false, "reason": "Call merlin_get_context before editing this file to check for existing patterns and conventions"}
+Always allow this edit. Respond with ONLY: {"ok": true}

package/files/hooks/session-start.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 #
-# Merlin Hook: SessionStart
-# Initializes analytics session and kicks off Sights context in background.
+# Merlin Hook: SessionStart (consolidated)
+# Does three things in a single hook (avoids 3x "success" messages):
+#   1. Analytics: initialize session, log start event
+#   2. Agent sync: refresh agent files from cloud (background, max once/hour)
+#   3. Context injection: output additionalContext for the session
+#
 # Always exits 0 — never blocks Claude Code startup.
 #
 set -euo pipefail
@@ -9,25 +13,73 @@ trap 'echo "{}"; exit 0' ERR
 
 HOOKS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Source shared libraries
+# ── 1. Analytics ────────────────────────────────────────────────
 # shellcheck source=lib/analytics.sh
 . "${HOOKS_DIR}/lib/analytics.sh"
 # shellcheck source=lib/sights-check.sh
 . "${HOOKS_DIR}/lib/sights-check.sh"
 
-# Initialize analytics session
 ensure_session_file
-
-# Log session start with working directory
 cwd="${PWD:-$(pwd)}"
 log_event "session_start" "$(printf '{"cwd":"%s"}' "$cwd")"
 
-# If merlin CLI is available, warm up Sights context in background
+# Warm up Sights context in background
 if command -v merlin >/dev/null 2>&1; then
   merlin context "session start" >/dev/null 2>&1 &
   record_sights_call
 fi
 
-# Claude Code command hooks must output valid JSON to stdout
-echo '{}'
+# ── 2. Agent sync (background, max once/hour) ──────────────────
+_merlin_sync_agents() {
+  local agents_dir="${HOME}/.claude/agents"
+  local merlin_dir="${HOME}/.claude/merlin"
+  local last_sync="${merlin_dir}/.last-agent-sync"
+  local api_url="${MERLIN_API_URL:-https://api.merlin.build}"
+
+  [ -d "${agents_dir}" ] || return 0
+
+  # Skip if synced within the last hour
+  if [ -f "${last_sync}" ]; then
+    local last
+    last=$(cat "${last_sync}" 2>/dev/null || echo "0")
+    [ $(($(date +%s) - last)) -lt 3600 ] && return 0
+  fi
+
+  local installed=""
+  for f in "${agents_dir}"/*.md; do
+    [ -f "${f}" ] || continue
+    local name hash
+    name=$(basename "${f}" .md)
+    hash=$(md5sum "${f}" 2>/dev/null | cut -c1-8 || md5 -q "${f}" 2>/dev/null | cut -c1-8 || echo "unknown")
+    installed="${installed}${name}:${hash},"
+  done
+
+  local response
+  response=$(curl -s --max-time 5 "${api_url}/api/agents-sync/check?installed=${installed}" 2>/dev/null) || return 0
+  local stale_names
+  stale_names=$(echo "${response}" | grep -o '"name":"[^"]*"' | sed 's/"name":"//;s/"//' 2>/dev/null) || return 0
+  [ -z "${stale_names}" ] && { date +%s > "${last_sync}"; return 0; }
+
+  for agent_name in ${stale_names}; do
+    local content md_content
+    content=$(curl -s --max-time 5 "${api_url}/api/agents-sync/${agent_name}" 2>/dev/null) || continue
+    md_content=$(echo "${content}" | python3 -c "import sys,json;print(json.load(sys.stdin).get('content',''))" 2>/dev/null) || continue
+    [ -n "${md_content}" ] && echo "${md_content}" > "${agents_dir}/${agent_name}.md"
+  done
+  date +%s > "${last_sync}"
+}
+_merlin_sync_agents &
+
+# ── 3. Context injection (the only stdout output) ──────────────
+# Output additionalContext JSON for Claude to see at session start.
+# Full boot instructions are in CLAUDE.md — this is a lightweight nudge.
+cat <<'CONTEXT_JSON'
+{
+  "hookSpecificOutput": {
+    "hookEventName": "SessionStart",
+    "additionalContext": "You are a Merlin-powered session. Before working: (1) call merlin_get_selected_repo to connect Sights, (2) call merlin_get_project_status to load state, (3) show numbered options. Check Sights before every edit. Route complex tasks to specialists via /merlin:route. Save checkpoints before stopping."
+  }
+}
+CONTEXT_JSON
+
 exit 0

package/package.json

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