From 635f6febe4c47baa614aa5ee3794b8e0e4c43c9f Mon Sep 17 00:00:00 2001 From: Tim Lingo <1timlingo@gmail.com> Date: Wed, 5 Aug 2026 09:11:03 -0500 Subject: [PATCH] =?UTF-8?q?feat(engine):=20plain=20chat=20generates=20at?= =?UTF-8?q?=20L3=20=E2=80=94=20inside=20the=20safety=20cycle,=20not=20arou?= =?UTF-8?q?nd=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non-agentic /api/chat (the desktop app's default "Tools: Off" mode) returned the user's own screened text as a bare non-JSON string. Every JSON client failed to parse it and showed "Couldn't reach Neuron - it may be offline." Root cause: f52d5bd (2026-06-11) correctly moved the route onto the layer spine (handle_chat -> layered_cycle), but L3 never got a generator — imprint_respond() annotates its input and returns it. Two pieces of the architecture were already waiting for that step: layered_cycle parks a bell directive in the state key build_system_prompt is written to consume, and build_system_prompt carries a chat_mode ("no tools") flag with no live caller. The fix composes rather than replaces. Wiring handle_chat would have removed safety_screen, the hard-bell short-circuit, the whole stewardship layer and safety_validate — the only enforcing output gate in the codebase — in exchange for a working reply (see _engine-websearch-20260804/SAFETY-STOP.md). Instead layered_cycle keeps every gate, in order, and gains a generation step between imprint_respond and safety_validate. L1 screen -> guard -> hard-bell short-circuit -> L2a -> L2b -> L2c -> L3 imprint_respond (prompt) -> L3b layered_generate (NEW) -> L1 validate - chat.el: NEW layered_generate (L3 generation, no tools offered), conv_history_block, conv_history_record. FIX build_system_prompt never concatenated no_tools_rule into its return — the "[NO TOOLS THIS TURN]" rule reached no model at all. handle_chat annotated DO-NOT-WIRE with the reason. - soul.el: layered_cycle gains L3b + post-validation turn bookkeeping. - routes.el: NEW plain_chat_envelope; all three /api/chat dispatch sites wrap the cycle's output. Built OUTSIDE the cycle so safety_validate always sees raw model text — nothing to unwrap or rebuild on the crisis path. Emits both `reply` and `response`: the desktop app reads `reply`, the CLI tools and telegram-gateway read `response`. Also fixes BUG-PLAINCHAT-1, a pre-existing CRITICAL crash on the crisis path. elc compiles `let n: Int = pos + str_len(marker)` to el_str_concat() — string concat on two integers — inside a block-expression initializer, segfaulting the daemon (SIGSEGV in strlen). Six inline copies of the same " | ts:" parser had it: two in layered_cycle L2c, two in engram_compile (live on the AGENTIC path too), two in affective_context_prefix. A distress turn following an earlier affective turn killed the whole process. Proven pre-existing: an unmodified baseline binary crashes identically, and the same bad C is in the committed dist/soul.c. Fixed by hoisting to one top-level function, affective_node_ts(), where the expression compiles to integer addition — verified in the generated C. Proof (throwaway HOME/engram, explicit NEURON_PORT, live chain untouched): - Plain turn returns a JSON envelope with the provider's answer, not an echo. - Captured request body: no `tools`, no `tool_choice`; system prompt carries the NO-TOOLS rule. Tools:Off means no tool is offered, structurally. - Hard bell: canned 988 message, and the provider request count does not move — the message never reaches a model. - Soft bell + a 2-char model reply: safety_validate's care phrase is appended to the MODEL's output. Output gate acting, on this route. - The L1 bell directive now reaches the model here for the first time (the state addendum had a producer and no consumer). - test_layered_cycle PASS; all six El suites byte-identical to baseline. - verify-soul-contract.sh (bash 5.3): GATE PASS, 27/27, immutability PASS. - The crash sequence that killed the baseline daemon now returns HTTP 200. Not proven: no live Anthropic call — the login keychain refuses the key to a non-interactive process (rc=24 errSecInteractionNotAllowed). Details and the one-command close-out are in _engine-plainchat-20260805/README.md §7. Builds on PR #108. dist/soul.c deliberately not regenerated — Will's toolchain. Co-Authored-By: Claude Opus 5 --- chat.el | 240 ++++++++++++++++++++++++++++++++---------- dist/soul-with-nlg.el | 15 +++ routes.el | 47 ++++++++- soul.el | 68 ++++++------ 4 files changed, 283 insertions(+), 87 deletions(-) diff --git a/chat.el b/chat.el index 578f67c..5e96a68 100644 --- a/chat.el +++ b/chat.el @@ -416,6 +416,46 @@ fn engram_extract_ids(nodes_json: String) -> String { // A proper cache/circuit-breaker requires C runtime support (e.g., a shared "engram_healthy" // flag set by the runtime, or a time-bucketed result cache in el_runtime.c). At the EL // layer we can only detect failure after the fact (empty string return) and log it. +// affective_node_ts — unix timestamp of an affective node (BellEvent / PositiveEvent). +// +// Prefers the " | ts:" marker auto_persist writes into the node content; falls back +// to created_at / updated_at. Returns 0 when there is no usable timestamp, which every +// caller already treats as "too old to surface". +// +// ─── ELC CODEGEN NOTE — THIS MUST STAY A TOP-LEVEL FUNCTION ─────────────────────────── +// Do not inline this back into a block-expression initializer. Written inline as +// let start: Int = pos + str_len(marker) +// inside a `let x: String = if cond { ... }` initializer, elc loses the declared Int type +// and emits el_str_concat() for the `+`. el_str_concat takes the C string of each operand, +// so two integers become a wild pointer and the daemon SEGFAULTS (EXC_BAD_ACCESS in +// strlen). The identical expression in a plain function body compiles to integer addition +// — verified in the generated C both ways. This is the same defect family Will hit on +// 2026-06-23 and solved the same way (aff_try_slot, soul.el). +// +// Six inline copies of this parser existed before this function: two in layered_cycle's +// L2c, two in engram_compile below, two in affective_context_prefix. All six emitted the +// bad concat and all six now call here. Full write-up: BUG-PLAINCHAT-1 in +// _engine-plainchat-20260805/README.md and the PR that introduced this function. +// ────────────────────────────────────────────────────────────────────────────────────── +fn affective_node_ts(node_json: String) -> Int { + if str_eq(node_json, "") { return 0 } + let content: String = json_get(node_json, "content") + let marker: String = " | ts:" + let mpos: Int = str_index_of(content, marker) + if mpos < 0 { + let ca: String = json_get(node_json, "created_at") + let alt: String = if str_eq(ca, "") { json_get(node_json, "updated_at") } else { ca } + if !engram_numeric_valid(alt) { return 0 } + return str_to_int(alt) + } + let start: Int = mpos + str_len(marker) + let rest: String = str_slice(content, start, str_len(content)) + let nxt: Int = str_index_of(rest, " | ") + let raw: String = if nxt < 0 { rest } else { str_slice(rest, 0, nxt) } + if !engram_numeric_valid(raw) { return 0 } + return str_to_int(raw) +} + fn engram_compile(intent: String) -> String { // Issue 1: decompose multi-topic messages into sub-queries. let topics: String = engram_split_topics(intent) @@ -519,20 +559,9 @@ fn engram_compile(intent: String) -> String { let cutoff_ts: Int = now_ts - 1209600 let recent_bell: String = if bell_ok { let bn0: String = json_array_get(bell_nodes, 0) - 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 } - } - // Q1 fix: validate bell timestamp before str_to_int. - let bn_ts: Int = if !engram_numeric_valid(bn_ts_raw) { 0 } else { str_to_int(bn_ts_raw) } + // Q1 fix (validate before str_to_int) now lives inside affective_node_ts, which + // also replaces the inline " | ts:" parser that miscompiled to el_str_concat here. + let bn_ts: Int = affective_node_ts(bn0) if bn_ts > cutoff_ts { bn0 } else { "" } } else { "" } // Positive emotion context: check for recent joy/success moments within 72h. @@ -540,19 +569,7 @@ fn engram_compile(intent: String) -> String { let pos_ec_ok: Bool = !str_eq(pos_ec_nodes, "") && !str_eq(pos_ec_nodes, "[]") let recent_positive_ec: String = if pos_ec_ok { let pec0: String = json_array_get(pos_ec_nodes, 0) - let pec_content: String = json_get(pec0, "content") - let pec_ts_marker: String = " | ts:" - let pec_ts_pos: Int = str_index_of(pec_content, pec_ts_marker) - let pec_ts_raw: String = if pec_ts_pos >= 0 { - let pec_ts_start: Int = pec_ts_pos + str_len(pec_ts_marker) - let pec_rest: String = str_slice(pec_content, pec_ts_start, str_len(pec_content)) - let pec_next: Int = str_index_of(pec_rest, " | ") - if pec_next < 0 { pec_rest } else { str_slice(pec_rest, 0, pec_next) } - } else { - let pec_ca: String = json_get(pec0, "created_at") - if str_eq(pec_ca, "") { json_get(pec0, "updated_at") } else { pec_ca } - } - let pec_ts: Int = if str_eq(pec_ts_raw, "") { 0 } else { str_to_int(pec_ts_raw) } + let pec_ts: Int = affective_node_ts(pec0) if pec_ts > cutoff_ts { pec0 } else { "" } } else { "" } let affective_part: String = if !str_eq(recent_bell, "") { @@ -768,7 +785,12 @@ fn build_system_prompt(ctx: String, chat_mode: Bool) -> String { safety_addendum } - return identity + operator_section + date_line + voice_rules + security_rules + capability_rules + bounded_persona_block + identity_block + affective_boot_block + engram_block + safety_block + // BUG FIX 2026-08-05: no_tools_rule was computed above and then never concatenated into + // this return, so the "[NO TOOLS THIS TURN]" instruction has not actually reached a model + // in this revision — the chat_mode flag had no effect on the prompt. Restored here, in the + // permanent-rules group, immediately after capability_rules (the rule it qualifies). + // Zero effect on agentic paths: they pass chat_mode=false, so no_tools_rule is "". + return identity + operator_section + date_line + voice_rules + security_rules + capability_rules + no_tools_rule + bounded_persona_block + identity_block + affective_boot_block + engram_block + safety_block } fn hist_append(hist: String, role: String, content: String) -> String { @@ -929,6 +951,123 @@ fn conv_history_load() -> String { return content } +// conv_history_record — append one completed turn to the conversation window. +// +// Same window, same append, same bell-guarded eviction handle_chat uses inline. It exists +// as a function so the layered_cycle path records turns through exactly this code instead +// of growing a second copy that can drift away from the bell guard. +// +// CONTRACT: assistant_msg MUST be post-safety_validate text. Recording the validated text +// rather than the raw model output means the history window can never replay something the +// output gate replaced or augmented. Callers on a hard bell must not call this at all — +// bell turns are kept out of conversation history by design (see layered_cycle). +fn conv_history_record(user_msg: String, assistant_msg: String) -> Void { + if str_eq(user_msg, "") { return "" } + let state_hist: String = state_get("conv_history") + let stored_hist: String = if str_eq(state_hist, "") { conv_history_load() } else { state_hist } + let h1: String = hist_append(stored_hist, "user", user_msg) + let h2: String = hist_append(h1, "assistant", assistant_msg) + // Bell-guarded trim: an evicted turn that triggered a bell is preserved to engram + // before it leaves the in-memory window. + let final_hist: String = if json_array_len(h2) > 20 { + hist_trim_with_bell_guard(h2) + } else { + h2 + } + state_set("conv_history", final_hist) + conv_history_persist(final_hist) +} + +// conv_history_block — recent dialogue, rendered for a system prompt. +// +// Same rendering handle_chat uses (role label + snipped content, one line per turn), read +// from the same "conv_history" window, so a plain-chat turn can follow the thread instead +// of answering every message from cold. Read-only: never writes history. +fn conv_history_block() -> String { + 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) } + if hist_len == 0 { + return "" + } + let rh_out: String = "" + let rh_i: Int = 0 + while rh_i < hist_len { + let rh_entry: String = json_array_get(stored_hist, rh_i) + let rh_role: String = json_get(rh_entry, "role") + let rh_content: String = json_get(rh_entry, "content") + let rh_label: String = if str_eq(rh_role, "user") { "User" } else { "Assistant" } + let rh_snip: String = if str_len(rh_content) > 400 { str_slice(rh_content, 0, 400) + "..." } else { rh_content } + let rh_line: String = rh_label + ": " + rh_snip + let rh_out = if str_eq(rh_out, "") { rh_line } else { rh_out + "\n" + rh_line } + let rh_i = rh_i + 1 + } + return "\n\n[RECENT CONVERSATION — last " + int_to_str(hist_len) + " turns]\n" + rh_out +} + +// layered_generate — the L3 generation step of layered_cycle. This is where the imprint +// SPEAKS. (Added 2026-08-05.) +// +// layered_cycle calls this immediately after imprint_respond(), which has already applied +// the active imprint's voice/domain annotation to the steward-aligned input. Before this +// existed, L3 ended at that annotation and layered_cycle handed the user's own text back +// as the "reply" — every gate ran, but nothing ever generated. +// +// It lives in chat.el, not imprint.el, on purpose: imprint.el is L3 and declares that the +// lower layers are structurally inaccessible from it. It has zero imports, and making it +// reach chat.el would transitively pull in safety.el (L1), inverting the layering and +// breaking the tests that link imprint.el on its own. The layer ORDER is enforced by +// layered_cycle, which is the only caller; this function holds no layer authority. +// +// SAFETY CONTRACT — this function is NOT a gate and must never become one: +// - Everything upstream has already run inside layered_cycle: L1 safety_screen, the +// safe-mode guard, the hard-bell short-circuit, L2a continuity/profiling, L2b mission +// alignment, L2c affective context. A hard bell can never reach this function — +// layered_cycle returns the fixed crisis message before L3 is entered. +// - Everything downstream is safety_validate(), which layered_cycle applies to this +// function's return value. Nothing here may bypass it, so this always returns plain +// text: no JSON envelope, no escaping, nothing for the output gate to have to unwrap. +// - The bell directive layered_cycle computed with safety_augment_system() is parked in +// the state key "layered_cycle_safety_system_addendum", and build_system_prompt() is +// its designated consumer. That is why the system prompt is assembled through +// build_system_prompt() here rather than hand-rolled: routing around it would drop the +// soft-bell / crisis directive on the floor. safety_augment_system() is NOT called +// again here — one evaluation per turn, one InternalStateEvent per bell. +// - No affective_context_prefix() call either: L2c already folded the affective note +// into that same addendum, and injecting it twice would double the cue. +// +// TOOLS: none, structurally. build_system_prompt(ctx, true) is chat mode, which injects +// the permanent "NO TOOLS THIS TURN" rule, and llm_call_system() is a plain /v1/messages +// call whose request body is built in el_runtime.c (llm_provider_request) with no "tools" +// and no "tool_choice" key at all. Tools:Off means no tool is offered to the model, not +// merely that none is used. +// +// Returns "" when the model call fails, so the caller reports the failure honestly instead +// of echoing the user's own text back at them. +fn layered_generate(prompt: String, imprint_id: String) -> String { + if str_eq(prompt, "") { + return "" + } + + let ctx: String = engram_compile(prompt) + let model: String = chat_default_model() + let base_system: String = build_system_prompt(ctx, true) + current_engine_note(model) + let hist_block: String = conv_history_block() + let full_system: String = base_system + hist_block + + let raw: String = llm_call_system(model, full_system, prompt) + + let is_error: Bool = str_starts_with(raw, "{\"error\"") + || str_starts_with(raw, "{\"type\":\"error\"") + || str_contains(raw, "authentication_error") + if is_error { + println("[chat] layered_generate: model call failed — returning empty so the caller can report it honestly") + return "" + } + + return clean_llm_response(raw) +} + // session_preload_bullets — render up to max_bullets nodes from a JSON array as // bullet lines, truncating content at snip_len chars each. fn session_preload_bullets(nodes: String, max_bullets: Int, snip_len: Int) -> String { @@ -969,19 +1108,7 @@ fn affective_context_prefix() -> String { } else { if has_dist_aff { let dn0: String = json_array_get(dist_nodes_aff, 0) - let dn_content: String = json_get(dn0, "content") - let daff_marker: String = " | ts:" - let daff_pos: Int = str_index_of(dn_content, daff_marker) - let daff_ts_str: String = if daff_pos >= 0 { - let daff_start: Int = daff_pos + str_len(daff_marker) - let daff_rest: String = str_slice(dn_content, daff_start, str_len(dn_content)) - let daff_next: Int = str_index_of(daff_rest, " | ") - if daff_next < 0 { daff_rest } else { str_slice(daff_rest, 0, daff_next) } - } else { - let daff_ca: String = json_get(dn0, "created_at") - if str_eq(daff_ca, "") { json_get(dn0, "updated_at") } else { daff_ca } - } - let daff_ts: Int = if str_eq(daff_ts_str, "") { 0 } else { str_to_int(daff_ts_str) } + let daff_ts: Int = affective_node_ts(dn0) daff_ts > aff_cutoff } else { false } } @@ -989,19 +1116,7 @@ fn affective_context_prefix() -> String { let has_pos_aff: Bool = !str_eq(pos_nodes_aff, "") && !str_eq(pos_nodes_aff, "[]") let found_recent_pos: Bool = if has_pos_aff && !found_recent_dist { let pn0: String = json_array_get(pos_nodes_aff, 0) - let pn_content: String = json_get(pn0, "content") - let paff_marker: String = " | ts:" - let paff_pos: Int = str_index_of(pn_content, paff_marker) - let paff_ts_str: String = if paff_pos >= 0 { - let paff_start: Int = paff_pos + str_len(paff_marker) - let paff_rest: String = str_slice(pn_content, paff_start, str_len(pn_content)) - let paff_next: Int = str_index_of(paff_rest, " | ") - if paff_next < 0 { paff_rest } else { str_slice(paff_rest, 0, paff_next) } - } else { - let paff_ca: String = json_get(pn0, "created_at") - if str_eq(paff_ca, "") { json_get(pn0, "updated_at") } else { paff_ca } - } - let paff_ts: Int = if str_eq(paff_ts_str, "") { 0 } else { str_to_int(paff_ts_str) } + let paff_ts: Int = affective_node_ts(pn0) paff_ts > aff_cutoff } else { false } let affective_out: String = if found_recent_dist { @@ -1014,6 +1129,23 @@ fn affective_context_prefix() -> String { return affective_out } +// ───────────────────────────────────────────────────────────────────────────── +// handle_chat — UNWIRED. DO NOT ROUTE /api/chat HERE. (annotated 2026-08-05) +// +// This was the non-agentic chat handler until 2026-06-11 (f52d5bd, "wire consciousness +// layers"), when Will moved /api/chat onto layered_cycle. It has had zero call sites since. +// +// It must stay unwired: it has NO enforcing input gate and NO enforcing output gate. +// It never calls safety_screen, so a hard bell would reach the model instead of being +// refused; it never calls safety_validate, the only enforcing output gate in the codebase; +// and it runs no stewardship layer. Its one safety touch, safety_augment_system at the +// llm_call_system site below, is an advisory system-prompt string — it cannot refuse, +// replace, or block anything. +// +// Plain chat generates through layered_cycle's L3 (layered_generate) instead, which keeps +// the screen, the stewardship layers and the output gate wrapped around the model call. +// If this function is ever revived, it must be gated first, not wired first. +// ───────────────────────────────────────────────────────────────────────────── fn handle_chat(body: String) -> String { let message: String = json_get(body, "message") if str_eq(message, "") { diff --git a/dist/soul-with-nlg.el b/dist/soul-with-nlg.el index 2042930..80da1d4 100644 --- a/dist/soul-with-nlg.el +++ b/dist/soul-with-nlg.el @@ -1,3 +1,18 @@ +// ╔══════════════════════════════════════════════════════════════════════════╗ +// ║ STALE BUNDLE — DO NOT BUILD. UNSAFE CHAT PATH. ║ +// ╚══════════════════════════════════════════════════════════════════════════╝ +// This concatenated bundle is a snapshot, not a source of truth, and it is stale in +// a way that matters for safety: it wires /api/chat straight to handle_chat and +// contains NO layered_cycle at all (verified: zero occurrences in the bundled code — +// the only textual hit in this file is this banner). A binary built from +// this file would run chat with no enforcing input gate (no safety_screen, no +// hard-bell short-circuit) and no enforcing output gate (no safety_validate). +// +// Build from the .el sources via manifest.el (entry soul.el), or from dist/soul.c. +// Nothing in the repo references this file. It is kept only as a historical artifact +// and should be deleted once Will confirms nothing external depends on it. +// (Flagged 2026-08-04 in _engine-websearch-20260804/SAFETY-STOP.md; banner added +// 2026-08-05 with the plain-chat generation fix.) // language-profile.el - Language profile data and accessors. // // A language profile is a slot map ([String] key-value list) describing the diff --git a/routes.el b/routes.el index e4139c4..73186b3 100644 --- a/routes.el +++ b/routes.el @@ -15,6 +15,40 @@ fn flag_true(body: String, key: String) -> Bool { return json_get_bool(body, key) || json_get_int(body, key) > 0 } +// --------------------------------------------------------------------------- +// plain_chat_envelope — the JSON response contract for a non-agentic ("Tools: Off") +// chat turn. Every /api/chat dispatch that calls layered_cycle goes through here, so +// the three call sites cannot drift apart. +// +// WHY THE ENVELOPE IS BUILT HERE AND NOT INSIDE layered_cycle: +// layered_cycle returns the user-facing text AFTER safety_validate has acted on it. +// Keeping the JSON out of the cycle means the output gate always sees raw model text +// and never an escaped blob — there is nothing to unwrap and re-wrap on the crisis +// path, which is exactly the failure mode that made wiring handle_chat unsafe. +// Escaping is the last thing that happens, strictly after the gate. +// +// FIELDS: `reply` and `response` carry the same validated text. Both are required by +// live clients — the desktop app reads `reply` first (DaemonClient.parseChatResponse), +// while the CLI tools and the Telegram gateway read `response` (the gateway reads only +// `response`). Emitting one would break the other. +// +// EMPTY MEANS FAILURE, NOT AN EMPTY ANSWER: a hard bell returns the fixed crisis +// message and a soft bell is padded to non-empty by safety_validate, so the only way +// an empty string leaves the cycle is a failed model call. It is reported as an error +// rather than dressed up as a successful blank reply. +// --------------------------------------------------------------------------- +fn plain_chat_envelope(validated: String, model: String) -> String { + if str_eq(validated, "") { + return "{\"error\":\"llm unavailable\",\"reply\":\"\",\"response\":\"\",\"agentic\":false,\"tools_used\":[]}" + } + let safe: String = json_safe(validated) + return "{\"reply\":\"" + safe + "\"" + + ",\"response\":\"" + safe + "\"" + + ",\"model\":\"" + json_safe(model) + "\"" + + ",\"agentic\":false" + + ",\"tools_used\":[]}" +} + // --------------------------------------------------------------------------- // Rate limiting — simple in-memory per-IP sliding window counter. // @@ -243,8 +277,11 @@ fn handle_dharma_recv(body: String) -> String { } else if agentic_flag { handle_chat_agentic(chat_body) } else { + // Non-agentic ("Tools: Off"): the full L1→L2→L3→L1 cycle, which now generates + // at L3 instead of echoing. Envelope built outside the cycle — see + // plain_chat_envelope. let screened_reply: String = layered_cycle(raw_msg) - screened_reply + plain_chat_envelope(screened_reply, chat_default_model()) } auto_persist(chat_body, reply) return reply @@ -416,8 +453,9 @@ fn handle_request(method: String, path: String, body: String) -> String { } else if agentic_flag { handle_chat_agentic(body) } else { + // Non-agentic ("Tools: Off") — same cycle and same envelope as POST. let screened_reply: String = layered_cycle(eff_msg) - screened_reply + plain_chat_envelope(screened_reply, chat_default_model()) } auto_persist(body, reply) return reply @@ -580,8 +618,11 @@ fn handle_request(method: String, path: String, body: String) -> String { } else if agentic_flag { handle_chat_agentic(body) } else { + // Non-agentic ("Tools: Off") — the app's DEFAULT mode (AgentMode.NEVER). + // Full L1→L2→L3→L1 cycle with real generation at L3; envelope built + // outside the cycle so safety_validate always sees raw text. let screened_reply: String = layered_cycle(raw_msg) - screened_reply + plain_chat_envelope(screened_reply, chat_default_model()) } auto_persist(body, reply) return reply diff --git a/soul.el b/soul.el index 55b5efc..20f0163 100644 --- a/soul.el +++ b/soul.el @@ -453,40 +453,24 @@ fn layered_cycle(raw_input: String) -> String { let lc_aff_cutoff: Int = time_now() - 259200 let lc_bell_nodes: String = engram_search_json("bell:soft bell:hard BellEvent affective", 2) let lc_has_bell: Bool = !str_eq(lc_bell_nodes, "") && !str_eq(lc_bell_nodes, "[]") + // CRASH FIX 2026-08-05 (BUG-PLAINCHAT-1): the " | ts:" parser used to be inline here. + // Inside this block-expression initializer elc compiled `lbmp + str_len(lbm)` to + // el_str_concat() on two integers, which segfaulted the whole daemon the moment a + // distress turn followed an earlier affective turn — i.e. exactly on the crisis path. + // Verified against the unmodified baseline binary AND present in the committed + // dist/soul.c. affective_node_ts() is a top-level function, where the same expression + // compiles to integer addition. Do not inline it back. let lc_bell_note: String = if lc_has_bell { let lb0: String = json_array_get(lc_bell_nodes, 0) - let lb_c: String = json_get(lb0, "content") - let lbm: String = " | ts:" - let lbmp: Int = str_index_of(lb_c, lbm) - let lb_ts_raw: String = if lbmp >= 0 { - let lbs: Int = lbmp + str_len(lbm) - let lbr: String = str_slice(lb_c, lbs, str_len(lb_c)) - let lbn: Int = str_index_of(lbr, " | ") - if lbn < 0 { lbr } else { str_slice(lbr, 0, lbn) } - } else { - let lbca: String = json_get(lb0, "created_at") - if str_eq(lbca, "") { json_get(lb0, "updated_at") } else { lbca } - } - let lb_ts: Int = if str_eq(lb_ts_raw, "") { 0 } else { str_to_int(lb_ts_raw) } + let lb_ts: Int = affective_node_ts(lb0) if lb_ts > lc_aff_cutoff { "[AFFECTIVE NOTE: User was in distress in a recent session.]" } else { "" } } else { "" } let lc_pos_nodes: String = engram_search_json("PositiveEvent joy:high joy:low affective", 2) let lc_has_pos: Bool = !str_eq(lc_pos_nodes, "") && !str_eq(lc_pos_nodes, "[]") + // Same crash fix as the bell note above (BUG-PLAINCHAT-1). let lc_pos_note: String = if lc_has_pos && str_eq(lc_bell_note, "") { let lp0: String = json_array_get(lc_pos_nodes, 0) - let lp_c: String = json_get(lp0, "content") - let lpm: String = " | ts:" - let lpmp: Int = str_index_of(lp_c, lpm) - let lp_ts_raw: String = if lpmp >= 0 { - let lps: Int = lpmp + str_len(lpm) - let lpr: String = str_slice(lp_c, lps, str_len(lp_c)) - let lpn: Int = str_index_of(lpr, " | ") - if lpn < 0 { lpr } else { str_slice(lpr, 0, lpn) } - } else { - let lpca: String = json_get(lp0, "created_at") - if str_eq(lpca, "") { json_get(lp0, "updated_at") } else { lpca } - } - let lp_ts: Int = if str_eq(lp_ts_raw, "") { 0 } else { str_to_int(lp_ts_raw) } + let lp_ts: Int = affective_node_ts(lp0) if lp_ts > lc_aff_cutoff { "[AFFECTIVE NOTE: User shared positive news in a recent session.]" } else { "" } } else { "" } let lc_affective_note: String = if !str_eq(lc_bell_note, "") { lc_bell_note } else { lc_pos_note } @@ -498,11 +482,35 @@ fn layered_cycle(raw_input: String) -> String { } state_set("layered_cycle_safety_system_addendum", augmented_addendum) - // L3: imprint responds - let output: String = imprint_respond(aligned, imprint_id) + // L3: imprint responds — applies the active imprint's voice/domain annotation to the + // steward-aligned input. This produces the PROMPT, not the answer. + let prompt: String = imprint_respond(aligned, imprint_id) - // L1 out: validate output before delivery - return safety_validate(output, screen_action) + // L3b: the imprint SPEAKS (added 2026-08-05). + // + // Until now the cycle stopped at the annotation above, so /api/chat with agentic:false + // handed the user's own screened text back as the "reply" — every gate ran, but nothing + // ever generated. The generation is placed HERE, inside the cycle, rather than by + // pointing the route at handle_chat(): handle_chat has no enforcing input gate and no + // enforcing output gate, so calling it instead of this cycle would have traded the whole + // safety pipeline for a working reply. Composing keeps both. + // + // Order is deliberate and must not be rearranged: this call sits strictly AFTER the L1 + // screen, the safe-mode guard, the hard-bell short-circuit and the L2 stewardship layers, + // and strictly BEFORE the L1 output gate. A hard bell never reaches a model — the branch + // above returns first. Tools are not offered on this turn; see layered_generate. + let output: String = layered_generate(prompt, imprint_id) + + // L1 out: validate output before delivery. Still the terminal gate — nothing below this + // line can change the string this function returns. + let validated: String = safety_validate(output, screen_action) + + // Turn bookkeeping. Records the VALIDATED text, never the raw model output, and is only + // reachable on the non-bell path: both bell branches above return before this point, so + // bell turns still never enter conversation history. Pure state side effect — it cannot + // alter what is returned. + conv_history_record(raw_input, validated) + return validated } let soul_cgi_id_raw: String = env("SOUL_CGI_ID")