nexo-brain 2.2.0 → 2.3.0

package/src/scripts/nexo-watchdog.sh

@@ -32,34 +32,87 @@ 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=(

package/src/server.py

@@ -106,8 +106,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/scripts/nexo-github-monitor.py

@@ -1,256 +0,0 @@
-#!/usr/bin/env python3
-"""
-NEXO GitHub Monitor — Wrapper + CLI pattern.
-Python: gh CLI API calls, data collection.
-CLI: Generates rich analysis and suggested responses for issues/PRs.
-
-Runs at 08:00 via LaunchAgent.
-Results saved to ~/.nexo/github-status.json.
-"""
-
-import json
-import os
-import subprocess
-import sys
-from datetime import datetime, timedelta
-from pathlib import Path
-
-NEXO_HOME = Path(os.environ.get("NEXO_HOME", Path.home() / ".nexo"))
-STATUS_FILE = NEXO_HOME / "github-status.json"
-LOG_FILE = NEXO_HOME / "logs" / "github-monitor.log"
-REPO = "wazionapps/nexo"
-CLAUDE_CLI = Path.home() / ".local" / "bin" / "claude"
-
-
-def log(msg: str):
-    ts = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    line = f"[{ts}] {msg}"
-    print(line, flush=True)
-    LOG_FILE.parent.mkdir(parents=True, exist_ok=True)
-    with open(LOG_FILE, "a") as f:
-        f.write(line + "\n")
-
-
-def gh_api(endpoint: str) -> dict | list | None:
-    """Call GitHub API via gh."""
-    try:
-        result = subprocess.run(
-            ["gh", "api", endpoint],
-            capture_output=True, text=True, timeout=21600
-        )
-        if result.returncode == 0:
-            return json.loads(result.stdout)
-    except Exception:
-        pass
-    return None
-
-
-def collect_data():
-    """Collect all GitHub data — mechanical work."""
-    data = {
-        "timestamp": datetime.now().isoformat(),
-        "repo": REPO,
-        "issues": [],
-        "prs": [],
-        "latest_release": None,
-        "unreleased_commits": 0,
-    }
-
-    # Issues
-    log("Fetching issues...")
-    issues = gh_api(f"repos/{REPO}/issues?state=open&per_page=50")
-    if issues:
-        for issue in issues:
-            if "pull_request" in issue:
-                continue
-            item = {
-                "number": issue["number"],
-                "title": issue["title"][:80],
-                "body": (issue.get("body") or "")[:500],
-                "created": issue["created_at"][:10],
-                "comments": issue["comments"],
-                "labels": [l["name"] for l in issue.get("labels", [])],
-                "author": issue.get("user", {}).get("login", ""),
-            }
-            # Get comment bodies for context
-            if issue["comments"] > 0:
-                comments = gh_api(f"repos/{REPO}/issues/{issue['number']}/comments?per_page=5")
-                if comments:
-                    item["comment_bodies"] = [
-                        {"author": c.get("user", {}).get("login", ""), "body": c.get("body", "")[:300]}
-                        for c in comments[:5]
-                    ]
-            data["issues"].append(item)
-
-    # PRs
-    log("Fetching PRs...")
-    prs = gh_api(f"repos/{REPO}/pulls?state=open&per_page=50")
-    if prs:
-        for pr in prs:
-            reviews = gh_api(f"repos/{REPO}/pulls/{pr['number']}/reviews") or []
-            item = {
-                "number": pr["number"],
-                "title": pr["title"][:80],
-                "body": (pr.get("body") or "")[:500],
-                "author": pr["user"]["login"],
-                "created": pr["created_at"][:10],
-                "reviews": len(reviews),
-                "changed_files": pr.get("changed_files", 0),
-            }
-            data["prs"].append(item)
-
-    # Releases
-    log("Fetching releases...")
-    releases = gh_api(f"repos/{REPO}/releases?per_page=1")
-    if releases and len(releases) > 0:
-        data["latest_release"] = releases[0].get("tag_name", "none")
-        tag = releases[0].get("tag_name", "")
-        if tag:
-            try:
-                result = subprocess.run(
-                    ["gh", "api", f"repos/{REPO}/compare/{tag}...main"],
-                    capture_output=True, text=True, timeout=21600
-                )
-                if result.returncode == 0:
-                    compare = json.loads(result.stdout)
-                    data["unreleased_commits"] = compare.get("ahead_by", 0)
-            except Exception:
-                pass
-
-    return data
-
-
-def analyze_via_cli(data):
-    """Pass collected data to CLI for analysis and suggested responses."""
-    data_json = json.dumps(data, ensure_ascii=False)
-
-    prompt = f"""Analyze this GitHub repository status for NEXO Brain (wazionapps/nexo).
-
-DATA:
-{data_json}
-
-Generate a status report with:
-1. SUMMARY: counts of open issues, PRs, unresponded items
-2. For each UNRESPONDED ISSUE (comments=0): suggest a response in English (technical, helpful, friendly)
-3. For each PR: brief assessment (looks good / needs changes / needs review)
-4. RELEASE STATUS: if >10 unreleased commits, recommend a release
-5. ALERTS: anything needing immediate attention (stale issues >7d, etc.)
-
-Return as JSON:
-{{
-  "summary": {{
-    "open_issues": N,
-    "unresponded_issues": N,
-    "stale_issues": N,
-    "open_prs": N,
-    "unreviewed_prs": N,
-    "unreleased_commits": N
-  }},
-  "issue_responses": [
-    {{"number": N, "suggested_response": "text"}},
-    ...
-  ],
-  "pr_assessments": [
-    {{"number": N, "assessment": "text"}},
-    ...
-  ],
-  "alerts": ["alert1", ...],
-  "release_recommendation": "text or null"
-}}"""
-    )
-    if auth_check.returncode != 0:
-        # CLI not authenticated, skip gracefully
-        return ""
-
-    env = os.environ.copy()
-    env["NEXO_HEADLESS"] = "1"  # Skip stop hook post-mortem
-    env.pop("CLAUDECODE", None)
-    env.pop("CLAUDE_CODE", None)
-
-    result = subprocess.run(
-        [str(CLAUDE_CLI), "-p", prompt,
-         "--model", "opus", "--output-format", "text",
-         "--allowedTools", "Read,Write,Edit,Glob,Grep,Bash,mcp__nexo__*"],
-        capture_output=True, text=True, timeout=21600, env=env
-    )
-
-    if result.returncode != 0:
-        log(f"CLI analysis failed: {result.stderr[:200]}")
-        return None
-
-    output = result.stdout.strip()
-    start = output.find("{")
-    end = output.rfind("}") + 1
-    if start >= 0 and end > start:
-        return json.loads(output[start:end])
-    return None
-
-
-def main():
-    log("=== NEXO GitHub Monitor ===")
-
-    # Step 1: Collect data (mechanical)
-    data = collect_data()
-
-    # Step 2: Analyze via CLI (intelligent)
-    log("Analyzing via CLI...")
-    analysis = analyze_via_cli(data)
-
-    # Build status file
-    status = {
-        "timestamp": data["timestamp"],
-        "repo": REPO,
-        "issues": {
-            "open": len(data["issues"]),
-            "unresponded": sum(1 for i in data["issues"] if i["comments"] == 0),
-            "stale": sum(1 for i in data["issues"]
-                        if i["comments"] == 0 and i["created"] < (datetime.now() - timedelta(days=7)).strftime('%Y-%m-%d')),
-            "items": [{"number": i["number"], "title": i["title"], "created": i["created"],
-                        "comments": i["comments"], "labels": i["labels"]} for i in data["issues"]],
-        },
-        "prs": {
-            "open": len(data["prs"]),
-            "unreviewed": sum(1 for p in data["prs"] if p["reviews"] == 0),
-            "items": [{"number": p["number"], "title": p["title"], "author": p["author"],
-                        "created": p["created"], "reviews": p["reviews"]} for p in data["prs"]],
-        },
-        "releases": {
-            "latest": data["latest_release"] or "none",
-            "unreleased_commits": data["unreleased_commits"],
-        },
-        "alerts": [],
-    }
-
-    # Merge CLI analysis
-    if analysis:
-        status["alerts"] = analysis.get("alerts", [])
-        status["issue_responses"] = analysis.get("issue_responses", [])
-        status["pr_assessments"] = analysis.get("pr_assessments", [])
-        status["release_recommendation"] = analysis.get("release_recommendation")
-    else:
-        # Fallback alerts without CLI
-        if status["issues"]["unresponded"] > 0:
-            status["alerts"].append(f"{status['issues']['unresponded']} issues without response")
-        if status["issues"]["stale"] > 0:
-            status["alerts"].append(f"{status['issues']['stale']} stale issues (>7d)")
-        if status["prs"]["unreviewed"] > 0:
-            status["alerts"].append(f"{status['prs']['unreviewed']} PRs awaiting review")
-        if data["unreleased_commits"] > 10:
-            status["alerts"].append(f"{data['unreleased_commits']} unreleased commits")
-
-    # Log summary
-    log(f"Issues: {status['issues']['open']} open ({status['issues']['unresponded']} unresponded)")
-    log(f"PRs: {status['prs']['open']} open ({status['prs']['unreviewed']} unreviewed)")
-    log(f"Latest release: {status['releases']['latest']}")
-    if status["alerts"]:
-        log(f"ALERTS: {'; '.join(status['alerts'])}")
-
-    # Save
-    STATUS_FILE.parent.mkdir(parents=True, exist_ok=True)
-    STATUS_FILE.write_text(json.dumps(status, indent=2))
-    log(f"Status saved to {STATUS_FILE}")
-    log("=== Done ===")
-
-
-if __name__ == "__main__":
-    main()