create-merlin-brain 5.4.3 → 5.4.4

package/bin/install.cjs

@@ -1400,20 +1400,16 @@ async function install() {
     // clean up existing prompt hooks from previous installs.
     // ═══════════════════════════════════════════════════════════════
 
-    // Configure Merlin statusline
-    settings.statusline = settings.statusline || {};
-    settings.statusline.enabled = true;
-    settings.statusline.items = settings.statusline.items || [];
-
-    // Add Merlin status if not already present
-    const hasMerlinStatus = settings.statusline.items.some(item =>
-      item.command && item.command.includes('merlin')
-    );
-    if (!hasMerlinStatus) {
-      settings.statusline.items.push({
-        command: 'bash -c \'echo "⟡🔮 MERLIN"\'',
-        interval: 30
-      });
+    // Configure Merlin statusLine — the ALWAYS-ON purple Merlin presence.
+    // Claude Code uses `statusLine` (camelCase): a command whose plain-text
+    // stdout is rendered. The old lowercase `statusline.items` block was a no-op
+    // (not a format Claude Code reads), so Merlin never actually appeared.
+    // Wire up the real command, but never clobber a user's custom statusLine.
+    if (settings.statusline) delete settings.statusline; // remove legacy no-op
+    const merlinStatusCmd = 'sh ~/.claude/scripts/merlin-statusline.sh';
+    const existingStatus = settings.statusLine && settings.statusLine.command;
+    if (!existingStatus || existingStatus.includes('merlin-statusline')) {
+      settings.statusLine = { type: 'command', command: merlinStatusCmd };
     }
 
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));

package/files/commands/merlin/duo.md

@@ -0,0 +1,75 @@
+---
+name: merlin:duo
+description: Toggle and inspect Merlin's duo mode — parallel + sequential dual-brain (Claude+Codex or twin-Claude) execution. Subcommands: on, off, status, unsuppress, offer.
+argument-hint: "[on|off|status|unsuppress|offer]"
+allowed-tools:
+  - Bash
+  - Read
+---
+
+<objective>
+Manage Merlin's duo mode. Duo runs two brains on the same task — parallel for
+plans/docs/review/tests, sequential for code write/modify — with an arbiter
+merging or a decider gating. This command is the registered entry point for
+`/merlin:duo` and `Skill("merlin:duo", args="…")`.
+
+State lives in `~/.claude/merlin-state/duo-mode.json` (24h auto-expire). The
+canonical routing rules are `~/.claude/rules/duo-routing.md` — this command only
+toggles/inspects state; it does not duplicate routing logic.
+</objective>
+
+<dispatch>
+Parse the argument (default to `status` when none is given) and run the matching
+section. Each section drives the shell scripts under `~/.claude/scripts/`; the
+detailed prose for each lives in `~/.claude/merlin/skills/duo/<sub>.md`.
+
+- `on`        → enable duo (see Step: ON)
+- `off`       → disable duo (see Step: OFF)
+- `status`    → report state (see Step: STATUS)
+- `unsuppress`→ clear suppression memory (see Step: UNSUPPRESS)
+- `offer`     → present the duo opt-in for a risky task (see Step: OFFER)
+</dispatch>
+
+<step name="ON">
+## ON
+1. `~/.claude/scripts/duo-mode-read.sh` — if it prints `enabled`, duo is already on; show status and stop.
+2. Detect pair: `~/.claude/scripts/codex-installed.sh` (exit 0 → `claude+codex`, else `claude+claude`); `MERLIN_RUNTIME=codex` → `codex+codex`.
+3. Enable: `~/.claude/scripts/duo-mode-write.sh on "<the user phrase that triggered enable>" "$PAIR"`.
+4. Compute badge with `~/.claude/scripts/duo-badge.sh` and emit the pair-specific confirmation block from `~/.claude/merlin/skills/duo/on.md`.
+5. If `codex-mode.json` is also enabled, append: `(codex-mode also active — duo wins per precedence rule)`.
+</step>
+
+<step name="OFF">
+## OFF
+1. `~/.claude/scripts/duo-mode-write.sh off "<the user phrase that triggered disable>"`.
+2. Check `~/.claude/merlin-state/codex-mode.json`.
+3. Emit: if codex-mode still active → `⟡🔮 MERLIN › Duo off. (codex-mode is still active.)`; otherwise → `⟡🔮 MERLIN › Duo off. Back to solo routing.`
+</step>
+
+<step name="STATUS">
+## STATUS
+Follow `~/.claude/merlin/skills/duo/status.md`: parse `duo-mode.json` with 24h
+expiry logic, check the Codex install gate, parse `duo-suppress.json`, and emit
+ON / OFF / AUTO-EXPIRED plus gate + suppression lines. Always prefix with the
+badge from `~/.claude/scripts/duo-badge.sh`.
+</step>
+
+<step name="UNSUPPRESS">
+## UNSUPPRESS
+Follow `~/.claude/merlin/skills/duo/unsuppress.md` to clear `session_skip`,
+`never_for_intents`, and `task_hashes_declined` in `duo-suppress.json`, then
+confirm what was cleared.
+</step>
+
+<step name="OFFER">
+## OFFER
+Follow `~/.claude/merlin/skills/duo/offer.md`: present the one-shot duo opt-in
+for a risky task, record the user's choice in `duo-suppress.json`, and route
+accordingly. Never offer mid-flight or more than once per task.
+</step>
+
+<notes>
+- Badge: ALWAYS prefix output with `~/.claude/scripts/duo-badge.sh` output (`⟡🔮↔🔮 MERLIN·DUO ›` when on, `⟡🔮 MERLIN ›` when off).
+- The gate authority `reviewer-decider` is Claude-only and must never run via `codex-as.sh`.
+- If a script is missing, fall back to writing `duo-mode.json` directly per the schema in `duo-routing.md` and say so — do not silently no-op.
+</notes>

package/files/scripts/merlin-statusline.sh

@@ -0,0 +1,62 @@
+#!/bin/sh
+# Merlin statusLine command — PLAIN TEXT output for Claude Code's `statusLine`.
+#
+# Always-on, model-independent "is Merlin active?" indicator: a purple Merlin
+# badge (duo-aware) + version, followed by the live model / dir / context%.
+# Unlike the in-chat badge (which is model behavior and drifts), this renders on
+# every status refresh regardless of what the model does.
+#
+# IMPORTANT: Claude Code's statusLine takes the command's STDOUT as literal text
+# (ANSI allowed). Do NOT emit JSON here — that is the Notification-hook format
+# (see hooks/statusline.sh), which Claude Code would print verbatim.
+#
+# Reads session JSON from stdin. Local files only — no network. Fast (<100ms).
+
+input=$(cat)
+
+# ── parse stdin (jq if present, grep fallback) ──
+if command -v jq >/dev/null 2>&1; then
+  model=$(printf '%s' "$input" | jq -r '.model.display_name // "Claude"' 2>/dev/null)
+  cwd=$(printf '%s' "$input" | jq -r '.workspace.current_dir // .cwd // ""' 2>/dev/null)
+  used=$(printf '%s' "$input" | jq -r '.context_window.used_percentage // empty' 2>/dev/null)
+else
+  model=$(printf '%s' "$input" | grep -o '"display_name":"[^"]*"' | head -1 | cut -d'"' -f4)
+  cwd=$(printf '%s' "$input" | grep -o '"current_dir":"[^"]*"' | head -1 | cut -d'"' -f4)
+  used=""
+fi
+[ -z "$model" ] && model="Claude"
+dir=$(basename "$cwd" 2>/dev/null)
+[ -z "$dir" ] && dir="project"
+
+# ── Merlin badge (duo-aware) ──
+badge="⟡🔮 MERLIN ›"
+if [ -x "$HOME/.claude/scripts/duo-badge.sh" ]; then
+  b=$("$HOME/.claude/scripts/duo-badge.sh" 2>/dev/null)
+  [ -n "$b" ] && badge="$b"
+fi
+
+# ── version (best-effort) ──
+mver=""
+if [ -f "$HOME/.claude/merlin/VERSION" ]; then
+  v=$(cat "$HOME/.claude/merlin/VERSION" 2>/dev/null)
+  [ -n "$v" ] && mver=" \033[90mv${v}\033[0m"
+fi
+
+# ── context% indicator (green/yellow/red) ──
+ctx_part=""
+if [ -n "$used" ]; then
+  ui=$(printf "%.0f" "$used" 2>/dev/null)
+  if [ -n "$ui" ]; then
+    if [ "$ui" -ge 80 ] 2>/dev/null; then
+      ctx_part=" \033[31m${ui}%ctx\033[0m"
+    elif [ "$ui" -ge 50 ] 2>/dev/null; then
+      ctx_part=" \033[33m${ui}%ctx\033[0m"
+    else
+      ctx_part=" \033[32m${ui}%ctx\033[0m"
+    fi
+  fi
+fi
+
+# Bold magenta badge leads so the purple Merlin icon is always visible.
+printf "\033[1;35m%s\033[0m%s \033[90m·\033[0m \033[36m%s\033[0m \033[90m%s\033[0m%s" \
+  "$badge" "$mver" "$model" "$dir" "$ctx_part"

package/package.json

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