nexo-brain 7.9.4 → 7.9.5

package/README.md

@@ -18,7 +18,9 @@
 
 [Watch the overview video](https://nexo-brain.com/watch/) · [Watch on YouTube](https://www.youtube.com/watch?v=i2lkGhKyVqI) · [Open the infographic](https://nexo-brain.com/assets/nexo-brain-infographic-v5.png)
 
-Version `7.9.4` is the current packaged-runtime line. Patch release that blocks the Brain 7.9.3 + Desktop 0.28.2 diary regression: canonical lifecycle plans now require real `session_diary` evidence (`wait_for_diary_write`) before `stop_session`, and canonical completion is rejected/retryable without that diary row. It also fixes npm CLI onboarding so `nexo-brain --version` and subcommands never launch the wizard when legacy/v2 calibration is already valid, commits setup calibration atomically only after the wizard completes, and adds `nexo-brain warmup-models` so install/update paths predownload the local mDeBERTa/BGE/reranker models. Verification: full Brain pytest (`2189 passed, 3 skipped, 1 xfailed, 5 xpassed`), release-readiness, npm pack dry-run, and coordinated Desktop v0.28.3 checks.
+Version `7.9.5` is the current packaged-runtime line. Patch release that fixes canonical diary confirmation for Desktop: Brain now resolves the Desktop/Claude session UUID through NEXO SID aliases before checking `session_diary`, so archive/delete/app-exit can confirm diaries written by `nexo_session_diary_write` under the active `nexo-...` SID. Verification: `pytest tests/test_lifecycle_events.py` (28 passing) plus coordinated Desktop v0.28.4 shutdown/archive/delete checks.
+
+Previously in `7.9.4`: patch release that blocks the Brain 7.9.3 + Desktop 0.28.2 diary regression: canonical lifecycle plans now require real `session_diary` evidence (`wait_for_diary_write`) before `stop_session`, and canonical completion is rejected/retryable without that diary row. It also fixes npm CLI onboarding so `nexo-brain --version` and subcommands never launch the wizard when legacy/v2 calibration is already valid, commits setup calibration atomically only after the wizard completes, and adds `nexo-brain warmup-models` so install/update paths predownload the local mDeBERTa/BGE/reranker models. Verification: full Brain pytest (`2189 passed, 3 skipped, 1 xfailed, 5 xpassed`), release-readiness, npm pack dry-run, and coordinated Desktop v0.28.3 checks.
 
 Previously in `7.9.3`: patch release that hardens Brain's canonical lifecycle plan for Desktop close/archive/delete/app-exit diary guarantees: `canonical_actions` now publish the v2 canonical shape (`type` plus `payload.prompt`) while keeping one-release compatibility mirrors (`kind` plus top-level `prompt`) for older Desktop clients. This lets Desktop execute resume → diary prompt → stop with one exact owner per lifecycle event and preserve Brain-side dedupe by event id. Targeted verification: `pytest tests/test_lifecycle_events.py` (25 passing) plus release-readiness after artifact sync.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexo-brain",
-  "version": "7.9.4",
+  "version": "7.9.5",
   "mcpName": "io.github.wazionapps/nexo",
   "description": "NEXO Brain — Shared brain for AI agents. Persistent memory, semantic RAG, natural forgetting, metacognitive guard, trust scoring, 150+ MCP tools. Works with Claude Code, Codex, Claude Desktop & any MCP client. 100% local, free.",
   "homepage": "https://nexo-brain.com",

package/src/lifecycle_events.py

@@ -52,7 +52,7 @@ from __future__ import annotations
 
 import json
 import time
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 
 from db import get_db
 import lifecycle_prompts
@@ -84,13 +84,56 @@ def _normalise_payload(obj: Any) -> str:
         return "{}"
 
 
+def _session_diary_session_ids(conn, session_id: str) -> List[str]:
+    """Return all session ids that can contain diary evidence for a lifecycle session.
+
+    Desktop passes Claude's conversation/session UUID as ``lifecycle_events.session_id``.
+    ``nexo_session_diary_write`` stores rows under the active NEXO SID (``nexo-...``).
+    The alias table links both values, so canonical diary confirmation must check the
+    direct id and its NEXO aliases.
+    """
+    raw = str(session_id or "").strip()
+    if not raw:
+        return []
+    ids: List[str] = [raw]
+    try:
+        rows = conn.execute(
+            "SELECT sid FROM session_claude_aliases "
+            "WHERE claude_session_id = ? ORDER BY last_seen DESC",
+            (raw,),
+        ).fetchall()
+        ids.extend(str(row[0]) for row in rows if row and row[0])
+    except Exception:
+        pass
+    try:
+        rows = conn.execute(
+            "SELECT sid FROM sessions "
+            "WHERE claude_session_id = ? OR external_session_id = ? "
+            "ORDER BY last_update_epoch DESC",
+            (raw, raw),
+        ).fetchall()
+        ids.extend(str(row[0]) for row in rows if row and row[0])
+    except Exception:
+        pass
+
+    deduped: List[str] = []
+    seen = set()
+    for sid in ids:
+        if sid and sid not in seen:
+            seen.add(sid)
+            deduped.append(sid)
+    return deduped
+
+
 def _max_session_diary_id(conn, session_id: str) -> int:
-    if not session_id:
+    session_ids = _session_diary_session_ids(conn, session_id)
+    if not session_ids:
         return 0
+    placeholders = ",".join("?" for _ in session_ids)
     try:
         row = conn.execute(
-            "SELECT COALESCE(MAX(id), 0) FROM session_diary WHERE session_id = ?",
-            (str(session_id),),
+            f"SELECT COALESCE(MAX(id), 0) FROM session_diary WHERE session_id IN ({placeholders})",
+            tuple(session_ids),
         ).fetchone()
     except Exception:
         return 0
@@ -156,25 +199,30 @@ def _session_diary_evidence(
     if not session_id or not dispatched_at:
         return None
     checkpoint_id = _diary_checkpoint_from_actions_json(actions_json)
+    session_ids = _session_diary_session_ids(conn, session_id)
+    if not session_ids:
+        return None
+    placeholders = ",".join("?" for _ in session_ids)
     try:
         if checkpoint_id > 0:
             row = conn.execute(
-                "SELECT id, created_at FROM session_diary "
-                "WHERE session_id = ? AND id > ? ORDER BY id ASC LIMIT 1",
-                (str(session_id), int(checkpoint_id)),
+                "SELECT id, created_at, session_id FROM session_diary "
+                f"WHERE session_id IN ({placeholders}) AND id > ? ORDER BY id ASC LIMIT 1",
+                (*session_ids, int(checkpoint_id)),
             ).fetchone()
         else:
             row = conn.execute(
-                "SELECT id, created_at FROM session_diary "
-                "WHERE session_id = ? AND created_at >= ? ORDER BY created_at ASC, id ASC LIMIT 1",
-                (str(session_id), str(dispatched_at)),
+                "SELECT id, created_at, session_id FROM session_diary "
+                f"WHERE session_id IN ({placeholders}) AND created_at >= ? "
+                "ORDER BY created_at ASC, id ASC LIMIT 1",
+                (*session_ids, str(dispatched_at)),
             ).fetchone()
     except Exception:
         # Missing table on a minimal test harness — treat as "no diary".
         return None
     if row is None:
         return None
-    return {"session_diary_id": row[0], "created_at": row[1]}
+    return {"session_diary_id": row[0], "created_at": row[1], "diary_session_id": row[2]}
 
 
 def _session_diary_since(conn, session_id: str, dispatched_at: Optional[str], actions_json: Optional[str] = None) -> bool: