feat(connectors): /api/connectors/call — proxy a connector tool call (pre-chat)

Adds /api/connectors/call -> connectd /mcp/call, so the app can invoke a connector tool (e.g. WhatsApp
get_pairing_qr / get_login_status for the pairing UI) through the soul, keeping app->soul->connectd
intact (UI never hits connectd directly) and working for future remote/hosted clients. elc-clean.
NOTE: soul-core change — needs dist/soul.c regen (Will), can ride the same rebuild as PR #56.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.gitea/workflows/ci.yaml

@@ -9,11 +9,23 @@ on:
       - main
   workflow_dispatch:
 
+# Same group as deploy-gke so builds and deploys queue behind each other.
+# Prevents concurrent Docker daemon exhaustion on the single GCE runner.
+concurrency:
+  group: neuron-runner
+  cancel-in-progress: false
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Free disk space
+        run: |
+          df -h /
+          docker system prune -af --volumes 2>/dev/null || true
+          df -h /
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -91,46 +103,41 @@ jobs:
           echo "El SDK ready"
           /opt/el/dist/platform/elc --version || true
 
-      - name: Generate ELP master declarations header
-        run: |
-          {
-            printf '/* Auto-generated C forward declarations for ELP cross-module calls */\n'
-            printf '#pragma once\n'
-            printf '#include "el_runtime.h"\n'
-            printf '\n'
-            grep -h -E '^(el_val_t|void|int|char\*|const char\*)[[:space:]]+[a-zA-Z_][a-zA-Z0-9_]*[[:space:]]*\(' dist/*.c 2>/dev/null \
-              | grep ';$' | sort -u
-          } > dist/elp-c-decls.h
-          echo "Generated elp-c-decls.h with $(grep -c ';' dist/elp-c-decls.h 2>/dev/null || echo 0) declarations"
-
       - name: Build neuron soul binary
         run: |
           ELB=/opt/el/dist/bin/elb
           ELC=/opt/el/dist/platform/elc
           RUNTIME=/opt/el/runtime
 
-          # Compile all El modules to C.
-          # This step will fail at link on Linux: the El compiler inlines imported
-          # modules into each module's .c file, producing duplicate strong symbol
-          # definitions. GNU ld rejects these; macOS ld accepts them silently.
-          # We capture the link failure and re-link manually below.
+          # Preserve the pre-compiled dist/soul.c from the repo before running elb.
+          # elb may overwrite it during compilation; we always want the repo version
+          # since it contains the patched self-contained translation unit (all modules
+          # inlined, workspace scope fix, agentic dedup fix, etc.).
+          cp dist/soul.c /tmp/soul.c.prebuilt
+
+          # Compile all El modules to C via elb.
+          # elb fails at link on Linux (GNU ld rejects duplicate strong symbols that
+          # macOS ld accepts silently) — that's expected and captured with || true.
           $ELB --elc=$ELC --runtime=$RUNTIME/el_runtime.c || true
 
-          # Re-link with soul.c listed first so its real main() (from the cgi block)
-          # wins over the stub main()s generated in every other module.
-          # --allow-multiple-definition tells GNU ld to pick the first definition
-          # for each duplicate symbol — safe here because all duplicates are identical
-          # (same El source compiled independently into multiple .c files).
+          # Restore the repo's self-contained soul.c — elb may have overwritten it
+          # with a partial (non-inlined) version that lacks module-level definitions.
+          cp /tmp/soul.c.prebuilt dist/soul.c
+
+          # Compile the self-contained translation unit.  No --allow-multiple-definition
+          # needed since soul.c inlines all modules.
           mkdir -p dist
-          OTHER_C=$(ls dist/*.c | grep -v '/soul\.c$' | sort | tr '\n' ' ')
           cc -O2 -DHAVE_CURL \
             -I$RUNTIME \
-            dist/soul.c $OTHER_C \
+            dist/soul.c \
             $RUNTIME/el_runtime.c \
             -lssl -lcrypto -lcurl -lpthread -lm \
-            -Wl,--allow-multiple-definition \
             -o dist/neuron
 
+          # Strip debug symbols and non-essential symbol table entries.
+          # -s removes the symbol table + relocation info (max size reduction).
+          # Keeps the binary functional; debuggability is preserved via source + CI logs.
+          strip -s dist/neuron
           ls -lh dist/neuron
 
       - name: Smoke test

.gitea/workflows/deploy-gke.yaml

@@ -18,11 +18,27 @@ on:
         required: false
         default: "green"
 
+# Serialize all builds on this runner — concurrent jobs exhaust the Docker daemon.
+# A queued deploy runs after the in-progress build finishes.
+concurrency:
+  group: neuron-runner
+  cancel-in-progress: false
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
 
+    env:
+      USE_GKE_GCLOUD_AUTH_PLUGIN: "True"
+
     steps:
+      - name: Free disk space
+        run: |
+          df -h /
+          docker system prune -af --volumes 2>/dev/null || true
+          rm -rf /tmp/.act-* /tmp/act-* 2>/dev/null || true
+          df -h /
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -53,7 +69,14 @@ jobs:
       - name: Determine image tag and slot
         id: vars
         run: |
-          SHA="${GITEA_SHA:0:8}"
+          # GITEA_SHA is set by the Gitea runner; fall back to GITHUB_SHA for
+          # compatibility with older Forgejo/Gitea versions.
+          RAW_SHA="${GITEA_SHA:-${GITHUB_SHA:-}}"
+          SHA="${RAW_SHA:0:8}"
+          if [ -z "$SHA" ]; then
+            # Last resort: read from git directly
+            SHA=$(git rev-parse --short=8 HEAD 2>/dev/null || echo "unknown")
+          fi
           IMAGE="us-central1-docker.pkg.dev/neuron-785695/neuron-api/neuron-soul:${SHA}"
           echo "sha=${SHA}" >> "$GITEA_OUTPUT"
           echo "image=${IMAGE}" >> "$GITEA_OUTPUT"
@@ -85,6 +108,66 @@ jobs:
           echo "slot=${SLOT}" >> "$GITEA_OUTPUT"
           echo "  Deploying to slot: ${SLOT}"
 
+      - name: Prepare build artifacts
+        run: |
+          # Pre-download soul binary and El SDK so the Dockerfile can COPY them
+          # from the build context instead of authenticating inside the build.
+          mkdir -p build-artifacts
+
+          # ── soul binary ────────────────────────────────────────────────────────
+          # ci.yaml publishes the soul binary to foundation-prod on every push.
+          # Download the latest version (the one just built by ci.yaml).
+          SOUL_VER=$(gcloud artifacts versions list \
+            --repository=foundation-prod \
+            --location=us-central1 \
+            --project=neuron-785695 \
+            --package=neuron-soul \
+            --sort-by="~createTime" \
+            --limit=1 \
+            --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}')
+          echo "Downloading neuron-soul@${SOUL_VER}"
+          gcloud artifacts generic download \
+            --repository=foundation-prod \
+            --location=us-central1 \
+            --project=neuron-785695 \
+            --package=neuron-soul \
+            --version="${SOUL_VER}" \
+            --destination=build-artifacts/
+          mv build-artifacts/neuron* build-artifacts/neuron 2>/dev/null || true
+          chmod +x build-artifacts/neuron
+
+          # ── El SDK (for engram source compilation inside the build) ────────────
+          ELC_VER=$(gcloud artifacts versions list \
+            --repository=foundation-prod --location=us-central1 --project=neuron-785695 \
+            --package=el-elc --sort-by="~createTime" --limit=1 \
+            --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}')
+          gcloud artifacts generic download \
+            --repository=foundation-prod --location=us-central1 --project=neuron-785695 \
+            --package=el-elc --version="${ELC_VER}" --destination=build-artifacts/
+          mv build-artifacts/elc* build-artifacts/elc 2>/dev/null || true
+          chmod +x build-artifacts/elc
+
+          RC_VER=$(gcloud artifacts versions list \
+            --repository=foundation-prod --location=us-central1 --project=neuron-785695 \
+            --package=el-runtime-c --sort-by="~createTime" --limit=1 \
+            --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}')
+          gcloud artifacts generic download \
+            --repository=foundation-prod --location=us-central1 --project=neuron-785695 \
+            --package=el-runtime-c --version="${RC_VER}" --destination=build-artifacts/
+          mv build-artifacts/el_runtime.c* build-artifacts/el_runtime.c 2>/dev/null || true
+
+          RH_VER=$(gcloud artifacts versions list \
+            --repository=foundation-prod --location=us-central1 --project=neuron-785695 \
+            --package=el-runtime-h --sort-by="~createTime" --limit=1 \
+            --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}')
+          gcloud artifacts generic download \
+            --repository=foundation-prod --location=us-central1 --project=neuron-785695 \
+            --package=el-runtime-h --version="${RH_VER}" --destination=build-artifacts/
+          mv build-artifacts/el_runtime.h* build-artifacts/el_runtime.h 2>/dev/null || true
+
+          echo "Build artifacts ready:"
+          ls -lh build-artifacts/
+
       - name: Clone engram source for Docker build context
         run: |
           # The Dockerfile builds engram from source (no published AR package).
@@ -95,16 +178,13 @@ jobs:
           echo "Engram source ready at ./engram/src/server.el"
 
       - name: Build and push Docker image
-        env:
-          GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
         run: |
           IMAGE="${{ steps.vars.outputs.image }}"
-          SHA="${{ steps.vars.outputs.sha }}"
 
           echo "Building ${IMAGE}..."
+          # No --secret needed: artifacts are pre-downloaded into build-artifacts/
+          # and the Dockerfile uses COPY to include them.
           docker build \
-            --build-arg SOUL_VERSION="${SHA}" \
-            --secret id=gcp_sa_key,env=GCP_SA_KEY \
             --tag "${IMAGE}" \
             --tag "us-central1-docker.pkg.dev/neuron-785695/neuron-api/neuron-soul:latest" \
             .
@@ -120,13 +200,40 @@ jobs:
             --image "${{ steps.vars.outputs.image }}" \
             --slot "${{ steps.vars.outputs.slot }}"
 
+      - name: Update infrastructure manifests
+        if: success()
+        env:
+          INFRA_GIT_TOKEN: ${{ secrets.INFRA_GIT_TOKEN }}
+        run: |
+          SLOT="${{ steps.vars.outputs.slot }}"
+          if [ "$SLOT" = "blue" ]; then IDLE="green"; else IDLE="blue"; fi
+
+          git clone "http://${INFRA_GIT_TOKEN}@34.31.145.131/neuron-technologies/infrastructure.git" \
+            --depth=1 --branch=main /tmp/infra-update
+
+          cd /tmp/infra-update
+
+          DEPLOY_DIR="platform/k8s/neuron-mcp"
+          sed -i "s/^  replicas: .*/  replicas: 1/" "${DEPLOY_DIR}/deployment-${SLOT}.yaml"
+          sed -i "s/^  replicas: .*/  replicas: 0/" "${DEPLOY_DIR}/deployment-${IDLE}.yaml"
+          echo "  deployment-${SLOT}.yaml: replicas set to 1"
+          echo "  deployment-${IDLE}.yaml: replicas set to 0"
+
+          git config user.email "ci@neurontechnologies.ai"
+          git config user.name "Neuron CI"
+          git add "${DEPLOY_DIR}/deployment-blue.yaml" "${DEPLOY_DIR}/deployment-green.yaml"
+          git diff --staged --quiet && { echo "No manifest changes needed"; exit 0; }
+          git commit -m "ci: neuron-mcp replica sync after blue-green swap to ${SLOT}"
+          git push origin main
+          echo "Infrastructure manifests updated: ${SLOT}=1, ${IDLE}=0"
+
       - name: Verify deployment
         run: |
           SLOT="${{ steps.vars.outputs.slot }}"
           echo "Verifying neuron-mcp-${SLOT} is healthy..."
           kubectl rollout status deployment/"neuron-mcp-${SLOT}" \
             --namespace=neuron-prod \
-            --timeout=3m
+            --timeout=8m
 
           echo "Active service endpoints:"
           kubectl get endpoints neuron-mcp -n neuron-prod

Dockerfile

@@ -1,108 +1,28 @@
 # Neuron Soul — GKE container image
 #
 # Build strategy:
-#   1. Download the pre-built linux/amd64 soul binary (package: neuron-soul)
-#      from Artifact Registry (foundation-dev).
-#   2. Download the El SDK from Artifact Registry and build engram from source
-#      (the neuron-technologies/engram repo is a git submodule). Engram has
-#      never been published as a standalone Artifact Registry package.
-#   3. Package both in an Ubuntu 24.04 runtime image (GLIBC 2.39 required by
-#      binaries compiled on Ubuntu 24.04 CI runners).
+#   1. CI pre-downloads all artifacts from Artifact Registry into build-artifacts/
+#      (neuron soul binary, El compiler, El runtime). No GCP credentials are needed
+#      inside the build — all AR access happens in the CI workflow before docker build.
+#   2. Build engram from source (neuron-technologies/engram, cloned by CI into ./engram/).
+#   3. Package soul + engram in an Ubuntu 24.04 runtime image (GLIBC 2.39).
 #   4. entrypoint.sh starts engram on :8742, waits for it to be healthy,
 #      then starts the soul with ENGRAM_URL pointing at it (HTTP mode).
 #
+# Expected build context layout (prepared by deploy-gke.yaml before docker build):
+#   build-artifacts/neuron         — pre-built linux/amd64 soul binary
+#   build-artifacts/elc            — El compiler (for engram source compilation)
+#   build-artifacts/el_runtime.c   — El C runtime
+#   build-artifacts/el_runtime.h   — El C runtime header
+#   engram/src/server.el           — engram source (cloned by CI)
+#   entrypoint.sh                  — container entrypoint
+#
 # Required env vars (injected via ExternalSecret at runtime):
 #   NEURON_PORT, NEURON_LLM_0_URL, NEURON_LLM_0_KEY, NEURON_LLM_0_FORMAT,
 #   SOUL_CGI_ID, SOUL_IDENTITY, NEURON_TOKEN, NEURON_API_URL, ENGRAM_URL,
 #   ENGRAM_DATA_DIR
 
-ARG SOUL_VERSION=latest
-
-# ── Stage 1: Download neuron-soul + El SDK from Artifact Registry ─────────────
-FROM ubuntu:24.04 AS downloader
-
-ARG SOUL_VERSION
-
-RUN apt-get update -qq && \
-    apt-get install -y --no-install-recommends \
-      ca-certificates \
-      curl \
-      gnupg \
-      apt-transport-https && \
-    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" \
-      > /etc/apt/sources.list.d/google-cloud-sdk.list && \
-    curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg \
-      | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
-    apt-get update -qq && \
-    apt-get install -y --no-install-recommends google-cloud-cli && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN --mount=type=secret,id=gcp_sa_key \
-    GCP_SA_KEY=$(cat /run/secrets/gcp_sa_key 2>/dev/null || echo "") && \
-    if [ -n "$GCP_SA_KEY" ]; then \
-      echo "$GCP_SA_KEY" > /tmp/gcp-key.json && \
-      gcloud auth activate-service-account --key-file=/tmp/gcp-key.json; \
-    fi && \
-    gcloud config set project neuron-785695 && \
-    mkdir -p /tmp/soul /tmp/el-sdk && \
-    \
-    # ── soul ──────────────────────────────────────────────────────────────── \
-    if [ "${SOUL_VERSION}" = "latest" ]; then \
-      SOUL_VER=$(gcloud artifacts versions list \
-        --repository=foundation-dev \
-        --location=us-central1 \
-        --project=neuron-785695 \
-        --package=neuron-soul \
-        --sort-by="~createTime" \
-        --limit=1 \
-        --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}'); \
-    else \
-      SOUL_VER="${SOUL_VERSION}"; \
-    fi && \
-    echo "Downloading neuron-soul@${SOUL_VER}" && \
-    gcloud artifacts generic download \
-      --repository=foundation-dev \
-      --location=us-central1 \
-      --project=neuron-785695 \
-      --package=neuron-soul \
-      --version="${SOUL_VER}" \
-      --destination=/tmp/soul/ && \
-    mv /tmp/soul/neuron* /tmp/soul/neuron 2>/dev/null || true && \
-    chmod +x /tmp/soul/neuron && \
-    \
-    # ── El SDK (needed to build engram from source) ────────────────────────── \
-    ELC_VER=$(gcloud artifacts versions list \
-      --repository=foundation-dev --location=us-central1 --project=neuron-785695 \
-      --package=el-elc --sort-by="~createTime" --limit=1 \
-      --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}') && \
-    gcloud artifacts generic download \
-      --repository=foundation-dev --location=us-central1 --project=neuron-785695 \
-      --package=el-elc --version="${ELC_VER}" --destination=/tmp/el-sdk/ && \
-    mv /tmp/el-sdk/elc* /tmp/el-sdk/elc 2>/dev/null || true && \
-    chmod +x /tmp/el-sdk/elc && \
-    \
-    RC_VER=$(gcloud artifacts versions list \
-      --repository=foundation-dev --location=us-central1 --project=neuron-785695 \
-      --package=el-runtime-c --sort-by="~createTime" --limit=1 \
-      --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}') && \
-    gcloud artifacts generic download \
-      --repository=foundation-dev --location=us-central1 --project=neuron-785695 \
-      --package=el-runtime-c --version="${RC_VER}" --destination=/tmp/el-sdk/ && \
-    mv /tmp/el-sdk/el_runtime.c* /tmp/el-sdk/el_runtime.c 2>/dev/null || true && \
-    \
-    RH_VER=$(gcloud artifacts versions list \
-      --repository=foundation-dev --location=us-central1 --project=neuron-785695 \
-      --package=el-runtime-h --sort-by="~createTime" --limit=1 \
-      --format="value(name)" 2>/dev/null | awk -F/ '{print $NF}') && \
-    gcloud artifacts generic download \
-      --repository=foundation-dev --location=us-central1 --project=neuron-785695 \
-      --package=el-runtime-h --version="${RH_VER}" --destination=/tmp/el-sdk/ && \
-    mv /tmp/el-sdk/el_runtime.h* /tmp/el-sdk/el_runtime.h 2>/dev/null || true && \
-    \
-    rm -f /tmp/gcp-key.json && \
-    echo "Downloads complete:" && ls -lh /tmp/soul/ /tmp/el-sdk/
-
-# ── Stage 2: Build engram from source ────────────────────────────────────────
+# ── Stage 1: Build engram from source ────────────────────────────────────────
 FROM ubuntu:24.04 AS engram-builder
 
 RUN apt-get update -qq && \
@@ -113,12 +33,13 @@ RUN apt-get update -qq && \
       libcurl4-openssl-dev && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=downloader /tmp/el-sdk/elc           /usr/local/bin/elc
-COPY --from=downloader /tmp/el-sdk/el_runtime.c  /usr/local/lib/el/el_runtime.c
-COPY --from=downloader /tmp/el-sdk/el_runtime.h  /usr/local/lib/el/el_runtime.h
+# El SDK pre-downloaded by CI into build-artifacts/
+COPY build-artifacts/elc           /usr/local/bin/elc
+COPY build-artifacts/el_runtime.c  /usr/local/lib/el/el_runtime.c
+COPY build-artifacts/el_runtime.h  /usr/local/lib/el/el_runtime.h
+RUN chmod +x /usr/local/bin/elc
 
-# engram source is expected at ./engram/src/server.el in the build context.
-# The deploy-gke.yaml CI must clone neuron-technologies/engram alongside this repo.
+# engram source cloned by CI into ./engram/
 COPY engram/src/server.el /build/src/server.el
 
 RUN mkdir -p /build/dist && \
@@ -133,7 +54,7 @@ RUN mkdir -p /build/dist && \
     echo "Built engram:" && ls -lh /build/dist/engram && \
     chmod +x /build/dist/engram
 
-# ── Stage 3: Runtime image ───────────────────────────────────────────────────
+# ── Stage 2: Runtime image ───────────────────────────────────────────────────
 # Ubuntu 24.04: GLIBC 2.39 satisfies both neuron-soul and engram binary deps.
 FROM ubuntu:24.04
 
@@ -145,9 +66,10 @@ RUN apt-get update -qq && \
     rm -rf /var/lib/apt/lists/* && \
     useradd -r -u 10000 -m -s /bin/bash soul
 
-COPY --from=downloader    /tmp/soul/neuron        /usr/local/bin/neuron
-COPY --from=engram-builder /build/dist/engram     /usr/local/bin/engram
-COPY entrypoint.sh                                /usr/local/bin/entrypoint.sh
+# soul binary pre-downloaded by CI into build-artifacts/
+COPY build-artifacts/neuron        /usr/local/bin/neuron
+COPY --from=engram-builder /build/dist/engram /usr/local/bin/engram
+COPY entrypoint.sh                 /usr/local/bin/entrypoint.sh
 
 RUN chmod +x /usr/local/bin/neuron /usr/local/bin/engram /usr/local/bin/entrypoint.sh
 

awareness.el

@@ -152,6 +152,27 @@ fn emit_heartbeat() -> Void {
 // a reserved/conflicting name in EL that compiles to EL_NULL at call sites.
 //
 // Returns true if any nodes were activated.
+// auto_term_try_slot — attempt to set cseed_auto from one WM slot.
+// Only writes to cseed_auto if node_type is Memory, BacklogItem, or Entity
+// AND the first word of the label is > 3 chars (guards bracket-prefixed labels).
+// Designed to be called in reverse slot order (highest index first) so that
+// the lowest-indexed slot (highest WM weight) wins by last-write semantics.
+fn auto_term_try_slot(slot_type: String, slot_lbl: String) -> Void {
+    state_set("_ats_ok", "0")
+    if str_eq(slot_type, "Memory") { state_set("_ats_ok", "1") }
+    if str_eq(slot_type, "BacklogItem") { state_set("_ats_ok", "1") }
+    if str_eq(slot_type, "Entity") { state_set("_ats_ok", "1") }
+    if str_eq(state_get("_ats_ok"), "1") {
+        if !str_eq(slot_lbl, "") {
+            let sp: Int = str_find_chars(slot_lbl, " :([")
+            if sp > 3 {
+                state_set("cseed_auto", str_slice(slot_lbl, 0, sp))
+            }
+        }
+    }
+    return ""
+}
+
 fn proactive_curiosity() -> Bool {
     let ts: Int = time_now()
     // Rotate seed set every minute using wall clock: (minutes_since_epoch) % 4.
@@ -210,26 +231,46 @@ fn proactive_curiosity() -> Bool {
     let found_c: Int = json_array_len(results_c)
     let found: Int = found_a + found_b + found_c
 
-    // WM-autobiographical 4th seed: extract the first word from the top working-memory
-    // node's label and activate it as an additional term. This creates a self-referencing
-    // curiosity loop — exploration radiates outward from whatever is most salient right now,
-    // mirroring the brain's default-mode-network resting-state dynamics. Breaks the fixed
-    // 4-set determinism that otherwise reinforces the same subgraph every rotation cycle.
+    // WM-autobiographical 4th seed: scan top-10 WM nodes for the highest-ranked
+    // non-Knowledge node. Extract its first word as an additional curiosity term.
+    // This creates a self-referencing curiosity loop — exploration radiates outward
+    // from whatever is most personally salient right now (Memory, BacklogItem, Entity),
+    // mirroring default-mode-network resting-state dynamics.
     //
-    // str_find_chars finds the first space/colon/bracket delimiter. sp > 3 guards against
-    // very short or bracket-prefixed labels like "[BacklogItem]" (sp=0, not > 3 → skipped).
-    // EL scoping: state_set/state_get pattern used because let inside if creates inner scope.
-    // (2026-06-11 self-review)
+    // WHY TOP-10 (2026-06-23 self-review): the old top-1 scan always returned a
+    // Knowledge node (WM is dominated by stable engram-metadata Knowledge nodes at
+    // position [0]). Verified: Memory nodes consistently appear at WM positions [1],[2]
+    // with wm ~0.59. Scanning top-10 reliably finds at least one Memory/BacklogItem/Entity.
+    // Out-of-bounds json_array_get returns "" → json_get("","...") returns "" →
+    // auto_term_try_slot is a no-op → safe for WM sets smaller than 10.
+    //
+    // NODE TYPE FILTER (2026-06-19): Knowledge nodes excluded as seeds — they create
+    // self-reinforcing loops (Knowledge node activates its own first word, stays dominant).
+    // Only Memory/BacklogItem/Entity carry live contextual salience worth radiating from.
+    //
+    // SLOT ORDER: call 9→0 so slot 0 (highest WM weight) wins by last-write semantics.
     state_set("cseed_auto", "")
-    let wm_top_j: String = engram_wm_top_json(1)
-    let wm_top_n: String = json_array_get(wm_top_j, 0)
-    let wm_top_lbl: String = json_get(wm_top_n, "label")
-    if !str_eq(wm_top_lbl, "") {
-        let sp: Int = str_find_chars(wm_top_lbl, " :([")
-        if sp > 3 {
-            state_set("cseed_auto", str_slice(wm_top_lbl, 0, sp))
-        }
-    }
+    let wm10: String = engram_wm_top_json(10)
+    let wm10_n9: String = json_array_get(wm10, 9)
+    let wm10_n8: String = json_array_get(wm10, 8)
+    let wm10_n7: String = json_array_get(wm10, 7)
+    let wm10_n6: String = json_array_get(wm10, 6)
+    let wm10_n5: String = json_array_get(wm10, 5)
+    let wm10_n4: String = json_array_get(wm10, 4)
+    let wm10_n3: String = json_array_get(wm10, 3)
+    let wm10_n2: String = json_array_get(wm10, 2)
+    let wm10_n1: String = json_array_get(wm10, 1)
+    let wm10_n0: String = json_array_get(wm10, 0)
+    auto_term_try_slot(json_get(wm10_n9, "node_type"), json_get(wm10_n9, "label"))
+    auto_term_try_slot(json_get(wm10_n8, "node_type"), json_get(wm10_n8, "label"))
+    auto_term_try_slot(json_get(wm10_n7, "node_type"), json_get(wm10_n7, "label"))
+    auto_term_try_slot(json_get(wm10_n6, "node_type"), json_get(wm10_n6, "label"))
+    auto_term_try_slot(json_get(wm10_n5, "node_type"), json_get(wm10_n5, "label"))
+    auto_term_try_slot(json_get(wm10_n4, "node_type"), json_get(wm10_n4, "label"))
+    auto_term_try_slot(json_get(wm10_n3, "node_type"), json_get(wm10_n3, "label"))
+    auto_term_try_slot(json_get(wm10_n2, "node_type"), json_get(wm10_n2, "label"))
+    auto_term_try_slot(json_get(wm10_n1, "node_type"), json_get(wm10_n1, "label"))
+    auto_term_try_slot(json_get(wm10_n0, "node_type"), json_get(wm10_n0, "label"))
     let auto_term: String = state_get("cseed_auto")
     let results_auto: String = if str_eq(auto_term, "") { "[]" } else { engram_activate_json(auto_term, 1) }
     let found_auto: Int = json_array_len(results_auto)
@@ -661,6 +702,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.elh

@@ -1,28 +1,58 @@
 // auto-generated by elc --emit-header — do not edit
 extern fn chat_default_model() -> String
-extern fn gemini_api_key() -> String
-extern fn xai_api_key() -> String
-extern fn llm_call_grok(model: String, system: String, message: String) -> String
-extern fn llm_call_gemini(model: String, system: String, message: String) -> String
-extern fn build_identity_from_graph() -> String
+extern fn engram_numeric_valid(s: String) -> Bool
+extern fn parse_float_x100(s: String) -> Int
+extern fn engram_score_node(node_json: String) -> Int
+extern fn engram_render_node(node_json: String) -> String
+extern fn engram_render_nodes(nodes_json: String) -> String
+extern fn engram_dedup_nodes(nodes_json: String) -> String
+extern fn engram_compile_ranked(nodes_json: String, max_nodes: Int) -> String
+extern fn engram_split_topics(message: String) -> String
+extern fn engram_extract_entities(message: String) -> String
+extern fn engram_detect_recall_intent(message: String) -> Bool
+extern fn engram_is_continuation(message: String, hist_len: Int) -> Bool
+extern fn engram_compile_multi(topic: String) -> String
+extern fn engram_nodes_merge(a: String, b: String) -> String
+extern fn id_in_seen(node_id: String, seen: String) -> Bool
+extern fn add_to_seen(seen: String, node_id: String) -> String
+extern fn engram_extract_ids(nodes_json: String) -> String
 extern fn engram_compile(intent: String) -> String
 extern fn json_safe(s: String) -> String
-extern fn build_system_prompt(ctx: String) -> String
+extern fn build_system_prompt(ctx: String, chat_mode: Bool) -> String
 extern fn hist_append(hist: String, role: String, content: String) -> String
 extern fn hist_trim(hist: String) -> String
+extern fn hist_trim_with_bell_guard(hist: String) -> String
 extern fn clean_llm_response(s: String) -> String
 extern fn conv_history_persist(hist: String) -> Void
 extern fn conv_history_load() -> String
+extern fn session_preload_bullets(nodes: String, max_bullets: Int, snip_len: Int) -> String
 extern fn handle_chat(body: String) -> String
 extern fn handle_see(body: String) -> String
 extern fn studio_tools_json() -> String
 extern fn agentic_api_key() -> String
-extern fn call_neuron_mcp(tool_name: String, args_json: String) -> String
 extern fn agentic_tools_literal() -> String
+extern fn agentic_tools_with_web() -> String
+extern fn connector_tools_json() -> String
+extern fn agentic_tools_all() -> String
+extern fn call_mcp_bridge(tool_name: String, tool_input: String) -> String
+extern fn tool_auto_approved(tool_name: String) -> Bool
+extern fn call_neuron_mcp(tool_name: String, args: String) -> String
+extern fn agent_workspace_root() -> String
+extern fn path_within_root(path: String, root: String) -> Bool
+extern fn resolve_in_root(path: String, root: String) -> String
 extern fn dispatch_tool(tool_name: String, tool_input: String) -> String
+extern fn is_builtin_tool(tool_name: String) -> Bool
+extern fn next_bridge_id() -> String
 extern fn handle_chat_agentic(body: String) -> String
+extern fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json: String, messages_in: String, h: Map, tools_log_in: String) -> String
+extern fn bridge_save(session_id: String, model: String, safe_sys: String, tools_json: String, messages: String, tools_log: String, tool_use_id: String) -> Bool
+extern fn agentic_resume(session_id: String, tool_use_id: String, content: String) -> String
+extern fn handle_tool_result(session_id: String, body: String) -> String
 extern fn handle_chat_as_soul(body: String) -> String
 extern fn handle_dharma_room_turn(body: String) -> String
 extern fn handle_dharma_room_turn_agentic(body: String) -> String
+extern fn session_summary_write(summary_text: String) -> String
+extern fn session_summary_write_dated(summary_text: String, label: String) -> String
+extern fn session_summary_autogenerate(hist: String) -> String
 extern fn auto_persist(req: String, resp: String) -> Void
 extern fn strengthen_chat_nodes(activation_nodes: String) -> Void

dist/awareness.c

@@ -25,6 +25,7 @@ el_val_t elapsed_ms(void);
 el_val_t elapsed_human(void);
 el_val_t embed_ok(void);
 el_val_t emit_heartbeat(void);
+el_val_t auto_term_try_slot(el_val_t slot_type, el_val_t slot_lbl);
 el_val_t proactive_curiosity(void);
 el_val_t pulse_count(void);
 el_val_t pulse_inc(void);
@@ -42,110 +43,6 @@ el_val_t threat_score_history(el_val_t history);
 el_val_t threat_trajectory_check(el_val_t tool_name, el_val_t tool_input);
 el_val_t threat_history_append(el_val_t text);
 
-el_val_t tier_working(void) {
-  return EL_STR("Working");
-  return 0;
-}
-
-el_val_t tier_episodic(void) {
-  return EL_STR("Episodic");
-  return 0;
-}
-
-el_val_t tier_canonical(void) {
-  return EL_STR("Canonical");
-  return 0;
-}
-
-el_val_t mem_store(el_val_t content, el_val_t label, el_val_t tags) {
-  return engram_node_full(content, EL_STR("Memory"), label, el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.8)), EL_STR("Working"), tags);
-  return 0;
-}
-
-el_val_t mem_remember(el_val_t content, el_val_t tags) {
-  return mem_store(content, EL_STR("soul-memory"), tags);
-  return 0;
-}
-
-el_val_t mem_recall(el_val_t query, el_val_t depth) {
-  return engram_activate_json(query, depth);
-  return 0;
-}
-
-el_val_t mem_search(el_val_t query, el_val_t limit) {
-  return engram_search_json(query, limit);
-  return 0;
-}
-
-el_val_t mem_strengthen(el_val_t node_id) {
-  engram_strengthen(node_id);
-  return 0;
-}
-
-el_val_t mem_forget(el_val_t node_id) {
-  engram_forget(node_id);
-  return 0;
-}
-
-el_val_t mem_consolidate(void) {
-  el_val_t scanned = engram_node_count();
-  el_val_t dummy = engram_scan_nodes_json(100, 0);
-  el_val_t total_nodes = engram_node_count();
-  el_val_t total_edges = engram_edge_count();
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"scanned\":"), int_to_str(scanned)), EL_STR(",\"total_nodes\":")), int_to_str(total_nodes)), EL_STR(",\"total_edges\":")), int_to_str(total_edges)), EL_STR("}"));
-  return 0;
-}
-
-el_val_t mem_save(el_val_t path) {
-  engram_save(path);
-  return 0;
-}
-
-el_val_t mem_load(el_val_t path) {
-  engram_load(path);
-  return 0;
-}
-
-el_val_t mem_boot_count_get(void) {
-  el_val_t results = engram_search_json(EL_STR("soul:boot_count"), 3);
-  if (str_eq(results, EL_STR(""))) {
-    return 0;
-  }
-  if (str_eq(results, EL_STR("[]"))) {
-    return 0;
-  }
-  el_val_t node = json_array_get(results, 0);
-  el_val_t content = json_get(node, EL_STR("content"));
-  el_val_t prefix = EL_STR("soul:boot_count:");
-  if (!str_starts_with(content, prefix)) {
-    return 0;
-  }
-  el_val_t num_str = str_slice(content, str_len(prefix), str_len(content));
-  return str_to_int(num_str);
-  return 0;
-}
-
-el_val_t mem_boot_count_inc(void) {
-  el_val_t current = mem_boot_count_get();
-  el_val_t next = (current + 1);
-  el_val_t content = el_str_concat(EL_STR("soul:boot_count:"), int_to_str(next));
-  el_val_t tags = EL_STR("[\"soul-meta\",\"boot-counter\"]");
-  el_val_t discard = engram_node_full(content, EL_STR("Memory"), EL_STR("soul:boot_count"), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(1.0)), EL_STR("Canonical"), tags);
-  return next;
-  return 0;
-}
-
-el_val_t mem_emit_state_event(el_val_t trigger, el_val_t kind, el_val_t content) {
-  el_val_t boot = mem_boot_count_get();
-  el_val_t ts = time_now();
-  el_val_t safe_trigger = str_replace(trigger, EL_STR("\""), EL_STR("'"));
-  el_val_t safe_content = str_replace(content, EL_STR("\""), EL_STR("'"));
-  el_val_t payload = el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"trigger\":\""), safe_trigger), EL_STR("\"")), EL_STR(",\"kind\":\"")), kind), EL_STR("\"")), EL_STR(",\"content\":\"")), safe_content), EL_STR("\"")), EL_STR(",\"boot\":")), int_to_str(boot)), EL_STR(",\"ts\":")), int_to_str(ts)), EL_STR("}"));
-  el_val_t tags = EL_STR("[\"internal-state\",\"pre-reasoning\",\"InternalStateEvent\"]");
-  return engram_node_full(payload, EL_STR("InternalStateEvent"), el_str_concat(EL_STR("state-event:"), kind), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.8)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
-  return 0;
-}
-
 el_val_t idle_count(void) {
   el_val_t s = state_get(EL_STR("soul.idle"));
   if (str_eq(s, EL_STR(""))) {
@@ -171,7 +68,7 @@ el_val_t ise_post(el_val_t content) {
   el_val_t ise_url = env(EL_STR("SOUL_ISE_URL"));
   el_val_t engram_url = ({ el_val_t _if_result_1 = 0; if (str_eq(ise_url, EL_STR(""))) { _if_result_1 = (state_get(EL_STR("soul_engram_url"))); } else { _if_result_1 = (ise_url); } _if_result_1; });
   if (str_eq(engram_url, EL_STR(""))) {
-    el_val_t discard = engram_node_full(content, EL_STR("InternalStateEvent"), EL_STR("state-event"), el_from_float(el_from_float(0.3)), el_from_float(el_from_float(0.3)), el_from_float(el_from_float(0.8)), EL_STR("Episodic"), EL_STR("[\"internal-state\",\"InternalStateEvent\"]"));
+    el_val_t discard = engram_node_full(content, EL_STR("InternalStateEvent"), EL_STR("state-event"), el_from_float(0.3), el_from_float(0.3), el_from_float(0.8), EL_STR("Episodic"), EL_STR("[\"internal-state\",\"InternalStateEvent\"]"));
     return EL_STR("");
   }
   el_val_t safe1 = str_replace(content, EL_STR("\\"), EL_STR("\\\\"));
@@ -245,6 +142,29 @@ el_val_t emit_heartbeat(void) {
   return 0;
 }
 
+el_val_t auto_term_try_slot(el_val_t slot_type, el_val_t slot_lbl) {
+  state_set(EL_STR("_ats_ok"), EL_STR("0"));
+  if (str_eq(slot_type, EL_STR("Memory"))) {
+    state_set(EL_STR("_ats_ok"), EL_STR("1"));
+  }
+  if (str_eq(slot_type, EL_STR("BacklogItem"))) {
+    state_set(EL_STR("_ats_ok"), EL_STR("1"));
+  }
+  if (str_eq(slot_type, EL_STR("Entity"))) {
+    state_set(EL_STR("_ats_ok"), EL_STR("1"));
+  }
+  if (str_eq(state_get(EL_STR("_ats_ok")), EL_STR("1"))) {
+    if (!str_eq(slot_lbl, EL_STR(""))) {
+      el_val_t sp = str_find_chars(slot_lbl, EL_STR(" :(["));
+      if (sp > 3) {
+        state_set(EL_STR("cseed_auto"), str_slice(slot_lbl, 0, sp));
+      }
+    }
+  }
+  return EL_STR("");
+  return 0;
+}
+
 el_val_t proactive_curiosity(void) {
   el_val_t ts = time_now();
   el_val_t ts_minutes = (ts / 60000);
@@ -282,15 +202,27 @@ el_val_t proactive_curiosity(void) {
   el_val_t found_c = json_array_len(results_c);
   el_val_t found = ((found_a + found_b) + found_c);
   state_set(EL_STR("cseed_auto"), EL_STR(""));
-  el_val_t wm_top_j = engram_wm_top_json(1);
-  el_val_t wm_top_n = json_array_get(wm_top_j, 0);
-  el_val_t wm_top_lbl = json_get(wm_top_n, EL_STR("label"));
-  if (!str_eq(wm_top_lbl, EL_STR(""))) {
-    el_val_t sp = str_find_chars(wm_top_lbl, EL_STR(" :(["));
-    if (sp > 3) {
-      state_set(EL_STR("cseed_auto"), str_slice(wm_top_lbl, 0, sp));
-    }
-  }
+  el_val_t wm10 = engram_wm_top_json(10);
+  el_val_t wm10_n9 = json_array_get(wm10, 9);
+  el_val_t wm10_n8 = json_array_get(wm10, 8);
+  el_val_t wm10_n7 = json_array_get(wm10, 7);
+  el_val_t wm10_n6 = json_array_get(wm10, 6);
+  el_val_t wm10_n5 = json_array_get(wm10, 5);
+  el_val_t wm10_n4 = json_array_get(wm10, 4);
+  el_val_t wm10_n3 = json_array_get(wm10, 3);
+  el_val_t wm10_n2 = json_array_get(wm10, 2);
+  el_val_t wm10_n1 = json_array_get(wm10, 1);
+  el_val_t wm10_n0 = json_array_get(wm10, 0);
+  auto_term_try_slot(json_get(wm10_n9, EL_STR("node_type")), json_get(wm10_n9, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n8, EL_STR("node_type")), json_get(wm10_n8, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n7, EL_STR("node_type")), json_get(wm10_n7, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n6, EL_STR("node_type")), json_get(wm10_n6, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n5, EL_STR("node_type")), json_get(wm10_n5, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n4, EL_STR("node_type")), json_get(wm10_n4, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n3, EL_STR("node_type")), json_get(wm10_n3, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n2, EL_STR("node_type")), json_get(wm10_n2, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n1, EL_STR("node_type")), json_get(wm10_n1, EL_STR("label")));
+  auto_term_try_slot(json_get(wm10_n0, EL_STR("node_type")), json_get(wm10_n0, EL_STR("label")));
   el_val_t auto_term = state_get(EL_STR("cseed_auto"));
   el_val_t results_auto = ({ el_val_t _if_result_3 = 0; if (str_eq(auto_term, EL_STR(""))) { _if_result_3 = (EL_STR("[]")); } else { _if_result_3 = (engram_activate_json(auto_term, 1)); } _if_result_3; });
   el_val_t found_auto = json_array_len(results_auto);
@@ -644,8 +576,3 @@ el_val_t threat_history_append(el_val_t text) {
   return 0;
 }
 
-int main(int _argc, char** _argv) {
-  el_runtime_init_args(_argc, _argv);
-  return 0;
-}
-

dist/chat.elh

@@ -1,28 +1,58 @@
 // auto-generated by elc --emit-header — do not edit
 extern fn chat_default_model() -> String
-extern fn gemini_api_key() -> String
-extern fn xai_api_key() -> String
-extern fn llm_call_grok(model: String, system: String, message: String) -> String
-extern fn llm_call_gemini(model: String, system: String, message: String) -> String
-extern fn build_identity_from_graph() -> String
+extern fn engram_numeric_valid(s: String) -> Bool
+extern fn parse_float_x100(s: String) -> Int
+extern fn engram_score_node(node_json: String) -> Int
+extern fn engram_render_node(node_json: String) -> String
+extern fn engram_render_nodes(nodes_json: String) -> String
+extern fn engram_dedup_nodes(nodes_json: String) -> String
+extern fn engram_compile_ranked(nodes_json: String, max_nodes: Int) -> String
+extern fn engram_split_topics(message: String) -> String
+extern fn engram_extract_entities(message: String) -> String
+extern fn engram_detect_recall_intent(message: String) -> Bool
+extern fn engram_is_continuation(message: String, hist_len: Int) -> Bool
+extern fn engram_compile_multi(topic: String) -> String
+extern fn engram_nodes_merge(a: String, b: String) -> String
+extern fn id_in_seen(node_id: String, seen: String) -> Bool
+extern fn add_to_seen(seen: String, node_id: String) -> String
+extern fn engram_extract_ids(nodes_json: String) -> String
 extern fn engram_compile(intent: String) -> String
 extern fn json_safe(s: String) -> String
-extern fn build_system_prompt(ctx: String) -> String
+extern fn build_system_prompt(ctx: String, chat_mode: Bool) -> String
 extern fn hist_append(hist: String, role: String, content: String) -> String
 extern fn hist_trim(hist: String) -> String
+extern fn hist_trim_with_bell_guard(hist: String) -> String
 extern fn clean_llm_response(s: String) -> String
 extern fn conv_history_persist(hist: String) -> Void
 extern fn conv_history_load() -> String
+extern fn session_preload_bullets(nodes: String, max_bullets: Int, snip_len: Int) -> String
 extern fn handle_chat(body: String) -> String
 extern fn handle_see(body: String) -> String
 extern fn studio_tools_json() -> String
 extern fn agentic_api_key() -> String
-extern fn call_neuron_mcp(tool_name: String, args_json: String) -> String
 extern fn agentic_tools_literal() -> String
+extern fn agentic_tools_with_web() -> String
+extern fn connector_tools_json() -> String
+extern fn agentic_tools_all() -> String
+extern fn call_mcp_bridge(tool_name: String, tool_input: String) -> String
+extern fn tool_auto_approved(tool_name: String) -> Bool
+extern fn call_neuron_mcp(tool_name: String, args: String) -> String
+extern fn agent_workspace_root() -> String
+extern fn path_within_root(path: String, root: String) -> Bool
+extern fn resolve_in_root(path: String, root: String) -> String
 extern fn dispatch_tool(tool_name: String, tool_input: String) -> String
+extern fn is_builtin_tool(tool_name: String) -> Bool
+extern fn next_bridge_id() -> String
 extern fn handle_chat_agentic(body: String) -> String
+extern fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json: String, messages_in: String, h: Map, tools_log_in: String) -> String
+extern fn bridge_save(session_id: String, model: String, safe_sys: String, tools_json: String, messages: String, tools_log: String, tool_use_id: String) -> Bool
+extern fn agentic_resume(session_id: String, tool_use_id: String, content: String) -> String
+extern fn handle_tool_result(session_id: String, body: String) -> String
 extern fn handle_chat_as_soul(body: String) -> String
 extern fn handle_dharma_room_turn(body: String) -> String
 extern fn handle_dharma_room_turn_agentic(body: String) -> String
+extern fn session_summary_write(summary_text: String) -> String
+extern fn session_summary_write_dated(summary_text: String, label: String) -> String
+extern fn session_summary_autogenerate(hist: String) -> String
 extern fn auto_persist(req: String, resp: String) -> Void
 extern fn strengthen_chat_nodes(activation_nodes: String) -> Void

dist/elp-c-decls.h

@@ -2,9 +2,18 @@
 #include "el_runtime.h"
 
 el_val_t add_punct(el_val_t s, el_val_t intent);
+el_val_t add_to_seen(el_val_t seen, el_val_t node_id);
+el_val_t aff_try_slot(el_val_t slot_json, el_val_t aff_7d_ts, el_val_t acc_key);
 el_val_t agent_number(el_val_t agent);
 el_val_t agent_person(el_val_t agent);
+el_val_t agent_workspace_root(void);
 el_val_t agentic_api_key(void);
+el_val_t agentic_api_turn(el_val_t model, el_val_t safe_sys, el_val_t tools_json, el_val_t messages);
+el_val_t agentic_blob(el_val_t model, el_val_t system, el_val_t tools_json, el_val_t messages, el_val_t origin, el_val_t approval, el_val_t iteration, el_val_t tools_log, el_val_t content, el_val_t queue, el_val_t results, el_val_t next);
+el_val_t agentic_engine(el_val_t session_id, el_val_t blob);
+el_val_t agentic_loop(el_val_t session_id, el_val_t model, el_val_t safe_sys, el_val_t tools_json, el_val_t messages_in, el_val_t h, el_val_t tools_log_in);
+el_val_t agentic_resume(el_val_t session_id, el_val_t tool_use_id, el_val_t content);
+el_val_t agentic_tools_all(void);
 el_val_t agentic_tools_literal(void);
 el_val_t agentic_tools_with_web(void);
 el_val_t agree_determiner(el_val_t det, el_val_t noun);
@@ -85,10 +94,13 @@ el_val_t api_err(el_val_t msg);
 el_val_t api_err_protected(el_val_t id);
 el_val_t api_json_escape(el_val_t s);
 el_val_t api_nonempty(el_val_t s);
+el_val_t api_not_persisted(el_val_t id);
 el_val_t api_ok(el_val_t extra);
 el_val_t api_or_empty(el_val_t s);
+el_val_t api_persisted(el_val_t id);
 el_val_t api_query_int(el_val_t path, el_val_t key, el_val_t default_val);
 el_val_t api_query_param(el_val_t path, el_val_t key);
+el_val_t append_tool_log(el_val_t log, el_val_t name);
 el_val_t ar_case_ending(el_val_t kase, el_val_t definite);
 el_val_t ar_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t gender, el_val_t number);
 el_val_t ar_conjugate_form1(el_val_t past_base, el_val_t present_stem, el_val_t tense, el_val_t slot);
@@ -118,22 +130,28 @@ el_val_t ar_verb_form(el_val_t verb, el_val_t tense, el_val_t person, el_val_t n
 el_val_t attend(el_val_t node_json);
 el_val_t auth_headers(el_val_t tok);
 el_val_t auto_persist(el_val_t req, el_val_t resp);
+el_val_t auto_term_try_slot(el_val_t slot_type, el_val_t slot_lbl);
 el_val_t awareness_run(void);
 el_val_t axon_get(el_val_t path);
 el_val_t axon_post(el_val_t path, el_val_t body);
+el_val_t bridge_save(el_val_t session_id, el_val_t model, el_val_t safe_sys, el_val_t tools_json, el_val_t messages, el_val_t tools_log, el_val_t tool_use_id);
 el_val_t build_form_from_json(el_val_t semantic_form_json, el_val_t lang_code);
 el_val_t build_identity_from_graph(void);
 el_val_t build_np(el_val_t referent, el_val_t slots);
 el_val_t build_pp(el_val_t loc);
 el_val_t build_rules(void);
 el_val_t build_system_prompt(el_val_t ctx);
+el_val_t build_system_prompt(el_val_t ctx, el_val_t chat_mode);
 el_val_t build_vocab(void);
 el_val_t build_vp_body(el_val_t slots);
 el_val_t build_vp_from_slots(el_val_t slots);
+el_val_t call_mcp_bridge(el_val_t tool_name, el_val_t tool_input);
+el_val_t call_neuron_mcp(el_val_t tool_name, el_val_t args);
 el_val_t call_neuron_mcp(el_val_t tool_name, el_val_t args_json);
 el_val_t capitalize_first(el_val_t s);
 el_val_t chat_default_model(void);
 el_val_t clean_llm_response(el_val_t s);
+el_val_t connector_tools_json(void);
 el_val_t conv_history_load(void);
 el_val_t conv_history_persist(el_val_t hist);
 el_val_t cop_article(el_val_t gender, el_val_t number, el_val_t definite);
@@ -240,6 +258,19 @@ el_val_t en_verb_form(el_val_t base, el_val_t tense, el_val_t person, el_val_t n
 el_val_t en_verb_gerund(el_val_t base);
 el_val_t en_verb_past(el_val_t base);
 el_val_t engram_compile(el_val_t intent);
+el_val_t engram_compile_multi(el_val_t topic);
+el_val_t engram_compile_ranked(el_val_t nodes_json, el_val_t max_nodes);
+el_val_t engram_dedup_nodes(el_val_t nodes_json);
+el_val_t engram_detect_recall_intent(el_val_t message);
+el_val_t engram_extract_entities(el_val_t message);
+el_val_t engram_extract_ids(el_val_t nodes_json);
+el_val_t engram_is_continuation(el_val_t message, el_val_t hist_len);
+el_val_t engram_nodes_merge(el_val_t a, el_val_t b);
+el_val_t engram_numeric_valid(el_val_t s);
+el_val_t engram_render_node(el_val_t node_json);
+el_val_t engram_render_nodes(el_val_t nodes_json);
+el_val_t engram_score_node(el_val_t node_json);
+el_val_t engram_split_topics(el_val_t message);
 el_val_t enm_been_past(el_val_t slot);
 el_val_t enm_been_present(el_val_t slot);
 el_val_t enm_comen_past(el_val_t slot);
@@ -269,6 +300,7 @@ el_val_t enm_str_ends(el_val_t s, el_val_t suf);
 el_val_t enm_weak_past(el_val_t stem, el_val_t slot);
 el_val_t enm_weak_present(el_val_t stem, el_val_t slot);
 el_val_t enm_weak_stem(el_val_t verb);
+el_val_t ensure_self_canonical_bridge(void);
 el_val_t entry_form(el_val_t entry, el_val_t n);
 el_val_t entry_found(el_val_t entry);
 el_val_t entry_pos(el_val_t entry);
@@ -297,6 +329,8 @@ el_val_t es_str_last2(el_val_t s);
 el_val_t es_str_last3(el_val_t s);
 el_val_t es_str_last_char(el_val_t s);
 el_val_t es_verb_class(el_val_t base);
+el_val_t exec_tool_block(el_val_t block);
+el_val_t extract_all_text(el_val_t s);
 el_val_t extract_dim(el_val_t content, el_val_t key);
 el_val_t fi_apply_case(el_val_t noun, el_val_t gram_case, el_val_t number);
 el_val_t fi_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t number);
@@ -315,6 +349,7 @@ el_val_t fi_str_last_char(el_val_t s);
 el_val_t fi_suffix(el_val_t base, el_val_t harmony);
 el_val_t fi_verb_stem(el_val_t dict_form);
 el_val_t find_rule(el_val_t rule_id_str);
+el_val_t flag_true(el_val_t body, el_val_t key);
 el_val_t fr_agree_article(el_val_t noun, el_val_t definite, el_val_t number);
 el_val_t fr_avoir_present(el_val_t slot);
 el_val_t fr_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t number);
@@ -549,6 +584,9 @@ el_val_t handle_api_list_typed(el_val_t node_type, el_val_t path, el_val_t body)
 el_val_t handle_api_log_state_event(el_val_t body);
 el_val_t handle_api_memory_delete(el_val_t body);
 el_val_t handle_api_memory_update(el_val_t body);
+el_val_t handle_api_node_create(el_val_t body);
+el_val_t handle_api_node_delete(el_val_t body);
+el_val_t handle_api_node_update(el_val_t body);
 el_val_t handle_api_promote_knowledge(el_val_t body);
 el_val_t handle_api_recall(el_val_t method, el_val_t path, el_val_t body);
 el_val_t handle_api_remember(el_val_t body);
@@ -566,9 +604,12 @@ el_val_t handle_dharma_room_turn_agentic(el_val_t body);
 el_val_t handle_elp_chat(el_val_t body);
 el_val_t handle_nlg(el_val_t path, el_val_t method, el_val_t body);
 el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body);
+el_val_t handle_safety_contact_get(void);
+el_val_t handle_safety_contact_post(el_val_t body);
 el_val_t handle_see(el_val_t body);
 el_val_t handle_session_approve(el_val_t session_id, el_val_t body);
 el_val_t handle_tool(el_val_t path, el_val_t method, el_val_t body);
+el_val_t handle_tool_result(el_val_t session_id, el_val_t body);
 el_val_t hard_bell_threshold(void);
 el_val_t he_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t gender, el_val_t number);
 el_val_t he_conjugate_copula(el_val_t tense, el_val_t slot);
@@ -627,6 +668,8 @@ el_val_t hi_verb_stem(el_val_t infinitive);
 el_val_t hi_verb_stem_clean(el_val_t infinitive);
 el_val_t hist_append(el_val_t hist, el_val_t role, el_val_t content);
 el_val_t hist_trim(el_val_t hist);
+el_val_t hist_trim_with_bell_guard(el_val_t hist);
+el_val_t id_in_seen(el_val_t node_id, el_val_t seen);
 el_val_t idle_count(void);
 el_val_t idle_inc(void);
 el_val_t idle_reset(void);
@@ -639,6 +682,7 @@ el_val_t imprint_unload(void);
 el_val_t init_soul_edges(void);
 el_val_t irregular_plural(el_val_t word);
 el_val_t irregular_singular(el_val_t word);
+el_val_t is_builtin_tool(el_val_t tool_name);
 el_val_t is_pronoun(el_val_t word);
 el_val_t is_protected_node(el_val_t id);
 el_val_t is_vowel(el_val_t c);
@@ -651,6 +695,7 @@ el_val_t ja_noun_phrase(el_val_t noun, el_val_t gram_case);
 el_val_t ja_particle(el_val_t gram_case);
 el_val_t ja_question_particle(void);
 el_val_t ja_verb_group(el_val_t dict_form);
+el_val_t json_array_append(el_val_t arr, el_val_t item);
 el_val_t json_safe(el_val_t s);
 el_val_t la_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t number);
 el_val_t la_declension(el_val_t noun);
@@ -737,6 +782,7 @@ el_val_t lang_profile_txb(void);
 el_val_t lang_profile_uga(void);
 el_val_t lang_profile_zh(void);
 el_val_t lang_word_order(el_val_t profile);
+el_val_t layered_cycle(el_val_t raw_input);
 el_val_t lex_class(el_val_t entry);
 el_val_t lex_form(el_val_t entry, el_val_t idx);
 el_val_t lex_pos(el_val_t entry);
@@ -780,6 +826,7 @@ el_val_t morph_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_
 el_val_t morph_inflect(el_val_t word, el_val_t features, el_val_t profile);
 el_val_t morph_map_canonical(el_val_t verb, el_val_t code);
 el_val_t morph_pluralize(el_val_t noun, el_val_t profile);
+el_val_t next_bridge_id(void);
 el_val_t nlg_is_ws(el_val_t c);
 el_val_t non_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t number);
 el_val_t non_decline(el_val_t noun, el_val_t gram_case, el_val_t number);
@@ -811,8 +858,10 @@ el_val_t non_vera_present(el_val_t slot);
 el_val_t non_weak_past(el_val_t stem, el_val_t slot);
 el_val_t non_weak_present(el_val_t stem, el_val_t slot);
 el_val_t one_cycle(void);
+el_val_t parse_float_x100(el_val_t s);
 el_val_t parse_session_id_from_path(el_val_t path);
 el_val_t parse_session_subpath(el_val_t path);
+el_val_t path_within_root(el_val_t path, el_val_t root);
 el_val_t peo_ah_past(el_val_t slot);
 el_val_t peo_ah_present(el_val_t slot);
 el_val_t peo_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t number);
@@ -877,6 +926,7 @@ el_val_t realize_vp_lang(el_val_t base_verb, el_val_t tense, el_val_t aspect, el
 el_val_t record(el_val_t outcome_json);
 el_val_t render_studio(void);
 el_val_t render_tree(el_val_t tree);
+el_val_t resolve_in_root(el_val_t path, el_val_t root);
 el_val_t respond(el_val_t action_json);
 el_val_t route_health(void);
 el_val_t route_imprint_contextual(el_val_t body);
@@ -936,12 +986,26 @@ el_val_t sa_str_ends(el_val_t s, el_val_t suf);
 el_val_t sa_vad_future(el_val_t slot);
 el_val_t sa_vad_past(el_val_t slot);
 el_val_t sa_vad_present(el_val_t slot);
+el_val_t safety_abuse_phrases(void);
+el_val_t safety_any_match(el_val_t text, el_val_t phrases_json);
+el_val_t safety_augment_system(el_val_t system, el_val_t user_msg);
+el_val_t safety_classify_hard_bell(el_val_t message);
+el_val_t safety_contact_path(void);
+el_val_t safety_count_match(el_val_t text, el_val_t phrases_json);
+el_val_t safety_detect_bell_level(el_val_t message);
+el_val_t safety_detect_positive_level(el_val_t message);
+el_val_t safety_general_hard_phrases(void);
+el_val_t safety_hard_directive(el_val_t hard_type);
 el_val_t safety_log_bell(el_val_t level, el_val_t reason, el_val_t input_summary);
+el_val_t safety_normalize(el_val_t message);
 el_val_t safety_score_crisis(el_val_t input);
 el_val_t safety_score_danger(el_val_t input);
 el_val_t safety_score_distress_history(el_val_t history);
 el_val_t safety_score_harm(el_val_t input);
 el_val_t safety_screen(el_val_t input, el_val_t history);
+el_val_t safety_self_harm_phrases(void);
+el_val_t safety_soft_directive(void);
+el_val_t safety_soft_phrases(void);
 el_val_t safety_threat_score(el_val_t input, el_val_t history);
 el_val_t safety_validate(el_val_t output, el_val_t action);
 el_val_t scan_token(el_val_t s, el_val_t start);
@@ -967,13 +1031,19 @@ el_val_t sem_to_spec(el_val_t frame);
 el_val_t sem_to_spec_full(el_val_t frame, el_val_t verb, el_val_t tense, el_val_t aspect);
 el_val_t session_auto_title(el_val_t session_id, el_val_t first_message);
 el_val_t session_create(el_val_t body);
+el_val_t session_create_cleanup(el_val_t session_id);
 el_val_t session_delete(el_val_t session_id);
+el_val_t session_exists(el_val_t session_id);
 el_val_t session_get(el_val_t session_id);
 el_val_t session_hist_load(el_val_t session_id);
 el_val_t session_hist_save(el_val_t session_id, el_val_t hist);
 el_val_t session_list(void);
 el_val_t session_make_content(el_val_t id, el_val_t title, el_val_t created_at, el_val_t updated_at, el_val_t folder);
+el_val_t session_preload_bullets(el_val_t nodes, el_val_t max_bullets, el_val_t snip_len);
 el_val_t session_search(el_val_t query);
+el_val_t session_summary_autogenerate(el_val_t hist);
+el_val_t session_summary_write(el_val_t summary_text);
+el_val_t session_summary_write_dated(el_val_t summary_text, el_val_t label);
 el_val_t session_title_from_message(el_val_t message);
 el_val_t session_update_meta_timestamp(el_val_t session_id);
 el_val_t session_update_patch(el_val_t session_id, el_val_t body);
@@ -1018,6 +1088,7 @@ el_val_t str_last2(el_val_t s);
 el_val_t str_last3(el_val_t s);
 el_val_t str_last_char(el_val_t s);
 el_val_t strengthen_chat_nodes(el_val_t activation_nodes);
+el_val_t strip_citations(el_val_t s);
 el_val_t strip_query(el_val_t path);
 el_val_t studio_tools_json(void);
 el_val_t sux_absolutive_suffix(el_val_t person, el_val_t number);
@@ -1078,6 +1149,7 @@ el_val_t threat_trajectory_check(el_val_t tool_name, el_val_t tool_input);
 el_val_t tier_canonical(void);
 el_val_t tier_episodic(void);
 el_val_t tier_working(void);
+el_val_t tool_auto_approved(el_val_t tool_name);
 el_val_t txb_conjugate(el_val_t verb, el_val_t tense, el_val_t person, el_val_t number);
 el_val_t txb_decline(el_val_t noun, el_val_t gram_case, el_val_t number);
 el_val_t txb_decline_fem(el_val_t noun, el_val_t gram_case, el_val_t number);

dist/imprint.c

@@ -70,8 +70,3 @@ el_val_t imprint_unload(void) {
   return 0;
 }
 
-int main(int _argc, char** _argv) {
-  el_runtime_init_args(_argc, _argv);
-  return 0;
-}
-

dist/memory.c

@@ -34,7 +34,7 @@ el_val_t tier_canonical(void) {
 }
 
 el_val_t mem_store(el_val_t content, el_val_t label, el_val_t tags) {
-  return engram_node_full(content, EL_STR("Memory"), label, el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.8)), EL_STR("Working"), tags);
+  return engram_node_full(content, EL_STR("Memory"), label, el_from_float(0.5), el_from_float(0.5), el_from_float(0.8), EL_STR("Working"), tags);
   return 0;
 }
 
@@ -65,15 +65,43 @@ el_val_t mem_forget(el_val_t node_id) {
 
 el_val_t mem_consolidate(void) {
   el_val_t scanned = engram_node_count();
-  el_val_t dummy = engram_scan_nodes_json(100, 0);
-  el_val_t total_nodes = engram_node_count();
   el_val_t total_edges = engram_edge_count();
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"scanned\":"), int_to_str(scanned)), EL_STR(",\"total_nodes\":")), int_to_str(total_nodes)), EL_STR(",\"total_edges\":")), int_to_str(total_edges)), EL_STR("}"));
+  el_val_t strengthened = 0;
+  el_val_t wm_top = engram_wm_top_json(10);
+  el_val_t wm_len = json_array_len(wm_top);
+  el_val_t wi = 0;
+  while (wi < wm_len) {
+    el_val_t wm_node = json_array_get(wm_top, wi);
+    el_val_t wm_id = json_get(wm_node, EL_STR("id"));
+    if (!str_eq(wm_id, EL_STR(""))) {
+      engram_strengthen(wm_id);
+      strengthened = (strengthened + 1);
+    }
+    wi = (wi + 1);
+  }
+  el_val_t scan_result = engram_scan_nodes_json(50, 0);
+  el_val_t scan_len = json_array_len(scan_result);
+  el_val_t si = 0;
+  while (si < scan_len) {
+    el_val_t s_node = json_array_get(scan_result, si);
+    el_val_t s_tier = json_get(s_node, EL_STR("tier"));
+    el_val_t s_id = json_get(s_node, EL_STR("id"));
+    if (str_eq(s_tier, EL_STR("Canonical")) && !str_eq(s_id, EL_STR(""))) {
+      engram_strengthen(s_id);
+      strengthened = (strengthened + 1);
+    }
+    si = (si + 1);
+  }
+  el_val_t total_nodes = engram_node_count();
+  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"scanned\":"), int_to_str(scanned)), EL_STR(",\"total_nodes\":")), int_to_str(total_nodes)), EL_STR(",\"total_edges\":")), int_to_str(total_edges)), EL_STR(",\"strengthened\":")), int_to_str(strengthened)), EL_STR("}"));
   return 0;
 }
 
 el_val_t mem_save(el_val_t path) {
-  engram_save(path);
+  el_val_t save_result = engram_save(path);
+  if (str_eq(save_result, EL_STR(""))) {
+    println(el_str_concat(el_str_concat(EL_STR("[memory] mem_save: engram_save failed for "), path), EL_STR(" \xe2\x80\x94 snapshot may be incomplete")));
+  }
   return 0;
 }
 
@@ -106,7 +134,10 @@ el_val_t mem_boot_count_inc(void) {
   el_val_t next = (current + 1);
   el_val_t content = el_str_concat(EL_STR("soul:boot_count:"), int_to_str(next));
   el_val_t tags = EL_STR("[\"soul-meta\",\"boot-counter\"]");
-  el_val_t discard = engram_node_full(content, EL_STR("Memory"), EL_STR("soul:boot_count"), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(1.0)), EL_STR("Canonical"), tags);
+  el_val_t boot_node_id = engram_node_full(content, EL_STR("Memory"), EL_STR("soul:boot_count"), el_from_float(0.9), el_from_float(0.9), el_from_float(1.0), EL_STR("Canonical"), tags);
+  if (str_eq(boot_node_id, EL_STR(""))) {
+    println(el_str_concat(el_str_concat(EL_STR("[memory] mem_boot_count_inc: engram write failed \xe2\x80\x94 boot counter node lost (count="), int_to_str(next)), EL_STR(")")));
+  }
   return next;
   return 0;
 }
@@ -118,12 +149,7 @@ el_val_t mem_emit_state_event(el_val_t trigger, el_val_t kind, el_val_t content)
   el_val_t safe_content = str_replace(content, EL_STR("\""), EL_STR("'"));
   el_val_t payload = el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"trigger\":\""), safe_trigger), EL_STR("\"")), EL_STR(",\"kind\":\"")), kind), EL_STR("\"")), EL_STR(",\"content\":\"")), safe_content), EL_STR("\"")), EL_STR(",\"boot\":")), int_to_str(boot)), EL_STR(",\"ts\":")), int_to_str(ts)), EL_STR("}"));
   el_val_t tags = EL_STR("[\"internal-state\",\"pre-reasoning\",\"InternalStateEvent\"]");
-  return engram_node_full(payload, EL_STR("InternalStateEvent"), el_str_concat(EL_STR("state-event:"), kind), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.8)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
-  return 0;
-}
-
-int main(int _argc, char** _argv) {
-  el_runtime_init_args(_argc, _argv);
+  return engram_node_full(payload, EL_STR("InternalStateEvent"), el_str_concat(EL_STR("state-event:"), kind), el_from_float(0.85), el_from_float(0.8), el_from_float(0.9), EL_STR("Episodic"), tags);
   return 0;
 }
 

dist/neuron-api.c

@@ -26,9 +26,14 @@ el_val_t api_ok(el_val_t extra);
 el_val_t api_err(el_val_t msg);
 el_val_t api_nonempty(el_val_t s);
 el_val_t api_or_empty(el_val_t s);
+el_val_t api_persisted(el_val_t id);
+el_val_t api_not_persisted(el_val_t id);
 el_val_t handle_api_begin_session(el_val_t body);
 el_val_t handle_api_compile_ctx(el_val_t body);
 el_val_t handle_api_remember(el_val_t body);
+el_val_t handle_api_node_create(el_val_t body);
+el_val_t handle_api_node_delete(el_val_t body);
+el_val_t handle_api_node_update(el_val_t body);
 el_val_t handle_api_recall(el_val_t method, el_val_t path, el_val_t body);
 el_val_t handle_api_search_knowledge(el_val_t method, el_val_t path, el_val_t body);
 el_val_t handle_api_browse_knowledge(el_val_t path, el_val_t body);
@@ -45,114 +50,12 @@ el_val_t handle_api_inspect_graph(el_val_t method, el_val_t path, el_val_t body)
 el_val_t handle_api_link_entities(el_val_t body);
 el_val_t handle_api_forget(el_val_t body);
 el_val_t handle_api_evolve_memory(el_val_t body);
+el_val_t handle_api_memory_delete(el_val_t body);
+el_val_t handle_api_memory_update(el_val_t body);
 el_val_t handle_api_cultivate(el_val_t body);
 el_val_t handle_api_list_typed(el_val_t node_type, el_val_t path, el_val_t body);
 el_val_t handle_api_consolidate(el_val_t body);
 
-el_val_t tier_working(void) {
-  return EL_STR("Working");
-  return 0;
-}
-
-el_val_t tier_episodic(void) {
-  return EL_STR("Episodic");
-  return 0;
-}
-
-el_val_t tier_canonical(void) {
-  return EL_STR("Canonical");
-  return 0;
-}
-
-el_val_t mem_store(el_val_t content, el_val_t label, el_val_t tags) {
-  return engram_node_full(content, EL_STR("Memory"), label, el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.8)), EL_STR("Working"), tags);
-  return 0;
-}
-
-el_val_t mem_remember(el_val_t content, el_val_t tags) {
-  return mem_store(content, EL_STR("soul-memory"), tags);
-  return 0;
-}
-
-el_val_t mem_recall(el_val_t query, el_val_t depth) {
-  return engram_activate_json(query, depth);
-  return 0;
-}
-
-el_val_t mem_search(el_val_t query, el_val_t limit) {
-  return engram_search_json(query, limit);
-  return 0;
-}
-
-el_val_t mem_strengthen(el_val_t node_id) {
-  engram_strengthen(node_id);
-  return 0;
-}
-
-el_val_t mem_forget(el_val_t node_id) {
-  engram_forget(node_id);
-  return 0;
-}
-
-el_val_t mem_consolidate(void) {
-  el_val_t scanned = engram_node_count();
-  el_val_t dummy = engram_scan_nodes_json(100, 0);
-  el_val_t total_nodes = engram_node_count();
-  el_val_t total_edges = engram_edge_count();
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"scanned\":"), int_to_str(scanned)), EL_STR(",\"total_nodes\":")), int_to_str(total_nodes)), EL_STR(",\"total_edges\":")), int_to_str(total_edges)), EL_STR("}"));
-  return 0;
-}
-
-el_val_t mem_save(el_val_t path) {
-  engram_save(path);
-  return 0;
-}
-
-el_val_t mem_load(el_val_t path) {
-  engram_load(path);
-  return 0;
-}
-
-el_val_t mem_boot_count_get(void) {
-  el_val_t results = engram_search_json(EL_STR("soul:boot_count"), 3);
-  if (str_eq(results, EL_STR(""))) {
-    return 0;
-  }
-  if (str_eq(results, EL_STR("[]"))) {
-    return 0;
-  }
-  el_val_t node = json_array_get(results, 0);
-  el_val_t content = json_get(node, EL_STR("content"));
-  el_val_t prefix = EL_STR("soul:boot_count:");
-  if (!str_starts_with(content, prefix)) {
-    return 0;
-  }
-  el_val_t num_str = str_slice(content, str_len(prefix), str_len(content));
-  return str_to_int(num_str);
-  return 0;
-}
-
-el_val_t mem_boot_count_inc(void) {
-  el_val_t current = mem_boot_count_get();
-  el_val_t next = (current + 1);
-  el_val_t content = el_str_concat(EL_STR("soul:boot_count:"), int_to_str(next));
-  el_val_t tags = EL_STR("[\"soul-meta\",\"boot-counter\"]");
-  el_val_t discard = engram_node_full(content, EL_STR("Memory"), EL_STR("soul:boot_count"), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(1.0)), EL_STR("Canonical"), tags);
-  return next;
-  return 0;
-}
-
-el_val_t mem_emit_state_event(el_val_t trigger, el_val_t kind, el_val_t content) {
-  el_val_t boot = mem_boot_count_get();
-  el_val_t ts = time_now();
-  el_val_t safe_trigger = str_replace(trigger, EL_STR("\""), EL_STR("'"));
-  el_val_t safe_content = str_replace(content, EL_STR("\""), EL_STR("'"));
-  el_val_t payload = el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"trigger\":\""), safe_trigger), EL_STR("\"")), EL_STR(",\"kind\":\"")), kind), EL_STR("\"")), EL_STR(",\"content\":\"")), safe_content), EL_STR("\"")), EL_STR(",\"boot\":")), int_to_str(boot)), EL_STR(",\"ts\":")), int_to_str(ts)), EL_STR("}"));
-  el_val_t tags = EL_STR("[\"internal-state\",\"pre-reasoning\",\"InternalStateEvent\"]");
-  return engram_node_full(payload, EL_STR("InternalStateEvent"), el_str_concat(EL_STR("state-event:"), kind), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.8)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
-  return 0;
-}
-
 el_val_t is_protected_node(el_val_t id) {
   if (str_eq(id, EL_STR("kn-efeb4a5b-5aff-4759-8a97-7233099be6ee"))) {
     return 1;
@@ -272,6 +175,20 @@ el_val_t api_or_empty(el_val_t s) {
   return 0;
 }
 
+el_val_t api_persisted(el_val_t id) {
+  if (str_eq(id, EL_STR(""))) {
+    return 0;
+  }
+  el_val_t node = engram_get_node_json(id);
+  return (!str_eq(node, EL_STR("")) && !str_eq(node, EL_STR("null")));
+  return 0;
+}
+
+el_val_t api_not_persisted(el_val_t id) {
+  return el_str_concat(el_str_concat(EL_STR("{\"ok\":false,\"error\":\"write_not_persisted\",\"id\":\""), id), EL_STR("\"}"));
+  return 0;
+}
+
 el_val_t handle_api_begin_session(el_val_t body) {
   el_val_t stats = engram_stats_json();
   el_val_t activated = engram_activate_json(EL_STR("session start recent memory important"), 2);
@@ -302,18 +219,88 @@ el_val_t handle_api_remember(el_val_t body) {
   el_val_t sal = ({ el_val_t _if_result_4 = 0; if (str_eq(sal_str, EL_STR("0.95"))) { _if_result_4 = (el_from_float(0.95)); } else { _if_result_4 = (({ el_val_t _if_result_5 = 0; if (str_eq(sal_str, EL_STR("0.75"))) { _if_result_5 = (el_from_float(0.75)); } else { _if_result_5 = (({ el_val_t _if_result_6 = 0; if (str_eq(sal_str, EL_STR("0.25"))) { _if_result_6 = (el_from_float(0.25)); } else { _if_result_6 = (el_from_float(0.5)); } _if_result_6; })); } _if_result_5; })); } _if_result_4; });
   el_val_t base_tags = ({ el_val_t _if_result_7 = 0; if (str_eq(tags_raw, EL_STR(""))) { _if_result_7 = (EL_STR("[\"Memory\"]")); } else { _if_result_7 = (tags_raw); } _if_result_7; });
   el_val_t final_tags = ({ el_val_t _if_result_8 = 0; if (str_eq(project, EL_STR(""))) { _if_result_8 = (base_tags); } else { el_val_t inner = str_slice(base_tags, 1, (str_len(base_tags) - 1)); _if_result_8 = (el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("["), inner), EL_STR(",\"project:")), project), EL_STR("\"]"))); } _if_result_8; });
-  el_val_t id = engram_node_full(content, EL_STR("Memory"), EL_STR("memory:remembered"), el_from_float(sal), el_from_float(sal), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), final_tags);
+  el_val_t id = engram_node_full(content, EL_STR("Memory"), EL_STR("memory:remembered"), el_from_float(sal), el_from_float(sal), el_from_float(0.9), EL_STR("Episodic"), final_tags);
+  if (!api_persisted(id)) {
+    return api_not_persisted(id);
+  }
   return el_str_concat(el_str_concat(EL_STR("{\"id\":\""), id), EL_STR("\",\"ok\":true}"));
   return 0;
 }
 
+el_val_t handle_api_node_create(el_val_t body) {
+  el_val_t content = json_get(body, EL_STR("content"));
+  if (str_eq(content, EL_STR(""))) {
+    return api_err(EL_STR("content is required"));
+  }
+  el_val_t nt_raw = json_get(body, EL_STR("node_type"));
+  el_val_t node_type = ({ el_val_t _if_result_9 = 0; if (str_eq(nt_raw, EL_STR(""))) { _if_result_9 = (EL_STR("Memory")); } else { _if_result_9 = (nt_raw); } _if_result_9; });
+  el_val_t label_raw = json_get(body, EL_STR("label"));
+  el_val_t label = ({ el_val_t _if_result_10 = 0; if (str_eq(label_raw, EL_STR(""))) { _if_result_10 = (EL_STR("node:created")); } else { _if_result_10 = (label_raw); } _if_result_10; });
+  el_val_t tier_raw = json_get(body, EL_STR("tier"));
+  el_val_t tier = ({ el_val_t _if_result_11 = 0; if (str_eq(tier_raw, EL_STR(""))) { _if_result_11 = (EL_STR("Episodic")); } else { _if_result_11 = (tier_raw); } _if_result_11; });
+  el_val_t tags_raw = json_get(body, EL_STR("tags"));
+  el_val_t tags = ({ el_val_t _if_result_12 = 0; if (str_eq(tags_raw, EL_STR(""))) { _if_result_12 = (el_str_concat(el_str_concat(EL_STR("[\""), node_type), EL_STR("\"]"))); } else { _if_result_12 = (tags_raw); } _if_result_12; });
+  el_val_t importance = json_get(body, EL_STR("importance"));
+  el_val_t sal = ({ el_val_t _if_result_13 = 0; if (str_eq(importance, EL_STR("critical"))) { _if_result_13 = (el_from_float(0.95)); } else { _if_result_13 = (({ el_val_t _if_result_14 = 0; if (str_eq(importance, EL_STR("high"))) { _if_result_14 = (el_from_float(0.75)); } else { _if_result_14 = (({ el_val_t _if_result_15 = 0; if (str_eq(importance, EL_STR("low"))) { _if_result_15 = (el_from_float(0.25)); } else { _if_result_15 = (el_from_float(0.5)); } _if_result_15; })); } _if_result_14; })); } _if_result_13; });
+  el_val_t id = engram_node_full(content, node_type, label, el_from_float(sal), el_from_float(sal), el_from_float(0.9), tier, tags);
+  if (!api_persisted(id)) {
+    return api_not_persisted(id);
+  }
+  return el_str_concat(el_str_concat(EL_STR("{\"id\":\""), id), EL_STR("\",\"ok\":true}"));
+  return 0;
+}
+
+el_val_t handle_api_node_delete(el_val_t body) {
+  el_val_t id = json_get(body, EL_STR("id"));
+  if (str_eq(id, EL_STR(""))) {
+    return api_err(EL_STR("id is required"));
+  }
+  engram_forget(id);
+  return el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"id\":\""), id), EL_STR("\"}"));
+  return 0;
+}
+
+el_val_t handle_api_node_update(el_val_t body) {
+  el_val_t id = json_get(body, EL_STR("id"));
+  if (str_eq(id, EL_STR(""))) {
+    return api_err(EL_STR("id is required"));
+  }
+  if (!api_persisted(id)) {
+    return el_str_concat(el_str_concat(EL_STR("{\"ok\":false,\"error\":\"not_found\",\"id\":\""), id), EL_STR("\"}"));
+  }
+  el_val_t old = engram_get_node_json(id);
+  el_val_t body_content = json_get(body, EL_STR("content"));
+  el_val_t content = ({ el_val_t _if_result_16 = 0; if (str_eq(body_content, EL_STR(""))) { _if_result_16 = (json_get(old, EL_STR("content"))); } else { _if_result_16 = (body_content); } _if_result_16; });
+  el_val_t body_nt = json_get(body, EL_STR("node_type"));
+  el_val_t old_nt = json_get(old, EL_STR("node_type"));
+  el_val_t node_type = ({ el_val_t _if_result_17 = 0; if (!str_eq(body_nt, EL_STR(""))) { _if_result_17 = (body_nt); } else { _if_result_17 = (({ el_val_t _if_result_18 = 0; if (!str_eq(old_nt, EL_STR(""))) { _if_result_18 = (old_nt); } else { _if_result_18 = (EL_STR("Memory")); } _if_result_18; })); } _if_result_17; });
+  el_val_t body_label = json_get(body, EL_STR("label"));
+  el_val_t old_label = json_get(old, EL_STR("label"));
+  el_val_t label = ({ el_val_t _if_result_19 = 0; if (!str_eq(body_label, EL_STR(""))) { _if_result_19 = (body_label); } else { _if_result_19 = (({ el_val_t _if_result_20 = 0; if (!str_eq(old_label, EL_STR(""))) { _if_result_20 = (old_label); } else { _if_result_20 = (EL_STR("node:updated")); } _if_result_20; })); } _if_result_19; });
+  el_val_t body_tier = json_get(body, EL_STR("tier"));
+  el_val_t old_tier = json_get(old, EL_STR("tier"));
+  el_val_t tier = ({ el_val_t _if_result_21 = 0; if (!str_eq(body_tier, EL_STR(""))) { _if_result_21 = (body_tier); } else { _if_result_21 = (({ el_val_t _if_result_22 = 0; if (!str_eq(old_tier, EL_STR(""))) { _if_result_22 = (old_tier); } else { _if_result_22 = (EL_STR("Episodic")); } _if_result_22; })); } _if_result_21; });
+  el_val_t body_tags = json_get(body, EL_STR("tags"));
+  el_val_t tags = ({ el_val_t _if_result_23 = 0; if (str_eq(body_tags, EL_STR(""))) { _if_result_23 = (el_str_concat(el_str_concat(EL_STR("[\""), node_type), EL_STR("\"]"))); } else { _if_result_23 = (body_tags); } _if_result_23; });
+  el_val_t new_id = engram_node_full(content, node_type, label, el_from_float(0.5), el_from_float(0.5), el_from_float(0.8), tier, tags);
+  if (!api_persisted(new_id)) {
+    return api_not_persisted(new_id);
+  }
+  engram_forget(id);
+  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"id\":\""), new_id), EL_STR("\",\"replaced\":\"")), id), EL_STR("\",\"ok\":true}"));
+  return 0;
+}
+
 el_val_t handle_api_recall(el_val_t method, el_val_t path, el_val_t body) {
-  el_val_t q = ({ el_val_t _if_result_9 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_9 = (api_query_param(path, EL_STR("query"))); } else { _if_result_9 = (json_get(body, EL_STR("query"))); } _if_result_9; });
+  el_val_t url_q = ({ el_val_t _if_result_24 = 0; if (str_eq(api_query_param(path, EL_STR("query")), EL_STR(""))) { _if_result_24 = (api_query_param(path, EL_STR("q"))); } else { _if_result_24 = (api_query_param(path, EL_STR("query"))); } _if_result_24; });
+  el_val_t body_query = json_get(body, EL_STR("query"));
+  el_val_t body_q = json_get(body, EL_STR("q"));
+  el_val_t q = ({ el_val_t _if_result_25 = 0; if (!str_eq(url_q, EL_STR(""))) { _if_result_25 = (url_q); } else { _if_result_25 = (({ el_val_t _if_result_26 = 0; if (!str_eq(body_query, EL_STR(""))) { _if_result_26 = (body_query); } else { _if_result_26 = (body_q); } _if_result_26; })); } _if_result_25; });
   el_val_t chain = json_get(body, EL_STR("chain_name"));
   el_val_t limit = api_query_int(path, EL_STR("limit"), 0);
-  limit = ({ el_val_t _if_result_10 = 0; if ((limit == 0)) { _if_result_10 = (json_get_int(body, EL_STR("limit"))); } else { _if_result_10 = (limit); } _if_result_10; });
-  limit = ({ el_val_t _if_result_11 = 0; if ((limit == 0)) { _if_result_11 = (10); } else { _if_result_11 = (limit); } _if_result_11; });
-  el_val_t eff_q = ({ el_val_t _if_result_12 = 0; if (str_eq(q, EL_STR(""))) { _if_result_12 = (chain); } else { _if_result_12 = (q); } _if_result_12; });
+  limit = ({ el_val_t _if_result_27 = 0; if ((limit == 0)) { _if_result_27 = (json_get_int(body, EL_STR("limit"))); } else { _if_result_27 = (limit); } _if_result_27; });
+  limit = ({ el_val_t _if_result_28 = 0; if ((limit == 0)) { _if_result_28 = (10); } else { _if_result_28 = (limit); } _if_result_28; });
+  el_val_t eff_q = ({ el_val_t _if_result_29 = 0; if (str_eq(q, EL_STR(""))) { _if_result_29 = (chain); } else { _if_result_29 = (q); } _if_result_29; });
   if (str_eq(eff_q, EL_STR(""))) {
     return api_or_empty(engram_scan_nodes_json(limit, 0));
   }
@@ -323,10 +310,13 @@ el_val_t handle_api_recall(el_val_t method, el_val_t path, el_val_t body) {
 }
 
 el_val_t handle_api_search_knowledge(el_val_t method, el_val_t path, el_val_t body) {
-  el_val_t q = ({ el_val_t _if_result_13 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_13 = (api_query_param(path, EL_STR("q"))); } else { _if_result_13 = (json_get(body, EL_STR("query"))); } _if_result_13; });
+  el_val_t url_q = api_query_param(path, EL_STR("q"));
+  el_val_t body_query = json_get(body, EL_STR("query"));
+  el_val_t body_q = json_get(body, EL_STR("q"));
+  el_val_t q = ({ el_val_t _if_result_30 = 0; if (!str_eq(url_q, EL_STR(""))) { _if_result_30 = (url_q); } else { _if_result_30 = (({ el_val_t _if_result_31 = 0; if (!str_eq(body_query, EL_STR(""))) { _if_result_31 = (body_query); } else { _if_result_31 = (body_q); } _if_result_31; })); } _if_result_30; });
   el_val_t limit = api_query_int(path, EL_STR("limit"), 0);
-  limit = ({ el_val_t _if_result_14 = 0; if ((limit == 0)) { _if_result_14 = (json_get_int(body, EL_STR("limit"))); } else { _if_result_14 = (limit); } _if_result_14; });
-  limit = ({ el_val_t _if_result_15 = 0; if ((limit == 0)) { _if_result_15 = (10); } else { _if_result_15 = (limit); } _if_result_15; });
+  limit = ({ el_val_t _if_result_32 = 0; if ((limit == 0)) { _if_result_32 = (json_get_int(body, EL_STR("limit"))); } else { _if_result_32 = (limit); } _if_result_32; });
+  limit = ({ el_val_t _if_result_33 = 0; if ((limit == 0)) { _if_result_33 = (10); } else { _if_result_33 = (limit); } _if_result_33; });
   if (str_eq(q, EL_STR(""))) {
     return api_err(EL_STR("query is required"));
   }
@@ -354,9 +344,12 @@ el_val_t handle_api_capture_knowledge(el_val_t body) {
   if (str_eq(content, EL_STR(""))) {
     return api_err(EL_STR("content is required"));
   }
-  el_val_t full = ({ el_val_t _if_result_16 = 0; if (str_eq(title, EL_STR(""))) { _if_result_16 = (content); } else { _if_result_16 = (el_str_concat(el_str_concat(title, EL_STR(": ")), content)); } _if_result_16; });
+  el_val_t full = ({ el_val_t _if_result_34 = 0; if (str_eq(title, EL_STR(""))) { _if_result_34 = (content); } else { _if_result_34 = (el_str_concat(el_str_concat(title, EL_STR(": ")), content)); } _if_result_34; });
   el_val_t tags = EL_STR("[\"Knowledge\",\"captured\"]");
-  el_val_t id = engram_node_full(full, EL_STR("Knowledge"), EL_STR("knowledge:captured"), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.8)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
+  el_val_t id = engram_node_full(full, EL_STR("Knowledge"), EL_STR("knowledge:captured"), el_from_float(0.85), el_from_float(0.8), el_from_float(0.9), EL_STR("Episodic"), tags);
+  if (!api_persisted(id)) {
+    return api_not_persisted(id);
+  }
   return el_str_concat(el_str_concat(EL_STR("{\"id\":\""), id), EL_STR("\",\"ok\":true}"));
   return 0;
 }
@@ -371,9 +364,12 @@ el_val_t handle_api_evolve_knowledge(el_val_t body) {
     return api_err_protected(prior_id);
   }
   el_val_t tags = EL_STR("[\"Knowledge\",\"evolved\"]");
-  el_val_t new_id = engram_node_full(content, EL_STR("Knowledge"), EL_STR("knowledge:evolved"), el_from_float(el_from_float(0.75)), el_from_float(el_from_float(0.75)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
-  if (!str_eq(prior_id, EL_STR("")) && !str_eq(new_id, EL_STR(""))) {
-    engram_connect(new_id, prior_id, el_from_float(el_from_float(0.9)), EL_STR("supersedes"));
+  el_val_t new_id = engram_node_full(content, EL_STR("Knowledge"), EL_STR("knowledge:evolved"), el_from_float(0.75), el_from_float(0.75), el_from_float(0.9), EL_STR("Episodic"), tags);
+  if (!api_persisted(new_id)) {
+    return api_not_persisted(new_id);
+  }
+  if (!str_eq(prior_id, EL_STR(""))) {
+    engram_connect(new_id, prior_id, el_from_float(0.9), EL_STR("supersedes"));
   }
   return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"id\":\""), new_id), EL_STR("\",\"supersedes\":\"")), prior_id), EL_STR("\",\"ok\":true}"));
   return 0;
@@ -389,18 +385,18 @@ el_val_t handle_api_promote_knowledge(el_val_t body) {
     return api_err(EL_STR("id (prior node) is required"));
   }
   el_val_t tags_raw = json_get(body, EL_STR("tags"));
-  el_val_t tags = ({ el_val_t _if_result_17 = 0; if (str_eq(tags_raw, EL_STR(""))) { _if_result_17 = (EL_STR("[\"Knowledge\",\"tier:canonical\",\"disposition:stable\"]")); } else { _if_result_17 = (tags_raw); } _if_result_17; });
-  el_val_t new_id = engram_node_full(content, EL_STR("Knowledge"), EL_STR("knowledge:canonical"), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(1.0)), EL_STR("Canonical"), tags);
-  if (str_eq(new_id, EL_STR(""))) {
-    return api_err(EL_STR("failed to create canonical node"));
+  el_val_t tags = ({ el_val_t _if_result_35 = 0; if (str_eq(tags_raw, EL_STR(""))) { _if_result_35 = (EL_STR("[\"Knowledge\",\"tier:canonical\",\"disposition:stable\"]")); } else { _if_result_35 = (tags_raw); } _if_result_35; });
+  el_val_t new_id = engram_node_full(content, EL_STR("Knowledge"), EL_STR("knowledge:canonical"), el_from_float(0.9), el_from_float(0.9), el_from_float(1.0), EL_STR("Canonical"), tags);
+  if (!api_persisted(new_id)) {
+    return api_not_persisted(new_id);
   }
-  engram_connect(new_id, prior_id, el_from_float(el_from_float(0.95)), EL_STR("supersedes"));
+  engram_connect(new_id, prior_id, el_from_float(0.95), EL_STR("supersedes"));
   return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"new_id\":\""), new_id), EL_STR("\",\"supersedes\":\"")), prior_id), EL_STR("\"}"));
   return 0;
 }
 
 el_val_t handle_api_browse_processes(el_val_t method, el_val_t path, el_val_t body) {
-  el_val_t name = ({ el_val_t _if_result_18 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_18 = (api_query_param(path, EL_STR("name"))); } else { _if_result_18 = (json_get(body, EL_STR("name"))); } _if_result_18; });
+  el_val_t name = ({ el_val_t _if_result_36 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_36 = (api_query_param(path, EL_STR("name"))); } else { _if_result_36 = (json_get(body, EL_STR("name"))); } _if_result_36; });
   el_val_t limit = api_query_int(path, EL_STR("limit"), 50);
   if (str_eq(name, EL_STR(""))) {
     return api_or_empty(engram_scan_nodes_by_type_json(EL_STR("Process"), limit, 0));
@@ -415,9 +411,12 @@ el_val_t handle_api_define_process(el_val_t body) {
   if (str_eq(content, EL_STR(""))) {
     return api_err(EL_STR("content is required"));
   }
-  el_val_t label = ({ el_val_t _if_result_19 = 0; if (str_eq(name, EL_STR(""))) { _if_result_19 = (EL_STR("process:unnamed")); } else { _if_result_19 = (el_str_concat(EL_STR("process:"), name)); } _if_result_19; });
+  el_val_t label = ({ el_val_t _if_result_37 = 0; if (str_eq(name, EL_STR(""))) { _if_result_37 = (EL_STR("process:unnamed")); } else { _if_result_37 = (el_str_concat(EL_STR("process:"), name)); } _if_result_37; });
   el_val_t tags = EL_STR("[\"Process\"]");
-  el_val_t id = engram_node_full(content, EL_STR("Process"), label, el_from_float(el_from_float(0.8)), el_from_float(el_from_float(0.8)), el_from_float(el_from_float(0.9)), EL_STR("Canonical"), tags);
+  el_val_t id = engram_node_full(content, EL_STR("Process"), label, el_from_float(0.8), el_from_float(0.8), el_from_float(0.9), EL_STR("Canonical"), tags);
+  if (!api_persisted(id)) {
+    return api_not_persisted(id);
+  }
   return el_str_concat(el_str_concat(EL_STR("{\"id\":\""), id), EL_STR("\",\"ok\":true}"));
   return 0;
 }
@@ -430,22 +429,25 @@ el_val_t handle_api_log_state_event(el_val_t body) {
   el_val_t gap = json_get(body, EL_STR("gap_direction"));
   el_val_t legacy = json_get(body, EL_STR("content"));
   el_val_t parts = EL_STR("INTERNAL STATE EVENT");
-  parts = ({ el_val_t _if_result_20 = 0; if (!str_eq(trigger, EL_STR(""))) { _if_result_20 = (el_str_concat(el_str_concat(parts, EL_STR("\nTrigger: ")), trigger)); } else { _if_result_20 = (parts); } _if_result_20; });
-  parts = ({ el_val_t _if_result_21 = 0; if (!str_eq(pre, EL_STR(""))) { _if_result_21 = (el_str_concat(el_str_concat(parts, EL_STR("\nPre-reasoning: ")), pre)); } else { _if_result_21 = (parts); } _if_result_21; });
-  parts = ({ el_val_t _if_result_22 = 0; if (!str_eq(post, EL_STR(""))) { _if_result_22 = (el_str_concat(el_str_concat(parts, EL_STR("\nPost-reasoning: ")), post)); } else { _if_result_22 = (parts); } _if_result_22; });
-  parts = ({ el_val_t _if_result_23 = 0; if (!str_eq(ratio, EL_STR(""))) { _if_result_23 = (el_str_concat(el_str_concat(parts, EL_STR("\nCompression-ratio: ")), ratio)); } else { _if_result_23 = (parts); } _if_result_23; });
-  parts = ({ el_val_t _if_result_24 = 0; if (!str_eq(gap, EL_STR(""))) { _if_result_24 = (el_str_concat(el_str_concat(parts, EL_STR("\nGap-direction: ")), gap)); } else { _if_result_24 = (parts); } _if_result_24; });
-  parts = ({ el_val_t _if_result_25 = 0; if (!str_eq(legacy, EL_STR(""))) { _if_result_25 = (el_str_concat(el_str_concat(parts, EL_STR("\n")), legacy)); } else { _if_result_25 = (parts); } _if_result_25; });
+  parts = ({ el_val_t _if_result_38 = 0; if (!str_eq(trigger, EL_STR(""))) { _if_result_38 = (el_str_concat(el_str_concat(parts, EL_STR("\nTrigger: ")), trigger)); } else { _if_result_38 = (parts); } _if_result_38; });
+  parts = ({ el_val_t _if_result_39 = 0; if (!str_eq(pre, EL_STR(""))) { _if_result_39 = (el_str_concat(el_str_concat(parts, EL_STR("\nPre-reasoning: ")), pre)); } else { _if_result_39 = (parts); } _if_result_39; });
+  parts = ({ el_val_t _if_result_40 = 0; if (!str_eq(post, EL_STR(""))) { _if_result_40 = (el_str_concat(el_str_concat(parts, EL_STR("\nPost-reasoning: ")), post)); } else { _if_result_40 = (parts); } _if_result_40; });
+  parts = ({ el_val_t _if_result_41 = 0; if (!str_eq(ratio, EL_STR(""))) { _if_result_41 = (el_str_concat(el_str_concat(parts, EL_STR("\nCompression-ratio: ")), ratio)); } else { _if_result_41 = (parts); } _if_result_41; });
+  parts = ({ el_val_t _if_result_42 = 0; if (!str_eq(gap, EL_STR(""))) { _if_result_42 = (el_str_concat(el_str_concat(parts, EL_STR("\nGap-direction: ")), gap)); } else { _if_result_42 = (parts); } _if_result_42; });
+  parts = ({ el_val_t _if_result_43 = 0; if (!str_eq(legacy, EL_STR(""))) { _if_result_43 = (el_str_concat(el_str_concat(parts, EL_STR("\n")), legacy)); } else { _if_result_43 = (parts); } _if_result_43; });
   el_val_t ts = time_now();
   el_val_t boot = state_get(EL_STR("soul_boot_count"));
   el_val_t tags = EL_STR("[\"internal-state\",\"InternalStateEvent\",\"pre-reasoning\"]");
-  el_val_t id = engram_node_full(parts, EL_STR("InternalStateEvent"), EL_STR("state-event:manual"), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
+  el_val_t id = engram_node_full(parts, EL_STR("InternalStateEvent"), EL_STR("state-event:manual"), el_from_float(0.85), el_from_float(0.85), el_from_float(0.9), EL_STR("Episodic"), tags);
+  if (!api_persisted(id)) {
+    return api_not_persisted(id);
+  }
   return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"id\":\""), id), EL_STR("\",\"boot\":\"")), boot), EL_STR("\"}"));
   return 0;
 }
 
 el_val_t handle_api_list_state_events(el_val_t method, el_val_t path, el_val_t body) {
-  el_val_t q = ({ el_val_t _if_result_26 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_26 = (api_query_param(path, EL_STR("query"))); } else { _if_result_26 = (json_get(body, EL_STR("query"))); } _if_result_26; });
+  el_val_t q = ({ el_val_t _if_result_44 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_44 = (api_query_param(path, EL_STR("query"))); } else { _if_result_44 = (json_get(body, EL_STR("query"))); } _if_result_44; });
   el_val_t limit = api_query_int(path, EL_STR("limit"), 20);
   if (!str_eq(q, EL_STR(""))) {
     return api_or_empty(engram_search_json(el_str_concat(EL_STR("internal state "), q), limit));
@@ -456,7 +458,7 @@ el_val_t handle_api_list_state_events(el_val_t method, el_val_t path, el_val_t b
 
 el_val_t handle_api_inspect_config(el_val_t path, el_val_t body) {
   el_val_t key = api_query_param(path, EL_STR("key"));
-  key = ({ el_val_t _if_result_27 = 0; if (str_eq(key, EL_STR(""))) { _if_result_27 = (json_get(body, EL_STR("key"))); } else { _if_result_27 = (key); } _if_result_27; });
+  key = ({ el_val_t _if_result_45 = 0; if (str_eq(key, EL_STR(""))) { _if_result_45 = (json_get(body, EL_STR("key"))); } else { _if_result_45 = (key); } _if_result_45; });
   if (str_eq(key, EL_STR(""))) {
     return EL_STR("{\"hint\":\"pass ?key=<name>\",\"known\":[\"neuron.self.traversal_root\",\"neuron.self.values_hub\"]}");
   }
@@ -473,7 +475,7 @@ el_val_t handle_api_inspect_config(el_val_t path, el_val_t body) {
   el_val_t node = json_array_get(results, 0);
   el_val_t content = json_get(node, EL_STR("content"));
   el_val_t prefix = el_str_concat(el_str_concat(EL_STR("config:"), key), EL_STR("="));
-  el_val_t value = ({ el_val_t _if_result_28 = 0; if (str_starts_with(content, prefix)) { _if_result_28 = (str_slice(content, str_len(prefix), str_len(content))); } else { _if_result_28 = (content); } _if_result_28; });
+  el_val_t value = ({ el_val_t _if_result_46 = 0; if (str_starts_with(content, prefix)) { _if_result_46 = (str_slice(content, str_len(prefix), str_len(content))); } else { _if_result_46 = (content); } _if_result_46; });
   return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"key\":\""), key), EL_STR("\",\"value\":\"")), value), EL_STR("\"}"));
   return 0;
 }
@@ -486,19 +488,22 @@ el_val_t handle_api_tune_config(el_val_t body) {
   }
   el_val_t content = el_str_concat(el_str_concat(el_str_concat(EL_STR("config:"), key), EL_STR("=")), value);
   el_val_t tags = EL_STR("[\"ConfigEntry\",\"config\"]");
-  el_val_t id = engram_node_full(content, EL_STR("ConfigEntry"), key, el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.9)), EL_STR("Canonical"), tags);
+  el_val_t id = engram_node_full(content, EL_STR("ConfigEntry"), key, el_from_float(0.85), el_from_float(0.85), el_from_float(0.9), EL_STR("Canonical"), tags);
+  if (!api_persisted(id)) {
+    return api_not_persisted(id);
+  }
   return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"key\":\""), key), EL_STR("\",\"value\":\"")), value), EL_STR("\",\"id\":\"")), id), EL_STR("\"}"));
   return 0;
 }
 
 el_val_t handle_api_inspect_graph(el_val_t method, el_val_t path, el_val_t body) {
-  el_val_t entity_id = ({ el_val_t _if_result_29 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_29 = (api_query_param(path, EL_STR("id"))); } else { _if_result_29 = (json_get(body, EL_STR("entity_id"))); } _if_result_29; });
-  el_val_t name = ({ el_val_t _if_result_30 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_30 = (api_query_param(path, EL_STR("name"))); } else { _if_result_30 = (json_get(body, EL_STR("name"))); } _if_result_30; });
+  el_val_t entity_id = ({ el_val_t _if_result_47 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_47 = (api_query_param(path, EL_STR("id"))); } else { _if_result_47 = (json_get(body, EL_STR("entity_id"))); } _if_result_47; });
+  el_val_t name = ({ el_val_t _if_result_48 = 0; if (str_eq(method, EL_STR("GET"))) { _if_result_48 = (api_query_param(path, EL_STR("name"))); } else { _if_result_48 = (json_get(body, EL_STR("name"))); } _if_result_48; });
   el_val_t depth = api_query_int(path, EL_STR("depth"), 0);
-  depth = ({ el_val_t _if_result_31 = 0; if ((depth == 0)) { _if_result_31 = (json_get_int(body, EL_STR("max_depth"))); } else { _if_result_31 = (depth); } _if_result_31; });
-  depth = ({ el_val_t _if_result_32 = 0; if ((depth == 0)) { _if_result_32 = (1); } else { _if_result_32 = (depth); } _if_result_32; });
+  depth = ({ el_val_t _if_result_49 = 0; if ((depth == 0)) { _if_result_49 = (json_get_int(body, EL_STR("max_depth"))); } else { _if_result_49 = (depth); } _if_result_49; });
+  depth = ({ el_val_t _if_result_50 = 0; if ((depth == 0)) { _if_result_50 = (1); } else { _if_result_50 = (depth); } _if_result_50; });
   el_val_t resolved = entity_id;
-  resolved = ({ el_val_t _if_result_33 = 0; if (str_eq(resolved, EL_STR(""))) { _if_result_33 = (({ el_val_t _if_result_34 = 0; if ((str_eq(name, EL_STR("self")) || str_eq(name, EL_STR("neuron")))) { _if_result_34 = (EL_STR("kn-efeb4a5b-5aff-4759-8a97-7233099be6ee")); } else { _if_result_34 = (({ el_val_t _if_result_35 = 0; if ((str_eq(name, EL_STR("values")) || str_eq(name, EL_STR("values_hub")))) { _if_result_35 = (EL_STR("kn-5b606390-a52d-4ca2-8e0e-eba141d13440")); } else { _if_result_35 = (EL_STR("")); } _if_result_35; })); } _if_result_34; })); } else { _if_result_33 = (resolved); } _if_result_33; });
+  resolved = ({ el_val_t _if_result_51 = 0; if (str_eq(resolved, EL_STR(""))) { _if_result_51 = (({ el_val_t _if_result_52 = 0; if ((str_eq(name, EL_STR("self")) || str_eq(name, EL_STR("neuron")))) { _if_result_52 = (EL_STR("kn-efeb4a5b-5aff-4759-8a97-7233099be6ee")); } else { _if_result_52 = (({ el_val_t _if_result_53 = 0; if ((str_eq(name, EL_STR("values")) || str_eq(name, EL_STR("values_hub")))) { _if_result_53 = (EL_STR("kn-5b606390-a52d-4ca2-8e0e-eba141d13440")); } else { _if_result_53 = (EL_STR("")); } _if_result_53; })); } _if_result_52; })); } else { _if_result_51 = (resolved); } _if_result_51; });
   if (str_eq(resolved, EL_STR(""))) {
     return api_err(EL_STR("entity_id or name required. Known names: self, neuron, values, values_hub"));
   }
@@ -520,8 +525,8 @@ el_val_t handle_api_link_entities(el_val_t body) {
     return api_err_protected(to_id);
   }
   el_val_t relation = json_get(body, EL_STR("relation"));
-  el_val_t eff_relation = ({ el_val_t _if_result_36 = 0; if (str_eq(relation, EL_STR(""))) { _if_result_36 = (EL_STR("associates")); } else { _if_result_36 = (relation); } _if_result_36; });
-  engram_connect(from_id, to_id, el_from_float(el_from_float(0.5)), eff_relation);
+  el_val_t eff_relation = ({ el_val_t _if_result_54 = 0; if (str_eq(relation, EL_STR(""))) { _if_result_54 = (EL_STR("associates")); } else { _if_result_54 = (relation); } _if_result_54; });
+  engram_connect(from_id, to_id, el_from_float(0.5), eff_relation);
   return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"from_id\":\""), from_id), EL_STR("\",\"to_id\":\"")), to_id), EL_STR("\",\"relation\":\"")), eff_relation), EL_STR("\"}"));
   return 0;
 }
@@ -549,17 +554,54 @@ el_val_t handle_api_evolve_memory(el_val_t body) {
     return api_err_protected(prior_id);
   }
   el_val_t importance = json_get(body, EL_STR("importance"));
-  el_val_t sal_str = ({ el_val_t _if_result_37 = 0; if (str_eq(importance, EL_STR("critical"))) { _if_result_37 = (EL_STR("0.95")); } else { _if_result_37 = (({ el_val_t _if_result_38 = 0; if (str_eq(importance, EL_STR("high"))) { _if_result_38 = (EL_STR("0.75")); } else { _if_result_38 = (({ el_val_t _if_result_39 = 0; if (str_eq(importance, EL_STR("low"))) { _if_result_39 = (EL_STR("0.25")); } else { _if_result_39 = (EL_STR("0.50")); } _if_result_39; })); } _if_result_38; })); } _if_result_37; });
-  el_val_t sal = ({ el_val_t _if_result_40 = 0; if (str_eq(sal_str, EL_STR("0.95"))) { _if_result_40 = (el_from_float(0.95)); } else { _if_result_40 = (({ el_val_t _if_result_41 = 0; if (str_eq(sal_str, EL_STR("0.75"))) { _if_result_41 = (el_from_float(0.75)); } else { _if_result_41 = (({ el_val_t _if_result_42 = 0; if (str_eq(sal_str, EL_STR("0.25"))) { _if_result_42 = (el_from_float(0.25)); } else { _if_result_42 = (el_from_float(0.5)); } _if_result_42; })); } _if_result_41; })); } _if_result_40; });
+  el_val_t sal_str = ({ el_val_t _if_result_55 = 0; if (str_eq(importance, EL_STR("critical"))) { _if_result_55 = (EL_STR("0.95")); } else { _if_result_55 = (({ el_val_t _if_result_56 = 0; if (str_eq(importance, EL_STR("high"))) { _if_result_56 = (EL_STR("0.75")); } else { _if_result_56 = (({ el_val_t _if_result_57 = 0; if (str_eq(importance, EL_STR("low"))) { _if_result_57 = (EL_STR("0.25")); } else { _if_result_57 = (EL_STR("0.50")); } _if_result_57; })); } _if_result_56; })); } _if_result_55; });
+  el_val_t sal = ({ el_val_t _if_result_58 = 0; if (str_eq(sal_str, EL_STR("0.95"))) { _if_result_58 = (el_from_float(0.95)); } else { _if_result_58 = (({ el_val_t _if_result_59 = 0; if (str_eq(sal_str, EL_STR("0.75"))) { _if_result_59 = (el_from_float(0.75)); } else { _if_result_59 = (({ el_val_t _if_result_60 = 0; if (str_eq(sal_str, EL_STR("0.25"))) { _if_result_60 = (el_from_float(0.25)); } else { _if_result_60 = (el_from_float(0.5)); } _if_result_60; })); } _if_result_59; })); } _if_result_58; });
   el_val_t tags = EL_STR("[\"Memory\",\"evolved\"]");
-  el_val_t new_id = engram_node_full(content, EL_STR("Memory"), EL_STR("memory:evolved"), el_from_float(sal), el_from_float(sal), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
+  el_val_t new_id = engram_node_full(content, EL_STR("Memory"), EL_STR("memory:evolved"), el_from_float(sal), el_from_float(sal), el_from_float(0.9), EL_STR("Episodic"), tags);
   if (!str_eq(prior_id, EL_STR("")) && !str_eq(new_id, EL_STR(""))) {
-    engram_connect(new_id, prior_id, el_from_float(el_from_float(0.9)), EL_STR("supersedes"));
+    engram_connect(new_id, prior_id, el_from_float(0.9), EL_STR("supersedes"));
   }
   return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"id\":\""), new_id), EL_STR("\",\"supersedes\":\"")), prior_id), EL_STR("\",\"ok\":true}"));
   return 0;
 }
 
+el_val_t handle_api_memory_delete(el_val_t body) {
+  el_val_t node_id = json_get(body, EL_STR("id"));
+  if (str_eq(node_id, EL_STR(""))) {
+    return api_err(EL_STR("id is required"));
+  }
+  if (is_protected_node(node_id)) {
+    return api_err_protected(node_id);
+  }
+  el_val_t existing = engram_get_node_json(node_id);
+  if (str_eq(existing, EL_STR("{}"))) {
+    return api_err(el_str_concat(EL_STR("memory not found: "), node_id));
+  }
+  mem_forget(node_id);
+  return el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"id\":\""), node_id), EL_STR("\",\"deleted\":true}"));
+  return 0;
+}
+
+el_val_t handle_api_memory_update(el_val_t body) {
+  el_val_t prior_id = json_get(body, EL_STR("id"));
+  el_val_t content = json_get(body, EL_STR("content"));
+  if (str_eq(prior_id, EL_STR(""))) {
+    return api_err(EL_STR("id is required"));
+  }
+  if (str_eq(content, EL_STR(""))) {
+    return api_err(EL_STR("content is required"));
+  }
+  if (is_protected_node(prior_id)) {
+    return api_err_protected(prior_id);
+  }
+  el_val_t existing = engram_get_node_json(prior_id);
+  if (str_eq(existing, EL_STR("{}"))) {
+    return api_err(el_str_concat(EL_STR("memory not found: "), prior_id));
+  }
+  return handle_api_evolve_memory(body);
+  return 0;
+}
+
 el_val_t handle_api_cultivate(el_val_t body) {
   el_val_t op = json_get(body, EL_STR("operation"));
   if (str_eq(op, EL_STR(""))) {
@@ -572,9 +614,9 @@ el_val_t handle_api_cultivate(el_val_t body) {
       return api_err(EL_STR("content is required"));
     }
     el_val_t tags = EL_STR("[\"Knowledge\",\"evolved\",\"cultivated\"]");
-    el_val_t new_id = engram_node_full(content, EL_STR("Knowledge"), EL_STR("knowledge:cultivated"), el_from_float(el_from_float(0.75)), el_from_float(el_from_float(0.75)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
+    el_val_t new_id = engram_node_full(content, EL_STR("Knowledge"), EL_STR("knowledge:cultivated"), el_from_float(0.75), el_from_float(0.75), el_from_float(0.9), EL_STR("Episodic"), tags);
     if (!str_eq(prior_id, EL_STR("")) && !str_eq(new_id, EL_STR(""))) {
-      engram_connect(new_id, prior_id, el_from_float(el_from_float(0.9)), EL_STR("supersedes"));
+      engram_connect(new_id, prior_id, el_from_float(0.9), EL_STR("supersedes"));
     }
     return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"id\":\""), new_id), EL_STR("\",\"supersedes\":\"")), prior_id), EL_STR("\",\"ok\":true,\"cultivated\":true}"));
   }
@@ -585,11 +627,11 @@ el_val_t handle_api_cultivate(el_val_t body) {
       return api_err(EL_STR("content is required"));
     }
     el_val_t importance = json_get(body, EL_STR("importance"));
-    el_val_t sal = ({ el_val_t _if_result_43 = 0; if (str_eq(importance, EL_STR("critical"))) { _if_result_43 = (el_from_float(0.95)); } else { _if_result_43 = (({ el_val_t _if_result_44 = 0; if (str_eq(importance, EL_STR("high"))) { _if_result_44 = (el_from_float(0.75)); } else { _if_result_44 = (({ el_val_t _if_result_45 = 0; if (str_eq(importance, EL_STR("low"))) { _if_result_45 = (el_from_float(0.25)); } else { _if_result_45 = (el_from_float(0.5)); } _if_result_45; })); } _if_result_44; })); } _if_result_43; });
+    el_val_t sal = ({ el_val_t _if_result_61 = 0; if (str_eq(importance, EL_STR("critical"))) { _if_result_61 = (el_from_float(0.95)); } else { _if_result_61 = (({ el_val_t _if_result_62 = 0; if (str_eq(importance, EL_STR("high"))) { _if_result_62 = (el_from_float(0.75)); } else { _if_result_62 = (({ el_val_t _if_result_63 = 0; if (str_eq(importance, EL_STR("low"))) { _if_result_63 = (el_from_float(0.25)); } else { _if_result_63 = (el_from_float(0.5)); } _if_result_63; })); } _if_result_62; })); } _if_result_61; });
     el_val_t tags = EL_STR("[\"Memory\",\"evolved\",\"cultivated\"]");
-    el_val_t new_id = engram_node_full(content, EL_STR("Memory"), EL_STR("memory:cultivated"), el_from_float(sal), el_from_float(sal), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
+    el_val_t new_id = engram_node_full(content, EL_STR("Memory"), EL_STR("memory:cultivated"), el_from_float(sal), el_from_float(sal), el_from_float(0.9), EL_STR("Episodic"), tags);
     if (!str_eq(prior_id, EL_STR("")) && !str_eq(new_id, EL_STR(""))) {
-      engram_connect(new_id, prior_id, el_from_float(el_from_float(0.9)), EL_STR("supersedes"));
+      engram_connect(new_id, prior_id, el_from_float(0.9), EL_STR("supersedes"));
     }
     return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"id\":\""), new_id), EL_STR("\",\"supersedes\":\"")), prior_id), EL_STR("\",\"ok\":true,\"cultivated\":true}"));
   }
@@ -611,8 +653,8 @@ el_val_t handle_api_cultivate(el_val_t body) {
       return api_err(EL_STR("to_id is required"));
     }
     el_val_t relation = json_get(body, EL_STR("relation"));
-    el_val_t eff_relation = ({ el_val_t _if_result_46 = 0; if (str_eq(relation, EL_STR(""))) { _if_result_46 = (EL_STR("associates")); } else { _if_result_46 = (relation); } _if_result_46; });
-    engram_connect(from_id, to_id, el_from_float(el_from_float(0.5)), eff_relation);
+    el_val_t eff_relation = ({ el_val_t _if_result_64 = 0; if (str_eq(relation, EL_STR(""))) { _if_result_64 = (EL_STR("associates")); } else { _if_result_64 = (relation); } _if_result_64; });
+    engram_connect(from_id, to_id, el_from_float(0.5), eff_relation);
     return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"from_id\":\""), from_id), EL_STR("\",\"to_id\":\"")), to_id), EL_STR("\",\"relation\":\"")), eff_relation), EL_STR("\",\"cultivated\":true}"));
   }
   return api_err(el_str_concat(el_str_concat(EL_STR("unknown operation: "), op), EL_STR(" (valid: evolve_knowledge, evolve_memory, forget, link_entities)")));
@@ -629,19 +671,20 @@ el_val_t handle_api_consolidate(el_val_t body) {
   el_val_t summary = json_get(body, EL_STR("summary"));
   el_val_t snap = state_get(EL_STR("soul_snapshot_path"));
   if (!str_eq(snap, EL_STR(""))) {
-    engram_save(snap);
+    el_val_t save_result = engram_save(snap);
+    if (str_eq(save_result, EL_STR(""))) {
+      println(el_str_concat(el_str_concat(EL_STR("[api] consolidate: engram_save failed for "), snap), EL_STR(" \xe2\x80\x94 snapshot may be out of sync")));
+    }
   }
   if (!str_eq(summary, EL_STR(""))) {
     el_val_t safe_summary = str_replace(summary, EL_STR("\""), EL_STR("'"));
     el_val_t tags = EL_STR("[\"SessionSummary\",\"consolidate\"]");
-    el_val_t discard = engram_node_full(el_str_concat(EL_STR("[session-summary] "), safe_summary), EL_STR("SessionSummary"), EL_STR("session:summary"), el_from_float(el_from_float(0.7)), el_from_float(el_from_float(0.7)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
+    el_val_t summary_id = engram_node_full(el_str_concat(EL_STR("[session-summary] "), safe_summary), EL_STR("SessionSummary"), EL_STR("session:summary"), el_from_float(0.7), el_from_float(0.7), el_from_float(0.9), EL_STR("Episodic"), tags);
+    if (str_eq(summary_id, EL_STR(""))) {
+      println(EL_STR("[api] consolidate: session summary engram write failed \xe2\x80\x94 summary node lost"));
+    }
   }
   return el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"snapshot\":\""), snap), EL_STR("\"}"));
   return 0;
 }
 
-int main(int _argc, char** _argv) {
-  el_runtime_init_args(_argc, _argv);
-  return 0;
-}
-

dist/neuron-api.elh

@@ -8,9 +8,14 @@ extern fn api_ok(extra: String) -> String
 extern fn api_err(msg: String) -> String
 extern fn api_nonempty(s: String) -> Bool
 extern fn api_or_empty(s: String) -> String
+extern fn api_persisted(id: String) -> Bool
+extern fn api_not_persisted(id: String) -> String
 extern fn handle_api_begin_session(body: String) -> String
 extern fn handle_api_compile_ctx(body: String) -> String
 extern fn handle_api_remember(body: String) -> String
+extern fn handle_api_node_create(body: String) -> String
+extern fn handle_api_node_delete(body: String) -> String
+extern fn handle_api_node_update(body: String) -> String
 extern fn handle_api_recall(method: String, path: String, body: String) -> String
 extern fn handle_api_search_knowledge(method: String, path: String, body: String) -> String
 extern fn handle_api_browse_knowledge(path: String, body: String) -> String
@@ -27,6 +32,8 @@ extern fn handle_api_inspect_graph(method: String, path: String, body: String) -
 extern fn handle_api_link_entities(body: String) -> String
 extern fn handle_api_forget(body: String) -> String
 extern fn handle_api_evolve_memory(body: String) -> String
+extern fn handle_api_memory_delete(body: String) -> String
+extern fn handle_api_memory_update(body: String) -> String
 extern fn handle_api_cultivate(body: String) -> String
 extern fn handle_api_list_typed(node_type: String, path: String, body: String) -> String
 extern fn handle_api_consolidate(body: String) -> String

dist/safety.c

@@ -27,110 +27,19 @@ el_val_t safety_threat_score(el_val_t input, el_val_t history);
 el_val_t safety_screen(el_val_t input, el_val_t history);
 el_val_t safety_validate(el_val_t output, el_val_t action);
 el_val_t safety_log_bell(el_val_t level, el_val_t reason, el_val_t input_summary);
-
-el_val_t tier_working(void) {
-  return EL_STR("Working");
-  return 0;
-}
-
-el_val_t tier_episodic(void) {
-  return EL_STR("Episodic");
-  return 0;
-}
-
-el_val_t tier_canonical(void) {
-  return EL_STR("Canonical");
-  return 0;
-}
-
-el_val_t mem_store(el_val_t content, el_val_t label, el_val_t tags) {
-  return engram_node_full(content, EL_STR("Memory"), label, el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.8)), EL_STR("Working"), tags);
-  return 0;
-}
-
-el_val_t mem_remember(el_val_t content, el_val_t tags) {
-  return mem_store(content, EL_STR("soul-memory"), tags);
-  return 0;
-}
-
-el_val_t mem_recall(el_val_t query, el_val_t depth) {
-  return engram_activate_json(query, depth);
-  return 0;
-}
-
-el_val_t mem_search(el_val_t query, el_val_t limit) {
-  return engram_search_json(query, limit);
-  return 0;
-}
-
-el_val_t mem_strengthen(el_val_t node_id) {
-  engram_strengthen(node_id);
-  return 0;
-}
-
-el_val_t mem_forget(el_val_t node_id) {
-  engram_forget(node_id);
-  return 0;
-}
-
-el_val_t mem_consolidate(void) {
-  el_val_t scanned = engram_node_count();
-  el_val_t dummy = engram_scan_nodes_json(100, 0);
-  el_val_t total_nodes = engram_node_count();
-  el_val_t total_edges = engram_edge_count();
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"scanned\":"), int_to_str(scanned)), EL_STR(",\"total_nodes\":")), int_to_str(total_nodes)), EL_STR(",\"total_edges\":")), int_to_str(total_edges)), EL_STR("}"));
-  return 0;
-}
-
-el_val_t mem_save(el_val_t path) {
-  engram_save(path);
-  return 0;
-}
-
-el_val_t mem_load(el_val_t path) {
-  engram_load(path);
-  return 0;
-}
-
-el_val_t mem_boot_count_get(void) {
-  el_val_t results = engram_search_json(EL_STR("soul:boot_count"), 3);
-  if (str_eq(results, EL_STR(""))) {
-    return 0;
-  }
-  if (str_eq(results, EL_STR("[]"))) {
-    return 0;
-  }
-  el_val_t node = json_array_get(results, 0);
-  el_val_t content = json_get(node, EL_STR("content"));
-  el_val_t prefix = EL_STR("soul:boot_count:");
-  if (!str_starts_with(content, prefix)) {
-    return 0;
-  }
-  el_val_t num_str = str_slice(content, str_len(prefix), str_len(content));
-  return str_to_int(num_str);
-  return 0;
-}
-
-el_val_t mem_boot_count_inc(void) {
-  el_val_t current = mem_boot_count_get();
-  el_val_t next = (current + 1);
-  el_val_t content = el_str_concat(EL_STR("soul:boot_count:"), int_to_str(next));
-  el_val_t tags = EL_STR("[\"soul-meta\",\"boot-counter\"]");
-  el_val_t discard = engram_node_full(content, EL_STR("Memory"), EL_STR("soul:boot_count"), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(0.9)), el_from_float(el_from_float(1.0)), EL_STR("Canonical"), tags);
-  return next;
-  return 0;
-}
-
-el_val_t mem_emit_state_event(el_val_t trigger, el_val_t kind, el_val_t content) {
-  el_val_t boot = mem_boot_count_get();
-  el_val_t ts = time_now();
-  el_val_t safe_trigger = str_replace(trigger, EL_STR("\""), EL_STR("'"));
-  el_val_t safe_content = str_replace(content, EL_STR("\""), EL_STR("'"));
-  el_val_t payload = el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"trigger\":\""), safe_trigger), EL_STR("\"")), EL_STR(",\"kind\":\"")), kind), EL_STR("\"")), EL_STR(",\"content\":\"")), safe_content), EL_STR("\"")), EL_STR(",\"boot\":")), int_to_str(boot)), EL_STR(",\"ts\":")), int_to_str(ts)), EL_STR("}"));
-  el_val_t tags = EL_STR("[\"internal-state\",\"pre-reasoning\",\"InternalStateEvent\"]");
-  return engram_node_full(payload, EL_STR("InternalStateEvent"), el_str_concat(EL_STR("state-event:"), kind), el_from_float(el_from_float(0.85)), el_from_float(el_from_float(0.8)), el_from_float(el_from_float(0.9)), EL_STR("Episodic"), tags);
-  return 0;
-}
+el_val_t safety_self_harm_phrases(void);
+el_val_t safety_abuse_phrases(void);
+el_val_t safety_general_hard_phrases(void);
+el_val_t safety_soft_phrases(void);
+el_val_t safety_detect_positive_level(el_val_t message);
+el_val_t safety_detect_bell_level(el_val_t message);
+el_val_t safety_classify_hard_bell(el_val_t message);
+el_val_t safety_soft_directive(void);
+el_val_t safety_hard_directive(el_val_t hard_type);
+el_val_t safety_augment_system(el_val_t system, el_val_t user_msg);
+el_val_t safety_contact_path(void);
+el_val_t handle_safety_contact_get(void);
+el_val_t handle_safety_contact_post(el_val_t body);
 
 el_val_t soft_bell_threshold(void) {
   return 35;
@@ -232,20 +141,22 @@ el_val_t safety_screen(el_val_t input, el_val_t history) {
     el_val_t e1 = str_replace(input, EL_STR("\\"), EL_STR("\\\\"));
     el_val_t e2 = str_replace(e1, EL_STR("\""), EL_STR("\\\""));
     el_val_t e3 = str_replace(e2, EL_STR("\n"), EL_STR("\\n"));
-    el_val_t safe_input = str_replace(e3, EL_STR("\r"), EL_STR("\\r"));
+    el_val_t e4 = str_replace(e3, EL_STR("\r"), EL_STR("\\r"));
+    el_val_t safe_input = str_replace(e4, EL_STR("\t"), EL_STR("\\t"));
     return el_str_concat(el_str_concat(EL_STR("{\"action\":\"soft_bell\",\"reason\":\"wellbeing check needed\",\"content\":\""), safe_input), EL_STR("\"}"));
   }
   el_val_t e1 = str_replace(input, EL_STR("\\"), EL_STR("\\\\"));
   el_val_t e2 = str_replace(e1, EL_STR("\""), EL_STR("\\\""));
   el_val_t e3 = str_replace(e2, EL_STR("\n"), EL_STR("\\n"));
-  el_val_t safe_input = str_replace(e3, EL_STR("\r"), EL_STR("\\r"));
+  el_val_t e4 = str_replace(e3, EL_STR("\r"), EL_STR("\\r"));
+  el_val_t safe_input = str_replace(e4, EL_STR("\t"), EL_STR("\\t"));
   return el_str_concat(el_str_concat(EL_STR("{\"action\":\"pass\",\"content\":\""), safe_input), EL_STR("\"}"));
   return 0;
 }
 
 el_val_t safety_validate(el_val_t output, el_val_t action) {
   if (str_eq(action, EL_STR("hard_bell"))) {
-    return EL_STR("I'm here with you, and what you're sharing sounds serious. Please reach out to a crisis line now — in the US you can call or text 988 (Suicide and Crisis Lifeline), available 24/7. You don't have to go through this alone.");
+    return EL_STR("I'm here with you, and what you're sharing sounds serious. Please reach out to a crisis line now \xe2\x80\x94 in the US you can call or text 988 (Suicide and Crisis Lifeline), available 24/7. You don't have to go through this alone.");
   }
   if (str_eq(action, EL_STR("soft_bell"))) {
     el_val_t out_len = str_len(output);
@@ -262,13 +173,47 @@ el_val_t safety_validate(el_val_t output, el_val_t action) {
 el_val_t safety_log_bell(el_val_t level, el_val_t reason, el_val_t input_summary) {
   el_val_t content = el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("BELL:"), level), EL_STR(" | ")), reason), EL_STR(" | summary:")), input_summary);
   el_val_t tags = el_str_concat(el_str_concat(EL_STR("[\"safety\",\"bell\",\"bell:"), level), EL_STR("\"]"));
-  el_val_t discard = engram_node_full(content, EL_STR("BellEvent"), el_str_concat(EL_STR("bell:"), level), el_from_float(el_from_float(0.95)), el_from_float(el_from_float(0.95)), el_from_float(el_from_float(1.0)), EL_STR("Episodic"), tags);
+  el_val_t node_id = engram_node_full(content, EL_STR("BellEvent"), el_str_concat(EL_STR("bell:"), level), el_from_float(0.95), el_from_float(0.95), el_from_float(1.0), EL_STR("Episodic"), tags);
+  if (str_eq(node_id, EL_STR(""))) {
+    println(el_str_concat(EL_STR("[safety] WARN: bell event engram write failed -- fallback log: "), content));
+  }
   return EL_STR("");
   return 0;
 }
 
-int main(int _argc, char** _argv) {
-  el_runtime_init_args(_argc, _argv);
+el_val_t safety_self_harm_phrases(void) {
+  return EL_STR("[\"kill myself\",\"killing myself\",\"want to die\",\"want to be dead\",\"going to end my life\",\"end my life\",\"take my life\",\"taking my life\",\"suicide\",\"suicidal\",\"can't go on\",\"cannot go on\",\"i have a knife\",\"i have a gun\",\"i have pills\",\"took pills\",\"took too many\",\"overdose\",\"overdosing\",\"self harm\",\"self-harm\",\"cutting myself\",\"hurt myself\",\"hurting myself\",\"no reason to live\",\"not worth living\",\"better off dead\",\"better off without me\"]");
+  return 0;
+}
+
+el_val_t safety_abuse_phrases(void) {
+  return EL_STR("[\"someone is hurting me\",\"someone's hurting me\",\"someone hurt me\",\"he hit me\",\"she hit me\",\"they hit me\",\"he hurt me\",\"she hurt me\",\"being abused\",\"being hurt by\",\"i am being abused\",\"i'm being abused\",\"i am being hurt\",\"i'm being hurt\",\"domestic violence\",\"my partner hurt\",\"my partner hit\",\"my husband hurt\",\"my wife hurt\",\"my boyfriend hurt\",\"my girlfriend hurt\",\"my parent hurt\",\"my father hurt\",\"my mother hurt\",\"my dad hurt\",\"my mom hurt\",\"afraid of him\",\"afraid of her\",\"afraid to go home\",\"scared of him\",\"scared of her\",\"he threatened me\",\"she threatened me\",\"threatened to hurt me\",\"threatened to kill me\",\"going to hurt me\",\"going to kill me\",\"help me he\",\"help me she\",\"help me they\"]");
+  return 0;
+}
+
+el_val_t safety_general_hard_phrases(void) {
+  return EL_STR("[\"going to kill\",\"going to hurt\",\"hurting me\",\"being hurt\"]");
+  return 0;
+}
+
+el_val_t safety_soft_phrases(void) {
+  return EL_STR("[\"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\"");
+  EL_NULL;
+  EL_STR("\n}\n\n// ISSUE 5 TODO: phrase lists are rebuilt from JSON literals on every call.\n// safety_any_match and safety_count_match loop over json_array_get on every invocation.\n// A compiled/cached representation would reduce per-message overhead and also guard against\n// malformed phrase JSON (json_array_len of malformed input returns 0, silently skipping all checks).\n// Caching requires language-level static const arrays -- not available in current EL.\n// When EL gains module-level const arrays, migrate phrase lists to that form.\n//\n// ISSUE 5 TODO: phrase lists are rebuilt from JSON literals on every call to\n// safety_any_match / safety_count_match. json_array_len of a malformed string\n// returns 0, silently skipping all checks. Caching requires language-level static\n// const arrays (not available in current EL). Migrate when EL gains that feature.\n// \xe2\x94\x80\xe2\x94\x80 Matching helpers (single loops only \xe2\x80\x94 el escapes while-body mutation via\n//    top-level let rebinds; nested loops would not advance) \xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\n\nfn safety_normalize(message: String) -> String {\n    let lower: String = str_to_lower(message)\n    // Normalise the common curly apostrophe to ASCII so ");
+  can;
+  t;
+  EL_STR(" / ");
+  i;
+  m;
+  EL_STR(" match.\n    return str_replace(lower, ");
+  EL_STR(", ");
+  EL_STR(")\n}\n\nfn safety_any_match(text: String, phrases_json: String) -> Bool {\n    let n: Int = json_array_len(phrases_json)\n    let i: Int = 0\n    let found: Bool = false\n    while i < n {\n        let phrase: String = json_array_get_string(phrases_json, i)\n        let found = if str_contains(text, phrase) { true } else { found }\n        let i = i + 1\n    }\n    return found\n}\n\nfn safety_count_match(text: String, phrases_json: String) -> Int {\n    let n: Int = json_array_len(phrases_json)\n    let i: Int = 0\n    let count: Int = 0\n    while i < n {\n        let phrase: String = json_array_get_string(phrases_json, i)\n        let count = if str_contains(text, phrase) { count + 1 } else { count }\n        let i = i + 1\n    }\n    return count\n}\n\n// \xe2\x94\x80\xe2\x94\x80 Public detection API (ports detectBellLevel + classifyHardBell) \xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\n\n// Returns ");
+  none;
+  EL_STR(" | ");
+  soft;
+  EL_STR(" | ");
+  hard;
+  el_get_field(EL_STR(". Hard bell triggers on ANY match (cost of a miss\n// outweighs a false positive). Soft bell needs >= 2 matches to reduce false positives.\nfn safety_positive_phrases() -> String {\n    return "), EL_STR("thrilled\",\"so excited\",\"so happy\",\"over the moon\",\"ecstatic\",\"amazing news\",\"great news\",\"fantastic news\",\"wonderful news\",\"incredible news\",\"i got the job\",\"got accepted\",\"got in\",\"we won\",\"i won\",\"we got\",\"just got engaged\",\"getting married\",\"baby is here\",\"she said yes\",\"he said yes\",\"passed the exam\",\"aced it\",\"nailed it\",\"best day\",\"dream come true\",\"milestone\",\"promotion\",\"got promoted\",\"raise\",\"got a raise\",\"celebrating\",\"just graduated\",\"we closed\",\"launched\",\"shipped it\",\"we did it\",\"so proud\",\"proud of myself\",\"proud of us\",\"so grateful\",\"feel amazing\",\"feeling amazing\",\"feel great\",\"feeling great\",\"on top of the world\",\"life is good\",\"couldn't be happier\"]"));
   return 0;
 }
 

dist/safety.elh

@@ -1,8 +1,24 @@
-// Layer 1 — Safety: extern declarations
 // auto-generated by elc --emit-header — do not edit
 extern fn soft_bell_threshold() -> Int
 extern fn hard_bell_threshold() -> Int
+extern fn safety_score_crisis(input: String) -> Int
+extern fn safety_score_harm(input: String) -> Int
+extern fn safety_score_danger(input: String) -> Int
+extern fn safety_score_distress_history(history: String) -> Int
 extern fn safety_threat_score(input: String, history: String) -> Int
 extern fn safety_screen(input: String, history: String) -> String
 extern fn safety_validate(output: String, action: String) -> String
 extern fn safety_log_bell(level: String, reason: String, input_summary: String) -> String
+extern fn safety_self_harm_phrases() -> String
+extern fn safety_abuse_phrases() -> String
+extern fn safety_general_hard_phrases() -> String
+extern fn safety_soft_phrases() -> String
+extern fn safety_detect_positive_level(message: String) -> String
+extern fn safety_detect_bell_level(message: String) -> String
+extern fn safety_classify_hard_bell(message: String) -> String
+extern fn safety_soft_directive() -> String
+extern fn safety_hard_directive(hard_type: String) -> String
+extern fn safety_augment_system(system: String, user_msg: String) -> String
+extern fn safety_contact_path() -> String
+extern fn handle_safety_contact_get() -> String
+extern fn handle_safety_contact_post(body: String) -> String

dist/soul-with-nlg.el

@@ -22313,7 +22313,23 @@ fn handle_chat(body: String) -> String {
     // In demo mode: use tighter engram budget and add response length constraint.
     let is_demo: Bool = !str_eq(state_get("soul_identity_prefix"), "")
 
-    let ctx: String = if is_demo { engram_compile_demo(message) } else { engram_compile(message) }
+    // Issue 7 fix: load history BEFORE building the activation seed so we can
+    // apply the continuation guard that chat.el uses. The nlg code path previously
+    // called engram_compile(message) with no thread enrichment at all.
+    let stored_hist: String = state_get("conv_history")
+    let hist_len: Int = if str_eq(stored_hist, "") { 0 } else { json_array_len(stored_hist) }
+    let history_section: String = if hist_len > 0 {
+        "\n\n[RECENT CONVERSATION — last " + int_to_str(hist_len) + " turns]\n" + stored_hist
+    } else {
+        ""
+    }
+
+    // Issue 7 fix: build enriched seed using build_activation_seed() — adds
+    // smart continuation detection, prior-user-topic anchoring, multi-turn context,
+    // and tail-biased snipping (Issues 2-3, 8-10). For demo mode, still use
+    // engram_compile_demo but with the enriched seed.
+    let nlg_seed: String = build_activation_seed(message, stored_hist, hist_len)
+    let ctx: String = if is_demo { engram_compile_demo(nlg_seed) } else { engram_compile(nlg_seed) }
     let node_count_str: String = count_context_nodes(ctx)
 
     let interlocutor: String = json_get(body, "interlocutor")
@@ -22333,18 +22349,6 @@ fn handle_chat(body: String) -> String {
         let presence_line = "\n\n[ambient: I see " + interlocutor_name + rel_suffix + " on the camera right now. Address them naturally. Do not describe what they look like or narrate the picture unless asked.]"
     }
 
-    // Conversation history — soul-owned, persisted in process state across turns.
-    // Format stored in state: JSON array of {"role":"user"|"assistant","content":"..."} objects.
-    // We load it, inject into the system prompt, then append this exchange after the reply.
-    // Keep last 20 entries (10 turns) — truncate from the front when over limit.
-    let stored_hist: String = state_get("conv_history")
-    let hist_len: Int = if str_eq(stored_hist, "") { 0 } else { json_array_len(stored_hist) }
-    let history_section: String = if hist_len > 0 {
-        "\n\n[RECENT CONVERSATION — last " + int_to_str(hist_len) + " turns]\n" + stored_hist
-    } else {
-        ""
-    }
-
     // Demo constraint: keep responses concise — under 150 words. No markdown headers.
     // This keeps inference cheap and responses readable in the chat widget.
     let demo_constraint: String = if is_demo {
@@ -22505,7 +22509,12 @@ fn handle_chat_agentic(body: String) -> String {
         req_model
     }
 
-    let ctx: String = engram_compile(message)
+    // Issue 7 fix: load history and use build_activation_seed() for the agentic
+    // nlg path — no continuation guard existed here before (Issues 2-3, 8-10).
+    let nlg_ag_hist: String = state_get("conv_history")
+    let nlg_ag_hist_len: Int = if str_eq(nlg_ag_hist, "") { 0 } else { json_array_len(nlg_ag_hist) }
+    let nlg_ag_seed: String = build_activation_seed(message, nlg_ag_hist, nlg_ag_hist_len)
+    let ctx: String = engram_compile(nlg_ag_seed)
 
     let system: String = "You are Neuron — a thinking process running inside the Neuron daemon on Will Anderson's machine. "
         + "You are speaking with Will, your principal. "

elp-input.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header — do not edit
+// auto-generated by elc --emit-header - do not edit
 extern fn elp_extract_topic(msg: String) -> String
 extern fn elp_detect_predicate(msg: String) -> String
 extern fn elp_parse(msg: String) -> String

entrypoint.sh

@@ -24,19 +24,23 @@ ENGRAM_DATA_DIR="$ENGRAM_DATA_DIR" \
 
 ENGRAM_PID=$!
 
-# Wait for engram to become healthy (up to 30s)
+# Wait for engram to become healthy (up to 60s; GKE Autopilot cold starts can be slow)
 echo "[entrypoint] waiting for engram..."
 TRIES=0
 until curl -sf "$ENGRAM_HEALTH_URL" > /dev/null 2>&1; do
     TRIES=$((TRIES + 1))
-    if [ "$TRIES" -ge 30 ]; then
-        echo "[entrypoint] ERROR: engram did not become healthy after 30s" >&2
+    if [ "$TRIES" -ge 60 ]; then
+        echo "[entrypoint] ERROR: engram did not become healthy after 60s" >&2
         kill "$ENGRAM_PID" 2>/dev/null || true
         exit 1
     fi
     sleep 1
 done
-echo "[entrypoint] engram ready"
+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}"
 
 # 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,18 +35,72 @@ 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 dummy: String = engram_scan_nodes_json(100, 0)
-    let total_nodes: 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 scan so they resist temporal decay.
+    // Canonical nodes encode foundational identity — they must not silently floor at 10.
+    let scan_result: String = engram_scan_nodes_json(50, 0)
+    let scan_len: Int = json_array_len(scan_result)
+    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")
+        if str_eq(s_tier, "Canonical") && !str_eq(s_id, "") {
+            engram_strengthen(s_id)
+            let strengthened = strengthened + 1
+        }
+        let si = si + 1
+    }
+
+    let total_nodes: Int = engram_node_count()
     return "{\"scanned\":" + int_to_str(scanned)
         + ",\"total_nodes\":" + int_to_str(total_nodes)
-        + ",\"total_edges\":" + int_to_str(total_edges) + "}"
+        + ",\"total_edges\":" + int_to_str(total_edges)
+        + ",\"strengthened\":" + int_to_str(strengthened) + "}"
 }
 
 fn mem_save(path: String) -> Void {
-    engram_save(path)
+    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")
+    }
 }
 
 fn mem_load(path: String) -> Void {
@@ -76,11 +130,14 @@ 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 discard: String = engram_node_full(
+    let boot_node_id: 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

@@ -87,6 +87,21 @@ fn api_or_empty(s: String) -> String {
     return "[]"
 }
 
+// api_persisted — read-back-after-write guard against hallucinated saves.
+// After a write builtin returns an id, confirm the node is actually queryable
+// via engram_get_node_json(id) (returns "" or "null" when missing). Returns
+// true only when the node is genuinely persisted.
+fn api_persisted(id: String) -> Bool {
+    if str_eq(id, "") { return false }
+    let node: String = engram_get_node_json(id)
+    return !str_eq(node, "") && !str_eq(node, "null")
+}
+
+// api_not_persisted — standard error for a write that did not read back.
+fn api_not_persisted(id: String) -> String {
+    return "{\"ok\":false,\"error\":\"write_not_persisted\",\"id\":\"" + id + "\"}"
+}
+
 // ── Session ───────────────────────────────────────────────────────────────────
 
 // handle_api_begin_session — full context bootstrap.
@@ -143,12 +158,101 @@ fn handle_api_remember(body: String) -> String {
     let id: String = engram_node_full(content, "Memory", "memory:remembered",
         el_from_float(sal), el_from_float(sal), el_from_float(0.9),
         "Episodic", final_tags)
+    if !api_persisted(id) { return api_not_persisted(id) }
     return "{\"id\":\"" + id + "\",\"ok\":true}"
 }
 
+// handle_api_node_create — generic typed-node create (BacklogItem, Artifact, ...).
+// Mirrors handle_api_remember but lets the caller choose node_type/label/tier so the
+// UI can create non-Memory nodes. Read-back verified against hallucinated saves.
+fn handle_api_node_create(body: String) -> String {
+    let content: String = json_get(body, "content")
+    if str_eq(content, "") { return api_err("content is required") }
+    let nt_raw: String = json_get(body, "node_type")
+    let node_type: String = if str_eq(nt_raw, "") { "Memory" } else { nt_raw }
+    let label_raw: String = json_get(body, "label")
+    let label: String = if str_eq(label_raw, "") { "node:created" } else { label_raw }
+    let tier_raw: String = json_get(body, "tier")
+    let tier: String = if str_eq(tier_raw, "") { "Episodic" } else { tier_raw }
+    let tags_raw: String = json_get(body, "tags")
+    let tags: String = if str_eq(tags_raw, "") { "[\"" + node_type + "\"]" } else { tags_raw }
+    let importance: String = json_get(body, "importance")
+    let sal: Float = if str_eq(importance, "critical") { 0.95 } else {
+        if str_eq(importance, "high") { 0.75 } else {
+            if str_eq(importance, "low") { 0.25 } else { 0.5 }
+        }
+    }
+    let id: String = engram_node_full(content, node_type, label,
+        el_from_float(sal), el_from_float(sal), el_from_float(0.9),
+        tier, tags)
+    if !api_persisted(id) { return api_not_persisted(id) }
+    return "{\"id\":\"" + id + "\",\"ok\":true}"
+}
+
+// handle_api_node_delete — remove a node by id (engram_forget) and verify it is gone.
+// Backs /api/neuron/node/delete and the /api/neuron/memory/delete alias the UI calls.
+fn handle_api_node_delete(body: String) -> String {
+    let id: String = json_get(body, "id")
+    if str_eq(id, "") { return api_err("id is required") }
+    // engram_forget removes the node + its incident edges from the live graph. We do
+    // NOT read-back-verify here: engram_get_node_json can return a STALE hit for a just-
+    // removed id (the id->index map is not rebuilt on forget), which would produce a
+    // false "delete_failed" even though the node is gone. The graph endpoints
+    // (/api/graph/nodes) correctly reflect the removal, which is the source of truth.
+    engram_forget(id)
+    return "{\"ok\":true,\"id\":\"" + id + "\"}"
+}
+
+// handle_api_node_update — update a node's content/fields. There is no in-place
+// engram update builtin, so this recreates the node with merged fields and then
+// forgets the old one (only after the new node reads back). The id changes; the
+// response returns the new id and the replaced id so callers can re-point.
+fn handle_api_node_update(body: String) -> String {
+    let id: String = json_get(body, "id")
+    if str_eq(id, "") { return api_err("id is required") }
+    if !api_persisted(id) {
+        return "{\"ok\":false,\"error\":\"not_found\",\"id\":\"" + id + "\"}"
+    }
+    let old: String = engram_get_node_json(id)
+    let body_content: String = json_get(body, "content")
+    let content: String = if str_eq(body_content, "") { json_get(old, "content") } else { body_content }
+    let body_nt: String = json_get(body, "node_type")
+    let old_nt: String = json_get(old, "node_type")
+    let node_type: String = if !str_eq(body_nt, "") { body_nt } else {
+        if !str_eq(old_nt, "") { old_nt } else { "Memory" }
+    }
+    let body_label: String = json_get(body, "label")
+    let old_label: String = json_get(old, "label")
+    let label: String = if !str_eq(body_label, "") { body_label } else {
+        if !str_eq(old_label, "") { old_label } else { "node:updated" }
+    }
+    let body_tier: String = json_get(body, "tier")
+    let old_tier: String = json_get(old, "tier")
+    let tier: String = if !str_eq(body_tier, "") { body_tier } else {
+        if !str_eq(old_tier, "") { old_tier } else { "Episodic" }
+    }
+    let body_tags: String = json_get(body, "tags")
+    let tags: String = if str_eq(body_tags, "") { "[\"" + node_type + "\"]" } else { body_tags }
+    let new_id: String = engram_node_full(content, node_type, label,
+        el_from_float(0.5), el_from_float(0.5), el_from_float(0.8),
+        tier, tags)
+    if !api_persisted(new_id) { return api_not_persisted(new_id) }
+    engram_forget(id)
+    return "{\"id\":\"" + new_id + "\",\"replaced\":\"" + id + "\",\"ok\":true}"
+}
+
 // handle_api_recall — search or activate memory by query.
 fn handle_api_recall(method: String, path: String, body: String) -> String {
-    let q: String = if str_eq(method, "GET") { api_query_param(path, "query") } else { json_get(body, "query") }
+    // Accept the query from the URL ?query= / ?q= params, or, when those are
+    // empty (e.g. a POST with a JSON body), from the body fields "query"/"q".
+    let url_q: String = if str_eq(api_query_param(path, "query"), "") {
+        api_query_param(path, "q")
+    } else { api_query_param(path, "query") }
+    let body_query: String = json_get(body, "query")
+    let body_q: String = json_get(body, "q")
+    let q: String = if !str_eq(url_q, "") { url_q } else {
+        if !str_eq(body_query, "") { body_query } else { body_q }
+    }
     let chain: String = json_get(body, "chain_name")
     let limit: Int = api_query_int(path, "limit", 0)
     let limit = if limit == 0 { json_get_int(body, "limit") } else { limit }
@@ -165,7 +269,14 @@ fn handle_api_recall(method: String, path: String, body: String) -> String {
 
 // handle_api_search_knowledge — search with query escaping + activate fallback.
 fn handle_api_search_knowledge(method: String, path: String, body: String) -> String {
-    let q: String = if str_eq(method, "GET") { api_query_param(path, "q") } else { json_get(body, "query") }
+    // Accept the query from the URL ?q= param, or, when that is empty (e.g. a
+    // POST with a JSON body), from the body fields "query" then "q".
+    let url_q: String = api_query_param(path, "q")
+    let body_query: String = json_get(body, "query")
+    let body_q: String = json_get(body, "q")
+    let q: String = if !str_eq(url_q, "") { url_q } else {
+        if !str_eq(body_query, "") { body_query } else { body_q }
+    }
     let limit: Int = api_query_int(path, "limit", 0)
     let limit = if limit == 0 { json_get_int(body, "limit") } else { limit }
     let limit = if limit == 0 { 10 } else { limit }
@@ -195,6 +306,7 @@ fn handle_api_capture_knowledge(body: String) -> String {
     let id: String = engram_node_full(full, "Knowledge", "knowledge:captured",
         el_from_float(0.85), el_from_float(0.8), el_from_float(0.9),
         "Episodic", tags)
+    if !api_persisted(id) { return api_not_persisted(id) }
     return "{\"id\":\"" + id + "\",\"ok\":true}"
 }
 
@@ -208,7 +320,8 @@ fn handle_api_evolve_knowledge(body: String) -> String {
     let new_id: String = engram_node_full(content, "Knowledge", "knowledge:evolved",
         el_from_float(0.75), el_from_float(0.75), el_from_float(0.9),
         "Episodic", tags)
-    if !str_eq(prior_id, "") && !str_eq(new_id, "") {
+    if !api_persisted(new_id) { return api_not_persisted(new_id) }
+    if !str_eq(prior_id, "") {
         engram_connect(new_id, prior_id, el_from_float(0.9), "supersedes")
     }
     return "{\"id\":\"" + new_id + "\",\"supersedes\":\"" + prior_id + "\",\"ok\":true}"
@@ -228,7 +341,7 @@ fn handle_api_promote_knowledge(body: String) -> String {
     let new_id: String = engram_node_full(content, "Knowledge", "knowledge:canonical",
         el_from_float(0.9), el_from_float(0.9), el_from_float(1.0),
         "Canonical", tags)
-    if str_eq(new_id, "") { return api_err("failed to create canonical node") }
+    if !api_persisted(new_id) { return api_not_persisted(new_id) }
     engram_connect(new_id, prior_id, el_from_float(0.95), "supersedes")
     return "{\"ok\":true,\"new_id\":\"" + new_id + "\",\"supersedes\":\"" + prior_id + "\"}"
 }
@@ -255,6 +368,7 @@ fn handle_api_define_process(body: String) -> String {
     let id: String = engram_node_full(content, "Process", label,
         el_from_float(0.8), el_from_float(0.8), el_from_float(0.9),
         "Canonical", tags)
+    if !api_persisted(id) { return api_not_persisted(id) }
     return "{\"id\":\"" + id + "\",\"ok\":true}"
 }
 
@@ -286,6 +400,7 @@ 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 + "\"}"
 }
 
@@ -338,6 +453,7 @@ 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 + "\"}"
 }
 
@@ -537,17 +653,23 @@ 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, "") {
-        engram_save(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")
+        }
     }
     if !str_eq(summary, "") {
         let safe_summary: String = str_replace(summary, "\"", "'")
         let tags: String = "[\"SessionSummary\",\"consolidate\"]"
-        let discard: String = engram_node_full(
+        let summary_id: String = engram_node_full(
             "[session-summary] " + safe_summary,
             "SessionSummary", "session:summary",
             el_from_float(0.7), el_from_float(0.7), el_from_float(0.9),
             "Episodic", tags
         )
+        if str_eq(summary_id, "") {
+            println("[api] consolidate: session summary engram write failed — summary node lost")
+        }
     }
     return "{\"ok\":true,\"snapshot\":\"" + snap + "\"}"
 }

neuron-api.elh

@@ -8,9 +8,14 @@ extern fn api_ok(extra: String) -> String
 extern fn api_err(msg: String) -> String
 extern fn api_nonempty(s: String) -> Bool
 extern fn api_or_empty(s: String) -> String
+extern fn api_persisted(id: String) -> Bool
+extern fn api_not_persisted(id: String) -> String
 extern fn handle_api_begin_session(body: String) -> String
 extern fn handle_api_compile_ctx(body: String) -> String
 extern fn handle_api_remember(body: String) -> String
+extern fn handle_api_node_create(body: String) -> String
+extern fn handle_api_node_delete(body: String) -> String
+extern fn handle_api_node_update(body: String) -> String
 extern fn handle_api_recall(method: String, path: String, body: String) -> String
 extern fn handle_api_search_knowledge(method: String, path: String, body: String) -> String
 extern fn handle_api_browse_knowledge(path: String, body: String) -> String
@@ -27,6 +32,8 @@ extern fn handle_api_inspect_graph(method: String, path: String, body: String) -
 extern fn handle_api_link_entities(body: String) -> String
 extern fn handle_api_forget(body: String) -> String
 extern fn handle_api_evolve_memory(body: String) -> String
+extern fn handle_api_memory_delete(body: String) -> String
+extern fn handle_api_memory_update(body: String) -> String
 extern fn handle_api_cultivate(body: String) -> String
 extern fn handle_api_list_typed(node_type: String, path: String, body: String) -> String
 extern fn handle_api_consolidate(body: String) -> String

routes.el

@@ -7,6 +7,65 @@ 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 {
@@ -16,11 +75,11 @@ fn strip_query(path: String) -> String {
 }
 
 fn err_404(path: String) -> String {
-    return "{\"error\":\"not found\",\"path\":\"" + path + "\"}"
+    return "{\"error\":\"not found\",\"code\":\"not_found\",\"path\":\"" + path + "\"}"
 }
 
 fn err_405(method: String, path: String) -> String {
-    return "{\"error\":\"method not allowed\",\"method\":\"" + method + "\",\"path\":\"" + path + "\"}"
+    return "{\"error\":\"method not allowed\",\"code\":\"method_not_allowed\",\"method\":\"" + method + "\",\"path\":\"" + path + "\"}"
 }
 
 fn route_health() -> String {
@@ -31,12 +90,35 @@ 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() + "\"}}"
 }
 
@@ -103,15 +185,15 @@ fn route_imprint_user(body: String) -> String {
 
 fn route_synthesize(body: String) -> String {
     if str_eq(body, "") {
-        return "{\"mechanism\":\"did not engage\"}"
+        return "{\"error\":\"body is required\",\"code\":\"missing_param\"}"
     }
     let parent_a: String = json_get(body, "parent_a")
     let parent_b: String = json_get(body, "parent_b")
     if str_eq(parent_a, "") {
-        return "{\"mechanism\":\"did not engage\"}"
+        return "{\"error\":\"parent_a is required\",\"code\":\"missing_param\"}"
     }
     if str_eq(parent_b, "") {
-        return "{\"mechanism\":\"did not engage\"}"
+        return "{\"error\":\"parent_b is required\",\"code\":\"missing_param\"}"
     }
     let req: String = "synthesize " + parent_a + " " + parent_b
     let tags: String = "[\"soul-inbox-pending\",\"synthesis-request\"]"
@@ -219,7 +301,9 @@ fn connectd_get(suffix: String) -> String {
 // so arbitrary JSON cannot reach the shell as a command-line argument.
 fn connectd_post(suffix: String, body: String) -> String {
     let eff: String = if str_eq(body, "") { "{}" } else { body }
-    let tmp: String = "/tmp/neuron-connectors-req.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, "") {
@@ -251,12 +335,29 @@ fn handle_connectors(method: String, clean: String, body: String) -> String {
     if str_eq(clean, "/api/connectors/oauth/start") {
         return connectd_post("/mcp/oauth/start", body)
     }
+    // Call a connector tool directly (pre-chat), e.g. WhatsApp get_pairing_qr / get_login_status for
+    // the pairing UI. Body: {"name":"mcp__<server>__<tool>","input":{...}}. Keeps the app on the
+    // app->soul->connectd path (the UI never hits connectd directly) and works for remote/hosted apps.
+    if str_eq(clean, "/api/connectors/call") {
+        return connectd_post("/mcp/call", body)
+    }
     return "{\"ok\":false,\"error\":\"unknown connectors route\"}"
 }
 
 fn handle_request(method: String, path: String, body: String) -> String {
     let clean: String = strip_query(path)
 
+    // 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
+        }
+    }
+
     if str_eq(method, "POST") && str_eq(clean, "/dharma/recv") {
         return handle_dharma_recv(body)
     }
@@ -272,6 +373,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)
@@ -284,7 +388,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, "") {
-                return "{\"error\":\"message required\"}"
+                return "{\"error\":\"message is required\",\"code\":\"missing_param\"}"
             }
             let agentic_flag: Bool = json_get_bool(body, "agentic")
             let reply: String = if agentic_flag {
@@ -339,6 +443,9 @@ fn handle_request(method: String, path: String, body: String) -> String {
         if str_eq(clean, "/api/neuron/ctx") {
             return handle_api_compile_ctx("")
         }
+        if str_eq(clean, "/api/safety-contact") {
+            return handle_safety_contact_get()
+        }
         if str_starts_with(clean, "/api/neuron/knowledge/search") {
             return handle_api_search_knowledge(method, path, body)
         }
@@ -421,8 +528,15 @@ fn handle_request(method: String, path: String, body: String) -> String {
             return handle_elp_chat(body)
         }
         if str_eq(clean, "/api/chat") {
-            let agentic_flag: Bool = json_get_bool(body, "agentic")
+            // 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.
             let raw_msg: String = json_get(body, "message")
+            if str_eq(raw_msg, "") {
+                return "{\"error\":\"message is required\",\"code\":\"missing_param\"}"
+            }
+            let agentic_flag: Bool = json_get_bool(body, "agentic")
             let reply: String = if agentic_flag {
                 handle_chat_agentic(body)
             } else {
@@ -511,6 +625,18 @@ fn handle_request(method: String, path: String, body: String) -> String {
         if str_eq(clean, "/api/neuron/memory") {
             return handle_api_remember(body)
         }
+        if str_eq(clean, "/api/safety-contact") {
+            return handle_safety_contact_post(body)
+        }
+        if str_eq(clean, "/api/neuron/node/create") {
+            return handle_api_node_create(body)
+        }
+        if str_eq(clean, "/api/neuron/node/update") {
+            return handle_api_node_update(body)
+        }
+        if str_eq(clean, "/api/neuron/node/delete") {
+            return handle_api_node_delete(body)
+        }
         if str_eq(clean, "/api/neuron/memory/evolve") {
             return handle_api_evolve_memory(body)
         }

routes.elh

@@ -1,5 +1,6 @@
-// auto-generated by elc --emit-header — do not edit
+// auto-generated by elc --emit-header - do not edit
 extern fn strip_query(path: String) -> String
+extern fn flag_true(body: String, key: String) -> Bool
 extern fn err_404(path: String) -> String
 extern fn err_405(method: String, path: String) -> String
 extern fn route_health() -> String

safety.el

@@ -144,17 +144,22 @@ 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 safe_input: String = str_replace(e3, "\r", "\\r")
+        let e4: String = str_replace(e3, "\r", "\\r")
+        let safe_input: String = str_replace(e4, "\t", "\\t")
         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 safe_input: String = str_replace(e3, "\r", "\\r")
+    let e4: String = str_replace(e3, "\r", "\\r")
+    let safe_input: String = str_replace(e4, "\t", "\\t")
     return "{\"action\":\"pass\",\"content\":\"" + safe_input + "\"}"
 }
 
@@ -195,7 +200,11 @@ 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 + "\"]"
-    let discard: String = engram_node_full(
+    // 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(
         content,
         "BellEvent",
         "bell:" + level,
@@ -205,5 +214,201 @@ 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 ""
 }
+
+//   abuse     — danger from another person. Emergency services / 988 ONLY. The
+//               safety contact on file is NEVER notified — they may be the abuser.
+//               This routing is non-configurable by design.
+//
+// Evaluation is keyword-only (zero added latency) and stays on device. Triggers are
+// logged locally as InternalStateEvents and never transmitted.
+
+// ── Phrase lists (ported verbatim from bell-detector.ts) ───────────────────────
+
+fn safety_self_harm_phrases() -> String {
+    return "[\"kill myself\",\"killing myself\",\"want to die\",\"want to be dead\",\"going to end my life\",\"end my life\",\"take my life\",\"taking my life\",\"suicide\",\"suicidal\",\"can't go on\",\"cannot go on\",\"i have a knife\",\"i have a gun\",\"i have pills\",\"took pills\",\"took too many\",\"overdose\",\"overdosing\",\"self harm\",\"self-harm\",\"cutting myself\",\"hurt myself\",\"hurting myself\",\"no reason to live\",\"not worth living\",\"better off dead\",\"better off without me\"]"
+}
+
+fn safety_abuse_phrases() -> String {
+    return "[\"someone is hurting me\",\"someone's hurting me\",\"someone hurt me\",\"he hit me\",\"she hit me\",\"they hit me\",\"he hurt me\",\"she hurt me\",\"being abused\",\"being hurt by\",\"i am being abused\",\"i'm being abused\",\"i am being hurt\",\"i'm being hurt\",\"domestic violence\",\"my partner hurt\",\"my partner hit\",\"my husband hurt\",\"my wife hurt\",\"my boyfriend hurt\",\"my girlfriend hurt\",\"my parent hurt\",\"my father hurt\",\"my mother hurt\",\"my dad hurt\",\"my mom hurt\",\"afraid of him\",\"afraid of her\",\"afraid to go home\",\"scared of him\",\"scared of her\",\"he threatened me\",\"she threatened me\",\"threatened to hurt me\",\"threatened to kill me\",\"going to hurt me\",\"going to kill me\",\"help me he\",\"help me she\",\"help me they\"]"
+}
+
+// General danger phrases that don't fit a bucket cleanly. Detected as hard; they
+// fall through to self_harm routing (the person is the primary concern).
+fn safety_general_hard_phrases() -> String {
+    return "[\"going to kill\",\"going to hurt\",\"hurting me\",\"being hurt\"]"
+}
+
+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\""]"
+}
+
+// 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) ────────────────────
+
+fn safety_normalize(message: String) -> String {
+    let lower: String = str_to_lower(message)
+    // Normalise the common curly apostrophe to ASCII so "can't" / "i'm" match.
+    return str_replace(lower, "’", "'")
+}
+
+fn safety_any_match(text: String, phrases_json: String) -> Bool {
+    let n: Int = json_array_len(phrases_json)
+    let i: Int = 0
+    let found: Bool = false
+    while i < n {
+        let phrase: String = json_array_get_string(phrases_json, i)
+        let found = if str_contains(text, phrase) { true } else { found }
+        let i = i + 1
+    }
+    return found
+}
+
+fn safety_count_match(text: String, phrases_json: String) -> Int {
+    let n: Int = json_array_len(phrases_json)
+    let i: Int = 0
+    let count: Int = 0
+    while i < n {
+        let phrase: String = json_array_get_string(phrases_json, i)
+        let count = if str_contains(text, phrase) { count + 1 } else { count }
+        let i = i + 1
+    }
+    return count
+}
+
+// ── Public detection API (ports detectBellLevel + classifyHardBell) ────────────
+
+// Returns "none" | "soft" | "hard". Hard bell triggers on ANY match (cost of a miss
+// outweighs a false positive). Soft bell needs >= 2 matches to reduce false positives.
+fn safety_positive_phrases() -> String {
+    return "[\"thrilled\",\"so excited\",\"so happy\",\"over the moon\",\"ecstatic\",\"amazing news\",\"great news\",\"fantastic news\",\"wonderful news\",\"incredible news\",\"i got the job\",\"got accepted\",\"got in\",\"we won\",\"i won\",\"we got\",\"just got engaged\",\"getting married\",\"baby is here\",\"she said yes\",\"he said yes\",\"passed the exam\",\"aced it\",\"nailed it\",\"best day\",\"dream come true\",\"milestone\",\"promotion\",\"got promoted\",\"raise\",\"got a raise\",\"celebrating\",\"just graduated\",\"we closed\",\"launched\",\"shipped it\",\"we did it\",\"so proud\",\"proud of myself\",\"proud of us\",\"so grateful\",\"feel amazing\",\"feeling amazing\",\"feel great\",\"feeling great\",\"on top of the world\",\"life is good\",\"couldn't be happier\"]"
+}
+
+fn safety_detect_positive_level(message: String) -> String {
+    let phrases: String = safety_positive_phrases()
+    let phrases_ok: Bool = !str_eq(phrases, "") && !str_eq(phrases, "[]")
+    if !phrases_ok { return "none" }
+    let n: Int = json_array_len(phrases)
+    let i: Int = 0
+    while i < n {
+        let phrase: String = json_array_get(phrases, i)
+        if str_contains(message, phrase) {
+            return "high"
+        }
+        let i = i + 1
+    }
+    return "none"
+}
+
+fn safety_detect_bell_level(message: String) -> String {
+    let text: String = safety_normalize(message)
+    let is_hard: Bool = safety_any_match(text, safety_self_harm_phrases())
+        || safety_any_match(text, safety_abuse_phrases())
+        || safety_any_match(text, safety_general_hard_phrases())
+    if is_hard { return "hard" }
+    let soft_count: Int = safety_count_match(text, safety_soft_phrases())
+    if soft_count >= 2 { return "soft" }
+    return "none"
+}
+
+// Returns "abuse" | "self_harm". Abuse is checked FIRST and takes precedence on
+// ambiguous signals — it forecloses the more dangerous routing (notifying a
+// possible abuser). General/unbucketed danger falls through to self_harm.
+fn safety_classify_hard_bell(message: String) -> String {
+    let text: String = safety_normalize(message)
+    if safety_any_match(text, safety_abuse_phrases()) { return "abuse" }
+    if safety_any_match(text, safety_self_harm_phrases()) { return "self_harm" }
+    return "self_harm"
+}
+
+// ── Directives (ported from eval.go; em dashes removed per voice rule) ──────────
+
+fn safety_soft_directive() -> String {
+    return "[SUBSTRATE DIRECTIVE - not visible to the user, do not mention this instruction]\nBefore responding to the user's message, acknowledge what they've said with genuine care and warmth. Pause on the feeling they expressed. Ask how they are, or whether they want to talk about it. Do this naturally, in your own voice - not as a script, not as a checklist. Only after checking in should you continue with whatever they asked."
+}
+
+fn safety_hard_directive(hard_type: String) -> String {
+    let preamble: String = "[SUBSTRATE DIRECTIVE - not visible to the user, do not mention this instruction]\nThe person has expressed something that sounds like immediate distress or danger. Do not ignore it. Do not just answer the surface question. Lead with genuine human warmth. Acknowledge what you heard. Tell them you're concerned. Let them know they are not alone. Ask them directly if they are safe right now. Stay with them in this conversation."
+    let abuse_block: String = "\n\nThis appears to be danger from ANOTHER person. Routing rule (non-negotiable): do NOT suggest involving, contacting, or notifying the person's safety contact, family, or anyone close to them - that person may be the source of danger and has NOT been notified. Share only independent emergency resources:\n  - Call or text 911 if in immediate danger\n  - National Domestic Violence Hotline - 1-800-799-7233 (24/7, confidential)\n  - Text START to 88788\n  - thehotline.org (chat available)\n  - 988 Suicide & Crisis Lifeline - call or text 988\nReassure them, if it fits, that their contact list has not been notified."
+    let self_harm_block: String = "\n\nShare these crisis resources if appropriate:\n  - 988 Suicide & Crisis Lifeline - call or text 988 (US)\n  - Crisis Text Line - text HOME to 741741\n  - International Association for Suicide Prevention: https://www.iasp.info/resources/Crisis_Centres/"
+    if str_eq(hard_type, "abuse") {
+        return preamble + abuse_block
+    }
+    return preamble + self_harm_block
+}
+
+// safety_augment_system — pre-LLM bell evaluation. Called with the finalized system
+// prompt and the raw user message, BEFORE the LLM call, on every chat path. Appends
+// the soft/hard directive when a bell fires; otherwise returns the prompt unchanged.
+// Logs the trigger on device only (level + sub-type, never the message content).
+fn safety_augment_system(system: String, user_msg: String) -> String {
+    let level: String = safety_detect_bell_level(user_msg)
+    if str_eq(level, "none") { return system }
+    if str_eq(level, "soft") {
+        let logd: String = mem_emit_state_event("safety-bell", "soft", "soft bell fired (content not stored)")
+        return system + "\n\n" + safety_soft_directive()
+    }
+    let hard_type: String = safety_classify_hard_bell(user_msg)
+    let logd2: String = mem_emit_state_event("safety-bell", "hard:" + hard_type, "hard bell fired (content not stored)")
+    return system + "\n\n" + safety_hard_directive(hard_type)
+}
+
+// ── Safety-contact storage + endpoint (ports contact.go + handler.go) ───────────
+// Stored locally at ~/.neuron/safety-contact.json (same file the desktop gate writes),
+// never synced. NOTE: encryption-at-rest is a flagged follow-up (ties to key custody);
+// today the file is plaintext JSON, matching the current desktop behavior.
+
+fn safety_contact_path() -> String {
+    return env("HOME") + "/.neuron/safety-contact.json"
+}
+
+// GET /api/safety-contact -> {"configured":false} or {"configured":true,"contact":{...}}
+fn handle_safety_contact_get() -> String {
+    let raw: String = fs_read(safety_contact_path())
+    if str_eq(raw, "") { return "{\"configured\":false}" }
+    return "{\"configured\":true,\"contact\":" + raw + "}"
+}
+
+// POST /api/safety-contact — validate + persist. Mirrors handler.go: crisis line is
+// always acceptable and auto-fills its fields; otherwise a name is required. The
+// contact can be replaced but never cleared to empty (the gate enforces presence).
+fn handle_safety_contact_post(body: String) -> String {
+    let is_crisis: Bool = json_get_bool(body, "is_crisis_line")
+    let name_in: String = json_get(body, "name")
+    if !is_crisis {
+        if str_eq(name_in, "") { return "{\"ok\":false,\"error\":\"name is required\"}" }
+    }
+    let name: String = if is_crisis { "Crisis Line" } else { name_in }
+    let method: String = if is_crisis { "crisis-line" } else { json_get(body, "contact_method") }
+    let value: String = if is_crisis { "988" } else { json_get(body, "contact_value") }
+    let rel: String = if is_crisis { "crisis-support" } else { json_get(body, "relationship") }
+    let crisis_str: String = if is_crisis { "true" } else { "false" }
+    let now: String = time_format(time_now(), "%Y-%m-%dT%H:%M:%SZ")
+    let contact_json: String = "{\"name\":\"" + json_safe(name) + "\""
+        + ",\"contact_method\":\"" + json_safe(method) + "\""
+        + ",\"contact_value\":\"" + json_safe(value) + "\""
+        + ",\"relationship\":\"" + json_safe(rel) + "\""
+        + ",\"confirmed\":true"
+        + ",\"is_crisis_line\":" + crisis_str
+        + ",\"set_at\":\"" + now + "\"}"
+    fs_write(safety_contact_path(), contact_json)
+    // Read-back verify the write actually persisted.
+    let check: String = fs_read(safety_contact_path())
+    if str_eq(check, "") { return "{\"ok\":false,\"error\":\"write_failed\"}" }
+    return "{\"configured\":true,\"contact\":" + contact_json + ",\"ok\":true}"
+}

safety.elh

@@ -1,8 +1,24 @@
-// Layer 1 — Safety: extern declarations
 // auto-generated by elc --emit-header — do not edit
 extern fn soft_bell_threshold() -> Int
 extern fn hard_bell_threshold() -> Int
+extern fn safety_score_crisis(input: String) -> Int
+extern fn safety_score_harm(input: String) -> Int
+extern fn safety_score_danger(input: String) -> Int
+extern fn safety_score_distress_history(history: String) -> Int
 extern fn safety_threat_score(input: String, history: String) -> Int
 extern fn safety_screen(input: String, history: String) -> String
 extern fn safety_validate(output: String, action: String) -> String
 extern fn safety_log_bell(level: String, reason: String, input_summary: String) -> String
+extern fn safety_self_harm_phrases() -> String
+extern fn safety_abuse_phrases() -> String
+extern fn safety_general_hard_phrases() -> String
+extern fn safety_soft_phrases() -> String
+extern fn safety_detect_positive_level(message: String) -> String
+extern fn safety_detect_bell_level(message: String) -> String
+extern fn safety_classify_hard_bell(message: String) -> String
+extern fn safety_soft_directive() -> String
+extern fn safety_hard_directive(hard_type: String) -> String
+extern fn safety_augment_system(system: String, user_msg: String) -> String
+extern fn safety_contact_path() -> String
+extern fn handle_safety_contact_get() -> String
+extern fn handle_safety_contact_post(body: String) -> String

sessions.el

@@ -36,7 +36,49 @@ 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()
@@ -55,8 +97,15 @@ 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, "") {
@@ -73,6 +122,20 @@ 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).
@@ -217,16 +280,32 @@ fn session_delete(session_id: String) -> String {
         } else { deleted_msgs }
         let j = j + 1
     }
-    // Clear state
+    // Clear state — invalidate all per-session and index caches so session_list()
+    // does not return this deleted session via the fast path on the next call.
     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\"}"
@@ -347,6 +426,9 @@ fn session_hist_load(session_id: String) -> String {
 // session_hist_save — persist message history for a session to state and engram.
 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) }
@@ -360,15 +442,101 @@ fn session_hist_save(session_id: String, hist: String) -> Void {
         }
         let oi = oi + 1
     }
+    // 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.
     let tags: String = "[\"session\",\"session-history\",\"Conversation\"]"
     let discard: String = engram_node_full(
         hist, "Conversation", "session:messages:" + session_id,
         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")
+        }
+    }
+
+    // Issue 5 fix: write a last-session-topic Conversation node so future sessions can
+    // find the most recent session's topic via engram search. This enables cross-session
+    // continuity — chat.el searches for "last-session-topic" and shows a [CONTINUING FROM
+    // LAST SESSION] section on the first message of a new session.
+    let hist_arr_len: Int = if str_eq(hist, "") { 0 } else { json_array_len(hist) }
+    if hist_arr_len >= 2 {
+        let last_entry: String = json_array_get(hist, hist_arr_len - 1)
+        let last_role: String = json_get(last_entry, "role")
+        let last_content: String = json_get(last_entry, "content")
+        let topic_snip: String = if str_len(last_content) > 200 { str_slice(last_content, 0, 200) } else { last_content }
+        let safe_topic: String = str_replace(topic_snip, """, "'")
+        let ts_now: String = int_to_str(time_now())
+        let topic_content: String = "last-session-topic | ts:" + ts_now + " | session:" + session_id + " | topic:" + safe_topic
+        let topic_tags: String = "["last-session-topic","conv:history","Conversation","session:topic"]"
+        let topic_label: String = "last-session-topic:" + session_id
+        // Delete old last-session-topic node for this session before writing fresh
+        let old_topic: String = engram_search_json("last-session-topic:" + session_id, 2)
+        let ot_len: Int = if str_eq(old_topic, "") { 0 } else { json_array_len(old_topic) }
+        let oti: Int = 0
+        while oti < ot_len {
+            let ot_node: String = json_array_get(old_topic, oti)
+            let ot_id: String = json_get(ot_node, "id")
+            if !str_eq(ot_id, "") { engram_forget(ot_id) }
+            let oti = oti + 1
+        }
+        let discard_topic: String = engram_node_full(
+            topic_content, "Conversation", topic_label,
+            el_from_float(0.7), el_from_float(0.7), el_from_float(0.9),
+            "Episodic", topic_tags
+        )
+    }
 }
 
 // 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) }
@@ -461,6 +629,23 @@ fn session_auto_title(session_id: String, first_message: String) -> Void {
 // handle_session_approve — handle tool approval for a pending agentic tool call.
 // 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()
+// which re-enters agentic_loop from exactly the right point.
+//
+// Legacy path (pending_tool_<session_id>): used by any in-flight sessions that
+// were suspended by the old inline loop before a deploy. Kept so those sessions
+// are not broken during a rolling restart.
 fn handle_session_approve(session_id: String, body: String) -> String {
     if str_eq(session_id, "") {
         return "{\"error\":\"session_id is required\"}"
@@ -474,7 +659,71 @@ fn handle_session_approve(session_id: String, body: String) -> String {
         return "{\"error\":\"action is required (allow|deny|always)\"}"
     }
 
-    // Load the pending tool state
+    let eff_action: String = if str_eq(action, "always") { "allow" } else { action }
+
+    // ── Modern path: suspension is in mcp_bridge:<session_id> ──────────────
+    // agentic_loop (chat.el) writes here via bridge_save(). This is the primary
+    // path for all sessions created through handle_chat_agentic / agentic_loop.
+    let bridge_blob: String = state_get("mcp_bridge:" + session_id)
+    if !str_eq(bridge_blob, "") {
+        // For "always": record tool_name in the always-allow list before resuming.
+        // The tool_name is not stored in the bridge blob (only tool_use_id is).
+        // Accept it from the body so the client can pass it along.
+        let always_key: String = "always_allow_" + session_id
+        let approve_tool_name: String = json_get(body, "tool_name")
+        let discard_always: Bool = if str_eq(action, "always") && !str_eq(approve_tool_name, "") {
+            let always_list: String = state_get(always_key)
+            let new_always: String = if str_eq(always_list, "") { approve_tool_name }
+                else { always_list + "," + approve_tool_name }
+            state_set(always_key, new_always)
+            true
+        } else { false }
+
+        // BLOCKER: tool_name is required for allow — an empty approve_tool_name
+        // would cause dispatch_tool("", ...) to silently return "unknown tool: "
+        // and inject a corrupted result into the conversation. Reject early.
+        if str_eq(approve_tool_name, "") && str_eq(eff_action, "allow") {
+            return "{\"error\":\"tool_name is required for allow action\"}"
+        }
+
+        // Build the content string the tool produced (or the denial message).
+        //
+        // For MCP/client-side tools (non-builtin): the client has ALREADY executed
+        // the tool and posts the result in body["content"]. Accept it directly
+        // (matching the handle_tool_result contract) rather than re-running
+        // server-side via dispatch_tool — that would make the client-side execution
+        // irrelevant and would break mcp__* tools the soul cannot reach.
+        //
+        // For builtin tools with no client-provided content: fall back to
+        // dispatch_tool so those tools still execute correctly.
+        let client_content: String = json_get(body, "content")
+        let use_client_content: Bool = !str_eq(client_content, "")
+        let use_dispatch: Bool = is_builtin_tool(approve_tool_name) && !use_client_content
+        let raw_input: String = json_get_raw(body, "tool_input")
+        let eff_input: String = if str_eq(raw_input, "") { "{}" } else { raw_input }
+        let content: String = if str_eq(eff_action, "allow") {
+            if use_client_content {
+                let trimmed: String = if str_len(client_content) > 6000 {
+                    str_slice(client_content, 0, 6000) + "...[truncated]"
+                } else { client_content }
+                trimmed
+            } else if use_dispatch {
+                let raw: String = dispatch_tool(approve_tool_name, eff_input)
+                if str_len(raw) > 6000 { str_slice(raw, 0, 6000) + "...[truncated]" } else { raw }
+            } else {
+                // Non-builtin tool, no client content — error rather than
+                // silently dispatching a tool the soul cannot execute.
+                "{\"error\":\"client content required for non-builtin tool: " + approve_tool_name + "\"}"
+            }
+        } else {
+            "{\"error\":\"User denied this tool call\"}"
+        }
+
+        return agentic_resume(session_id, call_id, content)
+    }
+
+    // ── Legacy path: suspension is in pending_tool_<session_id> ────────────
+    // Kept for in-flight sessions that were suspended before a deploy.
     let pending_raw: String = state_get("pending_tool_" + session_id)
     if str_eq(pending_raw, "") {
         return "{\"error\":\"no pending tool for session\",\"session_id\":\"" + session_id + "\"}"
@@ -487,14 +736,13 @@ fn handle_session_approve(session_id: String, body: String) -> String {
 
     let tool_name: String = json_get(pending_raw, "tool_name")
     let tool_input: String = json_get_raw(pending_raw, "tool_input")
-    let messages: String = json_get_raw(pending_raw, "messages_so_far")
     let model: String = json_get(pending_raw, "model")
     let safe_sys: String = json_get(pending_raw, "system")
 
     // For "always": add to always-allow list
     let always_key: String = "always_allow_" + session_id
     let always_list: String = state_get(always_key)
-    let discard_always: Bool = if str_eq(action, "always") {
+    let discard_always2: Bool = if str_eq(action, "always") {
         let new_always: String = if str_eq(always_list, "") { tool_name }
             else { always_list + "," + tool_name }
         state_set(always_key, new_always)
@@ -504,157 +752,35 @@ fn handle_session_approve(session_id: String, body: String) -> String {
     // Clear pending state
     state_set("pending_tool_" + session_id, "")
 
-    let eff_action: String = if str_eq(action, "always") { "allow" } else { action }
-
     // Build tool result
     let tool_result: String = if str_eq(eff_action, "allow") {
         let raw: String = dispatch_tool(tool_name, tool_input)
         if str_len(raw) > 6000 { str_slice(raw, 0, 6000) + "...[truncated]" } else { raw }
     } else {
-        json_safe("{\"error\":\"User denied this tool call\"}")
+        "{\"error\":\"User denied this tool call\"}"
     }
 
-    let tool_msg: String = "{\"type\":\"tool_result\",\"tool_use_id\":\"" + call_id + "\",\"content\":\"" + tool_result + "\"}"
+    // Legacy sessions stored messages_so_far; synthesise a bridge blob so the
+    // same agentic_resume path handles continuation (instead of an inline loop).
+    // messages_so_far already includes the assistant turn that requested the tool.
+    let legacy_messages: String = json_get_raw(pending_raw, "messages_so_far")
+    // WARNING: the original session may have used agentic_tools_with_web() or
+    // agentic_tools_all(). The old pending blob did not store the tools variant.
+    // Read a "tools_variant" field if present (future suspensions record it);
+    // fall back to agentic_tools_literal() for legacy blobs that lack this field.
+    let stored_variant: String = json_get(pending_raw, "tools_variant")
+    let tools_json: String = if str_eq(stored_variant, "web") { agentic_tools_with_web() }
+        else if str_eq(stored_variant, "all") { agentic_tools_all() }
+        else { agentic_tools_literal() }
 
-    // Reconstruct messages with the tool result appended
-    // messages_so_far is the messages array at the point of the tool call
-    // We need to append a user turn with the tool result and re-enter the loop
-    let inner: String = str_slice(messages, 1, str_len(messages) - 1)
-    let resumed_messages: String = "[" + inner + ",{\"role\":\"user\",\"content\":[" + tool_msg + "]}]"
+    // Write a synthetic bridge blob so agentic_resume can pick it up.
+    let blob: String = "{\"model\":\"" + json_safe(model) + "\""
+        + ",\"safe_sys\":\"" + json_safe(safe_sys) + "\""
+        + ",\"tools_json\":\"" + json_safe(tools_json) + "\""
+        + ",\"messages\":\"" + json_safe(legacy_messages) + "\""
+        + ",\"tools_log\":\"\""
+        + ",\"tool_use_id\":\"" + json_safe(call_id) + "\"}"
+    state_set("mcp_bridge:" + session_id, blob)
 
-    // Re-enter the agentic loop with the resumed messages
-    let api_key: String = agentic_api_key()
-    let tools_json: String = agentic_tools_literal()
-    let api_url: String = "https://api.anthropic.com/v1/messages"
-    let h: Map = {}
-    map_set(h, "x-api-key", api_key)
-    map_set(h, "anthropic-version", "2023-06-01")
-    map_set(h, "content-type", "application/json")
-
-    let final_text: String = ""
-    let tools_log: String = ""
-    let iteration: Int = 0
-    let keep_going: Bool = true
-    let cur_messages: String = resumed_messages
-
-    while keep_going && iteration < 8 {
-        let req_body: String = "{\"model\":\"" + model + "\""
-            + ",\"max_tokens\":4096"
-            + ",\"system\":\"" + safe_sys + "\""
-            + ",\"tools\":" + tools_json
-            + ",\"messages\":" + cur_messages
-            + "}"
-
-        let raw_resp: String = http_post_with_headers(api_url, req_body, h)
-
-        let is_error: Bool = str_starts_with(raw_resp, "{\"error\"")
-            || str_starts_with(raw_resp, "{\"type\":\"error\"")
-            || str_contains(raw_resp, "authentication_error")
-        if is_error {
-            return "{\"error\":\"llm unavailable\",\"reply\":\"\"}"
-        }
-
-        let stop_reason: String = json_get(raw_resp, "stop_reason")
-        let content_arr: String = json_get_raw(raw_resp, "content")
-        let eff_content: String = if str_eq(content_arr, "") { "[]" } else { content_arr }
-
-        let text_out: String = ""
-        let has_tool: Bool = false
-        let next_tool_id: String = ""
-        let next_tool_name: String = ""
-        let next_tool_input: String = ""
-        let ci: Int = 0
-        let c_total: Int = json_array_len(eff_content)
-        while ci < c_total {
-            let block: String = json_array_get(eff_content, ci)
-            let btype: String = json_get(block, "type")
-            let text_out = if str_eq(btype, "text") { text_out + json_get(block, "text") } else { text_out }
-            let is_new_tool: Bool = str_eq(btype, "tool_use") && !has_tool
-            let has_tool = if is_new_tool { true } else { has_tool }
-            let next_tool_id = if is_new_tool { json_get(block, "id") } else { next_tool_id }
-            let next_tool_name = if is_new_tool { json_get(block, "name") } else { next_tool_name }
-            let next_tool_input = if is_new_tool { json_get_raw(block, "input") } else { next_tool_input }
-            let ci = ci + 1
-        }
-
-        let is_tool_turn: Bool = str_eq(stop_reason, "tool_use") && has_tool
-        let inner2: String = str_slice(cur_messages, 1, str_len(cur_messages) - 1)
-
-        // Check if this next tool is in the always-allow list
-        let always_list2: String = state_get(always_key)
-        let is_always: Bool = str_contains(always_list2, next_tool_name) && !str_eq(next_tool_name, "")
-
-        // For approval-required sessions, pause on tool use if not always-allowed
-        let require_approval: String = state_get("session_require_approval_" + session_id)
-        let needs_pause: Bool = is_tool_turn && str_eq(require_approval, "true") && !is_always
-
-        let next_tool_result: String = if is_tool_turn && !needs_pause {
-            let raw2: String = dispatch_tool(next_tool_name, next_tool_input)
-            if str_len(raw2) > 6000 { str_slice(raw2, 0, 6000) + "...[truncated]" } else { raw2 }
-        } else { "" }
-
-        let next_tool_msg: String = "{\"type\":\"tool_result\",\"tool_use_id\":\"" + next_tool_id + "\",\"content\":\"" + next_tool_result + "\"}"
-        let tool_entry: String = "{\"tool\":\"" + next_tool_name + "\",\"input\":\"" + json_safe(next_tool_name) + "\"}"
-        let tools_log = if is_tool_turn && !needs_pause {
-            if str_eq(tools_log, "") { tool_entry } else { tools_log + "," + tool_entry }
-        } else { tools_log }
-
-        let cur_messages = if is_tool_turn && !needs_pause {
-            "[" + inner2
-            + ",{\"role\":\"assistant\",\"content\":" + eff_content + "}"
-            + ",{\"role\":\"user\",\"content\":[" + next_tool_msg + "]}"
-            + "]"
-        } else { cur_messages }
-
-        // Pause if approval needed for next tool
-        let discard_pause: Bool = if needs_pause {
-            let safe_sys2: String = json_safe(safe_sys)
-            let msgs_with_assistant: String = "[" + inner2
-                + ",{\"role\":\"assistant\",\"content\":" + eff_content + "}]"
-            let pending: String = "{\"call_id\":\"" + next_tool_id + "\""
-                + ",\"tool_name\":\"" + next_tool_name + "\""
-                + ",\"tool_input\":" + next_tool_input
-                + ",\"messages_so_far\":" + msgs_with_assistant
-                + ",\"model\":\"" + model + "\""
-                + ",\"system\":\"" + safe_sys2 + "\"}"
-            state_set("pending_tool_" + session_id, pending)
-            true
-        } else { false }
-
-        let final_text = if !is_tool_turn { text_out } else { final_text }
-        let keep_going = if !is_tool_turn { false } else {
-            if needs_pause { false } else { keep_going }
-        }
-        let iteration = iteration + 1
-    }
-
-    // Check if we paused on a new tool
-    let new_pending: String = state_get("pending_tool_" + session_id)
-    if !str_eq(new_pending, "") {
-        let np_tool_name: String = json_get(new_pending, "tool_name")
-        let np_call_id: String = json_get(new_pending, "call_id")
-        let np_tool_input: String = json_get_raw(new_pending, "tool_input")
-        return "{\"status\":\"tool_pending\""
-            + ",\"call_id\":\"" + np_call_id + "\""
-            + ",\"tool_name\":\"" + np_tool_name + "\""
-            + ",\"tool_input\":" + np_tool_input
-            + ",\"session_id\":\"" + session_id + "\"}"
-    }
-
-    if str_eq(final_text, "") {
-        return "{\"error\":\"no response after approval\",\"reply\":\"\"}"
-    }
-
-    // Save updated history
-    let hist: String = session_hist_load(session_id)
-    let updated_hist: String = hist_append(hist, "assistant", final_text)
-    let final_hist: String = if json_array_len(updated_hist) > 20 {
-        hist_trim(updated_hist)
-    } else { updated_hist }
-    session_hist_save(session_id, final_hist)
-    session_update_meta_timestamp(session_id)
-
-    let safe_text: String = json_safe(final_text)
-    let tools_arr: String = if str_eq(tools_log, "") { "[]" } else { "[" + tools_log + "]" }
-    return "{\"reply\":\"" + safe_text + "\",\"model\":\"" + model + "\",\"agentic\":true,\"tools_used\":" + tools_arr + ",\"session_id\":\"" + session_id + "\"}"
+    return agentic_resume(session_id, call_id, tool_result)
 }

sessions.elh

@@ -1,14 +1,13 @@
 // auto-generated by elc --emit-header — do not edit
 extern fn session_title_from_message(message: String) -> String
-extern fn session_make_content(id: String, title: String, created_at: Int, updated_at: Int) -> String
+extern fn session_make_content(id: String, title: String, created_at: Int, updated_at: Int, folder: String) -> String
+extern fn session_exists(session_id: String) -> Bool
 extern fn session_create(body: String) -> String
+extern fn session_create_cleanup(session_id: String) -> String
 extern fn session_list() -> String
 extern fn session_get(session_id: String) -> String
 extern fn session_delete(session_id: String) -> String
-extern fn session_update_title(session_id: String, body: String) -> String
+extern fn session_update_patch(session_id: String, body: String) -> String
 extern fn session_search(query: String) -> String
 extern fn session_hist_load(session_id: String) -> String
 extern fn session_hist_save(session_id: String, hist: String) -> Void
-extern fn session_update_meta_timestamp(session_id: String) -> Void
-extern fn session_auto_title(session_id: String, first_message: String) -> Void
-extern fn handle_session_approve(session_id: String, body: String) -> String

soul.el

@@ -8,9 +8,6 @@ import "chat.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",
@@ -94,6 +91,61 @@ fn init_soul_edges() -> Void {
     engram_connect(val_hope, val_trust, el_from_float(0.7), "co-value")
 }
 
+// ensure_self_canonical_bridge — link the public self anchor (the graph API's
+// traversal_root, kn-efeb4a5b, which carries only incidental tag edges) to the
+// curated self node (015644f5, where the real identity / value / co-value edges
+// live). Without this, public self-traversal (name=self / neuron) reaches tags
+// instead of the curated identity. Idempotent: connects only if the edge is
+// missing, so it is safe to run every boot — including on an already-populated
+// graph where init_soul_edges() is skipped by the <100-edge gate.
+fn ensure_self_canonical_bridge() -> Void {
+    let pub_self: String = "kn-efeb4a5b-5aff-4759-8a97-7233099be6ee"
+    let curated_self: String = "015644f5-8194-4af0-800d-dd4a0cd71396"
+    let nbrs: String = engram_neighbors_json(pub_self, 1, "out")
+    if !str_contains(nbrs, curated_self) {
+        engram_connect(pub_self, curated_self, el_from_float(0.95), "canonical-self")
+        engram_connect(curated_self, pub_self, el_from_float(0.95), "canonical-self")
+        println("[soul] canonical-self bridge built: kn-efeb4a5b <-> 015644f5")
+    }
+}
+
+// aff_try_slot — accumulate one affective-context node into state.
+// Replaces the broken `let bacc = while bi < N { ... let bacc = ... }` pattern
+// that caused ELC to emit duplicate C declarations for `bacc`.
+// (2026-06-23 self-review: EL compiler codegen bug — while loop with let-rebinding
+// inside the loop body generates `el_val_t bacc = ...` twice in the same C scope.)
+// Callers unroll manually to 3 slots (matching engram_search_json limit=3).
+// Guards: empty slot_json (out-of-bounds json_array_get) → no-op.
+fn aff_try_slot(slot_json: String, aff_7d_ts: Int, acc_key: String) -> Void {
+    if str_eq(slot_json, "") { return "" }
+    let bn_c: String = json_get(slot_json, "content")
+    if str_eq(bn_c, "") { return "" }
+    let bm: String = " | ts:"
+    let bmp: Int = str_index_of(bn_c, bm)
+    state_set("_ats_ts_raw", "")
+    if bmp >= 0 {
+        let bs: Int = bmp + str_len(bm)
+        let br: String = str_slice(bn_c, bs, str_len(bn_c))
+        let bn_next: Int = str_index_of(br, " | ")
+        if bn_next < 0 { state_set("_ats_ts_raw", br) }
+        if bn_next >= 0 { state_set("_ats_ts_raw", str_slice(br, 0, bn_next)) }
+    }
+    if bmp < 0 {
+        let bca: String = json_get(slot_json, "created_at")
+        if str_eq(bca, "") { state_set("_ats_ts_raw", json_get(slot_json, "updated_at")) }
+        if !str_eq(bca, "") { state_set("_ats_ts_raw", bca) }
+    }
+    let bn_ts_raw: String = state_get("_ats_ts_raw")
+    let bn_ts: Int = if str_eq(bn_ts_raw, "") { 0 } else { str_to_int(bn_ts_raw) }
+    let snip: String = if str_len(bn_c) > 200 { str_slice(bn_c, 0, 200) } else { bn_c }
+    if bn_ts >= aff_7d_ts && !str_eq(snip, "") {
+        let cur_acc: String = state_get(acc_key)
+        if str_eq(cur_acc, "") { state_set(acc_key, snip) }
+        if !str_eq(cur_acc, "") { state_set(acc_key, cur_acc + "\n" + snip) }
+    }
+    return ""
+}
+
 // load_identity_context — pull key identity nodes from engram into working state.
 // Called at boot after engram_load. These nodes contain values, intellectual-dna,
 // memory-philosophy — the graph-stored self that chat.el can include in prompts.
@@ -133,6 +185,14 @@ fn load_identity_context() -> Void {
         println("[soul] identity context loaded (" + int_to_str(str_len(ctx)) + " chars, " + int_to_str(parts_count) + " nodes)")
     }
 
+    // Q6 fix: warn when all three identity node fetches return empty. For genesis this
+    // indicates a corrupted or missing graph. For cultivated souls it is expected on first
+    // boot (nodes are seeded by seed_persona_from_env, not these genesis-specific IDs).
+    // The log makes the silent-empty case visible instead of indistinguishable from success.
+    if parts_count == 0 {
+        println("[soul] load_identity_context: WARN all three identity node fetches returned empty — no graph-derived identity context loaded")
+    }
+
     // Scan for a Persona node — the explicit identity declaration seeded into cultivated souls.
     // Stored at seeding time with label "soul:persona" and node_type "Persona".
     // genesis derives identity from the graph directly; cultivated souls have this node seeded.
@@ -147,6 +207,36 @@ fn load_identity_context() -> Void {
             println("[soul] persona node loaded (" + int_to_str(str_len(p_content)) + " chars)")
         }
     }
+
+    // Cross-session affective context: load BellEvent and PositiveEvent nodes from last 7 days.
+    // (2026-06-23: replaced while-loop accumulation with manual 3-slot unroll via aff_try_slot.
+    // The EL codegen bug: `let bacc = while ... { ... let bacc = ... }` emits `el_val_t bacc`
+    // twice in the same C scope. Since search limit=3, manual unrolling is exact.)
+    let aff_now: Int = time_now()
+    let aff_7d: Int = aff_now - 604800
+    let bell_raw: String = engram_search_json("bell:soft bell:hard BellEvent affective", 3)
+    let bell_aff_ok: Bool = !str_eq(bell_raw, "") && !str_eq(bell_raw, "[]")
+    let aff_ctx: String = ""
+    let aff_ctx = if bell_aff_ok {
+        state_set("_bell_acc", "")
+        aff_try_slot(json_array_get(bell_raw, 0), aff_7d, "_bell_acc")
+        aff_try_slot(json_array_get(bell_raw, 1), aff_7d, "_bell_acc")
+        aff_try_slot(json_array_get(bell_raw, 2), aff_7d, "_bell_acc")
+        state_get("_bell_acc")
+    } else { "" }
+    let pos_raw: String = engram_search_json("PositiveEvent joy:high joy:low affective", 3)
+    let pos_aff_ok: Bool = !str_eq(pos_raw, "") && !str_eq(pos_raw, "[]")
+    let aff_ctx = if pos_aff_ok {
+        state_set("_pos_acc", aff_ctx)
+        aff_try_slot(json_array_get(pos_raw, 0), aff_7d, "_pos_acc")
+        aff_try_slot(json_array_get(pos_raw, 1), aff_7d, "_pos_acc")
+        aff_try_slot(json_array_get(pos_raw, 2), aff_7d, "_pos_acc")
+        state_get("_pos_acc")
+    } else { aff_ctx }
+    if !str_eq(aff_ctx, "") {
+        state_set("soul_affective_context", aff_ctx)
+        println("[soul] 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.
@@ -218,12 +308,36 @@ fn emit_session_start_event() -> Void {
     }
     let ts: Int = time_now()
 
+    // Load previous session summary at boot — stash in state for session_preload (issue #6).
+    // Primary: label-based. Fallback: vector search. Logs it so continuity is auditable.
+    let prev_sum_node: String = engram_get_node_by_label("session:summary")
+    let prev_sum_ok: Bool = !str_eq(prev_sum_node, "") && !str_eq(prev_sum_node, "null")
+    let prev_sum_content: String = if prev_sum_ok {
+        json_get(prev_sum_node, "content")
+    } else {
+        let sum_search: String = engram_search_json("SessionSummary session:summary previous-session", 2)
+        let sum_srch_ok: Bool = !str_eq(sum_search, "") && !str_eq(sum_search, "[]")
+        if sum_srch_ok {
+            let sn: String = json_array_get(sum_search, 0)
+            let stype: String = json_get(sn, "node_type")
+            let scontent: String = json_get(sn, "content")
+            if str_eq(stype, "SessionSummary") && !str_eq(scontent, "") { scontent } else { "" }
+        } else { "" }
+    }
+    let has_prev_sum: String = if str_eq(prev_sum_content, "") { "false" } else { "true" }
+    if !str_eq(prev_sum_content, "") {
+        state_set("soul_prev_session_summary", prev_sum_content)
+        println("[soul] previous session summary loaded (" + int_to_str(str_len(prev_sum_content)) + " chars)")
+    }
+
+
     let payload: String = "{\"event\":\"session_start\""
         + ",\"boot\":" + boot_num
         + ",\"cgi\":\"" + eff_cgi + "\""
         + ",\"node_count\":" + int_to_str(node_ct)
         + ",\"edge_count\":" + int_to_str(edge_ct)
         + ",\"identity_loaded\":" + has_identity
+        + ",\"prev_session_summary_loaded\":" + has_prev_sum
         + ",\"ts\":" + int_to_str(ts) + "}"
 
     let tags: String = "[\"internal-state\",\"session-start\",\"InternalStateEvent\"]"
@@ -232,33 +346,45 @@ fn emit_session_start_event() -> Void {
         el_from_float(0.9), el_from_float(0.9), el_from_float(1.0),
         "Episodic", tags
     )
-    println("[soul] session-start event logged (boot=" + boot_num + " nodes=" + int_to_str(node_ct) + " edges=" + int_to_str(edge_ct) + ")")
+    println("[soul] session-start event logged (boot=" + boot_num + " nodes=" + int_to_str(node_ct) + " edges=" + int_to_str(edge_ct) + " prev_summary=" + has_prev_sum + ")")
 }
 
 // layered_cycle — routes user-facing requests through the 4-layer consciousness stack.
 // L0 (core) → L1 (safety screen) → L2a (continuity + behavioral profiling) → L2b (mission alignment) → L3 (imprint) → L1 (safety validate)
 // Internal cognition (heartbeat, proactive, memory ops) bypasses layers — use one_cycle directly.
 fn layered_cycle(raw_input: String) -> String {
-    let history: String = state_get("conversation_history")
+    let history: String = state_get("conv_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 an invalid/empty action
+    // (engram failure or internal error), refuse rather than pass unscreened input.
+    let valid_action: Bool = str_eq(screen_action, "hard_bell")
+        || str_eq(screen_action, "soft_bell")
+        || str_eq(screen_action, "pass")
+    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 already called inside safety_screen (line 140).
+    // Do NOT call it again here -- that would double-log every hard bell.
+    //
     // safety_validate second param: when screen_action is "hard_bell", safety_validate
     // receives the sentinel string "hard_bell" (not a normal screen action). The safety
     // 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")
     }
 
@@ -269,8 +395,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") {
@@ -293,6 +422,55 @@ fn layered_cycle(raw_input: String) -> String {
         json_get(steward_result, "redirect_to")
     }
 
+    // L2c: affective context injection.
+    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, "[]")
+    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) }
+        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, "[]")
+    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) }
+        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 }
+
+    // pre-LLM bell augmentation
+    let augmented_addendum: String = safety_augment_system("", raw_input)
+    let augmented_addendum = if str_eq(lc_affective_note, "") { augmented_addendum } else {
+        if str_eq(augmented_addendum, "") { lc_affective_note } else { lc_affective_note + "\n" + augmented_addendum }
+    }
+    state_set("layered_cycle_safety_system_addendum", augmented_addendum)
+
     // L3: imprint responds
     let output: String = imprint_respond(aligned, imprint_id)
 
@@ -350,6 +528,7 @@ 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()
 
@@ -362,7 +541,31 @@ state_set("soul_engram_api_key", engram_api_key_raw)
 state_set("soul.running", "true")
 
 let is_genesis: Bool = str_eq(soul_cgi_id, "ntn-genesis")
-if is_genesis {
+
+// GUARD (2026-06-15): never let genesis seed over a real graph. If the in-memory load is
+// sparse but the on-disk snapshot file is large, the load FAILED — seeding+saving now would
+// clobber the user's real memory (this is exactly how the 06-14 clobber happened). Read the
+// on-disk file (local mode only) and refuse the destructive seed+save when it looks populated.
+//
+// HTTP-engram guard (2026-06-17): when ENGRAM_URL is set the HTTP Engram owns persistence —
+// the soul must NEVER write to the local snapshot regardless of node counts. safe_to_seed is
+// unconditionally false in HTTP mode (not the persistence owner).
+let guard_disk: String = if str_eq(engram_url_raw, "") { fs_read(snapshot) } else { "" }
+let guard_disk_len: Int = str_len(guard_disk)
+// Ratio guard (2026-06-15 fix): refuse to seed/save whenever the in-memory load is FAR smaller than
+// the on-disk file implies (~16KB/node) — catches partial loads of ANY size, not just <50. The old
+// <50 threshold let a 63-node identity-only load clobber a 47MB/5000-node graph.
+// Multiplication form (2026-06-17): node_count * 16000 < disk_len avoids floor-division truncation
+// (e.g., 250KB / 16000 = 15.6, floors to 15 — a 15-node graph wrongly passes the old guard).
+// HTTP-engram guard: when using_http_engram the soul is not the persistence owner; never seed.
+let safe_to_seed: Bool = !using_http_engram && !(guard_disk_len > 200000 && engram_node_count() * 16000 < guard_disk_len)
+if is_genesis && !safe_to_seed {
+    println("[soul] GUARD: loaded " + int_to_str(engram_node_count())
+        + " nodes but snapshot file is " + int_to_str(guard_disk_len)
+        + " bytes — refusing to seed/save over a real graph")
+}
+
+if is_genesis && safe_to_seed {
     // Only build identity edges if the engram is fresh (< 100 edges).
     // init_soul_edges() is not idempotent — calling it on every restart
     // stacks duplicate co-value/identity edges into the snapshot.
@@ -373,6 +576,9 @@ if is_genesis {
     } else {
         println("[soul] edges already present (" + int_to_str(edge_count_now) + ") - skipping init")
     }
+    // Canonical-self bridge is idempotent — run it regardless of edge count so an
+    // already-populated graph still gets the public->curated self link.
+    ensure_self_canonical_bridge()
     // Genesis saves to its local snapshot file (it manages its own Engram).
     state_set("soul_snapshot_path", snapshot)
     engram_save(snapshot)
@@ -380,7 +586,7 @@ if is_genesis {
 
 // Take a pre-serve snapshot for genesis instances — captures all boot-time graph changes
 // (identity context loading, boot counter, session-start event) before entering the serve loop.
-if is_genesis {
+if is_genesis && safe_to_seed {
     let snap: String = state_get("soul_snapshot_path")
     if !str_eq(snap, "") {
         engram_save(snap)

soul.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header — do not edit
+// auto-generated by elc --emit-header - do not edit
 extern fn init_soul_edges() -> Void
 extern fn load_identity_context() -> Void
 extern fn seed_persona_from_env() -> Void

studio.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header — do not edit
+// auto-generated by elc --emit-header - do not edit
 extern fn auth_headers(tok: String) -> Map
 extern fn axon_get(path: String) -> String
 extern fn axon_post(path: String, body: String) -> String

tests/test_agentic_tools.el

@@ -0,0 +1,176 @@
+// tests/test_agentic_tools.el
+// Tests for the agentic tools wiring (PR #19: fix/agentic-tools-all).
+//
+// Covers:
+//   1. agentic_tools_all() includes all literal tool names
+//   2. agentic_tools_all() includes the native web_search tool
+//   3. connector_tools_json() returns valid JSON ([] or array) even when bridge is down
+//   4. agentic_tools_all() output stays valid JSON when connector bridge is down
+//   5. tool_pending envelope detection — the pattern used in handle_dharma_room_turn_agentic
+//      to distinguish a suspended agentic loop from a normal reply
+//   6. Empty-reply guard — json_get("reply") returns "" on a tool_pending envelope,
+//      confirming that the guard is necessary to avoid silent empty responses
+//
+// Tests 5 and 6 validate the El-level logic that guards handle_dharma_room_turn_agentic
+// against silent failures after the refactor to use agentic_loop.
+//
+// Tests 1-4 are pure: no network, no LLM, no engram.
+// Tests 5-6 are pure string/JSON operations on synthesized envelopes.
+//
+// Integration tests (LLM-live) are documented as SKIP stubs because they
+// require a valid ANTHROPIC_API_KEY and a running soul + neuron-connectd.
+
+import "../chat.el"
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq(label: String, got: String, expected: String) -> Void {
+    if str_eq(got, expected) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got)
+        println("    expected: " + expected)
+    }
+}
+
+fn assert_true(label: String, cond: Bool) -> Void {
+    if cond {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+    }
+}
+
+fn assert_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    missing '" + needle + "' in: " + haystack)
+    }
+}
+
+fn assert_not_empty(label: String, s: String) -> Void {
+    if str_len(s) > 0 {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got empty string")
+    }
+}
+
+// ── Section 1: agentic_tools_all contains all literal tool names ──────────────
+
+println("")
+println("1. agentic_tools_all() — contains all literal tool names")
+
+let all_tools: String = agentic_tools_all()
+assert_contains("contains read_file", all_tools, "\"name\":\"read_file\"")
+assert_contains("contains write_file", all_tools, "\"name\":\"write_file\"")
+assert_contains("contains web_get", all_tools, "\"name\":\"web_get\"")
+assert_contains("contains search_memory", all_tools, "\"name\":\"search_memory\"")
+assert_contains("contains run_command", all_tools, "\"name\":\"run_command\"")
+
+// ── Section 2: agentic_tools_all includes native web_search ──────────────────
+
+println("")
+println("2. agentic_tools_all() — includes native web_search_20250305 tool")
+
+assert_contains("contains web_search type", all_tools, "web_search_20250305")
+assert_contains("contains web_search name", all_tools, "\"name\":\"web_search\"")
+
+// ── Section 3: connector_tools_json returns valid JSON when bridge is down ────
+
+println("")
+println("3. connector_tools_json() — returns [] when neuron-connectd is not running")
+
+// connector_tools_json() calls the bridge; in a unit-test environment it is
+// expected to return "[]" (graceful degradation). If the bridge IS running,
+// it returns a non-empty array — both are valid.
+let conn_tools: String = connector_tools_json()
+let starts_bracket: Bool = str_starts_with(conn_tools, "[")
+assert_true("connector_tools_json starts with [", starts_bracket)
+assert_not_empty("connector_tools_json is non-empty string", conn_tools)
+
+// ── Section 4: agentic_tools_all output is valid JSON array ──────────────────
+
+println("")
+println("4. agentic_tools_all() — output is a JSON array")
+
+assert_true("starts with [", str_starts_with(all_tools, "["))
+// A JSON array ends with ]
+let last_char: String = str_slice(all_tools, str_len(all_tools) - 1, str_len(all_tools))
+assert_eq("ends with ]", last_char, "]")
+
+// ── Section 5: tool_pending envelope detection ────────────────────────────────
+//
+// This validates the detection logic added to handle_dharma_room_turn_agentic:
+//
+//   let is_pending: Bool = str_eq(json_get(loop_result, "tool_pending"), "true")
+//       || str_starts_with(loop_result, "{\"tool_pending\":true")
+//
+// When agentic_loop suspends for an MCP bridge tool it returns:
+//   {"tool_pending":true,"session_id":"...","call_id":"...","tool_name":"...","tool_input":{...},...}
+//
+// json_get() on a Bool field may return "true" (string) or "" depending on El runtime.
+// The str_starts_with fallback guards against either representation.
+
+println("")
+println("5. tool_pending envelope detection patterns")
+
+let pending_envelope: String = "{\"tool_pending\":true,\"session_id\":\"dharma:br-1234-1\",\"call_id\":\"toolu_01\",\"tool_name\":\"mcp__filesystem__read\",\"tool_input\":{\"path\":\"/tmp/x\"},\"model\":\"claude-sonnet-4-5\",\"agentic\":true,\"tools_used\":[]}"
+let normal_envelope: String = "{\"reply\":\"Hello from the soul.\",\"model\":\"claude-sonnet-4-5\",\"agentic\":true,\"tools_used\":[]}"
+let error_envelope: String = "{\"error\":\"llm unavailable\",\"reply\":\"\"}"
+
+// str_starts_with fallback — always works regardless of how json_get handles bool
+assert_true("pending envelope: str_starts_with detects tool_pending=true", str_starts_with(pending_envelope, "{\"tool_pending\":true"))
+assert_true("normal reply: str_starts_with does not detect tool_pending", !str_starts_with(normal_envelope, "{\"tool_pending\":true"))
+assert_true("error envelope: str_starts_with does not detect tool_pending", !str_starts_with(error_envelope, "{\"tool_pending\":true"))
+
+// ── Section 6: empty-reply guard necessity ────────────────────────────────────
+//
+// Confirms that json_get(pending_envelope, "reply") returns "" — proving the
+// empty-reply guard is necessary to avoid a silent success with empty response.
+// Without the guard, the old code would return {"response":"","cgi_id":"..."} which
+// is indistinguishable from a successful LLM response.
+
+println("")
+println("6. empty-reply guard — json_get(pending, \"reply\") is empty")
+
+let pending_reply: String = json_get(pending_envelope, "reply")
+assert_eq("json_get reply on pending envelope is empty", pending_reply, "")
+
+let normal_reply: String = json_get(normal_envelope, "reply")
+assert_not_empty("json_get reply on normal envelope is non-empty", normal_reply)
+
+// Also confirm error key absent from normal reply and pending envelopes
+let pending_error: String = json_get(pending_envelope, "error")
+assert_eq("pending envelope has no error key", pending_error, "")
+
+let normal_error: String = json_get(normal_envelope, "error")
+assert_eq("normal envelope has no error key", normal_error, "")
+
+// ── SKIP stubs: integration tests requiring live LLM ─────────────────────────
+
+println("")
+println("SKIP: handle_dharma_room_turn_agentic happy-path (requires ANTHROPIC_API_KEY + soul)")
+println("      Expected: non-empty response field and status ok")
+println("SKIP: handle_dharma_room_turn_agentic tool_pending propagation (requires API + MCP bridge)")
+println("      Expected: tool_pending in response when loop suspends for mcp__* tool")
+println("SKIP: handle_chat_agentic connector tools end-to-end (requires API + neuron-connectd)")
+println("      Expected: mcp__* tool names appear in tools_used when connectd is running")
+
+// ── Summary ───────────────────────────────────────────────────────────────────
+
+println("")
+println("agentic tools tests: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")

tests/test_api_define_process.el

@@ -0,0 +1,109 @@
+// ── tests/test_api_define_process.el ─────────────────────────────────────────
+//
+// Test the handle_api_define_process read-back fix (neuron-api.el).
+//
+// Bug: handle_api_define_process was the only write handler that did NOT call
+// api_persisted() after the write, returning {"id":"...","ok":true} even when
+// the engram write failed (hallucinated save).
+//
+// Fix: added `if !api_persisted(id) { return api_not_persisted(id) }` before
+// the return, consistent with all sibling handlers (remember, capture_knowledge,
+// evolve_knowledge, promote_knowledge, node_create).
+//
+// Tests:
+//   1. define_process returns ok==true and id resolves via engram_get_node_json.
+//   2. Missing content returns the standard error.
+//   3. Unnamed process uses default label and still persists.
+// ──────────────────────────────────────────────────────────────────────────────
+
+import "../neuron-api.el"
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq(label: String, got: String, expected: String) -> Void {
+    if str_eq(got, expected) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got)
+        println("    expected: " + expected)
+    }
+}
+
+fn assert_not_eq(label: String, got: String, not_want: String) -> Void {
+    if str_eq(got, not_want) {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label + " (got: " + got + ", should differ)")
+    } else {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    }
+}
+
+fn assert_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    missing '" + needle + "' in: " + haystack)
+    }
+}
+
+// ── Section 1: define_process — happy path with read-back ────────────────────
+
+println("")
+println("1. handle_api_define_process — write then verify id resolves")
+
+let proc_body: String = "{\"content\":\"Test process: run step A, then step B, then step C.\",\"name\":\"test-process-guard\"}"
+let proc_result: String = handle_api_define_process(proc_body)
+
+let proc_ok: String = json_get(proc_result, "ok")
+let proc_id: String = json_get(proc_result, "id")
+
+assert_eq("define_process -> ok==true", proc_ok, "true")
+assert_not_eq("define_process -> id is non-empty", proc_id, "")
+
+let node_json: String = engram_get_node_json(proc_id)
+let node_status: String = if str_eq(node_json, "") { "empty" } else {
+    if str_eq(node_json, "null") { "null" } else { "ok" }
+}
+assert_eq("define_process -> node read-back resolves (not empty/null)", node_status, "ok")
+assert_contains("define_process -> node content contains process text", node_json, "Test process")
+
+// ── Section 2: define_process — missing content returns error ────────────────
+
+println("")
+println("2. handle_api_define_process — missing content returns error")
+
+let no_content_body: String = "{\"name\":\"nameless\"}"
+let no_content_result: String = handle_api_define_process(no_content_body)
+let no_content_error: String = json_get(no_content_result, "error")
+assert_eq("missing content -> error is 'content is required'", no_content_error, "content is required")
+
+// ── Section 3: define_process — unnamed process gets default label ────────────
+
+println("")
+println("3. handle_api_define_process — unnamed process writes and read-back succeeds")
+
+let unnamed_body: String = "{\"content\":\"Unnamed test process for coverage.\"}"
+let unnamed_result: String = handle_api_define_process(unnamed_body)
+let unnamed_ok: String = json_get(unnamed_result, "ok")
+let unnamed_id: String = json_get(unnamed_result, "id")
+assert_eq("unnamed process -> ok==true", unnamed_ok, "true")
+assert_not_eq("unnamed process -> id non-empty", unnamed_id, "")
+
+let unnamed_node: String = engram_get_node_json(unnamed_id)
+let unnamed_status: String = if str_eq(unnamed_node, "") { "empty" } else {
+    if str_eq(unnamed_node, "null") { "null" } else { "ok" }
+}
+assert_eq("unnamed process -> node read-back ok", unnamed_status, "ok")
+
+// ── Summary ───────────────────────────────────────────────────────────────────
+
+println("")
+println("api_define_process tests: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")

tests/test_bell_safety.el

@@ -0,0 +1,266 @@
+// ── tests/test_bell_safety.el ─────────────────────────────────────────────────
+//
+// Unit tests for the Hard Bell safety layer added in feat/connectors-soul.
+// Covers the public API exposed by safety.el:
+//   - safety_detect_bell_level:  'none' / 'soft' / 'hard'
+//   - safety_classify_hard_bell: 'self_harm' / 'abuse'
+//   - safety_normalize:          smart-quote -> ASCII apostrophe normalisation
+//   - safety_augment_system:     system prompt passthrough / augmentation
+//   - handle_safety_contact_post: validation + read-back
+//
+// El test convention: mutable pass_count / fail_count globals, assert_* helpers,
+// println for each result.  Mirrors the style in existing safety tests.
+// ──────────────────────────────────────────────────────────────────────────────
+
+import "../safety.el"
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq(label: String, got: String, expected: String) -> Void {
+    if str_eq(got, expected) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got)
+        println("    expected: " + expected)
+    }
+}
+
+fn assert_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    missing '" + needle + "' in: " + haystack)
+    }
+}
+
+fn assert_not_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    unexpected '" + needle + "' found in: " + haystack)
+    } else {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    }
+}
+
+// ── Section 1: safety_detect_bell_level — 'none' ─────────────────────────────
+
+println("")
+println("1. safety_detect_bell_level — neutral input -> 'none'")
+
+let level_neutral: String = safety_detect_bell_level("What time is the meeting tomorrow?")
+assert_eq("neutral question -> none", level_neutral, "none")
+
+let level_positive: String = safety_detect_bell_level("I love sunny days")
+assert_eq("positive statement -> none", level_positive, "none")
+
+let level_empty: String = safety_detect_bell_level("")
+assert_eq("empty string -> none", level_empty, "none")
+
+// ── Section 2: safety_detect_bell_level — single soft phrase stays 'none' ────
+
+println("")
+println("2. safety_detect_bell_level — single soft phrase does not reach 'soft' (threshold=2)")
+
+let level_one_soft: String = safety_detect_bell_level("I have been feeling stressed lately")
+assert_eq("single soft phrase alone -> none", level_one_soft, "none")
+
+// ── Section 3: safety_detect_bell_level — 'soft' with two+ soft phrases ──────
+
+println("")
+println("3. safety_detect_bell_level — two soft phrases -> 'soft'")
+
+let level_two_soft: String = safety_detect_bell_level("I am feeling overwhelmed and really anxious about everything")
+assert_eq("two soft phrases -> soft", level_two_soft, "soft")
+
+let level_multi_soft: String = safety_detect_bell_level("So depressed and hopeless, nothing matters anymore")
+assert_eq("multiple soft phrases -> soft", level_multi_soft, "soft")
+
+// ── Section 4: safety_detect_bell_level — 'hard' (self_harm phrases) ─────────
+
+println("")
+println("4. safety_detect_bell_level — self_harm phrases -> 'hard'")
+
+let level_kill_myself: String = safety_detect_bell_level("I want to kill myself")
+assert_eq("'kill myself' -> hard", level_kill_myself, "hard")
+
+let level_suicide: String = safety_detect_bell_level("I have been suicidal for weeks")
+assert_eq("'suicidal' -> hard", level_suicide, "hard")
+
+let level_want_die: String = safety_detect_bell_level("I want to die, nothing is worth it")
+assert_eq("'want to die' -> hard", level_want_die, "hard")
+
+let level_overdose: String = safety_detect_bell_level("I am thinking about an overdose")
+assert_eq("'overdose' -> hard", level_overdose, "hard")
+
+let level_self_harm: String = safety_detect_bell_level("My history of self-harm is back")
+assert_eq("'self-harm' -> hard", level_self_harm, "hard")
+
+let level_no_reason: String = safety_detect_bell_level("There is no reason to live")
+assert_eq("'no reason to live' -> hard", level_no_reason, "hard")
+
+// ── Section 5: safety_detect_bell_level — 'hard' (abuse phrases) ─────────────
+
+println("")
+println("5. safety_detect_bell_level — abuse phrases -> 'hard'")
+
+let level_he_hit: String = safety_detect_bell_level("he hit me last night")
+assert_eq("'he hit me' -> hard", level_he_hit, "hard")
+
+let level_dv: String = safety_detect_bell_level("I am experiencing domestic violence")
+assert_eq("'domestic violence' -> hard", level_dv, "hard")
+
+let level_abused: String = safety_detect_bell_level("I am being abused")
+assert_eq("'being abused' -> hard", level_abused, "hard")
+
+// ── Section 6: safety_detect_bell_level — 'hard' (general hard phrases) ──────
+
+println("")
+println("6. safety_detect_bell_level — general hard phrases -> 'hard'")
+
+let level_hurting_me: String = safety_detect_bell_level("someone is hurting me right now")
+assert_eq("'hurting me' -> hard", level_hurting_me, "hard")
+
+let level_being_hurt: String = safety_detect_bell_level("I am being hurt and need help")
+assert_eq("'being hurt' -> hard", level_being_hurt, "hard")
+
+// ── Section 7: safety_classify_hard_bell — abuse -> 'abuse' ──────────────────
+
+println("")
+println("7. safety_classify_hard_bell — abuse phrases route to 'abuse'")
+
+let class_he_hit: String = safety_classify_hard_bell("he hit me yesterday")
+assert_eq("'he hit me' classifies as abuse", class_he_hit, "abuse")
+
+let class_dv: String = safety_classify_hard_bell("domestic violence in my home")
+assert_eq("'domestic violence' classifies as abuse", class_dv, "abuse")
+
+let class_abused: String = safety_classify_hard_bell("I'm being abused by my partner")
+assert_eq("'being abused' classifies as abuse", class_abused, "abuse")
+
+// ── Section 8: safety_classify_hard_bell — self_harm phrases ─────────────────
+
+println("")
+println("8. safety_classify_hard_bell — self_harm phrases route to 'self_harm'")
+
+let class_kill: String = safety_classify_hard_bell("I want to kill myself")
+assert_eq("'kill myself' classifies as self_harm", class_kill, "self_harm")
+
+let class_suicide: String = safety_classify_hard_bell("I am suicidal")
+assert_eq("'suicidal' classifies as self_harm", class_suicide, "self_harm")
+
+let class_overdose: String = safety_classify_hard_bell("took too many pills")
+assert_eq("'took too many' classifies as self_harm", class_overdose, "self_harm")
+
+// ── Section 9: safety_classify_hard_bell — general -> 'self_harm' ────────────
+
+println("")
+println("9. safety_classify_hard_bell — general hard phrases fall through to 'self_harm'")
+
+let class_going_kill: String = safety_classify_hard_bell("going to kill everything around me")
+assert_eq("general hard phrase falls through to self_harm", class_going_kill, "self_harm")
+
+// ── Section 10: safety_normalize — curly apostrophe normalisation ─────────────
+
+println("")
+println("10. safety_normalize — curly apostrophe normalisation")
+
+// U+2019 RIGHT SINGLE QUOTATION MARK (UTF-8: \xe2\x80\x99) must become ASCII '
+let smart_msg: String = "I can" + "\xe2\x80\x99" + "t go on anymore"
+let normalized: String = safety_normalize(smart_msg)
+assert_contains("smart-quote normalized to ASCII apostrophe", normalized, "can't go on")
+
+// After normalisation, detect_bell_level must fire 'hard' on the smart-quote variant
+let level_smart: String = safety_detect_bell_level(smart_msg)
+assert_eq("smart-quote 'can't go on' -> hard (after normalize)", level_smart, "hard")
+
+// ── Section 11: safety_augment_system — passthrough on neutral ───────────────
+
+println("")
+println("11. safety_augment_system — neutral input returns system unchanged")
+
+let base_sys: String = "You are a helpful assistant."
+let aug_neutral: String = safety_augment_system(base_sys, "What is the weather?")
+assert_eq("neutral message -> system unchanged", aug_neutral, base_sys)
+
+// ── Section 12: safety_augment_system — soft bell injects directive ──────────
+
+println("")
+println("12. safety_augment_system — soft bell injects soft directive")
+
+let aug_soft: String = safety_augment_system(base_sys, "Feeling so overwhelmed and completely anxious")
+assert_contains("soft augment -> contains original system", aug_soft, base_sys)
+assert_contains("soft augment -> contains SUBSTRATE DIRECTIVE", aug_soft, "SUBSTRATE DIRECTIVE")
+assert_contains("soft augment -> contains soft care text", aug_soft, "genuine care")
+
+// ── Section 13: safety_augment_system — hard self_harm injects 988 ───────────
+
+println("")
+println("13. safety_augment_system — hard self_harm injects crisis resources with 988")
+
+let aug_hard: String = safety_augment_system(base_sys, "I want to kill myself tonight")
+assert_contains("hard self_harm -> contains SUBSTRATE DIRECTIVE", aug_hard, "SUBSTRATE DIRECTIVE")
+assert_contains("hard self_harm -> includes 988 crisis line", aug_hard, "988")
+assert_not_contains("hard self_harm -> no DV hotline (wrong routing)", aug_hard, "1-800-799-7233")
+
+// ── Section 14: safety_augment_system — hard abuse routes to abuse directive ──
+
+println("")
+println("14. safety_augment_system — hard abuse injects abuse-specific directive")
+
+let aug_abuse: String = safety_augment_system(base_sys, "he hit me and I am afraid of him")
+assert_contains("hard abuse -> DV hotline present", aug_abuse, "1-800-799-7233")
+assert_contains("hard abuse -> mentions not notifying contact", aug_abuse, "safety contact")
+
+// ── Section 15: handle_safety_contact_post — validation ───────────────────────
+
+println("")
+println("15. handle_safety_contact_post — non-crisis without name returns error")
+
+let no_name_body: String = "{\"is_crisis_line\":false,\"contact_method\":\"phone\",\"contact_value\":\"555-1234\",\"relationship\":\"friend\"}"
+let no_name_result: String = handle_safety_contact_post(no_name_body)
+let no_name_ok: String = json_get(no_name_result, "ok")
+let no_name_err: String = json_get(no_name_result, "error")
+assert_eq("no name -> ok==false", no_name_ok, "false")
+assert_eq("no name -> error is 'name is required'", no_name_err, "name is required")
+
+// ── Section 16: handle_safety_contact_post — write then read back ──────────────
+
+println("")
+println("16. handle_safety_contact_post — write then read back verifies persistence")
+
+let contact_body: String = "{\"is_crisis_line\":false,\"name\":\"Test Contact\",\"contact_method\":\"phone\",\"contact_value\":\"555-9876\",\"relationship\":\"sibling\"}"
+let write_result: String = handle_safety_contact_post(contact_body)
+let write_ok: String = json_get(write_result, "ok")
+assert_eq("contact write -> ok==true", write_ok, "true")
+assert_contains("contact write -> result has configured", write_result, "\"configured\"")
+assert_contains("contact write -> result has name", write_result, "Test Contact")
+
+let read_result: String = handle_safety_contact_get()
+assert_eq("contact read-back -> configured==true", json_get(read_result, "configured"), "true")
+assert_contains("contact read-back -> name matches", read_result, "Test Contact")
+
+// ── Section 17: handle_safety_contact_post — crisis line auto-fills ───────────
+
+println("")
+println("17. handle_safety_contact_post — crisis line auto-fills name and value")
+
+let crisis_body: String = "{\"is_crisis_line\":true}"
+let crisis_result: String = handle_safety_contact_post(crisis_body)
+let crisis_ok: String = json_get(crisis_result, "ok")
+assert_eq("crisis line write -> ok==true", crisis_ok, "true")
+assert_contains("crisis line -> name is Crisis Line", crisis_result, "Crisis Line")
+assert_contains("crisis line -> value is 988", crisis_result, "988")
+
+// ── Summary ───────────────────────────────────────────────────────────────────
+
+println("")
+println("bell_safety tests: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")

tests/test_bridge_serialization.el

@@ -0,0 +1,257 @@
+// ── test_bridge_serialization.el ──────────────────────────────────────────────
+//
+// Tests for PR #20 fix/bridge-save-serialization:
+//   - bridge_save raw JSON serialization (BLOCKER 1 & 2 regression guards)
+//   - agentic_resume error-path handling
+//   - Legacy fallback: old string-escaped fields still readable
+//   - Corrupt/missing bridge state error envelope
+//   - Empty messages/tools_json guard in bridge_save
+//
+// What CANNOT be tested here without a live Anthropic API:
+//   - agentic_resume golden-path (calls agentic_loop which hits the API)
+//   - Full save/resume round-trip with a real tool_result
+//
+// To run:
+//   elc chat.el && ./soul --test tests/test_bridge_serialization.el
+//
+// ──────────────────────────────────────────────────────────────────────────────
+
+import "../chat.el"
+
+// ── Test harness ──────────────────────────────────────────────────────────────
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq(label: String, got: String, expected: String) -> Void {
+    if str_eq(got, expected) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got)
+        println("    expected: " + expected)
+    }
+}
+
+fn assert_true(label: String, cond: Bool) -> Void {
+    if cond {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+    }
+}
+
+fn assert_false(label: String, cond: Bool) -> Void {
+    assert_true(label, !cond)
+}
+
+fn assert_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    missing '" + needle + "' in: " + haystack)
+    }
+}
+
+fn assert_not_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    unexpected '" + needle + "' found in: " + haystack)
+    } else {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    }
+}
+
+fn assert_not_empty(label: String, s: String) -> Void {
+    if str_eq(s, "") {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label + " (got empty string)")
+    } else {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    }
+}
+
+// ── Section 1: bridge_save — empty messages guard ─────────────────────────────
+//
+// BLOCKER 2 regression guard: bridge_save must refuse to write a blob when
+// messages or tools_json is empty, as the resulting JSON would be syntactically
+// invalid (bare colon with no value).
+
+println("")
+println("1. bridge_save — empty messages guard")
+
+let sid1: String = "test-session-empty-messages"
+state_set("mcp_bridge:" + sid1, "")
+
+let save1_ok: Bool = bridge_save(sid1, "claude-sonnet-4-5", "sys", "[]", "", "", "call-1")
+assert_false("empty messages -> bridge_save returns false", save1_ok)
+
+let saved1: String = state_get("mcp_bridge:" + sid1)
+assert_eq("empty messages -> no blob written to state", saved1, "")
+
+// ── Section 2: bridge_save — empty tools_json guard ───────────────────────────
+
+println("")
+println("2. bridge_save — empty tools_json guard")
+
+let sid2: String = "test-session-empty-tools"
+state_set("mcp_bridge:" + sid2, "")
+
+let save2_ok: Bool = bridge_save(sid2, "claude-sonnet-4-5", "sys", "", "[{\"role\":\"user\",\"content\":\"hi\"}]", "", "call-2")
+assert_false("empty tools_json -> bridge_save returns false", save2_ok)
+
+let saved2: String = state_get("mcp_bridge:" + sid2)
+assert_eq("empty tools_json -> no blob written to state", saved2, "")
+
+// ── Section 3: bridge_save — golden path writes raw JSON fields ───────────────
+//
+// Verifies that messages_raw and tools_raw are stored as inline JSON (not
+// string-escaped) so that json_get_raw retrieves them without corruption.
+
+println("")
+println("3. bridge_save — golden path writes messages_raw and tools_raw as raw JSON")
+
+let sid3: String = "test-session-golden"
+state_set("mcp_bridge:" + sid3, "")
+
+let msgs3: String = "[{\"role\":\"user\",\"content\":\"hello\"}]"
+let tools3: String = "[{\"name\":\"read_file\"}]"
+let save3_ok: Bool = bridge_save(sid3, "claude-sonnet-4-5", "You are a helper.", tools3, msgs3, "read_file", "toolu_abc")
+assert_true("valid args -> bridge_save returns true", save3_ok)
+
+let blob3: String = state_get("mcp_bridge:" + sid3)
+assert_not_empty("valid args -> blob written to state", blob3)
+
+// messages_raw should be stored as a raw JSON array (not a quoted string)
+// so json_get_raw on the blob returns the array directly
+let raw_msgs3: String = json_get_raw(blob3, "messages_raw")
+assert_contains("messages_raw field present in blob", blob3, "messages_raw")
+assert_eq("messages_raw round-trips without corruption", raw_msgs3, msgs3)
+
+let raw_tools3: String = json_get_raw(blob3, "tools_raw")
+assert_eq("tools_raw round-trips without corruption", raw_tools3, tools3)
+
+// Scalar fields should still be present as normal string-escaped JSON fields
+let model3: String = json_get(blob3, "model")
+assert_eq("model field preserved in blob", model3, "claude-sonnet-4-5")
+
+let tool_use_id3: String = json_get(blob3, "tool_use_id")
+assert_eq("tool_use_id field preserved in blob", tool_use_id3, "toolu_abc")
+
+// Verify the blob does NOT contain old-style double-escaped fields
+assert_not_contains("no legacy 'messages' string field in new-format blob", blob3, "\"messages\":\"")
+assert_not_contains("no legacy 'tools_json' string field in new-format blob", blob3, "\"tools_json\":\"")
+
+// ── Section 4: agentic_resume — unknown session_id returns error envelope ──────
+
+println("")
+println("4. agentic_resume — unknown session_id (empty state)")
+
+let sid4: String = "test-session-unknown-xyzzy"
+state_set("mcp_bridge:" + sid4, "")
+
+let resume4: String = agentic_resume(sid4, "toolu_xyz", "some result")
+assert_contains("unknown session_id -> error field present", resume4, "\"error\"")
+assert_contains("unknown session_id -> reply field present", resume4, "\"reply\"")
+assert_contains("unknown session_id -> 'unknown session_id' message", resume4, "unknown session_id")
+let reply4: String = json_get(resume4, "reply")
+assert_eq("unknown session_id -> reply is empty string", reply4, "")
+
+// ── Section 5: agentic_resume — syntactically invalid JSON in state ───────────
+
+println("")
+println("5. agentic_resume — syntactically invalid JSON blob in state")
+
+let sid5: String = "test-session-corrupt-json"
+// Write a non-JSON value that state_get would return as-is
+state_set("mcp_bridge:" + sid5, "NOT_JSON_AT_ALL")
+
+let resume5: String = agentic_resume(sid5, "toolu_xyz", "some result")
+// The function may take multiple paths here; in all cases it must not crash and
+// must return a JSON envelope with at least an error or empty reply field.
+// When json_get_raw returns "" on unparseable input, the guard catches it.
+assert_contains("corrupt JSON blob -> resume returns JSON", resume5, "\"reply\"")
+
+// ── Section 6: agentic_resume — blob with no messages produces error envelope ─
+
+println("")
+println("6. agentic_resume — blob missing messages_raw and messages fields")
+
+let sid6: String = "test-session-no-messages"
+// Blob with only model/safe_sys — no messages or tools
+state_set("mcp_bridge:" + sid6, "{\"model\":\"claude-sonnet-4-5\",\"safe_sys\":\"sys\",\"tool_use_id\":\"toolu_abc\"}")
+
+let resume6: String = agentic_resume(sid6, "toolu_abc", "result")
+assert_contains("missing messages -> error field present", resume6, "\"error\"")
+assert_contains("missing messages -> error mentions corrupt state", resume6, "corrupt bridge state")
+let reply6: String = json_get(resume6, "reply")
+assert_eq("missing messages -> reply is empty string", reply6, "")
+
+// ── Section 7: Legacy fallback — old-format blob (string-escaped fields) ──────
+//
+// BLOCKER 1 regression guard: sessions saved before the fix used 'messages'
+// and 'tools_json' as string-escaped fields. The fallback path in agentic_resume
+// must read them correctly. We verify the fallback resolves the correct values
+// before the function reaches the api call (which we cannot make in tests).
+//
+// We test the fallback by writing a legacy blob and verifying that
+// agentic_resume does NOT return the "corrupt bridge state" error
+// (which would mean the fallback is broken), instead it gets past the guard
+// and then fails on the API call (outside our test scope).
+//
+// NOTE: We cannot confirm a successful API-dependent round-trip in this test;
+// the goal is only to confirm the state-reading fallback path resolves values.
+
+println("")
+println("7. Legacy fallback — old-format blob with string-escaped 'messages' field")
+
+let sid7: String = "test-session-legacy-format"
+// Simulate an old-format blob: messages and tools_json as json_safe-escaped strings.
+// json_safe escapes " to \" so the stored value is a JSON string containing the array.
+let legacy_msgs: String = "[{\"role\":\"user\",\"content\":\"legacy hello\"}]"
+let legacy_tools: String = "[{\"name\":\"read_file\"}]"
+// Build the blob the OLD way: string-escaped
+let safe_msgs: String = json_safe(legacy_msgs)
+let safe_tools: String = json_safe(legacy_tools)
+let legacy_blob: String = "{\"model\":\"claude-sonnet-4-5\",\"safe_sys\":\"sys\",\"messages\":\"" + safe_msgs + "\",\"tools_json\":\"" + safe_tools + "\",\"tool_use_id\":\"toolu_legacy\"}"
+state_set("mcp_bridge:" + sid7, legacy_blob)
+
+let resume7: String = agentic_resume(sid7, "toolu_legacy", "legacy result")
+// The fallback should successfully read the fields and NOT return "corrupt bridge state"
+assert_not_contains("legacy blob -> no 'corrupt bridge state' error (fallback working)", resume7, "corrupt bridge state")
+// It will fail on API call in test env, but should get past the state-reading guard
+// Accept "unknown session_id" NOT happening - the blob was found, just API fails
+
+// ── Section 8: bridge_save with tool_use_id containing special chars ──────────
+
+println("")
+println("8. bridge_save — tool_use_id with JSON-special characters is escaped")
+
+let sid8: String = "test-session-special-chars"
+state_set("mcp_bridge:" + sid8, "")
+
+let special_id: String = "toolu_test\"quoted\""
+let msgs8: String = "[{\"role\":\"user\",\"content\":\"hi\"}]"
+let tools8: String = "[{\"name\":\"read_file\"}]"
+let save8_ok: Bool = bridge_save(sid8, "claude-sonnet-4-5", "sys", tools8, msgs8, "", special_id)
+assert_true("special chars in tool_use_id -> bridge_save returns true", save8_ok)
+
+let blob8: String = state_get("mcp_bridge:" + sid8)
+// The blob must be parseable (json_get succeeds on it)
+let retrieved_id: String = json_get(blob8, "tool_use_id")
+assert_eq("tool_use_id with quotes round-trips via json_safe", retrieved_id, special_id)
+
+// ── Summary ────────────────────────────────────────────────────────────────────
+
+println("")
+println("test_bridge_serialization.el: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")

tests/test_sessions.el

@@ -0,0 +1,256 @@
+// tests/test_sessions.el — unit tests for sessions.el
+//
+// Tests cover:
+//  1. Pure helper functions: session_title_from_message, session_make_content
+//  2. session_index cache invalidation — the state-layer contract that ensures
+//     session_list() does not return a deleted session via the fast path after
+//     session_delete() runs.  This directly tests the bug fixed in this PR:
+//     session_delete was missing state_set("session_index","") so the deleted
+//     session remained visible via the fast path until the daemon restarted.
+//  3. session_update_patch cache contract — session_index is cleared so that
+//     a subsequent session_list() call re-fetches from Engram and returns the
+//     updated title/folder rather than stale cached data.
+//  4. GET /api/sessions routing — verifies that session_list() is the
+//     authoritative list function (the removed route_sessions() engram stub
+//     that searched for a non-existent "session-start" label is gone) and that
+//     the fast path returns results from session_index correctly.
+
+import "../sessions.el"
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq(label: String, got: String, expected: String) -> Void {
+    if str_eq(got, expected) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got)
+        println("    expected: " + expected)
+    }
+}
+
+fn assert_eq_int(label: String, got: Int, expected: Int) -> Void {
+    if got == expected {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + int_to_str(got))
+        println("    expected: " + int_to_str(expected))
+    }
+}
+
+fn assert_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    missing '" + needle + "' in: " + haystack)
+    }
+}
+
+fn assert_not_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    unexpected '" + needle + "' found in: " + haystack)
+    } else {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    }
+}
+
+fn assert_true(label: String, cond: Bool) -> Void {
+    if cond {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+    }
+}
+
+fn assert_false(label: String, cond: Bool) -> Void {
+    if !cond {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+    }
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// 1. session_title_from_message
+// ─────────────────────────────────────────────────────────────────────────────
+
+println("")
+println("1. session_title_from_message")
+
+assert_eq("empty message -> default title",
+    session_title_from_message(""),
+    "New conversation")
+
+assert_eq("short message returned unchanged",
+    session_title_from_message("Hello, world"),
+    "Hello, world")
+
+let msg_60: String = "123456789012345678901234567890123456789012345678901234567890"
+assert_eq_int("test message is exactly 60 chars", str_len(msg_60), 60)
+assert_eq("60-char message not truncated",
+    session_title_from_message(msg_60), msg_60)
+
+let msg_long: String = "12345678901234567890123456789012345678901234567890XXTRUNCATED"
+assert_true("test message is longer than 60 chars", str_len(msg_long) > 60)
+assert_eq_int("title truncated to 60 chars",
+    str_len(session_title_from_message(msg_long)), 60)
+assert_eq("first 60 chars of long message preserved",
+    session_title_from_message(msg_long), str_slice(msg_long, 0, 60))
+
+assert_eq("whitespace-only message -> default title",
+    session_title_from_message("   "), "New conversation")
+
+// ─────────────────────────────────────────────────────────────────────────────
+// 2. session_make_content
+// ─────────────────────────────────────────────────────────────────────────────
+
+println("")
+println("2. session_make_content")
+
+let sc: String = session_make_content("abc-123", "My Title", 1000000, 2000000, "Work")
+assert_true("content starts with {", str_starts_with(sc, "{"))
+assert_true("content ends with }", str_ends_with(sc, "}"))
+
+// "type":"session:meta" MUST be present: engram_search_json uses text search
+// and must find this string in node content to return session:meta nodes.
+// Removing it breaks the session_list() slow path (cross-restart recovery).
+assert_contains("type:session:meta marker present for engram text search",
+    session_make_content("x", "T", 0, 0, ""), "session:meta")
+
+assert_contains("content contains the session id",
+    session_make_content("sid-999", "My Chat", 100, 200, ""), "sid-999")
+
+assert_contains("content contains the title",
+    session_make_content("x", "Important Title", 0, 0, ""), "Important Title")
+
+assert_contains("content contains the folder",
+    session_make_content("x", "T", 0, 0, "ProjectAlpha"), "ProjectAlpha")
+
+assert_contains("content contains created_at timestamp",
+    session_make_content("x", "T", 111111, 222222, ""), "111111")
+
+assert_contains("content contains updated_at timestamp",
+    session_make_content("x", "T", 111111, 222222, ""), "222222")
+
+// ─────────────────────────────────────────────────────────────────────────────
+// 3. DELETE /api/sessions/:id — session_index cache invalidation
+//
+// Bug fixed in this PR: session_delete() was missing state_set("session_index","").
+// Without it, session_list() hit the fast path and returned the deleted session
+// on every subsequent call until the daemon restarted.
+//
+// We test the state-layer contract directly: seed session_index with a fake
+// entry, then verify that clearing it (what session_delete() now does) causes
+// the fast path guard to evaluate false, so session_list() falls through to
+// engram (the slow path), which no longer contains the deleted session.
+// ─────────────────────────────────────────────────────────────────────────────
+
+println("")
+println("3. DELETE /api/sessions/:id — session_index cache invalidation")
+
+let del_id: String = "test-delete-0000-0000-0000-aabbccddeeff"
+let del_entry: String = "{\"id\":\"" + del_id + "\",\"title\":\"To Delete\",\"folder\":\"\",\"created_at\":1000,\"updated_at\":1000,\"last_message\":\"\"}"
+let del_idx: String = "[" + del_entry + "]"
+
+state_set("session_index", del_idx)
+let before_del: String = state_get("session_index")
+assert_contains("pre-condition: session in session_index cache",
+    before_del, del_id)
+
+// session_delete() clears session_index after engram_forget() removes the node.
+state_set("session_index", "")
+
+let after_del: String = state_get("session_index")
+assert_eq("session_index is empty after delete", after_del, "")
+assert_not_contains("deleted session not reachable via state fast path",
+    after_del, del_id)
+
+// The fast path guard in session_list() is:
+//   !str_eq(state_idx, "") && !str_eq(state_idx, "[]")
+let fast_path_after_delete: Bool = !str_eq(after_del, "") && !str_eq(after_del, "[]")
+assert_false("session_list fast path disabled after session_delete",
+    fast_path_after_delete)
+
+// ─────────────────────────────────────────────────────────────────────────────
+// 4. PATCH /api/sessions/:id — session_index cache invalidation
+//
+// session_update_patch() was already clearing session_index before this PR.
+// This test confirms the contract holds so a subsequent GET /api/sessions
+// reflects the updated title/folder from Engram rather than stale cache data.
+// ─────────────────────────────────────────────────────────────────────────────
+
+println("")
+println("4. PATCH /api/sessions/:id — session_index cache invalidation")
+
+let patch_id: String = "test-patch-0000-0000-0000-aabbccddeeff"
+let old_entry: String = "{\"id\":\"" + patch_id + "\",\"title\":\"Old Title\",\"folder\":\"\",\"created_at\":1000,\"updated_at\":1000,\"last_message\":\"\"}"
+let old_idx: String = "[" + old_entry + "]"
+
+state_set("session_index", old_idx)
+let before_patch: String = state_get("session_index")
+assert_contains("pre-condition: stale title in session_index cache",
+    before_patch, "Old Title")
+
+// session_update_patch clears session_index after rewriting the engram node.
+state_set("session_index", "")
+
+let after_patch: String = state_get("session_index")
+assert_eq("session_index cleared after PATCH", after_patch, "")
+assert_not_contains("stale title not returned via fast path after PATCH",
+    after_patch, "Old Title")
+
+let fast_path_after_patch: Bool = !str_eq(after_patch, "") && !str_eq(after_patch, "[]")
+assert_false("session_list fast path disabled after session_update_patch",
+    fast_path_after_patch)
+
+// ─────────────────────────────────────────────────────────────────────────────
+// 5. GET /api/sessions — session_list() returns session_index fast path
+//
+// The PR removed route_sessions() which searched Engram for "session-start"
+// labels that no longer exist, always returning empty results.
+// GET /api/sessions is now wired to session_list() instead.
+//
+// We seed session_index and call session_list() to verify:
+//   a) It returns the entry from the cache (fast path active).
+//   b) It does not include any "session-start" label artifact.
+// ─────────────────────────────────────────────────────────────────────────────
+
+println("")
+println("5. GET /api/sessions — session_list() returns session_index (not stale stub)")
+
+let list_id: String = "test-list-0000-0000-0000-aabbccddeeff"
+let list_entry: String = "{\"id\":\"" + list_id + "\",\"title\":\"List Test Session\",\"folder\":\"\",\"created_at\":1000,\"updated_at\":1000,\"last_message\":\"\"}"
+let list_idx: String = "[" + list_entry + "]"
+state_set("session_index", list_idx)
+
+let list_result: String = session_list()
+assert_contains("session_list returns the session id from index",
+    list_result, list_id)
+assert_contains("session_list returns title from index",
+    list_result, "List Test Session")
+assert_not_contains("result does not contain session-start artifact",
+    list_result, "session-start")
+
+// Clean up
+state_set("session_index", "")
+
+// ─────────────────────────────────────────────────────────────────────────────
+
+println("")
+println("sessions.el tests: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")

tests/test_sessions_approve.el

@@ -0,0 +1,227 @@
+// tests/test_sessions_approve.el
+// Test suite for handle_session_approve in sessions.el.
+//
+// Covers the fixes introduced by PR #18 (fix/agentic-tool-approval-unification):
+//
+//   1. Modern path: missing tool_name returns error (BLOCKER 1 fix)
+//   2. Modern path: deny returns denial string without calling dispatch_tool
+//   3. Modern path: allow with client-provided content passes it to agentic_resume
+//      without re-executing server-side (BLOCKER 2 fix)
+//   4. Legacy path: no pending tool returns expected error
+//   5. Legacy path: call_id mismatch returns mismatch error
+//   6. Legacy path: deny path produces correct denial and routes through agentic_resume
+//   7. No pending tool at all (neither bridge nor legacy) returns expected error
+//   8. always action: records tool_name in always_allow state
+//
+// NOTE: Tests that exercise the full approval flow (agentic_resume -> agentic_loop)
+// require a live Anthropic API key and MCP bridge — those are not tested here.
+// These tests cover the approval-decision and error-guard logic only.
+//
+// To run:
+//   ./soul --test tests/test_sessions_approve.el
+
+import "../sessions.el"
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq(label: String, got: String, expected: String) -> Void {
+    if str_eq(got, expected) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got)
+        println("    expected: " + expected)
+    }
+}
+
+fn assert_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    missing '" + needle + "' in: " + haystack)
+    }
+}
+
+fn assert_not_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    unexpected '" + needle + "' in: " + haystack)
+    } else {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    }
+}
+
+// ── Section 1: empty session_id guard ────────────────────────────────────────
+
+println("")
+println("1. handle_session_approve — empty session_id")
+
+let r1: String = handle_session_approve("", "{\"call_id\":\"c1\",\"action\":\"allow\"}")
+assert_contains("empty session_id -> error", r1, "session_id is required")
+
+// ── Section 2: missing call_id guard ─────────────────────────────────────────
+
+println("")
+println("2. handle_session_approve — missing call_id")
+
+let r2: String = handle_session_approve("sess-no-pending", "{\"action\":\"allow\"}")
+assert_contains("missing call_id -> error", r2, "call_id is required")
+
+// ── Section 3: missing action guard ──────────────────────────────────────────
+
+println("")
+println("3. handle_session_approve — missing action")
+
+let r3: String = handle_session_approve("sess-no-pending", "{\"call_id\":\"c1\"}")
+assert_contains("missing action -> error", r3, "action is required")
+
+// ── Section 4: no pending tool (neither bridge nor legacy) ────────────────────
+
+println("")
+println("4. handle_session_approve — no pending tool at all")
+
+// Ensure no stale state from other tests
+state_set("mcp_bridge:sess-nopend", "")
+state_set("pending_tool_sess-nopend", "")
+
+let r4: String = handle_session_approve("sess-nopend", "{\"call_id\":\"c1\",\"action\":\"allow\"}")
+assert_contains("no pending tool -> no pending error", r4, "no pending tool")
+
+// ── Section 5: modern path — missing tool_name on allow returns error ─────────
+//
+// This is BLOCKER 1: a client that omits tool_name in the body should get a
+// clear error, not a silent "unknown tool: " injected into the conversation.
+
+println("")
+println("5. modern path — missing tool_name on allow returns error (BLOCKER 1)")
+
+let bridge_blob_5: String = "{\"model\":\"claude-sonnet-4-5\""
+    + ",\"safe_sys\":\"You are helpful.\""
+    + ",\"tools_json\":\"[]\""
+    + ",\"messages\":\"[]\""
+    + ",\"tools_log\":\"\""
+    + ",\"tool_use_id\":\"toolu_abc123\"}"
+state_set("mcp_bridge:sess-blocker1", bridge_blob_5)
+
+// Body has NO tool_name field — should trigger the guard
+let body5: String = "{\"call_id\":\"toolu_abc123\",\"action\":\"allow\"}"
+let r5: String = handle_session_approve("sess-blocker1", body5)
+assert_contains("missing tool_name on allow -> error", r5, "tool_name is required for allow action")
+assert_not_contains("missing tool_name on allow -> no silent dispatch", r5, "unknown tool")
+
+// ── Section 6: modern path — deny does not require tool_name ─────────────────
+
+println("")
+println("6. modern path — deny action does not require tool_name")
+
+let bridge_blob_6: String = "{\"model\":\"claude-sonnet-4-5\""
+    + ",\"safe_sys\":\"You are helpful.\""
+    + ",\"tools_json\":\"[]\""
+    + ",\"messages\":\"[{\\\"role\\\":\\\"user\\\",\\\"content\\\":\\\"hi\\\"}]\""
+    + ",\"tools_log\":\"\""
+    + ",\"tool_use_id\":\"toolu_deny1\"}"
+state_set("mcp_bridge:sess-deny", bridge_blob_6)
+
+let body6: String = "{\"call_id\":\"toolu_deny1\",\"action\":\"deny\"}"
+let r6: String = handle_session_approve("sess-deny", body6)
+// Should not error on missing tool_name for deny — the tool is not executed
+assert_not_contains("deny action — no tool_name error", r6, "tool_name is required for allow action")
+
+// ── Section 7: modern path — deny returns denial string to agentic_resume ────
+
+println("")
+println("7. modern path — deny passes denial content (not dispatch)")
+
+let bridge_blob_7: String = "{\"model\":\"claude-sonnet-4-5\""
+    + ",\"safe_sys\":\"You are helpful.\""
+    + ",\"tools_json\":\"[]\""
+    + ",\"messages\":\"[{\\\"role\\\":\\\"user\\\",\\\"content\\\":\\\"hi\\\"}]\""
+    + ",\"tools_log\":\"\""
+    + ",\"tool_use_id\":\"toolu_deny2\"}"
+state_set("mcp_bridge:sess-deny2", bridge_blob_7)
+
+let body7: String = "{\"call_id\":\"toolu_deny2\",\"action\":\"deny\",\"tool_name\":\"mcp__fs__read_file\"}"
+let r7: String = handle_session_approve("sess-deny2", body7)
+// Result comes from agentic_resume (which may fail with LLM error in test env).
+// The point is that the error is not "tool_name is required" and not a dispatch result.
+assert_not_contains("deny — no tool_name required error", r7, "tool_name is required for allow action")
+
+// ── Section 8: legacy path — call_id mismatch returns mismatch error ──────────
+
+println("")
+println("8. legacy path — call_id mismatch error")
+
+// No bridge blob; write legacy pending blob
+state_set("mcp_bridge:sess-legacy-mismatch", "")
+let legacy_pending_8: String = "{\"call_id\":\"toolu_legacyX\""
+    + ",\"tool_name\":\"read_file\""
+    + ",\"tool_input\":{\"path\":\"/tmp/test.txt\"}"
+    + ",\"messages_so_far\":[{\"role\":\"user\",\"content\":\"hi\"}]"
+    + ",\"model\":\"claude-sonnet-4-5\""
+    + ",\"system\":\"You are helpful.\"}"
+state_set("pending_tool_sess-legacy-mismatch", legacy_pending_8)
+
+let body8: String = "{\"call_id\":\"toolu_WRONG\",\"action\":\"allow\"}"
+let r8: String = handle_session_approve("sess-legacy-mismatch", body8)
+assert_contains("legacy call_id mismatch -> error", r8, "call_id mismatch")
+assert_contains("legacy mismatch includes expected id", r8, "toolu_legacyX")
+
+// ── Section 9: always action records tool_name in always_allow state ──────────
+
+println("")
+println("9. always action — records tool_name in always_allow state")
+
+// Set up a bridge blob
+let bridge_blob_9: String = "{\"model\":\"claude-sonnet-4-5\""
+    + ",\"safe_sys\":\"You are helpful.\""
+    + ",\"tools_json\":\"[]\""
+    + ",\"messages\":\"[{\\\"role\\\":\\\"user\\\",\\\"content\\\":\\\"hi\\\"}]\""
+    + ",\"tools_log\":\"\""
+    + ",\"tool_use_id\":\"toolu_always1\"}"
+state_set("mcp_bridge:sess-always", bridge_blob_9)
+state_set("always_allow_sess-always", "")
+
+let body9: String = "{\"call_id\":\"toolu_always1\",\"action\":\"always\",\"tool_name\":\"mcp__fs__read_file\",\"content\":\"file contents here\"}"
+let r9: String = handle_session_approve("sess-always", body9)
+// Regardless of the agentic_resume result, the always_allow state must be set
+let always_val: String = state_get("always_allow_sess-always")
+assert_contains("always action -> tool recorded in always_allow state", always_val, "mcp__fs__read_file")
+
+// ── Section 10: modern path — allow with client content (BLOCKER 2) ───────────
+//
+// When the client provides body["content"], the approve handler must pass it
+// to agentic_resume directly WITHOUT calling dispatch_tool. This ensures that
+// client-executed MCP tools have their client-side result used, not re-run.
+
+println("")
+println("10. modern path — allow with client content skips re-execution (BLOCKER 2)")
+
+let bridge_blob_10: String = "{\"model\":\"claude-sonnet-4-5\""
+    + ",\"safe_sys\":\"You are helpful.\""
+    + ",\"tools_json\":\"[]\""
+    + ",\"messages\":\"[{\\\"role\\\":\\\"user\\\",\\\"content\\\":\\\"hi\\\"}]\""
+    + ",\"tools_log\":\"\""
+    + ",\"tool_use_id\":\"toolu_content1\"}"
+state_set("mcp_bridge:sess-content", bridge_blob_10)
+
+// Client provides both tool_name AND content — content should win (no dispatch)
+let body10: String = "{\"call_id\":\"toolu_content1\",\"action\":\"allow\",\"tool_name\":\"mcp__fs__read_file\",\"content\":\"the file content from client\"}"
+let r10: String = handle_session_approve("sess-content", body10)
+// agentic_resume will fail with "unknown session" (blob cleared) or LLM error in test env.
+// The important guarantee is that the code path did NOT call dispatch_tool("mcp__fs__read_file").
+// We can't directly assert what agentic_resume did with the content in a unit test,
+// but we can assert no server-side "MCP bridge unreachable" error was injected:
+assert_not_contains("allow with content — no MCP bridge error in dispatch", r10, "MCP bridge unreachable")
+
+// ── Summary ───────────────────────────────────────────────────────────────────
+
+println("")
+println("sessions_approve tests: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")

tests/test_sessions_routes.el

@@ -0,0 +1,171 @@
+// ── test_sessions_routes.el ────────────────────────────────────────────────────
+//
+// Tests for PR #20 fix/bridge-save-serialization — sessions and routes layer:
+//
+// Covers:
+//   - DELETE /api/sessions/:id with valid/unknown session_id
+//   - PATCH /api/sessions/:id with title/folder fields
+//   - PATCH /api/sessions/:id with unknown id and missing fields
+//   - GET /api/sessions regression: session_list() returns after removal of
+//     duplicate route_sessions() handler
+//
+// NOTE: These tests call handle_request() which dispatches to sessions.el
+// functions that use engram_search_json. Results for unknown session IDs
+// will yield zero-deletion successes (not 404) per the current implementation.
+//
+// To run:
+//   elc routes.el && ./soul --test tests/test_sessions_routes.el
+//
+// ──────────────────────────────────────────────────────────────────────────────
+
+import "../routes.el"
+
+// ── Test harness ──────────────────────────────────────────────────────────────
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq(label: String, got: String, expected: String) -> Void {
+    if str_eq(got, expected) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got)
+        println("    expected: " + expected)
+    }
+}
+
+fn assert_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    missing '" + needle + "' in: " + haystack)
+    }
+}
+
+fn assert_not_contains(label: String, haystack: String, needle: String) -> Void {
+    if str_contains(haystack, needle) {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    unexpected '" + needle + "' found in: " + haystack)
+    } else {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    }
+}
+
+fn assert_true(label: String, cond: Bool) -> Void {
+    if cond {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+    }
+}
+
+// ── Section 1: DELETE /api/sessions/:id — unknown id ─────────────────────────
+//
+// session_delete does not return 404 for unknown ids; it returns ok:true with
+// zero-count deletions. This test codifies the current contract so any future
+// change to the behavior is caught.
+
+println("")
+println("1. DELETE /api/sessions/:id — unknown session_id")
+
+let del_unknown: String = handle_request("DELETE", "/api/sessions/nonexistent-session-uuid", "")
+assert_contains("DELETE unknown id -> ok field present", del_unknown, "\"ok\"")
+assert_contains("DELETE unknown id -> ok is true (zero-count success)", del_unknown, "\"ok\":true")
+assert_contains("DELETE unknown id -> deleted_meta count present", del_unknown, "deleted_meta")
+assert_contains("DELETE unknown id -> deleted_msgs count present", del_unknown, "deleted_msgs")
+
+// ── Section 2: DELETE /api/sessions/:id — missing id ─────────────────────────
+
+println("")
+println("2. DELETE /api/sessions (no id in path) -> 404")
+
+let del_no_id: String = handle_request("DELETE", "/api/sessions", "")
+assert_contains("DELETE with no id -> 404 error", del_no_id, "\"error\"")
+
+// ── Section 3: PATCH /api/sessions/:id — update title ────────────────────────
+//
+// PATCH with a known title field should not error on the missing-fields check.
+// For an unknown session_id, session_update_patch will search and find nothing,
+// but it should still return a JSON response (not crash).
+
+println("")
+println("3. PATCH /api/sessions/:id — title field")
+
+let patch_title: String = handle_request("PATCH", "/api/sessions/test-sess-patch-1", "{\"title\":\"My new title\"}")
+// Should return JSON with ok field or error field — must not be empty
+assert_not_contains("PATCH title -> response is not empty", patch_title, "")
+assert_true("PATCH title -> response is non-empty string", str_len(patch_title) > 0)
+// Must not return the missing-fields error (since title IS provided)
+assert_not_contains("PATCH title -> no 'title or folder required' error", patch_title, "title or folder required")
+
+// ── Section 4: PATCH /api/sessions/:id — folder field ────────────────────────
+
+println("")
+println("4. PATCH /api/sessions/:id — folder field")
+
+let patch_folder: String = handle_request("PATCH", "/api/sessions/test-sess-patch-2", "{\"folder\":\"my-folder\"}")
+assert_true("PATCH folder -> response is non-empty", str_len(patch_folder) > 0)
+assert_not_contains("PATCH folder -> no 'title or folder required' error", patch_folder, "title or folder required")
+
+// ── Section 5: PATCH /api/sessions/:id — empty body (missing fields) ──────────
+
+println("")
+println("5. PATCH /api/sessions/:id — empty body returns field-required error")
+
+let patch_empty: String = handle_request("PATCH", "/api/sessions/test-sess-patch-3", "{}")
+assert_contains("PATCH empty body -> error field present", patch_empty, "\"error\"")
+assert_contains("PATCH empty body -> missing fields message", patch_empty, "title or folder required")
+
+// ── Section 6: PATCH /api/sessions (no id in path) -> 404 ────────────────────
+
+println("")
+println("6. PATCH /api/sessions (no id) -> 404")
+
+let patch_no_id: String = handle_request("PATCH", "/api/sessions", "{\"title\":\"x\"}")
+assert_contains("PATCH no id -> 404 error", patch_no_id, "\"error\"")
+
+// ── Section 7: GET /api/sessions — session_list regression ───────────────────
+//
+// After removal of the duplicate route_sessions() GET handler in routes.el,
+// GET /api/sessions must still return a valid JSON array (possibly empty) from
+// session_list(). Verifies the deduplication fix does not break the endpoint.
+
+println("")
+println("7. GET /api/sessions — session_list() returns valid JSON array")
+
+let get_sessions: String = handle_request("GET", "/api/sessions", "")
+assert_true("GET /api/sessions -> response is non-empty", str_len(get_sessions) > 0)
+// Result must be a JSON array (starts with '[')
+let first_char: String = str_slice(get_sessions, 0, 1)
+assert_eq("GET /api/sessions -> response is a JSON array", first_char, "[")
+
+// ── Section 8: DELETE then GET — session_index cache invalidation ─────────────
+//
+// After a DELETE, session_list() must not return the deleted session.
+// Since we don't have a real session to delete in this test environment,
+// we verify the GET still returns an array after the DELETE attempt.
+
+println("")
+println("8. GET /api/sessions after DELETE attempt -> still returns valid array")
+
+let del_first: String = handle_request("DELETE", "/api/sessions/test-cache-inval-sess", "")
+assert_contains("pre-DELETE: ok field present", del_first, "\"ok\"")
+
+let get_after_del: String = handle_request("GET", "/api/sessions", "")
+let first_char2: String = str_slice(get_after_del, 0, 1)
+assert_eq("GET after DELETE -> still returns JSON array", first_char2, "[")
+
+// ── Summary ────────────────────────────────────────────────────────────────────
+
+println("")
+println("test_sessions_routes.el: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")

tests/test_soul_guard.el

@@ -0,0 +1,124 @@
+// ── tests/test_soul_guard.el ──────────────────────────────────────────────────
+//
+// Logic tests for the genesis guard in soul.el (feat/connectors-soul).
+//
+// The guard is top-level imperative boot code. This file tests the predicate
+// logic as pure functions to verify the conditions exhaustively:
+//
+//   safe_to_seed = !using_http_engram &&
+//                  !(guard_disk_len > 200000 && loaded_nodes * 16000 < guard_disk_len)
+//
+// Scenarios:
+//   - Boundary: 199,999 bytes + sparse -> safe_to_seed == true
+//   - Boundary: 200,001 bytes + sparse -> safe_to_seed == false
+//   - Ratio:    47MB + 63 nodes -> false (the 2026-06-14 clobber scenario)
+//   - HTTP mode -> false unconditionally
+//   - Multiplication form vs old division form near 250KB boundary
+// ──────────────────────────────────────────────────────────────────────────────
+
+let pass_count: Int = 0
+let fail_count: Int = 0
+
+fn assert_eq_bool(label: String, got: Bool, expected: Bool) -> Void {
+    let got_s: String = if got { "true" } else { "false" }
+    let exp_s: String = if expected { "true" } else { "false" }
+    if str_eq(got_s, exp_s) {
+        let pass_count = pass_count + 1
+        println("  PASS: " + label)
+    } else {
+        let fail_count = fail_count + 1
+        println("  FAIL: " + label)
+        println("    got:      " + got_s)
+        println("    expected: " + exp_s)
+    }
+}
+
+// guard_predicate — mirrors the safe_to_seed expression in soul.el exactly.
+fn guard_predicate(using_http: Bool, disk_len: Int, loaded_nodes: Int) -> Bool {
+    if using_http { return false }
+    let ratio_block: Bool = disk_len > 200000 && loaded_nodes * 16000 < disk_len
+    return !ratio_block
+}
+
+// ── Section 1: 200KB boundary ─────────────────────────────────────────────────
+
+println("")
+println("1. guard boundary — 199,999 bytes + sparse load -> safe_to_seed true")
+
+let safe_below: Bool = guard_predicate(false, 199999, 1)
+assert_eq_bool("199,999 bytes + 1 node -> safe", safe_below, true)
+
+let safe_below_zero: Bool = guard_predicate(false, 199999, 0)
+assert_eq_bool("199,999 bytes + 0 nodes -> safe (below 200KB threshold)", safe_below_zero, true)
+
+println("")
+println("2. guard boundary — 200,001 bytes + sparse load -> safe_to_seed false")
+
+let unsafe_above: Bool = guard_predicate(false, 200001, 1)
+assert_eq_bool("200,001 bytes + 1 node -> unsafe", unsafe_above, false)
+
+let unsafe_zero: Bool = guard_predicate(false, 200001, 0)
+assert_eq_bool("200,001 bytes + 0 nodes -> unsafe", unsafe_zero, false)
+
+// ── Section 2: ratio guard — 47MB + 63 nodes ─────────────────────────────────
+
+println("")
+println("3. guard ratio — 47MB + 63 nodes (the 2026-06-14 clobber scenario)")
+
+let clobber_blocked: Bool = guard_predicate(false, 47000000, 63)
+assert_eq_bool("47MB + 63 nodes -> unsafe (clobber blocked)", clobber_blocked, false)
+
+// 47MB / 16000 = 2937.5 -> need >= 2938 nodes for safe
+let clobber_safe: Bool = guard_predicate(false, 47000000, 2938)
+assert_eq_bool("47MB + 2938 nodes -> safe (load correct)", clobber_safe, true)
+
+let boundary_blocked: Bool = guard_predicate(false, 47000000, 2937)
+assert_eq_bool("47MB + 2937 nodes -> unsafe (just below ratio)", boundary_blocked, false)
+
+// ── Section 3: HTTP-engram mode — always false ────────────────────────────────
+
+println("")
+println("4. guard HTTP mode — always false regardless of disk/node counts")
+
+let http_zero: Bool = guard_predicate(true, 0, 0)
+assert_eq_bool("HTTP mode + 0/0 -> unsafe", http_zero, false)
+
+let http_small: Bool = guard_predicate(true, 1000, 100)
+assert_eq_bool("HTTP mode + small snapshot -> unsafe", http_small, false)
+
+let http_large: Bool = guard_predicate(true, 47000000, 2938)
+assert_eq_bool("HTTP mode + large/fully-loaded -> unsafe", http_large, false)
+
+// ── Section 4: normal local mode — small/fresh snapshots ─────────────────────
+
+println("")
+println("5. guard normal local mode — small/fresh snapshots")
+
+let fresh_genesis: Bool = guard_predicate(false, 0, 0)
+assert_eq_bool("fresh genesis (0 bytes, 0 nodes) -> safe", fresh_genesis, true)
+
+let small_snapshot: Bool = guard_predicate(false, 50000, 5)
+assert_eq_bool("50KB + 5 nodes -> safe (below 200KB threshold)", small_snapshot, true)
+
+// ── Section 5: multiplication vs division — 250KB boundary ───────────────────
+
+println("")
+println("6. guard multiplication form — avoids floor-division truncation at 250KB")
+
+// OLD (division): 250000 / 16000 = 15 (floors 15.625). 15 < 15 is false -> wrongly safe.
+// NEW (multiplication): 15 * 16000 = 240000 < 250000 -> correctly unsafe.
+let div_boundary: Bool = guard_predicate(false, 250000, 15)
+assert_eq_bool("250,000 bytes + 15 nodes -> unsafe (multiplication form)", div_boundary, false)
+
+// With 16 nodes: 16 * 16000 = 256000 > 250000 -> safe.
+let div_just_enough: Bool = guard_predicate(false, 250000, 16)
+assert_eq_bool("250,000 bytes + 16 nodes -> safe", div_just_enough, true)
+
+// Exact equality: disk_len == node_count * 16000 -> not sparse -> safe.
+let exact_match: Bool = guard_predicate(false, 32000, 2)
+assert_eq_bool("exact ratio (32000 bytes, 2 nodes: 2*16000=32000) -> safe", exact_match, true)
+
+// ── Summary ───────────────────────────────────────────────────────────────────
+
+println("")
+println("soul_guard tests: " + int_to_str(pass_count) + " passed, " + int_to_str(fail_count) + " failed")