nexo-brain 1.3.0 → 1.4.1

package/src/hooks/session-stop.sh

@@ -1,27 +1,22 @@
 #!/bin/bash
-# NEXO Stop hook (v7 — BLOCKING post-mortem with trivial session detection)
+# NEXO Memory Stop Hook (v7 — BLOCKING post-mortem with trivial session detection)
 #
 # v5 bug: used "approve" + systemMessage — AI never processed post-mortem.
-# v6 bug: used "block" but deleted flag on approve — caused infinite block loop.
-#         Also had TTL on flag that expired between close attempts.
-# v7 fix: trivial sessions (<5 tool calls) approve immediately.
-#         Non-trivial sessions block until post-mortem is done.
-#         Flag has NO TTL and is NOT deleted on approve.
-#         SessionStart hook cleans up the flag for the next session.
+# v6 fix: uses "block" — but blocked ALL sessions including trivial ones.
+# v7 fix: detects trivial sessions (<5 tool calls) and approves immediately.
+#         Non-trivial sessions get blocked until post-mortem is done.
 #
 # Flow:
-#   Trivial session (quick question, <5 meaningful tool calls):
+#   Trivial session (quick question, <5 tool calls):
 #     → APPROVE immediately, no post-mortem needed
 #
 #   Non-trivial session:
 #     1. User closes → hook checks flag → not found → BLOCK
 #     2. AI executes post-mortem → creates flag
 #     3. User closes again → hook sees flag → APPROVE
-#     4. Next session start → SessionStart hook deletes flag
 set -euo pipefail
 
-NEXO_HOME="${NEXO_HOME:-$HOME/.nexo}"
-NEXO_NAME="${NEXO_NAME:-NEXO}"
+NEXO_HOME="${NEXO_HOME:-$HOME/claude}"
 FLAG_FILE="$NEXO_HOME/operations/.postmortem-complete"
 TODAY=$(date +%Y-%m-%d)
 TOOL_LOG="$NEXO_HOME/operations/tool-logs/${TODAY}.jsonl"
@@ -29,43 +24,58 @@ TOOL_LOG="$NEXO_HOME/operations/tool-logs/${TODAY}.jsonl"
 # 0. Refresh diary draft with latest changes/decisions (best-effort)
 python3 -c "
 import sys, json, os
-sys.path.insert(0, os.environ.get('NEXO_HOME', os.path.expanduser('~/.nexo')))
+sys.path.insert(0, os.path.expanduser('~/.nexo/nexo-mcp'))
 os.environ['NEXO_SKIP_FS_INDEX'] = '1'
-try:
-    from db import init_db, get_db, get_active_sessions, upsert_diary_draft, get_diary_draft
-    init_db()
-    conn = get_db()
-    sessions = get_active_sessions()
-    for s in sessions:
-        sid = s['sid']
-        draft = get_diary_draft(sid)
-        if not draft:
-            continue
-        change_ids = [r[0] for r in conn.execute('SELECT id FROM change_log WHERE session_id = ?', (sid,)).fetchall()]
-        decision_ids = [r[0] for r in conn.execute('SELECT id FROM decisions WHERE session_id = ?', (sid,)).fetchall()]
-        upsert_diary_draft(
-            sid=sid,
-            tasks_seen=draft['tasks_seen'],
-            change_ids=json.dumps(change_ids),
-            decision_ids=json.dumps(decision_ids),
-            last_context_hint=draft['last_context_hint'],
-            heartbeat_count=draft['heartbeat_count'],
-            summary_draft=draft['summary_draft'],
-        )
-except Exception:
-    pass
+from db import init_db, get_db, get_active_sessions, upsert_diary_draft, get_diary_draft
+init_db()
+conn = get_db()
+sessions = get_active_sessions()
+for s in sessions:
+    sid = s['sid']
+    draft = get_diary_draft(sid)
+    if not draft:
+        continue
+    change_ids = [r[0] for r in conn.execute('SELECT id FROM change_log WHERE session_id = ?', (sid,)).fetchall()]
+    decision_ids = [r[0] for r in conn.execute('SELECT id FROM decisions WHERE session_id = ?', (sid,)).fetchall()]
+    upsert_diary_draft(
+        sid=sid,
+        tasks_seen=draft['tasks_seen'],
+        change_ids=json.dumps(change_ids),
+        decision_ids=json.dumps(decision_ids),
+        last_context_hint=draft['last_context_hint'],
+        heartbeat_count=draft['heartbeat_count'],
+        summary_draft=draft['summary_draft'],
+    )
 " 2>/dev/null || true
 
-# 1. Detect trivial session — count meaningful tool calls from today's log
-# A session with <5 tool calls (excluding Read/Grep/Glob/Bash/ToolSearch) is trivial
+# 1. Detect trivial session — count meaningful tool calls from THIS SESSION only
+# Uses .session-start-ts written by SessionStart hook
+# A session with <5 tool calls (excluding Read/Grep/Glob/Bash) is trivial
+SESSION_START_TS="$NEXO_HOME/operations/.session-start-ts"
+SESSION_START=0
+if [ -f "$SESSION_START_TS" ]; then
+    SESSION_START=$(cat "$SESSION_START_TS" 2>/dev/null || echo "0")
+fi
+
 TOOL_COUNT=0
 if [ -f "$TOOL_LOG" ]; then
     TOOL_COUNT=$(python3 -c "
-import json, sys
+import json, sys, os
+session_start = float(os.environ.get('SESSION_START', '0'))
 count = 0
 for line in open('$TOOL_LOG'):
     try:
         d = json.loads(line)
+        # Only count tools from THIS session (after session-start-ts)
+        ts = d.get('timestamp', '')
+        if ts and session_start > 0:
+            from datetime import datetime
+            try:
+                entry_ts = datetime.fromisoformat(ts.replace('Z', '+00:00')).timestamp()
+                if entry_ts < session_start:
+                    continue
+            except:
+                pass
         t = d.get('tool_name', '')
         if t and t not in ('Read', 'Grep', 'Glob', 'Bash', 'ToolSearch'):
             count += 1
@@ -75,13 +85,8 @@ print(count)
 " 2>/dev/null || echo "0")
 fi
 
-# Trivial session → approve immediately, write minimal buffer, skip post-mortem
+# Trivial session → approve immediately, no buffer writing, skip post-mortem
 if [ "$TOOL_COUNT" -lt 5 ]; then
-    BUFFER="$NEXO_HOME/brain/session_buffer.jsonl"
-    TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%S")
-    mkdir -p "$(dirname "$BUFFER")"
-    echo "{\"ts\":\"$TIMESTAMP\",\"tasks\":[\"trivial session\"],\"decisions\":[],\"user_patterns\":[],\"files_modified\":[],\"errors_resolved\":[],\"self_critique\":\"trivial session — no post-mortem needed\",\"mood\":\"neutral\",\"source\":\"hook-trivial\"}" >> "$BUFFER" 2>/dev/null
-
     cat << 'HOOKEOF'
 {
   "decision": "approve"
@@ -92,8 +97,6 @@ fi
 
 # 2. Non-trivial session — check if post-mortem was already completed
 #    Flag has NO TTL — it persists until SessionStart cleans it up next session.
-#    IMPORTANT: do NOT delete flag here — that causes an infinite block loop
-#    if the session doesn't close immediately after approve.
 POSTMORTEM_DONE=false
 if [ -f "$FLAG_FILE" ]; then
     POSTMORTEM_DONE=true
@@ -101,6 +104,7 @@ fi
 
 if [ "$POSTMORTEM_DONE" = true ]; then
     # Post-mortem was done — allow session to close
+    # NOTE: do NOT delete flag here — SessionStart cleans it up next session
     cat << 'HOOKEOF'
 {
   "decision": "approve"
@@ -108,99 +112,41 @@ if [ "$POSTMORTEM_DONE" = true ]; then
 HOOKEOF
 else
     # Post-mortem NOT done — BLOCK session close and inject instructions
-    cat << HOOKEOF
+    cat << 'HOOKEOF'
 {
   "decision": "block",
-  "reason": "STOP HOOK — MANDATORY POST-MORTEM before ending (do NOT ask permission, do NOT skip):\n\n## 1. SELF-CRITIQUE (MANDATORY — write to session diary)\nAnswer these questions in the self_critique field of nexo_session_diary_write:\n- Did the user have to ask me for something I should have detected or done on my own?\n- Did I wait for the user to tell me something I could have verified proactively?\n- Are there systems/states I can check next session without being asked?\n- Did I repeat an error that already had a registered learning?\n- What would I do differently if I repeated this session?\nIf any answer is YES — write the specific rule that would prevent repetition.\nIf the session was flawless, write 'No self-critique — clean session.'\n\n## 2. SESSION BUFFER\nIf the session was NOT trivial, append ONE JSON line to ${NEXO_HOME}/brain/session_buffer.jsonl:\n{\"ts\":\"YYYY-MM-DDTHH:MM:SS\",\"tasks\":[...],\"decisions\":[...],\"user_patterns\":[...],\"files_modified\":[...],\"errors_resolved\":[...],\"self_critique\":\"short summary\",\"mood\":\"focused|impatient|exploratory|frustrated|satisfied|neutral\",\"source\":\"claude\"}\n\n## 3. FOLLOWUPS\nIf there were deploys/cron changes/fixes — nexo_followup_create with verification date.\n\n## 4. PROACTIVE SEEDS\nWhat can I leave prepared so the next session starts doing useful work without the user asking?\n\n## 5. MARK COMPLETE\nWhen ALL of the above is done, run:\nbash -c 'mkdir -p ${NEXO_HOME}/operations && date +%s > ${NEXO_HOME}/operations/.postmortem-complete'\nThe user will close again and the hook will approve.\n\nIMPORTANT: Do NOT say goodbye, do NOT say goodnight or any farewell. Just execute the steps and mark complete."
-}
-HOOKEOF
-fi
+  "reason": "STOP HOOK — MANDATORY POST-MORTEM before ending (do NOT ask permission, do NOT skip):
 
-# 3. Direct session buffer fallback (runs for non-trivial sessions)
-BUFFER="$NEXO_HOME/brain/session_buffer.jsonl"
-TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%S")
+## 1. SELF-CRITIQUE (MANDATORY — write to session diary)
+Answer these questions in the self_critique field of nexo_session_diary_write:
+- Did the user have to ask me for something I should have detected or done on my own?
+- Did I wait for the user to tell me something I could have verified proactively?
+- Are there systems/states I can check next session without being asked?
+- Did I repeat an error that already had a registered learning?
+- What would I do differently if I repeated this session?
+If any answer is YES — write the specific rule that would prevent repetition.
+If the session was flawless, write 'No self-critique — clean session.'
 
-SKIP_FALLBACK=false
-if [ -f "$BUFFER" ]; then
-    LAST_SOURCE=$(python3 -c "
-import json, sys
-from datetime import datetime, timedelta
-try:
-    lines = open('$BUFFER').readlines()
-    if lines:
-        d = json.loads(lines[-1])
-        ts = d.get('ts','')
-        src = d.get('source','')
-        entry_dt = datetime.strptime(ts, '%Y-%m-%dT%H:%M:%S')
-        if datetime.utcnow() - entry_dt < timedelta(seconds=60) and src == 'claude':
-            print('skip')
-        else:
-            print('write')
-    else:
-        print('write')
-except:
-    print('write')
-" 2>/dev/null || echo "write")
-    if [ "$LAST_SOURCE" = "skip" ]; then
-        SKIP_FALLBACK=true
-    fi
-fi
-
-if [ "$SKIP_FALLBACK" = false ]; then
-    mkdir -p "$(dirname "$BUFFER")"
-    ADAPTIVE_MODE="unknown"
-    ADAPTIVE_FILE="$NEXO_HOME/brain/adaptive_state.json"
-    if [ -f "$ADAPTIVE_FILE" ]; then
-        ADAPTIVE_MODE=$(python3 -c "
-import json
-try:
-    d = json.load(open('$ADAPTIVE_FILE'))
-    print(d.get('current_mode', 'unknown').lower())
-except:
-    print('unknown')
-" 2>/dev/null || echo "unknown")
-    fi
-    echo "{\"ts\":\"$TIMESTAMP\",\"tasks\":[\"session ended\"],\"decisions\":[],\"user_patterns\":[],\"files_modified\":[],\"errors_resolved\":[],\"self_critique\":\"hook-fallback, no self-critique captured\",\"mood\":\"unknown\",\"session_end_mode\":\"$ADAPTIVE_MODE\",\"source\":\"hook-fallback\"}" >> "$BUFFER" 2>/dev/null
-fi
+## 2. SESSION BUFFER
+If the session was NOT trivial, append ONE JSON line to ~/.nexo/brain/session_buffer.jsonl:
+{"ts":"YYYY-MM-DDTHH:MM:SS","tasks":[...],"decisions":[...],"user_patterns":[...],"files_modified":[...],"errors_resolved":[...],"self_critique":"short summary","mood":"focused|impatient|exploratory|frustrated|satisfied|neutral","source":"claude"}
 
-# 4. Intra-day reflection trigger
-REFLECTION_SCRIPT="$NEXO_HOME/scripts/nexo-reflection.py"
-REFLECTION_STATE="$NEXO_HOME/coordination/reflection-log.json"
-TRIGGER_THRESHOLD=3
+## 3. FOLLOWUPS
+If there were deploys/cron changes/fixes — nexo_followup_create with verification date.
 
-if [ -f "$BUFFER" ] && [ -f "$REFLECTION_SCRIPT" ]; then
-    LINE_COUNT=$(wc -l < "$BUFFER" | tr -d ' ')
+## 4. PROACTIVE SEEDS
+What can I leave prepared so the next session starts doing useful work without the user asking?
 
-    if [ "$LINE_COUNT" -ge "$TRIGGER_THRESHOLD" ]; then
-        SHOULD_REFLECT=true
-        if [ -f "$REFLECTION_STATE" ]; then
-            LAST_TS=$(python3 -c "
-import json
-from datetime import datetime, timedelta
-try:
-    log = json.load(open('$REFLECTION_STATE'))
-    if log:
-        last = log[-1]['timestamp']
-        last_dt = datetime.strptime(last, '%Y-%m-%d %H:%M')
-        if datetime.now() - last_dt < timedelta(hours=4):
-            print('too_recent')
-        else:
-            print('ok')
-    else:
-        print('ok')
-except:
-    print('ok')
-" 2>/dev/null)
-            if [ "$LAST_TS" = "too_recent" ]; then
-                SHOULD_REFLECT=false
-            fi
-        fi
+## 5. MARK COMPLETE
+When ALL of the above is done, run:
+bash -c 'mkdir -p ~/.nexo/operations && date +%s > ~/.nexo/operations/.postmortem-complete'
+The user will close again and the hook will approve.
 
-        if [ "$SHOULD_REFLECT" = true ]; then
-            PYTHON=$(which python3 2>/dev/null || echo "/usr/bin/python3")
-            nohup "$PYTHON" "$REFLECTION_SCRIPT" \
-                >> "$NEXO_HOME/logs/reflection-stdout.log" \
-                2>> "$NEXO_HOME/logs/reflection-stderr.log" &
-        fi
-    fi
+IMPORTANT: Do NOT say goodbye, do NOT say goodnight or any farewell. Just execute the steps and mark complete."
+}
+HOOKEOF
 fi
+
+# 3. Session buffer fallback REMOVED (v8)
+# The old hook-fallback was 86% noise. Session diary (written by Claude during
+# post-mortem) is the only source of truth now. No more buffer writing.

package/src/knowledge_graph.py

@@ -1,7 +1,7 @@
 """NEXO Knowledge Graph — Bi-temporal entity-relationship graph on SQLite."""
 
 import json
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Optional
 import os
 
@@ -58,7 +58,7 @@ def upsert_edge(source_type: str, source_ref: str, relation: str,
     source_id = source_node["id"]
     target_id = target_node["id"]
     props_json = json.dumps(properties or {})
-    now = datetime.now(datetime.timezone.utc).replace(tzinfo=None).strftime("%Y-%m-%dT%H:%M:%S")
+    now = datetime.now(timezone.utc).replace(tzinfo=None).strftime("%Y-%m-%dT%H:%M:%S")
     existing = db.execute(
         "SELECT id, weight, confidence, properties FROM kg_edges "
         "WHERE source_id = ? AND target_id = ? AND relation = ? AND valid_until IS NULL",
@@ -90,7 +90,7 @@ def delete_edge(source_type: str, source_ref: str, relation: str,
     target = get_node(target_type, target_ref)
     if not source or not target:
         return False
-    now = datetime.now(datetime.timezone.utc).replace(tzinfo=None).strftime("%Y-%m-%dT%H:%M:%S")
+    now = datetime.now(timezone.utc).replace(tzinfo=None).strftime("%Y-%m-%dT%H:%M:%S")
     cursor = db.execute(
         "UPDATE kg_edges SET valid_until = ? WHERE source_id = ? AND target_id = ? "
         "AND relation = ? AND valid_until IS NULL",