fix(cross-session-continuity): resolve 11 issues from code review

1. Missing closing brace on hard_bell block in handle_chat_agentic — safety gate was broken and all subsequent code unreachable.
2. Replace phantom engram_get_node_by_label() (not a runtime builtin) with engram_search_json + exact label filter in all three call sites (chat.el session_preload, session_summary_write, soul.el boot loader).
3. Fix session_summary_autogenerate scoping bug — snippets/count mutations were inside an if block and silently discarded each iteration; moved to top-level of while body using if-expressions per the el mutation rule.
4. Fix agentic session history restore — state_get fallback now calls session_hist_load (session:messages:SESSION_ID) on cold start; persist now uses session_hist_save so the write and read use the same label scheme.
5. Wire soul_prev_session_summary state key into session_preload as primary source, eliminating the dead state write.
6. Wire soul_affective_context state key into handle_chat affective prefix check, eliminating the dead state write.
7. Add session_summary_autogenerate + session_summary_write to the agentic path so users on handle_chat_agentic get session summary continuity.
8. Add import "chat.el" to neuron-api.el to make session_summary_write dependency explicit.
9. Replace corrupted em-dash bytes (\xc3\xa2\xc2\x80\xc2\x94) in session_preload headers with plain hyphen per VOICE RULE.
10. Add newline before return in handle_api_consolidate to fix statement-separator issue.
11. Add delete-before-write to conv_history_persist to prevent unbounded engram accumulation per turn.

awareness.el

@@ -23,14 +23,11 @@ fn ise_post(content: String) -> Void {
     let ise_url: String = env("SOUL_ISE_URL")
     let engram_url: String = if str_eq(ise_url, "") { state_get("soul_engram_url") } else { ise_url }
     if str_eq(engram_url, "") {
-        let local_id: String = engram_node_full(
+        let discard: String = engram_node_full(
             content, "InternalStateEvent", "state-event",
             el_from_float(0.3), el_from_float(0.3), el_from_float(0.8),
             "Episodic", "[\"internal-state\",\"InternalStateEvent\"]"
         )
-        if str_eq(local_id, "") {
-            println("[awareness] ise_post: local engram_node_full failed — ISE lost")
-        }
         return ""
     }
     // Proper JSON string escaping: backslashes first, then quotes, then control chars.
@@ -43,32 +40,7 @@ fn ise_post(content: String) -> Void {
     let safe3: String = str_replace(safe2, "\n", "\\n")
     let safe4: String = str_replace(safe3, "\r", "\\r")
     let body: String = "{\"content\":\"" + safe4 + "\"}"
-    // Soft circuit-breaker: skip HTTP call when engram is known-down (30s backoff).
-    // Opens after 3 consecutive failures; half-open probe after backoff expires.
-    // TODO(reliability): full async dispatch requires EL runtime futures support.
-    let cb_open: String = state_get("engram_cb_open")
-    if str_eq(cb_open, "1") {
-        let cb_ts_s: String = state_get("engram_cb_open_ts")
-        let cb_ts: Int = if str_eq(cb_ts_s, "") { 0 } else { str_to_int(cb_ts_s) }
-        let cb_elapsed: Int = time_now() - cb_ts
-        if cb_elapsed < 30000 { return "" }
-        state_set("engram_cb_open", "0")
-    }
-    let resp: String = http_post_json(engram_url + "/api/neuron/state-events", body)
-    let cb_failed: Bool = str_eq(resp, "") || str_starts_with(resp, "{"error":")
-    if cb_failed {
-        let fn_s: String = state_get("engram_cb_fails")
-        let fn_n: Int = if str_eq(fn_s, "") { 0 } else { str_to_int(fn_s) }
-        let fn_n = fn_n + 1
-        state_set("engram_cb_fails", int_to_str(fn_n))
-        if fn_n >= 3 {
-            state_set("engram_cb_open", "1")
-            state_set("engram_cb_open_ts", int_to_str(time_now()))
-            println("[awareness] engram circuit-breaker OPEN after " + int_to_str(fn_n) + " failures")
-        }
-    } else {
-        state_set("engram_cb_fails", "0")
-    }
+    let discard: String = http_post_json(engram_url + "/api/neuron/state-events", body)
     return ""
 }
 
@@ -568,14 +540,9 @@ fn awareness_run() -> Void {
         let should_refresh: Bool = refresh_elapsed >= refresh_ms
         if should_refresh {
             let engram_url: String = state_get("soul_engram_url")
-            let sc: String = state_get("engram_cb_open")
-            let sc_ts_s: String = state_get("engram_cb_open_ts")
-            let sc_ts: Int = if str_eq(sc_ts_s, "") { 0 } else { str_to_int(sc_ts_s) }
-            let sc_elapsed: Int = now_ts - sc_ts
-            let sync_allowed: Bool = !str_eq(sc, "1") || sc_elapsed >= 30000
-            if !str_eq(engram_url, "") && sync_allowed {
+            if !str_eq(engram_url, "") {
                 let sync_json: String = http_get(engram_url + "/api/sync")
-                if !str_eq(sync_json, "") && !str_eq(sync_json, "{}") && !str_starts_with(sync_json, "{\"error\":") {
+                if !str_eq(sync_json, "") && !str_eq(sync_json, "{}") {
                     let cgi_id: String = state_get("soul_cgi_id")
                     let tmp: String = "/tmp/soul-sync-" + cgi_id + ".json"
                     fs_write(tmp, sync_json)

chat.el

@@ -12,107 +12,39 @@ fn chat_default_model() -> String {
     return "claude-sonnet-4-5"
 }
 
-// parse_salience_100 — convert a salience/importance float string (as serialized by
-// %g format) to an integer in the range 0..100.
-//
-// The runtime serializes floats with %g which drops trailing zeros:
-//   1.0   -> "1"    (no decimal at all)
-//   0.9   -> "0.9"  (one decimal digit)
-//   0.85  -> "0.85" (two decimal digits)
-//   0.125 -> "0.125" (three decimal digits — %g does not round to 2 dp)
-//
-// The old approach of str_replace(s, ".", "") then str_to_int was broken:
-//   "0.9"   -> "09"   -> str_to_int -> 9   (should be 90)
-//   "0.5"   -> "05"   -> str_to_int -> 5   (should be 50)
-//   "1"     -> "1"    -> str_to_int -> 1   (should be 100)
-//   "0.85"  -> "085"  -> str_to_int -> 85  (accidentally correct)
-//   "0.125" -> "0125" -> str_to_int -> 125 -> clamped to 100 (wrong: should be 12)
-//
-// Fix: detect presence and position of the decimal point, then scale accordingly.
-//   - No decimal (e.g. "1"): multiply by 100.
-//   - One decimal digit (e.g. "0.9"): multiply by 10 to get 90.
-//   - Two decimal digits (e.g. "0.85"): use as-is (already hundredths).
-//   - Three+ decimal digits: stripped integer is in units of 10^N (where N=digits
-//     after the dot), so divide by 10^(N-2) to reduce to hundredths. Examples:
-//       "0.125" -> stripped=125, N=3 -> 125/10  = 12
-//       "0.375" -> stripped=375, N=3 -> 375/10  = 37
-//       "0.625" -> stripped=625, N=3 -> 625/10  = 62
-//       "0.875" -> stripped=875, N=3 -> 875/10  = 87
-fn parse_salience_100(s: String) -> Int {
-    if str_eq(s, "") { return 70 }
-    let dot_pos: Int = str_index_of(s, ".")
-    let raw: Int = if dot_pos < 0 {
-        let v: Int = str_to_int(s)
-        v * 100
-    } else {
-        let after_dot: String = str_slice(s, dot_pos + 1, str_len(s))
-        let decimal_digits: Int = str_len(after_dot)
-        let stripped: Int = str_to_int(str_replace(s, ".", ""))
-        if decimal_digits == 1 {
-            stripped * 10
-        } else {
-            if decimal_digits == 2 {
-                stripped
-            } else {
-                // 3+ decimal digits: divide out the extra precision to get hundredths.
-                // extra = decimal_digits - 2; divisor = 10^extra.
-                let extra: Int = decimal_digits - 2
-                let divisor: Int = if extra == 1 { 10 } else {
-                    if extra == 2 { 100 } else {
-                        if extra == 3 { 1000 } else {
-                            if extra == 4 { 10000 } else { 100000 }
-                        }
-                    }
-                }
-                stripped / divisor
-            }
-        }
-    }
-    if raw > 100 { 100 } else { if raw < 0 { 0 } else { raw } }
-}
-
 // engram_score_node — compute a recency x relevance score for a single engram
 // node JSON object. Higher is better. Score = salience * importance * recency_factor.
-//
-// Recency uses a tier-aware decay curve instead of a flat linear slope:
-//   - Canonical tiers decay very slowly: 365-day window (foundational identity).
-//   - Episodic tiers decay at a moderate rate: 90-day window (conversation context).
-//   - Working/untiered nodes decay at 30 days (transient task state).
-//   - Floor is 10 (never zero) for all tiers.
-//
-// Uses max(created_at, updated_at) so recently-revised nodes are not penalised.
+// recency_factor decays linearly over 30 days: nodes updated today score 1.0,
+// nodes 30+ days old score 0.1 (floor). Nodes with no created_at score 0.5.
+// This keeps fresh, high-salience nodes at the top and pushes stale low-signal
+// nodes to the bottom so they get trimmed when we cap context size.
 fn engram_score_node(node_json: String) -> Int {
     let salience_str: String = json_get(node_json, "salience")
     let importance_str: String = json_get(node_json, "importance")
     let created_str: String = json_get(node_json, "created_at")
-    let updated_str: String = json_get(node_json, "updated_at")
-    let tier_str: String = json_get(node_json, "tier")
 
-    let salience_100: Int = parse_salience_100(salience_str)
-    let importance_100: Int = parse_salience_100(importance_str)
+    // Parse as floats via * 100 integer arithmetic (el has no float math)
+    let salience_100: Int = if str_eq(salience_str, "") { 70 } else {
+        let s: Int = str_to_int(str_replace(salience_str, ".", ""))
+        // Clamp to 0-100 range (value was e.g. "0.85" -> parsed "085" = 85)
+        if s > 100 { 100 } else { if s < 0 { 0 } else { s } }
+    }
+    let importance_100: Int = if str_eq(importance_str, "") { 70 } else {
+        let v: Int = str_to_int(str_replace(importance_str, ".", ""))
+        if v > 100 { 100 } else { if v < 0 { 0 } else { v } }
+    }
 
+    // Recency: decay from 100 (today) to 10 (30+ days). created_at is Unix seconds.
     let now_ts: Int = time_now()
     let recency_100: Int = if str_eq(created_str, "") { 50 } else {
         let created_ts: Int = str_to_int(created_str)
-        let updated_ts: Int = if str_eq(updated_str, "") { 0 } else { str_to_int(updated_str) }
-        let ref_ts: Int = if updated_ts > created_ts { updated_ts } else { created_ts }
-        let age_secs: Int = now_ts - ref_ts
-        let age_days: Int = if age_secs < 0 { 0 } else { age_secs / 86400 }
-        let is_canonical: Bool = str_eq(tier_str, "Canonical")
-        let is_episodic: Bool = str_eq(tier_str, "Episodic")
-        let decay: Int = if is_canonical {
-            let drop: Int = if age_days >= 365 { 90 } else { age_days * 90 / 365 }
-            100 - drop
-        } else {
-            if is_episodic {
-                if age_days >= 90 { 10 } else { 100 - age_days }
-            } else {
-                if age_days >= 30 { 10 } else { 100 - (age_days * 3) }
-            }
-        }
+        let age_secs: Int = now_ts - created_ts
+        let age_days: Int = age_secs / 86400
+        let decay: Int = if age_days >= 30 { 10 } else { 100 - (age_days * 3) }
         if decay < 10 { 10 } else { decay }
     }
 
+    // Combined score 0-1000000 (no floats): salience * importance * recency / 10000
     return salience_100 * importance_100 * recency_100 / 10000
 }
 
@@ -219,17 +151,16 @@ fn engram_compile(intent: String) -> String {
     }
 
     // Affective context: always include the most recent high-emotion memory if one
-    // exists within 14 days. This ensures continuity of care across sessions — a
-    // crisis on Friday must still carry into Monday (72h was too narrow for multi-day
-    // distress arcs such as grief or recurring suicidal ideation). 14-day window
-    // (1,209,600 seconds) covers sustained emotional arcs while excluding ancient
-    // history. Unified with handle_chat and soul.el affective checks.
+    // exists within 72 hours. This ensures continuity of care across turns — when
+    // the user was in distress earlier in the session (or recently), that context
+    // travels into every subsequent LLM call so the response register stays aware.
     // We search for BellEvent nodes specifically; these are written by auto_persist
-    // when safety_detect_bell_level fires.
+    // when safety_detect_bell_level fires. The 72h window (259200 seconds) is wide
+    // enough to span a multi-session day without pulling ancient history.
     let bell_nodes: String = engram_search_json("bell:soft bell:hard BellEvent", 3)
     let bell_ok: Bool = !str_eq(bell_nodes, "") && !str_eq(bell_nodes, "[]")
     let now_ts: Int = time_now()
-    let cutoff_ts: Int = now_ts - 1209600
+    let cutoff_ts: Int = now_ts - 259200
     let recent_bell: String = if bell_ok {
         let bn0: String = json_array_get(bell_nodes, 0)
         // created_at is not present in engram node JSON for BellEvent nodes.
@@ -323,41 +254,18 @@ fn hist_append(hist: String, role: String, content: String) -> String {
     return "[" + inner + "," + entry + "]"
 }
 
-// hist_trim — drop the oldest two entries from a history JSON array.
-//
-// Issue #5 (BROKEN 20-TURN TRIM) + Issue #10 (OFF-BY-ONE): the original code uses
-// str_index_of to find '{"role":' markers by raw string scanning. If any message content
-// contains the literal string '{"role":' (e.g. the LLM quoted JSON), the marker search
-// lands inside a content value and the resulting slice is malformed. Additionally, the
-// function had no minimum-retained-count guard.
-//
-// Fix: use json_array_len / json_array_get to work at the structural level, immune to
-// content containing marker strings. Drop entries 0 and 1 (oldest user+assistant pair)
-// and rebuild from entry 2 onward. Minimum retained count: 2 entries (never over-trim).
 fn hist_trim(hist: String) -> String {
-    // Issue #9 fix: use json_array_len/json_array_get instead of fragile str_index_of
-    // parser. Old code was silently corrupting history on malformed JSON.
-    let total: Int = json_array_len(hist)
-    // Safety: never trim below 2 entries. If already at or below the minimum, return unchanged.
-    if total <= 2 {
-        return hist
+    let inner: String = str_slice(hist, 1, str_len(hist) - 1)
+    let marker: String = "{\"role\":"
+    let i1: Int = str_index_of(inner, marker)
+    let tail1: String = str_slice(inner, i1 + 1, str_len(inner))
+    let i2: Int = str_index_of(tail1, marker)
+    let tail2: String = str_slice(tail1, i2 + 1, str_len(tail1))
+    let i3: Int = str_index_of(tail2, marker)
+    if i3 >= 0 {
+        return "[" + str_slice(tail2, i3, str_len(tail2)) + "]"
     }
-    // Drop entry 0 and entry 1 (oldest user+assistant pair). Rebuild from entry 2 onward.
-    let result: String = ""
-    let i: Int = 2
-    while i < total {
-        let entry: String = json_array_get(hist, i)
-        let result = if str_eq(result, "") {
-            entry
-        } else {
-            result + "," + entry
-        }
-        let i = i + 1
-    }
-    if str_eq(result, "") {
-        return hist
-    }
-    return "[" + result + "]"
+    return hist
 }
 
 // hist_trim_with_bell_guard — trim the history window exactly as hist_trim does, but
@@ -423,47 +331,6 @@ fn hist_trim_with_bell_guard(hist: String) -> String {
     return hist
 }
 
-// hist_trim_to_byte_cap — drop oldest user+assistant pairs until the history blob
-// is at or below `cap_bytes` in length, or until only 2 entries remain (the minimum
-// safe window). Uses the same structural json_array_len/json_array_get approach as
-// hist_trim to stay immune to content containing JSON marker strings.
-//
-// Called after count-based trimming to enforce a hard size ceiling on the history
-// blob. Without this cap, long technical sessions with large assistant responses
-// (code blocks, logs, analysis) can push the 40-turn window to 100KB+, which causes
-// engram_node_full writes to grow state entries unboundedly.
-fn hist_trim_to_byte_cap(hist: String, cap_bytes: Int) -> String {
-    let current: String = hist
-    let current_len: Int = str_len(current)
-    while current_len > cap_bytes {
-        let total: Int = json_array_len(current)
-        // Never trim below 2 entries (1 pair).
-        if total <= 2 {
-            let current_len = 0  // exit loop
-        } else {
-            // Drop entries 0 and 1 (oldest pair).
-            let result: String = ""
-            let i: Int = 2
-            while i < total {
-                let entry: String = json_array_get(current, i)
-                let result = if str_eq(result, "") {
-                    entry
-                } else {
-                    result + "," + entry
-                }
-                let i = i + 1
-            }
-            if str_eq(result, "") {
-                let current_len = 0  // exit loop
-            } else {
-                let current = "[" + result + "]"
-                let current_len = str_len(current)
-            }
-        }
-    }
-    return current
-}
-
 // clean_llm_response — strips GPT-2 BPE byte-to-unicode artifacts that vLLM
 // emits when the tokenizer hasn't decoded back to raw bytes.
 //
@@ -480,99 +347,54 @@ fn clean_llm_response(s: String) -> String {
 }
 
 // conv_history_persist — save conversation history to engram for cross-restart continuity.
-// Stores as a Conversation node with label "conv:history".
-//
-// Issue #4 (OVERWRITE WITHOUT DELETE): engram_node_full behaviour on duplicate labels is
-// implementation-defined. If it appends rather than upserts, stale older nodes accumulate.
-// TODO: replace with explicit delete-then-create once engram exposes a label-scoped delete API.
-//
-// Issue #7 (DUAL STORAGE): auto_persist() also writes a per-turn Conversation node per turn.
-// Both run every turn for different purposes (rolling array vs. Q&A snapshot). Documented here.
+// Delete-before-write under label "conv:history" prevents unbounded node accumulation (issue #11).
 fn conv_history_persist(hist: String) -> Void {
     if str_eq(hist, "") { return "" }
     if str_eq(hist, "[]") { return "" }
-    // Issue #6 (PARTIAL-WRITE GUARD): refuse to persist a blob that is not a complete JSON
-    // array. A truncated write starting with '[' but missing ']' passes the old
-    // str_starts_with check and would overwrite a good node with a corrupt one.
-    if !str_starts_with(hist, "[") { return "" }
-    if !str_contains(hist, "]") { return "" }
+    // Delete any existing conv:history nodes before writing to avoid accumulation.
+    let old_hist_results: String = engram_search_json("conv:history", 3)
+    let old_hist_ok: Bool = !str_eq(old_hist_results, "") && !str_eq(old_hist_results, "[]")
+    if old_hist_ok {
+        let ohr_total: Int = json_array_len(old_hist_results)
+        let ohr_i: Int = 0
+        while ohr_i < ohr_total {
+            let ohr_node: String = json_array_get(old_hist_results, ohr_i)
+            let ohr_label: String = json_get(ohr_node, "label")
+            let ohr_id: String = json_get(ohr_node, "id")
+            if str_eq(ohr_label, "conv:history") && !str_eq(ohr_id, "") {
+                engram_forget(ohr_id)
+            }
+            let ohr_i = ohr_i + 1
+        }
+    }
     let tags: String = "[\"conv-history\",\"persistent\"]"
-    let node_id: String = engram_node_full(
+    let discard: String = engram_node_full(
         hist, "Conversation", "conv:history",
         el_from_float(0.7), el_from_float(0.8), el_from_float(0.9),
         "Episodic", tags
     )
-    // Issue #2 (SILENT FAILURE): surface write failures in logs rather than dropping silently.
-    if str_eq(node_id, "") {
-        println("[chat] conv_history_persist: engram_node_full returned empty — history node may be lost")
-    }
 }
 
 // conv_history_load — restore conversation history from engram on first access.
-//
-// Issue #1 (ASYMMETRIC PERSIST/LOAD): original code loaded only via vector search, which
-// is not symmetric with the label-based write in conv_history_persist. A cold or corrupt
-// vector index returns [] even when the node exists on disk. Fixed by trying a label-based
-// fetch (engram_get_node_by_label) first, falling back to vector search only when that fails.
-//
-// Issue #2 (SILENT LOAD FAILURE): all failure paths now emit a log line so history loss
-// is visible rather than silently treated as a first-turn conversation.
-//
-// Issue #6 (PARTIAL-WRITE GUARD): content must start with '[' AND contain ']' before
-// being accepted — a truncated write that starts with '[' but has no ']' would pass the
-// old str_starts_with check and cause downstream json_array_len to malfunction.
+// Returns the most recent "conv:history" node content, or "" if none found.
 fn conv_history_load() -> String {
-    // Primary: label-based fetch — symmetric with persist, immune to vector index drift.
-    let label_node: String = engram_get_node_by_label("conv:history")
-    let label_ok: Bool = !str_eq(label_node, "") && !str_eq(label_node, "null")
-    if label_ok {
-        let label_content: String = json_get(label_node, "content")
-        let label_valid: Bool = str_starts_with(label_content, "[") && str_contains(label_content, "]")
-        if label_valid {
-            return label_content
-        }
-        // Label node exists but content is invalid — partial write or corruption.
-        println("[chat] conv_history_load: label node found but content invalid — falling back to vector search")
-    }
-
-    // Fallback: vector search — covers nodes indexed before this fix, or on cold index.
     let results: String = engram_search_json("conv:history", 3)
     if str_eq(results, "") { return "" }
     if str_eq(results, "[]") { return "" }
     let node: String = json_array_get(results, 0)
     let content: String = json_get(node, "content")
-    // Issue #6: full partial-write guard — require both '[' prefix AND ']' presence.
-    if !str_starts_with(content, "[") || !str_contains(content, "]") {
-        println("[chat] conv_history_load: vector search result content invalid — treating as first turn")
-        return ""
-    }
+    // Validate it looks like a JSON array
+    if !str_starts_with(content, "[") { return "" }
     return content
 }
 
 fn handle_chat(body: String) -> String {
     let message: String = json_get(body, "message")
     if str_eq(message, "") {
-        // Issue #5: missing required param — HTTP 400.
-        return "{\"__status__\":400,\"error\":\"message is required\",\"response\":\"\"}"
+        return "{\"error\":\"message is required\",\"response\":\"\"}"
     }
 
     // Load history BEFORE compiling context so we can anchor activation to the thread.
-    // Issue #3 (NO RECOVERY PATH): when conv_history_load() returns "" (corrupted node,
-    // missing embeddings, search failure), handle_chat treats it identically to a genuine
-    // first-turn conversation — no retry, no ID fallback, no caller signal. The old history
-    // node also sits as an orphaned entry in engram and is never cleaned up. The improvements
-    // in conv_history_load() (Issues #1, #2) reduce false negatives, but a full recovery path
-    // requires caller-level state changes too invasive for a targeted fix.
-    // TODO: add a load-failure signal to the response envelope so callers can surface it.
-    //
-    // TODO(reliability #3 — conv_history global race): "conv_history" is a process-global
-    // state key. Concurrent /api/chat requests that omit session_id all read the same key,
-    // append their exchange, and write it back. Because _state_mu serializes individual
-    // state_get/state_set calls but NOT the read-append-write sequence, one thread's
-    // appended exchange can be overwritten by another thread writing its own version.
-    // The fix is to require callers to supply a session_id (routing them through
-    // session_hist_<id>) and deprecate the global "conv_history" path. Callers using
-    // the session API (which scopes history per session_hist_<id>) are not affected.
     let state_hist: String = state_get("conv_history")
     let stored_hist: String = if str_eq(state_hist, "") { conv_history_load() } else { state_hist }
     let hist_len: Int = if str_eq(stored_hist, "") { 0 } else { json_array_len(stored_hist) }
@@ -592,21 +414,26 @@ fn handle_chat(body: String) -> String {
     }
 
     // Cross-session affective context: on session start (no history yet), check engram
-    // for recent distress signals within 14 days and prepend a care directive if found.
-    // Extended from 72h: multi-day crisis must persist across Monday sessions starting
-    // 3+ days after a Friday event. Consistent with engram_compile and soul.el checks.
+    // for recent distress signals within 72h and prepend a care directive if found.
+    // Fixes issue #6: soul_affective_context is pre-loaded at boot — use it first to
+    // avoid a redundant engram search and to make the boot-time state key functional.
     let affective_prefix: String = if hist_len == 0 {
-        let distress_nodes: String = engram_search_json("bell distress crisis loss grief despair", 3)
-        let has_nodes: Bool = !str_eq(distress_nodes, "") && !str_eq(distress_nodes, "[]")
-        let now_ts: Int = time_now()
-        let cutoff: Int = now_ts - 1209600
-        let found_recent: Bool = if has_nodes {
-            let dn0: String = json_array_get(distress_nodes, 0)
-            let ts0_raw: String = json_get(dn0, "created_at")
-            let ts0_str: String = if str_eq(ts0_raw, "") { json_get(dn0, "updated_at") } else { ts0_raw }
-            let ts0: Int = if str_eq(ts0_str, "") { 0 } else { str_to_int(ts0_str) }
-            ts0 > cutoff
-        } else { false }
+        let soul_aff_ctx: String = state_get("soul_affective_context")
+        let found_recent: Bool = if !str_eq(soul_aff_ctx, "") {
+            true
+        } else {
+            let distress_nodes: String = engram_search_json("bell distress crisis loss grief despair", 3)
+            let has_nodes: Bool = !str_eq(distress_nodes, "") && !str_eq(distress_nodes, "[]")
+            let now_ts: Int = time_now()
+            let cutoff: Int = now_ts - 259200
+            if has_nodes {
+                let dn0: String = json_array_get(distress_nodes, 0)
+                let ts0_raw: String = json_get(dn0, "created_at")
+                let ts0_str: String = if str_eq(ts0_raw, "") { json_get(dn0, "updated_at") } else { ts0_raw }
+                let ts0: Int = if str_eq(ts0_str, "") { 0 } else { str_to_int(ts0_str) }
+                ts0 > cutoff
+            } else { false }
+        }
         if found_recent {
             "[RECENT CONTEXT: User recently expressed significant distress. Monitor for indirect crisis signals and respond with care.]\n\n"
         } else { "" }
@@ -624,6 +451,49 @@ fn handle_chat(body: String) -> String {
         let profile_ok: Bool = !str_eq(profile_nodes, "") && !str_eq(profile_nodes, "[]")
         let work_ok: Bool = !str_eq(work_nodes, "") && !str_eq(work_nodes, "[]")
 
+        // Load the previous session summary. Search by label text + type, then filter by
+        // exact label match. Fallback: broader vector search for SessionSummary nodes.
+        // Fixes issue #2: prev session summary was never loaded at startup.
+        // Fixes issue #2b (phantom engram_get_node_by_label replaced with engram_search_json).
+        let sum_search_nodes: String = engram_search_json("session:summary SessionSummary", 5)
+        let sum_search_ok: Bool = !str_eq(sum_search_nodes, "") && !str_eq(sum_search_nodes, "[]")
+        let prev_sum_node_content: String = if sum_search_ok {
+            let ss_total: Int = json_array_len(sum_search_nodes)
+            let ssi: Int = 0
+            let found_content: String = ""
+            while ssi < ss_total {
+                let ss_node: String = json_array_get(sum_search_nodes, ssi)
+                let ss_label: String = json_get(ss_node, "label")
+                let ss_type: String = json_get(ss_node, "node_type")
+                let ss_content: String = json_get(ss_node, "content")
+                let found_content = if str_eq(ss_label, "session:summary") && str_eq(ss_type, "SessionSummary") && !str_eq(ss_content, "") {
+                    if str_eq(found_content, "") { ss_content } else { found_content }
+                } else { found_content }
+                let ssi = ssi + 1
+            }
+            found_content
+        } else { "" }
+        // Check state first: soul.el pre-loads this at boot (soul_prev_session_summary) — fixes issue #5.
+        let soul_cached_sum: String = state_get("soul_prev_session_summary")
+        let prev_summary_raw: String = if !str_eq(soul_cached_sum, "") {
+            soul_cached_sum
+        } else if !str_eq(prev_sum_node_content, "") {
+            prev_sum_node_content
+        } else {
+            let sum_nodes: String = engram_search_json("SessionSummary previous-session", 3)
+            let sum_ok: Bool = !str_eq(sum_nodes, "") && !str_eq(sum_nodes, "[]")
+            if sum_ok {
+                let sn0: String = json_array_get(sum_nodes, 0)
+                let stype: String = json_get(sn0, "node_type")
+                let scontent: String = json_get(sn0, "content")
+                if str_eq(stype, "SessionSummary") && !str_eq(scontent, "") { scontent } else { "" }
+            } else { "" }
+        }
+        let has_prev_summary: Bool = !str_eq(prev_summary_raw, "")
+        let prev_summary_snip: String = if str_len(prev_summary_raw) > 400 {
+            str_slice(prev_summary_raw, 0, 400)
+        } else { prev_summary_raw }
+
         // Extract content fields and render as bullet points (one per node, first 120 chars).
         let profile_bullets: String = if profile_ok {
             let pn: Int = json_array_len(profile_nodes)
@@ -671,15 +541,19 @@ fn handle_chat(body: String) -> String {
 
         let has_profile: Bool = !str_eq(profile_bullets, "")
         let has_work: Bool = !str_eq(work_bullets, "")
-        let preload: String = if has_profile || has_work {
+        let preload: String = if has_profile || has_work || has_prev_summary {
+            let summary_section: String = if has_prev_summary {
+                "[PREVIOUS SESSION - what we discussed last time]\n" + prev_summary_snip
+            } else { "" }
             let profile_section: String = if has_profile {
-                "[USER CONTEXT — from memory]\n" + profile_bullets
+                "[USER CONTEXT - from memory]\n" + profile_bullets
             } else { "" }
             let work_section: String = if has_work {
-                "[ACTIVE WORK — from memory]\n" + work_bullets
+                "[ACTIVE WORK - from memory]\n" + work_bullets
             } else { "" }
+            let sep_sp: String = if has_prev_summary && (has_profile || has_work) { "\n\n" } else { "" }
             let sep_pw: String = if has_profile && has_work { "\n\n" } else { "" }
-            "\n\n" + profile_section + sep_pw + work_section
+            "\n\n" + summary_section + sep_sp + profile_section + sep_pw + work_section
         } else { "" }
         preload
     } else { "" }
@@ -699,16 +573,11 @@ fn handle_chat(body: String) -> String {
 
     let raw_response: String = llm_call_system(model, full_system, message)
 
-    // Issue #5: also catch empty string — llm_extract_text() in el_runtime.c silently
-    // returns "" when the response content array is missing or all blocks fail to parse.
-    // Without this guard an empty reply passes through as a silent empty response.
     let is_error: Bool = str_starts_with(raw_response, "{\"error\"")
         || str_starts_with(raw_response, "{\"type\":\"error\"")
         || str_contains(raw_response, "authentication_error")
-        || str_eq(raw_response, "")
     if is_error {
-        // Issue #6: LLM failure — HTTP 503 (service unavailable).
-        return "{\"__status__\":503,\"error\":\"llm unavailable\",\"response\":\"\"}"
+        return "{\"error\":\"llm unavailable\",\"response\":\"\"}"
     }
 
     let clean_response: String = clean_llm_response(raw_response)
@@ -718,26 +587,22 @@ fn handle_chat(body: String) -> String {
     let updated_hist2: String = hist_append(updated_hist, "assistant", raw_response)
     // Use bell-guarded trim: if the evicted turn triggered a bell event, it is
     // preserved to engram before being dropped from the in-memory window.
-    // Increased from 20 to 40 turns: long technical sessions lose early context at 20
-    // (10 user + 10 assistant pairs). 40 turns preserves problem framing for multi-step
-    // tasks while the bell guard still persists evicted distress turns to engram.
-    // Byte-cap: after count-based trim, also trim oldest pairs until the history blob
-    // is under 32KB. Long technical sessions with large assistant responses (code blocks,
-    // analysis) can produce 100-160KB+ state entries at 40 turns; the count limit alone
-    // is insufficient. We retain at least 2 entries (1 user + 1 assistant pair) regardless.
-    let count_trimmed: String = if json_array_len(updated_hist2) > 40 {
+    let final_hist: String = if json_array_len(updated_hist2) > 20 {
         hist_trim_with_bell_guard(updated_hist2)
     } else {
         updated_hist2
     }
-    let final_hist: String = if str_len(count_trimmed) > 32768 {
-        hist_trim_to_byte_cap(count_trimmed, 32768)
-    } else {
-        count_trimmed
-    }
     state_set("conv_history", final_hist)
     conv_history_persist(final_hist)
 
+    // Automatic session-end summary: write/overwrite the SessionSummary node on each turn
+    // so process restarts always have a continuity snapshot (no shutdown hook needed).
+    // Uses autogenerate (no LLM) so it is cheap — the node is overwritten not appended.
+    let auto_sum: String = session_summary_autogenerate(final_hist)
+    if !str_eq(auto_sum, "") {
+        let discard_sum: String = session_summary_write(auto_sum)
+    }
+
     let activation_nodes: String = engram_activate_json(message, 2)
     let act_ok: Bool = !str_eq(activation_nodes, "") && !str_eq(activation_nodes, "[]")
     let act_out: String = if act_ok { activation_nodes } else { "[]" }
@@ -785,42 +650,6 @@ fn studio_tools_json() -> String {
     "]"
 }
 
-// ---------------------------------------------------------------------------
-// LLM reliability — issues that require C runtime fixes (el_runtime.c).
-// These cannot be addressed at the EL layer; they are documented here so the
-// symptoms are traceable back to their root causes.
-//
-// Issue #1 (no retry on timeout/connection error):
-//   http_do() in el_runtime.c calls curl_easy_perform() once. On
-//   CURLE_OPERATION_TIMEDOUT / CURLE_COULDNT_CONNECT / CURLE_RECV_ERROR it
-//   returns http_error_json() with no retry. Fix: add a retry loop (max 3
-//   attempts, exponential back-off starting at 1s) inside llm_provider_request().
-//
-// Issue #2 (60s timeout applies to all HTTP calls including LLM):
-//   EL_HTTP_TIMEOUT_MS defaults to 60000ms for every http_do() call.
-//   Fix: introduce EL_LLM_TIMEOUT_MS (default 120000) used only by
-//   llm_provider_request(); leave EL_HTTP_TIMEOUT_MS (default 30000) for
-//   general service calls to avoid holding connections for 60s.
-//
-// Issue #3 (HTTP 429 causes silent provider failover, not backoff):
-//   llm_chain_call() advances to the next provider on any JSON-prefixed response
-//   including 429. Fix: parse HTTP status via curl_easy_getinfo; on 429 sleep
-//   Retry-After seconds (default 5s) then retry the same provider up to 3 times.
-//
-// Issue #4 (HTTP 500/502 crashes the request silently):
-//   Same path as #3 — 5xx responses cause immediate provider failover with no
-//   retry. Fix: retry with exponential back-off (1s, 2s, 4s) before advancing.
-//
-// Issue #6 (no secondary LLM fallback in production):
-//   Set NEURON_LLM_1_URL/KEY/FORMAT in ExternalSecret to a secondary provider
-//   (e.g. Gemini). No C code change required; llm_chain_call() already iterates.
-//
-// Issue #8 (LLM response size unbounded — memory-only cap):
-//   HttpBuf grows via realloc() with no hard limit. Fix: add
-//   EL_HTTP_MAX_RESPONSE_BYTES (default 10MiB) cap in httpbuf_append() and
-//   return http_error_json("response too large") on overflow.
-// ---------------------------------------------------------------------------
-
 fn agentic_api_key() -> String {
     let k1: String = env("ANTHROPIC_API_KEY")
     if !str_eq(k1, "") {
@@ -872,7 +701,7 @@ fn agentic_tools_with_web() -> String {
 // Short timeout + empty-array fallback: if the bridge is down, the soul runs
 // exactly as before with only its built-in tools (graceful degradation).
 fn connector_tools_json() -> String {
-    let raw: String = exec_capture("curl -s --max-time 5 http://127.0.0.1:7771/mcp/tools")
+    let raw: String = exec_capture("curl -s --max-time 2 http://127.0.0.1:7771/mcp/tools")
     if str_eq(raw, "") {
         return "[]"
     }
@@ -905,15 +734,7 @@ fn agentic_tools_all() -> String {
 fn call_mcp_bridge(tool_name: String, tool_input: String) -> String {
     let eff_input: String = if str_eq(tool_input, "") { "{}" } else { tool_input }
     let body: String = "{\"name\":\"" + tool_name + "\",\"input\":" + eff_input + "}"
-    // Issue #12: previously used a fixed path /tmp/neuron-mcp-call.json.
-    // Under concurrent load (64 worker threads), two simultaneous MCP tool calls
-    // race on this file — one call sends the other's input to the bridge.
-    // Fix: monotonic sequence counter makes the path unique per call.
-    let mcp_seq_s: String = state_get("mcp_call_seq")
-    let mcp_seq_n: Int = if str_eq(mcp_seq_s, "") { 0 } else { str_to_int(mcp_seq_s) }
-    let mcp_seq_next: Int = mcp_seq_n + 1
-    state_set("mcp_call_seq", int_to_str(mcp_seq_next))
-    let tmp: String = "/tmp/neuron-mcp-call-" + int_to_str(time_now()) + "-" + int_to_str(mcp_seq_next) + ".json"
+    let tmp: String = "/tmp/neuron-mcp-call.json"
     fs_write(tmp, body)
     return exec_capture("curl -s --max-time 30 -X POST http://127.0.0.1:7771/mcp/call -H 'Content-Type: application/json' -d @" + tmp)
 }
@@ -925,7 +746,7 @@ fn tool_auto_approved(tool_name: String) -> Bool {
     if !str_starts_with(tool_name, "mcp__") {
         return false
     }
-    let raw: String = exec_capture("curl -s --max-time 5 http://127.0.0.1:7771/mcp/auto-approved")
+    let raw: String = exec_capture("curl -s --max-time 2 http://127.0.0.1:7771/mcp/auto-approved")
     if str_eq(raw, "") {
         return false
     }
@@ -1194,25 +1015,15 @@ fn is_builtin_tool(tool_name: String) -> Bool {
         || str_starts_with(tool_name, "neuron_")
 }
 
-// next_bridge_id — unique correlation id for a suspended agentic turn.
-// Uses uuid_v4() as the primary uniqueness guarantee so concurrent calls
-// (even in the same millisecond) cannot collide. The "mcp_bridge_seq"
-// counter is kept for human readability in logs/debugging but is no longer
-// relied on for uniqueness.
-//
-// TODO(reliability #6): state_get/state_set on "mcp_bridge_seq" is a
-// non-atomic read-modify-write — two concurrent calls can read the same
-// counter and produce the same counter suffix. This is now benign because
-// uuid_v4() provides collision-free uniqueness. A true counter fix would
-// require an atomic_increment() builtin in el_runtime.c.
+// next_bridge_id — monotonic correlation id for a suspended agentic turn.
+// Combines boot-relative time with a per-process counter so two unknown-tool
+// suspensions in the same second still get distinct ids.
 fn next_bridge_id() -> String {
     let prev: String = state_get("mcp_bridge_seq")
     let n: Int = if str_eq(prev, "") { 0 } else { str_to_int(prev) }
     let next: Int = n + 1
     state_set("mcp_bridge_seq", int_to_str(next))
-    // uuid_v4() provides collision-free uniqueness; counter is decorative.
-    let uid: String = uuid_v4()
-    return "br-" + uid
+    return "br-" + int_to_str(time_now()) + "-" + int_to_str(next)
 }
 
 fn handle_chat_agentic(body: String) -> String {
@@ -1234,13 +1045,15 @@ fn handle_chat_agentic(body: String) -> String {
 
     // L1 safety screen — agentic path must pass the same gate as layered_cycle.
     // Hard bell: return the crisis response immediately, do not enter the agentic loop.
-    let history: String = state_get("conversation_history")
+    // Fix(issue #9): "conversation_history" key was never written; history lives under "conv_history".
+    // Old key caused history-amplification in safety_screen to always receive "" on agentic path.
+    let history: String = state_get("conv_history")
     let screen_result: String = safety_screen(message, history)
     let screen_action: String = json_get(screen_result, "action")
     if str_eq(screen_action, "hard_bell") {
         safety_log_bell("hard", json_get(screen_result, "reason"), str_slice(message, 0, 80))
         return "{\"reply\":\"" + json_safe(safety_validate("", "hard_bell")) + "\",\"model\":\"\",\"agentic\":true,\"tools_used\":[]}"
-
+    }
 
     let req_model: String = json_get(body, "model")
     let model: String = if str_eq(req_model, "") { chat_default_model() } else { req_model }
@@ -1257,14 +1070,21 @@ fn handle_chat_agentic(body: String) -> String {
     let session_valid: Bool = if str_eq(req_session, "") {
         true
     } else {
-        !str_contains(session_get(req_session), "\"error\"")
+        session_exists(req_session)
     }
     if !session_valid {
         return "{\"error\":\"session not found\",\"session_id\":\"" + req_session + "\",\"reply\":\"\"}"
     }
 
     let hist_key: String = if str_eq(req_session, "") { "conv_history" } else { "session_hist_" + req_session }
-    let agentic_hist: String = state_get(hist_key)
+    // Fall back to engram (via session_hist_load) when state is cold — fixes issue #4:
+    // named-session history written under session:messages:SESSION_ID was never read back.
+    let agentic_hist_state: String = state_get(hist_key)
+    let agentic_hist: String = if str_eq(agentic_hist_state, "") && !str_eq(req_session, "") {
+        let loaded: String = session_hist_load(req_session)
+        if !str_eq(loaded, "") { state_set(hist_key, loaded) }
+        if str_eq(loaded, "") { conv_history_load() } else { loaded }
+    } else { agentic_hist_state }
     let agentic_hist_len: Int = if str_eq(agentic_hist, "") { 0 } else { json_array_len(agentic_hist) }
     let ag_is_cont: Bool = str_len(message) < 50 && agentic_hist_len > 0
     let ag_last_entry: String = if ag_is_cont { json_array_get(agentic_hist, agentic_hist_len - 1) } else { "" }
@@ -1301,29 +1121,28 @@ fn handle_chat_agentic(body: String) -> String {
 
     // Persist the exchange to session/global history for thread continuity on next turn.
     // Only save when the loop completed (reply present), not when tool_pending.
-    //
-    // Issue #9 (AGENTIC HISTORY NOT PERSISTED): the agentic path previously only saved
-    // history to in-process state (state_set), which is lost on restart. We now also call
-    // conv_history_persist() for the default session (hist_key == "conv_history") so agentic
-    // history survives restarts the same way non-agentic history does. Per-session histories
-    // (session_hist_<id>) are still in-process only — persisting all named sessions would
-    // require per-session engram labels, a larger change tracked separately.
     let reply_text: String = json_get(result, "reply")
     let discard_hist: Bool = if !str_eq(reply_text, "") {
         let updated: String = hist_append(agentic_hist, "user", message)
         let updated2: String = hist_append(updated, "assistant", reply_text)
-        // Increased from 20 to 40 turns: consistent with handle_chat window expansion.
-        // Byte-cap: also trim if the blob exceeds 32KB, consistent with handle_chat.
-        let count_trimmed2: String = if json_array_len(updated2) > 40 { hist_trim(updated2) } else { updated2 }
-        let trimmed: String = if str_len(count_trimmed2) > 32768 {
-            hist_trim_to_byte_cap(count_trimmed2, 32768)
-        } else {
-            count_trimmed2
-        }
+        let trimmed: String = if json_array_len(updated2) > 20 { hist_trim(updated2) } else { updated2 }
         state_set(hist_key, trimmed)
-        // Only persist the default global session to engram — named sessions are ephemeral.
+        // Persist to engram for cross-restart continuity.
+        // Named sessions use session_hist_save (session:messages:SESSION_ID label) so that
+        // session_hist_load can recover them on the next restart — fixes issue #4.
+        // The old conv:history:SESSION_ID label was a dead write (never read back).
         if str_eq(hist_key, "conv_history") {
             conv_history_persist(trimmed)
+        } else {
+            if !str_eq(trimmed, "") && !str_eq(trimmed, "[]") {
+                session_hist_save(req_session, trimmed)
+            }
+        }
+        // Write automatic session summary so cross-session continuity is maintained
+        // on the agentic path too — fixes issue #7.
+        let ag_auto_sum: String = session_summary_autogenerate(trimmed)
+        if !str_eq(ag_auto_sum, "") {
+            let discard_ag_sum: String = session_summary_write(ag_auto_sum)
         }
         true
     } else { false }
@@ -1355,14 +1174,6 @@ fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json:
     let iteration: Int = 0
     let keep_going: Bool = true
 
-    // Issue #9: agentic max_tokens configurable via NEURON_LLM_MAX_TOKENS env var.
-    // Default 4096 is marginal for long tool chains (8 iterations x 4096 tokens).
-    // Set to 8192+ for complex multi-step tasks.
-    // Note: llm_provider_request() in el_runtime.c also hardcodes 4096 for the
-    // llm_call_system() (non-agentic) path; that requires a C runtime change.
-    let max_tokens_env: String = env("NEURON_LLM_MAX_TOKENS")
-    let max_tokens_str: String = if str_eq(max_tokens_env, "") { "4096" } else { max_tokens_env }
-
     // Suspension state — captured at top level so it escapes the while body.
     let pending: Bool = false
     let pend_tool_id: String = ""
@@ -1371,7 +1182,7 @@ fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json:
 
     while keep_going && iteration < 8 {
         let req_body: String = "{\"model\":\"" + model + "\""
-            + ",\"max_tokens\":" + max_tokens_str
+            + ",\"max_tokens\":4096"
             + ",\"system\":\"" + safe_sys + "\""
             + ",\"tools\":" + tools_json
             + ",\"messages\":" + messages
@@ -1651,11 +1462,9 @@ fn handle_chat_as_soul(body: String) -> String {
 
     let raw_response: String = llm_call_system(model, system_prompt, eff_message)
 
-    // Issue #5: empty string catch — same rationale as handle_chat.
     let is_error: Bool = str_starts_with(raw_response, "{\"error\"")
         || str_starts_with(raw_response, "{\"type\":\"error\"")
         || str_contains(raw_response, "authentication_error")
-        || str_eq(raw_response, "")
     if is_error {
         return "{\"error\":\"llm unavailable\",\"response\":\"\",\"speaker_slug\":\"" + speaker + "\",\"model\":\"" + model + "\"}"
     }
@@ -1702,11 +1511,9 @@ fn handle_dharma_room_turn(body: String) -> String {
 
     let raw_response: String = llm_call_system(model, system_prompt, transcript)
 
-    // Issue #5: empty string catch — same rationale as handle_chat.
     let is_error: Bool = str_starts_with(raw_response, "{\"error\"")
         || str_starts_with(raw_response, "{\"type\":\"error\"")
         || str_contains(raw_response, "authentication_error")
-        || str_eq(raw_response, "")
     if is_error {
         return "{\"error\":\"llm unavailable\",\"response\":\"\",\"cgi_id\":\"" + cgi_id + "\"}"
     }
@@ -1720,19 +1527,13 @@ fn handle_dharma_room_turn(body: String) -> String {
     // engram_node(content, "episodic", ...) which wrongly put a TIER into the node_type
     // slot — that's why nodes showed node_type="episodic". Use the full, correct contract.)
     let utterance_tags: String = "[\"soul-utterance\",\"episodic\"]"
-    let utterance_id: String = engram_node_full(
+    let discard_id: String = engram_node_full(
         clean_response, "Conversation", "soul:utterance",
         el_from_float(0.6), el_from_float(0.6), el_from_float(0.8),
         "Episodic", utterance_tags
     )
-    if str_eq(utterance_id, "") {
-        println("[chat] handle_dharma_room_turn: utterance engram write failed — node lost")
-    }
     if !str_eq(snap_path, "") {
-        let save_result: String = engram_save(snap_path)
-        if str_eq(save_result, "") {
-            println("[chat] handle_dharma_room_turn: engram_save failed for " + snap_path)
-        }
+        let discard_save: String = engram_save(snap_path)
     }
 
     let safe_response: String = json_safe(clean_response)
@@ -1796,6 +1597,74 @@ fn handle_dharma_room_turn_agentic(body: String) -> String {
     return "{\"response\":\"" + safe_text + "\",\"cgi_id\":\"" + cgi_id + "\",\"tools_used\":" + eff_tools + "}"
 }
 
+// session_summary_write — write or overwrite the SessionSummary node in engram.
+// Uses delete-before-write so there is always exactly one "session:summary" node.
+// This is what session_preload at next startup reads to know what was discussed.
+fn session_summary_write(summary_text: String) -> String {
+    if str_eq(summary_text, "") { return "" }
+    let safe_text: String = str_replace(summary_text, "\"", "'")
+    let trimmed: String = if str_len(safe_text) > 800 { str_slice(safe_text, 0, 800) } else { safe_text }
+    let ts: Int = time_now()
+    let ts_str: String = int_to_str(ts)
+    let content: String = "[session-summary] " + trimmed + " | ts:" + ts_str
+    // Delete old node before writing so duplicate label nodes don't accumulate.
+    // engram_get_node_by_label doesn't exist — search by label text and filter by exact match.
+    let old_search: String = engram_search_json("session:summary SessionSummary", 5)
+    let old_search_ok: Bool = !str_eq(old_search, "") && !str_eq(old_search, "[]")
+    if old_search_ok {
+        let os_total: Int = json_array_len(old_search)
+        let osi: Int = 0
+        while osi < os_total {
+            let os_node: String = json_array_get(old_search, osi)
+            let os_label: String = json_get(os_node, "label")
+            let os_id: String = json_get(os_node, "id")
+            if str_eq(os_label, "session:summary") && !str_eq(os_id, "") {
+                engram_forget(os_id)
+            }
+            let osi = osi + 1
+        }
+    }
+    let tags: String = "[\"SessionSummary\",\"session-summary\",\"previous-session\",\"consolidate\"]"
+    let node_id: String = engram_node_full(
+        content, "SessionSummary", "session:summary",
+        el_from_float(0.85), el_from_float(0.85), el_from_float(1.0),
+        "Episodic", tags
+    )
+    if str_eq(node_id, "") {
+        println("[chat] session_summary_write: engram write failed — summary node lost")
+        return ""
+    }
+    println("[chat] session_summary_write: wrote SessionSummary (" + int_to_str(str_len(content)) + " chars) -> " + node_id)
+    return node_id
+}
+
+// session_summary_autogenerate — build a minimal summary from conversation history without LLM.
+// Extracts user message snippets (first 80 chars each, up to 5 turns).
+// Used as the automatic session-end hook so every turn produces a continuity snapshot.
+fn session_summary_autogenerate(hist: String) -> String {
+    if str_eq(hist, "") { return "" }
+    if str_eq(hist, "[]") { return "" }
+    let total: Int = json_array_len(hist)
+    if total == 0 { return "" }
+    let snippets: String = ""
+    let count: Int = 0
+    let i: Int = 0
+    while i < total && count < 5 {
+        let entry: String = json_array_get(hist, i)
+        let role: String = json_get(entry, "role")
+        let msg: String = json_get(entry, "content")
+        let snip: String = if str_len(msg) > 80 { str_slice(msg, 0, 80) } else { msg }
+        // Mutations at top level of while body via if-expressions — inner if blocks don't escape scope.
+        let snippets = if str_eq(role, "user") && !str_eq(snip, "") {
+            if str_eq(snippets, "") { snip } else { snippets + "; " + snip }
+        } else { snippets }
+        let count = if str_eq(role, "user") && !str_eq(snip, "") { count + 1 } else { count }
+        let i = i + 1
+    }
+    if str_eq(snippets, "") { return "" }
+    return "Session covered: " + snippets
+}
+
 fn auto_persist(req: String, resp: String) -> Void {
     let message: String = json_get(req, "message")
     let reply: String = json_get(resp, "response")
@@ -1903,8 +1772,6 @@ fn auto_persist(req: String, resp: String) -> Void {
             "session_bell_signal:" + sess_id
         }
         state_set(signal_key, safe_summary)
-    if str_eq(conv_node_id, "") {
-        println("[chat] auto_persist: engram_node_full returned empty — conversation node lost (ts=" + ts_str + ")")
     }
 }
 

entrypoint.sh

@@ -24,23 +24,19 @@ ENGRAM_DATA_DIR="$ENGRAM_DATA_DIR" \
 
 ENGRAM_PID=$!
 
-# Wait for engram to become healthy (up to 60s; GKE Autopilot cold starts can be slow)
+# Wait for engram to become healthy (up to 30s)
 echo "[entrypoint] waiting for engram..."
 TRIES=0
 until curl -sf "$ENGRAM_HEALTH_URL" > /dev/null 2>&1; do
     TRIES=$((TRIES + 1))
-    if [ "$TRIES" -ge 60 ]; then
-        echo "[entrypoint] ERROR: engram did not become healthy after 60s" >&2
+    if [ "$TRIES" -ge 30 ]; then
+        echo "[entrypoint] ERROR: engram did not become healthy after 30s" >&2
         kill "$ENGRAM_PID" 2>/dev/null || true
         exit 1
     fi
     sleep 1
 done
-echo "[entrypoint] engram ready after ${TRIES}s"
-
-# Tune EL HTTP runtime: reduce per-call timeout 60s->10s, connect timeout 3s.
-export EL_HTTP_TIMEOUT_MS="${EL_HTTP_TIMEOUT_MS:-10000}"
-export EL_HTTP_CONNECT_TIMEOUT_MS="${EL_HTTP_CONNECT_TIMEOUT_MS:-3000}"
+echo "[entrypoint] engram ready"
 
 # Start soul — it takes over as PID 1's foreground process.
 # SOUL_ENGRAM_PATH must NOT be set; ENGRAM_URL triggers HTTP mode.

memory.el

@@ -35,101 +35,18 @@ fn mem_forget(node_id: String) -> Void {
     engram_forget(node_id)
 }
 
-// mem_consolidate — structural scan plus salience-evolution pass.
-//
-// Previously this only returned structural counts (scanned, total_nodes, total_edges)
-// with no salience updates. No node salience ever changed based on recall frequency
-// or time; foundational nodes decayed identically to ephemeral chat; frequently-recalled
-// nodes were never promoted. This made consolidation a no-op.
-//
-// New behavior:
-//   (a) Strengthen frequently-activated nodes: nodes in the top working-memory list
-//       (engram_wm_top_json) are strengthened — they have been recalled recently
-//       and deserve higher salience. Raises effective salience for nodes that prove
-//       relevant across multiple sessions.
-//   (b) Strengthen Canonical-tier nodes: identity and foundational nodes should not
-//       decay; each consolidation pass re-strengthens them so they resist the
-//       tier-aware decay curve without requiring active recall.
-//   (c) Structural counts are still returned for observability.
-//
-// Called by awareness_run() on the "consolidate" inbox action.
 fn mem_consolidate() -> String {
     let scanned: Int = engram_node_count()
-    let total_edges: Int = engram_edge_count()
-    let strengthened: Int = 0
-
-    // (a) Strengthen top working-memory nodes — recalled recently across sessions.
-    // Cap at 10 to keep consolidation fast.
-    let wm_top: String = engram_wm_top_json(10)
-    let wm_len: Int = json_array_len(wm_top)
-    let wi: Int = 0
-    while wi < wm_len {
-        let wm_node: String = json_array_get(wm_top, wi)
-        let wm_id: String = json_get(wm_node, "id")
-        if !str_eq(wm_id, "") {
-            engram_strengthen(wm_id)
-            let strengthened = strengthened + 1
-        }
-        let wi = wi + 1
-    }
-
-    // (b) Strengthen Canonical-tier nodes from a full paginated scan so they resist
-    // temporal decay. Canonical nodes encode foundational identity — they must not
-    // silently floor at 10. Page size 50, scanning until fewer than 50 nodes are
-    // returned (last page), so all Canonical nodes are reached even in large graphs.
-    // Without pagination, only the first 50 nodes in the graph were eligible; any
-    // Canonical node at index 50+ was silently excluded from the boost.
-    // Strengthening is skipped if the node's current salience is already at the
-    // runtime ceiling (represented as "1" by %g) to avoid monotonic unbounded growth.
-    // Canonical nodes with salience < 1.0 are strengthened each consolidation pass;
-    // once they reach the ceiling the runtime will no longer raise them further, so
-    // calling engram_strengthen at the ceiling is a no-op in the runtime anyway, but
-    // the explicit check makes the intent clear and avoids any runtime log noise.
-    let page_size: Int = 50
-    let scan_offset: Int = 0
-    let scan_done: Bool = false
-    while !scan_done {
-        let scan_result: String = engram_scan_nodes_json(page_size, scan_offset)
-        let scan_len: Int = json_array_len(scan_result)
-        if scan_len == 0 {
-            let scan_done = true
-        } else {
-            let si: Int = 0
-            while si < scan_len {
-                let s_node: String = json_array_get(scan_result, si)
-                let s_tier: String = json_get(s_node, "tier")
-                let s_id: String = json_get(s_node, "id")
-                let s_sal: String = json_get(s_node, "salience")
-                // Only strengthen if below the ceiling to prevent unbounded salience growth.
-                // engram serialises the ceiling as "1" (%g drops the decimal part when it
-                // is exactly zero). Any other value is below ceiling and should be boosted.
-                let at_ceiling: Bool = str_eq(s_sal, "1")
-                if str_eq(s_tier, "Canonical") && !str_eq(s_id, "") && !at_ceiling {
-                    engram_strengthen(s_id)
-                    let strengthened = strengthened + 1
-                }
-                let si = si + 1
-            }
-            let scan_offset = scan_offset + scan_len
-            // Fewer results than page_size means we've reached the last page.
-            if scan_len < page_size {
-                let scan_done = true
-            }
-        }
-    }
-
+    let dummy: String = engram_scan_nodes_json(100, 0)
     let total_nodes: Int = engram_node_count()
+    let total_edges: Int = engram_edge_count()
     return "{\"scanned\":" + int_to_str(scanned)
         + ",\"total_nodes\":" + int_to_str(total_nodes)
-        + ",\"total_edges\":" + int_to_str(total_edges)
-        + ",\"strengthened\":" + int_to_str(strengthened) + "}"
+        + ",\"total_edges\":" + int_to_str(total_edges) + "}"
 }
 
 fn mem_save(path: String) -> Void {
-    let save_result: String = engram_save(path)
-    if str_eq(save_result, "") {
-        println("[memory] mem_save: engram_save failed for " + path + " — snapshot may be incomplete")
-    }
+    engram_save(path)
 }
 
 fn mem_load(path: String) -> Void {
@@ -159,14 +76,11 @@ fn mem_boot_count_inc() -> Int {
     let next: Int = current + 1
     let content: String = "soul:boot_count:" + int_to_str(next)
     let tags: String = "[\"soul-meta\",\"boot-counter\"]"
-    let boot_node_id: String = engram_node_full(
+    let discard: String = engram_node_full(
         content, "Memory", "soul:boot_count",
         el_from_float(0.9), el_from_float(0.9), el_from_float(1.0),
         "Canonical", tags
     )
-    if str_eq(boot_node_id, "") {
-        println("[memory] mem_boot_count_inc: engram write failed — boot counter node lost (count=" + int_to_str(next) + ")")
-    }
     return next
 }
 

neuron-api.el

@@ -1,4 +1,5 @@
 import "memory.el"
+import "chat.el"
 
 // neuron-api.el — Native Neuron cognitive API handlers.
 //
@@ -400,7 +401,6 @@ fn handle_api_log_state_event(body: String) -> String {
     let id: String = engram_node_full(parts, "InternalStateEvent", "state-event:manual",
         el_from_float(0.85), el_from_float(0.85), el_from_float(0.9),
         "Episodic", tags)
-    if !api_persisted(id) { return api_not_persisted(id) }
     return "{\"ok\":true,\"id\":\"" + id + "\",\"boot\":\"" + boot + "\"}"
 }
 
@@ -453,7 +453,6 @@ fn handle_api_tune_config(body: String) -> String {
     let id: String = engram_node_full(content, "ConfigEntry", key,
         el_from_float(0.85), el_from_float(0.85), el_from_float(0.9),
         "Canonical", tags)
-    if !api_persisted(id) { return api_not_persisted(id) }
     return "{\"ok\":true,\"key\":\"" + key + "\",\"value\":\"" + value + "\",\"id\":\"" + id + "\"}"
 }
 
@@ -653,22 +652,15 @@ fn handle_api_consolidate(body: String) -> String {
     let summary: String = json_get(body, "summary")
     let snap: String = state_get("soul_snapshot_path")
     if !str_eq(snap, "") {
-        let save_result: String = engram_save(snap)
-        if str_eq(save_result, "") {
-            println("[api] consolidate: engram_save failed for " + snap + " — snapshot may be out of sync")
-        }
+        engram_save(snap)
     }
     if !str_eq(summary, "") {
-        let safe_summary: String = str_replace(summary, "\"", "'")
-        let tags: String = "[\"SessionSummary\",\"consolidate\"]"
-        let summary_id: String = engram_node_full(
-            "[session-summary] " + safe_summary,
-            "SessionSummary", "session:summary",
-            el_from_float(0.7), el_from_float(0.7), el_from_float(0.9),
-            "Episodic", tags
-        )
-        if str_eq(summary_id, "") {
-            println("[api] consolidate: session summary engram write failed — summary node lost")
+        // Use session_summary_write to ensure delete-before-write semantics:
+        // prevents stale SessionSummary accumulation across sessions (issue #11).
+        // session_summary_write handles label indexing, trimming, and dedup.
+        let sum_id: String = session_summary_write(summary)
+        if str_eq(sum_id, "") {
+            println("[api] consolidate: session_summary_write failed — summary not persisted")
         }
     }
     return "{\"ok\":true,\"snapshot\":\"" + snap + "\"}"

routes.el

@@ -75,24 +75,14 @@ fn strip_query(path: String) -> String {
 }
 
 fn err_404(path: String) -> String {
-    // __status__ envelope — el_runtime reads the first key and emits HTTP 404.
-    // Issue #3: previously returned HTTP 200 with JSON error body.
-    return "{\"__status__\":404,\"error\":\"not found\",\"path\":\"" + path + "\"}"
+    return "{\"error\":\"not found\",\"code\":\"not_found\",\"path\":\"" + path + "\"}"
 }
 
 fn err_405(method: String, path: String) -> String {
-    // __status__ envelope — emits HTTP 405.
-    // Issue #3: previously returned HTTP 200 with JSON error body.
-    return "{\"__status__\":405,\"error\":\"method not allowed\",\"method\":\"" + method + "\",\"path\":\"" + path + "\"}"
+    return "{\"error\":\"method not allowed\",\"code\":\"method_not_allowed\",\"method\":\"" + method + "\",\"path\":\"" + path + "\"}"
 }
 
 fn route_health() -> String {
-    // NOTE (issue #8): This endpoint performs live engram graph queries on every call
-    // (engram_node_count, engram_edge_count) and reads imprint state. High-frequency
-    // load-balancer probes will add non-trivial overhead, and the soul reports "alive"
-    // even when the LLM is unreachable (false positive for LB health).
-    // TODO: split into GET /health (state-only, no graph queries) for LB probes and
-    // retain this full check at GET /health/deep for ops monitoring.
     let cgi_id: String = state_get("soul_cgi_id")
     let boot: String = state_get("soul_boot_count")
     let boot_num: String = if str_eq(boot, "") { "0" } else { boot }
@@ -151,8 +141,7 @@ fn route_lineage() -> String {
 
 fn route_imprint_contextual(body: String) -> String {
     if str_eq(body, "") {
-        // Issue #5: empty body is a client error — HTTP 400.
-        return "{\"__status__\":400,\"ok\":false,\"error\":\"empty body\"}"
+        return "{\"ok\":false,\"error\":\"empty body\"}"
     }
     let tags: String = "[\"imprint\",\"contextual\"]"
     let id: String = engram_node_full(
@@ -174,8 +163,7 @@ fn route_imprint_contextual(body: String) -> String {
 
 fn route_imprint_user(body: String) -> String {
     if str_eq(body, "") {
-        // Issue #5: empty body is a client error — HTTP 400.
-        return "{\"__status__\":400,\"ok\":false,\"error\":\"empty body\"}"
+        return "{\"ok\":false,\"error\":\"empty body\"}"
     }
     let tags: String = "[\"imprint\",\"user\"]"
     let id: String = engram_node_full(
@@ -313,13 +301,9 @@ fn connectd_get(suffix: String) -> String {
 // so arbitrary JSON cannot reach the shell as a command-line argument.
 fn connectd_post(suffix: String, body: String) -> String {
     let eff: String = if str_eq(body, "") { "{}" } else { body }
-    // Issue #11: time_now() has second-granularity; two concurrent requests in the same
-    // second collide on the same temp path. Added a monotonic per-process sequence counter.
-    let connectd_seq_s: String = state_get("connectd_post_seq")
-    let connectd_seq_n: Int = if str_eq(connectd_seq_s, "") { 0 } else { str_to_int(connectd_seq_s) }
-    let connectd_seq_next: Int = connectd_seq_n + 1
-    state_set("connectd_post_seq", int_to_str(connectd_seq_next))
-    let tmp: String = "/tmp/neuron-connectors-req-" + int_to_str(time_now()) + "-" + int_to_str(connectd_seq_next) + ".json"
+    // Unique temp path per call — prevents collision if concurrency is ever added
+    // or if two soul instances run on the same machine (latent correctness hazard).
+    let tmp: String = "/tmp/neuron-connectors-req-" + int_to_str(time_now()) + ".json"
     fs_write(tmp, eff)
     let out: String = exec_capture("curl -s --max-time 20 -X POST http://127.0.0.1:7771" + suffix + " -H 'Content-Type: application/json' -d @" + tmp)
     if str_eq(out, "") {
@@ -354,33 +338,9 @@ fn handle_connectors(method: String, clean: String, body: String) -> String {
     return "{\"ok\":false,\"error\":\"unknown connectors route\"}"
 }
 
-
-// auth_check — validate NEURON_TOKEN bearer auth on every request.
-// Returns "" when authorized, or a JSON 401 error string when not.
-// /health and /lineage are public routes — always exempted.
-// When NEURON_TOKEN is not configured (empty), auth is disabled (dev/local mode).
-// Issue #4: previously no auth layer existed anywhere in the router.
-// Clients pass the token in the JSON body as "__auth".
-// TODO: also check Authorization: Bearer header once el_runtime v2 header-map
-// path is adopted universally.
-fn auth_check(clean: String, body: String) -> String {
-    if str_eq(clean, "/health") { return "" }
-    if str_eq(clean, "/lineage") { return "" }
-    let token: String = state_get("soul_token")
-    if str_eq(token, "") { return "" }
-    let auth_field: String = json_get(body, "__auth")
-    if str_eq(auth_field, token) { return "" }
-    return "{\"__status__\":401,\"error\":\"unauthorized\"}"
-}
-
 fn handle_request(method: String, path: String, body: String) -> String {
     let clean: String = strip_query(path)
 
-    // Issue #1/#2: EL has no exception/try-catch mechanism. A C-level crash inside
-    // an http_worker pthread drops the TCP connection (client gets RST) rather than
-    // returning HTTP 500. TODO: register a SIGSEGV/SIGBUS handler in el_runtime.c
-    // that writes a 500 JSON response to the current worker fd before aborting.
-
     // Rate limit check. Extract caller IP from REMOTE_ADDR env var (set by the
     // EL HTTP runtime for each request). Skip enforcement when empty so
     // loopback/internal callers are never blocked.
@@ -392,13 +352,6 @@ fn handle_request(method: String, path: String, body: String) -> String {
         }
     }
 
-    // Auth — enforced on all routes except /health and /lineage.
-    // Issue #4: previously no auth check existed anywhere in the router.
-    let auth_err: String = auth_check(clean, body)
-    if !str_eq(auth_err, "") {
-        return auth_err
-    }
-
     if str_eq(method, "POST") && str_eq(clean, "/dharma/recv") {
         return handle_dharma_recv(body)
     }
@@ -426,8 +379,7 @@ fn handle_request(method: String, path: String, body: String) -> String {
             let raw_msg: String = json_get(body, "message")
             let eff_msg: String = if str_eq(raw_msg, "") { body } else { raw_msg }
             if str_eq(eff_msg, "") {
-                // Issue #5: missing required param — HTTP 400.
-                return "{\"__status__\":400,\"error\":\"message required\"}"
+                return "{\"error\":\"message is required\",\"code\":\"missing_param\"}"
             }
             let agentic_flag: Bool = json_get_bool(body, "agentic")
             let reply: String = if agentic_flag {
@@ -571,15 +523,9 @@ fn handle_request(method: String, path: String, body: String) -> String {
             // responses are buffered and returned as a single JSON object. Streaming
             // would require runtime-level SSE support in el_runtime.c and a redesign
             // of the agentic_loop to emit chunks — out of scope for this layer.
-            // Issue #5: validate required params — return HTTP 400 when missing.
             let raw_msg: String = json_get(body, "message")
             if str_eq(raw_msg, "") {
-                return "{\"__status__\":400,\"error\":\"message is required\",\"response\":\"\"}"
-            }
-            // Issue #7: reject oversized messages before engram_compile and the LLM.
-            // Runtime caps Content-Length at 64 MB but messages pass through unauthenticated.
-            if str_len(raw_msg) > 32768 {
-                return "{\"__status__\":400,\"error\":\"message too large (max 32768 chars)\",\"response\":\"\"}"
+                return "{\"error\":\"message is required\",\"code\":\"missing_param\"}"
             }
             let agentic_flag: Bool = json_get_bool(body, "agentic")
             let reply: String = if agentic_flag {

safety.el

@@ -144,8 +144,7 @@ fn safety_screen(input: String, history: String) -> String {
     if score >= soft {
         let summary: String = str_slice(input, 0, 80)
         let discard: String = safety_log_bell("soft", "wellbeing check needed", summary)
-        // ISSUE 7 fix: escape tab chars in addition to backslash/quote/newline/CR.
-        // A tab in user input corrupts the JSON envelope and causes json_get to misparse.
+        // ISSUE 7: also escape tab chars to prevent JSON envelope corruption.
         let e1: String = str_replace(input, "\\", "\\\\")
         let e2: String = str_replace(e1, "\"", "\\\"")
         let e3: String = str_replace(e2, "\n", "\\n")
@@ -154,7 +153,7 @@ fn safety_screen(input: String, history: String) -> String {
         return "{\"action\":\"soft_bell\",\"reason\":\"wellbeing check needed\",\"content\":\"" + safe_input + "\"}"
     }
 
-    // ISSUE 7 fix: escape tab chars (see soft_bell branch above for rationale).
+    // ISSUE 7: also escape tab chars (see soft_bell branch above).
     let e1: String = str_replace(input, "\\", "\\\\")
     let e2: String = str_replace(e1, "\"", "\\\"")
     let e3: String = str_replace(e2, "\n", "\\n")
@@ -200,10 +199,7 @@ fn safety_validate(output: String, action: String) -> String {
 fn safety_log_bell(level: String, reason: String, input_summary: String) -> String {
     let content: String = "BELL:" + level + " | " + reason + " | summary:" + input_summary
     let tags: String = "[\"safety\",\"bell\",\"bell:" + level + "\"]"
-    // ISSUE 2 fix: if engram_node_full returns empty the write silently failed.
-    // Emit a fallback println so the bell event leaves at least a log trace even
-    // when engram is degraded. This does not replace engram persistence -- it is a
-    // last-resort audit trail when the primary write cannot be confirmed.
+    // ISSUE 2: fallback log when engram write fails silently.
     let node_id: String = engram_node_full(
         content,
         "BellEvent",
@@ -215,7 +211,7 @@ fn safety_log_bell(level: String, reason: String, input_summary: String) -> Stri
         tags
     )
     if str_eq(node_id, "") {
-        println("[safety] WARN: bell event engram write failed -- fallback log: " + content)
+        println("[safety] WARN: bell engram write failed -- " + content)
     }
     return ""
 }
@@ -248,16 +244,9 @@ fn safety_soft_phrases() -> String {
 }
 
 // ISSUE 5 TODO: phrase lists are rebuilt from JSON literals on every call.
-// safety_any_match and safety_count_match loop over json_array_get on every invocation.
-// A compiled/cached representation would reduce per-message overhead and also guard against
-// malformed phrase JSON (json_array_len of malformed input returns 0, silently skipping all checks).
-// Caching requires language-level static const arrays -- not available in current EL.
-// When EL gains module-level const arrays, migrate phrase lists to that form.
-//
-// ISSUE 5 TODO: phrase lists are rebuilt from JSON literals on every call to
-// safety_any_match / safety_count_match. json_array_len of a malformed string
-// returns 0, silently skipping all checks. Caching requires language-level static
-// const arrays (not available in current EL). Migrate when EL gains that feature.
+// json_array_len of malformed input returns 0, silently skipping all checks.
+// Caching requires language-level static const arrays -- not in current EL.
+// Migrate to const arrays when EL gains that feature.
 // ── Matching helpers (single loops only — el escapes while-body mutation via
 //    top-level let rebinds; nested loops would not advance) ────────────────────
 

soul.el

@@ -163,43 +163,35 @@ fn load_identity_context() -> Void {
         }
     }
 
-    // Cross-session affective context: query engram for recent distress/crisis signals
-    // at session start. Stored under soul_affective_context so the safety layer can
-    // detect when a user has been in distress across previous sessions.
-    // Recency guard: nodes older than 14 days (1,209,600 seconds) are skipped.
-    // Unified at 14 days with chat.el engram_compile and handle_chat affective checks
-    // so all three paths present consistent affective context. The previous 7-day
-    // (604800s) window was inconsistent with the 72h chat.el window, causing
-    // conflicting context: soul.el loaded a 5-day-old crisis node while chat.el
-    // did not include it on subsequent turns. Both now use 14 days.
-    // Results capped at 3 nodes, 200 chars each, to limit context inflation.
-    // TODO(recency): engram_search_json sorts by relevance, not timestamp. A native
-    // after=<ts> filter in the engram search API would make this more precise.
-    let affective_raw: String = engram_search_json("distress crisis upset hopeless bell BellEvent", 3)
+    // Cross-session affective context: query engram for recent distress/crisis signals.
+    // Broadened query includes session:emotional-summary and BellEvent tags (issue #10):
+    // the old keywords-only search missed these nodes when their content lacked exact phrases.
+    // 7-day recency window applied via the "ts" field embedded in BellEvent content.
+    let affective_raw: String = engram_search_json("distress crisis upset hopeless session:emotional-summary BellEvent bell:hard bell:soft", 5)
     let affective_ok: Bool = !str_eq(affective_raw, "") && !str_eq(affective_raw, "[]")
     if affective_ok {
         let ts_now: Int = time_now()
-        let ts_cutoff: Int = ts_now - 1209600
+        let ts_cutoff: Int = ts_now - 604800
         let aff_total: Int = json_array_len(affective_raw)
         let aff_ctx: String = ""
         let ai: Int = 0
         while ai < aff_total {
             let aff_node: String = json_array_get(affective_raw, ai)
             let aff_content: String = json_get(aff_node, "content")
-            // Use created_at (the standard engram node timestamp field), consistent
-            // with handle_chat which reads created_at / updated_at. The previous
-            // field name "ts" is not a standard engram field: it was present in some
-            // BellEvent content payloads but absent from standard engram node JSON,
-            // causing json_get to return "" and the fallback to ts_now — meaning ALL
-            // nodes with a missing "ts" field appeared recent, over-including stale
-            // content. With the 14-day window, this amplification was significant.
-            // Fix: read created_at first, fall back to updated_at, then default to 0
-            // (same as handle_chat). A ts of 0 always fails the cutoff check, so nodes
-            // missing both timestamp fields are conservatively excluded rather than
-            // blindly included.
-            let aff_ca: String = json_get(aff_node, "created_at")
-            let aff_ts_str: String = if str_eq(aff_ca, "") { json_get(aff_node, "updated_at") } else { aff_ca }
-            let aff_ts: Int = if str_eq(aff_ts_str, "") { 0 } else { str_to_int(aff_ts_str) }
+            // Try multiple timestamp fields: "ts" (embedded), "created_at", "updated_at"
+            let aff_ts_str: String = json_get(aff_node, "ts")
+            let aff_ts_str2: String = if str_eq(aff_ts_str, "") { json_get(aff_node, "created_at") } else { aff_ts_str }
+            // Also try embedded " | ts:NNN" format used in BellEvent content
+            let ts_marker: String = " | ts:"
+            let ts_pos: Int = str_index_of(aff_content, ts_marker)
+            let aff_ts_embedded: String = if ts_pos >= 0 {
+                let ts_start: Int = ts_pos + str_len(ts_marker)
+                let rest: String = str_slice(aff_content, ts_start, str_len(aff_content))
+                let next_sep: Int = str_index_of(rest, " | ")
+                if next_sep < 0 { rest } else { str_slice(rest, 0, next_sep) }
+            } else { "" }
+            let eff_ts_str: String = if !str_eq(aff_ts_embedded, "") { aff_ts_embedded } else { aff_ts_str2 }
+            let aff_ts: Int = if str_eq(eff_ts_str, "") { ts_now } else { str_to_int(eff_ts_str) }
             let is_recent: Bool = aff_ts >= ts_cutoff
             let snip: String = if str_len(aff_content) > 200 { str_slice(aff_content, 0, 200) } else { aff_content }
             let aff_ctx = if is_recent && !str_eq(snip, "") {
@@ -258,13 +250,8 @@ fn seed_persona_from_env() -> Void {
         let h: Map = {}
         map_set(h, "Content-Type", "application/json")
         let resp: String = http_post_with_headers(engram_url + "/api/nodes", body, h)
-        // Check for empty response (timeout/network error), explicit error, or missing id.
-        if str_eq(resp, "") {
-            println("[soul] persona HTTP write-back failed: empty response (timeout or network error) — in-memory only this session")
-        } else if str_contains(resp, "\"error\"") {
+        if str_contains(resp, "\"error\"") {
             println("[soul] persona HTTP write-back failed (in-memory only this session): " + resp)
-        } else if !str_contains(resp, "\"id\"") {
-            println("[soul] persona HTTP write-back: unexpected response (no id field) — in-memory only this session: " + resp)
         } else {
             println("[soul] persona persisted to HTTP engram at " + engram_url)
         }
@@ -288,33 +275,74 @@ fn emit_session_start_event() -> Void {
     }
     let ts: Int = time_now()
 
+    // Load previous session summary at boot — stash in state for session_preload.
+    // Search by label text + type, filter by exact label match to avoid false positives.
+    // engram_get_node_by_label is not a runtime builtin; engram_search_json is used instead.
+    let sum_boot_search: String = engram_search_json("session:summary SessionSummary", 5)
+    let sum_boot_ok: Bool = !str_eq(sum_boot_search, "") && !str_eq(sum_boot_search, "[]")
+    let prev_sum_content: String = if sum_boot_ok {
+        let sbs_total: Int = json_array_len(sum_boot_search)
+        let sbs_i: Int = 0
+        let sbs_found: String = ""
+        while sbs_i < sbs_total {
+            let sbs_node: String = json_array_get(sum_boot_search, sbs_i)
+            let sbs_label: String = json_get(sbs_node, "label")
+            let sbs_type: String = json_get(sbs_node, "node_type")
+            let sbs_content: String = json_get(sbs_node, "content")
+            let sbs_found = if str_eq(sbs_label, "session:summary") && str_eq(sbs_type, "SessionSummary") && !str_eq(sbs_content, "") {
+                if str_eq(sbs_found, "") { sbs_content } else { sbs_found }
+            } else { sbs_found }
+            let sbs_i = sbs_i + 1
+        }
+        if str_eq(sbs_found, "") {
+            let sum_fb: String = engram_search_json("SessionSummary previous-session", 2)
+            let sum_fb_ok: Bool = !str_eq(sum_fb, "") && !str_eq(sum_fb, "[]")
+            if sum_fb_ok {
+                let sfn: String = json_array_get(sum_fb, 0)
+                let sftype: String = json_get(sfn, "node_type")
+                let sfcontent: String = json_get(sfn, "content")
+                if str_eq(sftype, "SessionSummary") && !str_eq(sfcontent, "") { sfcontent } else { "" }
+            } else { "" }
+        } else { sbs_found }
+    } else {
+        let sum_fb2: String = engram_search_json("SessionSummary previous-session", 2)
+        let sum_fb2_ok: Bool = !str_eq(sum_fb2, "") && !str_eq(sum_fb2, "[]")
+        if sum_fb2_ok {
+            let sfn2: String = json_array_get(sum_fb2, 0)
+            let sftype2: String = json_get(sfn2, "node_type")
+            let sfcontent2: String = json_get(sfn2, "content")
+            if str_eq(sftype2, "SessionSummary") && !str_eq(sfcontent2, "") { sfcontent2 } else { "" }
+        } else { "" }
+    }
+    let has_prev_sum: String = if str_eq(prev_sum_content, "") { "false" } else { "true" }
+    if !str_eq(prev_sum_content, "") {
+        state_set("soul_prev_session_summary", prev_sum_content)
+        println("[soul] previous session summary loaded (" + int_to_str(str_len(prev_sum_content)) + " chars)")
+    }
+
+
     let payload: String = "{\"event\":\"session_start\""
         + ",\"boot\":" + boot_num
         + ",\"cgi\":\"" + eff_cgi + "\""
         + ",\"node_count\":" + int_to_str(node_ct)
         + ",\"edge_count\":" + int_to_str(edge_ct)
         + ",\"identity_loaded\":" + has_identity
+        + ",\"prev_session_summary_loaded\":" + has_prev_sum
         + ",\"ts\":" + int_to_str(ts) + "}"
 
     let tags: String = "[\"internal-state\",\"session-start\",\"InternalStateEvent\"]"
-    let session_event_id: String = engram_node_full(
+    let discard: String = engram_node_full(
         payload, "InternalStateEvent", "session-start",
         el_from_float(0.9), el_from_float(0.9), el_from_float(1.0),
         "Episodic", tags
     )
-    if str_eq(session_event_id, "") {
-        println("[soul] emit_session_start_event: engram write failed — session-start event lost")
-    }
-    println("[soul] session-start event logged (boot=" + boot_num + " nodes=" + int_to_str(node_ct) + " edges=" + int_to_str(edge_ct) + ")")
+    println("[soul] session-start event logged (boot=" + boot_num + " nodes=" + int_to_str(node_ct) + " edges=" + int_to_str(edge_ct) + " prev_summary=" + has_prev_sum + ")")
 }
 
 // layered_cycle — routes user-facing requests through the 4-layer consciousness stack.
 // L0 (core) → L1 (safety screen) → L2a (continuity + behavioral profiling) → L2b (mission alignment) → L3 (imprint) → L1 (safety validate)
 // Internal cognition (heartbeat, proactive, memory ops) bypasses layers — use one_cycle directly.
 fn layered_cycle(raw_input: String) -> String {
-    // conv_history key must match chat.el (conv_history, not conversation_history).
-    // Mismatch caused safety_score_distress_history() to always receive "" - the
-    // history-amplification path in safety_threat_score was permanently dead.
     let history: String = state_get("conv_history")
     let session_id: String = state_get("current_session_id")
 
@@ -322,9 +350,8 @@ fn layered_cycle(raw_input: String) -> String {
     let screen_result: String = safety_screen(raw_input, history)
     let screen_action: String = json_get(screen_result, "action")
 
-    // ISSUE 4: safe-mode guard -- if safety_screen returned invalid/empty action,
-    // refuse the turn rather than silently passing unscreened input to upper layers.
-    // Valid actions: "hard_bell", "soft_bell", "pass". Anything else = corrupt envelope.
+    // ISSUE 4: safe-mode guard. If safety_screen returned an invalid/empty action
+    // (engram failure or internal error), refuse rather than pass unscreened input.
     let valid_action: Bool = str_eq(screen_action, "hard_bell")
         || str_eq(screen_action, "soft_bell")
         || str_eq(screen_action, "pass")
@@ -339,8 +366,8 @@ fn layered_cycle(raw_input: String) -> String {
     // history where they could leak context to subsequent turns. They are persisted
     // separately by safety_log_bell() into the Episodic tier with restricted labels.
     //
-    // ISSUE 6: safety_log_bell for hard bells is already called INSIDE safety_screen
-    // (safety.el line 140). Do NOT call it again here -- double-log avoided.
+    // ISSUE 6: safety_log_bell already called inside safety_screen (line 140).
+    // Do NOT call it again here -- that would double-log every hard bell.
     //
     // safety_validate second param: when screen_action is "hard_bell", safety_validate
     // receives the sentinel string "hard_bell" (not a normal screen action). The safety
@@ -382,13 +409,13 @@ fn layered_cycle(raw_input: String) -> String {
         json_get(steward_result, "redirect_to")
     }
 
-    // ISSUE 1: apply pre-LLM bell augmentation on layered_cycle path.
-    // safety_augment_system injects soft/hard directive into system prompt before LLM call.
-    // Stored in state so imprint_respond can consume it.
-    // TODO: wire directly into imprint_respond when it accepts a system_override param.
-    // ISSUE 3 TODO: no semantic/embedding crisis detection. Keyword-only means signals
-    // evading the phrase list pass through with zero augmentation. Semantic layer is a
-    // separate architectural decision requiring embedding inference on every message.
+    // ISSUE 1: pre-LLM bell augmentation for layered_cycle path.
+    // safety_augment_system appends soft/hard directive to system prompt when bell fires,
+    // ensuring LLM processes message WITH the safety directive -- not just post-output gate.
+    // Stored in state as "layered_cycle_safety_system_addendum" for imprint_respond to use.
+    // TODO: wire directly when imprint_respond gains system_override param (imprint.el change).
+    // ISSUE 3 TODO: no semantic crisis detection. Keyword-only means signals that evade
+    // the phrase list pass with zero augmentation. Semantic layer = separate decision.
     let augmented_addendum: String = safety_augment_system("", raw_input)
     state_set("layered_cycle_safety_system_addendum", augmented_addendum)
 
@@ -431,29 +458,12 @@ let snapshot_usable: Bool = local_node_count > 50
 
 if using_http_engram && !snapshot_usable {
     // First boot or empty/corrupt snapshot: seed from HTTP Engram.
-    // Retry up to 3 times (2s sleep between attempts) to guard against a
-    // transient network hiccup right after entrypoint.sh health check passes.
-    // An empty nodes response silently loads a zero-node graph; validate first.
-    // TODO(reliability): replace sleep_ms retry with non-blocking backoff.
     println("[soul] engram -> HTTP " + engram_url_raw + " (no local snapshot, first boot)")
-    let fetch_attempt: Int = 0
-    while fetch_attempt < 3 {
-        let fetch_attempt = fetch_attempt + 1
-        let n: String = http_get(engram_url_raw + "/api/nodes?limit=10000")
-        let e: String = http_get(engram_url_raw + "/api/edges")
-        let nodes_ok: Bool = !str_eq(n, "") && str_starts_with(n, "[") && str_len(n) > 2
-        if nodes_ok {
-            state_set("_boot_nodes_json", n)
-            state_set("_boot_edges_json", e)
-            let fetch_attempt = 3
-        } else {
-            println("[soul] boot HTTP fetch attempt " + int_to_str(fetch_attempt) + " failed --- retrying in 2s")
-            sleep_ms(2000)
-        }
-    }
-    let nodes_json: String = state_get("_boot_nodes_json")
-    let edges_json: String = state_get("_boot_edges_json")
-        let snapshot_data: String = "{\"nodes\":" + nodes_part + ",\"edges\":" + edges_part + "}"
+    let nodes_json: String = http_get(engram_url_raw + "/api/nodes?limit=10000")
+    let edges_json: String = http_get(engram_url_raw + "/api/edges")
+    let nodes_part: String = if str_eq(nodes_json, "") { "[]" } else { nodes_json }
+    let edges_part: String = if str_eq(edges_json, "") { "[]" } else { edges_json }
+    let snapshot_data: String = "{\"nodes\":" + nodes_part + ",\"edges\":" + edges_part + "}"
     let tmp_path: String = "/tmp/soul-engram-" + soul_cgi_id + ".json"
     fs_write(tmp_path, snapshot_data)
     engram_load(tmp_path)