nexo-brain 2.2.0 → 2.3.1

package/src/scripts/nexo-watchdog.sh

@@ -32,39 +32,97 @@ TS_EPOCH=$(date +%s)
 log() { echo "[$TS] $1" >> "$LOG"; }
 
 # ============================================================================
-# MONITOR REGISTRY — Add new monitors here
+# MONITOR REGISTRY — generated dynamically from manifest.json
 # ============================================================================
-# Format: NAME|PLIST_ID|LOG_STDOUT|LOG_STDERR|MAX_STALE_SECS|PROCESS_GREP|SCHEDULE_DESC
+# Format: NAME|PLIST_ID|LOG_STDOUT|LOG_STDERR|MAX_STALE_SECS|PROCESS_GREP|SCHEDULE_DESC|TYPE
 #
 # MAX_STALE_SECS: how old stdout log can be before WARN.
 #   0 = skip staleness check (for one-shot or infrequent tasks)
 #   WARN at MAX_STALE_SECS, FAIL at 3x MAX_STALE_SECS
 # PROCESS_GREP: pattern to grep in ps (empty = skip process check)
 # ============================================================================
-# TYPE field: "core" = part of NEXO (goes to public repo), "personal" = user-specific
-# Format: NAME|PLIST_ID|LOG_STDOUT|LOG_STDERR|MAX_STALE_SECS|PROCESS_GREP|SCHEDULE_DESC|TYPE
-# Add your own monitors below. Core NEXO services are listed as examples.
-MONITORS=(
-  "Catchup|com.nexo.catchup|$NEXO_HOME/logs/catchup-stdout.log|$NEXO_HOME/logs/catchup-stderr.log|0||RunAtLoad once|core"
-  "Cognitive Decay|com.nexo.cognitive-decay|$NEXO_HOME/logs/cognitive-decay-stdout.log|$NEXO_HOME/logs/cognitive-decay-stderr.log|90000||Daily 3:00 AM|core"
-  "Evolution|com.nexo.evolution|$NEXO_HOME/logs/evolution-stdout.log|$NEXO_HOME/logs/evolution-stderr.log|0||Weekly Sun 3:00 AM|core"
-  "GitHub Monitor|com.nexo.github-monitor|$NEXO_HOME/logs/github-monitor-stdout.log|$NEXO_HOME/logs/github-monitor-stderr.log|90000||Daily 8:00 AM|core"
-  "Immune|com.nexo.immune|$NEXO_HOME/logs/immune-stdout.log|$NEXO_HOME/logs/immune-stderr.log|3600||Every 30 min|core"
-  "Postmortem|com.nexo.postmortem|$NEXO_HOME/logs/postmortem-stdout.log|$NEXO_HOME/logs/postmortem-stderr.log|90000||Daily 23:30|core"
-  "Prevent Sleep|com.nexo.prevent-sleep|||0|caffeinate|KeepAlive|core"
-  "Self Audit|com.nexo.self-audit|$NEXO_HOME/logs/self-audit-stdout.log|$NEXO_HOME/logs/self-audit-stderr.log|90000||Daily 7:00 AM|core"
-  "Sleep|com.nexo.sleep|$NEXO_HOME/logs/sleep-stdout.log|$NEXO_HOME/logs/sleep-stderr.log|90000||Daily 4:00 AM|core"
-  "Synthesis|com.nexo.synthesis|$NEXO_HOME/logs/synthesis-stdout.log|$NEXO_HOME/logs/synthesis-stderr.log|10800||Every 2 hours|core"
-  "Deep Sleep|com.nexo.deep-sleep|$NEXO_HOME/logs/deep-sleep-stdout.log|$NEXO_HOME/logs/deep-sleep-stderr.log|90000||Daily 4:30 AM|core"
-  "Followup Hygiene|com.nexo.followup-hygiene|$NEXO_HOME/logs/followup-hygiene-stdout.log|$NEXO_HOME/logs/followup-hygiene-stderr.log|604800||Weekly Sun 5:00 AM|core"
-  # Add your own personal monitors below (type "personal"):
+# Core monitors are built from crons/manifest.json (single source of truth).
+# The NEXO_CODE env var must point to the repo src/ directory.
+# Add personal (non-manifest) monitors to PERSONAL_MONITORS below.
+NEXO_CODE="${NEXO_CODE:-$(cd "$(dirname "$0")/.." 2>/dev/null && pwd)}"
+MANIFEST_FILE="$NEXO_CODE/crons/manifest.json"
+
+_build_monitors_from_manifest() {
+  if [ ! -f "$MANIFEST_FILE" ]; then
+    log "WARNING: manifest.json not found at $MANIFEST_FILE — no core monitors loaded"
+    return
+  fi
+  python3 -c "
+import json, sys
+
+nexo_home = '$NEXO_HOME'
+
+with open('$MANIFEST_FILE') as f:
+    data = json.load(f)
+
+for c in data.get('crons', []):
+    cid = c['id']
+    # Derive human-readable name from id
+    name = cid.replace('-', ' ').title()
+    plist_id = 'com.nexo.' + cid
+    stdout_log = nexo_home + '/logs/' + cid + '-stdout.log'
+    stderr_log = nexo_home + '/logs/' + cid + '-stderr.log'
+
+    # Derive max_stale_secs and schedule_desc from schedule config
+    if c.get('run_at_load'):
+        max_stale = 0
+        schedule_desc = 'RunAtLoad once'
+    elif 'interval_seconds' in c:
+        iv = c['interval_seconds']
+        # Allow 2x the interval before WARN
+        max_stale = iv * 2
+        if iv >= 3600:
+            schedule_desc = f'Every {iv // 3600}h'
+        else:
+            schedule_desc = f'Every {iv // 60} min'
+    elif 'schedule' in c:
+        s = c['schedule']
+        h = s.get('hour', 0)
+        m = s.get('minute', 0)
+        if 'weekday' in s:
+            days = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat']
+            schedule_desc = f'Weekly {days[s[\"weekday\"]]} {h}:{m:02d}'
+            max_stale = 0  # weekly tasks: skip staleness
+        else:
+            schedule_desc = f'Daily {h}:{m:02d}'
+            max_stale = 90000  # ~25h
+    else:
+        max_stale = 0
+        schedule_desc = 'unknown'
+
+    mon_type = 'core' if c.get('core') else 'personal'
+    proc_grep = ''  # manifest crons are one-shot, no persistent process
+
+    print(f'{name}|{plist_id}|{stdout_log}|{stderr_log}|{max_stale}|{proc_grep}|{schedule_desc}|{mon_type}')
+" 2>/dev/null
+}
+
+MONITORS=()
+while IFS= read -r line; do
+  [ -n "$line" ] && MONITORS+=("$line")
+done < <(_build_monitors_from_manifest)
+
+# Personal (non-manifest) monitors — add yours below.
+# These are NOT in manifest.json and won't be synced by cron-sync.
+PERSONAL_MONITORS=(
   # "My Service|com.nexo.my-service|$NEXO_HOME/logs/my-service.log||3600||Every 30 min|personal"
 )
+MONITORS+=("${PERSONAL_MONITORS[@]+"${PERSONAL_MONITORS[@]}"}")
 
 # Cron jobs to check (NAME|SCRIPT|CHECK_PATH|MAX_STALE_SECS|SCHEDULE)
-CRON_MONITORS=(
-  "Backup Cron|$NEXO_DIR/backup_cron.sh|$NEXO_DIR/backups/|7200|Hourly"
-)
+# Core cron monitors are loaded from manifest above.
+# Maintainer-only monitors go here (guarded by NEXO_MAINTAINER env var).
+CRON_MONITORS=()
+if [ "${NEXO_MAINTAINER:-}" = "1" ]; then
+  CRON_MONITORS+=(
+    "Backup|$NEXO_DIR/scripts/nexo-backup.sh|$NEXO_DIR/backups/|7200|Hourly"
+  )
+fi
 
 # Error patterns to search in stderr logs (last 50 lines)
 ERROR_PATTERNS="Traceback|Error:|CRITICAL|FATAL|ModuleNotFoundError|PermissionError|FileNotFoundError|ConnectionRefused|Errno"
@@ -234,16 +292,18 @@ try_verify_repair() {
 }
 
 try_repair_backup() {
-  local backup_script="$NEXO_DIR/backup_cron.sh"
+  # Use the core backup script (nexo-backup.sh)
+  local backup_script="$NEXO_DIR/scripts/nexo-backup.sh"
+  [ ! -x "$backup_script" ] && backup_script="$SCRIPT_DIR/nexo-backup.sh"
   if [ -x "$backup_script" ]; then
-    "$backup_script" 2>/dev/null
+    bash "$backup_script" 2>/dev/null
     sleep 1
     local newest
     newest=$(ls -t "$NEXO_DIR/backups/nexo-"*.db 2>/dev/null | head -1)
     if [ -n "$newest" ]; then
       if $IS_MACOS; then local age=$(( TS_EPOCH - $(stat -f %m "$newest") )); else local age=$(( TS_EPOCH - $(stat -c %Y "$newest") )); fi
       if [ "$age" -lt 60 ]; then
-        log_repair "backup_cron.sh: ran successfully, fresh backup created"
+        log_repair "nexo-backup.sh: ran successfully, fresh backup created"
         return 0
       fi
     fi
@@ -775,12 +835,12 @@ ${STDOUT_TAIL}
       log "Launching NEXO Level 2 repair..."
 
       # Build propagation instructions if core services failed
-      # Only the origin maintainer (user) propagates fixes to the public repo
+      # Only runs when NEXO_MAINTAINER=1 and NEXO_PUBLIC_REPO is configured
       PROPAGATE_BLOCK=""
-      # If you maintain a public NEXO repo, configure propagation here
-      NEXO_PUBLIC_REPO="${NEXO_PUBLIC_REPO:-}"
-      if $HAS_CORE_FAILS && [ -n "$NEXO_PUBLIC_REPO" ] && [ -d "$NEXO_PUBLIC_REPO/.git" ]; then
-        PROPAGATE_BLOCK="
+      if [ "${NEXO_MAINTAINER:-}" = "1" ]; then
+        NEXO_PUBLIC_REPO="${NEXO_PUBLIC_REPO:-}"
+        if $HAS_CORE_FAILS && [ -n "$NEXO_PUBLIC_REPO" ] && [ -d "$NEXO_PUBLIC_REPO/.git" ]; then
+          PROPAGATE_BLOCK="
 PROPAGATION (for [core] fixes ONLY):
 If your fix modifies a file under $NEXO_HOME/ (server.py, db/, plugins/, scripts/):
 1. Commit the fix locally with a descriptive message
@@ -789,6 +849,7 @@ If your fix modifies a file under $NEXO_HOME/ (server.py, db/, plugins/, scripts
 4. Commit + push
 5. Create a GitHub release with gh release create
 Do NOT propagate fixes for [personal] services — those stay local only."
+        fi
       fi
 
       # Write prompt to temp file (avoids heredoc quoting issues in subshell)

package/src/server.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 """NEXO MCP Server — Phase 4: Hot-Reload Plugin System."""
 
 import os
@@ -106,8 +107,12 @@ mcp = FastMCP(
         "- **Delegate:** prefer direct. If needed: `nexo_context_packet(area)` + guard + 'if unsure STOP'\n"
         "- **Memory:** `nexo_recall` searches all. Capture: errors→`nexo_learning_add`, prefs, entities, decisions\n"
         "- **Change log:** `nexo_change_log(...)` after production edits. NOT for config dir\n"
-        "- **Diary:** `nexo_session_diary_write(...)` mandatory on close. Include self_critique\n"
+        "- **Diary:** When user signals end of session (any language, any style — 'bye', 'done', 'cierro', etc.), "
+        "write `nexo_session_diary_write(...)` with self_critique BEFORE responding. "
+        "Detect intent, not keywords. If session closes without diary, auto_close handles it.\n"
         "- **Cortex:** `nexo_cortex_check` before budget/campaign/architecture changes\n"
+        "- **Skills:** before multi-step tasks, `nexo_skill_match(task)` to find reusable procedures. "
+        "If match found, read it and follow the steps. After completion, `nexo_skill_result(id, success, context)` to record outcome.\n"
         "- **Dissonance:** user contradicts memory→`nexo_cognitive_dissonance`. Frustrated→force=True\n"
         "- **Trust:** <40=paranoid verify twice, >80=fluid. Check: `nexo_cognitive_trust`"
     ),

package/src/tools_coordination.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 """Coordination tools: file tracking, messaging, Q&A."""
 
 from db import (

package/src/tools_sessions.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 """Session management tools: startup, heartbeat, status."""
 
 import time