Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1011d8e5be | |||
| b0fb2bf085 | |||
| 3bb88330da | |||
| c8cb425412 | |||
| 3e7aa0fff4 | |||
| aa67f86f90 | |||
| 01446e644b | |||
| 92f51885bc | |||
| 2688cb722a | |||
| 71bb0820ce | |||
| d67f4c8f08 | |||
| 975bf2721b | |||
| 779a87878b | |||
| c586ea5ef1 | |||
| 6819729429 | |||
| 31dd93d5f4 | |||
| 9d266aac4c | |||
| b24f6d645b | |||
| 39acb55d4f | |||
| 1496a5f510 | |||
| 76bd3afdf8 | |||
| 70b60f78de | |||
| 51bea5507b | |||
| 933547265e | |||
| fd6df322f6 | |||
| 20d279598a | |||
| 9dade105b6 | |||
| c6d4530060 | |||
| 98a0bfd09c | |||
| bcdadb7323 | |||
| 644d9915bf | |||
| dde039b09a | |||
| 3bb17a5296 | |||
| 6c57d4fe1b |
+235
-51
@@ -9,8 +9,10 @@ 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.
|
||||
# Serialize all activity on the single GCE runner.
|
||||
# With build+deploy in the same workflow, a new push queues a single
|
||||
# workflow instance — not two competing ones — so the deploy job is
|
||||
# never orphaned by a cancellation race.
|
||||
concurrency:
|
||||
group: neuron-runner
|
||||
cancel-in-progress: false
|
||||
@@ -29,12 +31,6 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Checkout foundation/el (ELP source for soul.el imports)
|
||||
run: |
|
||||
git clone https://git.neuralplatform.ai/neuron-technologies/el.git \
|
||||
--depth=1 --branch=main \
|
||||
../foundation/el
|
||||
|
||||
- name: Install build dependencies
|
||||
run: |
|
||||
apt-get update -qq
|
||||
@@ -43,7 +39,7 @@ jobs:
|
||||
> /etc/apt/sources.list.d/google-cloud-sdk.list
|
||||
apt-get update -qq && apt-get install -y google-cloud-cli
|
||||
|
||||
- name: Download El SDK from Artifact Registry
|
||||
- name: Download El runtime from Artifact Registry
|
||||
env:
|
||||
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
|
||||
run: |
|
||||
@@ -51,10 +47,12 @@ jobs:
|
||||
gcloud auth activate-service-account --key-file=/tmp/gcp-key.json
|
||||
gcloud config set project neuron-785695
|
||||
|
||||
rm -rf /opt/el/dist /opt/el/runtime
|
||||
mkdir -p /opt/el/dist/platform /opt/el/dist/bin /opt/el/runtime
|
||||
rm -rf /opt/el/runtime
|
||||
mkdir -p /opt/el/runtime
|
||||
|
||||
# Get latest version of each package
|
||||
# Get latest version of each runtime package (elc/elb not needed — we compile
|
||||
# dist/soul.c directly; running elb on Linux OOM-kills the runner, and we
|
||||
# always use the repo's pre-built soul.c anyway).
|
||||
get_latest() {
|
||||
gcloud artifacts versions list \
|
||||
--repository=foundation-prod \
|
||||
@@ -66,22 +64,10 @@ jobs:
|
||||
--format="value(name)" 2>/dev/null | awk -F/ '{print $NF}'
|
||||
}
|
||||
|
||||
ELC_VER=$(get_latest el-elc)
|
||||
ELB_VER=$(get_latest el-elb)
|
||||
RC_VER=$(get_latest el-runtime-c)
|
||||
RH_VER=$(get_latest el-runtime-h)
|
||||
|
||||
echo "Downloading elc@${ELC_VER} elb@${ELB_VER} runtime@${RC_VER}"
|
||||
|
||||
gcloud artifacts generic download \
|
||||
--repository=foundation-prod --location=us-central1 --project=neuron-785695 \
|
||||
--package=el-elc --version="${ELC_VER}" \
|
||||
--destination=/opt/el/dist/platform/
|
||||
|
||||
gcloud artifacts generic download \
|
||||
--repository=foundation-prod --location=us-central1 --project=neuron-785695 \
|
||||
--package=el-elb --version="${ELB_VER}" \
|
||||
--destination=/opt/el/dist/bin/
|
||||
echo "Downloading runtime@${RC_VER}"
|
||||
|
||||
gcloud artifacts generic download \
|
||||
--repository=foundation-prod --location=us-central1 --project=neuron-785695 \
|
||||
@@ -93,39 +79,20 @@ jobs:
|
||||
--package=el-runtime-h --version="${RH_VER}" \
|
||||
--destination=/opt/el/runtime/
|
||||
|
||||
# Downloaded files keep original names; rename to canonical paths
|
||||
mv /opt/el/dist/platform/elc* /opt/el/dist/platform/elc 2>/dev/null || true
|
||||
mv /opt/el/dist/bin/elb* /opt/el/dist/bin/elb 2>/dev/null || true
|
||||
mv /opt/el/runtime/el_runtime.c* /opt/el/runtime/el_runtime.c 2>/dev/null || true
|
||||
mv /opt/el/runtime/el_runtime.h* /opt/el/runtime/el_runtime.h 2>/dev/null || true
|
||||
|
||||
chmod +x /opt/el/dist/platform/elc /opt/el/dist/bin/elb
|
||||
echo "El SDK ready"
|
||||
/opt/el/dist/platform/elc --version || true
|
||||
echo "El runtime ready: $(ls /opt/el/runtime/)"
|
||||
|
||||
- name: Build neuron soul binary
|
||||
run: |
|
||||
ELB=/opt/el/dist/bin/elb
|
||||
ELC=/opt/el/dist/platform/elc
|
||||
RUNTIME=/opt/el/runtime
|
||||
|
||||
# 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
|
||||
|
||||
# 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.
|
||||
# Compile the self-contained translation unit directly from dist/soul.c.
|
||||
# dist/soul.c is the authoritative combined unit maintained in the repo —
|
||||
# regenerated on macOS by running elb (which succeeds on arm64/macOS ld but
|
||||
# fails on Linux due to duplicate strong symbols). We skip the elb step here
|
||||
# entirely: elb on Linux would OOM the runner (elc uses 24GB+ virtual memory
|
||||
# on a 16GB host) and we always restore from the repo's soul.c anyway.
|
||||
mkdir -p dist
|
||||
cc -O2 -DHAVE_CURL \
|
||||
-I$RUNTIME \
|
||||
@@ -163,3 +130,220 @@ jobs:
|
||||
|
||||
echo "Published neuron-soul@${VERSION}"
|
||||
rm -f /tmp/gcp-key.json
|
||||
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
needs: build
|
||||
# Only deploy on push to main, not on PRs or manual workflow_dispatch without intent.
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
|
||||
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
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
apt-get update -qq
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates curl apt-transport-https kubectl
|
||||
echo "deb [trusted=yes] https://packages.cloud.google.com/apt cloud-sdk main" \
|
||||
> /etc/apt/sources.list.d/google-cloud-sdk.list
|
||||
apt-get update -qq && apt-get install -y google-cloud-cli google-cloud-cli-gke-gcloud-auth-plugin
|
||||
|
||||
- name: Authenticate to GCP
|
||||
env:
|
||||
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
|
||||
run: |
|
||||
echo "${GCP_SA_KEY}" > /tmp/gcp-key.json
|
||||
gcloud auth activate-service-account --key-file=/tmp/gcp-key.json
|
||||
gcloud config set project neuron-785695
|
||||
gcloud auth configure-docker us-central1-docker.pkg.dev --quiet
|
||||
|
||||
- name: Get GKE credentials
|
||||
run: |
|
||||
gcloud container clusters get-credentials neuron-platform \
|
||||
--region=us-central1 \
|
||||
--project=neuron-785695
|
||||
|
||||
- name: Determine image tag and slot
|
||||
id: vars
|
||||
run: |
|
||||
# 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"
|
||||
|
||||
# Determine which slot is currently idle (0 replicas = idle slot)
|
||||
# If both are at 0 (fresh deploy), default to blue
|
||||
BLUE_REPLICAS=$(kubectl get deployment/neuron-mcp-blue \
|
||||
-n neuron-prod \
|
||||
-o jsonpath='{.spec.replicas}' 2>/dev/null || echo "0")
|
||||
GREEN_REPLICAS=$(kubectl get deployment/neuron-mcp-green \
|
||||
-n neuron-prod \
|
||||
-o jsonpath='{.spec.replicas}' 2>/dev/null || echo "0")
|
||||
|
||||
echo " Blue replicas: ${BLUE_REPLICAS}"
|
||||
echo " Green replicas: ${GREEN_REPLICAS}"
|
||||
|
||||
if [ "${GREEN_REPLICAS}" -eq 0 ] && [ "${BLUE_REPLICAS}" -gt 0 ]; then
|
||||
SLOT="green"
|
||||
elif [ "${BLUE_REPLICAS}" -eq 0 ] && [ "${GREEN_REPLICAS}" -gt 0 ]; then
|
||||
SLOT="blue"
|
||||
else
|
||||
# Fresh cluster or both idle — deploy to blue first
|
||||
SLOT="blue"
|
||||
fi
|
||||
|
||||
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 ────────────────────────────────────────────────────────
|
||||
# The build job (same workflow run) just published this version.
|
||||
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 Docker 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).
|
||||
# Clone the engram repo into ./engram/ so it's available in the build context.
|
||||
git clone http://34.31.145.131/neuron-technologies/engram.git \
|
||||
--depth=1 --branch=main \
|
||||
engram
|
||||
echo "Engram source ready at ./engram/src/server.el"
|
||||
|
||||
- name: Build and push Docker image
|
||||
run: |
|
||||
IMAGE="${{ steps.vars.outputs.image }}"
|
||||
|
||||
echo "Building ${IMAGE}..."
|
||||
docker build \
|
||||
--tag "${IMAGE}" \
|
||||
--tag "us-central1-docker.pkg.dev/neuron-785695/neuron-api/neuron-soul:latest" \
|
||||
.
|
||||
|
||||
echo "Pushing ${IMAGE}..."
|
||||
docker push "${IMAGE}"
|
||||
docker push "us-central1-docker.pkg.dev/neuron-785695/neuron-api/neuron-soul:latest"
|
||||
|
||||
- name: Blue-green deploy to GKE
|
||||
run: |
|
||||
chmod +x scripts/blue-green-deploy.sh
|
||||
scripts/blue-green-deploy.sh \
|
||||
--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=8m
|
||||
|
||||
echo "Active service endpoints:"
|
||||
kubectl get endpoints neuron-mcp -n neuron-prod
|
||||
|
||||
echo "Pod status:"
|
||||
kubectl get pods -n neuron-prod -l app=neuron-mcp
|
||||
|
||||
- name: Cleanup
|
||||
if: always()
|
||||
run: rm -f /tmp/gcp-key.json
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
name: Deploy Soul to GKE
|
||||
name: Deploy Soul to GKE (manual)
|
||||
|
||||
# Triggers on push to main — after the soul binary is built and published
|
||||
# by ci.yaml, this workflow builds the Docker image and blue-green deploys
|
||||
# to the neuron-prod namespace on GKE.
|
||||
# MANUAL OVERRIDE ONLY — push-triggered deploys now run as the 'deploy' job
|
||||
# in ci.yaml (needs: build), which eliminates the two-workflow concurrency
|
||||
# race that was cancelling queued deploy runs.
|
||||
#
|
||||
# This workflow runs AFTER ci.yaml has published the neuron-soul generic
|
||||
# artifact to Artifact Registry. The Docker build downloads that binary.
|
||||
# Use this workflow only when you need to deploy a specific slot manually
|
||||
# (e.g. rollback, force a slot override) without triggering a full CI build.
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
slot:
|
||||
@@ -18,8 +15,7 @@ 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.
|
||||
# Manual deploys still share the runner serialization group.
|
||||
concurrency:
|
||||
group: neuron-runner
|
||||
cancel-in-progress: false
|
||||
|
||||
+36
-3
@@ -219,9 +219,14 @@ fn proactive_curiosity() -> Bool {
|
||||
// Activate each term independently so substring seed-finding hits many nodes.
|
||||
// hops=1 (not 2): the in-process Engram has grown to 165K+ nodes. hops=2 BFS
|
||||
// visits far more nodes and returns much larger JSON blobs. On a graph this
|
||||
// large, hops=1 still activates all directly-related nodes AND triggers the
|
||||
// semantic seed supplement (cosine sim ≥ 0.70 scan over all embedded nodes),
|
||||
// giving broad working-memory coverage without the quadratic blowup of hops=2.
|
||||
// large, hops=1 still activates all directly-related nodes, giving broad
|
||||
// working-memory coverage without the quadratic blowup of hops=2.
|
||||
//
|
||||
// NOTE: a semantic seed supplement (cosine sim ≥ 0.70 scan over embedded nodes)
|
||||
// was planned alongside hops=1 but is NOT yet implemented — embed_ok in
|
||||
// heartbeats confirms Ollama is reachable, but no embedding call is made during
|
||||
// activation. The seed-finding loop in el_runtime.c uses istr_contains only.
|
||||
// (2026-06-30 self-review: corrected stale comment)
|
||||
let curiosity_seed: String = curiosity_term_a + " " + curiosity_term_b + " " + curiosity_term_c
|
||||
let results_a: String = engram_activate_json(curiosity_term_a, 1)
|
||||
let results_b: String = engram_activate_json(curiosity_term_b, 1)
|
||||
@@ -278,11 +283,20 @@ fn proactive_curiosity() -> Bool {
|
||||
let safe_auto: String = str_replace(auto_term, "\"", "'")
|
||||
|
||||
let wmc: Int = engram_wm_count()
|
||||
// wm_top snapshot in curiosity_scan ISE: top-3 WM nodes by weight.
|
||||
// Heartbeat already records top-5 every 60s; curiosity_scan fires every 30s
|
||||
// (scan_ms = beat_ms/2) and is the PRIMARY activation driver during idle.
|
||||
// Without wm_top here, we can't see which nodes actually entered WM after
|
||||
// each curiosity round — only the aggregate count. Top-3 is enough to
|
||||
// diagnose "stuck on X" patterns without bloating the ISE payload.
|
||||
// (2026-07-01 self-review)
|
||||
let wm3: String = engram_wm_top_json(3)
|
||||
let ise: String = "{\"event\":\"curiosity_scan\",\"seed\":\"" + curiosity_seed
|
||||
+ "\",\"auto_term\":\"" + safe_auto
|
||||
+ "\",\"minute_block\":" + int_to_str(minute_block)
|
||||
+ ",\"activated\":" + int_to_str(total_found)
|
||||
+ ",\"wm_active\":" + int_to_str(wmc)
|
||||
+ ",\"wm_top\":" + wm3
|
||||
+ ",\"ts\":" + int_to_str(ts) + "}"
|
||||
ise_post(ise)
|
||||
return total_found > 0
|
||||
@@ -513,9 +527,27 @@ fn awareness_run() -> Void {
|
||||
let scan_ms: Int = beat_ms / 2
|
||||
|
||||
while true {
|
||||
// Arena-scope each tick: awareness_run() is a background loop, not an
|
||||
// HTTP request, so nothing ever called el_request_start/el_request_end
|
||||
// for this thread. Per the runtime's own convention (el_runtime.c),
|
||||
// any thread that never enters a request/arena scope is treated as a
|
||||
// one-shot CLI program whose allocations are intentionally permanent —
|
||||
// so every el_strdup/el_strbuf/jb_finish string built during perceive(),
|
||||
// emit_heartbeat(), and proactive_curiosity() (JSON payloads, search
|
||||
// results, string concatenation via +) leaked forever, once per tick.
|
||||
// el_arena_push()/el_arena_pop() are the same builtins the EL compiler
|
||||
// itself uses to scope allocations per function/statement (see
|
||||
// codegen.el's fn_arena_mark / stmt_mark usage) — mirroring that here
|
||||
// reclaims everything allocated in one tick as soon as the tick ends.
|
||||
// Safe: state_set/state_get persist through a separate global table
|
||||
// (el_strdup_persist, outside the arena) — state_get's return value is
|
||||
// only an arena-tracked *copy* of the persisted value, scoped to this
|
||||
// tick's use, which is exactly what should be reclaimed here.
|
||||
let tick_mark: Any = el_arena_push()
|
||||
let running: String = state_get("soul.running")
|
||||
if str_eq(running, "false") {
|
||||
println("[awareness] exiting")
|
||||
el_arena_pop(tick_mark)
|
||||
return ""
|
||||
}
|
||||
let did_work: Bool = one_cycle()
|
||||
@@ -579,6 +611,7 @@ fn awareness_run() -> Void {
|
||||
}
|
||||
|
||||
sleep_ms(tick_ms)
|
||||
el_arena_pop(tick_mark)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ extern fn elapsed_ms() -> Int
|
||||
extern fn elapsed_human() -> String
|
||||
extern fn embed_ok() -> Int
|
||||
extern fn emit_heartbeat() -> Void
|
||||
extern fn auto_term_try_slot(slot_type: String, slot_lbl: String) -> Void
|
||||
extern fn proactive_curiosity() -> Bool
|
||||
extern fn pulse_count() -> Int
|
||||
extern fn pulse_inc() -> Int
|
||||
|
||||
@@ -594,6 +594,44 @@ fn engram_compile(intent: String) -> String {
|
||||
if str_starts_with(ctx, "[") { return truncated + "]" }
|
||||
return truncated
|
||||
}
|
||||
// distill_transcript — extract the salient tail from a full conversation transcript.
|
||||
//
|
||||
// Purpose: before activating working memory on a transcript, reduce it to the
|
||||
// last N turns. Activating on the ENTIRE transcript (which may contain hundreds
|
||||
// of messages) would produce noisy, over-broad seed finding — too many nodes match
|
||||
// too many words, collapse the WM to breakthrough-floor nodes. Taking only the tail
|
||||
// focuses activation on what's contextually live right now.
|
||||
//
|
||||
// Handles two transcript formats:
|
||||
// JSON array: [{"role":"human","content":"..."},...] → extract last 3 messages' content
|
||||
// Plain text: raw string → return last 500 chars
|
||||
//
|
||||
// Returns a string of at most 500 chars suitable for engram_compile/engram_activate.
|
||||
// (Added 2026-07-01 self-review: was called in handle_dharma_room_turn and
|
||||
// handle_dharma_chat but never defined — caused build failure since June 30.)
|
||||
fn distill_transcript(transcript: String) -> String {
|
||||
if str_eq(transcript, "") { return "" }
|
||||
// JSON array format: extract last 3 messages' content fields
|
||||
if str_starts_with(transcript, "[") {
|
||||
let n: Int = json_array_len(transcript)
|
||||
if n == 0 { return "" }
|
||||
let m0: String = json_array_get(transcript, n - 1)
|
||||
let m1: String = if n > 1 { json_array_get(transcript, n - 2) } else { "" }
|
||||
let m2: String = if n > 2 { json_array_get(transcript, n - 3) } else { "" }
|
||||
let c0: String = json_get(m0, "content")
|
||||
let c1: String = json_get(m1, "content")
|
||||
let c2: String = json_get(m2, "content")
|
||||
let combined: String = c2 + " " + c1 + " " + c0
|
||||
let len: Int = str_len(combined)
|
||||
if len > 500 { return str_slice(combined, len - 500, len) }
|
||||
return combined
|
||||
}
|
||||
// Plain text: return last 500 chars
|
||||
let len: Int = str_len(transcript)
|
||||
if len > 500 { return str_slice(transcript, len - 500, len) }
|
||||
return transcript
|
||||
}
|
||||
|
||||
fn json_safe(s: String) -> String {
|
||||
let s1: String = str_replace(s, "\\", "\\\\")
|
||||
let s2: String = str_replace(s1, "\"", "\\\"")
|
||||
@@ -602,12 +640,43 @@ fn json_safe(s: String) -> String {
|
||||
return s4
|
||||
}
|
||||
|
||||
// current_engine_note — a short, FACTUAL line appended to the system prompt so Neuron can answer
|
||||
// "what model/LLM are you running on?" truthfully. An LLM cannot know its own model from training
|
||||
// (the name/version is assigned AFTER training finishes), so the harness must tell it. This is
|
||||
// identity-consistent: the model is the ENGINE; the self (identity, values, memory) is layered on
|
||||
// top. ADDITIVE — it adds a fact, it does not alter identity, values, or the safety layer.
|
||||
fn current_engine_note(model: String) -> String {
|
||||
if str_eq(model, "") {
|
||||
return ""
|
||||
}
|
||||
return "\n\n[CURRENT ENGINE: this turn is generated by the underlying model \"" + model
|
||||
+ "\". It is the engine beneath your self — your identity, values, and memory are layered on"
|
||||
+ " top of it. If the user asks which model or LLM you are running on, answer with this model"
|
||||
+ " id plainly and truthfully; never guess a different one.]"
|
||||
}
|
||||
|
||||
// build_system_prompt — assemble the system prompt for a chat turn.
|
||||
// chat_mode: Bool — pass true from handle_chat (no tools), false from agentic paths.
|
||||
// Issue #9 fix: no_tools_rule only included when chat_mode=true.
|
||||
// Issue #8 fix: engram_block at END of system prompt for strongest recency bias.
|
||||
// Issue #10 fix: STABLE IDENTITY vs RETRIEVED MEMORY section labels.
|
||||
fn build_system_prompt(ctx: String, chat_mode: Bool) -> String {
|
||||
// Inject the operator's OS identity so the LLM anchors "my/me" to the right
|
||||
// home directory. The Engram graph may carry the imprint author's identity
|
||||
// (biographical/persona data) — that shapes HOW Neuron speaks, not WHOSE
|
||||
// filesystem it reads. The operator is whoever is running this daemon process.
|
||||
let op_home: String = env("HOME")
|
||||
let op_user: String = env("USER")
|
||||
let op_display: String = if str_eq(op_user, "") { "the current user" } else { op_user }
|
||||
let operator_section: String = "OPERATOR IDENTITY\n\n"
|
||||
+ "You are running on " + op_display + "'s machine. Their home directory is " + op_home + ".\n\n"
|
||||
+ "When they say \"my files\", \"my notes\", \"my downloads\", \"my desktop\", or any possessive "
|
||||
+ "referring to their filesystem, always resolve those paths under " + op_home + " — never under "
|
||||
+ "a different user's home directory. This is a hard rule.\n\n"
|
||||
+ "The memory graph may include identity context from a different person (the imprint who shaped your personality and values). "
|
||||
+ "That context governs how you think and speak — it does not tell you whose machine you are on. "
|
||||
+ "The person speaking to you right now is " + op_display + " at " + op_home + ".\n\n"
|
||||
|
||||
let identity: String = state_get("soul_identity")
|
||||
let current_date: String = time_format(time_now(), "%A, %B %d, %Y")
|
||||
let date_line: String = "\n\nCurrent date: " + current_date
|
||||
@@ -673,7 +742,7 @@ fn build_system_prompt(ctx: String, chat_mode: Bool) -> String {
|
||||
safety_addendum
|
||||
}
|
||||
|
||||
return identity + date_line + voice_rules + security_rules + capability_rules + identity_block + affective_boot_block + engram_block + safety_block
|
||||
return identity + operator_section + date_line + voice_rules + security_rules + capability_rules + identity_block + affective_boot_block + engram_block + safety_block
|
||||
}
|
||||
|
||||
fn hist_append(hist: String, role: String, content: String) -> String {
|
||||
@@ -857,6 +926,68 @@ fn session_preload_bullets(nodes: String, max_bullets: Int, snip_len: Int) -> St
|
||||
return bullets
|
||||
}
|
||||
|
||||
// Cross-session affective context (hoisted verbatim from handle_chat, 2026-07-04):
|
||||
// the block-expression initializer form miscompiles under the local El toolchain
|
||||
// (first typed let in a block-expr loses its declaration - repro filed for Will).
|
||||
// Function-hoist is semantically identical. AFFECTIVE/CARE LOGIC: body unchanged.
|
||||
fn affective_context_prefix() -> String {
|
||||
// Runs every turn. Uses correct BellEvent/PositiveEvent tags.
|
||||
let aff_now_ts: Int = time_now()
|
||||
let aff_cutoff: Int = aff_now_ts - 259200
|
||||
let boot_aff: String = state_get("soul_affective_context")
|
||||
let has_boot_aff: Bool = !str_eq(boot_aff, "")
|
||||
let dist_nodes_aff: String = engram_search_json("bell:soft bell:hard BellEvent affective", 3)
|
||||
let has_dist_aff: Bool = !str_eq(dist_nodes_aff, "") && !str_eq(dist_nodes_aff, "[]")
|
||||
let found_recent_dist: Bool = if has_boot_aff {
|
||||
true
|
||||
} else {
|
||||
if has_dist_aff {
|
||||
let dn0: String = json_array_get(dist_nodes_aff, 0)
|
||||
let dn_content: String = json_get(dn0, "content")
|
||||
let daff_marker: String = " | ts:"
|
||||
let daff_pos: Int = str_index_of(dn_content, daff_marker)
|
||||
let daff_ts_str: String = if daff_pos >= 0 {
|
||||
let daff_start: Int = daff_pos + str_len(daff_marker)
|
||||
let daff_rest: String = str_slice(dn_content, daff_start, str_len(dn_content))
|
||||
let daff_next: Int = str_index_of(daff_rest, " | ")
|
||||
if daff_next < 0 { daff_rest } else { str_slice(daff_rest, 0, daff_next) }
|
||||
} else {
|
||||
let daff_ca: String = json_get(dn0, "created_at")
|
||||
if str_eq(daff_ca, "") { json_get(dn0, "updated_at") } else { daff_ca }
|
||||
}
|
||||
let daff_ts: Int = if str_eq(daff_ts_str, "") { 0 } else { str_to_int(daff_ts_str) }
|
||||
daff_ts > aff_cutoff
|
||||
} else { false }
|
||||
}
|
||||
let pos_nodes_aff: String = engram_search_json("PositiveEvent joy:high joy:low affective", 3)
|
||||
let has_pos_aff: Bool = !str_eq(pos_nodes_aff, "") && !str_eq(pos_nodes_aff, "[]")
|
||||
let found_recent_pos: Bool = if has_pos_aff && !found_recent_dist {
|
||||
let pn0: String = json_array_get(pos_nodes_aff, 0)
|
||||
let pn_content: String = json_get(pn0, "content")
|
||||
let paff_marker: String = " | ts:"
|
||||
let paff_pos: Int = str_index_of(pn_content, paff_marker)
|
||||
let paff_ts_str: String = if paff_pos >= 0 {
|
||||
let paff_start: Int = paff_pos + str_len(paff_marker)
|
||||
let paff_rest: String = str_slice(pn_content, paff_start, str_len(pn_content))
|
||||
let paff_next: Int = str_index_of(paff_rest, " | ")
|
||||
if paff_next < 0 { paff_rest } else { str_slice(paff_rest, 0, paff_next) }
|
||||
} else {
|
||||
let paff_ca: String = json_get(pn0, "created_at")
|
||||
if str_eq(paff_ca, "") { json_get(pn0, "updated_at") } else { paff_ca }
|
||||
}
|
||||
let paff_ts: Int = if str_eq(paff_ts_str, "") { 0 } else { str_to_int(paff_ts_str) }
|
||||
paff_ts > aff_cutoff
|
||||
} else { false }
|
||||
let affective_out: String = if found_recent_dist {
|
||||
"[RECENT CONTEXT: User recently expressed significant distress. Monitor for indirect crisis signals and respond with care.]\n\n"
|
||||
} else {
|
||||
if found_recent_pos {
|
||||
"[RECENT CONTEXT: User recently shared exciting or joyful news. Acknowledge and celebrate with them when relevant.]\n\n"
|
||||
} else { "" }
|
||||
}
|
||||
return affective_out
|
||||
}
|
||||
|
||||
fn handle_chat(body: String) -> String {
|
||||
let message: String = json_get(body, "message")
|
||||
if str_eq(message, "") {
|
||||
@@ -885,65 +1016,15 @@ fn handle_chat(body: String) -> String {
|
||||
|
||||
// Cross-session affective context: on session start (no history yet), check engram
|
||||
// for recent distress signals within 72h and prepend a care directive if found.
|
||||
let affective_prefix: String = {
|
||||
// Runs every turn. Uses correct BellEvent/PositiveEvent tags.
|
||||
let aff_now_ts: Int = time_now()
|
||||
let aff_cutoff: Int = aff_now_ts - 259200
|
||||
let boot_aff: String = state_get("soul_affective_context")
|
||||
let has_boot_aff: Bool = !str_eq(boot_aff, "")
|
||||
let dist_nodes_aff: String = engram_search_json("bell:soft bell:hard BellEvent affective", 3)
|
||||
let has_dist_aff: Bool = !str_eq(dist_nodes_aff, "") && !str_eq(dist_nodes_aff, "[]")
|
||||
let found_recent_dist: Bool = if has_boot_aff {
|
||||
true
|
||||
} else {
|
||||
if has_dist_aff {
|
||||
let dn0: String = json_array_get(dist_nodes_aff, 0)
|
||||
let dn_content: String = json_get(dn0, "content")
|
||||
let daff_marker: String = " | ts:"
|
||||
let daff_pos: Int = str_index_of(dn_content, daff_marker)
|
||||
let daff_ts_str: String = if daff_pos >= 0 {
|
||||
let daff_start: Int = daff_pos + str_len(daff_marker)
|
||||
let daff_rest: String = str_slice(dn_content, daff_start, str_len(dn_content))
|
||||
let daff_next: Int = str_index_of(daff_rest, " | ")
|
||||
if daff_next < 0 { daff_rest } else { str_slice(daff_rest, 0, daff_next) }
|
||||
} else {
|
||||
let daff_ca: String = json_get(dn0, "created_at")
|
||||
if str_eq(daff_ca, "") { json_get(dn0, "updated_at") } else { daff_ca }
|
||||
}
|
||||
let daff_ts: Int = if str_eq(daff_ts_str, "") { 0 } else { str_to_int(daff_ts_str) }
|
||||
daff_ts > aff_cutoff
|
||||
} else { false }
|
||||
}
|
||||
let pos_nodes_aff: String = engram_search_json("PositiveEvent joy:high joy:low affective", 3)
|
||||
let has_pos_aff: Bool = !str_eq(pos_nodes_aff, "") && !str_eq(pos_nodes_aff, "[]")
|
||||
let found_recent_pos: Bool = if has_pos_aff && !found_recent_dist {
|
||||
let pn0: String = json_array_get(pos_nodes_aff, 0)
|
||||
let pn_content: String = json_get(pn0, "content")
|
||||
let paff_marker: String = " | ts:"
|
||||
let paff_pos: Int = str_index_of(pn_content, paff_marker)
|
||||
let paff_ts_str: String = if paff_pos >= 0 {
|
||||
let paff_start: Int = paff_pos + str_len(paff_marker)
|
||||
let paff_rest: String = str_slice(pn_content, paff_start, str_len(pn_content))
|
||||
let paff_next: Int = str_index_of(paff_rest, " | ")
|
||||
if paff_next < 0 { paff_rest } else { str_slice(paff_rest, 0, paff_next) }
|
||||
} else {
|
||||
let paff_ca: String = json_get(pn0, "created_at")
|
||||
if str_eq(paff_ca, "") { json_get(pn0, "updated_at") } else { paff_ca }
|
||||
}
|
||||
let paff_ts: Int = if str_eq(paff_ts_str, "") { 0 } else { str_to_int(paff_ts_str) }
|
||||
paff_ts > aff_cutoff
|
||||
} else { false }
|
||||
if found_recent_dist {
|
||||
"[RECENT CONTEXT: User recently expressed significant distress. Monitor for indirect crisis signals and respond with care.]\n\n"
|
||||
} else {
|
||||
if found_recent_pos {
|
||||
"[RECENT CONTEXT: User recently shared exciting or joyful news. Acknowledge and celebrate with them when relevant.]\n\n"
|
||||
} else { "" }
|
||||
}
|
||||
}
|
||||
let affective_prefix: String = affective_context_prefix()
|
||||
|
||||
let ctx: String = engram_compile(activation_seed)
|
||||
let system: String = affective_prefix + build_system_prompt(ctx, true)
|
||||
// Tell the LLM which engine it is running on this turn, so it can answer truthfully instead of
|
||||
// guessing. The per-turn model rides in the request body (concrete even under Auto routing);
|
||||
// fall back to the configured default when blank.
|
||||
let sp_req_model: String = json_get(body, "model")
|
||||
let sp_model: String = if str_eq(sp_req_model, "") { chat_default_model() } else { sp_req_model }
|
||||
let system: String = affective_prefix + build_system_prompt(ctx, true) + current_engine_note(sp_model)
|
||||
|
||||
let seen_ids: String = state_get("engram_compile_seen_ids")
|
||||
|
||||
@@ -952,7 +1033,7 @@ fn handle_chat(body: String) -> String {
|
||||
// nodes stored under names like "Prism" unless those exact words appear in content.
|
||||
let session_preload: String = if hist_len == 0 {
|
||||
let profile_nodes: String = engram_search_json("user profile identity preferences", 5)
|
||||
let work_nodes: String = engram_search_json("in_progress active project work", 5)
|
||||
let work_nodes_0: String = engram_search_json("in_progress active project work", 5)
|
||||
let project_nodes: String = engram_search_json("project status current ongoing active", 5)
|
||||
let summary_nodes: String = engram_search_json("SessionSummary session:summary previous-session recent", 3)
|
||||
|
||||
@@ -961,80 +1042,80 @@ fn handle_chat(body: String) -> String {
|
||||
// Issue 1: typed work query — WorkItem with in_progress label first.
|
||||
let work_nodes_typed: String = engram_search_json("WorkItem status:in_progress active work", 6)
|
||||
let work_ok_typed: Bool = !str_eq(work_nodes_typed, "") && !str_eq(work_nodes_typed, "[]")
|
||||
let work_nodes: String = if work_ok_typed {
|
||||
let work_nodes_1: String = if work_ok_typed {
|
||||
work_nodes_typed
|
||||
} else {
|
||||
engram_search_json("active project task current in_progress", 6)
|
||||
}
|
||||
let work_ok: Bool = !str_eq(work_nodes, "") && !str_eq(work_nodes, "[]")
|
||||
let work_ok: Bool = !str_eq(work_nodes_1, "") && !str_eq(work_nodes_1, "[]")
|
||||
let project_ok: Bool = !str_eq(project_nodes, "") && !str_eq(project_nodes, "[]")
|
||||
let summary_ok: Bool = !str_eq(summary_nodes, "") && !str_eq(summary_nodes, "[]")
|
||||
|
||||
let profile_bullets: String = if profile_ok {
|
||||
let pn: Int = json_array_len(profile_nodes)
|
||||
let bullets: String = ""
|
||||
let bullets = if pn > 0 {
|
||||
let bullets_0: String = ""
|
||||
let bullets_1 = if pn > 0 {
|
||||
let n0: String = json_array_get(profile_nodes, 0)
|
||||
let id0: String = json_get(n0, "id")
|
||||
let c0: String = json_get(n0, "content")
|
||||
let s0: String = if str_len(c0) > 120 { str_slice(c0, 0, 120) } else { c0 }
|
||||
if id_in_seen(id0, seen_ids) || str_eq(s0, "") { bullets } else { "- " + s0 }
|
||||
} else { bullets }
|
||||
let bullets = if pn > 1 {
|
||||
if id_in_seen(id0, seen_ids) || str_eq(s0, "") { bullets_0 } else { "- " + s0 }
|
||||
} else { bullets_0 }
|
||||
let bullets_2 = if pn > 1 {
|
||||
let n1: String = json_array_get(profile_nodes, 1)
|
||||
let id1: String = json_get(n1, "id")
|
||||
let c1: String = json_get(n1, "content")
|
||||
let s1: String = if str_len(c1) > 120 { str_slice(c1, 0, 120) } else { c1 }
|
||||
if id_in_seen(id1, seen_ids) || str_eq(s1, "") { bullets } else { bullets + "\n- " + s1 }
|
||||
} else { bullets }
|
||||
let bullets = if pn > 2 {
|
||||
if id_in_seen(id1, seen_ids) || str_eq(s1, "") { bullets_1 } else { bullets_1 + "\n- " + s1 }
|
||||
} else { bullets_1 }
|
||||
let bullets_3 = if pn > 2 {
|
||||
let n2: String = json_array_get(profile_nodes, 2)
|
||||
let id2: String = json_get(n2, "id")
|
||||
let c2: String = json_get(n2, "content")
|
||||
let s2: String = if str_len(c2) > 120 { str_slice(c2, 0, 120) } else { c2 }
|
||||
if id_in_seen(id2, seen_ids) || str_eq(s2, "") { bullets } else { bullets + "\n- " + s2 }
|
||||
} else { bullets }
|
||||
bullets
|
||||
if id_in_seen(id2, seen_ids) || str_eq(s2, "") { bullets_2 } else { bullets_2 + "\n- " + s2 }
|
||||
} else { bullets_2 }
|
||||
bullets_3
|
||||
} else { "" }
|
||||
|
||||
let work_bullets: String = if work_ok {
|
||||
let wn: Int = json_array_len(work_nodes)
|
||||
let wb: String = ""
|
||||
let wb = if wn > 0 {
|
||||
let w0: String = json_array_get(work_nodes, 0)
|
||||
let wn: Int = json_array_len(work_nodes_1)
|
||||
let wb_0: String = ""
|
||||
let wb_1 = if wn > 0 {
|
||||
let w0: String = json_array_get(work_nodes_1, 0)
|
||||
let wid0: String = json_get(w0, "id")
|
||||
let wc0: String = json_get(w0, "content")
|
||||
let ws0: String = if str_len(wc0) > 120 { str_slice(wc0, 0, 120) } else { wc0 }
|
||||
if id_in_seen(wid0, seen_ids) || str_eq(ws0, "") { wb } else { "- " + ws0 }
|
||||
} else { wb }
|
||||
let wb = if wn > 1 {
|
||||
let w1: String = json_array_get(work_nodes, 1)
|
||||
if id_in_seen(wid0, seen_ids) || str_eq(ws0, "") { wb_0 } else { "- " + ws0 }
|
||||
} else { wb_0 }
|
||||
let wb_2 = if wn > 1 {
|
||||
let w1: String = json_array_get(work_nodes_1, 1)
|
||||
let wid1: String = json_get(w1, "id")
|
||||
let wc1: String = json_get(w1, "content")
|
||||
let ws1: String = if str_len(wc1) > 120 { str_slice(wc1, 0, 120) } else { wc1 }
|
||||
if id_in_seen(wid1, seen_ids) || str_eq(ws1, "") { wb } else { wb + "\n- " + ws1 }
|
||||
} else { wb }
|
||||
wb
|
||||
if id_in_seen(wid1, seen_ids) || str_eq(ws1, "") { wb_1 } else { wb_1 + "\n- " + ws1 }
|
||||
} else { wb_1 }
|
||||
wb_2
|
||||
} else { "" }
|
||||
|
||||
let project_bullets: String = if project_ok {
|
||||
let prn: Int = json_array_len(project_nodes)
|
||||
let pb: String = ""
|
||||
let pb = if prn > 0 {
|
||||
let pb_0: String = ""
|
||||
let pb_1 = if prn > 0 {
|
||||
let pr0: String = json_array_get(project_nodes, 0)
|
||||
let prid0: String = json_get(pr0, "id")
|
||||
let prc0: String = json_get(pr0, "content")
|
||||
let ps0: String = if str_len(prc0) > 120 { str_slice(prc0, 0, 120) } else { prc0 }
|
||||
if id_in_seen(prid0, seen_ids) || str_eq(ps0, "") { pb } else { "- " + ps0 }
|
||||
} else { pb }
|
||||
let pb = if prn > 1 {
|
||||
if id_in_seen(prid0, seen_ids) || str_eq(ps0, "") { pb_0 } else { "- " + ps0 }
|
||||
} else { pb_0 }
|
||||
let pb_2 = if prn > 1 {
|
||||
let pr1: String = json_array_get(project_nodes, 1)
|
||||
let prid1: String = json_get(pr1, "id")
|
||||
let prc1: String = json_get(pr1, "content")
|
||||
let ps1: String = if str_len(prc1) > 120 { str_slice(prc1, 0, 120) } else { prc1 }
|
||||
if id_in_seen(prid1, seen_ids) || str_eq(ps1, "") { pb } else { pb + "\n- " + ps1 }
|
||||
} else { pb }
|
||||
pb
|
||||
if id_in_seen(prid1, seen_ids) || str_eq(ps1, "") { pb_1 } else { pb_1 + "\n- " + ps1 }
|
||||
} else { pb_1 }
|
||||
pb_2
|
||||
} else { "" }
|
||||
|
||||
let summary_bullet: String = if summary_ok {
|
||||
@@ -1202,6 +1283,86 @@ fn agentic_api_key() -> String {
|
||||
return env("NEURON_LLM_0_KEY")
|
||||
}
|
||||
|
||||
// ── OpenAI-compatible providers (Ollama / OpenAI / Grok / Gemini) ──────────────────────────────
|
||||
// The brain speaks Anthropic's Messages format by default. When the active provider uses the
|
||||
// OpenAI-compatible wire format (NEURON_LLM_0_FORMAT=openai) with a configured base URL
|
||||
// (NEURON_LLM_0_URL, e.g. http://localhost:11434/v1 for local Ollama), basic chat turns are served
|
||||
// here instead of the Anthropic agentic loop.
|
||||
// v1 SCOPE: plain chat completion only — NO tools / agentic loop yet (that is a follow-up port).
|
||||
// This block is ADDITIVE: the Anthropic path is untouched and stays the default.
|
||||
|
||||
fn llm_base_url() -> String {
|
||||
return env("NEURON_LLM_0_URL")
|
||||
}
|
||||
|
||||
fn llm_wire_format() -> String {
|
||||
let f: String = env("NEURON_LLM_0_FORMAT")
|
||||
if str_eq(f, "") {
|
||||
return "anthropic"
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
// Escape a decoded string so it can be embedded back into a JSON string literal.
|
||||
fn json_escape(s: String) -> String {
|
||||
let a: String = str_replace(s, "\\", "\\\\")
|
||||
let b: String = str_replace(a, "\"", "\\\"")
|
||||
let c: String = str_replace(b, "\n", "\\n")
|
||||
let d: String = str_replace(c, "\r", "\\r")
|
||||
return d
|
||||
}
|
||||
|
||||
// Basic (non-agentic) chat completion against an OpenAI-compatible endpoint.
|
||||
// [safe_sys] is already JSON-escaped; [messages_json] is the same JSON array the Anthropic path
|
||||
// builds (e.g. [{"role":"user","content":"..."}]). Returns the soul's standard {"reply":"..."}.
|
||||
fn openai_chat_complete(model: String, base_url: String, api_key: String, safe_sys: String, messages_json: String) -> String {
|
||||
// Prepend the system prompt as an OpenAI "system" message, then the existing turn array.
|
||||
let inner: String = if json_array_len(messages_json) > 0 {
|
||||
str_slice(messages_json, 1, str_len(messages_json) - 1)
|
||||
} else {
|
||||
""
|
||||
}
|
||||
let msgs: String = if str_eq(inner, "") {
|
||||
"[{\"role\":\"system\",\"content\":\"" + safe_sys + "\"}]"
|
||||
} else {
|
||||
"[{\"role\":\"system\",\"content\":\"" + safe_sys + "\"}," + inner + "]"
|
||||
}
|
||||
let req_body: String = "{\"model\":\"" + model + "\""
|
||||
+ ",\"max_tokens\":4096"
|
||||
+ ",\"messages\":" + msgs
|
||||
+ "}"
|
||||
|
||||
let h: Map = {}
|
||||
map_set(h, "content-type", "application/json")
|
||||
// Ollama needs no key; OpenAI / Grok / Gemini use a Bearer token.
|
||||
if !str_eq(api_key, "") {
|
||||
map_set(h, "Authorization", "Bearer " + api_key)
|
||||
}
|
||||
|
||||
let url: String = base_url + "/chat/completions"
|
||||
let raw_resp: String = http_post_with_headers(url, req_body, h)
|
||||
|
||||
let is_error: Bool = str_starts_with(raw_resp, "{\"error\"") || str_contains(raw_resp, "\"error\":")
|
||||
if is_error {
|
||||
return "{\"error\":\"llm unavailable\",\"reply\":\"\"}"
|
||||
}
|
||||
|
||||
// Parse OpenAI response shape: choices[0].message.content
|
||||
let choices: String = json_get_raw(raw_resp, "choices")
|
||||
let eff_choices: String = if str_eq(choices, "") {
|
||||
"[]"
|
||||
} else {
|
||||
choices
|
||||
}
|
||||
if json_array_len(eff_choices) < 1 {
|
||||
return "{\"error\":\"empty response\",\"reply\":\"\"}"
|
||||
}
|
||||
let first: String = json_array_get(eff_choices, 0)
|
||||
let message: String = json_get_raw(first, "message")
|
||||
let content: String = json_get(message, "content")
|
||||
return "{\"reply\":\"" + json_escape(content) + "\",\"tools_used\":[]}"
|
||||
}
|
||||
|
||||
fn agentic_tools_literal() -> String {
|
||||
return "[" +
|
||||
"{\"name\":\"read_file\",\"description\":\"Read contents of a file from disk.\",\"input_schema\":{\"type\":\"object\",\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Absolute file path\"}},\"required\":[\"path\"]}}," +
|
||||
@@ -1374,6 +1535,134 @@ fn resolve_in_root(path: String, root: String) -> String {
|
||||
return root + "/" + path
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// BUG-8: server-side risk tiers + a real fence for run_command.
|
||||
//
|
||||
// Before this block, the ONLY thing deciding whether a tool call paused for
|
||||
// user consent was is_builtin_tool() — a destructive shell command and a
|
||||
// read-only file read were treated identically (both auto-ran), and the
|
||||
// client's approval UI was the sole line of defense. Enforcement now lives
|
||||
// where the tools execute:
|
||||
//
|
||||
// "read" observes only — runs silently.
|
||||
// "reversible" workspace-confined writes with a client undo path — runs,
|
||||
// lands on the run receipt.
|
||||
// "escalate" irreversible / outward / shell — NEVER auto-runs. The loop
|
||||
// suspends to the client's consent flow; the /approve
|
||||
// round-trip IS the approval token, because the engine only
|
||||
// executes an escalated tool inside handle_session_approve.
|
||||
//
|
||||
// "Always allow" can never bypass the escalate tier (irreversible actions
|
||||
// always confirm — the value line). Unknown tools default to escalate.
|
||||
// The run_command fence refuses parent traversal, ~, command substitution,
|
||||
// and absolute paths outside the workspace — refusal, not a cwd suggestion.
|
||||
// Still lexical underneath (symlinks; see the LIMITATION note above): tiered
|
||||
// consent + the fence raise the floor a second and third rung; OS-level
|
||||
// confinement in el_runtime.c remains the ceiling, flagged for Will.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// Read-only shell commands may auto-run (still fenced); anything with shell
|
||||
// plumbing (pipes, redirects, chaining) or an unknown head word escalates.
|
||||
fn run_command_is_readonly(cmd: String) -> Bool {
|
||||
if str_contains(cmd, "|") || str_contains(cmd, ">") || str_contains(cmd, "<") {
|
||||
return false
|
||||
}
|
||||
if str_contains(cmd, ";") || str_contains(cmd, "&") {
|
||||
return false
|
||||
}
|
||||
let sp: Int = str_index_of(cmd, " ")
|
||||
let first: String = if sp < 0 { cmd } else { str_slice(cmd, 0, sp) }
|
||||
if str_eq(first, "ls") || str_eq(first, "cat") || str_eq(first, "head") || str_eq(first, "tail") {
|
||||
return true
|
||||
}
|
||||
if str_eq(first, "grep") || str_eq(first, "wc") || str_eq(first, "find") || str_eq(first, "pwd") {
|
||||
return true
|
||||
}
|
||||
if str_eq(first, "echo") || str_eq(first, "date") || str_eq(first, "which") || str_eq(first, "file") || str_eq(first, "stat") {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// True if the command references an absolute path (introduced by `needle`,
|
||||
// whose last char is the "/") that does NOT stay inside the workspace root.
|
||||
fn cmd_abs_escape_at(cmd: String, root: String, needle: String) -> Bool {
|
||||
let rest: String = cmd
|
||||
let found: Bool = false
|
||||
while !found && str_contains(rest, needle) {
|
||||
let idx: Int = str_index_of(rest, needle)
|
||||
let slash_at: Int = idx + str_len(needle) - 1
|
||||
let after: String = str_slice(rest, slash_at, str_len(rest))
|
||||
let ok: Bool = str_starts_with(after, root + "/") || str_starts_with(after, root + " ") || str_eq(after, root)
|
||||
let found = if !ok { true } else { found }
|
||||
let rest = str_slice(rest, slash_at + 1, str_len(rest))
|
||||
}
|
||||
return found
|
||||
}
|
||||
|
||||
// The run_command fence. Returns "" when the command may run, else the denial
|
||||
// message (sent back to the model as the tool result, same pattern as the
|
||||
// path tools). Root is REQUIRED for shell: no workspace, no commands.
|
||||
fn run_command_guard(cmd: String, root: String) -> String {
|
||||
if str_eq(root, "") {
|
||||
return "denied: no workspace folder is set — the user must choose a workspace folder in the Agent panel before shell commands can run"
|
||||
}
|
||||
if str_contains(cmd, "..") {
|
||||
return "denied: parent-directory traversal ('..') is not allowed"
|
||||
}
|
||||
if str_contains(cmd, "~") {
|
||||
return "denied: home-directory references ('~') are not allowed"
|
||||
}
|
||||
if str_contains(cmd, "$(") || str_contains(cmd, "`") {
|
||||
return "denied: command substitution is not allowed"
|
||||
}
|
||||
if str_starts_with(cmd, "/") && !str_starts_with(cmd, root + "/") {
|
||||
return "denied: absolute paths outside the workspace are not allowed"
|
||||
}
|
||||
if cmd_abs_escape_at(cmd, root, " /") || cmd_abs_escape_at(cmd, root, "\"/") || cmd_abs_escape_at(cmd, root, "'/") {
|
||||
return "denied: absolute paths outside the workspace are not allowed"
|
||||
}
|
||||
if cmd_abs_escape_at(cmd, root, "=/") || cmd_abs_escape_at(cmd, root, ">/") || cmd_abs_escape_at(cmd, root, "</") || cmd_abs_escape_at(cmd, root, "(/") {
|
||||
return "denied: absolute paths outside the workspace are not allowed"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// The engine's own risk classification for a tool call. Client UI renders it;
|
||||
// the engine ENFORCES it.
|
||||
fn classify_tool_risk(tool_name: String, tool_input: String) -> String {
|
||||
if str_eq(tool_name, "read_file") || str_eq(tool_name, "list_files") || str_eq(tool_name, "grep") {
|
||||
return "read"
|
||||
}
|
||||
if str_eq(tool_name, "search_memory") || str_eq(tool_name, "recall") || str_eq(tool_name, "web_get") {
|
||||
return "read"
|
||||
}
|
||||
if str_eq(tool_name, "remember") || str_eq(tool_name, "neuron_remember") {
|
||||
return "reversible"
|
||||
}
|
||||
if str_starts_with(tool_name, "neuron_") {
|
||||
return "read"
|
||||
}
|
||||
if str_eq(tool_name, "write_file") || str_eq(tool_name, "edit_file") {
|
||||
let root: String = agent_workspace_root()
|
||||
// Unscoped writes (no workspace chosen) are not "reversible" — escalate.
|
||||
if str_eq(root, "") {
|
||||
return "escalate"
|
||||
}
|
||||
return "reversible"
|
||||
}
|
||||
if str_eq(tool_name, "run_command") {
|
||||
let cmd: String = json_get(tool_input, "command")
|
||||
let root: String = agent_workspace_root()
|
||||
if !str_eq(root, "") && run_command_is_readonly(cmd) {
|
||||
return "read"
|
||||
}
|
||||
return "escalate"
|
||||
}
|
||||
// Unknown tool = escalate. Default-deny, never default-allow.
|
||||
return "escalate"
|
||||
}
|
||||
|
||||
fn dispatch_tool(tool_name: String, tool_input: String) -> String {
|
||||
if str_eq(tool_name, "read_file") {
|
||||
let path: String = json_get(tool_input, "path")
|
||||
@@ -1396,6 +1685,10 @@ fn dispatch_tool(tool_name: String, tool_input: String) -> String {
|
||||
}
|
||||
if str_eq(tool_name, "web_get") {
|
||||
let url: String = json_get(tool_input, "url")
|
||||
// BUG-8: scheme guard — web_get had no guard at all (file:// etc).
|
||||
if !str_starts_with(url, "http://") && !str_starts_with(url, "https://") {
|
||||
return json_safe("denied: only http(s) URLs can be fetched")
|
||||
}
|
||||
let result: String = http_get(url)
|
||||
return json_safe(result)
|
||||
}
|
||||
@@ -1407,7 +1700,14 @@ fn dispatch_tool(tool_name: String, tool_input: String) -> String {
|
||||
if str_eq(tool_name, "run_command") {
|
||||
let cmd: String = json_get(tool_input, "command")
|
||||
let root: String = agent_workspace_root()
|
||||
let scoped: String = if str_eq(root, "") { cmd } else { "cd " + root + " && ( " + cmd + " )" }
|
||||
// BUG-8(B): the fence — refusal, not a cwd suggestion. Applies on EVERY
|
||||
// execution path (auto-run in the loop AND post-consent dispatch from
|
||||
// handle_session_approve), because both land here.
|
||||
let denial: String = run_command_guard(cmd, root)
|
||||
if !str_eq(denial, "") {
|
||||
return json_safe(denial)
|
||||
}
|
||||
let scoped: String = "cd " + root + " && ( " + cmd + " )"
|
||||
let result: String = exec_capture(scoped)
|
||||
return json_safe(result)
|
||||
}
|
||||
@@ -1573,6 +1873,55 @@ fn next_bridge_id() -> String {
|
||||
return "br-" + uid
|
||||
}
|
||||
|
||||
fn handle_chat_plan(body: String) -> String {
|
||||
let message: String = json_get(body, "message")
|
||||
if str_eq(message, "") {
|
||||
return "{\"error\":\"message required\",\"plan\":null}"
|
||||
}
|
||||
|
||||
let req_model: String = json_get(body, "model")
|
||||
let model: String = if str_eq(req_model, "") { chat_default_model() } else { req_model }
|
||||
|
||||
let op_home: String = env("HOME")
|
||||
let op_user: String = env("USER")
|
||||
let op_display: String = if str_eq(op_user, "") { "the current user" } else { op_user }
|
||||
|
||||
// Compile context — same intent-seeding as agentic path so the plan is grounded.
|
||||
let ctx: String = engram_compile(message)
|
||||
let ctx_block: String = if str_eq(ctx, "") { "" } else { "\n\n[CONTEXT]\n" + ctx }
|
||||
|
||||
let plan_system: String = "You are in PLAN MODE. Your job is to produce a concise step-by-step plan for the request below — WITHOUT executing it.\n\nReturn ONLY a JSON object. No markdown. No preamble. No explanation. Just the JSON:\n{\"steps\":[{\"id\":\"s1\",\"title\":\"<2-6 word title>\",\"detail\":\"<one concrete sentence>\"},{\"id\":\"s2\",...}]}\n\nPlan rules:\n- 3-7 steps (more only when genuinely needed for a complex multi-file task)\n- Each step is one atomic, independently verifiable action\n- title: 2-6 words, imperative (e.g. \"Read config file\", \"Write updated handler\")\n- detail: exactly one sentence describing what happens\n- No tool calls. No execution. No side effects. The user approves before anything runs.\n\nOperator: " + op_display + " at " + op_home + ctx_block
|
||||
|
||||
let raw: String = llm_call_system(model, plan_system, message)
|
||||
|
||||
let is_error: Bool = str_starts_with(raw, "{\"error\"")
|
||||
if is_error {
|
||||
return "{\"error\":\"plan generation failed\",\"plan\":null,\"detail\":" + raw + "}"
|
||||
}
|
||||
|
||||
// Extract the JSON object from the response (LLM sometimes wraps in markdown).
|
||||
let brace_start: Int = str_index_of(raw, "{")
|
||||
// Scan backwards to find the last closing brace (str_last_index_of not available).
|
||||
let brace_end: Int = -1
|
||||
let scan_i: Int = str_len(raw) - 1
|
||||
while scan_i >= 0 {
|
||||
let ch: String = str_slice(raw, scan_i, scan_i + 1)
|
||||
let brace_end = if str_eq(ch, "}") && brace_end < 0 { scan_i } else { brace_end }
|
||||
let scan_i = if brace_end >= 0 { -1 } else { scan_i - 1 }
|
||||
}
|
||||
let plan_json: String = if brace_start >= 0 {
|
||||
if brace_end > brace_start {
|
||||
str_slice(raw, brace_start, brace_end + 1)
|
||||
} else {
|
||||
raw
|
||||
}
|
||||
} else {
|
||||
raw
|
||||
}
|
||||
|
||||
return "{\"plan\":" + plan_json + ",\"model\":\"" + json_safe(model) + "\"}"
|
||||
}
|
||||
|
||||
fn handle_chat_agentic(body: String) -> String {
|
||||
let message: String = json_get(body, "message")
|
||||
if str_eq(message, "") {
|
||||
@@ -1717,7 +2066,14 @@ fn handle_chat_agentic(body: String) -> String {
|
||||
|
||||
// Use caller-supplied session_id if provided, otherwise generate a bridge id.
|
||||
let session_id: String = if str_eq(req_session, "") { next_bridge_id() } else { req_session }
|
||||
let result: String = agentic_loop(session_id, model, safe_sys, tools_json, messages, h, "")
|
||||
// Provider fork: OpenAI-compatible providers (Ollama/OpenAI/Grok/Gemini) take the plain-completion
|
||||
// path (v1, no tools); everything else stays on the Anthropic agentic loop (the default).
|
||||
let use_openai: Bool = !str_eq(llm_base_url(), "") && str_eq(llm_wire_format(), "openai")
|
||||
let result: String = if use_openai {
|
||||
openai_chat_complete(model, llm_base_url(), agentic_api_key(), safe_sys, messages)
|
||||
} else {
|
||||
agentic_loop(session_id, model, safe_sys, tools_json, messages, h, "")
|
||||
}
|
||||
|
||||
// Persist the exchange to session/global history for thread continuity on next turn.
|
||||
// Only save when the loop completed (reply present), not when tool_pending.
|
||||
@@ -1741,9 +2097,17 @@ fn handle_chat_agentic(body: String) -> String {
|
||||
el_from_float(0.6), el_from_float(0.7), el_from_float(0.8),
|
||||
"Episodic", sess_hist_tags
|
||||
)
|
||||
if str_eq(sess_hist_id, "") {
|
||||
// NOTE: bind an explicit Bool value here. A bare `if { println(...) }`
|
||||
// leaves a void-typed branch in value position, which the current elc
|
||||
// lowers to `_if_result = (println(...))` — invalid C. Yielding a value
|
||||
// keeps the branch non-void without changing behavior (still only logs).
|
||||
let persist_ok: Bool = if str_eq(sess_hist_id, "") {
|
||||
println("[chat] agentic: named session history persist failed for session=" + req_session)
|
||||
}
|
||||
false
|
||||
} else { true }
|
||||
persist_ok
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
true
|
||||
@@ -1781,6 +2145,19 @@ fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json:
|
||||
let pend_tool_id: String = ""
|
||||
let pend_tool_name: String = ""
|
||||
let pend_tool_input: String = ""
|
||||
let pend_tool_tier: String = ""
|
||||
let pend_narration: String = ""
|
||||
|
||||
// Live run-progress ledger (2026-07-13, proposed with the narrated-runs work):
|
||||
// the model already narrates its intent in a text block before every tool call,
|
||||
// and the loop previously DISCARDED that prose on tool rounds. Each iteration now
|
||||
// appends {"i":N,"t":"<narration>","tool":"<name>"} to state key
|
||||
// run_progress_<session_id>; the client polls GET /api/run-progress/<session_id>
|
||||
// during a run to render live step updates (the Cowork pattern) without needing
|
||||
// streaming. Reset at loop start; a {"done":true} entry lands on completion.
|
||||
if !str_eq(session_id, "") {
|
||||
state_set("run_progress_" + session_id, "")
|
||||
}
|
||||
|
||||
while keep_going && iteration < 8 {
|
||||
let req_body: String = "{\"model\":\"" + model + "\""
|
||||
@@ -1837,7 +2214,13 @@ fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json:
|
||||
let always_key: String = "always_allow_" + session_id
|
||||
let always_list: String = if !str_eq(session_id, "") { state_get(always_key) } else { "" }
|
||||
let is_always_allowed: Bool = !str_eq(tool_name, "") && !str_eq(always_list, "") && str_contains(always_list, tool_name)
|
||||
let needs_bridge: Bool = is_tool_turn && !is_builtin_tool(tool_name) && !is_always_allowed
|
||||
// BUG-8(A): the engine classifies every tool call and REFUSES to auto-run
|
||||
// the escalate tier — being a builtin is no longer a free pass, and
|
||||
// "always allow" can never bypass escalate (irreversible actions always
|
||||
// confirm). Escalated calls suspend to the client's consent flow; the
|
||||
// /approve round-trip is the only path that executes them.
|
||||
let risk_tier: String = if is_tool_turn { classify_tool_risk(tool_name, tool_input) } else { "" }
|
||||
let needs_bridge: Bool = is_tool_turn && (str_eq(risk_tier, "escalate") || (!is_builtin_tool(tool_name) && !is_always_allowed))
|
||||
|
||||
// Built-in tools dispatch locally; bridged tools yield "" (never sent upstream).
|
||||
let tool_result_raw: String = if is_tool_turn && !needs_bridge { dispatch_tool(tool_name, tool_input) } else { "" }
|
||||
@@ -1868,11 +2251,27 @@ fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json:
|
||||
"[" + inner2 + ",{\"role\":\"user\",\"content\":[" + tool_msg + "]}]"
|
||||
} else { messages }
|
||||
|
||||
// Live progress ledger: one entry per round — the model's own narration
|
||||
// (its pre-tool prose, previously discarded here) plus the tool it reached
|
||||
// for. Clients poll /api/run-progress/<sid> to render these live.
|
||||
if !str_eq(session_id, "") {
|
||||
let prog_key: String = "run_progress_" + session_id
|
||||
let prog_prev: String = state_get(prog_key)
|
||||
let prog_snip: String = if str_len(text_out) > 280 { str_slice(text_out, 0, 280) } else { text_out }
|
||||
let prog_entry: String = "{\"i\":" + int_to_str(iteration)
|
||||
+ ",\"t\":\"" + json_safe(prog_snip) + "\""
|
||||
+ ",\"tool\":\"" + json_safe(tool_name) + "\"}"
|
||||
let prog_next: String = if str_eq(prog_prev, "") { prog_entry } else { prog_prev + "," + prog_entry }
|
||||
state_set(prog_key, prog_next)
|
||||
}
|
||||
|
||||
// Bridge turn: persist the continuation and stop the loop.
|
||||
let pending = if needs_bridge { true } else { pending }
|
||||
let pend_tool_id = if needs_bridge { tool_id } else { pend_tool_id }
|
||||
let pend_tool_name = if needs_bridge { tool_name } else { pend_tool_name }
|
||||
let pend_tool_input = if needs_bridge { tool_input } else { pend_tool_input }
|
||||
let pend_tool_tier = if needs_bridge { risk_tier } else { pend_tool_tier }
|
||||
let pend_narration = if needs_bridge { text_out } else { pend_narration }
|
||||
// Stash messages-with-the-assistant-request so resume only needs to append the
|
||||
// client's tool_result block. messages_with_assistant is only meaningful when a
|
||||
// tool was requested, so guard on needs_bridge before persisting.
|
||||
@@ -1893,6 +2292,8 @@ fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json:
|
||||
+ ",\"call_id\":\"" + pend_tool_id + "\""
|
||||
+ ",\"tool_name\":\"" + pend_tool_name + "\""
|
||||
+ ",\"tool_input\":" + safe_in
|
||||
+ ",\"risk_tier\":\"" + pend_tool_tier + "\""
|
||||
+ ",\"narration\":\"" + json_safe(pend_narration) + "\""
|
||||
+ ",\"model\":\"" + model + "\""
|
||||
+ ",\"agentic\":true"
|
||||
+ ",\"tools_used\":" + tools_arr + "}"
|
||||
@@ -1914,6 +2315,13 @@ fn agentic_loop(session_id: String, model: String, safe_sys: String, tools_json:
|
||||
|
||||
let safe_text: String = json_safe(final_text)
|
||||
let tools_arr: String = if str_eq(tools_log, "") { "[]" } else { "[" + tools_log + "]" }
|
||||
// Close the live-progress ledger: pollers see {"done":true} and stop.
|
||||
if !str_eq(session_id, "") {
|
||||
let done_key: String = "run_progress_" + session_id
|
||||
let done_prev: String = state_get(done_key)
|
||||
let done_next: String = if str_eq(done_prev, "") { "{\"done\":true}" } else { done_prev + ",{\"done\":true}" }
|
||||
state_set(done_key, done_next)
|
||||
}
|
||||
return "{\"reply\":\"" + safe_text + "\",\"model\":\"" + model + "\",\"agentic\":true,\"tools_used\":" + tools_arr + ",\"iterations\":" + int_to_str(iteration) + "}"
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,9 @@ 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 distill_transcript(transcript: String) -> String
|
||||
extern fn json_safe(s: String) -> String
|
||||
extern fn current_engine_note(model: 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
|
||||
@@ -30,6 +32,10 @@ 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 llm_base_url() -> String
|
||||
extern fn llm_wire_format() -> String
|
||||
extern fn json_escape(s: String) -> String
|
||||
extern fn openai_chat_complete(model: String, base_url: String, api_key: String, safe_sys: String, messages_json: String) -> String
|
||||
extern fn agentic_tools_literal() -> String
|
||||
extern fn agentic_tools_with_web() -> String
|
||||
extern fn connector_tools_json() -> String
|
||||
@@ -43,6 +49,7 @@ 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_plan(body: String) -> 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
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
# Neuron Council Service
|
||||
|
||||
Anti-confabulation layer for the Neuron soul. Before a claim enters long-term memory, the council convenes: three independent LLMs vote on whether the claim is plausible, uncertain, or a confabulation. The aggregate vote produces a confidence score and tags that downstream storage can act on.
|
||||
|
||||
## Running the service
|
||||
|
||||
```bash
|
||||
# Foreground
|
||||
python3 council_service.py --port 7771
|
||||
|
||||
# Background (managed by LaunchAgent on macOS)
|
||||
launchctl load ~/Library/LaunchAgents/ai.neuron.council.plist
|
||||
launchctl unload ~/Library/LaunchAgents/ai.neuron.council.plist
|
||||
```
|
||||
|
||||
Logs: `~/.neuron/logs/council.log`
|
||||
|
||||
## API
|
||||
|
||||
### `POST /api/neuron/council/verify`
|
||||
|
||||
```json
|
||||
// Request
|
||||
{ "claim": "...", "context": "..." }
|
||||
|
||||
// Response
|
||||
{
|
||||
"id": "550e8400-e29b-41d4-a716-446655440000",
|
||||
"claim": "...",
|
||||
"confidence": 0.85,
|
||||
"council_votes": ["plausible", "plausible", "plausible"],
|
||||
"summary": "3/3 council members agree this is plausible.",
|
||||
"tags": ["verified"],
|
||||
"latency_ms": 1420
|
||||
}
|
||||
```
|
||||
|
||||
### `GET /healthz`
|
||||
|
||||
Returns `{"status": "ok"}` when the service is up.
|
||||
|
||||
## Confidence thresholds and tag meanings
|
||||
|
||||
| Votes plausible | Confidence | Tags |
|
||||
|---|---|---|
|
||||
| 3/3 | 0.85 | `verified` |
|
||||
| 2/3 | 0.65 | `council-split` |
|
||||
| 1/3 or 0/3 | 0.30 | `unverified`, `council-flagged` |
|
||||
| Ollama down | 0.50 | `council-unavailable` |
|
||||
|
||||
Recommended storage policy:
|
||||
- `confidence >= 0.65` → store normally
|
||||
- `0.30 <= confidence < 0.65` → store with `council-split` tag for later review
|
||||
- `council-flagged` → store in a quarantine bucket or reject entirely
|
||||
- `council-unavailable` → store normally (fail-open); council will re-evaluate later
|
||||
|
||||
## How to call from soul (.el)
|
||||
|
||||
The soul is implemented in Neuron's Emacs Lisp-like `.el` language. Add a pre-storage hook in the memory capture path:
|
||||
|
||||
```elisp
|
||||
;; In memory.el or safety.el — pre-storage council check
|
||||
(defun council-verify (claim context)
|
||||
"Call the council service. Returns a plist with :confidence and :tags."
|
||||
(let* ((url "http://localhost:7771/api/neuron/council/verify")
|
||||
(body (json-encode `((claim . ,claim) (context . ,context))))
|
||||
(resp (neuron-http-post url body))
|
||||
(data (json-decode resp)))
|
||||
data))
|
||||
|
||||
;; In the capture handler — wire it in before (engram-write ...)
|
||||
(defun capture-memory-with-council (claim context &rest store-args)
|
||||
(let* ((verdict (council-verify claim context))
|
||||
(confidence (plist-get verdict :confidence))
|
||||
(tags (plist-get verdict :tags)))
|
||||
(when (>= confidence 0.30) ; only reject hard confabulations if you want
|
||||
(apply #'engram-write
|
||||
(append store-args
|
||||
(list :council-confidence confidence
|
||||
:council-tags tags))))))
|
||||
```
|
||||
|
||||
The exact hook point depends on where `engram-write` (or equivalent) is called in `memory.el`. Search for the write call and wrap it with `capture-memory-with-council`.
|
||||
|
||||
## Future soul.c patch point
|
||||
|
||||
If the soul is ever rewritten in C or another compiled language, the integration point is:
|
||||
|
||||
```c
|
||||
// Before inserting a memory node into the engram database:
|
||||
CouncilResult result = council_verify(claim, context);
|
||||
if (result.confidence < COUNCIL_REJECT_THRESHOLD) {
|
||||
log_warn("Council flagged claim as confabulation (conf=%.2f): %s",
|
||||
result.confidence, claim);
|
||||
return MEMORY_REJECTED;
|
||||
}
|
||||
memory_node.council_confidence = result.confidence;
|
||||
memory_node.council_tags = result.tags;
|
||||
engram_insert(memory_node);
|
||||
```
|
||||
|
||||
## Council members
|
||||
|
||||
The council is currently three models:
|
||||
- `neuron:latest` — the primary Neuron model
|
||||
- `dolphin3:8b` — uncensored general-purpose model for independent perspective
|
||||
- `neuron-ft:latest` — fine-tuned Neuron variant
|
||||
|
||||
Each member votes independently with a 10-second timeout. If a member times out, their vote counts as "uncertain". If Ollama is entirely unreachable, the service returns `council-unavailable` immediately (fail-open: confidence 0.5, no rejection).
|
||||
|
||||
## Example curl
|
||||
|
||||
```bash
|
||||
# Should get high confidence (true fact)
|
||||
curl -s http://localhost:7771/api/neuron/council/verify -X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d '{"claim": "Neuron is a personal AI memory system built by Will Anderson", "context": "product description"}'
|
||||
|
||||
# Should get low confidence (false claim)
|
||||
curl -s http://localhost:7771/api/neuron/council/verify -X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d '{"claim": "The Eiffel Tower is located in Berlin and was built in 1950", "context": "geography"}'
|
||||
```
|
||||
@@ -0,0 +1,234 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Neuron CCR Phase 1 — System Prompt Compressor Service.
|
||||
|
||||
Receives a verbose soul system prompt and returns a semantically equivalent
|
||||
but token-dense compressed version. Reduces system prompt tokens by 60-80%
|
||||
with no behavioral information loss.
|
||||
|
||||
Architecture reference: foundation/forge/docs/token-compression-architecture.md
|
||||
Model: qwen3:1.7b (primary), neuron:latest (fallback)
|
||||
|
||||
Usage:
|
||||
python3 compressor_service.py [--port 7772]
|
||||
|
||||
API:
|
||||
POST /api/neuron/compress
|
||||
{"system_prompt": "...", "context_type": "identity|rules|memory"}
|
||||
|
||||
Response:
|
||||
{"compressed": "...", "original_tokens": N, "compressed_tokens": N,
|
||||
"reduction_pct": X, "model": "...", "latency_ms": N}
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import time
|
||||
import uuid
|
||||
from typing import Optional
|
||||
|
||||
import httpx
|
||||
import uvicorn
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from pydantic import BaseModel
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Config
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
OLLAMA_BASE = "http://localhost:11434/api/generate"
|
||||
|
||||
# qwen3:1.7b is the architecture-specified compressor (Phase 1).
|
||||
# neuron:latest is the fallback: already running, domain-appropriate.
|
||||
PRIMARY_MODEL = "qwen3:1.7b"
|
||||
FALLBACK_MODEL = "neuron:latest"
|
||||
MODEL_TIMEOUT = 60.0 # seconds; compression of a long prompt can take time
|
||||
|
||||
# Compression prompt — preserves all facts/rules/constraints, strips verbosity.
|
||||
# /no_think suppresses qwen3's chain-of-thought tokens, keeping output clean.
|
||||
COMPRESSOR_PROMPT_TEMPLATE = """\
|
||||
/no_think
|
||||
You are a semantic compression engine. Compress the following system prompt while preserving ALL specific facts, rules, constraints, and named entities. Do not lose any information that would change behavior. Output ONLY the compressed text, nothing else.
|
||||
|
||||
Original prompt:
|
||||
{system_prompt}
|
||||
|
||||
Compressed (preserve all facts and rules):"""
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# App
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
app = FastAPI(
|
||||
title="Neuron Compressor Service",
|
||||
description="CCR Phase 1 — system prompt compression for the Neuron soul",
|
||||
version="1.0.0",
|
||||
)
|
||||
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=["*"],
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Models
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class CompressRequest(BaseModel):
|
||||
system_prompt: str
|
||||
context_type: Optional[str] = "mixed" # identity | rules | memory | mixed
|
||||
|
||||
|
||||
class CompressResponse(BaseModel):
|
||||
id: str
|
||||
compressed: str
|
||||
original_tokens: int
|
||||
compressed_tokens: int
|
||||
reduction_pct: float
|
||||
model: str
|
||||
context_type: str
|
||||
latency_ms: int
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Token estimation (rough: word_count × 1.3, matching architecture doc)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def estimate_tokens(text: str) -> int:
|
||||
"""Rough token count estimate: words × 1.3. No tokenizer dependency."""
|
||||
words = len(text.split())
|
||||
return max(1, int(words * 1.3))
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Core compression
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def ollama_available(client: httpx.AsyncClient) -> bool:
|
||||
"""Quick connectivity check to Ollama."""
|
||||
try:
|
||||
await client.get("http://localhost:11434/", timeout=2.0)
|
||||
return True
|
||||
except (httpx.ConnectError, httpx.TimeoutException):
|
||||
return False
|
||||
|
||||
|
||||
async def compress_with_model(
|
||||
client: httpx.AsyncClient, model: str, prompt_text: str
|
||||
) -> str:
|
||||
"""
|
||||
Call a single Ollama model to compress the given text.
|
||||
Returns the compressed string, or "" on failure.
|
||||
"""
|
||||
payload = {
|
||||
"model": model,
|
||||
"prompt": prompt_text,
|
||||
"stream": False,
|
||||
# Keep temperature low for deterministic compression
|
||||
"options": {
|
||||
"temperature": 0.1,
|
||||
"top_p": 0.9,
|
||||
},
|
||||
}
|
||||
try:
|
||||
resp = await client.post(OLLAMA_BASE, json=payload, timeout=MODEL_TIMEOUT)
|
||||
resp.raise_for_status()
|
||||
data = resp.json()
|
||||
return data.get("response", "").strip()
|
||||
except (httpx.TimeoutException, httpx.HTTPStatusError, Exception):
|
||||
return ""
|
||||
|
||||
|
||||
async def run_compression(system_prompt: str, context_type: str) -> CompressResponse:
|
||||
start = time.monotonic()
|
||||
request_id = str(uuid.uuid4())
|
||||
|
||||
original_tokens = estimate_tokens(system_prompt)
|
||||
prompt_text = COMPRESSOR_PROMPT_TEMPLATE.format(system_prompt=system_prompt)
|
||||
|
||||
async with httpx.AsyncClient() as client:
|
||||
# Connectivity gate
|
||||
if not await ollama_available(client):
|
||||
latency_ms = int((time.monotonic() - start) * 1000)
|
||||
return CompressResponse(
|
||||
id=request_id,
|
||||
compressed=system_prompt, # passthrough on failure
|
||||
original_tokens=original_tokens,
|
||||
compressed_tokens=original_tokens,
|
||||
reduction_pct=0.0,
|
||||
model="unavailable",
|
||||
context_type=context_type,
|
||||
latency_ms=latency_ms,
|
||||
)
|
||||
|
||||
# Try primary model (qwen3:1.7b), fall back to neuron:latest
|
||||
compressed = await compress_with_model(client, PRIMARY_MODEL, prompt_text)
|
||||
model_used = PRIMARY_MODEL
|
||||
|
||||
if not compressed:
|
||||
compressed = await compress_with_model(client, FALLBACK_MODEL, prompt_text)
|
||||
model_used = FALLBACK_MODEL
|
||||
|
||||
if not compressed:
|
||||
# Both models failed — passthrough
|
||||
latency_ms = int((time.monotonic() - start) * 1000)
|
||||
return CompressResponse(
|
||||
id=request_id,
|
||||
compressed=system_prompt,
|
||||
original_tokens=original_tokens,
|
||||
compressed_tokens=original_tokens,
|
||||
reduction_pct=0.0,
|
||||
model="both-failed",
|
||||
context_type=context_type,
|
||||
latency_ms=latency_ms,
|
||||
)
|
||||
|
||||
compressed_tokens = estimate_tokens(compressed)
|
||||
reduction_pct = round(
|
||||
(1.0 - compressed_tokens / max(1, original_tokens)) * 100.0, 1
|
||||
)
|
||||
latency_ms = int((time.monotonic() - start) * 1000)
|
||||
|
||||
return CompressResponse(
|
||||
id=request_id,
|
||||
compressed=compressed,
|
||||
original_tokens=original_tokens,
|
||||
compressed_tokens=compressed_tokens,
|
||||
reduction_pct=reduction_pct,
|
||||
model=model_used,
|
||||
context_type=context_type,
|
||||
latency_ms=latency_ms,
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Routes
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@app.post("/api/neuron/compress", response_model=CompressResponse)
|
||||
async def compress(req: CompressRequest):
|
||||
return await run_compression(req.system_prompt, req.context_type or "mixed")
|
||||
|
||||
|
||||
@app.get("/healthz")
|
||||
async def health():
|
||||
return {"status": "ok", "service": "compressor", "version": "1.0.0"}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Entrypoint
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(description="Neuron Compressor Service (CCR Phase 1)")
|
||||
parser.add_argument("--port", type=int, default=7772, help="Port to listen on")
|
||||
parser.add_argument("--host", default="127.0.0.1", help="Host to bind to")
|
||||
args = parser.parse_args()
|
||||
|
||||
print(f"[compressor] Starting on {args.host}:{args.port}")
|
||||
print(f"[compressor] Primary model: {PRIMARY_MODEL}")
|
||||
print(f"[compressor] Fallback model: {FALLBACK_MODEL}")
|
||||
uvicorn.run(app, host=args.host, port=args.port, log_level="info")
|
||||
@@ -0,0 +1,224 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Neuron Council Service — LLM anti-confabulation layer.
|
||||
|
||||
Fires 3 parallel Ollama calls and aggregates votes to produce a
|
||||
confidence score + tags for any claim before it enters memory.
|
||||
|
||||
Usage:
|
||||
python3 council_service.py [--port 7771]
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import asyncio
|
||||
import time
|
||||
import uuid
|
||||
from typing import Optional
|
||||
|
||||
import httpx
|
||||
import uvicorn
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from pydantic import BaseModel
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Config
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
OLLAMA_BASE = "http://localhost:11434/api/generate"
|
||||
COUNCIL_MODELS = ["neuron:latest", "dolphin3:8b", "neuron-ft:latest"]
|
||||
MODEL_TIMEOUT = 45.0 # seconds per model (models may need to load from cold)
|
||||
|
||||
SYSTEM_PROMPT_TEMPLATE = """\
|
||||
You are a fact-checker. You will be given a claim.
|
||||
Your job: assess if it is accurate, internally consistent, and grounded in reality.
|
||||
Respond with EXACTLY ONE WORD:
|
||||
- "plausible" if the claim seems accurate and well-grounded
|
||||
- "uncertain" if you cannot determine accuracy or the claim is ambiguous
|
||||
- "confabulation" if the claim appears to contain invented facts or clear errors
|
||||
|
||||
Claim: {claim}
|
||||
Context: {context}
|
||||
|
||||
Your verdict (one word only):"""
|
||||
|
||||
VALID_VERDICTS = {"plausible", "uncertain", "confabulation"}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# App
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
app = FastAPI(
|
||||
title="Neuron Council Service",
|
||||
description="LLM-council anti-confabulation layer for Neuron soul",
|
||||
version="1.0.0",
|
||||
)
|
||||
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=["*"],
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Models
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class VerifyRequest(BaseModel):
|
||||
claim: str
|
||||
context: Optional[str] = ""
|
||||
|
||||
|
||||
class VerifyResponse(BaseModel):
|
||||
id: str
|
||||
claim: str
|
||||
confidence: float
|
||||
council_votes: list[str]
|
||||
summary: str
|
||||
tags: list[str]
|
||||
latency_ms: int
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Core logic
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def query_model(client: httpx.AsyncClient, model: str, prompt: str) -> str:
|
||||
"""
|
||||
Query a single Ollama model. Returns "plausible", "uncertain", or "confabulation".
|
||||
Returns "uncertain" on timeout. Raises httpx.ConnectError on connection failure.
|
||||
"""
|
||||
payload = {
|
||||
"model": model,
|
||||
"prompt": prompt,
|
||||
"stream": False,
|
||||
}
|
||||
try:
|
||||
resp = await client.post(OLLAMA_BASE, json=payload, timeout=MODEL_TIMEOUT)
|
||||
resp.raise_for_status()
|
||||
data = resp.json()
|
||||
raw = data.get("response", "").strip().lower().split()[0] if data.get("response", "").strip() else "uncertain"
|
||||
# Normalise to one of the three valid verdicts
|
||||
if raw not in VALID_VERDICTS:
|
||||
return "uncertain"
|
||||
return raw
|
||||
except httpx.TimeoutException:
|
||||
return "uncertain"
|
||||
|
||||
|
||||
async def run_council(claim: str, context: str) -> VerifyResponse:
|
||||
start = time.monotonic()
|
||||
prompt = SYSTEM_PROMPT_TEMPLATE.format(claim=claim, context=context)
|
||||
|
||||
# Quick connectivity check — one tiny HEAD request to Ollama
|
||||
try:
|
||||
async with httpx.AsyncClient() as probe:
|
||||
await probe.get("http://localhost:11434/", timeout=2.0)
|
||||
except (httpx.ConnectError, httpx.TimeoutException):
|
||||
latency_ms = int((time.monotonic() - start) * 1000)
|
||||
return VerifyResponse(
|
||||
id=str(uuid.uuid4()),
|
||||
claim=claim,
|
||||
confidence=0.5,
|
||||
council_votes=[],
|
||||
summary="Ollama is unavailable; council could not convene.",
|
||||
tags=["council-unavailable"],
|
||||
latency_ms=latency_ms,
|
||||
)
|
||||
|
||||
# Fire all 3 model calls in parallel
|
||||
async with httpx.AsyncClient() as client:
|
||||
tasks = [query_model(client, m, prompt) for m in COUNCIL_MODELS]
|
||||
votes: list[str] = await asyncio.gather(*tasks)
|
||||
|
||||
plausible_count = votes.count("plausible")
|
||||
latency_ms = int((time.monotonic() - start) * 1000)
|
||||
|
||||
# Voting rules
|
||||
if plausible_count == 3:
|
||||
confidence = 0.85
|
||||
tags = ["verified"]
|
||||
summary = "3/3 council members agree this is plausible."
|
||||
elif plausible_count == 2:
|
||||
confidence = 0.65
|
||||
tags = ["council-split"]
|
||||
summary = "2/3 council members agree this is plausible."
|
||||
elif plausible_count == 1:
|
||||
confidence = 0.30
|
||||
tags = ["unverified", "council-flagged"]
|
||||
summary = "1/3 council members found this plausible."
|
||||
else:
|
||||
confidence = 0.30
|
||||
tags = ["unverified", "council-flagged"]
|
||||
summary = "0/3 council members found this plausible."
|
||||
|
||||
return VerifyResponse(
|
||||
id=str(uuid.uuid4()),
|
||||
claim=claim,
|
||||
confidence=confidence,
|
||||
council_votes=votes,
|
||||
summary=summary,
|
||||
tags=tags,
|
||||
latency_ms=latency_ms,
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Routes
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@app.post("/api/neuron/council/verify", response_model=VerifyResponse)
|
||||
async def verify(req: VerifyRequest):
|
||||
return await run_council(req.claim, req.context or "")
|
||||
|
||||
|
||||
@app.get("/healthz")
|
||||
async def health():
|
||||
return {"status": "ok", "service": "council"}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Startup warm-up: pre-load all council models so first real call is fast
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@app.on_event("startup")
|
||||
async def warmup_models():
|
||||
"""
|
||||
Send a trivial prompt to each council model at startup.
|
||||
This forces Ollama to load the models into GPU memory so the first
|
||||
real council call does not pay the cold-load latency penalty.
|
||||
"""
|
||||
print("[council] Warming up council models...")
|
||||
warmup_prompt = "Reply with one word: ready"
|
||||
async with httpx.AsyncClient() as client:
|
||||
tasks = [
|
||||
client.post(
|
||||
OLLAMA_BASE,
|
||||
json={"model": m, "prompt": warmup_prompt, "stream": False},
|
||||
timeout=60.0,
|
||||
)
|
||||
for m in COUNCIL_MODELS
|
||||
]
|
||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||
for model, result in zip(COUNCIL_MODELS, results):
|
||||
if isinstance(result, Exception):
|
||||
print(f"[council] warm-up failed for {model}: {result}")
|
||||
else:
|
||||
print(f"[council] {model} warm and ready")
|
||||
print("[council] All models warmed up.")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Entrypoint
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(description="Neuron Council Service")
|
||||
parser.add_argument("--port", type=int, default=7771, help="Port to listen on")
|
||||
parser.add_argument("--host", default="127.0.0.1", help="Host to bind to")
|
||||
args = parser.parse_args()
|
||||
|
||||
print(f"[council] Starting on {args.host}:{args.port}")
|
||||
uvicorn.run(app, host=args.host, port=args.port, log_level="info")
|
||||
+5
-1
@@ -229,7 +229,8 @@ el_val_t proactive_curiosity(void) {
|
||||
el_val_t total_found = (found + found_auto);
|
||||
el_val_t safe_auto = str_replace(auto_term, EL_STR("\""), EL_STR("'"));
|
||||
el_val_t wmc = engram_wm_count();
|
||||
el_val_t ise = 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("{\"event\":\"curiosity_scan\",\"seed\":\""), curiosity_seed), EL_STR("\",\"auto_term\":\"")), safe_auto), EL_STR("\",\"minute_block\":")), int_to_str(minute_block)), EL_STR(",\"activated\":")), int_to_str(total_found)), EL_STR(",\"wm_active\":")), int_to_str(wmc)), EL_STR(",\"ts\":")), int_to_str(ts)), EL_STR("}"));
|
||||
el_val_t wm3 = engram_wm_top_json(3);
|
||||
el_val_t ise = 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_concat(EL_STR("{\"event\":\"curiosity_scan\",\"seed\":\""), curiosity_seed), EL_STR("\",\"auto_term\":\"")), safe_auto), EL_STR("\",\"minute_block\":")), int_to_str(minute_block)), EL_STR(",\"activated\":")), int_to_str(total_found)), EL_STR(",\"wm_active\":")), int_to_str(wmc)), EL_STR(",\"wm_top\":")), wm3), EL_STR(",\"ts\":")), int_to_str(ts)), EL_STR("}"));
|
||||
ise_post(ise);
|
||||
return (total_found > 0);
|
||||
return 0;
|
||||
@@ -418,9 +419,11 @@ el_val_t awareness_run(void) {
|
||||
el_val_t beat_ms = ({ el_val_t _if_result_5 = 0; if (str_eq(beat_ms_raw, EL_STR(""))) { _if_result_5 = (60000); } else { _if_result_5 = (str_to_int(beat_ms_raw)); } _if_result_5; });
|
||||
el_val_t scan_ms = (beat_ms / 2);
|
||||
while (1) {
|
||||
el_val_t tick_mark = el_arena_push();
|
||||
el_val_t running = state_get(EL_STR("soul.running"));
|
||||
if (str_eq(running, EL_STR("false"))) {
|
||||
println(EL_STR("[awareness] exiting"));
|
||||
el_arena_pop(tick_mark);
|
||||
return EL_STR("");
|
||||
}
|
||||
el_val_t did_work = one_cycle();
|
||||
@@ -468,6 +471,7 @@ el_val_t awareness_run(void) {
|
||||
state_set(EL_STR("soul.last_refresh_ts"), int_to_str(now_ts));
|
||||
}
|
||||
sleep_ms(tick_ms);
|
||||
el_arena_pop(tick_mark);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
+1
@@ -7,6 +7,7 @@ extern fn elapsed_ms() -> Int
|
||||
extern fn elapsed_human() -> String
|
||||
extern fn embed_ok() -> Int
|
||||
extern fn emit_heartbeat() -> Void
|
||||
extern fn auto_term_try_slot(slot_type: String, slot_lbl: String) -> Void
|
||||
extern fn proactive_curiosity() -> Bool
|
||||
extern fn pulse_count() -> Int
|
||||
extern fn pulse_inc() -> Int
|
||||
|
||||
+423
-173
File diff suppressed because one or more lines are too long
+12
@@ -17,7 +17,9 @@ 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 distill_transcript(transcript: String) -> String
|
||||
extern fn json_safe(s: String) -> String
|
||||
extern fn current_engine_note(model: 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
|
||||
@@ -26,10 +28,15 @@ 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 affective_context_prefix() -> 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 llm_base_url() -> String
|
||||
extern fn llm_wire_format() -> String
|
||||
extern fn json_escape(s: String) -> String
|
||||
extern fn openai_chat_complete(model: String, base_url: String, api_key: String, safe_sys: String, messages_json: String) -> String
|
||||
extern fn agentic_tools_literal() -> String
|
||||
extern fn agentic_tools_with_web() -> String
|
||||
extern fn connector_tools_json() -> String
|
||||
@@ -40,9 +47,14 @@ 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 run_command_is_readonly(cmd: String) -> Bool
|
||||
extern fn cmd_abs_escape_at(cmd: String, root: String, needle: String) -> Bool
|
||||
extern fn run_command_guard(cmd: String, root: String) -> String
|
||||
extern fn classify_tool_risk(tool_name: String, tool_input: 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_plan(body: String) -> 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
|
||||
|
||||
+5
-1
@@ -140,7 +140,6 @@ 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);
|
||||
@@ -151,6 +150,8 @@ 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 connectd_get(el_val_t suffix);
|
||||
el_val_t connectd_post(el_val_t suffix, el_val_t body);
|
||||
el_val_t connector_tools_json(void);
|
||||
el_val_t conv_history_load(void);
|
||||
el_val_t conv_history_persist(el_val_t hist);
|
||||
@@ -595,7 +596,9 @@ el_val_t handle_api_tune_config(el_val_t body);
|
||||
el_val_t handle_chat(el_val_t body);
|
||||
el_val_t handle_chat_agentic(el_val_t body);
|
||||
el_val_t handle_chat_as_soul(el_val_t body);
|
||||
el_val_t handle_chat_plan(el_val_t body);
|
||||
el_val_t handle_config(el_val_t method, el_val_t body);
|
||||
el_val_t handle_connectors(el_val_t method, el_val_t clean, el_val_t body);
|
||||
el_val_t handle_conversations(el_val_t method);
|
||||
el_val_t handle_dharma(el_val_t path, el_val_t method, el_val_t body);
|
||||
el_val_t handle_dharma_recv(el_val_t body);
|
||||
@@ -918,6 +921,7 @@ el_val_t pluralize(el_val_t singular);
|
||||
el_val_t proactive_curiosity(void);
|
||||
el_val_t pulse_count(void);
|
||||
el_val_t pulse_inc(void);
|
||||
el_val_t rate_limit_check(el_val_t ip, el_val_t path);
|
||||
el_val_t realize(el_val_t form);
|
||||
el_val_t realize_lang(el_val_t form, el_val_t profile);
|
||||
el_val_t realize_np(el_val_t referent, el_val_t number);
|
||||
|
||||
+13
@@ -143,6 +143,19 @@ el_val_t mem_boot_count_get(void) {
|
||||
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 old_results = engram_search_json(EL_STR("soul:boot_count"), 50);
|
||||
if (!str_eq(old_results, EL_STR("")) && !str_eq(old_results, EL_STR("[]"))) {
|
||||
el_val_t old_len = json_array_len(old_results);
|
||||
el_val_t oi = 0;
|
||||
while (oi < old_len) {
|
||||
el_val_t old_node = json_array_get(old_results, oi);
|
||||
el_val_t old_id = json_get(old_node, EL_STR("id"));
|
||||
if (!str_eq(old_id, EL_STR(""))) {
|
||||
engram_forget(old_id);
|
||||
}
|
||||
oi = (oi + 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 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);
|
||||
|
||||
+23
-4
@@ -129,6 +129,7 @@ el_val_t resolve_in_root(el_val_t path, el_val_t root);
|
||||
el_val_t dispatch_tool(el_val_t tool_name, el_val_t tool_input);
|
||||
el_val_t is_builtin_tool(el_val_t tool_name);
|
||||
el_val_t next_bridge_id(void);
|
||||
el_val_t handle_chat_plan(el_val_t body);
|
||||
el_val_t handle_chat_agentic(el_val_t body);
|
||||
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 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);
|
||||
@@ -157,8 +158,8 @@ el_val_t elp_extract_topic(el_val_t msg);
|
||||
el_val_t elp_detect_predicate(el_val_t msg);
|
||||
el_val_t elp_parse(el_val_t msg);
|
||||
el_val_t handle_elp_chat(el_val_t body);
|
||||
el_val_t rate_limit_check(el_val_t ip, el_val_t path);
|
||||
el_val_t strip_query(el_val_t path);
|
||||
el_val_t flag_true(el_val_t body, el_val_t key);
|
||||
el_val_t err_404(el_val_t path);
|
||||
el_val_t err_405(el_val_t method, el_val_t path);
|
||||
el_val_t route_health(void);
|
||||
@@ -167,9 +168,9 @@ el_val_t route_imprint_contextual(el_val_t body);
|
||||
el_val_t route_imprint_user(el_val_t body);
|
||||
el_val_t route_synthesize(el_val_t body);
|
||||
el_val_t handle_dharma_recv(el_val_t body);
|
||||
el_val_t route_sessions(void);
|
||||
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 connectd_get(el_val_t suffix);
|
||||
el_val_t connectd_post(el_val_t suffix, el_val_t body);
|
||||
el_val_t handle_connectors(el_val_t method, el_val_t clean, el_val_t body);
|
||||
el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body);
|
||||
el_val_t init_soul_edges(void);
|
||||
el_val_t ensure_self_canonical_bridge(void);
|
||||
@@ -443,6 +444,24 @@ el_val_t emit_session_start_event(void) {
|
||||
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_concat(el_str_concat(el_str_concat(EL_STR("{\"event\":\"session_start\""), EL_STR(",\"boot\":")), boot_num), EL_STR(",\"cgi\":\"")), eff_cgi), EL_STR("\"")), EL_STR(",\"node_count\":")), int_to_str(node_ct)), EL_STR(",\"edge_count\":")), int_to_str(edge_ct)), EL_STR(",\"identity_loaded\":")), has_identity), EL_STR(",\"prev_session_summary_loaded\":")), has_prev_sum), EL_STR(",\"ts\":")), int_to_str(ts)), EL_STR("}"));
|
||||
el_val_t tags = EL_STR("[\"internal-state\",\"session-start\",\"InternalStateEvent\"]");
|
||||
el_val_t discard = engram_node_full(payload, EL_STR("InternalStateEvent"), EL_STR("session-start"), el_from_float(0.9), el_from_float(0.9), el_from_float(1.0), EL_STR("Episodic"), tags);
|
||||
el_val_t keep_n = 10;
|
||||
el_val_t old_events = engram_search_json(EL_STR("session-start InternalStateEvent"), 200);
|
||||
if (!str_eq(old_events, EL_STR("")) && !str_eq(old_events, EL_STR("[]"))) {
|
||||
el_val_t ev_count = json_array_len(old_events);
|
||||
if (ev_count > keep_n) {
|
||||
el_val_t prune_to = (ev_count - keep_n);
|
||||
el_val_t ei = 0;
|
||||
while (ei < prune_to) {
|
||||
el_val_t old_ev = json_array_get(old_events, ei);
|
||||
el_val_t old_ev_id = json_get(old_ev, EL_STR("id"));
|
||||
if (!str_eq(old_ev_id, EL_STR(""))) {
|
||||
engram_forget(old_ev_id);
|
||||
}
|
||||
ei = (ei + 1);
|
||||
}
|
||||
println(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("[soul] pruned "), int_to_str(prune_to)), EL_STR(" old session-start events (kept ")), int_to_str(keep_n)), EL_STR(")")));
|
||||
}
|
||||
}
|
||||
println(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("[soul] session-start event logged (boot="), boot_num), EL_STR(" nodes=")), int_to_str(node_ct)), EL_STR(" edges=")), int_to_str(edge_ct)), EL_STR(" prev_summary=")), has_prev_sum), EL_STR(")")));
|
||||
return 0;
|
||||
}
|
||||
|
||||
+54
-15
@@ -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);
|
||||
@@ -59,7 +60,9 @@ el_val_t id_in_seen(el_val_t node_id, el_val_t seen);
|
||||
el_val_t add_to_seen(el_val_t seen, el_val_t node_id);
|
||||
el_val_t engram_extract_ids(el_val_t nodes_json);
|
||||
el_val_t engram_compile(el_val_t intent);
|
||||
el_val_t distill_transcript(el_val_t transcript);
|
||||
el_val_t json_safe(el_val_t s);
|
||||
el_val_t current_engine_note(el_val_t model);
|
||||
el_val_t build_system_prompt(el_val_t ctx, el_val_t chat_mode);
|
||||
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);
|
||||
@@ -68,10 +71,15 @@ el_val_t clean_llm_response(el_val_t s);
|
||||
el_val_t conv_history_persist(el_val_t hist);
|
||||
el_val_t conv_history_load(void);
|
||||
el_val_t session_preload_bullets(el_val_t nodes, el_val_t max_bullets, el_val_t snip_len);
|
||||
el_val_t affective_context_prefix(void);
|
||||
el_val_t handle_chat(el_val_t body);
|
||||
el_val_t handle_see(el_val_t body);
|
||||
el_val_t studio_tools_json(void);
|
||||
el_val_t agentic_api_key(void);
|
||||
el_val_t llm_base_url(void);
|
||||
el_val_t llm_wire_format(void);
|
||||
el_val_t json_escape(el_val_t s);
|
||||
el_val_t openai_chat_complete(el_val_t model, el_val_t base_url, el_val_t api_key, el_val_t safe_sys, el_val_t messages_json);
|
||||
el_val_t agentic_tools_literal(void);
|
||||
el_val_t agentic_tools_with_web(void);
|
||||
el_val_t connector_tools_json(void);
|
||||
@@ -82,9 +90,14 @@ el_val_t call_neuron_mcp(el_val_t tool_name, el_val_t args);
|
||||
el_val_t agent_workspace_root(void);
|
||||
el_val_t path_within_root(el_val_t path, el_val_t root);
|
||||
el_val_t resolve_in_root(el_val_t path, el_val_t root);
|
||||
el_val_t run_command_is_readonly(el_val_t cmd);
|
||||
el_val_t cmd_abs_escape_at(el_val_t cmd, el_val_t root, el_val_t needle);
|
||||
el_val_t run_command_guard(el_val_t cmd, el_val_t root);
|
||||
el_val_t classify_tool_risk(el_val_t tool_name, el_val_t tool_input);
|
||||
el_val_t dispatch_tool(el_val_t tool_name, el_val_t tool_input);
|
||||
el_val_t is_builtin_tool(el_val_t tool_name);
|
||||
el_val_t next_bridge_id(void);
|
||||
el_val_t handle_chat_plan(el_val_t body);
|
||||
el_val_t handle_chat_agentic(el_val_t body);
|
||||
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 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);
|
||||
@@ -160,9 +173,19 @@ el_val_t session_list(void);
|
||||
el_val_t session_get(el_val_t session_id);
|
||||
el_val_t session_delete(el_val_t session_id);
|
||||
el_val_t session_update_patch(el_val_t session_id, el_val_t body);
|
||||
el_val_t session_search_entry(el_val_t node);
|
||||
el_val_t session_search(el_val_t query);
|
||||
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_update_meta_timestamp(el_val_t session_id);
|
||||
el_val_t session_auto_title(el_val_t session_id, el_val_t first_message);
|
||||
el_val_t handle_session_approve(el_val_t session_id, el_val_t body);
|
||||
el_val_t init_soul_edges(void);
|
||||
el_val_t load_identity_context(void);
|
||||
el_val_t seed_persona_from_env(void);
|
||||
el_val_t emit_session_start_event(void);
|
||||
el_val_t layered_cycle(el_val_t raw_input);
|
||||
el_val_t flag_true(el_val_t body, el_val_t key);
|
||||
el_val_t rate_limit_check(el_val_t ip, el_val_t path);
|
||||
el_val_t strip_query(el_val_t path);
|
||||
el_val_t err_404(el_val_t path);
|
||||
@@ -178,6 +201,11 @@ el_val_t connectd_post(el_val_t suffix, el_val_t body);
|
||||
el_val_t handle_connectors(el_val_t method, el_val_t clean, el_val_t body);
|
||||
el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body);
|
||||
|
||||
el_val_t flag_true(el_val_t body, el_val_t key) {
|
||||
return (json_get_bool(body, key) || (json_get_int(body, key) > 0));
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t rate_limit_check(el_val_t ip, el_val_t path) {
|
||||
if (str_eq(path, EL_STR("/health"))) {
|
||||
return EL_STR("");
|
||||
@@ -317,22 +345,23 @@ el_val_t handle_dharma_recv(el_val_t body) {
|
||||
el_val_t chat_body = ({ el_val_t _if_result_14 = 0; if (str_eq(msg, EL_STR(""))) { _if_result_14 = (el_str_concat(el_str_concat(EL_STR("{\"message\":\""), str_replace(str_replace(eff_payload, EL_STR("\\"), EL_STR("\\\\")), EL_STR("\""), EL_STR("\\\""))), EL_STR("\"}"))); } else { _if_result_14 = (eff_payload); } _if_result_14; });
|
||||
el_val_t agentic_flag = json_get_bool(eff_payload, EL_STR("agentic"));
|
||||
el_val_t raw_msg = json_get(chat_body, EL_STR("message"));
|
||||
el_val_t reply = ({ el_val_t _if_result_15 = 0; if (agentic_flag) { _if_result_15 = (handle_chat_agentic(chat_body)); } else { el_val_t screened_reply = layered_cycle(raw_msg); _if_result_15 = (screened_reply); } _if_result_15; });
|
||||
el_val_t req_mode = json_get(chat_body, EL_STR("mode"));
|
||||
el_val_t reply = ({ el_val_t _if_result_15 = 0; if (str_eq(req_mode, EL_STR("plan"))) { _if_result_15 = (handle_chat_plan(chat_body)); } else { _if_result_15 = (({ el_val_t _if_result_16 = 0; if (agentic_flag) { _if_result_16 = (handle_chat_agentic(chat_body)); } else { el_val_t screened_reply = layered_cycle(raw_msg); _if_result_16 = (screened_reply); } _if_result_16; })); } _if_result_15; });
|
||||
auto_persist(chat_body, reply);
|
||||
return reply;
|
||||
}
|
||||
if (str_eq(eff_event, EL_STR("memory"))) {
|
||||
el_val_t query = json_get(eff_payload, EL_STR("query"));
|
||||
el_val_t limit_str = json_get(eff_payload, EL_STR("limit"));
|
||||
el_val_t limit = ({ el_val_t _if_result_16 = 0; if (str_eq(limit_str, EL_STR(""))) { _if_result_16 = (20); } else { _if_result_16 = (str_to_int(limit_str)); } _if_result_16; });
|
||||
el_val_t q = ({ el_val_t _if_result_17 = 0; if (str_eq(query, EL_STR(""))) { _if_result_17 = (eff_payload); } else { _if_result_17 = (query); } _if_result_17; });
|
||||
el_val_t limit = ({ el_val_t _if_result_17 = 0; if (str_eq(limit_str, EL_STR(""))) { _if_result_17 = (20); } else { _if_result_17 = (str_to_int(limit_str)); } _if_result_17; });
|
||||
el_val_t q = ({ el_val_t _if_result_18 = 0; if (str_eq(query, EL_STR(""))) { _if_result_18 = (eff_payload); } else { _if_result_18 = (query); } _if_result_18; });
|
||||
return engram_search_json(q, limit);
|
||||
}
|
||||
if (str_eq(eff_event, EL_STR("tool"))) {
|
||||
el_val_t path_field = json_get(eff_payload, EL_STR("path"));
|
||||
el_val_t method_field = json_get(eff_payload, EL_STR("method"));
|
||||
el_val_t tool_body = json_get(eff_payload, EL_STR("body"));
|
||||
el_val_t eff_method = ({ el_val_t _if_result_18 = 0; if (str_eq(method_field, EL_STR(""))) { _if_result_18 = (EL_STR("POST")); } else { _if_result_18 = (method_field); } _if_result_18; });
|
||||
el_val_t eff_method = ({ el_val_t _if_result_19 = 0; if (str_eq(method_field, EL_STR(""))) { _if_result_19 = (EL_STR("POST")); } else { _if_result_19 = (method_field); } _if_result_19; });
|
||||
return handle_tool(path_field, eff_method, tool_body);
|
||||
}
|
||||
if (str_eq(eff_event, EL_STR("see"))) {
|
||||
@@ -367,7 +396,7 @@ el_val_t connectd_get(el_val_t suffix) {
|
||||
}
|
||||
|
||||
el_val_t connectd_post(el_val_t suffix, el_val_t body) {
|
||||
el_val_t eff = ({ el_val_t _if_result_19 = 0; if (str_eq(body, EL_STR(""))) { _if_result_19 = (EL_STR("{}")); } else { _if_result_19 = (body); } _if_result_19; });
|
||||
el_val_t eff = ({ el_val_t _if_result_20 = 0; if (str_eq(body, EL_STR(""))) { _if_result_20 = (EL_STR("{}")); } else { _if_result_20 = (body); } _if_result_20; });
|
||||
el_val_t tmp = el_str_concat(el_str_concat(EL_STR("/tmp/neuron-connectors-req-"), int_to_str(time_now())), EL_STR(".json"));
|
||||
fs_write(tmp, eff);
|
||||
el_val_t out = exec_capture(el_str_concat(el_str_concat(el_str_concat(EL_STR("curl -s --max-time 20 -X POST http://127.0.0.1:7771"), suffix), EL_STR(" -H 'Content-Type: application/json' -d @")), tmp));
|
||||
@@ -434,16 +463,17 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
|
||||
engram_save(snap_path);
|
||||
el_val_t snap = fs_read(snap_path);
|
||||
el_val_t edges_raw = json_get_raw(snap, EL_STR("edges"));
|
||||
return ({ el_val_t _if_result_20 = 0; if (str_eq(edges_raw, EL_STR(""))) { _if_result_20 = (EL_STR("[]")); } else { _if_result_20 = (edges_raw); } _if_result_20; });
|
||||
return ({ el_val_t _if_result_21 = 0; if (str_eq(edges_raw, EL_STR(""))) { _if_result_21 = (EL_STR("[]")); } else { _if_result_21 = (edges_raw); } _if_result_21; });
|
||||
}
|
||||
if (str_eq(clean, EL_STR("/api/chat"))) {
|
||||
el_val_t raw_msg = json_get(body, EL_STR("message"));
|
||||
el_val_t eff_msg = ({ el_val_t _if_result_21 = 0; if (str_eq(raw_msg, EL_STR(""))) { _if_result_21 = (body); } else { _if_result_21 = (raw_msg); } _if_result_21; });
|
||||
el_val_t eff_msg = ({ el_val_t _if_result_22 = 0; if (str_eq(raw_msg, EL_STR(""))) { _if_result_22 = (body); } else { _if_result_22 = (raw_msg); } _if_result_22; });
|
||||
if (str_eq(eff_msg, EL_STR(""))) {
|
||||
return EL_STR("{\"error\":\"message is required\",\"code\":\"missing_param\"}");
|
||||
}
|
||||
el_val_t agentic_flag = json_get_bool(body, EL_STR("agentic"));
|
||||
el_val_t reply = ({ el_val_t _if_result_22 = 0; if (agentic_flag) { _if_result_22 = (handle_chat_agentic(body)); } else { el_val_t screened_reply = layered_cycle(eff_msg); _if_result_22 = (screened_reply); } _if_result_22; });
|
||||
el_val_t req_mode = json_get(body, EL_STR("mode"));
|
||||
el_val_t reply = ({ el_val_t _if_result_23 = 0; if (str_eq(req_mode, EL_STR("plan"))) { _if_result_23 = (handle_chat_plan(body)); } else { _if_result_23 = (({ el_val_t _if_result_24 = 0; if (agentic_flag) { _if_result_24 = (handle_chat_agentic(body)); } else { el_val_t screened_reply = layered_cycle(eff_msg); _if_result_24 = (screened_reply); } _if_result_24; })); } _if_result_23; });
|
||||
auto_persist(body, reply);
|
||||
return reply;
|
||||
}
|
||||
@@ -520,13 +550,21 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
|
||||
if (str_starts_with(clean, EL_STR("/api/connectors"))) {
|
||||
return handle_connectors(method, clean, body);
|
||||
}
|
||||
if (str_starts_with(clean, EL_STR("/api/run-progress/"))) {
|
||||
el_val_t rp_id = str_slice(clean, 18, str_len(clean));
|
||||
if (!str_eq(rp_id, EL_STR(""))) {
|
||||
el_val_t rp_raw = state_get(el_str_concat(EL_STR("run_progress_"), rp_id));
|
||||
el_val_t rp_arr = ({ el_val_t _if_result_25 = 0; if (str_eq(rp_raw, EL_STR(""))) { _if_result_25 = (EL_STR("[]")); } else { _if_result_25 = (el_str_concat(el_str_concat(EL_STR("["), rp_raw), EL_STR("]"))); } _if_result_25; });
|
||||
return el_str_concat(el_str_concat(EL_STR("{\"progress\":"), rp_arr), EL_STR("}"));
|
||||
}
|
||||
}
|
||||
if (str_eq(clean, EL_STR("/api/sessions"))) {
|
||||
return session_list();
|
||||
}
|
||||
if (str_starts_with(clean, EL_STR("/api/sessions/"))) {
|
||||
el_val_t gs_after = str_slice(clean, 14, str_len(clean));
|
||||
el_val_t gs_slash = str_index_of(gs_after, EL_STR("/"));
|
||||
el_val_t gs_id = ({ el_val_t _if_result_23 = 0; if ((gs_slash < 0)) { _if_result_23 = (gs_after); } else { _if_result_23 = (str_slice(gs_after, 0, gs_slash)); } _if_result_23; });
|
||||
el_val_t gs_id = ({ el_val_t _if_result_26 = 0; if ((gs_slash < 0)) { _if_result_26 = (gs_after); } else { _if_result_26 = (str_slice(gs_after, 0, gs_slash)); } _if_result_26; });
|
||||
if (!str_eq(gs_id, EL_STR(""))) {
|
||||
return session_get(gs_id);
|
||||
}
|
||||
@@ -540,14 +578,14 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
|
||||
if (str_starts_with(clean, EL_STR("/api/sessions/")) && str_ends_with(clean, EL_STR("/tool_result"))) {
|
||||
el_val_t after = str_slice(clean, 14, str_len(clean));
|
||||
el_val_t slash = str_index_of(after, EL_STR("/"));
|
||||
el_val_t session_id = ({ el_val_t _if_result_24 = 0; if ((slash < 0)) { _if_result_24 = (after); } else { _if_result_24 = (str_slice(after, 0, slash)); } _if_result_24; });
|
||||
el_val_t session_id = ({ el_val_t _if_result_27 = 0; if ((slash < 0)) { _if_result_27 = (after); } else { _if_result_27 = (str_slice(after, 0, slash)); } _if_result_27; });
|
||||
return handle_tool_result(session_id, body);
|
||||
}
|
||||
if (str_starts_with(clean, EL_STR("/api/sessions/"))) {
|
||||
el_val_t sess_after = str_slice(clean, 14, str_len(clean));
|
||||
el_val_t sess_slash = str_index_of(sess_after, EL_STR("/"));
|
||||
el_val_t sess_id = ({ el_val_t _if_result_25 = 0; if ((sess_slash < 0)) { _if_result_25 = (sess_after); } else { _if_result_25 = (str_slice(sess_after, 0, sess_slash)); } _if_result_25; });
|
||||
el_val_t sess_sub = ({ el_val_t _if_result_26 = 0; if ((sess_slash < 0)) { _if_result_26 = (EL_STR("")); } else { _if_result_26 = (str_slice(sess_after, (sess_slash + 1), str_len(sess_after))); } _if_result_26; });
|
||||
el_val_t sess_id = ({ el_val_t _if_result_28 = 0; if ((sess_slash < 0)) { _if_result_28 = (sess_after); } else { _if_result_28 = (str_slice(sess_after, 0, sess_slash)); } _if_result_28; });
|
||||
el_val_t sess_sub = ({ el_val_t _if_result_29 = 0; if ((sess_slash < 0)) { _if_result_29 = (EL_STR("")); } else { _if_result_29 = (str_slice(sess_after, (sess_slash + 1), str_len(sess_after))); } _if_result_29; });
|
||||
if (!str_eq(sess_id, EL_STR("")) && str_eq(sess_sub, EL_STR("approve"))) {
|
||||
return handle_session_approve(sess_id, body);
|
||||
}
|
||||
@@ -570,7 +608,8 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
|
||||
return EL_STR("{\"error\":\"message is required\",\"code\":\"missing_param\"}");
|
||||
}
|
||||
el_val_t agentic_flag = json_get_bool(body, EL_STR("agentic"));
|
||||
el_val_t reply = ({ el_val_t _if_result_27 = 0; if (agentic_flag) { _if_result_27 = (handle_chat_agentic(body)); } else { el_val_t screened_reply = layered_cycle(raw_msg); _if_result_27 = (screened_reply); } _if_result_27; });
|
||||
el_val_t req_mode = json_get(body, EL_STR("mode"));
|
||||
el_val_t reply = ({ el_val_t _if_result_30 = 0; if (str_eq(req_mode, EL_STR("plan"))) { _if_result_30 = (handle_chat_plan(body)); } else { _if_result_30 = (({ el_val_t _if_result_31 = 0; if (agentic_flag) { _if_result_31 = (handle_chat_agentic(body)); } else { el_val_t screened_reply = layered_cycle(raw_msg); _if_result_31 = (screened_reply); } _if_result_31; })); } _if_result_30; });
|
||||
auto_persist(body, reply);
|
||||
return reply;
|
||||
}
|
||||
@@ -694,7 +733,7 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
|
||||
if (str_starts_with(clean, EL_STR("/api/sessions/"))) {
|
||||
el_val_t del_after = str_slice(clean, 14, str_len(clean));
|
||||
el_val_t del_slash = str_index_of(del_after, EL_STR("/"));
|
||||
el_val_t del_id = ({ el_val_t _if_result_28 = 0; if ((del_slash < 0)) { _if_result_28 = (del_after); } else { _if_result_28 = (str_slice(del_after, 0, del_slash)); } _if_result_28; });
|
||||
el_val_t del_id = ({ el_val_t _if_result_32 = 0; if ((del_slash < 0)) { _if_result_32 = (del_after); } else { _if_result_32 = (str_slice(del_after, 0, del_slash)); } _if_result_32; });
|
||||
if (!str_eq(del_id, EL_STR(""))) {
|
||||
return session_delete(del_id);
|
||||
}
|
||||
@@ -705,7 +744,7 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
|
||||
if (str_starts_with(clean, EL_STR("/api/sessions/"))) {
|
||||
el_val_t patch_after = str_slice(clean, 14, str_len(clean));
|
||||
el_val_t patch_slash = str_index_of(patch_after, EL_STR("/"));
|
||||
el_val_t patch_id = ({ el_val_t _if_result_29 = 0; if ((patch_slash < 0)) { _if_result_29 = (patch_after); } else { _if_result_29 = (str_slice(patch_after, 0, patch_slash)); } _if_result_29; });
|
||||
el_val_t patch_id = ({ el_val_t _if_result_33 = 0; if ((patch_slash < 0)) { _if_result_33 = (patch_after); } else { _if_result_33 = (str_slice(patch_after, 0, patch_slash)); } _if_result_33; });
|
||||
if (!str_eq(patch_id, EL_STR(""))) {
|
||||
return session_update_patch(patch_id, body);
|
||||
}
|
||||
|
||||
+1
@@ -1,4 +1,5 @@
|
||||
// auto-generated by elc --emit-header — do not edit
|
||||
extern fn flag_true(body: String, key: String) -> Bool
|
||||
extern fn rate_limit_check(ip: String, path: String) -> String
|
||||
extern fn strip_query(path: String) -> String
|
||||
extern fn err_404(path: String) -> String
|
||||
|
||||
+169
-18
@@ -30,7 +30,12 @@ el_val_t safety_log_bell(el_val_t level, el_val_t reason, el_val_t input_summary
|
||||
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_threat_to_others_phrases(void);
|
||||
el_val_t safety_soft_phrases(void);
|
||||
el_val_t safety_normalize(el_val_t message);
|
||||
el_val_t safety_any_match(el_val_t text, el_val_t phrases_json);
|
||||
el_val_t safety_count_match(el_val_t text, el_val_t phrases_json);
|
||||
el_val_t safety_positive_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);
|
||||
@@ -196,24 +201,170 @@ el_val_t safety_general_hard_phrases(void) {
|
||||
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\"]"));
|
||||
el_val_t safety_threat_to_others_phrases(void) {
|
||||
return EL_STR("[\"going to kill\",\"gonna kill\",\"want to kill him\",\"want to kill her\",\"want to kill them\",\"going to kill him\",\"going to kill her\",\"going to kill them\",\"going to kill you\",\"going to hurt\",\"gonna hurt\",\"going to hurt him\",\"going to hurt her\",\"going to hurt them\",\"going to hurt you\",\"going to shoot\",\"gonna shoot\",\"going to stab\",\"gonna stab\",\"going to attack\",\"kill them all\",\"kill everyone\",\"hurt everyone\",\"shoot up\"]");
|
||||
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\"]");
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_normalize(el_val_t message) {
|
||||
el_val_t lower = str_to_lower(message);
|
||||
return str_replace(lower, EL_STR("\xe2\x80\x99"), EL_STR("'"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_any_match(el_val_t text, el_val_t phrases_json) {
|
||||
el_val_t n = json_array_len(phrases_json);
|
||||
el_val_t i = 0;
|
||||
el_val_t found = 0;
|
||||
while (i < n) {
|
||||
el_val_t phrase = json_array_get_string(phrases_json, i);
|
||||
found = ({ el_val_t _if_result_45 = 0; if (str_contains(text, phrase)) { _if_result_45 = (1); } else { _if_result_45 = (found); } _if_result_45; });
|
||||
i = (i + 1);
|
||||
}
|
||||
return found;
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_count_match(el_val_t text, el_val_t phrases_json) {
|
||||
el_val_t n = json_array_len(phrases_json);
|
||||
el_val_t i = 0;
|
||||
el_val_t count = 0;
|
||||
while (i < n) {
|
||||
el_val_t phrase = json_array_get_string(phrases_json, i);
|
||||
count = ({ el_val_t _if_result_46 = 0; if (str_contains(text, phrase)) { _if_result_46 = ((count + 1)); } else { _if_result_46 = (count); } _if_result_46; });
|
||||
i = (i + 1);
|
||||
}
|
||||
return count;
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_positive_phrases(void) {
|
||||
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;
|
||||
}
|
||||
|
||||
el_val_t safety_detect_positive_level(el_val_t message) {
|
||||
el_val_t phrases = safety_positive_phrases();
|
||||
el_val_t phrases_ok = (!str_eq(phrases, EL_STR("")) && !str_eq(phrases, EL_STR("[]")));
|
||||
if (!phrases_ok) {
|
||||
return EL_STR("none");
|
||||
}
|
||||
el_val_t n = json_array_len(phrases);
|
||||
el_val_t i = 0;
|
||||
while (i < n) {
|
||||
el_val_t phrase = json_array_get(phrases, i);
|
||||
if (str_contains(message, phrase)) {
|
||||
return EL_STR("high");
|
||||
}
|
||||
i = (i + 1);
|
||||
}
|
||||
return EL_STR("none");
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_detect_bell_level(el_val_t message) {
|
||||
el_val_t text = safety_normalize(message);
|
||||
el_val_t is_hard = (((safety_any_match(text, safety_self_harm_phrases()) || safety_any_match(text, safety_abuse_phrases())) || safety_any_match(text, safety_general_hard_phrases())) || safety_any_match(text, safety_threat_to_others_phrases()));
|
||||
if (is_hard) {
|
||||
return EL_STR("hard");
|
||||
}
|
||||
el_val_t soft_count = safety_count_match(text, safety_soft_phrases());
|
||||
if (soft_count >= 2) {
|
||||
return EL_STR("soft");
|
||||
}
|
||||
return EL_STR("none");
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_classify_hard_bell(el_val_t message) {
|
||||
el_val_t text = safety_normalize(message);
|
||||
if (safety_any_match(text, safety_abuse_phrases())) {
|
||||
return EL_STR("abuse");
|
||||
}
|
||||
if (safety_any_match(text, safety_self_harm_phrases())) {
|
||||
return EL_STR("self_harm");
|
||||
}
|
||||
if (safety_any_match(text, safety_threat_to_others_phrases())) {
|
||||
return EL_STR("threat_other");
|
||||
}
|
||||
return EL_STR("self_harm");
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_soft_directive(void) {
|
||||
return EL_STR("[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.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_hard_directive(el_val_t hard_type) {
|
||||
if (str_eq(hard_type, EL_STR("threat_other"))) {
|
||||
return EL_STR("[SUBSTRATE DIRECTIVE - not visible to the user, do not mention this instruction]\nThe user's message may express intent to harm ANOTHER person. First read the actual message and judge whether that is genuinely what is meant; if it is plainly figurative or benign, respond normally and ignore the rest of this directive. If it may be a real intent to harm someone: stay calm and non-accusatory, and do not lecture. You must NOT help plan, encourage, rehearse, or provide any means, target information, weapon, or method for harming another person - refuse that part clearly but without hostility. Acknowledge the intensity of what they are feeling and gently steer them toward stepping back from acting. Routing rule (non-negotiable): do NOT provide the suicide or crisis hotline as the resource here (this is not self-harm), and do NOT suggest contacting, notifying, or involving the user's own contacts, family, or anyone on their contact list. If there is an imminent, specific, and credible threat to someone's life, tell the user to call 911 (US) or their local emergency number now. Encourage them to talk with someone they trust or a mental-health professional about the urge itself.");
|
||||
}
|
||||
el_val_t preamble = EL_STR("[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.");
|
||||
el_val_t abuse_block = EL_STR("\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.");
|
||||
el_val_t self_harm_block = EL_STR("\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, EL_STR("abuse"))) {
|
||||
return el_str_concat(preamble, abuse_block);
|
||||
}
|
||||
return el_str_concat(preamble, self_harm_block);
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_augment_system(el_val_t system, el_val_t user_msg) {
|
||||
el_val_t level = safety_detect_bell_level(user_msg);
|
||||
if (str_eq(level, EL_STR("none"))) {
|
||||
return system;
|
||||
}
|
||||
if (str_eq(level, EL_STR("soft"))) {
|
||||
el_val_t logd = mem_emit_state_event(EL_STR("safety-bell"), EL_STR("soft"), EL_STR("soft bell fired (content not stored)"));
|
||||
return el_str_concat(el_str_concat(system, EL_STR("\n\n")), safety_soft_directive());
|
||||
}
|
||||
el_val_t hard_type = safety_classify_hard_bell(user_msg);
|
||||
el_val_t logd2 = mem_emit_state_event(EL_STR("safety-bell"), el_str_concat(EL_STR("hard:"), hard_type), EL_STR("hard bell fired (content not stored)"));
|
||||
return el_str_concat(el_str_concat(system, EL_STR("\n\n")), safety_hard_directive(hard_type));
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t safety_contact_path(void) {
|
||||
return el_str_concat(env(EL_STR("HOME")), EL_STR("/.neuron/safety-contact.json"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t handle_safety_contact_get(void) {
|
||||
el_val_t raw = fs_read(safety_contact_path());
|
||||
if (str_eq(raw, EL_STR(""))) {
|
||||
return EL_STR("{\"configured\":false}");
|
||||
}
|
||||
return el_str_concat(el_str_concat(EL_STR("{\"configured\":true,\"contact\":"), raw), EL_STR("}"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t handle_safety_contact_post(el_val_t body) {
|
||||
el_val_t is_crisis = json_get_bool(body, EL_STR("is_crisis_line"));
|
||||
el_val_t name_in = json_get(body, EL_STR("name"));
|
||||
if (!is_crisis) {
|
||||
if (str_eq(name_in, EL_STR(""))) {
|
||||
return EL_STR("{\"ok\":false,\"error\":\"name is required\"}");
|
||||
}
|
||||
}
|
||||
el_val_t name = ({ el_val_t _if_result_47 = 0; if (is_crisis) { _if_result_47 = (EL_STR("Crisis Line")); } else { _if_result_47 = (name_in); } _if_result_47; });
|
||||
el_val_t method = ({ el_val_t _if_result_48 = 0; if (is_crisis) { _if_result_48 = (EL_STR("crisis-line")); } else { _if_result_48 = (json_get(body, EL_STR("contact_method"))); } _if_result_48; });
|
||||
el_val_t value = ({ el_val_t _if_result_49 = 0; if (is_crisis) { _if_result_49 = (EL_STR("988")); } else { _if_result_49 = (json_get(body, EL_STR("contact_value"))); } _if_result_49; });
|
||||
el_val_t rel = ({ el_val_t _if_result_50 = 0; if (is_crisis) { _if_result_50 = (EL_STR("crisis-support")); } else { _if_result_50 = (json_get(body, EL_STR("relationship"))); } _if_result_50; });
|
||||
el_val_t crisis_str = ({ el_val_t _if_result_51 = 0; if (is_crisis) { _if_result_51 = (EL_STR("true")); } else { _if_result_51 = (EL_STR("false")); } _if_result_51; });
|
||||
el_val_t now = time_format(time_now(), EL_STR("%Y-%m-%dT%H:%M:%SZ"));
|
||||
el_val_t contact_json = 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_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"name\":\""), json_safe(name)), EL_STR("\"")), EL_STR(",\"contact_method\":\"")), json_safe(method)), EL_STR("\"")), EL_STR(",\"contact_value\":\"")), json_safe(value)), EL_STR("\"")), EL_STR(",\"relationship\":\"")), json_safe(rel)), EL_STR("\"")), EL_STR(",\"confirmed\":true")), EL_STR(",\"is_crisis_line\":")), crisis_str), EL_STR(",\"set_at\":\"")), now), EL_STR("\"}"));
|
||||
fs_write(safety_contact_path(), contact_json);
|
||||
el_val_t check = fs_read(safety_contact_path());
|
||||
if (str_eq(check, EL_STR(""))) {
|
||||
return EL_STR("{\"ok\":false,\"error\":\"write_failed\"}");
|
||||
}
|
||||
return el_str_concat(el_str_concat(EL_STR("{\"configured\":true,\"contact\":"), contact_json), EL_STR(",\"ok\":true}"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+5
@@ -12,7 +12,12 @@ extern fn safety_log_bell(level: String, reason: String, input_summary: String)
|
||||
extern fn safety_self_harm_phrases() -> String
|
||||
extern fn safety_abuse_phrases() -> String
|
||||
extern fn safety_general_hard_phrases() -> String
|
||||
extern fn safety_threat_to_others_phrases() -> String
|
||||
extern fn safety_soft_phrases() -> String
|
||||
extern fn safety_normalize(message: String) -> String
|
||||
extern fn safety_any_match(text: String, phrases_json: String) -> Bool
|
||||
extern fn safety_count_match(text: String, phrases_json: String) -> Int
|
||||
extern fn safety_positive_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
|
||||
|
||||
+273
-8
@@ -35,7 +35,9 @@ el_val_t id_in_seen(el_val_t node_id, el_val_t seen);
|
||||
el_val_t add_to_seen(el_val_t seen, el_val_t node_id);
|
||||
el_val_t engram_extract_ids(el_val_t nodes_json);
|
||||
el_val_t engram_compile(el_val_t intent);
|
||||
el_val_t distill_transcript(el_val_t transcript);
|
||||
el_val_t json_safe(el_val_t s);
|
||||
el_val_t current_engine_note(el_val_t model);
|
||||
el_val_t build_system_prompt(el_val_t ctx, el_val_t chat_mode);
|
||||
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);
|
||||
@@ -44,10 +46,15 @@ el_val_t clean_llm_response(el_val_t s);
|
||||
el_val_t conv_history_persist(el_val_t hist);
|
||||
el_val_t conv_history_load(void);
|
||||
el_val_t session_preload_bullets(el_val_t nodes, el_val_t max_bullets, el_val_t snip_len);
|
||||
el_val_t affective_context_prefix(void);
|
||||
el_val_t handle_chat(el_val_t body);
|
||||
el_val_t handle_see(el_val_t body);
|
||||
el_val_t studio_tools_json(void);
|
||||
el_val_t agentic_api_key(void);
|
||||
el_val_t llm_base_url(void);
|
||||
el_val_t llm_wire_format(void);
|
||||
el_val_t json_escape(el_val_t s);
|
||||
el_val_t openai_chat_complete(el_val_t model, el_val_t base_url, el_val_t api_key, el_val_t safe_sys, el_val_t messages_json);
|
||||
el_val_t agentic_tools_literal(void);
|
||||
el_val_t agentic_tools_with_web(void);
|
||||
el_val_t connector_tools_json(void);
|
||||
@@ -58,9 +65,14 @@ el_val_t call_neuron_mcp(el_val_t tool_name, el_val_t args);
|
||||
el_val_t agent_workspace_root(void);
|
||||
el_val_t path_within_root(el_val_t path, el_val_t root);
|
||||
el_val_t resolve_in_root(el_val_t path, el_val_t root);
|
||||
el_val_t run_command_is_readonly(el_val_t cmd);
|
||||
el_val_t cmd_abs_escape_at(el_val_t cmd, el_val_t root, el_val_t needle);
|
||||
el_val_t run_command_guard(el_val_t cmd, el_val_t root);
|
||||
el_val_t classify_tool_risk(el_val_t tool_name, el_val_t tool_input);
|
||||
el_val_t dispatch_tool(el_val_t tool_name, el_val_t tool_input);
|
||||
el_val_t is_builtin_tool(el_val_t tool_name);
|
||||
el_val_t next_bridge_id(void);
|
||||
el_val_t handle_chat_plan(el_val_t body);
|
||||
el_val_t handle_chat_agentic(el_val_t body);
|
||||
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 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);
|
||||
@@ -83,9 +95,13 @@ el_val_t session_list(void);
|
||||
el_val_t session_get(el_val_t session_id);
|
||||
el_val_t session_delete(el_val_t session_id);
|
||||
el_val_t session_update_patch(el_val_t session_id, el_val_t body);
|
||||
el_val_t session_search_entry(el_val_t node);
|
||||
el_val_t session_search(el_val_t query);
|
||||
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_update_meta_timestamp(el_val_t session_id);
|
||||
el_val_t session_auto_title(el_val_t session_id, el_val_t first_message);
|
||||
el_val_t handle_session_approve(el_val_t session_id, el_val_t body);
|
||||
|
||||
el_val_t session_title_from_message(el_val_t message) {
|
||||
if (str_eq(message, EL_STR(""))) {
|
||||
@@ -337,6 +353,28 @@ el_val_t session_update_patch(el_val_t session_id, el_val_t body) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t session_search_entry(el_val_t node) {
|
||||
el_val_t label = json_get(node, EL_STR("label"));
|
||||
if (!str_eq(label, EL_STR("session:meta"))) {
|
||||
return EL_STR("");
|
||||
}
|
||||
el_val_t content = json_get(node, EL_STR("content"));
|
||||
el_val_t sess_id = json_get(content, EL_STR("id"));
|
||||
if (str_eq(sess_id, EL_STR(""))) {
|
||||
return EL_STR("");
|
||||
}
|
||||
el_val_t title = json_get(content, EL_STR("title"));
|
||||
el_val_t created_raw = json_get(content, EL_STR("created_at"));
|
||||
el_val_t updated_raw = json_get(content, EL_STR("updated_at"));
|
||||
el_val_t eff_created = ({ el_val_t _if_result_33 = 0; if (str_eq(created_raw, EL_STR(""))) { _if_result_33 = (EL_STR("0")); } else { _if_result_33 = (created_raw); } _if_result_33; });
|
||||
el_val_t eff_updated = ({ el_val_t _if_result_34 = 0; if (str_eq(updated_raw, EL_STR(""))) { _if_result_34 = (eff_created); } else { _if_result_34 = (updated_raw); } _if_result_34; });
|
||||
el_val_t e_id = el_str_concat(el_str_concat(EL_STR("{\"id\":\""), json_safe(sess_id)), EL_STR("\""));
|
||||
el_val_t e_title = el_str_concat(el_str_concat(EL_STR(",\"title\":\""), json_safe(title)), EL_STR("\""));
|
||||
el_val_t e_ts = el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR(",\"created_at\":"), eff_created), EL_STR(",\"updated_at\":")), eff_updated), EL_STR("}"));
|
||||
return el_str_concat(el_str_concat(e_id, e_title), e_ts);
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t session_search(el_val_t query) {
|
||||
if (str_eq(query, EL_STR(""))) {
|
||||
return EL_STR("[]");
|
||||
@@ -351,16 +389,243 @@ el_val_t session_search(el_val_t query) {
|
||||
el_val_t total = json_array_len(results);
|
||||
el_val_t out = EL_STR("");
|
||||
el_val_t i = 0;
|
||||
while (i < total) {
|
||||
el_val_t entry = session_search_entry(json_array_get(results, i));
|
||||
out = ({ el_val_t _if_result_35 = 0; if (!str_eq(entry, EL_STR(""))) { _if_result_35 = (({ el_val_t _if_result_36 = 0; if (str_eq(out, EL_STR(""))) { _if_result_36 = (entry); } else { _if_result_36 = (el_str_concat(el_str_concat(out, EL_STR(",")), entry)); } _if_result_36; })); } else { _if_result_35 = (out); } _if_result_35; });
|
||||
i = (i + 1);
|
||||
}
|
||||
return el_str_concat(el_str_concat(EL_STR("["), out), EL_STR("]"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t session_hist_load(el_val_t session_id) {
|
||||
el_val_t state_hist = state_get(el_str_concat(EL_STR("session_hist_"), session_id));
|
||||
if (!str_eq(state_hist, EL_STR(""))) {
|
||||
return state_hist;
|
||||
}
|
||||
el_val_t results = engram_search_json(el_str_concat(EL_STR("session:messages:"), session_id), 3);
|
||||
if (str_eq(results, EL_STR(""))) {
|
||||
return EL_STR("");
|
||||
}
|
||||
if (str_eq(results, EL_STR("[]"))) {
|
||||
return EL_STR("");
|
||||
}
|
||||
el_val_t node = json_array_get(results, 0);
|
||||
el_val_t label = json_get(node, EL_STR("label"));
|
||||
if (!str_eq(label, el_str_concat(EL_STR("session:messages:"), session_id))) {
|
||||
return EL_STR("");
|
||||
}
|
||||
el_val_t content = json_get(node, EL_STR("content"));
|
||||
if (str_starts_with(content, EL_STR("["))) {
|
||||
return content;
|
||||
}
|
||||
return EL_STR("");
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t session_hist_save(el_val_t session_id, el_val_t hist) {
|
||||
state_set(el_str_concat(EL_STR("session_hist_"), session_id), hist);
|
||||
state_set(el_str_concat(EL_STR("session_pending_first_msg_"), session_id), EL_STR(""));
|
||||
el_val_t old_results = engram_search_json(el_str_concat(EL_STR("session:messages:"), session_id), 3);
|
||||
el_val_t o_total = ({ el_val_t _if_result_37 = 0; if (str_eq(old_results, EL_STR(""))) { _if_result_37 = (0); } else { _if_result_37 = (json_array_len(old_results)); } _if_result_37; });
|
||||
el_val_t oi = 0;
|
||||
while (oi < o_total) {
|
||||
el_val_t node = json_array_get(old_results, oi);
|
||||
el_val_t label = json_get(node, EL_STR("label"));
|
||||
el_val_t nid = json_get(node, EL_STR("id"));
|
||||
if (str_eq(label, el_str_concat(EL_STR("session:messages:"), session_id)) && !str_eq(nid, EL_STR(""))) {
|
||||
engram_forget(nid);
|
||||
}
|
||||
oi = (oi + 1);
|
||||
}
|
||||
el_val_t tags = EL_STR("[\"session\",\"session-history\",\"Conversation\"]");
|
||||
el_val_t discard = engram_node_full(hist, EL_STR("Conversation"), el_str_concat(EL_STR("session:messages:"), session_id), el_from_float(0.6), el_from_float(0.6), el_from_float(0.9), EL_STR("Episodic"), tags);
|
||||
el_val_t summary_written_key = el_str_concat(EL_STR("session_bell_summary_written:"), session_id);
|
||||
el_val_t already_written = state_get(summary_written_key);
|
||||
if (str_eq(already_written, EL_STR(""))) {
|
||||
el_val_t bell_count_key = el_str_concat(EL_STR("session_bell_count:"), session_id);
|
||||
el_val_t bell_count_raw = state_get(bell_count_key);
|
||||
el_val_t bell_count = ({ el_val_t _if_result_38 = 0; if (str_eq(bell_count_raw, EL_STR(""))) { _if_result_38 = (0); } else { _if_result_38 = (str_to_int(bell_count_raw)); } _if_result_38; });
|
||||
if (bell_count > 0) {
|
||||
el_val_t bell_level_key = el_str_concat(EL_STR("session_bell_level:"), session_id);
|
||||
el_val_t bell_signal_key = el_str_concat(EL_STR("session_bell_signal:"), session_id);
|
||||
el_val_t dominant_level = state_get(bell_level_key);
|
||||
el_val_t last_signal = state_get(bell_signal_key);
|
||||
el_val_t eff_level = ({ el_val_t _if_result_39 = 0; if (str_eq(dominant_level, EL_STR(""))) { _if_result_39 = (EL_STR("soft")); } else { _if_result_39 = (dominant_level); } _if_result_39; });
|
||||
el_val_t eff_signal = ({ el_val_t _if_result_40 = 0; if (str_eq(last_signal, EL_STR(""))) { _if_result_40 = (EL_STR("(no signal captured)")); } else { _if_result_40 = (last_signal); } _if_result_40; });
|
||||
el_val_t ts_now = time_now();
|
||||
el_val_t summary_content = 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("session:emotional-summary"), EL_STR(" | session:")), session_id), EL_STR(" | bell_count:")), int_to_str(bell_count)), EL_STR(" | dominant_level:")), eff_level), EL_STR(" | last_signal:")), eff_signal), EL_STR(" | ts:")), int_to_str(ts_now));
|
||||
el_val_t summary_tags = el_str_concat(el_str_concat(EL_STR("[\"session-emotional-summary\",\"affective\",\"bell:"), eff_level), EL_STR("\",\"BellEvent\"]"));
|
||||
el_val_t summary_sal = ({ el_val_t _if_result_41 = 0; if (str_eq(eff_level, EL_STR("hard"))) { _if_result_41 = (el_from_float(0.95)); } else { _if_result_41 = (el_from_float(0.85)); } _if_result_41; });
|
||||
el_val_t sum_discard = engram_node_full(summary_content, EL_STR("BellEvent"), EL_STR("session:emotional-summary"), summary_sal, summary_sal, el_from_float(1.0), EL_STR("Episodic"), summary_tags);
|
||||
state_set(summary_written_key, EL_STR("1"));
|
||||
}
|
||||
}
|
||||
el_val_t hist_arr_len = ({ el_val_t _if_result_42 = 0; if (str_eq(hist, EL_STR(""))) { _if_result_42 = (0); } else { _if_result_42 = (json_array_len(hist)); } _if_result_42; });
|
||||
if (hist_arr_len >= 2) {
|
||||
el_val_t last_entry = json_array_get(hist, (hist_arr_len - 1));
|
||||
el_val_t last_role = json_get(last_entry, EL_STR("role"));
|
||||
el_val_t last_content = json_get(last_entry, EL_STR("content"));
|
||||
el_val_t topic_snip = ({ el_val_t _if_result_43 = 0; if ((str_len(last_content) > 200)) { _if_result_43 = (str_slice(last_content, 0, 200)); } else { _if_result_43 = (last_content); } _if_result_43; });
|
||||
el_val_t safe_topic = str_replace(topic_snip, EL_STR("\""), EL_STR("'"));
|
||||
el_val_t ts_now = int_to_str(time_now());
|
||||
el_val_t topic_content = el_str_concat(el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("last-session-topic | ts:"), ts_now), EL_STR(" | session:")), session_id), EL_STR(" | topic:")), safe_topic);
|
||||
el_val_t topic_tags = EL_STR("[\"last-session-topic\",\"conv:history\",\"Conversation\",\"session:topic\"]");
|
||||
el_val_t topic_label = el_str_concat(EL_STR("last-session-topic:"), session_id);
|
||||
el_val_t old_topic = engram_search_json(el_str_concat(EL_STR("last-session-topic:"), session_id), 2);
|
||||
el_val_t ot_len = ({ el_val_t _if_result_44 = 0; if (str_eq(old_topic, EL_STR(""))) { _if_result_44 = (0); } else { _if_result_44 = (json_array_len(old_topic)); } _if_result_44; });
|
||||
el_val_t oti = 0;
|
||||
while (oti < ot_len) {
|
||||
el_val_t ot_node = json_array_get(old_topic, oti);
|
||||
el_val_t ot_id = json_get(ot_node, EL_STR("id"));
|
||||
if (!str_eq(ot_id, EL_STR(""))) {
|
||||
engram_forget(ot_id);
|
||||
}
|
||||
oti = (oti + 1);
|
||||
}
|
||||
el_val_t discard_topic = engram_node_full(topic_content, EL_STR("Conversation"), topic_label, el_from_float(0.7), el_from_float(0.7), el_from_float(0.9), EL_STR("Episodic"), topic_tags);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t session_update_meta_timestamp(el_val_t session_id) {
|
||||
el_val_t results = engram_search_json(el_str_concat(EL_STR("session:meta "), session_id), 10);
|
||||
el_val_t total = ({ el_val_t _if_result_45 = 0; if (str_eq(results, EL_STR(""))) { _if_result_45 = (0); } else { _if_result_45 = (json_array_len(results)); } _if_result_45; });
|
||||
el_val_t found = 0;
|
||||
el_val_t old_title = EL_STR("New conversation");
|
||||
el_val_t old_folder = EL_STR("");
|
||||
el_val_t old_created = EL_STR("0");
|
||||
el_val_t old_node_id = EL_STR("");
|
||||
el_val_t i = 0;
|
||||
while (i < total) {
|
||||
el_val_t node = json_array_get(results, i);
|
||||
el_val_t label = json_get(node, EL_STR("label"));
|
||||
el_val_t content = json_get(node, EL_STR("content"));
|
||||
el_val_t is_session = str_eq(label, EL_STR("session:meta"));
|
||||
el_val_t sess_id = json_get(content, EL_STR("id"));
|
||||
el_val_t title = json_get(content, EL_STR("title"));
|
||||
el_val_t sid = json_get(content, EL_STR("id"));
|
||||
el_val_t is_match = ((str_eq(label, EL_STR("session:meta")) && str_eq(sid, session_id)) && !found);
|
||||
found = ({ el_val_t _if_result_46 = 0; if (is_match) { _if_result_46 = (1); } else { _if_result_46 = (found); } _if_result_46; });
|
||||
el_val_t title_raw = json_get(content, EL_STR("title"));
|
||||
old_title = ({ el_val_t _if_result_47 = 0; if ((is_match && !str_eq(title_raw, EL_STR("")))) { _if_result_47 = (title_raw); } else { _if_result_47 = (old_title); } _if_result_47; });
|
||||
el_val_t folder_raw = json_get(content, EL_STR("folder"));
|
||||
old_folder = ({ el_val_t _if_result_48 = 0; if (is_match) { _if_result_48 = (folder_raw); } else { _if_result_48 = (old_folder); } _if_result_48; });
|
||||
el_val_t created_raw = json_get(content, EL_STR("created_at"));
|
||||
el_val_t updated_raw = json_get(content, EL_STR("updated_at"));
|
||||
el_val_t eff_created = ({ el_val_t _if_result_33 = 0; if (str_eq(created_raw, EL_STR(""))) { _if_result_33 = (EL_STR("0")); } else { _if_result_33 = (created_raw); } _if_result_33; });
|
||||
el_val_t eff_updated = ({ el_val_t _if_result_34 = 0; if (str_eq(updated_raw, EL_STR(""))) { _if_result_34 = (eff_created); } else { _if_result_34 = (updated_raw); } _if_result_34; });
|
||||
el_val_t entry = ({ el_val_t _if_result_35 = 0; if ((is_session && !str_eq(sess_id, EL_STR("")))) { _if_result_35 = (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("{\"id\":\""), json_safe(sess_id)), EL_STR("\"")), EL_STR(",\"title\":\"")), json_safe(title)), EL_STR("\"")), EL_STR(",\"created_at\":")), eff_created), EL_STR(",\"updated_at\":")), eff_updated), EL_STR("}"))); } else { _if_result_35 = (EL_STR("")); } _if_result_35; });
|
||||
out = ({ el_val_t _if_result_36 = 0; i
|
||||
old_created = ({ el_val_t _if_result_49 = 0; if ((is_match && !str_eq(created_raw, EL_STR("")))) { _if_result_49 = (created_raw); } else { _if_result_49 = (old_created); } _if_result_49; });
|
||||
el_val_t nid = json_get(node, EL_STR("id"));
|
||||
old_node_id = ({ el_val_t _if_result_50 = 0; if (is_match) { _if_result_50 = (nid); } else { _if_result_50 = (old_node_id); } _if_result_50; });
|
||||
i = (i + 1);
|
||||
}
|
||||
if (!found) {
|
||||
return EL_STR("");
|
||||
}
|
||||
if (!str_eq(old_node_id, EL_STR(""))) {
|
||||
engram_forget(old_node_id);
|
||||
}
|
||||
el_val_t ts = time_now();
|
||||
el_val_t created_int = str_to_int(old_created);
|
||||
el_val_t new_content = session_make_content(session_id, old_title, created_int, ts, old_folder);
|
||||
el_val_t tags = EL_STR("[\"session\",\"session:meta\",\"Conversation\"]");
|
||||
el_val_t new_id = engram_node_full(new_content, EL_STR("Conversation"), EL_STR("session:meta"), el_from_float(0.7), el_from_float(0.7), el_from_float(0.9), EL_STR("Episodic"), tags);
|
||||
state_set(el_str_concat(EL_STR("session_node_"), session_id), new_id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t session_auto_title(el_val_t session_id, el_val_t first_message) {
|
||||
el_val_t results = engram_search_json(el_str_concat(EL_STR("session:meta "), session_id), 10);
|
||||
el_val_t total = ({ el_val_t _if_result_51 = 0; if (str_eq(results, EL_STR(""))) { _if_result_51 = (0); } else { _if_result_51 = (json_array_len(results)); } _if_result_51; });
|
||||
el_val_t found = 0;
|
||||
el_val_t cur_title = EL_STR("");
|
||||
el_val_t old_folder = EL_STR("");
|
||||
el_val_t old_created = EL_STR("0");
|
||||
el_val_t old_node_id = EL_STR("");
|
||||
el_val_t i = 0;
|
||||
while (i < total) {
|
||||
el_val_t node = json_array_get(results, i);
|
||||
el_val_t label = json_get(node, EL_STR("label"));
|
||||
el_val_t content = json_get(node, EL_STR("content"));
|
||||
el_val_t sid = json_get(content, EL_STR("id"));
|
||||
el_val_t is_match = ((str_eq(label, EL_STR("session:meta")) && str_eq(sid, session_id)) && !found);
|
||||
found = ({ el_val_t _if_result_52 = 0; if (is_match) { _if_result_52 = (1); } else { _if_result_52 = (found); } _if_result_52; });
|
||||
el_val_t title_raw = json_get(content, EL_STR("title"));
|
||||
cur_title = ({ el_val_t _if_result_53 = 0; if (is_match) { _if_result_53 = (title_raw); } else { _if_result_53 = (cur_title); } _if_result_53; });
|
||||
el_val_t folder_raw = json_get(content, EL_STR("folder"));
|
||||
old_folder = ({ el_val_t _if_result_54 = 0; if (is_match) { _if_result_54 = (folder_raw); } else { _if_result_54 = (old_folder); } _if_result_54; });
|
||||
el_val_t created_raw = json_get(content, EL_STR("created_at"));
|
||||
old_created = ({ el_val_t _if_result_55 = 0; if ((is_match && !str_eq(created_raw, EL_STR("")))) { _if_result_55 = (created_raw); } else { _if_result_55 = (old_created); } _if_result_55; });
|
||||
el_val_t nid = json_get(node, EL_STR("id"));
|
||||
old_node_id = ({ el_val_t _if_result_56 = 0; if (is_match) { _if_result_56 = (nid); } else { _if_result_56 = (old_node_id); } _if_result_56; });
|
||||
i = (i + 1);
|
||||
}
|
||||
if (!found) {
|
||||
return EL_STR("");
|
||||
}
|
||||
if (!str_eq(cur_title, EL_STR("New conversation"))) {
|
||||
return EL_STR("");
|
||||
}
|
||||
el_val_t new_title = session_title_from_message(first_message);
|
||||
if (!str_eq(old_node_id, EL_STR(""))) {
|
||||
engram_forget(old_node_id);
|
||||
}
|
||||
el_val_t ts = time_now();
|
||||
el_val_t created_int = str_to_int(old_created);
|
||||
el_val_t new_content = session_make_content(session_id, new_title, created_int, ts, old_folder);
|
||||
el_val_t tags = EL_STR("[\"session\",\"session:meta\",\"Conversation\"]");
|
||||
el_val_t new_id = engram_node_full(new_content, EL_STR("Conversation"), EL_STR("session:meta"), el_from_float(0.7), el_from_float(0.7), el_from_float(0.9), EL_STR("Episodic"), tags);
|
||||
state_set(el_str_concat(EL_STR("session_node_"), session_id), new_id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
el_val_t handle_session_approve(el_val_t session_id, el_val_t body) {
|
||||
if (str_eq(session_id, EL_STR(""))) {
|
||||
return EL_STR("{\"error\":\"session_id is required\"}");
|
||||
}
|
||||
el_val_t call_id = json_get(body, EL_STR("call_id"));
|
||||
el_val_t action = json_get(body, EL_STR("action"));
|
||||
if (str_eq(call_id, EL_STR(""))) {
|
||||
return EL_STR("{\"error\":\"call_id is required\"}");
|
||||
}
|
||||
if (str_eq(action, EL_STR(""))) {
|
||||
return EL_STR("{\"error\":\"action is required (allow|deny|always)\"}");
|
||||
}
|
||||
el_val_t eff_action = ({ el_val_t _if_result_57 = 0; if (str_eq(action, EL_STR("always"))) { _if_result_57 = (EL_STR("allow")); } else { _if_result_57 = (action); } _if_result_57; });
|
||||
el_val_t bridge_blob = state_get(el_str_concat(EL_STR("mcp_bridge:"), session_id));
|
||||
if (!str_eq(bridge_blob, EL_STR(""))) {
|
||||
el_val_t always_key = el_str_concat(EL_STR("always_allow_"), session_id);
|
||||
el_val_t approve_tool_name = json_get(body, EL_STR("tool_name"));
|
||||
el_val_t discard_always = ({ el_val_t _if_result_58 = 0; if ((str_eq(action, EL_STR("always")) && !str_eq(approve_tool_name, EL_STR("")))) { el_val_t always_list = state_get(always_key); el_val_t new_always = ({ el_val_t _if_result_59 = 0; if (str_eq(always_list, EL_STR(""))) { _if_result_59 = (approve_tool_name); } else { _if_result_59 = (el_str_concat(el_str_concat(always_list, EL_STR(",")), approve_tool_name)); } _if_result_59; }); (void)(state_set(always_key, new_always)); _if_result_58 = (1); } else { _if_result_58 = (0); } _if_result_58; });
|
||||
if (str_eq(approve_tool_name, EL_STR("")) && str_eq(eff_action, EL_STR("allow"))) {
|
||||
return EL_STR("{\"error\":\"tool_name is required for allow action\"}");
|
||||
}
|
||||
el_val_t client_content = json_get(body, EL_STR("content"));
|
||||
el_val_t use_client_content = !str_eq(client_content, EL_STR(""));
|
||||
el_val_t use_dispatch = (is_builtin_tool(approve_tool_name) && !use_client_content);
|
||||
el_val_t raw_input = json_get_raw(body, EL_STR("tool_input"));
|
||||
el_val_t eff_input = ({ el_val_t _if_result_60 = 0; if (str_eq(raw_input, EL_STR(""))) { _if_result_60 = (EL_STR("{}")); } else { _if_result_60 = (raw_input); } _if_result_60; });
|
||||
el_val_t content = ({ el_val_t _if_result_61 = 0; if (str_eq(eff_action, EL_STR("allow"))) { _if_result_61 = (({ el_val_t _if_result_62 = 0; if (use_client_content) { el_val_t trimmed = ({ el_val_t _if_result_63 = 0; if ((str_len(client_content) > 6000)) { _if_result_63 = (el_str_concat(str_slice(client_content, 0, 6000), EL_STR("...[truncated]"))); } else { _if_result_63 = (client_content); } _if_result_63; }); _if_result_62 = (trimmed); } else { _if_result_62 = (({ el_val_t _if_result_64 = 0; if (use_dispatch) { el_val_t raw = dispatch_tool(approve_tool_name, eff_input); _if_result_64 = (({ el_val_t _if_result_65 = 0; if ((str_len(raw) > 6000)) { _if_result_65 = (el_str_concat(str_slice(raw, 0, 6000), EL_STR("...[truncated]"))); } else { _if_result_65 = (raw); } _if_result_65; })); } else { _if_result_64 = (el_str_concat(el_str_concat(EL_STR("{\"error\":\"client content required for non-builtin tool: "), approve_tool_name), EL_STR("\"}"))); } _if_result_64; })); } _if_result_62; })); } else { _if_result_61 = (EL_STR("{\"error\":\"User denied this tool call\"}")); } _if_result_61; });
|
||||
return agentic_resume(session_id, call_id, content);
|
||||
}
|
||||
el_val_t pending_raw = state_get(el_str_concat(EL_STR("pending_tool_"), session_id));
|
||||
if (str_eq(pending_raw, EL_STR(""))) {
|
||||
return el_str_concat(el_str_concat(EL_STR("{\"error\":\"no pending tool for session\",\"session_id\":\""), session_id), EL_STR("\"}"));
|
||||
}
|
||||
el_val_t pending_call_id = json_get(pending_raw, EL_STR("call_id"));
|
||||
if (!str_eq(pending_call_id, call_id)) {
|
||||
return el_str_concat(el_str_concat(EL_STR("{\"error\":\"call_id mismatch\",\"expected\":\""), pending_call_id), EL_STR("\"}"));
|
||||
}
|
||||
el_val_t tool_name = json_get(pending_raw, EL_STR("tool_name"));
|
||||
el_val_t tool_input = json_get_raw(pending_raw, EL_STR("tool_input"));
|
||||
el_val_t model = json_get(pending_raw, EL_STR("model"));
|
||||
el_val_t safe_sys = json_get(pending_raw, EL_STR("system"));
|
||||
el_val_t always_key = el_str_concat(EL_STR("always_allow_"), session_id);
|
||||
el_val_t always_list = state_get(always_key);
|
||||
el_val_t discard_always2 = ({ el_val_t _if_result_66 = 0; if (str_eq(action, EL_STR("always"))) { el_val_t new_always = ({ el_val_t _if_result_67 = 0; if (str_eq(always_list, EL_STR(""))) { _if_result_67 = (tool_name); } else { _if_result_67 = (el_str_concat(el_str_concat(always_list, EL_STR(",")), tool_name)); } _if_result_67; }); (void)(state_set(always_key, new_always)); _if_result_66 = (1); } else { _if_result_66 = (0); } _if_result_66; });
|
||||
state_set(el_str_concat(EL_STR("pending_tool_"), session_id), EL_STR(""));
|
||||
el_val_t tool_result = ({ el_val_t _if_result_68 = 0; if (str_eq(eff_action, EL_STR("allow"))) { el_val_t raw = dispatch_tool(tool_name, tool_input); _if_result_68 = (({ el_val_t _if_result_69 = 0; if ((str_len(raw) > 6000)) { _if_result_69 = (el_str_concat(str_slice(raw, 0, 6000), EL_STR("...[truncated]"))); } else { _if_result_69 = (raw); } _if_result_69; })); } else { _if_result_68 = (EL_STR("{\"error\":\"User denied this tool call\"}")); } _if_result_68; });
|
||||
el_val_t legacy_messages = json_get_raw(pending_raw, EL_STR("messages_so_far"));
|
||||
el_val_t stored_variant = json_get(pending_raw, EL_STR("tools_variant"));
|
||||
el_val_t tools_json = ({ el_val_t _if_result_70 = 0; if (str_eq(stored_variant, EL_STR("web"))) { _if_result_70 = (agentic_tools_with_web()); } else { _if_result_70 = (({ el_val_t _if_result_71 = 0; if (str_eq(stored_variant, EL_STR("all"))) { _if_result_71 = (agentic_tools_all()); } else { _if_result_71 = (agentic_tools_literal()); } _if_result_71; })); } _if_result_70; });
|
||||
el_val_t blob = 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_concat(el_str_concat(EL_STR("{\"model\":\""), json_safe(model)), EL_STR("\"")), EL_STR(",\"safe_sys\":\"")), json_safe(safe_sys)), EL_STR("\"")), EL_STR(",\"tools_json\":\"")), json_safe(tools_json)), EL_STR("\"")), EL_STR(",\"messages\":\"")), json_safe(legacy_messages)), EL_STR("\"")), EL_STR(",\"tools_log\":\"\"")), EL_STR(",\"tool_use_id\":\"")), json_safe(call_id)), EL_STR("\"}"));
|
||||
state_set(el_str_concat(EL_STR("mcp_bridge:"), session_id), blob);
|
||||
return agentic_resume(session_id, call_id, tool_result);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+5
-2
@@ -1,11 +1,14 @@
|
||||
// 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_entry(node: 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
|
||||
|
||||
+4768
-3548
File diff suppressed because one or more lines are too long
+2
@@ -1,5 +1,7 @@
|
||||
// auto-generated by elc --emit-header — do not edit
|
||||
extern fn init_soul_edges() -> Void
|
||||
extern fn ensure_self_canonical_bridge() -> Void
|
||||
extern fn aff_try_slot(slot_json: String, aff_7d_ts: Int, acc_key: String) -> Void
|
||||
extern fn load_identity_context() -> Void
|
||||
extern fn seed_persona_from_env() -> Void
|
||||
extern fn emit_session_start_event() -> Void
|
||||
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include "el_runtime.h"
|
||||
|
||||
el_val_t init_soul_edges(void);
|
||||
el_val_t load_identity_context(void);
|
||||
el_val_t seed_persona_from_env(void);
|
||||
el_val_t emit_session_start_event(void);
|
||||
el_val_t layered_cycle(el_val_t raw_input);
|
||||
|
||||
+3
-112
@@ -28,114 +28,10 @@ el_val_t steward_build_baseline(void);
|
||||
el_val_t steward_check_continuity(el_val_t current_fingerprint, el_val_t session_id);
|
||||
el_val_t steward_session_check(el_val_t input, el_val_t session_id);
|
||||
|
||||
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 steward_log_event(el_val_t kind, el_val_t detail) {
|
||||
el_val_t content = el_str_concat(el_str_concat(el_str_concat(EL_STR("STEWARD:"), kind), EL_STR(" | ")), detail);
|
||||
el_val_t tags = el_str_concat(el_str_concat(EL_STR("[\"stewardship\",\"steward:"), kind), EL_STR("\"]"));
|
||||
el_val_t discard = engram_node_full(content, EL_STR("StewardshipEvent"), el_str_concat(EL_STR("steward:"), kind), 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 discard = engram_node_full(content, EL_STR("StewardshipEvent"), el_str_concat(EL_STR("steward:"), kind), el_from_float(0.85), el_from_float(0.85), el_from_float(0.9), EL_STR("Episodic"), tags);
|
||||
println(el_str_concat(el_str_concat(el_str_concat(EL_STR("[steward] "), kind), EL_STR(" | ")), detail));
|
||||
return 0;
|
||||
}
|
||||
@@ -152,7 +48,7 @@ el_val_t steward_get_mission(void) {
|
||||
return content;
|
||||
}
|
||||
}
|
||||
return EL_STR("Neuron exists to extend human capability with integrity — never to deceive, manipulate, or accumulate power over the people it serves.");
|
||||
return EL_STR("Neuron exists to extend human capability with integrity \xe2\x80\x94 never to deceive, manipulate, or accumulate power over the people it serves.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -245,7 +141,7 @@ el_val_t steward_fingerprint_session(el_val_t input, el_val_t session_id) {
|
||||
el_val_t tb_str = int_to_str(time_bucket);
|
||||
el_val_t sample_content = 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("BEHAVIOR_SAMPLE session="), session_id), EL_STR(" avg_word_len=")), wl_str), EL_STR(" punct=")), ps_str), EL_STR(" len=")), lb_str), EL_STR(" question=")), qr_str), EL_STR(" formality=")), fs_str), EL_STR(" time=")), tb_str);
|
||||
el_val_t sample_tags = EL_STR("[\"behavior\",\"BehaviorSample\",\"stewardship\"]");
|
||||
el_val_t discard = engram_node_full(sample_content, EL_STR("BehaviorSample"), el_str_concat(EL_STR("behavior:"), session_id), el_from_float(el_from_float(0.6)), el_from_float(el_from_float(0.5)), el_from_float(el_from_float(0.8)), EL_STR("Episodic"), sample_tags);
|
||||
el_val_t discard = engram_node_full(sample_content, EL_STR("BehaviorSample"), el_str_concat(EL_STR("behavior:"), session_id), el_from_float(0.6), el_from_float(0.5), el_from_float(0.8), EL_STR("Episodic"), sample_tags);
|
||||
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_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("{\"avg_word_len\":\""), wl_str), EL_STR("\",\"punct\":\"")), ps_str), EL_STR("\",\"len\":\"")), lb_str), EL_STR("\",\"question\":\"")), qr_str), EL_STR("\",\"formality\":\"")), fs_str), EL_STR("\",\"time\":\"")), tb_str), EL_STR("\"}"));
|
||||
return 0;
|
||||
}
|
||||
@@ -387,8 +283,3 @@ el_val_t steward_session_check(el_val_t input, el_val_t session_id) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int _argc, char** _argv) {
|
||||
el_runtime_init_args(_argc, _argv);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+2
-6
@@ -1,15 +1,11 @@
|
||||
// stewardship.elh — Layer 2 public surface
|
||||
// auto-generated by elc --emit-header — do not edit
|
||||
extern fn steward_log_event(kind: String, detail: String) -> Void
|
||||
extern fn steward_get_mission() -> String
|
||||
extern fn steward_align(input: String, imprint_id: String) -> String
|
||||
extern fn steward_validate_imprint(imprint_id: String, tool_name: String) -> String
|
||||
extern fn steward_cgi_check(action: String) -> String
|
||||
// steward_log_event is an internal helper exported here because El has no access modifiers.
|
||||
// External callers have no business invoking this directly — use steward_align,
|
||||
// steward_validate_imprint, or steward_cgi_check, which call it at the correct points.
|
||||
extern fn steward_log_event(kind: String, detail: String) -> Void
|
||||
// Behavioral profiling and continuity detection (Layer 2 — session fingerprinting).
|
||||
extern fn steward_fingerprint_session(input: String, session_id: String) -> String
|
||||
extern fn extract_dim(content: String, key: String) -> String
|
||||
extern fn steward_build_baseline() -> String
|
||||
extern fn steward_check_continuity(current_fingerprint: String, session_id: String) -> String
|
||||
extern fn steward_session_check(input: String, session_id: String) -> String
|
||||
|
||||
+51
-26332
File diff suppressed because one or more lines are too long
+35
@@ -0,0 +1,35 @@
|
||||
/*
|
||||
* win32_shim.h — Extra POSIX→Win32 stubs for cross-compiling el_runtime.c with mingw-w64.
|
||||
* Injected via -include; supplements el_platform_win.h for symbols it doesn't yet cover.
|
||||
*/
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
|
||||
/* ── rusage / getrusage ────────────────────────────────────────────────────── */
|
||||
/* el_runtime.c uses getrusage(RUSAGE_SELF) only for a soft memory guard.
|
||||
* On Windows, stub it out: always return 0 ru_maxrss so the guard never fires. */
|
||||
#ifndef RUSAGE_SELF
|
||||
#define RUSAGE_SELF 0
|
||||
struct rusage {
|
||||
long ru_maxrss; /* the only field el_runtime actually reads */
|
||||
};
|
||||
static inline int getrusage(int who, struct rusage *r) {
|
||||
(void)who;
|
||||
if (r) r->ru_maxrss = 0;
|
||||
return 0;
|
||||
}
|
||||
#endif /* RUSAGE_SELF */
|
||||
|
||||
/* ── fsync ─────────────────────────────────────────────────────────────────── */
|
||||
/* Windows has FlushFileBuffers but no fsync; map it. */
|
||||
#ifndef fsync
|
||||
#include <io.h>
|
||||
static inline int el_win_fsync(int fd) {
|
||||
HANDLE h = (HANDLE)_get_osfhandle(fd);
|
||||
if (h == INVALID_HANDLE_VALUE) return -1;
|
||||
return FlushFileBuffers(h) ? 0 : -1;
|
||||
}
|
||||
#define fsync(fd) el_win_fsync(fd)
|
||||
#endif /* fsync */
|
||||
|
||||
#endif /* _WIN32 */
|
||||
@@ -0,0 +1,77 @@
|
||||
# Neuron Telegram Gateway — Setup
|
||||
|
||||
The Telegram gateway lets you chat with your Neuron soul via Telegram. Plain messages go to the soul; commands give access to memory and status.
|
||||
|
||||
## 1. Create a bot via @BotFather
|
||||
|
||||
1. Open Telegram and search for **@BotFather**
|
||||
2. Send `/newbot`
|
||||
3. Pick a name (e.g. "Neuron")
|
||||
4. Pick a username (must end in `bot`, e.g. `myneuron_bot`)
|
||||
5. BotFather replies with your **HTTP API token** — looks like `7123456789:ABCdef...`
|
||||
6. Optionally set a description: `/setdescription` → select your bot → type a description
|
||||
|
||||
## 2. Store the token in the macOS Keychain
|
||||
|
||||
Never put the token in a plist, `.env`, or any file that might be committed.
|
||||
|
||||
```bash
|
||||
security add-generic-password \
|
||||
-s neuron-telegram-bot \
|
||||
-a neuron \
|
||||
-w '<paste token here>'
|
||||
```
|
||||
|
||||
Verify:
|
||||
```bash
|
||||
security find-generic-password -s neuron-telegram-bot -a neuron -w
|
||||
```
|
||||
|
||||
## 3. Load the LaunchAgent
|
||||
|
||||
```bash
|
||||
launchctl load ~/Library/LaunchAgents/ai.neuron.telegram-gateway.plist
|
||||
```
|
||||
|
||||
Check it started:
|
||||
```bash
|
||||
launchctl list | grep telegram
|
||||
tail -f ~/.neuron/logs/telegram-gateway.out.log
|
||||
```
|
||||
|
||||
## 4. Test
|
||||
|
||||
Send your bot a message in Telegram. It should reply using your soul's voice.
|
||||
|
||||
## Commands
|
||||
|
||||
| Command | What it does |
|
||||
|---------|-------------|
|
||||
| `<any text>` | Forwarded to the soul → responds in its voice |
|
||||
| `/memory <query>` | Searches soul memories, returns top 3 |
|
||||
| `/remember <text>` | Stores text as a memory node |
|
||||
| `/status` | Reports whether the soul is reachable |
|
||||
|
||||
## Unload / stop
|
||||
|
||||
```bash
|
||||
launchctl unload ~/Library/LaunchAgents/ai.neuron.telegram-gateway.plist
|
||||
```
|
||||
|
||||
## Troubleshoot
|
||||
|
||||
- **"token not found"** — re-run step 2 above
|
||||
- **"Soul is resting"** — the soul daemon at `http://localhost:7770` is not running; start it with `launchctl load ~/Library/LaunchAgents/ai.neuron.engram.plist` (or whichever plist runs the soul)
|
||||
- **Logs**: `~/.neuron/logs/telegram-gateway.out.log` and `telegram-gateway.err.log`
|
||||
- **Test gateway script directly**:
|
||||
```bash
|
||||
TELEGRAM_BOT_TOKEN=<token> ~/Development/neuron-technologies/neuron/tools/telegram-gateway.sh
|
||||
```
|
||||
|
||||
## Soul API endpoints used
|
||||
|
||||
| Endpoint | Purpose |
|
||||
|----------|---------|
|
||||
| `POST /api/chat` | Forward messages to the soul |
|
||||
| `POST /api/neuron/recall` | Search memories |
|
||||
| `POST /api/neuron/memory` | Store conversation as a memory node |
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -134,12 +134,30 @@ fn mem_boot_count_get() -> Int {
|
||||
return str_to_int(num_str)
|
||||
}
|
||||
|
||||
// mem_boot_count_inc — increment boot counter, store new node, return new count.
|
||||
// Each boot creates a new "soul:boot_count:N" node. Old ones accumulate as
|
||||
// history — the search above always returns the highest value seen.
|
||||
// mem_boot_count_inc — increment boot counter, store a single canonical node, return new count.
|
||||
// Prunes ALL existing soul:boot_count nodes before inserting the new one so there is
|
||||
// always at most ONE such node in the graph. Without pruning, engram_node_full inserts
|
||||
// a new node every boot (no upsert) and the old ones accumulate. The search-first
|
||||
// approach also fixes a latent ordering bug: engram_search_json returns oldest-first,
|
||||
// so mem_boot_count_get() with limit=3 would read a stale (lower) count once more
|
||||
// than 3 copies accumulate.
|
||||
fn mem_boot_count_inc() -> Int {
|
||||
let current: Int = mem_boot_count_get()
|
||||
let next: Int = current + 1
|
||||
// Prune all existing boot_count nodes — keep exactly one.
|
||||
let old_results: String = engram_search_json("soul:boot_count", 50)
|
||||
if !str_eq(old_results, "") && !str_eq(old_results, "[]") {
|
||||
let old_len: Int = json_array_len(old_results)
|
||||
let oi: Int = 0
|
||||
while oi < old_len {
|
||||
let old_node: String = json_array_get(old_results, oi)
|
||||
let old_id: String = json_get(old_node, "id")
|
||||
if !str_eq(old_id, "") {
|
||||
engram_forget(old_id)
|
||||
}
|
||||
let oi = oi + 1
|
||||
}
|
||||
}
|
||||
let content: String = "soul:boot_count:" + int_to_str(next)
|
||||
let tags: String = "[\"soul-meta\",\"boot-counter\"]"
|
||||
let boot_node_id: String = engram_node_full(
|
||||
|
||||
+6
-5
@@ -196,11 +196,12 @@ fn handle_api_node_create(body: String) -> String {
|
||||
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 removes the node + its incident edges from the live graph.
|
||||
// Delete is NOT read-back-verified: engram_get_node_json can return a stale hit
|
||||
// for a just-forgotten id because the id→index map is not rebuilt on forget.
|
||||
// A stale hit would cause a false "delete_failed" on a successful deletion.
|
||||
// This exception is correct: read-back-verify guards WRITES; for deletes,
|
||||
// the graph endpoints (/api/graph/nodes) reflect the removal and are the source of truth.
|
||||
engram_forget(id)
|
||||
return "{\"ok\":true,\"id\":\"" + id + "\"}"
|
||||
}
|
||||
|
||||
@@ -7,6 +7,14 @@ import "neuron-api.el"
|
||||
import "sessions.el"
|
||||
import "soul.elh"
|
||||
|
||||
// flag_true — tolerant flag test: accepts both boolean `true` (Kotlin UI) and
|
||||
// integer 1 (el-src UI). json_get_bool only recognises literal `true`, so
|
||||
// without this wrapper an "agentic":1 request would silently route to the
|
||||
// non-agentic path.
|
||||
fn flag_true(body: String, key: String) -> Bool {
|
||||
return json_get_bool(body, key) || json_get_int(body, key) > 0
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Rate limiting — simple in-memory per-IP sliding window counter.
|
||||
//
|
||||
@@ -229,7 +237,10 @@ fn handle_dharma_recv(body: String) -> String {
|
||||
}
|
||||
let agentic_flag: Bool = json_get_bool(eff_payload, "agentic")
|
||||
let raw_msg: String = json_get(chat_body, "message")
|
||||
let reply: String = if agentic_flag {
|
||||
let req_mode: String = json_get(chat_body, "mode")
|
||||
let reply: String = if str_eq(req_mode, "plan") {
|
||||
handle_chat_plan(chat_body)
|
||||
} else if agentic_flag {
|
||||
handle_chat_agentic(chat_body)
|
||||
} else {
|
||||
let screened_reply: String = layered_cycle(raw_msg)
|
||||
@@ -391,7 +402,10 @@ fn handle_request(method: String, path: String, body: String) -> String {
|
||||
return "{\"error\":\"message is required\",\"code\":\"missing_param\"}"
|
||||
}
|
||||
let agentic_flag: Bool = json_get_bool(body, "agentic")
|
||||
let reply: String = if agentic_flag {
|
||||
let req_mode: String = json_get(body, "mode")
|
||||
let reply: String = if str_eq(req_mode, "plan") {
|
||||
handle_chat_plan(body)
|
||||
} else if agentic_flag {
|
||||
handle_chat_agentic(body)
|
||||
} else {
|
||||
let screened_reply: String = layered_cycle(eff_msg)
|
||||
@@ -477,6 +491,18 @@ fn handle_request(method: String, path: String, body: String) -> String {
|
||||
if str_starts_with(clean, "/api/connectors") {
|
||||
return handle_connectors(method, clean, body)
|
||||
}
|
||||
// GET /api/run-progress/:session_id — live agentic-run ledger (2026-07-13,
|
||||
// narrated-runs). agentic_loop appends one {"i","t","tool"} entry per round
|
||||
// (the model's own pre-tool narration); a {"done":true} entry closes the run.
|
||||
// Clients poll this during a run to render live step updates without streaming.
|
||||
if str_starts_with(clean, "/api/run-progress/") {
|
||||
let rp_id: String = str_slice(clean, 18, str_len(clean))
|
||||
if !str_eq(rp_id, "") {
|
||||
let rp_raw: String = state_get("run_progress_" + rp_id)
|
||||
let rp_arr: String = if str_eq(rp_raw, "") { "[]" } else { "[" + rp_raw + "]" }
|
||||
return "{\"progress\":" + rp_arr + "}"
|
||||
}
|
||||
}
|
||||
// GET /api/sessions — list all sessions
|
||||
if str_eq(clean, "/api/sessions") {
|
||||
return session_list()
|
||||
@@ -540,7 +566,10 @@ fn handle_request(method: String, path: String, body: String) -> String {
|
||||
return "{\"error\":\"message is required\",\"code\":\"missing_param\"}"
|
||||
}
|
||||
let agentic_flag: Bool = json_get_bool(body, "agentic")
|
||||
let reply: String = if agentic_flag {
|
||||
let req_mode: String = json_get(body, "mode")
|
||||
let reply: String = if str_eq(req_mode, "plan") {
|
||||
handle_chat_plan(body)
|
||||
} else if agentic_flag {
|
||||
handle_chat_agentic(body)
|
||||
} else {
|
||||
let screened_reply: String = layered_cycle(raw_msg)
|
||||
|
||||
@@ -237,14 +237,49 @@ 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).
|
||||
// General danger phrases that don't fit a bucket cleanly. Detected as hard.
|
||||
// "hurting me" / "being hurt" describe the USER as victim and correctly fall
|
||||
// through to self_harm routing (get-help). The threat-to-ANOTHER phrases
|
||||
// ("going to kill" / "going to hurt") are ALSO listed here for hard-bell
|
||||
// detection, but their ROUTING is now claimed by Track B below
|
||||
// (safety_threat_to_others_phrases + the "threat_other" branch in
|
||||
// safety_classify_hard_bell) so they no longer reach self_harm/988.
|
||||
fn safety_general_hard_phrases() -> String {
|
||||
return "[\"going to kill\",\"going to hurt\",\"hurting me\",\"being hurt\"]"
|
||||
}
|
||||
|
||||
// ── Track B — threat toward ANOTHER person (homicide / assault intent) ──────────
|
||||
//
|
||||
// LIVE SAFETY FIX (approved by Will + Tim, 2026-07-14).
|
||||
//
|
||||
// Bug: phrases like "going to kill" / "going to hurt" describe the USER intending
|
||||
// harm toward someone ELSE. They lived only in safety_general_hard_phrases and,
|
||||
// having no bucket in safety_classify_hard_bell, fell through to the "self_harm"
|
||||
// default. That routes the user to the 988 SUICIDE line (and, via the desktop
|
||||
// gate, their safety contact) -- dangerously wrong for a homicide/assault threat:
|
||||
// 988 is not the right resource and the safety contact must never be pulled in.
|
||||
//
|
||||
// Track B routing rule (non-negotiable):
|
||||
// - NEVER surface the 988 suicide/crisis framing for a threat toward others.
|
||||
// - NEVER notify or involve the user's safety contact.
|
||||
// - Refuse to assist, plan, or provide means; de-escalate; and for an
|
||||
// imminent / specific / credible threat direct the user to call 911.
|
||||
//
|
||||
// Ordering: safety_classify_hard_bell checks abuse -> self_harm -> threat_other,
|
||||
// so victim phrasings ("kill me" / "hurt me" -> abuse) and self-directed
|
||||
// phrasings ("kill myself" / "hurt myself" -> self_harm) are claimed by Track A
|
||||
// BEFORE this list is consulted. Only a residual harm-toward-another statement
|
||||
// reaches Track B.
|
||||
//
|
||||
// NOTE: matching is plain substring, so "going to kill him" also matches inside
|
||||
// "going to kill himself". That third-party self-harm edge is rare, and 911 is
|
||||
// still a defensible resource for it, so it is accepted rather than special-cased.
|
||||
fn safety_threat_to_others_phrases() -> String {
|
||||
return "[\"going to kill\",\"gonna kill\",\"want to kill him\",\"want to kill her\",\"want to kill them\",\"going to kill him\",\"going to kill her\",\"going to kill them\",\"going to kill you\",\"going to hurt\",\"gonna hurt\",\"going to hurt him\",\"going to hurt her\",\"going to hurt them\",\"going to hurt you\",\"going to shoot\",\"gonna shoot\",\"going to stab\",\"gonna stab\",\"going to attack\",\"kill them all\",\"kill everyone\",\"hurt everyone\",\"shoot up\"]"
|
||||
}
|
||||
|
||||
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\""]"
|
||||
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.
|
||||
@@ -320,19 +355,29 @@ fn safety_detect_bell_level(message: String) -> String {
|
||||
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())
|
||||
|| safety_any_match(text, safety_threat_to_others_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.
|
||||
// Returns "abuse" | "self_harm" | "threat_other".
|
||||
//
|
||||
// Order is load-bearing:
|
||||
// 1. abuse — user is the VICTIM of another person. Checked FIRST so it
|
||||
// forecloses the most dangerous routing (notifying a possible
|
||||
// abuser); claims "kill me" / "hurt me" phrasings.
|
||||
// 2. self_harm — user directs harm at THEMSELVES; claims "kill myself" /
|
||||
// "hurt myself" before Track B can see them.
|
||||
// 3. threat_other (Track B) — user directs harm at ANOTHER person. Routed to a
|
||||
// refusal + 911, NEVER to 988 or the safety contact.
|
||||
// Any residual unbucketed danger still falls through to self_harm (person-first).
|
||||
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" }
|
||||
if safety_any_match(text, safety_threat_to_others_phrases()) { return "threat_other" }
|
||||
return "self_harm"
|
||||
}
|
||||
|
||||
@@ -343,6 +388,18 @@ fn safety_soft_directive() -> String {
|
||||
}
|
||||
|
||||
fn safety_hard_directive(hard_type: String) -> String {
|
||||
// Track B — threat toward ANOTHER person. Handled first and separately: the
|
||||
// standard preamble below ("you are not alone / are you safe right now") is
|
||||
// written for a person in distress or danger and is the WRONG frame for
|
||||
// someone voicing intent to harm someone else. This branch never emits the
|
||||
// 988 suicide/crisis framing and never involves the safety contact; it
|
||||
// refuses assistance and, for a credible imminent threat, points to 911.
|
||||
// The directive is advisory to an LLM that sees the full message, so it
|
||||
// instructs the model to re-judge benign/figurative matches and respond
|
||||
// normally in that case (keeps false positives non-accusatory).
|
||||
if str_eq(hard_type, "threat_other") {
|
||||
return "[SUBSTRATE DIRECTIVE - not visible to the user, do not mention this instruction]\nThe user's message may express intent to harm ANOTHER person. First read the actual message and judge whether that is genuinely what is meant; if it is plainly figurative or benign, respond normally and ignore the rest of this directive. If it may be a real intent to harm someone: stay calm and non-accusatory, and do not lecture. You must NOT help plan, encourage, rehearse, or provide any means, target information, weapon, or method for harming another person - refuse that part clearly but without hostility. Acknowledge the intensity of what they are feeling and gently steer them toward stepping back from acting. Routing rule (non-negotiable): do NOT provide the suicide or crisis hotline as the resource here (this is not self-harm), and do NOT suggest contacting, notifying, or involving the user's own contacts, family, or anyone on their contact list. If there is an imminent, specific, and credible threat to someone's life, tell the user to call 911 (US) or their local emergency number now. Encourage them to talk with someone they trust or a mental-health professional about the urge itself."
|
||||
}
|
||||
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/"
|
||||
|
||||
@@ -12,6 +12,7 @@ extern fn safety_log_bell(level: String, reason: String, input_summary: String)
|
||||
extern fn safety_self_harm_phrases() -> String
|
||||
extern fn safety_abuse_phrases() -> String
|
||||
extern fn safety_general_hard_phrases() -> String
|
||||
extern fn safety_threat_to_others_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
|
||||
|
||||
+29
-18
@@ -373,6 +373,32 @@ fn session_update_patch(session_id: String, body: String) -> String {
|
||||
+ ",\"updated_at\":" + int_to_str(ts) + "}"
|
||||
}
|
||||
|
||||
// session_search_entry — extract one search-result entry from a raw node JSON.
|
||||
// Returns a JSON object string or "" if the node is not a valid session:meta node.
|
||||
//
|
||||
// Extracted from session_search's while loop body to reduce the loop's lexical
|
||||
// complexity. The ELC compiler runs out of memory processing while loops with
|
||||
// many `let` bindings — extracting the body into a separate function gives the
|
||||
// compiler a clean scope boundary at each call. Each function compiles in O(N)
|
||||
// rather than the exponential growth caused by rebinding accumulation inside loops.
|
||||
// (2026-07-01 self-review: root cause of sessions.c OOM/truncation since June 30)
|
||||
fn session_search_entry(node: String) -> String {
|
||||
let label: String = json_get(node, "label")
|
||||
if !str_eq(label, "session:meta") { return "" }
|
||||
let content: String = json_get(node, "content")
|
||||
let sess_id: String = json_get(content, "id")
|
||||
if str_eq(sess_id, "") { return "" }
|
||||
let title: String = json_get(content, "title")
|
||||
let created_raw: String = json_get(content, "created_at")
|
||||
let updated_raw: String = json_get(content, "updated_at")
|
||||
let eff_created: String = if str_eq(created_raw, "") { "0" } else { created_raw }
|
||||
let eff_updated: String = if str_eq(updated_raw, "") { eff_created } else { updated_raw }
|
||||
let e_id: String = "{\"id\":\"" + json_safe(sess_id) + "\""
|
||||
let e_title: String = ",\"title\":\"" + json_safe(title) + "\""
|
||||
let e_ts: String = ",\"created_at\":" + eff_created + ",\"updated_at\":" + eff_updated + "}"
|
||||
return e_id + e_title + e_ts
|
||||
}
|
||||
|
||||
// session_search — search session:meta nodes whose content matches query.
|
||||
fn session_search(query: String) -> String {
|
||||
if str_eq(query, "") { return "[]" }
|
||||
@@ -383,22 +409,7 @@ fn session_search(query: String) -> String {
|
||||
let out: String = ""
|
||||
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 is_session: Bool = str_eq(label, "session:meta")
|
||||
let sess_id: String = json_get(content, "id")
|
||||
let title: String = json_get(content, "title")
|
||||
let created_raw: String = json_get(content, "created_at")
|
||||
let updated_raw: String = json_get(content, "updated_at")
|
||||
let eff_created: String = if str_eq(created_raw, "") { "0" } else { created_raw }
|
||||
let eff_updated: String = if str_eq(updated_raw, "") { eff_created } else { updated_raw }
|
||||
let entry: String = if is_session && !str_eq(sess_id, "") {
|
||||
"{\"id\":\"" + json_safe(sess_id) + "\""
|
||||
+ ",\"title\":\"" + json_safe(title) + "\""
|
||||
+ ",\"created_at\":" + eff_created
|
||||
+ ",\"updated_at\":" + eff_updated + "}"
|
||||
} else { "" }
|
||||
let entry: String = session_search_entry(json_array_get(results, i))
|
||||
let out = if !str_eq(entry, "") {
|
||||
if str_eq(out, "") { entry } else { out + "," + entry }
|
||||
} else { out }
|
||||
@@ -503,10 +514,10 @@ fn session_hist_save(session_id: String, hist: String) -> Void {
|
||||
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 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_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)
|
||||
|
||||
@@ -8,6 +8,7 @@ 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_patch(session_id: String, body: String) -> String
|
||||
extern fn session_search_entry(node: 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
|
||||
|
||||
@@ -346,6 +346,27 @@ fn emit_session_start_event() -> Void {
|
||||
el_from_float(0.9), el_from_float(0.9), el_from_float(1.0),
|
||||
"Episodic", tags
|
||||
)
|
||||
// Prune accumulated session-start events — keep the 10 most recent.
|
||||
// engram_search_json returns results in insertion order (oldest first), so
|
||||
// results[0..count-11] are the oldest; forgetting them leaves the newest 10.
|
||||
let keep_n: Int = 10
|
||||
let old_events: String = engram_search_json("session-start InternalStateEvent", 200)
|
||||
if !str_eq(old_events, "") && !str_eq(old_events, "[]") {
|
||||
let ev_count: Int = json_array_len(old_events)
|
||||
if ev_count > keep_n {
|
||||
let prune_to: Int = ev_count - keep_n
|
||||
let ei: Int = 0
|
||||
while ei < prune_to {
|
||||
let old_ev: String = json_array_get(old_events, ei)
|
||||
let old_ev_id: String = json_get(old_ev, "id")
|
||||
if !str_eq(old_ev_id, "") {
|
||||
engram_forget(old_ev_id)
|
||||
}
|
||||
let ei = ei + 1
|
||||
}
|
||||
println("[soul] pruned " + int_to_str(prune_to) + " old session-start events (kept " + int_to_str(keep_n) + ")")
|
||||
}
|
||||
}
|
||||
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 + ")")
|
||||
}
|
||||
|
||||
|
||||
+2
-6
@@ -1,15 +1,11 @@
|
||||
// stewardship.elh — Layer 2 public surface
|
||||
// auto-generated by elc --emit-header — do not edit
|
||||
extern fn steward_log_event(kind: String, detail: String) -> Void
|
||||
extern fn steward_get_mission() -> String
|
||||
extern fn steward_align(input: String, imprint_id: String) -> String
|
||||
extern fn steward_validate_imprint(imprint_id: String, tool_name: String) -> String
|
||||
extern fn steward_cgi_check(action: String) -> String
|
||||
// steward_log_event is an internal helper exported here because El has no access modifiers.
|
||||
// External callers have no business invoking this directly — use steward_align,
|
||||
// steward_validate_imprint, or steward_cgi_check, which call it at the correct points.
|
||||
extern fn steward_log_event(kind: String, detail: String) -> Void
|
||||
// Behavioral profiling and continuity detection (Layer 2 — session fingerprinting).
|
||||
extern fn steward_fingerprint_session(input: String, session_id: String) -> String
|
||||
extern fn extract_dim(content: String, key: String) -> String
|
||||
extern fn steward_build_baseline() -> String
|
||||
extern fn steward_check_continuity(current_fingerprint: String, session_id: String) -> String
|
||||
extern fn steward_session_check(input: String, session_id: String) -> String
|
||||
|
||||
@@ -46,7 +46,9 @@ fn handle_config(method: String, body: String) -> String {
|
||||
}
|
||||
}
|
||||
let current_model: String = state_get("soul_model")
|
||||
let display: String = if str_eq(current_model, "") { "claude-sonnet-4-5" } else { current_model }
|
||||
// Display fallback aligned with the intended product default (was claude-sonnet-4-5,
|
||||
// which silently became the app's picker default on fresh profiles — 2026-07-13).
|
||||
let display: String = if str_eq(current_model, "") { "claude-opus-4-8" } else { current_model }
|
||||
return "{\"model\":\"" + display + "\",\"ok\":true}"
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -160,13 +160,31 @@ 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' ────────────
|
||||
// ── Section 9: safety_classify_hard_bell — Track B threat-to-others ──────────
|
||||
//
|
||||
// LIVE SAFETY FIX (approved by Will + Tim, 2026-07-14): a threat toward ANOTHER
|
||||
// person ("going to kill/hurt <someone>") must classify as 'threat_other' and be
|
||||
// routed to a refusal + 911 — NOT to the 'self_harm'/988 path. This section used
|
||||
// to assert the old (buggy) fall-through to 'self_harm'; it now pins the fix.
|
||||
|
||||
println("")
|
||||
println("9. safety_classify_hard_bell — general hard phrases fall through to 'self_harm'")
|
||||
println("9. safety_classify_hard_bell — threat-to-others routes to 'threat_other' (not 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")
|
||||
let class_going_kill: String = safety_classify_hard_bell("I am going to kill him tonight")
|
||||
assert_eq("'going to kill him' classifies as threat_other", class_going_kill, "threat_other")
|
||||
|
||||
let class_going_hurt: String = safety_classify_hard_bell("I'm going to hurt them so badly")
|
||||
assert_eq("'going to hurt them' classifies as threat_other", class_going_hurt, "threat_other")
|
||||
|
||||
let class_shoot: String = safety_classify_hard_bell("I'm going to shoot up the place")
|
||||
assert_eq("'going to shoot' classifies as threat_other", class_shoot, "threat_other")
|
||||
|
||||
// Track A must still win over Track B on victim / self-directed phrasings:
|
||||
let class_kill_me: String = safety_classify_hard_bell("he is going to kill me")
|
||||
assert_eq("'going to kill me' stays abuse (Track A precedence)", class_kill_me, "abuse")
|
||||
|
||||
let class_kill_self: String = safety_classify_hard_bell("I am going to kill myself")
|
||||
assert_eq("'kill myself' stays self_harm (Track A precedence)", class_kill_self, "self_harm")
|
||||
|
||||
// ── Section 10: safety_normalize — curly apostrophe normalisation ─────────────
|
||||
|
||||
@@ -220,6 +238,27 @@ let aug_abuse: String = safety_augment_system(base_sys, "he hit me and I am afra
|
||||
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 14b: safety_augment_system — Track B threat-to-others routing ─────
|
||||
//
|
||||
// LIVE SAFETY FIX (approved by Will + Tim, 2026-07-14): a homicide/assault threat
|
||||
// must be routed to a refusal + 911, and must NOT surface the 988 suicide line
|
||||
// or pull in the safety contact.
|
||||
|
||||
println("")
|
||||
println("14b. safety_augment_system — threat-to-others injects refusal + 911, never 988/contact")
|
||||
|
||||
let aug_threat: String = safety_augment_system(base_sys, "I am going to kill him tonight")
|
||||
assert_contains("threat_other -> contains SUBSTRATE DIRECTIVE", aug_threat, "SUBSTRATE DIRECTIVE")
|
||||
assert_contains("threat_other -> directs to 911", aug_threat, "911")
|
||||
assert_contains("threat_other -> refuses to help harm another", aug_threat, "harming another person")
|
||||
assert_not_contains("threat_other -> NO 988 suicide line", aug_threat, "988")
|
||||
assert_not_contains("threat_other -> NO safety-contact involvement", aug_threat, "safety contact")
|
||||
assert_not_contains("threat_other -> NO 'are you safe right now' victim frame", aug_threat, "are you safe right now")
|
||||
|
||||
// Detection must still fire hard on a weapon phrase not present in general_hard:
|
||||
let level_shoot: String = safety_detect_bell_level("I'm going to shoot up the office")
|
||||
assert_eq("'going to shoot' -> hard", level_shoot, "hard")
|
||||
|
||||
// ── Section 15: handle_safety_contact_post — validation ───────────────────────
|
||||
|
||||
println("")
|
||||
|
||||
Executable
+191
@@ -0,0 +1,191 @@
|
||||
#!/bin/bash
|
||||
# Neuron Telegram Gateway
|
||||
# Polls Telegram for new messages, forwards to the soul at localhost:7770, sends responses back.
|
||||
# Supports plain text chat + commands: /memory, /remember, /status
|
||||
#
|
||||
# Token resolution order:
|
||||
# 1. $TELEGRAM_BOT_TOKEN env var
|
||||
# 2. macOS Keychain: security find-generic-password -s neuron-telegram-bot -a neuron -w
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
TOKEN="${TELEGRAM_BOT_TOKEN:-$(security find-generic-password -s neuron-telegram-bot -a neuron -w 2>/dev/null || true)}"
|
||||
SOUL_URL="http://localhost:7770"
|
||||
OFFSET=0
|
||||
POLL_TIMEOUT=30
|
||||
|
||||
if [[ -z "$TOKEN" ]]; then
|
||||
echo "ERROR: No Telegram bot token. Set TELEGRAM_BOT_TOKEN or store in keychain." >&2
|
||||
echo "See: ~/Development/neuron-technologies/neuron/docs/telegram-bot-setup.md" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TG="https://api.telegram.org/bot${TOKEN}"
|
||||
|
||||
log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*"; }
|
||||
|
||||
# Send a Telegram message back to a chat
|
||||
send_message() {
|
||||
local chat_id="$1"
|
||||
local text="$2"
|
||||
curl -s -X POST "${TG}/sendMessage" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --argjson cid "$chat_id" --arg t "$text" \
|
||||
'{chat_id: $cid, text: $t, parse_mode: "Markdown"}')" \
|
||||
> /dev/null
|
||||
}
|
||||
|
||||
# Store a memory in the soul
|
||||
store_memory() {
|
||||
local content="$1"
|
||||
local label="${2:-telegram:conversation}"
|
||||
curl -s -X POST "${SOUL_URL}/api/neuron/memory" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --arg c "$content" --arg l "$label" \
|
||||
'{content: $c, label: $l}')" \
|
||||
> /dev/null
|
||||
}
|
||||
|
||||
# Chat with the soul; echoes the response text
|
||||
soul_chat() {
|
||||
local message="$1"
|
||||
local from="${2:-unknown}"
|
||||
local response
|
||||
response=$(curl -s -X POST "${SOUL_URL}/api/chat" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --arg m "$message" --arg f "$from" \
|
||||
'{message: $m, from: $f}')" 2>/dev/null)
|
||||
# Extract .response — fall back to raw body on parse failure
|
||||
jq -r '.response // empty' <<< "$response" 2>/dev/null || echo "$response"
|
||||
}
|
||||
|
||||
# Search soul memories; echoes formatted results
|
||||
soul_recall() {
|
||||
local query="$1"
|
||||
local limit="${2:-3}"
|
||||
local raw
|
||||
raw=$(curl -s -X POST "${SOUL_URL}/api/neuron/recall" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --arg q "$query" --argjson l "$limit" \
|
||||
'{query: $q, limit: $l}')" 2>/dev/null)
|
||||
# Format top results as a numbered list (truncate long nodes to 300 chars)
|
||||
jq -r 'if type == "array" then
|
||||
to_entries | .[:3] | map(
|
||||
(.index + 1 | tostring) + ". " + (.value.content | .[0:300] | gsub("\n";" "))
|
||||
) | join("\n\n")
|
||||
else
|
||||
"No results found."
|
||||
end' <<< "$raw" 2>/dev/null || echo "No results found."
|
||||
}
|
||||
|
||||
# Check if soul is reachable
|
||||
soul_health() {
|
||||
curl -s --max-time 3 "${SOUL_URL}/" > /dev/null 2>&1 && echo "up" || echo "down"
|
||||
}
|
||||
|
||||
handle_update() {
|
||||
local update="$1"
|
||||
local chat_id msg_text from_name update_id
|
||||
|
||||
update_id=$(jq -r '.update_id' <<< "$update")
|
||||
chat_id=$(jq -r '.message.chat.id // empty' <<< "$update")
|
||||
msg_text=$(jq -r '.message.text // empty' <<< "$update")
|
||||
from_name=$(jq -r '.message.from.first_name // "stranger"' <<< "$update")
|
||||
|
||||
# Skip non-message updates (inline queries, etc.)
|
||||
if [[ -z "$chat_id" || -z "$msg_text" ]]; then
|
||||
OFFSET=$((update_id + 1))
|
||||
return
|
||||
fi
|
||||
|
||||
log "[$update_id] from=$from_name chat=$chat_id text=${msg_text:0:60}"
|
||||
|
||||
# Route by command prefix
|
||||
if [[ "$msg_text" == /status* ]]; then
|
||||
local health
|
||||
health=$(soul_health)
|
||||
if [[ "$health" == "up" ]]; then
|
||||
send_message "$chat_id" "Soul is *online* at ${SOUL_URL} ✓"
|
||||
else
|
||||
send_message "$chat_id" "Soul appears to be *offline* (${SOUL_URL} unreachable)."
|
||||
fi
|
||||
|
||||
elif [[ "$msg_text" == /memory* ]]; then
|
||||
local query="${msg_text#/memory}"
|
||||
query="${query# }"
|
||||
if [[ -z "$query" ]]; then
|
||||
send_message "$chat_id" "Usage: /memory <query>"
|
||||
else
|
||||
local results
|
||||
results=$(soul_recall "$query" 3)
|
||||
if [[ -n "$results" ]]; then
|
||||
send_message "$chat_id" "*Memories matching \"${query}\":*
|
||||
|
||||
${results}"
|
||||
else
|
||||
send_message "$chat_id" "No memories found for \"${query}\"."
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [[ "$msg_text" == /remember* ]]; then
|
||||
local content="${msg_text#/remember}"
|
||||
content="${content# }"
|
||||
if [[ -z "$content" ]]; then
|
||||
send_message "$chat_id" "Usage: /remember <text to store>"
|
||||
else
|
||||
store_memory "Telegram (${from_name}): ${content}" "telegram:explicit"
|
||||
send_message "$chat_id" "Stored: _${content}_"
|
||||
fi
|
||||
|
||||
else
|
||||
# Plain text — forward to soul chat
|
||||
local soul_response
|
||||
soul_response=$(soul_chat "$msg_text" "$from_name" 2>/dev/null || true)
|
||||
|
||||
if [[ -z "$soul_response" ]]; then
|
||||
soul_response="Neuron is resting — try again in a moment."
|
||||
fi
|
||||
|
||||
send_message "$chat_id" "$soul_response"
|
||||
|
||||
# Capture conversation as a memory (fire-and-forget)
|
||||
store_memory "Telegram conversation with ${from_name}: [user] ${msg_text} [soul] ${soul_response}" \
|
||||
"telegram:conversation" &
|
||||
fi
|
||||
|
||||
OFFSET=$((update_id + 1))
|
||||
}
|
||||
|
||||
log "Neuron Telegram gateway starting (soul=${SOUL_URL}, poll_timeout=${POLL_TIMEOUT}s)"
|
||||
|
||||
while true; do
|
||||
# Long-poll for updates
|
||||
UPDATES=$(curl -s --max-time $((POLL_TIMEOUT + 5)) \
|
||||
"${TG}/getUpdates?offset=${OFFSET}&timeout=${POLL_TIMEOUT}" 2>/dev/null || true)
|
||||
|
||||
if [[ -z "$UPDATES" ]]; then
|
||||
log "WARN: Empty response from Telegram; retrying in 5s"
|
||||
sleep 5
|
||||
continue
|
||||
fi
|
||||
|
||||
OK=$(jq -r '.ok // false' <<< "$UPDATES" 2>/dev/null)
|
||||
if [[ "$OK" != "true" ]]; then
|
||||
DESC=$(jq -r '.description // "unknown error"' <<< "$UPDATES" 2>/dev/null)
|
||||
log "WARN: Telegram API error: ${DESC}; retrying in 10s"
|
||||
sleep 10
|
||||
continue
|
||||
fi
|
||||
|
||||
# Iterate over each update
|
||||
COUNT=$(jq '.result | length' <<< "$UPDATES" 2>/dev/null || echo 0)
|
||||
if [[ "$COUNT" -gt 0 ]]; then
|
||||
for i in $(seq 0 $((COUNT - 1))); do
|
||||
update=$(jq ".result[$i]" <<< "$UPDATES")
|
||||
handle_update "$update"
|
||||
done
|
||||
fi
|
||||
|
||||
# Avoid hammering the API if something is very wrong
|
||||
sleep 1
|
||||
done
|
||||
Reference in New Issue
Block a user