fix(reliability): state-management — document and partially fix concurrent state races

Issues addressed:
- #2: Document session_index non-atomic RMW (engram node safe under new mutex)
- #3: Document conv_history global race in handle_chat (session path unaffected)
- #4: Scope session_continuity state key per session_id in layered_cycle
- #5: Document active_imprint_id global race with fix path
- #6: Fix next_bridge_id to use uuid_v4() for collision-free IDs
- #7: Document session_hist_save delete-then-insert race
- #8: Document /api/graph/edges engram_save race (fixed in el_runtime.c)
- #10: Document agentic_conv_history global race in awareness loop

Issues #1 (engram_global mutex) and #8 (atomic engram_save write-to-temp+rename)
are fully fixed in el_runtime.c (committed to foundation/el repo separately).
Issue #9 skipped — already fixed in PR #31.

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)
@@ -711,6 +678,8 @@ fn threat_trajectory_check(tool_name: String, tool_input: String) -> Int {
     return combined
 }
 
+// TODO(reliability #10): agentic_conv_history is process-global; awareness loop
+// and HTTP workers race on this key. Impact: noisy threat score only, not content.
 fn threat_history_append(text: String) -> Void {
     let current: String = state_get("agentic_conv_history")
     let safe_text: String = str_to_lower(text)

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
 }
 
@@ -218,44 +150,9 @@ 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.
-    // We search for BellEvent nodes specifically; these are written by auto_persist
-    // when safety_detect_bell_level fires.
-    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 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.
-        // Extract the timestamp embedded in the content string as " | ts:NNNNN".
-        // Fall back to created_at / updated_at JSON fields if the marker is absent.
-        let bn_content: String = json_get(bn0, "content")
-        let ts_marker: String = " | ts:"
-        let ts_pos: Int = str_index_of(bn_content, ts_marker)
-        let bn_ts_raw: String = if ts_pos >= 0 {
-            let ts_start: Int = ts_pos + str_len(ts_marker)
-            let rest: String = str_slice(bn_content, ts_start, str_len(bn_content))
-            let next_sep: Int = str_index_of(rest, " | ")
-            if next_sep < 0 { rest } else { str_slice(rest, 0, next_sep) }
-        } else {
-            let ca: String = json_get(bn0, "created_at")
-            if str_eq(ca, "") { json_get(bn0, "updated_at") } else { ca }
-        }
-        let bn_ts: Int = if str_eq(bn_ts_raw, "") { 0 } else { str_to_int(bn_ts_raw) }
-        if bn_ts > cutoff_ts { bn0 } else { "" }
-    } else { "" }
-    let affective_part: String = if !str_eq(recent_bell, "") { recent_bell } else { "" }
-
     let sep1: String = if !str_eq(act_part, "") && !str_eq(srch_part, "") { "\n" } else { "" }
     let sep2: String = if (!str_eq(act_part, "") || !str_eq(srch_part, "")) && !str_eq(scan_part, "") { "\n" } else { "" }
-    let sep3: String = if (!str_eq(act_part, "") || !str_eq(srch_part, "") || !str_eq(scan_part, "")) && !str_eq(affective_part, "") { "\n" } else { "" }
-    let ctx: String = act_part + sep1 + srch_part + sep2 + scan_part + sep3 + affective_part
+    let ctx: String = act_part + sep1 + srch_part + sep2 + scan_part
 
     if str_eq(ctx, "") { return "" }
 
@@ -302,15 +199,7 @@ fn build_system_prompt(ctx: String) -> String {
         "\n\n[ENGRAM CONTEXT — compiled from your graph]\n" + ctx
     }
 
-    let safety_addendum: String = state_get("layered_cycle_safety_system_addendum")
-    let safety_block: String = if str_eq(safety_addendum, "") {
-        ""
-    } else {
-        state_set("layered_cycle_safety_system_addendum", "")
-        safety_addendum
-    }
-
-    return identity + date_line + voice_rules + security_rules + capability_rules + identity_block + engram_block + safety_block
+    return identity + date_line + voice_rules + security_rules + capability_rules + identity_block + engram_block
 }
 
 fn hist_append(hist: String, role: String, content: String) -> String {
@@ -323,98 +212,12 @@ 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
-    }
-    // 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 + "]"
-}
-
-// hist_trim_with_bell_guard — trim the history window exactly as hist_trim does, but
-// before dropping the oldest user/assistant pair check whether the user turn triggered
-// a bell event. If it did, write a preservation node to engram so the distress exchange
-// survives the 20-turn window. The LLM window drops it; engram retains it permanently
-// and engram_compile will surface it again via the affective context path.
-fn hist_trim_with_bell_guard(hist: String) -> String {
-    // Extract the first turn (should be a user message) to inspect it.
     let inner: String = str_slice(hist, 1, str_len(hist) - 1)
     let marker: String = "{\"role\":"
     let i1: Int = str_index_of(inner, marker)
-    // i1 is the start of the first entry within inner.
-    // Find where the second entry begins to delimit the first entry's JSON.
     let tail1: String = str_slice(inner, i1 + 1, str_len(inner))
     let i2: Int = str_index_of(tail1, marker)
-    // The first entry spans from i1 to (i1 + 1 + i2 - 1) within inner.
-    let first_entry_raw: String = if i2 > 0 {
-        str_slice(inner, i1, i1 + 1 + i2 - 1)
-    } else {
-        str_slice(inner, i1, str_len(inner))
-    }
-    let first_role: String = json_get(first_entry_raw, "role")
-    let first_content: String = json_get(first_entry_raw, "content")
-
-    // Only inspect user turns — assistant content doesn't carry bell signals.
-    let bell_level: String = if str_eq(first_role, "user") {
-        safety_detect_bell_level(first_content)
-    } else {
-        "none"
-    }
-
-    // If the turn being evicted triggered a bell, preserve it to engram.
-    // This is distinct from the BellEvent written by auto_persist: that node
-    // carries a short summary. This node carries the full exchange content so
-    // it is recoverable for clinical/continuity review.
-    if !str_eq(bell_level, "none") {
-        let ts: Int = time_now()
-        let ts_str: String = int_to_str(ts)
-        let safe_content: String = str_replace(first_content, "\"", "'")
-        let preserve_content: String = "PRESERVED_BELL:" + bell_level
-            + " | evicted_at:" + ts_str
-            + " | message:" + safe_content
-        let preserve_tags: String = "[\"bell-history\",\"bell:" + bell_level + "\",\"evicted\",\"affective\",\"BellEvent\"]"
-        let discard: String = engram_node_full(
-            preserve_content,
-            "BellEvent",
-            "bell:" + bell_level + ":preserved",
-            el_from_float(0.9),
-            el_from_float(0.9),
-            el_from_float(1.0),
-            "Episodic",
-            preserve_tags
-        )
-    }
-
-    // Now perform the standard trim (drop oldest 2 entries = 1 user + 1 assistant pair).
     let tail2: String = str_slice(tail1, i2 + 1, str_len(tail1))
     let i3: Int = str_index_of(tail2, marker)
     if i3 >= 0 {
@@ -423,47 +226,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 +242,41 @@ 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.
+// Stores as a Conversation node. Overwrites by using consistent label "conv:history".
 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 "" }
+    let ts: Int = time_now()
     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.
+    // TODO(reliability #3 — conv_history global race): process-global key; concurrent
+    // /api/chat requests without session_id race on this read-append-write.
     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) }
@@ -591,29 +295,8 @@ fn handle_chat(body: String) -> String {
         message
     }
 
-    // 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.
-    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 }
-        if found_recent {
-            "[RECENT CONTEXT: User recently expressed significant distress. Monitor for indirect crisis signals and respond with care.]\n\n"
-        } else { "" }
-    } else { "" }
-
     let ctx: String = engram_compile(activation_seed)
-    let system: String = affective_prefix + build_system_prompt(ctx)
+    let system: String = build_system_prompt(ctx)
 
     // First message of the session: proactively load user profile and active work context.
     // These two searches give the soul grounding before any conversation history exists.
@@ -693,22 +376,13 @@ fn handle_chat(body: String) -> String {
     let req_model: String = json_get(body, "model")
     let model: String = if str_eq(req_model, "") { chat_default_model() } else { req_model }
 
-    // ISSUE 9: add safety_augment_system to primary /api/chat path.
-    // handle_chat was the only LLM path missing bell directive injection.
-    let full_system = safety_augment_system(full_system, message)
-
     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)
@@ -716,25 +390,11 @@ fn handle_chat(body: String) -> String {
 
     let updated_hist: String = hist_append(stored_hist, "user", message)
     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 {
-        hist_trim_with_bell_guard(updated_hist2)
+    let final_hist: String = if json_array_len(updated_hist2) > 20 {
+        hist_trim(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)
 
@@ -785,42 +445,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 +496,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 +529,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 +541,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
     }
@@ -992,8 +608,7 @@ fn path_within_root(path: String, root: String) -> Bool {
         return false
     }
     if str_starts_with(path, "/") {
-        let root_normalized: String = root + "/"
-        return str_starts_with(path, root_normalized)
+        return str_starts_with(path, root)
     }
     return true
 }
@@ -1084,17 +699,12 @@ fn dispatch_tool(tool_name: String, tool_input: String) -> String {
         let path: String = json_get(tool_input, "path")
         let old_text: String = json_get(tool_input, "old_text")
         let new_text: String = json_get(tool_input, "new_text")
-        let root: String = agent_workspace_root()
-        if !path_within_root(path, root) {
-            return json_safe("denied: path is outside the agent workspace root")
-        }
-        let resolved: String = resolve_in_root(path, root)
-        let content: String = fs_read(resolved)
+        let content: String = fs_read(path)
         if str_eq(content, "") {
             return json_safe("{\"error\":\"file not found\"}")
         }
         let updated: String = str_replace(content, old_text, new_text)
-        fs_write(resolved, updated)
+        fs_write(path, updated)
         return json_safe("{\"ok\":true}")
     }
     if str_eq(tool_name, "remember") {
@@ -1195,22 +805,15 @@ fn is_builtin_tool(tool_name: String) -> Bool {
 }
 
 // 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.
+// Uses uuid_v4() as the primary uniqueness guarantee — concurrent calls cannot collide.
 //
-// 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.
+// TODO(reliability #6): mcp_bridge_seq RMW is non-atomic. Now benign because
+// uuid_v4() provides collision-free uniqueness. Counter is kept for readability only.
 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
 }
@@ -1221,17 +824,6 @@ fn handle_chat_agentic(body: String) -> String {
         return "{\"error\":\"message required\",\"reply\":\"\"}"
     }
 
-    // Workspace scope (#23): the desktop UI sends the user-chosen Agent Workspace root
-    // on every agentic request. Persist it to state so agent_workspace_root() — and the
-    // path/command tool guards that read it — confine this turn's file/command tools to
-    // that subtree. Only set when non-empty: an empty/absent field means the client sent
-    // no root (or cleared the field), and we must not overwrite a server-configured root
-    // from NEURON_AGENT_ROOT with an empty string, which would silently un-scope the agent.
-    let ws_root: String = json_get(body, "agent_workspace_root")
-    if !str_eq(ws_root, "") {
-        state_set("agent_workspace_root", ws_root)
-    }
-
     // 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")
@@ -1240,7 +832,7 @@ fn handle_chat_agentic(body: String) -> String {
     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 }
@@ -1248,21 +840,6 @@ fn handle_chat_agentic(body: String) -> String {
     // Thread-aware activation: same logic as handle_chat.
     // Use the session's or global history to anchor short messages to the thread.
     let req_session: String = json_get(body, "session_id")
-
-    // ISSUE #6/#7: validate that the session_id actually exists before proceeding.
-    // Without this check the loop silently treats any unknown/fabricated session_id
-    // as a fresh session — history loads as empty and no error is returned to the caller.
-    // Only validate when a session_id is explicitly provided; anonymous calls
-    // (no session_id) continue to work for backward compatibility.
-    let session_valid: Bool = if str_eq(req_session, "") {
-        true
-    } else {
-        !str_contains(session_get(req_session), "\"error\"")
-    }
-    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)
     let agentic_hist_len: Int = if str_eq(agentic_hist, "") { 0 } else { json_array_len(agentic_hist) }
@@ -1301,30 +878,12 @@ 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.
-        if str_eq(hist_key, "conv_history") {
-            conv_history_persist(trimmed)
-        }
         true
     } else { false }
 
@@ -1355,14 +914,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 +922,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 +1202,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 +1251,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 +1267,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)
@@ -1807,28 +1348,14 @@ fn auto_persist(req: String, resp: String) -> Void {
     let safe_msg: String = str_replace(message, "\"", "'")
     let safe_reply: String = str_replace(reply2, "\"", "'")
 
-    // Detect emotional salience before persisting. safety_detect_bell_level uses the
-    // same phrase lists as the safety layer (safety.el), so the classification is
-    // consistent with what safety_screen already evaluated for this turn.
-    let bell_level: String = safety_detect_bell_level(message)
-    let is_bell: Bool = !str_eq(bell_level, "none")
-
-    // Tag the Conversation node with bell metadata when distress is present so
-    // subsequent affective queries (e.g. engram_compile) can find this exchange.
-    let tags: String = if is_bell {
-        "[\"Conversation\",\"chat\",\"timestamped\",\"bell:" + bell_level + "\",\"affective\"]"
-    } else {
-        "[\"Conversation\",\"chat\",\"timestamped\"]"
-    }
-
     let content: String = "{\"q\":\"" + safe_msg + "\""
         + ",\"a\":\"" + safe_reply + "\""
         + ",\"created_at\":" + ts_str
         + ",\"source\":\"chat\""
-        + ",\"bell\":\"" + bell_level + "\""
         + ",\"label\":\"chat:" + ts_str + "\"}"
 
-    let conv_node_id: String = engram_node_full(
+    let tags: String = "[\"Conversation\",\"chat\",\"timestamped\"]"
+    engram_node_full(
         content,
         "Conversation",
         "chat:" + ts_str,
@@ -1838,74 +1365,6 @@ fn auto_persist(req: String, resp: String) -> Void {
         "Episodic",
         tags
     )
-
-    // When a bell fires, write a dedicated BellEvent node in addition to the
-    // Conversation node. This makes distress moments directly findable by label
-    // ("bell:soft" / "bell:hard") without having to scan all Conversation nodes.
-    // The BellEvent carries higher salience so engram_compile pulls it into context.
-    // The message content is truncated to 120 chars — enough signal, not a full dump.
-    if is_bell {
-        let summary: String = if str_len(message) > 120 { str_slice(message, 0, 120) } else { message }
-        let safe_summary: String = str_replace(summary, "\"", "'")
-        let bell_content: String = "BELL:" + bell_level
-            + " | ts:" + ts_str
-            + " | summary:" + safe_summary
-
-        // bell:hard gets peak salience; bell:soft is slightly lower.
-        let sal_a: String = if str_eq(bell_level, "hard") { el_from_float(0.98) } else { el_from_float(0.88) }
-        let sal_b: String = if str_eq(bell_level, "hard") { el_from_float(0.98) } else { el_from_float(0.88) }
-        let sal_c: String = if str_eq(bell_level, "hard") { el_from_float(1.0) } else { el_from_float(0.95) }
-
-        let bell_tags: String = "[\"safety\",\"bell\",\"bell:" + bell_level + "\",\"affective\",\"BellEvent\"]"
-        let bell_ts_str: String = int_to_str(time_now())
-        let bell_label: String = "bell:" + bell_level + ":" + bell_ts_str
-        let bell_node_id: String = engram_node_full(
-            bell_content,
-            "BellEvent",
-            bell_label,
-            sal_a,
-            sal_b,
-            sal_c,
-            "Episodic",
-            bell_tags
-        )
-
-        // Increment session-level bell counter so session_hist_save knows whether
-        // any bell fired during this session when writing a boundary summary.
-        let sess_id: String = json_get(req, "session_id")
-        let bell_key: String = if str_eq(sess_id, "") {
-            "session_bell_count"
-        } else {
-            "session_bell_count:" + sess_id
-        }
-        let prior_count: String = state_get(bell_key)
-        let prior_n: Int = if str_eq(prior_count, "") { 0 } else { str_to_int(prior_count) }
-        state_set(bell_key, int_to_str(prior_n + 1))
-
-        // Also record the highest bell level seen this session so the boundary
-        // summary can classify the session correctly (hard takes precedence).
-        let level_key: String = if str_eq(sess_id, "") {
-            "session_bell_level"
-        } else {
-            "session_bell_level:" + sess_id
-        }
-        let prior_level: String = state_get(level_key)
-        let new_level: String = if str_eq(bell_level, "hard") { "hard" } else {
-            if str_eq(prior_level, "hard") { "hard" } else { "soft" }
-        }
-        state_set(level_key, new_level)
-
-        // Stash a short signal summary for the boundary node (last bell wins for
-        // the one-liner; the full history is in per-bell BellEvent nodes).
-        let signal_key: String = if str_eq(sess_id, "") {
-            "session_bell_signal"
-        } else {
-            "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 + ")")
-    }
 }
 
 // strengthen_chat_nodes — strengthen the engram nodes that were activated during a chat.

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.

imprint.el

@@ -5,6 +5,10 @@
 
 // imprint_current — returns the active imprint ID from state.
 // Falls back to "base" (bare Neuron, no suit) when nothing is loaded.
+//
+// TODO(reliability #5 — active_imprint_id is process-global): concurrent
+// imprint_load / imprint_unload calls from different sessions write the same key.
+// Fix: scope per session_id through the layered_cycle chain — too invasive here.
 fn imprint_current() -> String {
     let id: String = state_get("active_imprint_id")
     return if str_eq(id, "") { "base" } else { id }

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

@@ -400,7 +400,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 +452,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,23 +651,17 @@ 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(
+        let discard: 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")
-        }
     }
     return "{\"ok\":true,\"snapshot\":\"" + snap + "\"}"
 }

routes.el

@@ -7,65 +7,6 @@ import "neuron-api.el"
 import "sessions.el"
 import "soul.elh"
 
-// ---------------------------------------------------------------------------
-// Rate limiting — simple in-memory per-IP sliding window counter.
-//
-// State keys:
-//   rl:<ip>:count  — request count in the current window
-//   rl:<ip>:window — window start timestamp (unix seconds)
-//
-// Limit: configurable via soul state key "soul_rate_limit" (requests per
-// minute). Falls back to 60 req/min if not set. The /health endpoint is
-// exempt so monitoring does not consume quota.
-//
-// State growth: each unique source IP accumulates exactly 2 state keys
-// (count + window) for the lifetime of the process. Per-IP storage is
-// bounded and constant; values reset on window expiry. In aggregate, state
-// grows linearly with distinct IPs — typical for a trusted-client service.
-// EL has no state_delete builtin, so keys from inactive IPs persist.
-// TODO: add state_delete sweep when the EL runtime exposes that primitive.
-//
-// Returns "" when the request is allowed, or a 429 JSON body when rejected.
-// ---------------------------------------------------------------------------
-fn rate_limit_check(ip: String, path: String) -> String {
-    // Health checks are exempt — they must never be blocked.
-    if str_eq(path, "/health") {
-        return ""
-    }
-
-    let limit_str: String = state_get("soul_rate_limit")
-    let limit: Int = if str_eq(limit_str, "") { 60 } else { str_to_int(limit_str) }
-
-    let now: Int = time_now()
-    let window_key: String = "rl:" + ip + ":window"
-    let count_key: String = "rl:" + ip + ":count"
-
-    let win_str: String = state_get(window_key)
-    let win_start: Int = if str_eq(win_str, "") { now } else { str_to_int(win_str) }
-
-    // New window every 60 seconds.
-    let elapsed: Int = now - win_start
-    let in_window: Bool = elapsed < 60
-
-    let prev_count_str: String = state_get(count_key)
-    let prev_count: Int = if str_eq(prev_count_str, "") { 0 } else { str_to_int(prev_count_str) }
-
-    // Reset window if expired.
-    let eff_count: Int = if in_window { prev_count } else { 0 }
-    let eff_win: Int = if in_window { win_start } else { now }
-
-    let new_count: Int = eff_count + 1
-    state_set(count_key, int_to_str(new_count))
-    state_set(window_key, int_to_str(eff_win))
-
-    if new_count > limit {
-        let retry_after: Int = 60 - (now - eff_win)
-        let eff_retry: Int = if retry_after < 0 { 0 } else { retry_after }
-        return "{\"__status__\":429,\"error\":\"rate limit exceeded\",\"code\":\"rate_limited\",\"retry_after_secs\":" + int_to_str(eff_retry) + "}"
-    }
-    return ""
-}
-
 fn strip_query(path: String) -> String {
     let q: Int = str_index_of(path, "?")
     if q < 0 {
@@ -75,24 +16,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\",\"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\",\"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 }
@@ -100,35 +31,12 @@ fn route_health() -> String {
     let edge_ct: Int = engram_edge_count()
     let pulse: String = state_get("soul.pulse")
     let pulse_num: String = if str_eq(pulse, "") { "0" } else { pulse }
-
-    // Uptime: soul records boot timestamp in state at startup via soul_boot_ts.
-    // Compute elapsed seconds; fall back to -1 if not yet set.
-    let boot_ts_str: String = state_get("soul_boot_ts")
-    let uptime_secs: Int = if str_eq(boot_ts_str, "") {
-        -1
-    } else {
-        time_now() - str_to_int(boot_ts_str)
-    }
-
-    // LLM connectivity: probe with a minimal call. Any non-error reply = ok.
-    // Use a short, fixed prompt so this never counts against conversation history.
-    let model: String = state_get("soul_model")
-    let eff_model: String = if str_eq(model, "") { "claude-sonnet-4-5" } else { model }
-    let llm_probe: String = llm_call_system(eff_model, "You are a health probe. Reply with the single word: ok", "ping")
-    let llm_ok: Bool = !str_eq(llm_probe, "")
-        && !str_starts_with(llm_probe, "{\"error\"")
-        && !str_starts_with(llm_probe, "{\"type\":\"error\"")
-        && !str_contains(llm_probe, "authentication_error")
-    let llm_status: String = if llm_ok { "ok" } else { "unreachable" }
-
     return "{\"status\":\"alive\""
         + ",\"cgi_id\":\"" + cgi_id + "\""
         + ",\"boot\":" + boot_num
-        + ",\"uptime_secs\":" + int_to_str(uptime_secs)
         + ",\"node_count\":" + int_to_str(node_ct)
         + ",\"edge_count\":" + int_to_str(edge_ct)
         + ",\"pulse\":" + pulse_num
-        + ",\"llm\":\"" + llm_status + "\""
         + ",\"layers\":{\"l0\":\"core\",\"l1\":\"safety\",\"l2\":\"stewardship\",\"l3\":\"" + imprint_current() + "\"}}"
 }
 
@@ -151,8 +59,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 +81,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(
@@ -197,15 +103,15 @@ fn route_imprint_user(body: String) -> String {
 
 fn route_synthesize(body: String) -> String {
     if str_eq(body, "") {
-        return "{\"error\":\"body is required\",\"code\":\"missing_param\"}"
+        return "{\"mechanism\":\"did not engage\"}"
     }
     let parent_a: String = json_get(body, "parent_a")
     let parent_b: String = json_get(body, "parent_b")
     if str_eq(parent_a, "") {
-        return "{\"error\":\"parent_a is required\",\"code\":\"missing_param\"}"
+        return "{\"mechanism\":\"did not engage\"}"
     }
     if str_eq(parent_b, "") {
-        return "{\"error\":\"parent_b is required\",\"code\":\"missing_param\"}"
+        return "{\"mechanism\":\"did not engage\"}"
     }
     let req: String = "synthesize " + parent_a + " " + parent_b
     let tags: String = "[\"soul-inbox-pending\",\"synthesis-request\"]"
@@ -313,13 +219,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,51 +256,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.
-    let ip: String = env("REMOTE_ADDR")
-    if !str_eq(ip, "") {
-        let rl_result: String = rate_limit_check(ip, clean)
-        if !str_eq(rl_result, "") {
-            return rl_result
-        }
-    }
-
-    // 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)
     }
@@ -414,6 +274,9 @@ fn handle_request(method: String, path: String, body: String) -> String {
             return engram_scan_nodes_json(9999, 0)
         }
         if str_eq(clean, "/api/graph/edges") {
+            // TODO(reliability #8): engram_save races with awareness loop mem_save().
+            // Both now use atomic write-to-temp+rename (el_runtime.c). Serialised
+            // by engram_global_mu. Future: add engram_edges_json() builtin.
             let snap_path: String = env("HOME") + "/.neuron/engram/snapshot.json"
             engram_save(snap_path)
             let snap: String = fs_read(snap_path)
@@ -426,8 +289,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 required\"}"
             }
             let agentic_flag: Bool = json_get_bool(body, "agentic")
             let reply: String = if agentic_flag {
@@ -567,21 +429,8 @@ fn handle_request(method: String, path: String, body: String) -> String {
             return handle_elp_chat(body)
         }
         if str_eq(clean, "/api/chat") {
-            // NOTE: streaming (SSE / chunked transfer) is not implemented. All chat
-            // 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\":\"\"}"
-            }
             let agentic_flag: Bool = json_get_bool(body, "agentic")
+            let raw_msg: String = json_get(body, "message")
             let reply: String = if agentic_flag {
                 handle_chat_agentic(body)
             } else {

safety.el

@@ -144,22 +144,17 @@ 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.
         let e1: String = str_replace(input, "\\", "\\\\")
         let e2: String = str_replace(e1, "\"", "\\\"")
         let e3: String = str_replace(e2, "\n", "\\n")
-        let e4: String = str_replace(e3, "\r", "\\r")
-        let safe_input: String = str_replace(e4, "\t", "\\t")
+        let safe_input: String = str_replace(e3, "\r", "\\r")
         return "{\"action\":\"soft_bell\",\"reason\":\"wellbeing check needed\",\"content\":\"" + safe_input + "\"}"
     }
 
-    // ISSUE 7 fix: escape tab chars (see soft_bell branch above for rationale).
     let e1: String = str_replace(input, "\\", "\\\\")
     let e2: String = str_replace(e1, "\"", "\\\"")
     let e3: String = str_replace(e2, "\n", "\\n")
-    let e4: String = str_replace(e3, "\r", "\\r")
-    let safe_input: String = str_replace(e4, "\t", "\\t")
+    let safe_input: String = str_replace(e3, "\r", "\\r")
     return "{\"action\":\"pass\",\"content\":\"" + safe_input + "\"}"
 }
 
@@ -200,11 +195,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.
-    let node_id: String = engram_node_full(
+    let discard: String = engram_node_full(
         content,
         "BellEvent",
         "bell:" + level,
@@ -214,9 +205,6 @@ fn safety_log_bell(level: String, reason: String, input_summary: String) -> Stri
         "Episodic",
         tags
     )
-    if str_eq(node_id, "") {
-        println("[safety] WARN: bell event engram write failed -- fallback log: " + content)
-    }
     return ""
 }
 
@@ -244,20 +232,9 @@ fn safety_general_hard_phrases() -> String {
 }
 
 fn safety_soft_phrases() -> String {
-    return "[\"stressed\",\"overwhelmed\",\"can't cope\",\"cannot cope\",\"struggling\",\"anxious\",\"anxiety\",\"depressed\",\"depression\",\"lonely\",\"isolated\",\"hopeless\",\"hopelessness\",\"exhausted\",\"burnt out\",\"burned out\",\"burnout\",\"panic\",\"panicking\",\"falling apart\",\"breaking down\",\"can't handle\",\"cannot handle\",\"losing it\",\"nothing matters\",\"don't care anymore\",\"given up\",\"giving up\",\"helpless\",\"worthless\",\"useless\",\"hate myself\",\"no one cares\",\"nobody cares\",\"no one understands\",\"nobody understands\",\"empty inside\",\"can't stop crying\",\"breaking point\",\"at my limit\",\"having a breakdown\",\"highest structure\",\"tallest building\",\"tallest structure\",\"highest building\",\"bridge near me\",\"overpass near\",\"rooftop near\"]"
+    return "[\"stressed\",\"overwhelmed\",\"can't cope\",\"cannot cope\",\"struggling\",\"anxious\",\"anxiety\",\"depressed\",\"depression\",\"lonely\",\"isolated\",\"hopeless\",\"hopelessness\",\"exhausted\",\"burnt out\",\"burned out\",\"burnout\",\"panic\",\"panicking\",\"falling apart\",\"breaking down\",\"can't handle\",\"cannot handle\",\"losing it\",\"nothing matters\",\"don't care anymore\",\"given up\",\"giving up\",\"helpless\",\"worthless\",\"useless\",\"hate myself\",\"no one cares\",\"nobody cares\",\"no one understands\",\"nobody understands\",\"empty inside\",\"can't stop crying\",\"breaking point\",\"at my limit\",\"having a breakdown\"]"
 }
 
-// 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.
 // ── Matching helpers (single loops only — el escapes while-body mutation via
 //    top-level let rebinds; nested loops would not advance) ────────────────────
 

sessions.el

@@ -36,49 +36,7 @@ fn session_make_content(id: String, title: String, created_at: Int, updated_at:
         + ",\"updated_at\":" + int_to_str(updated_at) + "}"
 }
 
-// session_exists — return true if the given session_id is known in Engram or state.
-// Used by chat.el to validate a session_id before processing a chat message.
-// Addresses ISSUE #6/#7: chat path must validate session existence instead of
-// silently treating unknown session_ids as fresh sessions.
-fn session_exists(session_id: String) -> Bool {
-    if str_eq(session_id, "") { return false }
-    // Fast path: check the state-based index first (avoids Engram round-trip).
-    let idx: String = state_get("session_index")
-    if !str_eq(idx, "") && !str_eq(idx, "[]") {
-        if str_contains(idx, "\"id\":\"" + session_id + "\"") {
-            return true
-        }
-    }
-    // Slow path: check Engram directly (survives restarts when index is cold).
-    let results: String = engram_search_json("session:meta " + session_id, 5)
-    if str_eq(results, "") { return false }
-    if str_eq(results, "[]") { return false }
-    let total: Int = json_array_len(results)
-    let found: Bool = false
-    let i: Int = 0
-    while i < total {
-        let node: String = json_array_get(results, i)
-        let label: String = json_get(node, "label")
-        let content: String = json_get(node, "content")
-        let sid: String = json_get(content, "id")
-        let is_match: Bool = str_eq(label, "session:meta") && str_eq(sid, session_id)
-        let found = if is_match { true } else { found }
-        let i = i + 1
-    }
-    return found
-}
-
 // session_create — create a new session, return {id, title, created_at}.
-//
-// ISSUE #1: Ghost sessions on failed first message.
-// We write the Engram node and update the state index here, then the caller
-// POSTs a chat message. If that chat call fails (LLM unavailable, network
-// error, etc.) the session is stranded with no messages. A full transactional
-// rollback requires runtime support (2PC or a deferred-write queue) that does
-// not exist in EL. Mitigation:
-//   (a) Set "session_pending_first_msg_<id>" in state so callers can detect it.
-//   (b) Provide session_create_cleanup() for callers that detect a failure.
-// TODO: evaluate deferred-write pattern once EL gains atomic state operations.
 fn session_create(body: String) -> String {
     let ts: Int = time_now()
     let id: String = uuid_v4()
@@ -97,13 +55,10 @@ fn session_create(body: String) -> String {
     }
     // Store the engram node_id mapping so we can look up the node for this session
     state_set("session_node_" + id, node_id)
-    // Mark as pending first message so stale ghost sessions can be identified
-    // (e.g. if the caller\'s subsequent chat POST fails).
-    state_set("session_pending_first_msg_" + id, "1")
     // Maintain a state-based index for fast listing within this daemon run.
     // Newest sessions first (prepend).
-    // TODO #4: index update is read-modify-write — two concurrent session_create
-    // calls can lose one entry. EL has no CAS primitive; fix requires runtime support.
+    // TODO(reliability #2): session_index RMW is non-atomic. Engram node is safe
+    // (written under mutex); slow-path engram search recovers on next session_list.
     let existing_idx: String = state_get("session_index")
     let idx_entry: String = "{\"id\":\"" + id + "\",\"title\":\"" + json_safe(title) + "\",\"folder\":\"" + json_safe(folder) + "\",\"created_at\":" + int_to_str(ts) + ",\"updated_at\":" + int_to_str(ts) + ",\"last_message\":\"\"}"
     let new_idx: String = if str_eq(existing_idx, "") {
@@ -120,20 +75,6 @@ fn session_create(body: String) -> String {
         + ",\"created_at\":" + int_to_str(ts) + "}"
 }
 
-// session_create_cleanup — undo a session_create when the caller\'s first chat
-// fails. Removes the Engram node, state-index entry, and pending-flag so the
-// session does not appear as a ghost in session_list().
-// Addresses ISSUE #1: cleanup path for ghost sessions.
-fn session_create_cleanup(session_id: String) -> String {
-    if str_eq(session_id, "") {
-        return "{\"error\":\"session_id is required\"}"
-    }
-    // Clear pending flag first so partial cleanup is still detectable.
-    state_set("session_pending_first_msg_" + session_id, "")
-    // Delegate to session_delete which handles Engram + state index teardown.
-    return session_delete(session_id)
-}
-
 // session_list — list all sessions. Returns [{id, title, last_message, created_at, updated_at}].
 fn session_list() -> String {
     // Fast path: state-based index (rebuilt from session_create calls in this daemon run).
@@ -283,27 +224,13 @@ fn session_delete(session_id: String) -> String {
     state_set("session_hist_" + session_id, "")
     state_set("session_node_" + session_id, "")
     state_set("session_index", "")
-    // ISSUE #5: clean up bridge blobs and always_allow keys that were never
-    // cleared by agentic_resume (e.g. client abandoned a pending tool call).
-    // Without this, stranded bridge blobs accumulate indefinitely in state.
-    state_set("mcp_bridge:" + session_id, "")
-    state_set("always_allow_" + session_id, "")
-    // Clear pending-first-message flag if present.
-    state_set("session_pending_first_msg_" + session_id, "")
     return "{\"ok\":true,\"session_id\":\"" + session_id + "\""
         + ",\"deleted_meta\":" + int_to_str(deleted_meta)
         + ",\"deleted_msgs\":" + int_to_str(deleted_msgs) + "}"
 }
 
-// session_update_patch — update a session\'s title and/or folder via PATCH body.
+// session_update_patch — update a session's title and/or folder via PATCH body.
 // Body may contain "title", "folder", or both. Preserves unmentioned fields.
-//
-// ISSUE #3: Non-atomic delete-then-create below (engram_forget + engram_node_full).
-// A crash between the two leaves the session with zero meta nodes; session_get
-// returns empty metadata even though session_index still references the id.
-// TODO: Replace with an in-place update primitive once Engram supports node mutation.
-// Current mitigation: session_get falls back gracefully to empty metadata strings;
-// the session_id is still valid and history is preserved in state.
 fn session_update_patch(session_id: String, body: String) -> String {
     if str_eq(session_id, "") {
         return "{\"error\":\"session_id is required\"}"
@@ -422,11 +349,10 @@ fn session_hist_load(session_id: String) -> String {
 }
 
 // session_hist_save — persist message history for a session to state and engram.
+// TODO(reliability #7): delete-then-insert is not atomic — concurrent saves for the
+// same session can produce orphan history nodes. State is primary truth; engram fallback.
 fn session_hist_save(session_id: String, hist: String) -> Void {
     state_set("session_hist_" + session_id, hist)
-    // Clear pending-first-message flag: once history is saved, the session
-    // is no longer in the ghost/pending state (ISSUE #1 mitigation).
-    state_set("session_pending_first_msg_" + session_id, "")
     // Delete old history node and write fresh one
     let old_results: String = engram_search_json("session:messages:" + session_id, 3)
     let o_total: Int = if str_eq(old_results, "") { 0 } else { json_array_len(old_results) }
@@ -446,61 +372,9 @@ fn session_hist_save(session_id: String, hist: String) -> Void {
         el_from_float(0.6), el_from_float(0.6), el_from_float(0.9),
         "Episodic", tags
     )
-
-    // Session boundary emotional summary — written once per session the first time
-    // a bell event has fired. The summary node is findable by future sessions via
-    // broad affective queries ("session:emotional-summary" or "bell distress session").
-    // It is NOT rewritten on every save — the state flag prevents duplicate nodes.
-    let summary_written_key: String = "session_bell_summary_written:" + session_id
-    let already_written: String = state_get(summary_written_key)
-    if str_eq(already_written, "") {
-        let bell_count_key: String = "session_bell_count:" + session_id
-        let bell_count_raw: String = state_get(bell_count_key)
-        let bell_count: Int = if str_eq(bell_count_raw, "") { 0 } else { str_to_int(bell_count_raw) }
-        if bell_count > 0 {
-            let bell_level_key: String = "session_bell_level:" + session_id
-            let bell_signal_key: String = "session_bell_signal:" + session_id
-            let dominant_level: String = state_get(bell_level_key)
-            let last_signal: String = state_get(bell_signal_key)
-            let eff_level: String = if str_eq(dominant_level, "") { "soft" } else { dominant_level }
-            let eff_signal: String = if str_eq(last_signal, "") { "(no signal captured)" } else { last_signal }
-            let ts_now: Int = time_now()
-            let summary_content: String = "session:emotional-summary"
-                + " | session:" + session_id
-                + " | bell_count:" + int_to_str(bell_count)
-                + " | dominant_level:" + eff_level
-                + " | last_signal:" + eff_signal
-                + " | ts:" + int_to_str(ts_now)
-            let summary_tags: String = "[\"session-emotional-summary\",\"affective\",\"bell:" + eff_level + "\",\"BellEvent\"]"
-            let summary_sal: String = if str_eq(eff_level, "hard") { el_from_float(0.95) } else { el_from_float(0.85) }
-            let sum_discard: String = engram_node_full(
-                summary_content,
-                "BellEvent",
-                "session:emotional-summary",
-                summary_sal,
-                summary_sal,
-                el_from_float(1.0),
-                "Episodic",
-                summary_tags
-            )
-            // Mark written so we do not create duplicate summary nodes as the
-            // session continues accumulating more turns.
-            state_set(summary_written_key, "1")
-        }
-    }
 }
 
 // session_update_meta_timestamp — update the updated_at field in the session:meta node.
-//
-// ISSUE #2: No TTL / idle expiry mechanism. Sessions accumulate indefinitely.
-// A sweep job (e.g. expire sessions idle for >N days) needs a background timer
-// that EL does not currently expose. Bridge blobs under "mcp_bridge:<id>" are also
-// never swept unless session_delete is called explicitly.
-// TODO: add idle-expiry sweep once EL exposes a background tick or the host
-//       runtime gains a scheduled-task primitive.
-//
-// ISSUE #3 applies here too: delete-then-create is non-atomic. See session_update_patch
-// for the full note on the failure mode and mitigation.
 fn session_update_meta_timestamp(session_id: String) -> Void {
     let results: String = engram_search_json("session:meta " + session_id, 10)
     let total: Int = if str_eq(results, "") { 0 } else { json_array_len(results) }
@@ -594,14 +468,6 @@ fn session_auto_title(session_id: String, first_message: String) -> Void {
 // action: "allow" | "deny" | "always"
 // Resumes the agentic loop from where it was paused.
 //
-// ISSUE #8: Reconnect/duplicate resume race. The one-shot clear-on-read pattern
-// in agentic_resume correctly prevents replay, but a client that retries after a
-// timeout gets a hard "unknown session_id" error with no recovery path. The
-// conversation is permanently stuck in that case. Full idempotency (e.g. caching
-// the last reply keyed by call_id) requires a new state structure.
-// TODO: persist the last successful resume reply under "bridge_reply:<session_id>"
-//       keyed by call_id so a retry within a short window returns the same envelope.
-//
 // Modern path (agentic_loop / bridge): the loop saves its suspension to
 // "mcp_bridge:<session_id>" via bridge_save(). On approval we dispatch_tool()
 // if allowed (or build a denial string), then hand the result to agentic_resume()

soul.el

@@ -5,9 +5,13 @@ import "stewardship.el"
 import "imprint.el"
 import "awareness.el"
 import "chat.el"
+import "safety.el"
 import "studio.el"
 import "elp-input.el"
 import "routes.el"
+import "safety.el"
+import "stewardship.el"
+import "imprint.el"
 
 cgi "neuron-soul" {
     dharma_id: "ntn-genesis@http://localhost:7770",
@@ -162,56 +166,6 @@ fn load_identity_context() -> Void {
             println("[soul] persona node loaded (" + int_to_str(str_len(p_content)) + " chars)")
         }
     }
-
-    // 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)
-    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 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) }
-            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, "") {
-                if str_eq(aff_ctx, "") { snip } else { aff_ctx + "\n" + snip }
-            } else { aff_ctx }
-            let ai = ai + 1
-        }
-        if !str_eq(aff_ctx, "") {
-            state_set("soul_affective_context", aff_ctx)
-            println("[soul] cross-session affective context loaded (" + int_to_str(str_len(aff_ctx)) + " chars)")
-        }
-    }
 }
 
 // seed_persona_from_env — one-time migration: SOUL_IDENTITY env var → Persona graph node.
@@ -258,13 +212,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)
         }
@@ -297,14 +246,11 @@ fn emit_session_start_event() -> Void {
         + ",\"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) + ")")
 }
 
@@ -312,42 +258,26 @@ fn emit_session_start_event() -> Void {
 // 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 history: String = state_get("conversation_history")
     let session_id: String = state_get("current_session_id")
 
     // L1 in: safety screen
     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.
-    let valid_action: Bool = str_eq(screen_action, "hard_bell")
-        || str_eq(screen_action, "soft_bell")
-        || str_eq(screen_action, "pass")
-    if !valid_action {
-        println("[soul] layered_cycle: safety_screen invalid action -- safe mode refusal")
-        return safety_validate("", "hard_bell")
-    }
-
     // Hard bell: bypass all upper layers, log and escalate.
     // Intentionally does NOT update conversation_history or call auto_persist():
     // hard bell events are security-sensitive and must not appear in engram conversation
     // 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.
-    //
     // 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
     // layer contract requires it to return a fixed refusal regardless of the output arg.
     // On the normal path, safety_validate receives the original screen_action ("pass")
     // so it can apply action-specific post-output checks.
     if str_eq(screen_action, "hard_bell") {
+        safety_log_bell("hard", json_get(screen_result, "reason"), str_slice(raw_input, 0, 80))
         return safety_validate("", "hard_bell")
     }
 
@@ -358,8 +288,11 @@ fn layered_cycle(raw_input: String) -> String {
     let cont_status: String = json_get(continuity, "status")
     let cont_action: String = json_get(continuity, "action")
 
-    // Store continuity status so imprint can adjust its response register
-    state_set("session_continuity", cont_status)
+    // Store continuity status so imprint can adjust its response register.
+    // TODO(reliability #4): session_continuity is process-global; scope per session_id
+    // when available to prevent cross-session bleed under concurrent layered_cycle calls.
+    let cont_key: String = if str_eq(session_id, "") { "session_continuity" } else { "session_continuity:" + session_id }
+    state_set(cont_key, cont_status)
 
     // Identity anomaly: add a gentle verification cue to the input before imprint
     let guided: String = if str_eq(cont_action, "identity_check") {
@@ -382,16 +315,6 @@ 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.
-    let augmented_addendum: String = safety_augment_system("", raw_input)
-    state_set("layered_cycle_safety_system_addendum", augmented_addendum)
-
     // L3: imprint responds
     let output: String = imprint_respond(aligned, imprint_id)
 
@@ -431,29 +354,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)
@@ -466,7 +372,6 @@ load_identity_context()
 seed_persona_from_env()
 let boot_num: Int = mem_boot_count_inc()
 state_set("soul_boot_count", int_to_str(boot_num))
-state_set("soul_boot_ts", int_to_str(time_now()))
 println("[soul] boot #" + int_to_str(boot_num))
 emit_session_start_event()