create-merlin-brain 5.3.3 → 5.3.5

package/files/scripts/duo-mode-read.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # duo-mode-read.sh — reads duo-mode.json, applies 24h auto-expire (read-time only, never modifies file)
 # Without --pair: prints exactly "enabled" or "disabled" to stdout
-# With --pair:    prints the pair value: "claude+codex", "claude+claude", or "none"
+# With --pair:    prints the pair value: "claude+codex", "claude+claude", "codex+codex", or "none"
 
 set -euo pipefail
 
@@ -24,48 +24,48 @@ if [[ ! -f "$STATE_FILE" ]]; then
     exit 0
 fi
 
-python3 - "$STATE_FILE" "$PAIR_MODE" <<'PYEOF'
-import sys
-import json
-from datetime import datetime, timezone, timedelta
+# Parse JSON using portable bash + sed/grep (no jq, no python required)
+enabled=$(grep -o '"enabled"[[:space:]]*:[[:space:]]*\(true\|false\)' "$STATE_FILE" 2>/dev/null | grep -o 'true\|false' || echo "false")
+since=$(grep -o '"sinceISO"[[:space:]]*:[[:space:]]*"[^"]*"' "$STATE_FILE" 2>/dev/null | sed 's/.*"\([^"]*\)"/\1/' || echo "")
+pair=$(grep -o '"pair"[[:space:]]*:[[:space:]]*"[^"]*"' "$STATE_FILE" 2>/dev/null | sed 's/.*"\([^"]*\)"/\1/' || echo "")
 
-state_path = sys.argv[1]
-pair_mode = sys.argv[2] == "true"
+# If not enabled, or sinceISO is missing/null, return default
+[[ "$enabled" != "true" ]] && { if [[ "$PAIR_MODE" == "true" ]]; then echo "none"; else echo "disabled"; fi; exit 0; }
+[[ -z "$since" || "$since" == "null" ]] && { if [[ "$PAIR_MODE" == "true" ]]; then echo "none"; else echo "disabled"; fi; exit 0; }
 
-try:
-    with open(state_path, "r") as f:
-        data = json.load(f)
-except (json.JSONDecodeError, OSError):
-    print("none" if pair_mode else "disabled")
-    sys.exit(0)
-
-enabled = data.get("enabled", False)
-since_iso = data.get("sinceISO")
-pair = data.get("pair")
+# Check 24h expiry using portable date commands (macOS has date -j, Linux has date -d)
+since_epoch=$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "$since" "+%s" 2>/dev/null || date -d "$since" "+%s" 2>/dev/null || echo "")
+if [[ -z "$since_epoch" ]]; then
+    # Unparseable timestamp — treat as expired
+    if [[ "$PAIR_MODE" == "true" ]]; then
+        echo "none"
+    else
+        echo "disabled"
+    fi
+    exit 0
+fi
 
-if not enabled or since_iso is None:
-    print("none" if pair_mode else "disabled")
-    sys.exit(0)
+now_epoch=$(date +%s)
+age=$((now_epoch - since_epoch))
 
-# Parse sinceISO and apply 24h auto-expire (read-time interpretation, no file write)
-try:
-    since_str = since_iso.replace("Z", "+00:00")
-    since_dt = datetime.fromisoformat(since_str)
-    now_dt = datetime.now(timezone.utc)
-    if (now_dt - since_dt) > timedelta(hours=24):
-        print("none" if pair_mode else "disabled")
-        sys.exit(0)
-except (ValueError, TypeError):
-    # Unparseable timestamp — treat as expired
-    print("none" if pair_mode else "disabled")
-    sys.exit(0)
+# 24 hours = 86400 seconds
+if [[ $age -gt 86400 ]]; then
+    if [[ "$PAIR_MODE" == "true" ]]; then
+        echo "none"
+    else
+        echo "disabled"
+    fi
+    exit 0
+fi
 
-if pair_mode:
+# Still enabled and within 24h
+if [[ "$PAIR_MODE" == "true" ]]; then
     # Legacy state (no pair field) when enabled defaults to claude+codex
-    if pair is None:
-        print("claude+codex")
-    else:
-        print(pair)
-else:
-    print("enabled")
-PYEOF
+    if [[ -z "$pair" || "$pair" == "null" ]]; then
+        echo "claude+codex"
+    else
+        echo "$pair"
+    fi
+else
+    echo "enabled"
+fi

package/files/scripts/merlin-codex.sh

@@ -72,10 +72,43 @@ fi
 # Otherwise prepend to the full prompt string.
 if [ "${FIRST_ARG}" = "exec" ]; then
   shift
-  # $@ is now the prompt(s) passed to codex exec
+  # Parse out flags from prompt args (preserve them for codex exec)
+  CODEX_FLAGS=()
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      -s|--sandbox|--model|--cd|-c)
+        # Flag with value
+        CODEX_FLAGS+=("$1" "$2")
+        shift 2
+        ;;
+      --skip-git-repo-check|--full-auto|--dangerously-bypass-approvals-and-sandbox)
+        # Boolean flag
+        CODEX_FLAGS+=("$1")
+        shift
+        ;;
+      --*=*)
+        # Flag with =value
+        CODEX_FLAGS+=("$1")
+        shift
+        ;;
+      --*|-*)
+        # Unknown flag — pass through with value if next arg doesn't look like a flag
+        CODEX_FLAGS+=("$1")
+        shift
+        if [[ $# -gt 0 && "$1" != -* ]]; then
+          CODEX_FLAGS+=("$1")
+          shift
+        fi
+        ;;
+      *)
+        # First non-flag arg = prompt; break and treat rest as prompt
+        break
+        ;;
+    esac
+  done
   ORIGINAL_PROMPT="${*:-}"
   FULL_PROMPT="${MERLIN_PROMPT}"$'\n\n'"---USER---"$'\n\n'"${ORIGINAL_PROMPT}"
-  exec codex exec "${FULL_PROMPT}"
+  exec codex exec "${CODEX_FLAGS[@]}" "${FULL_PROMPT}"
 else
   # Treat remaining args as a single prompt string
   ORIGINAL_PROMPT="${*:-}"

package/files/scripts/task-optimize.sh

@@ -93,6 +93,14 @@ TEST_CASES = [
     ("React component refactor", "react", "merlin-frontend", 25),
     ("useState hook pattern", "react", "merlin-frontend", 25),
     ("Next.js server component", "react", "merlin-frontend", 25),
+    ("build Android app with Kotlin", "android", "android-expert", 25),
+    ("Jetpack Compose UI for Material You", "android", "android-expert", 25),
+    ("iOS SwiftUI development", "apple", "apple-swift-expert", 25),
+    ("macOS AppKit interface", "apple", "apple-swift-expert", 25),
+    ("Electron app development", "desktop", "desktop-app-expert", 25),
+    ("Tauri system tray application", "desktop", "desktop-app-expert", 25),
+    ("email marketing campaign setup", "marketing", "marketing-automation", 25),
+    ("drip sequence for onboarding", "marketing", "marketing-automation", 25),
     ("fix the database query", "none", "", 0),
     ("rename a variable", "none", "", 0),
     ("update README", "none", "", 0),
@@ -161,6 +169,42 @@ def main():
             print(f"FAIL: '{task[:50]}...' => {reason}")
             failed += 1
 
+    # Wiring integrity: every agent in registry must have a corresponding agent file
+    print("\n" + "-" * 60)
+    print("Wiring Integrity Check")
+    print("-" * 60)
+    try:
+        with open(registry_path, 'r') as f:
+            registry = json.load(f)
+
+        registry_dir = os.path.dirname(registry_path)
+        agent_dir = os.path.join(registry_dir, '../../agents')  # files/merlin/skills/TASK-OPTIMIZER.json → files/agents/
+        if os.path.isabs(registry_dir):
+            agent_dir = os.path.abspath(agent_dir)
+
+        # Collect all agents referenced in registry
+        agents_in_registry = set()
+        for skill in registry.get('skills', []):
+            agent = skill.get('agent', '')
+            if agent:
+                agents_in_registry.add(agent)
+
+        integrity_fail = 0
+        for agent in sorted(agents_in_registry):
+            agent_file = os.path.join(agent_dir, f'{agent}.md')
+            if not os.path.isfile(agent_file):
+                print(f"✗ WIRING FAIL: agent '{agent}' referenced in registry but not in {agent_dir}/")
+                integrity_fail += 1
+
+        if integrity_fail > 0:
+            print(f"✗ WIRING INTEGRITY CHECK FAILED ({integrity_fail} agents missing)")
+            failed += 1
+        else:
+            total_agents = len(agents_in_registry)
+            print(f"✓ wiring integrity: all {total_agents} agents in registry exist on disk")
+    except Exception as e:
+        print(f"⚠ wiring integrity check skipped: {e}")
+
     print("\n" + "=" * 60)
     print(f"RESULTS: {passed} passed, {failed} failed")
     print("=" * 60)

package/files/scripts/with-timeout.sh

@@ -19,9 +19,9 @@ if ! [[ "$SECS" =~ ^[0-9]+$ ]]; then
 fi
 
 if command -v gtimeout >/dev/null 2>&1; then
-    exec gtimeout --preserve-status --signal=TERM "${SECS}s" "$@"
+    exec gtimeout --signal=TERM "${SECS}s" "$@"
 elif command -v timeout >/dev/null 2>&1; then
-    exec timeout --preserve-status --signal=TERM "${SECS}s" "$@"
+    exec timeout --signal=TERM "${SECS}s" "$@"
 else
     # Perl fork+alarm fallback (always available on macOS+Linux).
     # Must fork — exec replaces the perl process and discards the SIGALRM handler,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-merlin-brain",
-  "version": "5.3.3",
+  "version": "5.3.5",
   "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",
@@ -17,8 +17,7 @@
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest",
-    "prepublishOnly": "npm run build",
-    "postinstall": "node bin/install.cjs"
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "claude",