nexo-brain 5.3.27 → 5.3.30

package/src/scripts/nexo-cron-wrapper.sh

@@ -13,6 +13,7 @@ shift
 
 NEXO_HOME="${NEXO_HOME:-$HOME/.nexo}"
 DB="$NEXO_HOME/data/nexo.db"
+SPOOL_DIR="$NEXO_HOME/operations/cron-spool"
 
 # Unlock macOS Keychain so headless Claude Code can read auth tokens.
 # Claude Code stores its API key in the login keychain which auto-locks.
@@ -21,40 +22,95 @@ if [ -f "$KEYCHAIN_PASS_FILE" ] && [ "$(uname)" = "Darwin" ]; then
     security unlock-keychain -p "$(cat "$KEYCHAIN_PASS_FILE")" ~/Library/Keychains/login.keychain-db 2>/dev/null || true
 fi
 
-# Record start
-RUN_ID=$(sqlite3 "$DB" "INSERT INTO cron_runs (cron_id) VALUES ('$CRON_ID'); SELECT last_insert_rowid();" 2>/dev/null)
-
-if [ -z "$RUN_ID" ]; then
-    # DB not ready — run without tracking
-    exec "$@"
-fi
+START_EPOCH=$(python3 - <<'PY'
+import time
+print(f"{time.time():.6f}")
+PY
+)
+STARTED_AT=$(python3 - <<'PY'
+from datetime import datetime, timezone
+print(datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S"))
+PY
+)
 
 # Run the actual command, capture output
 OUTPUT_FILE=$(mktemp)
+trap 'rm -f "$OUTPUT_FILE"' EXIT
 "$@" > "$OUTPUT_FILE" 2>&1
 EXIT_CODE=$?
+ENDED_AT=$(python3 - <<'PY'
+from datetime import datetime, timezone
+print(datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S"))
+PY
+)
+DURATION_SECS=$(python3 - <<PY
+start = float("$START_EPOCH")
+import time
+print(round(time.time() - start, 1))
+PY
+)
 
 # Extract summary (last meaningful line, max 500 chars)
-SUMMARY=$(tail -5 "$OUTPUT_FILE" | grep -v "^$" | tail -1 | head -c 500 | sed "s/'/''/g")
+SUMMARY=$(tail -5 "$OUTPUT_FILE" | grep -v "^$" | tail -1 | head -c 500)
 
 # Extract error if failed
 ERROR=""
 if [ $EXIT_CODE -ne 0 ]; then
-    ERROR=$(grep -i "error\|exception\|fail\|traceback" "$OUTPUT_FILE" | tail -1 | head -c 500 | sed "s/'/''/g")
+    ERROR=$(grep -i "error\|exception\|fail\|traceback" "$OUTPUT_FILE" | tail -1 | head -c 500)
 fi
 
-# Record end
-sqlite3 "$DB" "
-    UPDATE cron_runs SET
-        ended_at = datetime('now'),
-        exit_code = $EXIT_CODE,
-        summary = '$SUMMARY',
-        error = '$ERROR',
-        duration_secs = ROUND((julianday(datetime('now')) - julianday(started_at)) * 86400, 1)
-    WHERE id = $RUN_ID;
-" 2>/dev/null
-
-# Clean output
-rm -f "$OUTPUT_FILE"
+if ! python3 - "$DB" "$CRON_ID" "$STARTED_AT" "$ENDED_AT" "$EXIT_CODE" "$SUMMARY" "$ERROR" "$DURATION_SECS" <<'PY'
+from __future__ import annotations
+
+import sqlite3
+import sys
+
+db_path, cron_id, started_at, ended_at, exit_code, summary, error, duration_secs = sys.argv[1:]
+conn = sqlite3.connect(db_path)
+try:
+    conn.execute(
+        """
+        INSERT INTO cron_runs (
+            cron_id, started_at, ended_at, exit_code, summary, error, duration_secs
+        ) VALUES (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (
+            cron_id,
+            started_at,
+            ended_at,
+            int(exit_code),
+            summary,
+            error,
+            float(duration_secs),
+        ),
+    )
+    conn.commit()
+finally:
+    conn.close()
+PY
+then
+    mkdir -p "$SPOOL_DIR"
+    SPOOL_FILE="$SPOOL_DIR/${CRON_ID}-$(date +%Y%m%d-%H%M%S)-$$.json"
+    python3 - "$SPOOL_FILE" "$CRON_ID" "$STARTED_AT" "$ENDED_AT" "$EXIT_CODE" "$SUMMARY" "$ERROR" "$DURATION_SECS" <<'PY'
+from __future__ import annotations
+
+import json
+import sys
+from pathlib import Path
+
+spool_file, cron_id, started_at, ended_at, exit_code, summary, error, duration_secs = sys.argv[1:]
+payload = {
+    "cron_id": cron_id,
+    "started_at": started_at,
+    "ended_at": ended_at,
+    "exit_code": int(exit_code),
+    "summary": summary,
+    "error": error,
+    "duration_secs": float(duration_secs),
+}
+Path(spool_file).write_text(json.dumps(payload, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
+PY
+    echo "[nexo-cron-wrapper] DB write failed; spooled run to $SPOOL_FILE" >&2
+fi
 
 exit $EXIT_CODE

package/src/scripts/nexo-update.sh

@@ -1,306 +1,32 @@
 #!/usr/bin/env bash
-# nexo-update.sh — Standalone NEXO update script
-# Same logic as the MCP tool but usable when the server itself needs updating.
-#
+# nexo-update.sh — Thin wrapper around the canonical Python update core.
 # Usage:
 #   nexo-update.sh                    # pull from origin main
 #   nexo-update.sh origin beta        # pull from origin beta
-#   NEXO_HOME=/path nexo-update.sh    # custom NEXO_HOME
 
 set -euo pipefail
 
-# --- Configuration ---
 REMOTE="${1:-origin}"
 BRANCH="${2:-main}"
-NEXO_HOME="${NEXO_HOME:-$HOME/.nexo}"
-
-# Determine repo directory: script is at src/scripts/, repo root is ../../
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-REPO_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
-SRC_DIR="$REPO_DIR/src"
-PACKAGE_JSON="$REPO_DIR/package.json"
-
-# --- Helpers ---
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m'
-
-log()  { echo -e "${GREEN}[nexo-update]${NC} $*"; }
-warn() { echo -e "${YELLOW}[nexo-update]${NC} $*"; }
-err()  { echo -e "${RED}[nexo-update]${NC} $*" >&2; }
-
-read_version() {
-    python3 -c "import json; print(json.load(open('$PACKAGE_JSON')).get('version','unknown'))" 2>/dev/null || echo "unknown"
-}
-
-# --- Check if this is a git repo ---
-if [ ! -d "$REPO_DIR/.git" ] && [ ! -f "$REPO_DIR/.git" ]; then
-    err "ABORTED: Not a git repository at $REPO_DIR"
-    err "For packaged installs, use: npm update -g nexo-brain"
-    exit 1
-fi
-
-# --- Step 1: Check for uncommitted changes in entire worktree ---
-log "Checking for uncommitted changes..."
-cd "$REPO_DIR"
-
-if [ -n "$(git status --porcelain 2>/dev/null)" ]; then
-    err "ABORTED: Uncommitted changes in worktree"
-    git status --short
-    exit 1
-fi
-log "Working tree clean."
-
-# Record current state
-OLD_VERSION="$(read_version)"
-OLD_COMMIT="$(git rev-parse HEAD)"
-REQ_FILE="$SRC_DIR/requirements.txt"
-OLD_REQ_HASH=""
-if [ -f "$REQ_FILE" ]; then
-    OLD_REQ_HASH="$(shasum -a 256 "$REQ_FILE" | cut -d' ' -f1)"
-fi
-log "Current: v${OLD_VERSION} (${OLD_COMMIT:0:8})"
-
-# --- Step 2: Backup databases ---
-TIMESTAMP="$(date +%Y-%m-%d-%H%M)"
-BACKUP_DIR="$NEXO_HOME/backups/pre-update-$TIMESTAMP"
-
-backup_dbs() {
-    local found=0
-    # Check data/, NEXO_HOME root, and src/ for .db files
-    for dir in "$NEXO_HOME/data" "$NEXO_HOME" "$SRC_DIR"; do
-        if [ -d "$dir" ]; then
-            for db in "$dir"/*.db; do
-                [ -f "$db" ] || continue
-                found=1
-                mkdir -p "$BACKUP_DIR"
-                cp "$db" "$BACKUP_DIR/$(basename "$db")"
-                log "  Backed up: $(basename "$db")"
-            done
-        fi
-    done
-    if [ "$found" -eq 0 ]; then
-        log "  No databases found to backup."
-    fi
-}
-
-log "Backing up databases..."
-backup_dbs
+SRC_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+RUNTIME_PYTHON="${NEXO_RUNTIME_PYTHON:-python3}"
 
-# --- Step 3: git pull ---
-log "Pulling from ${REMOTE}/${BRANCH}..."
-PULL_OUTPUT="$(git pull "$REMOTE" "$BRANCH" 2>&1)" || {
-    err "git pull failed:"
-    err "$PULL_OUTPUT"
-    exit 1
-}
-log "$PULL_OUTPUT"
+export NEXO_CODE="${NEXO_CODE:-$SRC_DIR}"
+export PYTHONPATH="$SRC_DIR${PYTHONPATH:+:$PYTHONPATH}"
 
-if echo "$PULL_OUTPUT" | grep -q "Already up to date"; then
-    log "Already up to date (v${OLD_VERSION}). Done."
-    exit 0
-fi
+"$RUNTIME_PYTHON" - "$REMOTE" "$BRANCH" <<'PY'
+from __future__ import annotations
 
-# --- Step 4: Check version ---
-NEW_VERSION="$(read_version)"
-log "New version: v${NEW_VERSION}"
-
-# --- Step 4b: Reinstall Python dependencies if requirements.txt changed ---
-NEW_REQ_HASH=""
-if [ -f "$REQ_FILE" ]; then
-    NEW_REQ_HASH="$(shasum -a 256 "$REQ_FILE" | cut -d' ' -f1)"
-fi
-
-DEPS_CHANGED=false
-if [ "$OLD_REQ_HASH" != "$NEW_REQ_HASH" ]; then
-    DEPS_CHANGED=true
-fi
-
-reinstall_pip_deps() {
-    local VENV_PIP="$NEXO_HOME/.venv/bin/pip"
-    if [ -f "$REQ_FILE" ]; then
-        if [ -x "$VENV_PIP" ]; then
-            "$VENV_PIP" install --quiet -r "$REQ_FILE" || return 1
-        else
-            python3 -m pip install --quiet -r "$REQ_FILE" --break-system-packages 2>/dev/null || return 1
-        fi
-    fi
-    return 0
-}
-
-if [ "$DEPS_CHANGED" = true ] || [ "$OLD_VERSION" != "$NEW_VERSION" ]; then
-    log "Reinstalling Python dependencies..."
-    if ! reinstall_pip_deps; then
-        err "pip install failed! Rolling back..."
-        git reset --hard "$OLD_COMMIT"
-        reinstall_pip_deps || warn "pip rollback also had issues"
-        if [ -d "$BACKUP_DIR" ]; then
-            for db in "$BACKUP_DIR"/*.db; do
-                [ -f "$db" ] || continue
-                BASENAME="$(basename "$db")"
-                for candidate in "$NEXO_HOME/data/$BASENAME" "$NEXO_HOME/$BASENAME" "$SRC_DIR/$BASENAME"; do
-                    if [ -f "$candidate" ]; then
-                        cp "$db" "$candidate"
-                        warn "  Restored: $BASENAME"
-                        break
-                    fi
-                done
-            done
-        fi
-        err "Rolled back to ${OLD_COMMIT:0:8}. Databases restored."
-        exit 1
-    fi
-    log "Python dependencies updated."
-fi
-
-# --- Step 5: Run migrations if version changed ---
-if [ "$OLD_VERSION" != "$NEW_VERSION" ]; then
-    log "Version changed: ${OLD_VERSION} -> ${NEW_VERSION}"
-    log "Running migrations..."
-    if ! (cd "$SRC_DIR" && python3 -c "import db; db.init_db()" 2>&1); then
-        err "Migration failed! Rolling back..."
-        git reset --hard "$OLD_COMMIT"
-        # Reinstall pip deps from restored old requirements.txt
-        reinstall_pip_deps || warn "pip rollback also had issues"
-        # Restore DB backups
-        if [ -d "$BACKUP_DIR" ]; then
-            for db in "$BACKUP_DIR"/*.db; do
-                [ -f "$db" ] || continue
-                BASENAME="$(basename "$db")"
-                for candidate in "$NEXO_HOME/data/$BASENAME" "$NEXO_HOME/$BASENAME" "$SRC_DIR/$BASENAME"; do
-                    if [ -f "$candidate" ]; then
-                        cp "$db" "$candidate"
-                        warn "  Restored: $BASENAME"
-                        break
-                    fi
-                done
-            done
-        fi
-        err "Rolled back to ${OLD_COMMIT:0:8}. Databases and deps restored."
-        exit 1
-    fi
-    log "Migrations applied."
-else
-    log "Version unchanged (${OLD_VERSION}), skipping migrations."
-fi
-
-# --- Step 6: Verify import ---
-log "Verifying server.py import..."
-if ! (cd "$SRC_DIR" && python3 -c "import server" 2>&1); then
-    err "Import verification failed! Rolling back..."
-    git reset --hard "$OLD_COMMIT"
-    # Reinstall pip deps from restored old requirements.txt
-    reinstall_pip_deps || warn "pip rollback also had issues"
-    if [ -d "$BACKUP_DIR" ]; then
-        for db in "$BACKUP_DIR"/*.db; do
-            [ -f "$db" ] || continue
-            BASENAME="$(basename "$db")"
-            for candidate in "$NEXO_HOME/data/$BASENAME" "$NEXO_HOME/$BASENAME" "$SRC_DIR/$BASENAME"; do
-                if [ -f "$candidate" ]; then
-                    cp "$db" "$candidate"
-                    warn "  Restored: $BASENAME"
-                    break
-                fi
-            done
-        done
-    fi
-    err "Rolled back to ${OLD_COMMIT:0:8}. Databases and deps restored."
-    exit 1
-fi
-
-# --- Step 7: Sync hooks to NEXO_HOME ---
-HOOKS_SRC="$SRC_DIR/hooks"
-HOOKS_DEST="$NEXO_HOME/hooks"
-if [ -d "$HOOKS_SRC" ]; then
-    mkdir -p "$HOOKS_DEST"
-    SYNCED=0
-    for hook in "$HOOKS_SRC"/*.sh; do
-        [ -f "$hook" ] || continue
-        cp "$hook" "$HOOKS_DEST/$(basename "$hook")"
-        chmod 755 "$HOOKS_DEST/$(basename "$hook")"
-        SYNCED=$((SYNCED + 1))
-    done
-    if [ "$SYNCED" -gt 0 ]; then
-        log "Synced $SYNCED hook(s) to $HOOKS_DEST"
-    fi
-fi
+import sys
 
-# --- Step 8: Sync cron definitions with manifest ---
-CRON_SYNC="$SRC_DIR/crons/sync.py"
-CRON_SYNC_OK=false
-if [ -f "$CRON_SYNC" ]; then
-    log "Syncing cron definitions..."
-    if NEXO_HOME="$NEXO_HOME" NEXO_CODE="$SRC_DIR" python3 "$CRON_SYNC" 2>&1; then
-        log "Cron definitions synced."
-        CRON_SYNC_OK=true
-    else
-        warn "Cron sync failed (non-fatal). Installed manifest NOT refreshed to avoid divergence."
-    fi
-fi
+from plugins.update import handle_update
 
-# --- Step 8b: Refresh installed manifest for catchup/watchdog (only if sync succeeded) ---
-if $CRON_SYNC_OK && [ -d "$SRC_DIR/crons" ]; then
-    mkdir -p "$NEXO_HOME/crons"
-    cp -f "$SRC_DIR/crons/"*.json "$NEXO_HOME/crons/" 2>/dev/null
-    cp -f "$SRC_DIR/crons/"*.py "$NEXO_HOME/crons/" 2>/dev/null
-    log "Refreshed installed crons manifest."
-fi
 
-# --- Step 9: Sync shared client configs ---
-CLIENT_SYNC="$SRC_DIR/scripts/nexo-sync-clients.py"
-if [ -f "$CLIENT_SYNC" ]; then
-    log "Syncing shared client configs..."
-    CLIENT_SYNC_ARGS=()
-    if [ -f "$NEXO_HOME/config/schedule.json" ]; then
-        while IFS= read -r line; do
-            [ -n "$line" ] && CLIENT_SYNC_ARGS+=("--enabled-client" "$line")
-        done < <(
-            NEXO_HOME="$NEXO_HOME" NEXO_CODE="$SRC_DIR" python3 - <<'PY'
-import json
-import os
-import sys
-from pathlib import Path
+remote = sys.argv[1]
+branch = sys.argv[2]
+result = handle_update(remote=remote, branch=branch)
+print(result)
 
-sys.path.insert(0, os.environ["NEXO_CODE"])
-from client_preferences import normalize_client_preferences
-
-schedule_file = Path(os.environ["NEXO_HOME"]) / "config" / "schedule.json"
-schedule_payload = json.loads(schedule_file.read_text()) if schedule_file.exists() else {}
-prefs = normalize_client_preferences(schedule_payload)
-if prefs != {key: schedule_payload.get(key) for key in prefs}:
-    merged = dict(schedule_payload)
-    merged.update(prefs)
-    schedule_file.parent.mkdir(parents=True, exist_ok=True)
-    schedule_file.write_text(json.dumps(merged, indent=2, ensure_ascii=False) + "\n")
-enabled = [key for key, value in prefs.get("interactive_clients", {}).items() if value]
-if prefs.get("automation_enabled", True):
-    backend = prefs.get("automation_backend")
-    if backend and backend != "none" and backend not in enabled:
-        enabled.append(backend)
-for item in enabled:
-    print(item)
+raise SystemExit(1 if result.startswith(("ABORTED", "UPDATE FAILED")) else 0)
 PY
-        )
-    fi
-    if NEXO_HOME="$NEXO_HOME" NEXO_CODE="$SRC_DIR" python3 "$CLIENT_SYNC" --nexo-home "$NEXO_HOME" --runtime-root "$SRC_DIR" "${CLIENT_SYNC_ARGS[@]}" --json >/dev/null 2>&1; then
-        log "Shared client configs synced."
-    else
-        warn "Client config sync failed (non-fatal). Run 'nexo clients sync' later."
-    fi
-fi
-
-# --- Done ---
-echo ""
-log "========================================="
-log " UPDATE SUCCESSFUL"
-if [ "$OLD_VERSION" != "$NEW_VERSION" ]; then
-    log " Version: ${OLD_VERSION} -> ${NEW_VERSION}"
-else
-    log " Version: ${OLD_VERSION} (unchanged)"
-fi
-log " Branch: ${REMOTE}/${BRANCH}"
-log " Backup: ${BACKUP_DIR}"
-log "========================================="
-echo ""
-warn "MCP server restart needed to load new code."