create-merlin-brain 5.0.0 → 5.0.2

package/README.md

@@ -153,6 +153,19 @@ When enabled, the badge swaps to `⟡🔮↔🔮 MERLIN·DUO ›` so you always
 
 Full rules: `~/.claude/rules/duo-routing.md`.
 
+## Standalone Codex Users
+
+If you run Codex directly (without Claude Code), use `merlin-codex` as a drop-in wrapper to get the Merlin orchestrator persona on every invocation:
+
+```bash
+merlin-codex                        # opens interactive Codex shell with Merlin banner
+merlin-codex exec "add auth login"  # exec with Merlin system prompt prepended
+merlin-codex "fix the failing test" # prompt mode with Merlin prompt prepended
+merlin-codex login                  # pass-through — no prompt injection
+```
+
+The wrapper prints the Merlin banner to stderr, loads `~/.claude/merlin-system-prompt.txt` (falls back to a one-liner if missing), and forwards all management subcommands (`login`, `logout`, `mcp`, etc.) unchanged.
+
 ## Documentation
 
 Visit [merlin.build/docs](https://merlin.build/docs) for full documentation.

package/files/CLAUDE.md

@@ -90,6 +90,8 @@ Merlin can delegate code execution to OpenAI Codex while Claude handles planning
 
 **Brain/hands split:** Codex writes code; Claude always verifies via `merlin_run_verification()`.
 
+**Standalone Codex users:** invoke `merlin-codex` instead of `codex` to get the Merlin orchestrator persona.
+
 ## Duo Mode (parallel + sequential dual-brain)
 
 Duo mode runs Claude AND Codex on the same task — parallel for planning/docs/review/tests, sequential for code write/modify. The decider merges (parallel) or gates (sequential).

package/files/hooks/session-start.sh

@@ -199,8 +199,94 @@ _merlin_check_voice_mode
 _voice_note=""
 [ "${MERLIN_VOICE_MODE:-}" = "1" ] && _voice_note=" Voice mode active: keep all responses short and direct."
 
-# Build the additionalContext with embedded routing rules.
-_context="STOP. Your FIRST action must be: call merlin_get_selected_repo, then call merlin_get_project_status, then call merlin_get_rules and merlin_get_brief in parallel. Do not respond to the user until you complete the boot sequence."
+# ── 4a. Session banner (best-effort, all reads use || true) ────
+_SCRIPTS_DIR="${HOME}/.claude/scripts"
+
+# Project name: git basename or pwd basename (handle spaces in path)
+_git_top=$(git -C "${PWD}" rev-parse --show-toplevel 2>/dev/null || true)
+if [ -n "${_git_top:-}" ]; then
+  _project_name=$(basename "${_git_top}" 2>/dev/null || true)
+else
+  _project_name=$(basename "${PWD}" 2>/dev/null || true)
+fi
+if [ -z "${_project_name:-}" ]; then
+  _project_name="project"
+fi
+
+# Mode: Solo or Duo
+_duo_status="disabled"
+if [ -x "${_SCRIPTS_DIR}/duo-mode-read.sh" ]; then
+  _duo_status=$("${_SCRIPTS_DIR}/duo-mode-read.sh" 2>/dev/null || echo "disabled")
+fi
+_duo_installed=false
+if [ -x "${_SCRIPTS_DIR}/duo-installed.sh" ]; then
+  if "${_SCRIPTS_DIR}/duo-installed.sh" 2>/dev/null; then
+    _duo_installed=true
+  fi
+fi
+if [ "${_duo_status}" = "enabled" ] && [ "${_duo_installed}" = "true" ]; then
+  _mode_label="Duo"
+else
+  _mode_label="Solo"
+fi
+
+# Codex: installed or missing
+_codex_label="missing"
+if [ -x "${_SCRIPTS_DIR}/codex-installed.sh" ]; then
+  if "${_SCRIPTS_DIR}/codex-installed.sh" 2>/dev/null; then
+    _codex_label="installed"
+  fi
+fi
+
+# Badge: use duo-badge.sh if available
+_badge="⟡🔮 MERLIN ›"
+if [ -x "${_SCRIPTS_DIR}/duo-badge.sh" ]; then
+  _badge=$("${_SCRIPTS_DIR}/duo-badge.sh" 2>/dev/null || echo "⟡🔮 MERLIN ›")
+fi
+
+# Recommended next action (priority order, all reads use || true)
+_next_action="Ready: ask anything or /merlin:help"
+if [ -f "${HOME}/.merlin/state/active-plan.md" ] || \
+   [ -f "${HOME}/.claude/merlin/active-plan.md" ] || \
+   [ -f "${PWD}/PLAN.md" ]; then
+  _next_action="Continue execution: /merlin:execute-phase"
+elif [ -f "${HOME}/.merlin/state/verification.json" ]; then
+  _vfailed=""
+  if command -v jq >/dev/null 2>&1; then
+    _vfailed=$(jq -r '.status // ""' "${HOME}/.merlin/state/verification.json" 2>/dev/null || echo "")
+  fi
+  if [ "${_vfailed:-}" = "failed" ]; then
+    _next_action="Verification failed last time — investigate or rerun"
+  fi
+fi
+if [ "${_next_action}" = "Ready: ask anything or /merlin:help" ]; then
+  if git -C "${PWD}" rev-parse --git-dir >/dev/null 2>&1 && [ ! -f "${PWD}/PROJECT.md" ]; then
+    _next_action="New project: /merlin:new-project"
+  fi
+fi
+if [ "${_next_action}" = "Ready: ask anything or /merlin:help" ] && \
+   [ -f "${HOME}/.merlin/state/tasks.json" ]; then
+  _pending=0
+  if command -v jq >/dev/null 2>&1; then
+    _tdone=$(jq '.done // 0' "${HOME}/.merlin/state/tasks.json" 2>/dev/null || echo "0")
+    _ttotal=$(jq '.total // 0' "${HOME}/.merlin/state/tasks.json" 2>/dev/null || echo "0")
+    if [ "${_ttotal:-0}" -gt 0 ] 2>/dev/null && [ "${_tdone:-0}" -lt "${_ttotal:-0}" ] 2>/dev/null; then
+      _pending=$(( _ttotal - _tdone ))
+    fi
+  fi
+  if [ "${_pending:-0}" -gt 0 ] 2>/dev/null; then
+    _next_action="${_pending} tasks pending: /merlin:next"
+  fi
+fi
+
+# Banner line 1: "⟡🔮 MERLIN · connected · {project}" (spec format)
+# Use the badge prefix (everything before "MERLIN") plus fixed text so
+# "MERLIN · connected" always appears regardless of duo/solo badge variant.
+_badge_prefix=$(echo "${_badge}" | sed 's/MERLIN.*//' 2>/dev/null || true)
+_banner="${_badge_prefix}MERLIN · connected · ${_project_name} | Mode: ${_mode_label} · Codex: ${_codex_label} | Next: ${_next_action}"
+
+# ── 4b. Build the additionalContext with banner + routing rules ─
+_context="${_banner} || STOP. Your FIRST action must be: call merlin_get_selected_repo, then call merlin_get_project_status, then call merlin_get_rules and merlin_get_brief in parallel. Do not respond to the user until you complete the boot sequence."
 _context="${_context} AFTER BOOT — MANDATORY ROUTING (you MUST follow this, do NOT skip):"
 _context="${_context} Bug/crash/error logs/deploy failure: use Skill(merlin:workflow, args=run bug-fix <summary>)."
 _context="${_context} Build feature/add feature: use Skill(merlin:workflow, args=run feature-dev <summary>)."

package/files/hooks/statusline.sh

@@ -9,6 +9,7 @@
 #   {"hookSpecificOutput":{"hookEventName":"Notification","statusLine":"..."}}
 #
 # Metrics included:
+#   - Merlin badge    (from ~/.claude/scripts/duo-badge.sh — duo-aware)
 #   - Merlin version  (from ~/.claude/merlin/VERSION)
 #   - Active agents   (from ~/.merlin/state/agents.json)
 #   - Task progress   (from ~/.merlin/state/tasks.json)
@@ -132,8 +133,15 @@ else
   RATE_DISPLAY="OK"
 fi
 
+# ── Badge (duo-aware) ──────────────────────────────────────────────────────
+SCRIPTS_DIR="${HOME}/.claude/scripts"
+BADGE="⟡🔮 MERLIN ›"
+if [ -x "${SCRIPTS_DIR}/duo-badge.sh" ]; then
+  BADGE=$("${SCRIPTS_DIR}/duo-badge.sh" 2>/dev/null || echo "⟡🔮 MERLIN ›")
+fi
+
 # ── Compose statusline ─────────────────────────────────────────────────────
-STATUSLINE="v${MERLIN_VERSION} | ${AGENT_COUNT} agents | ${TASKS_DISPLAY} | ${COST_DISPLAY} | ${GIT_BRANCH} | ctx:${CTX_DISPLAY} | rate:${RATE_DISPLAY}"
+STATUSLINE="${BADGE} v${MERLIN_VERSION} | ${AGENT_COUNT} agents | ${TASKS_DISPLAY} | ${COST_DISPLAY} | ${GIT_BRANCH} | ctx:${CTX_DISPLAY} | rate:${RATE_DISPLAY}"
 
 # ── Output ─────────────────────────────────────────────────────────────────
 if command -v jq >/dev/null 2>&1; then

package/files/hooks/user-prompt-router.sh

@@ -6,7 +6,7 @@
 # session start.
 #
 # Contract:
-#   - Reads JSON from stdin: {"userPrompt": "..."}
+#   - Reads JSON from stdin: {"prompt": "..."}
 #   - Outputs {} when no pattern matches (no noise)
 #   - Outputs additionalContext JSON when a routing signal is found
 #   - MUST be <100ms: no network calls, no merlin CLI, no curl
@@ -23,13 +23,13 @@ fi
 
 [ -z "$input" ] && echo "{}" && exit 0
 
-# ── Extract userPrompt ────────────────────────────────────────────────────────
+# ── Extract prompt ────────────────────────────────────────────────────────
 prompt=""
 if command -v jq >/dev/null 2>&1; then
-  prompt=$(echo "$input" | jq -r '.userPrompt // empty' 2>/dev/null || true)
+  prompt=$(echo "$input" | jq -r '.prompt // empty' 2>/dev/null || true)
 else
   # Minimal extraction without jq — strip surrounding JSON scaffolding
-  prompt=$(echo "$input" | sed 's/.*"userPrompt"[[:space:]]*:[[:space:]]*"\(.*\)".*/\1/' 2>/dev/null || true)
+  prompt=$(echo "$input" | sed 's/.*"prompt"[[:space:]]*:[[:space:]]*"\(.*\)".*/\1/' 2>/dev/null || true)
 fi
 
 [ -z "$prompt" ] && echo "{}" && exit 0

package/files/scripts/merlin-codex.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+#
+# merlin-codex.sh — Merlin-aware Codex CLI wrapper
+#
+# Prints the Merlin engagement banner to stderr and injects the Merlin
+# orchestrator system prompt into every Codex invocation. Pass-through
+# subcommands (login, logout, mcp, etc.) are forwarded unchanged.
+#
+# Usage:
+#   merlin-codex                        # interactive Codex shell with Merlin banner
+#   merlin-codex exec "list files"      # exec with Merlin prompt prepended
+#   merlin-codex "fix the auth bug"     # prompt with Merlin prompt prepended
+#   merlin-codex --help                 # forwarded directly to codex
+#   merlin-codex login                  # forwarded directly (no prompt injection)
+#
+set -euo pipefail
+
+SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SYSTEM_PROMPT_FILE="${HOME}/.claude/merlin-system-prompt.txt"
+FALLBACK_PROMPT="You are Merlin: orchestrator, not coder. Route implementation to specialists. Badge every action with ⟡🔮 MERLIN ›."
+
+# ── Pass-through subcommands (no Merlin prompt injection) ──────
+PASSTHROUGH_CMDS="login logout mcp mcp-server app app-server completion sandbox debug"
+
+# ── Determine duo mode for banner ──────────────────────────────
+_mode_label="Solo"
+if [ -x "${SCRIPTS_DIR}/duo-mode-read.sh" ]; then
+  _duo=$("${SCRIPTS_DIR}/duo-mode-read.sh" 2>/dev/null) || _duo="disabled"
+  if [ "${_duo}" = "enabled" ]; then
+    if [ -x "${SCRIPTS_DIR}/duo-installed.sh" ]; then
+      "${SCRIPTS_DIR}/duo-installed.sh" 2>/dev/null && _mode_label="Duo" || true
+    fi
+  fi
+fi
+
+# ── Print banner to stderr (always) ───────────────────────────
+printf '⟡🔮 MERLIN · entering Codex via merlin-codex\n' >&2
+printf '🎯 Mode: %s\n' "${_mode_label}" >&2
+printf '▶ Codex will inherit Merlin'"'"'s orchestrator instructions\n' >&2
+
+# ── If no args, open interactive Codex shell ──────────────────
+if [ $# -eq 0 ]; then
+  exec codex
+fi
+
+# ── Check for pass-through subcommand or flags ────────────────
+FIRST_ARG="${1:-}"
+for cmd in ${PASSTHROUGH_CMDS}; do
+  if [ "${FIRST_ARG}" = "${cmd}" ]; then
+    exec codex "$@"
+  fi
+done
+# Also pass through if first arg is a flag like --help, --version
+if [[ "${FIRST_ARG}" == --* ]] || [[ "${FIRST_ARG}" == -* ]]; then
+  exec codex "$@"
+fi
+
+# ── Load Merlin system prompt ──────────────────────────────────
+MERLIN_PROMPT="${FALLBACK_PROMPT}"
+if [ -f "${SYSTEM_PROMPT_FILE}" ]; then
+  MERLIN_PROMPT=$(cat "${SYSTEM_PROMPT_FILE}" 2>/dev/null) || MERLIN_PROMPT="${FALLBACK_PROMPT}"
+fi
+
+# ── Inject Merlin prompt into Codex invocation ─────────────────
+# Try -c instructions= config override first (documented Codex flag).
+# If the subcommand is "exec", inject into the prompt argument.
+# Otherwise prepend to the full prompt string.
+if [ "${FIRST_ARG}" = "exec" ]; then
+  shift
+  # $@ is now the prompt(s) passed to codex exec
+  ORIGINAL_PROMPT="${*:-}"
+  FULL_PROMPT="${MERLIN_PROMPT}"$'\n\n'"---USER---"$'\n\n'"${ORIGINAL_PROMPT}"
+  exec codex exec "${FULL_PROMPT}"
+else
+  # Treat remaining args as a single prompt string
+  ORIGINAL_PROMPT="${*:-}"
+  FULL_PROMPT="${MERLIN_PROMPT}"$'\n\n'"---USER---"$'\n\n'"${ORIGINAL_PROMPT}"
+  exec codex "${FULL_PROMPT}"
+fi

package/package.json

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