Merge branch 'fix/windows-rusage-guard' (PR #61): UTF-8 guard, engram sync route, native platform backends, UI vessels

Runtime now includes engram_load_merge — soul daemon awareness.el calls
this function during its periodic sync refresh cycle. Binary rebuilt from
server.el (unchanged source) + updated el_runtime.c.

.gitea/workflows/ci-dev.yaml

@@ -22,7 +22,10 @@ jobs:
       - name: Install build dependencies
         run: |
           apt-get update -qq
-          apt-get install -y gcc libcurl4-openssl-dev
+          apt-get install -y gcc libcurl4-openssl-dev apt-transport-https ca-certificates
+          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
 
       # Seed: use the committed linux-amd64 binary as the bootstrap
       - name: Bootstrap from committed linux binary (seed)
@@ -84,13 +87,22 @@ jobs:
           bash tests/html_sanitizer/run.sh
 
       # Native El test suites (elc --test, compile-link-run)
+      # el_runtime.c is precompiled to .o once and reused by all 8 modules.
+      - name: Precompile el_runtime.o
+        run: |
+          set -euo pipefail
+          RUNTIME="$(pwd)/el-compiler/runtime"
+          gcc -O2 -c -I "$RUNTIME" "$RUNTIME/el_runtime.c" \
+            -o /tmp/el_runtime.o
+          echo "el_runtime.o compiled"
+
       - name: Run tests - native (core)
         run: |
           set -euo pipefail
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_core.el > /tmp/el_native_core.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_core.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_core.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_core
           /tmp/el_native_core
 
@@ -100,7 +112,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_text.el > /tmp/el_native_text.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_text.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_text.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_text
           /tmp/el_native_text
 
@@ -110,7 +122,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_string.el > /tmp/el_native_string.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_string.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_string.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_string
           /tmp/el_native_string
 
@@ -120,7 +132,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_math.el > /tmp/el_native_math.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_math.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_math.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_math
           /tmp/el_native_math
 
@@ -130,7 +142,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_state.el > /tmp/el_native_state.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_state.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_state.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_state
           /tmp/el_native_state
 
@@ -140,7 +152,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_time.el > /tmp/el_native_time.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_time.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_time.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_time
           /tmp/el_native_time
 
@@ -150,7 +162,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_json.el > /tmp/el_native_json.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_json.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_json.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_json
           /tmp/el_native_json
 
@@ -160,7 +172,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_env.el > /tmp/el_native_env.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_env.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_env.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_env
           /tmp/el_native_env
 
@@ -170,7 +182,7 @@ jobs:
           ELC="$(pwd)/dist/platform/elc"
           RUNTIME="$(pwd)/el-compiler/runtime"
           "$ELC" --test tests/native/test_fs.el > /tmp/el_native_fs.c
-          gcc -O2 -I "$RUNTIME" /tmp/el_native_fs.c "$RUNTIME/el_runtime.c" \
+          gcc -O2 -I "$RUNTIME" /tmp/el_native_fs.c /tmp/el_runtime.o \
             -lcurl -lssl -lcrypto -lpthread -lm -o /tmp/el_native_fs
           /tmp/el_native_fs
 
@@ -203,9 +215,6 @@ jobs:
           GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
         run: |
           echo "${GCP_SA_KEY}" > /tmp/gcp-key.json
-          apt-get install -y -qq apt-transport-https ca-certificates curl
-          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
           gcloud auth activate-service-account --key-file=/tmp/gcp-key.json
           gcloud config set project neuron-785695
 
@@ -272,8 +281,9 @@ jobs:
           gcloud config set project neuron-785695
           gcloud auth configure-docker us-central1-docker.pkg.dev --quiet
 
-          # Pull existing ci-base:dev (system deps stay cached in the base layer)
-          docker pull "${CI_BASE}:dev" || docker pull "${CI_BASE}:latest"
+          # Pull existing ci-base:dev (or fall back to :latest on first run)
+          BASE_TAG="dev"
+          docker pull "${CI_BASE}:dev" || { docker pull "${CI_BASE}:latest" && BASE_TAG="latest"; }
 
           # Inline Dockerfile — only replaces the El SDK layer
           cat > /tmp/Dockerfile.ci-base-patch << 'EOF'
@@ -288,7 +298,7 @@ jobs:
           EOF
 
           docker build \
-            --build-arg BASE="${CI_BASE}:dev" \
+            --build-arg BASE="${CI_BASE}:${BASE_TAG}" \
             --build-arg BUILDKIT_INLINE_CACHE=1 \
             -f /tmp/Dockerfile.ci-base-patch \
             -t "${CI_BASE}:dev" \

elp/src/elp.elh

@@ -1,7 +1,7 @@
 // auto-generated by elc --emit-header — do not edit
 extern fn sem_get(json: String, key: String) -> String
-extern fn generate_frame(frame: Any) -> String
-extern fn generate_frame_lang(frame: Any, lang_code: String) -> String
-extern fn build_form_from_json(semantic_form_json: String, lang_code: String) -> Any
+extern fn generate_frame(frame: [String]) -> String
+extern fn generate_frame_lang(frame: [String], lang_code: String) -> String
+extern fn build_form_from_json(semantic_form_json: String, lang_code: String) -> [String]
 extern fn generate(semantic_form_json: String) -> String
 extern fn generate_lang(semantic_form_json: String, lang_code: String) -> String

elp/src/grammar.elh

@@ -1,22 +1,22 @@
-// auto-generated by elc --emit-header - do not edit
-extern fn slots_get(slots: Any, key: String) -> String
-extern fn slots_set(slots: Any, key: String, val: String) -> Any
-extern fn make_slots(k0: String, v0: String) -> Any
-extern fn make_slots2(k0: String, v0: String, k1: String, v1: String) -> Any
-extern fn make_slots3(k0: String, v0: String, k1: String, v1: String, k2: String, v2: String) -> Any
-extern fn make_slots4(k0: String, v0: String, k1: String, v1: String, k2: String, v2: String, k3: String, v3: String) -> Any
-extern fn make_slots5(k0: String, v0: String, k1: String, v1: String, k2: String, v2: String, k3: String, v3: String, k4: String, v4: String) -> Any
-extern fn rule_id(rule: Any) -> String
-extern fn rule_lhs(rule: Any) -> String
-extern fn rule_rhs_len(rule: Any) -> Int
-extern fn rule_rhs(rule: Any, idx: Int) -> String
-extern fn make_rule(id: String, lhs: String, r0: String) -> Any
-extern fn make_rule2(id: String, lhs: String, r0: String, r1: String) -> Any
-extern fn make_rule3(id: String, lhs: String, r0: String, r1: String, r2: String) -> Any
-extern fn make_rule4(id: String, lhs: String, r0: String, r1: String, r2: String, r3: String) -> Any
-extern fn build_rules() -> Any
-extern fn get_rules() -> Any
-extern fn find_rule(rule_id_str: String) -> Any
+// auto-generated by elc --emit-header — do not edit
+extern fn slots_get(slots: [String], key: String) -> String
+extern fn slots_set(slots: [String], key: String, val: String) -> [String]
+extern fn make_slots(k0: String, v0: String) -> [String]
+extern fn make_slots2(k0: String, v0: String, k1: String, v1: String) -> [String]
+extern fn make_slots3(k0: String, v0: String, k1: String, v1: String, k2: String, v2: String) -> [String]
+extern fn make_slots4(k0: String, v0: String, k1: String, v1: String, k2: String, v2: String, k3: String, v3: String) -> [String]
+extern fn make_slots5(k0: String, v0: String, k1: String, v1: String, k2: String, v2: String, k3: String, v3: String, k4: String, v4: String) -> [String]
+extern fn rule_id(rule: [String]) -> String
+extern fn rule_lhs(rule: [String]) -> String
+extern fn rule_rhs_len(rule: [String]) -> Int
+extern fn rule_rhs(rule: [String], idx: Int) -> String
+extern fn make_rule(id: String, lhs: String, r0: String) -> [String]
+extern fn make_rule2(id: String, lhs: String, r0: String, r1: String) -> [String]
+extern fn make_rule3(id: String, lhs: String, r0: String, r1: String, r2: String) -> [String]
+extern fn make_rule4(id: String, lhs: String, r0: String, r1: String, r2: String, r3: String) -> [String]
+extern fn build_rules() -> [[String]]
+extern fn get_rules() -> [[String]]
+extern fn find_rule(rule_id_str: String) -> [String]
 extern fn make_leaf(label: String, word: String) -> String
 extern fn make_node1(label: String, child0: String) -> String
 extern fn make_node2(label: String, child0: String, child1: String) -> String
@@ -24,15 +24,15 @@ extern fn make_node3(label: String, child0: String, child1: String, child2: Stri
 extern fn make_node4(label: String, child0: String, child1: String, child2: String, child3: String) -> String
 extern fn nlg_is_ws(c: String) -> Bool
 extern fn skip_ws(s: String, pos: Int) -> Int
-extern fn scan_token(s: String, start: Int) -> Any
+extern fn scan_token(s: String, start: Int) -> [String]
 extern fn render_tree(tree: String) -> String
-extern fn gram_word_order(profile: Any) -> String
-extern fn gram_order_constituents(subj: String, verb: String, obj: String, profile: Any) -> String
-extern fn gram_build_vp(verb: String, aux: String, profile: Any) -> String
-extern fn gram_question_strategy(profile: Any) -> String
+extern fn gram_word_order(profile: [String]) -> String
+extern fn gram_order_constituents(subj: String, verb: String, obj: String, profile: [String]) -> String
+extern fn gram_build_vp(verb: String, aux: String, profile: [String]) -> String
+extern fn gram_question_strategy(profile: [String]) -> String
 extern fn is_pronoun(word: String) -> Bool
-extern fn build_np(referent: String, slots: Any) -> String
+extern fn build_np(referent: String, slots: [String]) -> String
 extern fn build_pp(loc: String) -> String
-extern fn build_vp_body(slots: Any) -> String
-extern fn build_vp_from_slots(slots: Any) -> String
-extern fn generate_tree(rule_id_str: String, slots: Any) -> String
+extern fn build_vp_body(slots: [String]) -> String
+extern fn build_vp_from_slots(slots: [String]) -> String
+extern fn generate_tree(rule_id_str: String, slots: [String]) -> String

elp/src/language-profile.elh

@@ -1,46 +1,46 @@
-// auto-generated by elc --emit-header - do not edit
-extern fn lang_profile(code: String, word_order: String, morph_type: String, has_case: String, has_gender: String, script_dir: String, agreement: String, null_subject: String) -> Any
-extern fn lang_get(profile: Any, key: String) -> String
-extern fn lang_profile_en() -> Any
-extern fn lang_profile_ja() -> Any
-extern fn lang_profile_ar() -> Any
-extern fn lang_profile_zh() -> Any
-extern fn lang_profile_de() -> Any
-extern fn lang_profile_es() -> Any
-extern fn lang_profile_fi() -> Any
-extern fn lang_profile_sw() -> Any
-extern fn lang_profile_hi() -> Any
-extern fn lang_profile_ru() -> Any
-extern fn lang_profile_fr() -> Any
-extern fn lang_profile_la() -> Any
-extern fn lang_profile_he() -> Any
-extern fn lang_profile_sa() -> Any
-extern fn lang_profile_got() -> Any
-extern fn lang_profile_non() -> Any
-extern fn lang_profile_enm() -> Any
-extern fn lang_profile_pi() -> Any
-extern fn lang_profile_grc() -> Any
-extern fn lang_profile_ang() -> Any
-extern fn lang_profile_fro() -> Any
-extern fn lang_profile_goh() -> Any
-extern fn lang_profile_sga() -> Any
-extern fn lang_profile_txb() -> Any
-extern fn lang_profile_peo() -> Any
-extern fn lang_profile_akk() -> Any
-extern fn lang_profile_uga() -> Any
-extern fn lang_profile_egy() -> Any
-extern fn lang_profile_sux() -> Any
-extern fn lang_profile_gez() -> Any
-extern fn lang_profile_cop() -> Any
-extern fn lang_from_code(code: String) -> Any
-extern fn lang_default() -> Any
-extern fn lang_is_isolating(profile: Any) -> Bool
-extern fn lang_is_agglutinative(profile: Any) -> Bool
-extern fn lang_is_fusional(profile: Any) -> Bool
-extern fn lang_is_polysynthetic(profile: Any) -> Bool
-extern fn lang_is_rtl(profile: Any) -> Bool
-extern fn lang_has_null_subject(profile: Any) -> Bool
-extern fn lang_has_case(profile: Any) -> Bool
-extern fn lang_has_gender(profile: Any) -> Bool
-extern fn lang_word_order(profile: Any) -> String
-extern fn lang_code(profile: Any) -> String
+// auto-generated by elc --emit-header — do not edit
+extern fn lang_profile(code: String, word_order: String, morph_type: String, has_case: String, has_gender: String, script_dir: String, agreement: String, null_subject: String) -> [String]
+extern fn lang_get(profile: [String], key: String) -> String
+extern fn lang_profile_en() -> [String]
+extern fn lang_profile_ja() -> [String]
+extern fn lang_profile_ar() -> [String]
+extern fn lang_profile_zh() -> [String]
+extern fn lang_profile_de() -> [String]
+extern fn lang_profile_es() -> [String]
+extern fn lang_profile_fi() -> [String]
+extern fn lang_profile_sw() -> [String]
+extern fn lang_profile_hi() -> [String]
+extern fn lang_profile_ru() -> [String]
+extern fn lang_profile_fr() -> [String]
+extern fn lang_profile_la() -> [String]
+extern fn lang_profile_he() -> [String]
+extern fn lang_profile_sa() -> [String]
+extern fn lang_profile_got() -> [String]
+extern fn lang_profile_non() -> [String]
+extern fn lang_profile_enm() -> [String]
+extern fn lang_profile_pi() -> [String]
+extern fn lang_profile_grc() -> [String]
+extern fn lang_profile_ang() -> [String]
+extern fn lang_profile_fro() -> [String]
+extern fn lang_profile_goh() -> [String]
+extern fn lang_profile_sga() -> [String]
+extern fn lang_profile_txb() -> [String]
+extern fn lang_profile_peo() -> [String]
+extern fn lang_profile_akk() -> [String]
+extern fn lang_profile_uga() -> [String]
+extern fn lang_profile_egy() -> [String]
+extern fn lang_profile_sux() -> [String]
+extern fn lang_profile_gez() -> [String]
+extern fn lang_profile_cop() -> [String]
+extern fn lang_from_code(code: String) -> [String]
+extern fn lang_default() -> [String]
+extern fn lang_is_isolating(profile: [String]) -> Bool
+extern fn lang_is_agglutinative(profile: [String]) -> Bool
+extern fn lang_is_fusional(profile: [String]) -> Bool
+extern fn lang_is_polysynthetic(profile: [String]) -> Bool
+extern fn lang_is_rtl(profile: [String]) -> Bool
+extern fn lang_has_null_subject(profile: [String]) -> Bool
+extern fn lang_has_case(profile: [String]) -> Bool
+extern fn lang_has_gender(profile: [String]) -> Bool
+extern fn lang_word_order(profile: [String]) -> String
+extern fn lang_code(profile: [String]) -> String

elp/src/morphology-akk.el

@@ -56,6 +56,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn akk_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-akk.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn akk_str_ends(s: String, suf: String) -> Bool
 extern fn akk_str_len(s: String) -> Int
 extern fn akk_str_drop_last(s: String, n: Int) -> String

elp/src/morphology-ang.el

@@ -36,6 +36,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn ang_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-ang.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn ang_str_ends(s: String, suf: String) -> Bool
 extern fn ang_str_drop_last(s: String, n: Int) -> String
 extern fn ang_str_last_char(s: String) -> String

elp/src/morphology-ar.el

@@ -21,6 +21,7 @@
 
 // ── String helpers ────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn ar_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-ar.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn ar_str_ends(s: String, suf: String) -> Bool
 extern fn ar_str_len(s: String) -> Int
 extern fn ar_str_drop_last(s: String, n: Int) -> String

elp/src/morphology-cop.el

@@ -54,6 +54,7 @@
 
 // ── String helpers ──────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn cop_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-cop.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn cop_str_ends(s: String, suf: String) -> Bool
 extern fn cop_str_len(s: String) -> Int
 extern fn cop_drop(s: String, n: Int) -> String

elp/src/morphology-de.el

@@ -26,6 +26,7 @@
 //  Dat:    dem     der     dem     den
 //  Gen:    des     der     des     der
 
+import "morphology.el"
 fn de_article_def(gender: String, gram_case: String, number: String) -> String {
     if str_eq(number, "pl") {
         if str_eq(gram_case, "nom") { return "die" }

elp/src/morphology-de.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn de_article_def(gender: String, gram_case: String, number: String) -> String
 extern fn de_article_indef(gender: String, gram_case: String, number: String) -> String
 extern fn de_article(gender: String, gram_case: String, number: String, definite: String) -> String

elp/src/morphology-egy.el

@@ -52,6 +52,7 @@
 
 // ── String helpers ──────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn egy_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-egy.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn egy_str_ends(s: String, suf: String) -> Bool
 extern fn egy_str_len(s: String) -> Int
 extern fn egy_drop(s: String, n: Int) -> String

elp/src/morphology-enm.el

@@ -31,6 +31,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn enm_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-enm.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn enm_str_ends(s: String, suf: String) -> Bool
 extern fn enm_drop(s: String, n: Int) -> String
 extern fn enm_first_char(s: String) -> String

elp/src/morphology-es.el

@@ -12,6 +12,7 @@
 
 // ── String helpers (local, matching morphology.el conventions) ────────────────
 
+import "morphology.el"
 fn es_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-es.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn es_str_ends(s: String, suf: String) -> Bool
 extern fn es_str_drop_last(s: String, n: Int) -> String
 extern fn es_str_last_char(s: String) -> String

elp/src/morphology-fi.el

@@ -25,6 +25,7 @@
 // If only neutral vowels are found, default to "front" (the conservative choice
 // for borrowed words and those without clear back vowels).
 
+import "morphology.el"
 fn fi_harmony(word: String) -> String {
     let n: Int = str_len(word)
     let i: Int = n - 1

elp/src/morphology-fi.elh

@@ -1,11 +1,11 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn fi_harmony(word: String) -> String
 extern fn fi_suffix(base: String, harmony: String) -> String
 extern fn fi_noun_case(stem: String, gram_case: String, number: String, harmony: String) -> String
 extern fn fi_str_last_char(s: String) -> String
 extern fn fi_apply_case(noun: String, gram_case: String, number: String) -> String
 extern fn fi_verb_stem(dict_form: String) -> String
-extern fn fi_irregular_verb(dict_form: String) -> Any
+extern fn fi_irregular_verb(dict_form: String) -> [String]
 extern fn fi_present_ending(stem: String, person: String, number: String, harmony: String) -> String
 extern fn fi_past_stem(stem: String) -> String
 extern fn fi_past_ending(stem: String, person: String, number: String, harmony: String) -> String
@@ -14,4 +14,4 @@ extern fn fi_negative(verb: String, person: String, number: String) -> String
 extern fn fi_conjugate(verb: String, tense: String, person: String, number: String) -> String
 extern fn fi_question_suffix(harmony: String) -> String
 extern fn fi_make_question(verb_form: String, harmony: String) -> String
-extern fn fi_full_paradigm(noun: String) -> Any
+extern fn fi_full_paradigm(noun: String) -> [String]

elp/src/morphology-fr.el

@@ -19,6 +19,7 @@
 
 // ── String helpers (local, matching morphology.el conventions) ────────────────
 
+import "morphology.el"
 fn fr_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-fr.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn fr_str_ends(s: String, suf: String) -> Bool
 extern fn fr_str_drop_last(s: String, n: Int) -> String
 extern fn fr_str_last_char(s: String) -> String

elp/src/morphology-fro.el

@@ -53,6 +53,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn fro_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-fro.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn fro_str_ends(s: String, suf: String) -> Bool
 extern fn fro_drop(s: String, n: Int) -> String
 extern fn fro_slot(person: String, number: String) -> Int

elp/src/morphology-gez.el

@@ -64,6 +64,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn gez_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-gez.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn gez_str_ends(s: String, suf: String) -> Bool
 extern fn gez_str_len(s: String) -> Int
 extern fn gez_str_drop_last(s: String, n: Int) -> String

elp/src/morphology-goh.el

@@ -48,6 +48,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn goh_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-goh.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn goh_str_ends(s: String, suf: String) -> Bool
 extern fn goh_drop(s: String, n: Int) -> String
 extern fn goh_slot(person: String, number: String) -> Int

elp/src/morphology-got.el

@@ -49,6 +49,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn got_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-got.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn got_str_ends(s: String, suf: String) -> Bool
 extern fn got_str_drop_last(s: String, n: Int) -> String
 extern fn got_slot(person: String, number: String) -> Int

elp/src/morphology-grc.el

@@ -31,6 +31,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn grc_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-grc.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn grc_str_ends(s: String, suf: String) -> Bool
 extern fn grc_str_drop_last(s: String, n: Int) -> String
 extern fn grc_str_last_char(s: String) -> String

elp/src/morphology-he.el

@@ -51,6 +51,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn he_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-he.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn he_str_ends(s: String, suf: String) -> Bool
 extern fn he_str_len(s: String) -> Int
 extern fn he_str_drop_last(s: String, n: Int) -> String

elp/src/morphology-hi.el

@@ -24,6 +24,7 @@
 
 // ── String helpers ────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn hi_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-hi.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn hi_str_ends(s: String, suf: String) -> Bool
 extern fn hi_str_drop_last(s: String, n: Int) -> String
 extern fn hi_str_last_char(s: String) -> String

elp/src/morphology-ja.el

@@ -23,6 +23,7 @@
 // Note: this is a heuristic classifier for romanized input.  For production use
 // with native kana/kanji forms, the dictionary form (辞書形) must be consulted.
 
+import "morphology.el"
 fn ja_verb_group(dict_form: String) -> String {
     // Irregular verbs (exact match on dictionary form)
     if str_eq(dict_form, "する")  { return "irregular" }

elp/src/morphology-ja.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn ja_verb_group(dict_form: String) -> String
 extern fn ja_ichidan_stem(dict_form: String) -> String
 extern fn ja_godan_stem_change(dict_form: String, row: String) -> String

elp/src/morphology-la.el

@@ -25,6 +25,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn la_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-la.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn la_str_ends(s: String, suf: String) -> Bool
 extern fn la_str_drop_last(s: String, n: Int) -> String
 extern fn la_str_last_char(s: String) -> String

elp/src/morphology-non.el

@@ -27,6 +27,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn non_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-non.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn non_str_ends(s: String, suf: String) -> Bool
 extern fn non_drop(s: String, n: Int) -> String
 extern fn non_last(s: String) -> String

elp/src/morphology-peo.el

@@ -31,6 +31,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn peo_drop(s: String, n: Int) -> String {
     let len: Int = str_len(s)
     if n >= len { return "" }

elp/src/morphology-peo.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn peo_drop(s: String, n: Int) -> String
 extern fn peo_ends(s: String, suf: String) -> Bool
 extern fn peo_slot(person: String, number: String) -> Int

elp/src/morphology-pi.el

@@ -30,6 +30,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn pi_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-pi.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn pi_str_ends(s: String, suf: String) -> Bool
 extern fn pi_drop(s: String, n: Int) -> String
 extern fn pi_last_char(s: String) -> String

elp/src/morphology-ru.el

@@ -35,6 +35,7 @@
 // The heuristic returns the most probable gender.  Caller should override
 // for known exceptions (путь, рубль are masc despite -ь).
 
+import "morphology.el"
 fn ru_gender(noun: String) -> String {
     let n: Int = str_len(noun)
     if n == 0 { return "m" }

elp/src/morphology-ru.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn ru_gender(noun: String) -> String
 extern fn ru_stem_type(noun: String, gender: String) -> String
 extern fn ru_noun_case(noun: String, gender: String, gram_case: String, number: String) -> String

elp/src/morphology-sa.el

@@ -42,6 +42,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn sa_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-sa.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn sa_str_ends(s: String, suf: String) -> Bool
 extern fn sa_str_drop_last(s: String, n: Int) -> String
 extern fn sa_slot(person: String, number: String) -> Int

elp/src/morphology-sga.el

@@ -31,6 +31,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn sga_drop(s: String, n: Int) -> String {
     let len: Int = str_len(s)
     if n >= len { return "" }

elp/src/morphology-sga.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn sga_drop(s: String, n: Int) -> String
 extern fn sga_first(s: String) -> String
 extern fn sga_rest(s: String) -> String

elp/src/morphology-sux.el

@@ -53,6 +53,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn sux_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-sux.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn sux_str_ends(s: String, suf: String) -> Bool
 extern fn sux_str_drop_last(s: String, n: Int) -> String
 extern fn sux_str_last_char(s: String) -> String

elp/src/morphology-sw.el

@@ -24,6 +24,7 @@
 
 // ── String helpers ────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn sw_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-sw.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn sw_str_ends(s: String, suf: String) -> Bool
 extern fn sw_str_drop_last(s: String, n: Int) -> String
 extern fn sw_str_first_char(s: String) -> String

elp/src/morphology-txb.el

@@ -30,6 +30,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn txb_drop(s: String, n: Int) -> String {
     let len: Int = str_len(s)
     if n >= len { return "" }

elp/src/morphology-txb.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn txb_drop(s: String, n: Int) -> String
 extern fn txb_ends(s: String, suf: String) -> Bool
 extern fn txb_slot(person: String, number: String) -> Int

elp/src/morphology-uga.el

@@ -48,6 +48,7 @@
 
 // ── String helpers ─────────────────────────────────────────────────────────────
 
+import "morphology.el"
 fn uga_str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology-uga.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn uga_str_ends(s: String, suf: String) -> Bool
 extern fn uga_str_len(s: String) -> Int
 extern fn uga_str_drop_last(s: String, n: Int) -> String

elp/src/morphology.el

@@ -33,6 +33,17 @@
 
 // ── String helpers ────────────────────────────────────────────────────────────
 
+import "language-profile.el"
+import "morphology-es.el"
+import "morphology-fr.el"
+import "morphology-de.el"
+import "morphology-ru.el"
+import "morphology-fi.el"
+import "morphology-ar.el"
+import "morphology-hi.el"
+import "morphology-sw.el"
+import "morphology-la.el"
+import "morphology-ja.el"
 fn str_ends(s: String, suf: String) -> Bool {
     return str_ends_with(s, suf)
 }

elp/src/morphology.elh

@@ -1,4 +1,4 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn str_ends(s: String, suf: String) -> Bool
 extern fn str_last_char(s: String) -> String
 extern fn str_last2(s: String) -> String
@@ -8,7 +8,7 @@ extern fn is_vowel(c: String) -> Bool
 extern fn morph_apply_suffix(base: String, suffix: String) -> String
 extern fn en_irregular_plural(word: String) -> String
 extern fn en_irregular_singular(word: String) -> String
-extern fn en_irregular_verb(base: String) -> Any
+extern fn en_irregular_verb(base: String) -> [String]
 extern fn en_verb_3sg(base: String) -> String
 extern fn en_should_double_final(base: String) -> Bool
 extern fn en_verb_past(base: String) -> String
@@ -16,10 +16,10 @@ extern fn en_verb_gerund(base: String) -> String
 extern fn en_pluralize_regular(singular: String) -> String
 extern fn en_verb_form(base: String, tense: String, person: String, number: String) -> String
 extern fn agree_determiner(det: String, noun: String) -> String
-extern fn morph_pluralize(noun: String, profile: Any) -> String
+extern fn morph_pluralize(noun: String, profile: [String]) -> String
 extern fn morph_map_canonical(verb: String, code: String) -> String
-extern fn morph_conjugate(verb: String, tense: String, person: String, number: String, profile: Any) -> String
-extern fn morph_inflect(word: String, features: String, profile: Any) -> String
+extern fn morph_conjugate(verb: String, tense: String, person: String, number: String, profile: [String]) -> String
+extern fn morph_inflect(word: String, features: String, profile: [String]) -> String
 extern fn pluralize(singular: String) -> String
 extern fn singularize(plural: String) -> String
 extern fn verb_form(base: String, tense: String, person: String, number: String) -> String

elp/src/realizer.elh

@@ -1,10 +1,10 @@
-// auto-generated by elc --emit-header - do not edit
+// auto-generated by elc --emit-header — do not edit
 extern fn agent_person(agent: String) -> String
 extern fn agent_number(agent: String) -> String
 extern fn realize_np(referent: String, number: String) -> String
-extern fn realize_vp_lang(base_verb: String, tense: String, aspect: String, person: String, number: String, profile: Any) -> Any
-extern fn realize_question_lang(predicate: String, tense: String, aspect: String, person: String, number: String, agent: String, patient: String, location: String, profile: Any) -> String
+extern fn realize_vp_lang(base_verb: String, tense: String, aspect: String, person: String, number: String, profile: [String]) -> [String]
+extern fn realize_question_lang(predicate: String, tense: String, aspect: String, person: String, number: String, agent: String, patient: String, location: String, profile: [String]) -> String
 extern fn capitalize_first(s: String) -> String
 extern fn add_punct(s: String, intent: String) -> String
-extern fn realize_lang(form: Any, profile: Any) -> String
-extern fn realize(form: Any) -> String
+extern fn realize_lang(form: [String], profile: [String]) -> String
+extern fn realize(form: [String]) -> String

elp/src/semantics.elh

@@ -1,18 +1,18 @@
-// auto-generated by elc --emit-header - do not edit
-extern fn sem_frame(intent: String, subject: String, obj: String, modifiers: String) -> Any
-extern fn sem_frame_lang(intent: String, subject: String, obj: String, modifiers: String, lang_code: String) -> Any
-extern fn sem_frame_simple(intent: String, subject: String) -> Any
-extern fn sem_frame_obj(intent: String, subject: String, obj: String) -> Any
-extern fn sem_intent(frame: Any) -> String
-extern fn sem_subject(frame: Any) -> String
-extern fn sem_object(frame: Any) -> String
-extern fn sem_modifiers(frame: Any) -> String
-extern fn sem_lang(frame: Any) -> String
+// auto-generated by elc --emit-header — do not edit
+extern fn sem_frame(intent: String, subject: String, obj: String, modifiers: String) -> [String]
+extern fn sem_frame_lang(intent: String, subject: String, obj: String, modifiers: String, lang_code: String) -> [String]
+extern fn sem_frame_simple(intent: String, subject: String) -> [String]
+extern fn sem_frame_obj(intent: String, subject: String, obj: String) -> [String]
+extern fn sem_intent(frame: [String]) -> String
+extern fn sem_subject(frame: [String]) -> String
+extern fn sem_object(frame: [String]) -> String
+extern fn sem_modifiers(frame: [String]) -> String
+extern fn sem_lang(frame: [String]) -> String
 extern fn sem_first_modifier(mods: String) -> String
 extern fn sem_intent_to_realize(intent: String) -> String
-extern fn sem_to_spec(frame: Any) -> Any
-extern fn sem_to_spec_full(frame: Any, verb: String, tense: String, aspect: String) -> Any
+extern fn sem_to_spec(frame: [String]) -> [String]
+extern fn sem_to_spec_full(frame: [String], verb: String, tense: String, aspect: String) -> [String]
 extern fn sem_realize_greet(subject: String) -> String
-extern fn sem_realize(frame: Any) -> String
-extern fn sem_realize_full(frame: Any, verb: String, tense: String, aspect: String) -> String
-extern fn sem_realize_lang(frame: Any, lang_code: String) -> String
+extern fn sem_realize(frame: [String]) -> String
+extern fn sem_realize_full(frame: [String], verb: String, tense: String, aspect: String) -> String
+extern fn sem_realize_lang(frame: [String], lang_code: String) -> String

elp/src/vocabulary.elh

@@ -1,20 +1,20 @@
-// auto-generated by elc --emit-header - do not edit
-extern fn lex_word(entry: Any) -> String
-extern fn lex_pos(entry: Any) -> String
-extern fn lex_form(entry: Any, idx: Int) -> String
-extern fn lex_class(entry: Any) -> String
-extern fn make_entry(word: String, pos: String, f0: String, f1: String, f2: String, f3: String, f4: String, cls: String) -> Any
-extern fn make_entry2(word: String, pos: String, f0: String, f1: String, cls: String) -> Any
-extern fn make_entry3(word: String, pos: String, f0: String, f1: String, f2: String, cls: String) -> Any
-extern fn make_entry1(word: String, pos: String, f0: String, cls: String) -> Any
-extern fn build_vocab() -> Any
-extern fn get_vocab() -> Any
-extern fn vocab_lookup(word: String, lang_code: String) -> Any
-extern fn vocab_lookup_en(word: String) -> Any
+// auto-generated by elc --emit-header — do not edit
+extern fn lex_word(entry: [String]) -> String
+extern fn lex_pos(entry: [String]) -> String
+extern fn lex_form(entry: [String], idx: Int) -> String
+extern fn lex_class(entry: [String]) -> String
+extern fn make_entry(word: String, pos: String, f0: String, f1: String, f2: String, f3: String, f4: String, cls: String) -> [String]
+extern fn make_entry2(word: String, pos: String, f0: String, f1: String, cls: String) -> [String]
+extern fn make_entry3(word: String, pos: String, f0: String, f1: String, f2: String, cls: String) -> [String]
+extern fn make_entry1(word: String, pos: String, f0: String, cls: String) -> [String]
+extern fn build_vocab() -> [[String]]
+extern fn get_vocab() -> [[String]]
+extern fn vocab_lookup(word: String, lang_code: String) -> [String]
+extern fn vocab_lookup_en(word: String) -> [String]
 extern fn vocab_synonym(word: String, lang_register: String, lang_code: String) -> String
-extern fn vocab_by_pos(pos: String) -> Any
-extern fn vocab_by_class(cls: String) -> Any
-extern fn entry_found(entry: Any) -> Bool
-extern fn entry_word(entry: Any) -> String
-extern fn entry_pos(entry: Any) -> String
-extern fn entry_form(entry: Any, n: Int) -> String
+extern fn vocab_by_pos(pos: String) -> [[String]]
+extern fn vocab_by_class(cls: String) -> [[String]]
+extern fn entry_found(entry: [String]) -> Bool
+extern fn entry_word(entry: [String]) -> String
+extern fn entry_pos(entry: [String]) -> String
+extern fn entry_form(entry: [String], n: Int) -> String

engram/dist/engram.c

@@ -20,6 +20,8 @@ el_val_t route_create_edge(el_val_t method, el_val_t path, el_val_t body);
 el_val_t route_neighbors(el_val_t method, el_val_t path, el_val_t body);
 el_val_t route_strengthen(el_val_t method, el_val_t path, el_val_t body);
 el_val_t route_forget(el_val_t method, el_val_t path, el_val_t body);
+el_val_t route_create_ise(el_val_t method, el_val_t path, el_val_t body);
+el_val_t route_sync(el_val_t method, el_val_t path, el_val_t body);
 el_val_t route_save(el_val_t method, el_val_t path, el_val_t body);
 el_val_t route_load(el_val_t method, el_val_t path, el_val_t body);
 el_val_t route_health(el_val_t method, el_val_t path, el_val_t body);
@@ -115,7 +117,7 @@ el_val_t route_create_node(el_val_t method, el_val_t path, el_val_t body) {
     node_type = EL_STR("Memory");
   }
   el_val_t salience = json_get_float(body, EL_STR("salience"));
-  if (str_eq(salience, el_from_float(0.0))) {
+  if (salience == el_from_float(0.0)) {
     salience = el_from_float(0.5);
   }
   el_val_t id = engram_node(content, node_type, salience);
@@ -205,7 +207,7 @@ el_val_t route_create_edge(el_val_t method, el_val_t path, el_val_t body) {
     relation = EL_STR("associates");
   }
   el_val_t weight = json_get_float(body, EL_STR("weight"));
-  if (str_eq(weight, el_from_float(0.0))) {
+  if (weight == el_from_float(0.0)) {
     weight = el_from_float(0.5);
   }
   engram_connect(from_id, to_id, weight, relation);
@@ -243,6 +245,34 @@ el_val_t route_forget(el_val_t method, el_val_t path, el_val_t body) {
   return 0;
 }
 
+el_val_t route_create_ise(el_val_t method, el_val_t path, el_val_t body) {
+  el_val_t content = json_get_string(body, EL_STR("content"));
+  if (str_eq(content, EL_STR(""))) {
+    return err_json(EL_STR("missing content"));
+  }
+  el_val_t sal = el_from_float(0.3);
+  el_val_t imp = el_from_float(0.3);
+  el_val_t conf = el_from_float(0.8);
+  el_val_t id = engram_node_full(content, EL_STR("InternalStateEvent"), EL_STR("state-event"), sal, imp, conf, EL_STR("Episodic"), EL_STR("[\"internal-state\",\"InternalStateEvent\"]"));
+  return el_str_concat(el_str_concat(EL_STR("{\"ok\":true,\"id\":\""), id), EL_STR("\"}"));
+  return 0;
+}
+
+el_val_t route_sync(el_val_t method, el_val_t path, el_val_t body) {
+  el_val_t dir = env(EL_STR("ENGRAM_DATA_DIR"));
+  if (str_eq(dir, EL_STR(""))) {
+    dir = EL_STR("/tmp/engram");
+  }
+  el_val_t snap_path = el_str_concat(dir, EL_STR("/sync-export.json"));
+  engram_save(snap_path);
+  el_val_t snap = fs_read(snap_path);
+  if (str_eq(snap, EL_STR(""))) {
+    return EL_STR("{\"nodes\":[],\"edges\":[]}");
+  }
+  return snap;
+  return 0;
+}
+
 el_val_t route_save(el_val_t method, el_val_t path, el_val_t body) {
   el_val_t p = json_get_string(body, EL_STR("path"));
   if (str_eq(p, EL_STR(""))) {
@@ -299,6 +329,9 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
       return route_health(method, path, body);
     }
   }
+  if (str_eq(method, EL_STR("POST")) && str_starts_with(clean, EL_STR("/api/neuron/state-events"))) {
+    return route_create_ise(method, path, body);
+  }
   if (!check_auth_ok(method, body)) {
     return err_json(EL_STR("unauthorized"));
   }
@@ -341,6 +374,9 @@ el_val_t handle_request(el_val_t method, el_val_t path, el_val_t body) {
   if (str_eq(method, EL_STR("POST")) && (str_eq(clean, EL_STR("/api/strengthen")) || str_eq(clean, EL_STR("/strengthen")))) {
     return route_strengthen(method, path, body);
   }
+  if (str_eq(method, EL_STR("GET")) && (str_eq(clean, EL_STR("/api/sync")) || str_eq(clean, EL_STR("/sync")))) {
+    return route_sync(method, path, body);
+  }
   if (str_eq(method, EL_STR("POST")) && (str_eq(clean, EL_STR("/api/save")) || str_eq(clean, EL_STR("/save")))) {
     return route_save(method, path, body);
   }

engram/src/server.el

@@ -206,6 +206,59 @@ fn route_health(method: String, path: String, body: String) -> String {
     "{\"status\":\"ok\",\"engine\":\"engram-runtime-native\"}"
 }
 
+// route_sync — return a snapshot of non-ISE/non-Working nodes for the soul daemon
+// to merge into its in-process graph via engram_load_merge.
+//
+// The soul calls GET /api/sync every SOUL_REFRESH_MS (default 10 min) to pull
+// new Knowledge/Memory/BacklogItem nodes from the authoritative HTTP Engram into
+// its in-process working store. Previously this returned 404 "not found", causing
+// the soul to write the error JSON to a temp file and attempt an empty merge.
+//
+// Strategy: save the current snapshot to disk, read it back, return the full
+// snapshot JSON. The soul's engram_load_merge handles large files gracefully
+// (it skips nodes already present by ID). Auth-exempt: same-host internal call.
+// (2026-06-27 self-review: added this route to fix silent 10-min sync failures)
+fn route_sync(method: String, path: String, body: String) -> String {
+    let dir: String = env("ENGRAM_DATA_DIR")
+    if str_eq(dir, "") { let dir = "/tmp/engram" }
+    let snap_path: String = dir + "/snapshot.json"
+    engram_save(snap_path)
+    let snap: String = fs_read(snap_path)
+    if str_eq(snap, "") { return "{\"nodes\":[],\"edges\":[]}" }
+    return snap
+}
+
+// route_emit_ise — write an InternalStateEvent node from the soul daemon.
+//
+// Endpoint: POST /api/neuron/state-events
+// Body:     {"content": "<json-string>"}
+//
+// Auth: exempt (internal endpoint, soul daemon on same host, no _auth needed).
+// The soul's ise_post() sends {"content":"..."} without _auth; enforcing auth
+// here would silently drop all heartbeat/curiosity ISEs. Unauthenticated POST
+// to this endpoint is acceptable: ISE writes are observability-only, append-only,
+// and come from a trusted process on localhost.
+//
+// Salience/importance set to match engram_node_full ISE defaults used by the
+// in-process fallback path in awareness.el (salience=0.3, importance=0.3,
+// confidence=0.8, tier=Episodic). High temporal_decay_rate (1.617) — ISEs
+// are inherently transient; they should decay faster than structural knowledge.
+// (2026-06-26 self-review: added this route after discovering ise_post was
+// silently failing — the soul posts here but the endpoint didn't exist.)
+fn route_emit_ise(method: String, path: String, body: String) -> String {
+    let content: String = json_get_string(body, "content")
+    if str_eq(content, "") { return err_json("missing content") }
+    let sal: Float = 0.3
+    let imp: Float = 0.3
+    let conf: Float = 0.8
+    let id: String = engram_node_full(
+        content, "InternalStateEvent", "state-event",
+        sal, imp, conf,
+        "Episodic", "[\"internal-state\",\"InternalStateEvent\"]"
+    )
+    "{\"ok\":true,\"id\":\"" + id + "\"}"
+}
+
 // ── Auth ──────────────────────────────────────────────────────────────────────
 
 fn check_auth_ok(method: String, body: String) -> Bool {
@@ -232,6 +285,11 @@ fn handle_request(method: String, path: String, body: String) -> String {
         }
     }
 
+    // ISE posting is auth-exempt (internal soul daemon, same host, no _auth key)
+    if str_eq(method, "POST") && str_eq(clean, "/api/neuron/state-events") {
+        return route_emit_ise(method, path, body)
+    }
+
     // Auth (when ENGRAM_API_KEY is set)
     if !check_auth_ok(method, body) {
         return err_json("unauthorized")
@@ -294,6 +352,11 @@ fn handle_request(method: String, path: String, body: String) -> String {
         return route_load(method, path, body)
     }
 
+    // Sync — soul daemon periodic pull of non-ISE knowledge into in-process graph
+    if str_eq(method, "GET") && str_eq(clean, "/api/sync") {
+        return route_sync(method, path, body)
+    }
+
     "{\"error\":\"not found\",\"path\":\"" + clean + "\"}"
 }
 

lang/el-compiler/runtime/ElBridge.java

@@ -0,0 +1,711 @@
+/*
+ * ElBridge.java — Android Java companion to el_android.c.
+ *
+ * All public methods are static. The C JNI layer calls these to create views,
+ * set properties, and manage the widget tree. Views are identified by integer
+ * slot indices matching the C-side handle values.
+ *
+ * Threading: every method that touches a View dispatches to the UI thread
+ * using Activity.runOnUiThread(Runnable) and blocks with a CountDownLatch
+ * until the UI thread completes the operation. This mirrors the AppKit
+ * dispatch_sync(main_queue, ^{}) pattern in el_appkit.m.
+ *
+ * Callbacks: Java sets listeners on views that call back into C via:
+ *   nativeOnClick(int slot)
+ *   nativeOnChange(int slot, String text)
+ *   nativeOnSubmit(int slot, String text)
+ * These are declared native and implemented in el_android.c.
+ *
+ * Usage (in your Activity.onCreate):
+ *   System.loadLibrary("elruntime");
+ *   ElBridge.init(this);
+ *
+ * The native library calls __native_init() which calls nativeRegisterActivity
+ * via the C side; alternatively call ElBridge.init(this) directly from Java.
+ *
+ * Compile requirements:
+ *   Android minSdkVersion 21 (Lollipop) or higher.
+ *   No third-party dependencies — uses only android.* framework classes.
+ *   For image loading from arbitrary file paths, BitmapFactory is used.
+ *   To replace with Glide/Picasso, edit createImageView only.
+ */
+
+package com.neuron.el;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import java.util.concurrent.CountDownLatch;
+
+public class ElBridge {
+
+    /* ── Native callbacks (implemented in el_android.c) ─────────────────── */
+
+    public static native void nativeOnClick(int slot);
+    public static native void nativeOnChange(int slot, String text);
+    public static native void nativeOnSubmit(int slot, String text);
+    public static native void nativeRegisterActivity(Activity activity);
+
+    /* ── State ───────────────────────────────────────────────────────────── */
+
+    private static final int MAX_SLOTS = 4096;
+
+    private static Activity   sActivity;
+    private static Handler    sUiHandler;
+    private static View[]     sViews    = new View[MAX_SLOTS];
+    private static int        sNextSlot = 1;   /* slot 0 reserved / null */
+
+    /* ── Init ────────────────────────────────────────────────────────────── */
+
+    /**
+     * Must be called from the Activity before any widget operations.
+     * Typically called from Activity.onCreate after System.loadLibrary.
+     */
+    public static void init(Activity activity) {
+        sActivity  = activity;
+        sUiHandler = new Handler(Looper.getMainLooper());
+        nativeRegisterActivity(activity);
+    }
+
+    /* ── Slot management ─────────────────────────────────────────────────── */
+
+    private static int allocSlot(View v) {
+        /* Find a free slot starting from sNextSlot, wrap around. */
+        for (int i = 0; i < MAX_SLOTS - 1; i++) {
+            int idx = ((sNextSlot - 1 + i) % (MAX_SLOTS - 1)) + 1;
+            if (sViews[idx] == null) {
+                sViews[idx] = v;
+                sNextSlot = (idx % (MAX_SLOTS - 1)) + 1;
+                return idx;
+            }
+        }
+        android.util.Log.e("ElBridge", "allocSlot: slot table full");
+        return -1;
+    }
+
+    private static View getView(int slot) {
+        if (slot <= 0 || slot >= MAX_SLOTS) return null;
+        return sViews[slot];
+    }
+
+    /* ── UI-thread dispatch helper ───────────────────────────────────────── */
+
+    /*
+     * Dispatch r on the UI thread and block until it completes.
+     * Safe to call from the UI thread itself (runs inline without posting).
+     */
+    private static void runSync(final Runnable r) {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            r.run();
+        } else {
+            final CountDownLatch latch = new CountDownLatch(1);
+            sUiHandler.post(new Runnable() {
+                @Override public void run() {
+                    try { r.run(); } finally { latch.countDown(); }
+                }
+            });
+            try { latch.await(); } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    /* ── Integer slot returning runSync helper ───────────────────────────── */
+
+    private interface IntSupplier { int get(); }
+
+    private static int runSyncInt(final IntSupplier s) {
+        final int[] result = { -1 };
+        runSync(new Runnable() {
+            @Override public void run() { result[0] = s.get(); }
+        });
+        return result[0];
+    }
+
+    /* ── Context accessor ────────────────────────────────────────────────── */
+
+    private static Context ctx() { return sActivity; }
+
+    /* ── View creation ───────────────────────────────────────────────────── */
+
+    /**
+     * Create a LinearLayout.
+     * @param orientation 1=VERTICAL, 0=HORIZONTAL
+     * @param spacing     gap between children in dp; applied as bottom/right margin
+     */
+    public static int createLinearLayout(final int orientation, final int spacing) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                LinearLayout ll = new LinearLayout(ctx());
+                ll.setOrientation(orientation == 1
+                        ? LinearLayout.VERTICAL
+                        : LinearLayout.HORIZONTAL);
+                ll.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                /* Spacing is stored so addChild can apply margins. */
+                ll.setTag(R_TAG_SPACING, spacing);
+                return allocSlot(ll);
+            }
+        });
+    }
+
+    /** Create a FrameLayout (ZStack equivalent). */
+    public static int createFrameLayout() {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                FrameLayout fl = new FrameLayout(ctx());
+                fl.setLayoutParams(new FrameLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(fl);
+            }
+        });
+    }
+
+    /** Create a ScrollView. */
+    public static int createScrollView() {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                ScrollView sv = new ScrollView(ctx());
+                sv.setLayoutParams(new ScrollView.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT));
+                sv.setFillViewport(true);
+                return allocSlot(sv);
+            }
+        });
+    }
+
+    /** Create a TextView with initial text. */
+    public static int createTextView(final String text) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                TextView tv = new TextView(ctx());
+                tv.setText(text != null ? text : "");
+                tv.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(tv);
+            }
+        });
+    }
+
+    /** Create a Button with a label. */
+    public static int createButton(final String label) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                Button btn = new Button(ctx());
+                btn.setText(label != null ? label : "");
+                btn.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(btn);
+            }
+        });
+    }
+
+    /**
+     * Create an EditText.
+     * @param placeholder hint text
+     * @param singleLine  true = single-line text field; false = multi-line text area
+     */
+    public static int createEditText(final String placeholder, final boolean singleLine) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                EditText et = new EditText(ctx());
+                et.setHint(placeholder != null ? placeholder : "");
+                if (singleLine) {
+                    et.setInputType(InputType.TYPE_CLASS_TEXT
+                            | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+                    et.setMaxLines(1);
+                    et.setSingleLine(true);
+                } else {
+                    et.setInputType(InputType.TYPE_CLASS_TEXT
+                            | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+                    et.setMinLines(3);
+                    et.setSingleLine(false);
+                    et.setGravity(Gravity.TOP | Gravity.START);
+                }
+                et.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(et);
+            }
+        });
+    }
+
+    /**
+     * Create an ImageView, loading from a file path via BitmapFactory.
+     * If path is null/empty the ImageView is created with no image.
+     */
+    public static int createImageView(final String path) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                ImageView iv = new ImageView(ctx());
+                iv.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                iv.setAdjustViewBounds(true);
+                if (path != null && !path.isEmpty()) {
+                    Bitmap bmp = BitmapFactory.decodeFile(path);
+                    if (bmp != null) {
+                        iv.setImageBitmap(bmp);
+                    } else {
+                        android.util.Log.w("ElBridge",
+                                "createImageView: failed to decode " + path);
+                    }
+                }
+                iv.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(iv);
+            }
+        });
+    }
+
+    /* ── Window operations ───────────────────────────────────────────────── */
+
+    /** Set the Activity's content view to the view at slot. */
+    public static void setContentView(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null && sActivity != null) {
+                    sActivity.setContentView(v);
+                }
+            }
+        });
+    }
+
+    /** Set the Activity title. */
+    public static void setTitle(final String title) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                if (sActivity != null) {
+                    sActivity.setTitle(title != null ? title : "");
+                }
+            }
+        });
+    }
+
+    /* ── Tree operations ─────────────────────────────────────────────────── */
+
+    /**
+     * Add child view to parent view.
+     * LinearLayout: child added as arranged child with spacing margin.
+     * ScrollView: child replaces current document view.
+     * FrameLayout / other ViewGroup: plain addView.
+     */
+    public static void addChild(final int parentSlot, final int childSlot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View parent = getView(parentSlot);
+                View child  = getView(childSlot);
+                if (parent == null || child == null) return;
+
+                /* Remove child from existing parent first. */
+                if (child.getParent() instanceof ViewGroup) {
+                    ((ViewGroup) child.getParent()).removeView(child);
+                }
+
+                if (parent instanceof LinearLayout) {
+                    LinearLayout ll = (LinearLayout) parent;
+                    Object tag = ll.getTag(R_TAG_SPACING);
+                    int spacing = (tag instanceof Integer) ? (Integer) tag : 0;
+                    LinearLayout.LayoutParams lp;
+                    Object existingLp = child.getLayoutParams();
+                    if (existingLp instanceof LinearLayout.LayoutParams) {
+                        lp = (LinearLayout.LayoutParams) existingLp;
+                    } else {
+                        lp = new LinearLayout.LayoutParams(
+                                ViewGroup.LayoutParams.WRAP_CONTENT,
+                                ViewGroup.LayoutParams.WRAP_CONTENT);
+                    }
+                    /* Apply spacing as margin on the leading/top edge (after first child). */
+                    if (ll.getChildCount() > 0 && spacing > 0) {
+                        int px = dpToPx(spacing);
+                        if (ll.getOrientation() == LinearLayout.VERTICAL) {
+                            lp.topMargin = px;
+                        } else {
+                            lp.leftMargin = px;
+                        }
+                    }
+                    child.setLayoutParams(lp);
+                    ll.addView(child);
+                } else if (parent instanceof ScrollView) {
+                    ScrollView sv = (ScrollView) parent;
+                    sv.removeAllViews();
+                    sv.addView(child);
+                } else if (parent instanceof ViewGroup) {
+                    ((ViewGroup) parent).addView(child);
+                }
+            }
+        });
+    }
+
+    /** Remove child from its parent. */
+    public static void removeChild(final int parentSlot, final int childSlot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View parent = getView(parentSlot);
+                View child  = getView(childSlot);
+                if (parent instanceof ViewGroup && child != null) {
+                    ((ViewGroup) parent).removeView(child);
+                }
+            }
+        });
+    }
+
+    /** Remove the view from its parent and release the slot. */
+    public static void destroyView(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                if (v.getParent() instanceof ViewGroup) {
+                    ((ViewGroup) v.getParent()).removeView(v);
+                }
+                sViews[slot] = null;
+            }
+        });
+    }
+
+    /* ── Property setters ────────────────────────────────────────────────── */
+
+    public static void setText(final int slot, final String text) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                String s = text != null ? text : "";
+                if (v instanceof EditText) {
+                    ((EditText) v).setText(s);
+                } else if (v instanceof Button) {
+                    ((Button) v).setText(s);
+                } else if (v instanceof TextView) {
+                    ((TextView) v).setText(s);
+                }
+            }
+        });
+    }
+
+    public static String getText(final int slot) {
+        final String[] result = { "" };
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v instanceof TextView) {
+                    CharSequence cs = ((TextView) v).getText();
+                    result[0] = cs != null ? cs.toString() : "";
+                }
+            }
+        });
+        return result[0];
+    }
+
+    /** Set foreground text color. Components in [0,1]. */
+    public static void setTextColor(final int slot, final float r, final float g,
+                                     final float b, final float a) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v instanceof TextView) {
+                    ((TextView) v).setTextColor(floatToArgb(r, g, b, a));
+                }
+            }
+        });
+    }
+
+    /** Set background color using a GradientDrawable so corner radius is preserved. */
+    public static void setBackgroundColor(final int slot, final float r, final float g,
+                                           final float b, final float a) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ensureGradientBackground(v);
+                GradientDrawable gd = (GradientDrawable) v.getBackground();
+                gd.setColor(floatToArgb(r, g, b, a));
+            }
+        });
+    }
+
+    /**
+     * Set font family and size.
+     * family: "system" or null → system default; otherwise tries to load by name.
+     * bold: if true uses Typeface.BOLD.
+     */
+    public static void setFont(final int slot, final String family,
+                                final int sizeSp, final boolean bold) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (!(v instanceof TextView)) return;
+                TextView tv = (TextView) v;
+                Typeface tf;
+                if (family != null && !family.isEmpty()
+                        && !family.equals("system")) {
+                    Typeface base = Typeface.create(family,
+                            bold ? Typeface.BOLD : Typeface.NORMAL);
+                    tf = (base != null) ? base
+                            : Typeface.defaultFromStyle(bold ? Typeface.BOLD : Typeface.NORMAL);
+                } else {
+                    tf = Typeface.defaultFromStyle(bold ? Typeface.BOLD : Typeface.NORMAL);
+                }
+                tv.setTypeface(tf);
+                tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, sizeSp);
+            }
+        });
+    }
+
+    /** Set padding in dp. */
+    public static void setPadding(final int slot, final int top, final int right,
+                                   final int bottom, final int left) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null) {
+                    v.setPadding(dpToPx(left), dpToPx(top), dpToPx(right), dpToPx(bottom));
+                }
+            }
+        });
+    }
+
+    /** Set explicit width in dp. Passes MATCH_PARENT for negative values. */
+    public static void setWidth(final int slot, final int widthDp) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ViewGroup.LayoutParams lp = v.getLayoutParams();
+                if (lp == null) lp = new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT);
+                lp.width = widthDp < 0
+                        ? ViewGroup.LayoutParams.MATCH_PARENT
+                        : dpToPx(widthDp);
+                v.setLayoutParams(lp);
+            }
+        });
+    }
+
+    /** Set explicit height in dp. */
+    public static void setHeight(final int slot, final int heightDp) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ViewGroup.LayoutParams lp = v.getLayoutParams();
+                if (lp == null) lp = new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT);
+                lp.height = heightDp < 0
+                        ? ViewGroup.LayoutParams.MATCH_PARENT
+                        : dpToPx(heightDp);
+                v.setLayoutParams(lp);
+            }
+        });
+    }
+
+    /**
+     * Set flex weight on a child of a LinearLayout.
+     * flex > 0 → weight = flex, width/height = 0dp (expand).
+     * flex == 0 → weight = 0, wrap_content (shrink to content).
+     */
+    public static void setFlex(final int slot, final int flex) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ViewGroup.LayoutParams lp = v.getLayoutParams();
+                if (lp instanceof LinearLayout.LayoutParams) {
+                    LinearLayout.LayoutParams llp = (LinearLayout.LayoutParams) lp;
+                    if (flex > 0) {
+                        llp.weight = (float) flex;
+                        /* Determine orientation from parent to set 0dp on the right axis. */
+                        if (v.getParent() instanceof LinearLayout) {
+                            LinearLayout parent = (LinearLayout) v.getParent();
+                            if (parent.getOrientation() == LinearLayout.VERTICAL) {
+                                llp.height = 0;
+                            } else {
+                                llp.width = 0;
+                            }
+                        }
+                    } else {
+                        llp.weight = 0f;
+                    }
+                    v.setLayoutParams(llp);
+                }
+            }
+        });
+    }
+
+    /** Set corner radius in dp using a GradientDrawable background. */
+    public static void setCornerRadius(final int slot, final float radiusDp) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ensureGradientBackground(v);
+                GradientDrawable gd = (GradientDrawable) v.getBackground();
+                gd.setCornerRadius(dpToPxF(radiusDp));
+            }
+        });
+    }
+
+    public static void setEnabled(final int slot, final boolean enabled) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null) v.setEnabled(enabled);
+            }
+        });
+    }
+
+    /**
+     * Show or hide a view.
+     * @param visible true = VISIBLE, false = GONE (matches AppKit setHidden semantics)
+     */
+    public static void setVisibility(final int slot, final boolean visible) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null) v.setVisibility(visible ? View.VISIBLE : View.GONE);
+            }
+        });
+    }
+
+    /* ── Event listener registration ─────────────────────────────────────── */
+
+    /** Register an OnClickListener that calls back into C nativeOnClick. */
+    public static void setOnClickListener(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                final int capturedSlot = slot;
+                v.setOnClickListener(new View.OnClickListener() {
+                    @Override public void onClick(View view) {
+                        nativeOnClick(capturedSlot);
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Register a TextWatcher on an EditText that calls back nativeOnChange
+     * for every text change.
+     */
+    public static void setOnChangeListener(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (!(v instanceof EditText)) return;
+                final int capturedSlot = slot;
+                ((EditText) v).addTextChangedListener(new TextWatcher() {
+                    @Override public void beforeTextChanged(CharSequence s, int start,
+                                                             int count, int after) {}
+                    @Override public void onTextChanged(CharSequence s, int start,
+                                                         int before, int count) {}
+                    @Override public void afterTextChanged(Editable s) {
+                        nativeOnChange(capturedSlot, s != null ? s.toString() : "");
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Register an OnEditorActionListener on a single-line EditText that calls
+     * nativeOnSubmit when the user presses the action/enter key.
+     */
+    public static void setOnSubmitListener(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (!(v instanceof EditText)) return;
+                final int capturedSlot = slot;
+                ((EditText) v).setOnEditorActionListener(
+                        new TextView.OnEditorActionListener() {
+                    @Override
+                    public boolean onEditorAction(TextView tv, int actionId,
+                                                   android.view.KeyEvent event) {
+                        nativeOnSubmit(capturedSlot,
+                                tv.getText() != null ? tv.getText().toString() : "");
+                        return true;
+                    }
+                });
+            }
+        });
+    }
+
+    /* ── Internal helpers ─────────────────────────────────────────────────── */
+
+    /*
+     * Tag key used to stash the spacing value on LinearLayouts so addChild
+     * can apply the correct margin between children.
+     * We use a stable integer resource-id-like value; because we do not have
+     * a resources file here we use View.generateViewId() lazily.
+     */
+    private static int sSpacingTagKey = 0;
+
+    private static int R_TAG_SPACING;
+    static {
+        R_TAG_SPACING = View.generateViewId();
+    }
+
+    /** Convert dp to pixels using the Activity's display metrics. */
+    private static int dpToPx(float dp) {
+        if (sActivity == null) return (int) dp;
+        float density = sActivity.getResources().getDisplayMetrics().density;
+        return Math.round(dp * density);
+    }
+
+    private static float dpToPxF(float dp) {
+        if (sActivity == null) return dp;
+        float density = sActivity.getResources().getDisplayMetrics().density;
+        return dp * density;
+    }
+
+    /** Convert RGBA float components (0–1) to an Android ARGB int. */
+    private static int floatToArgb(float r, float g, float b, float a) {
+        int ai = Math.round(a * 255f);
+        int ri = Math.round(r * 255f);
+        int gi = Math.round(g * 255f);
+        int bi = Math.round(b * 255f);
+        return Color.argb(ai, ri, gi, bi);
+    }
+
+    /**
+     * Ensure the view has a GradientDrawable background so that both color
+     * and corner radius can be set independently.  If the current background
+     * is already a GradientDrawable it is reused; otherwise a new transparent
+     * one is installed.
+     */
+    private static void ensureGradientBackground(View v) {
+        if (!(v.getBackground() instanceof GradientDrawable)) {
+            GradientDrawable gd = new GradientDrawable();
+            gd.setColor(Color.TRANSPARENT);
+            v.setBackground(gd);
+        }
+    }
+}

lang/el-compiler/runtime/PLATFORM_BRIDGE_SPEC.md

@@ -0,0 +1,554 @@
+# Platform Bridge Specification — el-native
+
+This document is the authoritative reference for anyone implementing a new platform bridge for the el-native widget system. Read it top to bottom before writing a single line of code.
+
+---
+
+## What a Platform Bridge Is
+
+The el compiler (`elc`) emits C code. That C code calls `__`-prefixed functions for everything OS-related: printing, file I/O, threading, and — when building a native UI app — widget creation and event handling. These `__` functions are the *OS boundary*.
+
+For native UI, the bridge is the translation layer between that fixed C API and whatever platform toolkit you are targeting. The bridge owns:
+
+1. A **slot table** of up to 4096 widget objects, indexed by `int64_t` handle.
+2. Implementations of all 33 `__*` widget functions declared in `el_native_target.h`.
+3. Callback dispatch from platform events back into El function symbols resolved via `dlsym` (or a platform equivalent).
+
+The thin wrappers in `el_seed.c` (`#ifdef EL_TARGET_*` blocks) marshal between `el_val_t` and native C types, then call through to the bridge. The bridge itself never touches `el_val_t` — it works only with plain C types (`int64_t`, `const char*`, `int`, `float`).
+
+**Existing bridges:**
+
+| File | Platform | Toolkit | Language |
+|------|----------|---------|----------|
+| `el_appkit.m` | macOS | AppKit | ObjC (MRC) |
+| `el_gtk4.c` | Linux | GTK4 | C |
+| `el_win32.c` | Windows | Win32/ComCtl | C |
+| `el_uikit.m` | iOS | UIKit | ObjC (MRC) |
+| `el_android.c` + `ElBridge.java` | Android | View/JNI | C + Java |
+| `el_sdl2.c` | Embedded Linux / Pi | SDL2 | C |
+| `el_lvgl.c` | Microcontrollers | LVGL | C |
+
+---
+
+## The Slot System
+
+Every widget — window, button, label, container, image — is stored in a static array:
+
+```c
+#define EL_<PLATFORM>_MAX_WIDGETS 4096
+
+typedef struct {
+    ElWidgetKind  kind;
+    /* platform-specific object reference (pointer, handle, ID...) */
+    /* callback names */
+    char*         cb_click;
+    char*         cb_change;
+} ElWidget;
+
+static ElWidget _el_widgets[EL_<PLATFORM>_MAX_WIDGETS];
+```
+
+Rules:
+- **Slot 0 is never valid.** Scan starts at index 1. This ensures 0 is never a valid handle.
+- **Handle = slot index.** An `int64_t` value returned to El code is a direct index into `_el_widgets[]`.
+- **-1 = invalid.** All create functions return -1 on failure (table full, platform API error).
+- **Slot is FREE until allocated, FREE again after destroy.** Use an `ElWidgetKind` enum where `0 = EL_WIDGET_FREE` to track liveness.
+- **4096 slots is the system-wide maximum.** This is intentional and sufficient for any realistic UI. Do not increase it without a compelling reason.
+
+### Slot allocation and release pattern
+
+```c
+static int64_t el_widget_alloc(ElWidgetKind kind, /* platform object ref */) {
+    for (int i = 1; i < EL_<PLATFORM>_MAX_WIDGETS; i++) {
+        if (_el_widgets[i].kind == EL_WIDGET_FREE) {
+            _el_widgets[i].kind     = kind;
+            /* store platform object ref — retain/addref if needed */
+            _el_widgets[i].cb_click  = NULL;
+            _el_widgets[i].cb_change = NULL;
+            return (int64_t)i;
+        }
+    }
+    return -1; /* table full */
+}
+
+static ElWidget* el_widget_get(int64_t handle) {
+    if (handle <= 0 || handle >= EL_<PLATFORM>_MAX_WIDGETS) return NULL;
+    if (_el_widgets[handle].kind == EL_WIDGET_FREE) return NULL;
+    return &_el_widgets[handle];
+}
+
+static void el_widget_free(int64_t handle) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    /* release platform object ref */
+    w->kind = EL_WIDGET_FREE;
+    free(w->cb_click);  w->cb_click  = NULL;
+    free(w->cb_change); w->cb_change = NULL;
+}
+```
+
+**NULL handle guard:** `el_widget_get` must return `NULL` for any handle that is 0, negative, out of range, or points to a `FREE` slot. Every `__` function that takes a handle must null-check the result of `el_widget_get` before doing anything. Failing to do so causes crashes or corruption when El code passes an uninitialized handle.
+
+---
+
+## The 33 Required Functions
+
+Every bridge must implement all 33 functions listed below. They are grouped by category. The signatures shown are from `el_native_target.h` and from `el_seed.c`'s wrapper layer; the bridge itself uses plain C types (the wrappers do the `el_val_t` ↔ C-type conversion).
+
+### Internal C signatures (what the bridge implements)
+
+These are what your `.c` / `.m` file defines. The `el_seed.c` wrappers call these.
+
+#### Lifecycle (2 functions)
+
+```c
+void el_<platform>_init(void);
+```
+**Purpose:** Initialize the platform UI toolkit. Must be idempotent (safe to call more than once). Called once from `__native_init` before any widget creation.  
+**Edge cases:** On platforms where the toolkit must be initialized before a display connection is established (X11, Wayland), this is where that happens. On Android, this is a no-op because ElBridge.java calls init from Java.
+
+```c
+void el_<platform>_run_loop(void);
+```
+**Purpose:** Start the platform event loop. On most platforms this **never returns**. Exceptions: Android (the loop is Java-managed — this must be a no-op) and headless test builds.  
+**Edge cases:** Must be called from the main thread. On iOS/UIKit, calls `UIApplicationMain` which never returns; El code must set `el_main_entry_fn` before calling this.
+
+#### Window (3 functions)
+
+```c
+int64_t el_<platform>_window_create(const char* title, int w, int h, int mw, int mh);
+```
+**Purpose:** Create a top-level window. `w`/`h` = initial size in logical pixels. `mw`/`mh` = minimum size (0 = no minimum).  
+**Returns:** Slot handle, or -1 on failure.  
+**Edge cases:** NULL or empty `title` must be handled gracefully (use `""`). On mobile (iOS, Android), the concept of a "window" maps to the root view controller / activity root view — create that here.
+
+```c
+void el_<platform>_window_show(int64_t handle);
+```
+**Purpose:** Make the window visible. On some platforms windows are hidden at creation; this makes them appear.  
+**Edge cases:** NULL handle → return silently. Calling on an already-visible window is a no-op.
+
+```c
+void el_<platform>_window_set_title(int64_t handle, const char* title);
+```
+**Purpose:** Update the window's title bar text at runtime.  
+**Edge cases:** NULL handle or NULL title → no-op.
+
+#### Layout containers (4 functions)
+
+```c
+int64_t el_<platform>_vstack_create(int spacing);
+int64_t el_<platform>_hstack_create(int spacing);
+```
+**Purpose:** Create a vertical/horizontal linear container. `spacing` = gap between children in logical pixels.  
+**Returns:** Slot handle, or -1.  
+**Edge cases:** spacing = 0 is valid and common.
+
+```c
+int64_t el_<platform>_zstack_create(void);
+```
+**Purpose:** Create a z-axis layered container (children overlap, no stacking direction). Used for overlays.  
+**Returns:** Slot handle, or -1.
+
+```c
+int64_t el_<platform>_scroll_create(void);
+```
+**Purpose:** Create a scrollable container. Scrolls vertically by default. Only the first child added is the scrollable content.  
+**Returns:** Slot handle, or -1.
+
+#### Leaf widgets (5 functions)
+
+```c
+int64_t el_<platform>_label_create(const char* text);
+```
+**Purpose:** Create a non-editable text label.  
+**Edge cases:** NULL/empty text → label with empty string, not a crash.
+
+```c
+int64_t el_<platform>_button_create(const char* label);
+```
+**Purpose:** Create a clickable button. The `label` is the button's visible text.  
+**Edge cases:** The button must wire up an action target at creation time so that click callbacks registered later via `el_<platform>_widget_on_click` will fire. On platforms with target-action (AppKit, UIKit), allocate the delegate object here.
+
+```c
+int64_t el_<platform>_text_field_create(const char* placeholder);
+```
+**Purpose:** Create a single-line text input. `placeholder` is the hint text shown when empty.  
+**Edge cases:** NULL placeholder → no hint text displayed.
+
+```c
+int64_t el_<platform>_text_area_create(const char* placeholder);
+```
+**Purpose:** Create a multi-line text input (scrollable).  
+**Edge cases:** Same as text_field_create. On AppKit, this wraps NSTextView inside NSScrollView — the slot's `obj` points to the scroll view, not the text view.
+
+```c
+int64_t el_<platform>_image_create(const char* path_or_name);
+```
+**Purpose:** Create an image widget. `path_or_name` can be a filesystem path or a platform resource name. Try path first, fall back to named resource.  
+**Edge cases:** Non-existent path → create an empty image widget (do not crash). NULL → same.
+
+#### Widget properties (12 functions)
+
+```c
+void el_<platform>_widget_set_text(int64_t handle, const char* text);
+```
+**Purpose:** Update the text content of a label, button, text field, text area, or window title. Must dispatch on `kind` to use the correct API.  
+**Edge cases:** NULL handle → no-op. NULL text → treat as `""`.
+
+```c
+const char* el_<platform>_widget_get_text(int64_t handle);
+```
+**Purpose:** Return the current text of a widget. Returns a `const char*` that the `el_seed.c` wrapper wraps into an `el_val_t` string.  
+**Edge cases:** NULL handle → return `""` (never NULL). The caller in `el_seed.c` handles the `strdup` lifetime issue — see the AppKit reference implementation notes.
+
+```c
+void el_<platform>_widget_set_color(int64_t h, float r, float g, float b, float a);
+void el_<platform>_widget_set_bg_color(int64_t h, float r, float g, float b, float a);
+```
+**Purpose:** Set foreground (text) color and background color respectively. All channels are normalized floats [0.0, 1.0].  
+**Edge cases:** For containers, `set_color` may be a no-op (no text); `set_bg_color` should set the layer/surface background. On platforms without alpha compositing, clamp alpha to 0 or 1.
+
+```c
+void el_<platform>_widget_set_font(int64_t h, const char* family, int size, int bold);
+```
+**Purpose:** Set the font on a text-bearing widget. `family` = font family name or `"system"` for the platform default. `size` = point size. `bold` = 0 or 1.  
+**Edge cases:** If `family` is not found, fall back to the system font. Non-text widgets (containers, images) → no-op.
+
+```c
+void el_<platform>_widget_set_padding(int64_t h, int top, int right, int bottom, int left);
+```
+**Purpose:** Set internal padding/insets for a container or text area.  
+**Edge cases:** On platforms where padding is per-view (not per-container), map to the nearest equivalent (margin, insets, text container inset). For leaf widgets other than text areas, this may be a partial no-op.
+
+```c
+void el_<platform>_widget_set_width(int64_t h, int width);
+void el_<platform>_widget_set_height(int64_t h, int height);
+```
+**Purpose:** Apply a fixed-size constraint. `width`/`height` in logical pixels.  
+**Edge cases:** On platforms with Auto Layout or constraint systems, add a fixed-size constraint. Do not apply to windows (size is set at creation). Calling multiple times should override the previous constraint, not add another.
+
+```c
+void el_<platform>_widget_set_flex(int64_t h, int flex);
+```
+**Purpose:** Set the flex/expansion factor. `flex > 0` → the widget expands to fill available space. `flex == 0` → hugs content size.  
+**Edge cases:** Maps to content-hugging priority (AppKit), `GtkWidget::hexpand`/`vexpand` (GTK4), or layout weight (Android). For windows → no-op.
+
+```c
+void el_<platform>_widget_set_corner_radius(int64_t h, int radius);
+```
+**Purpose:** Apply rounded corners to the widget's visual layer.  
+**Edge cases:** Requires backing layer / GPU surface. On platforms without layer compositing (Win32 without DX), this may be a no-op or require manual painting. Radius in logical pixels.
+
+```c
+void el_<platform>_widget_set_disabled(int64_t h, int disabled);
+```
+**Purpose:** Enable or disable user interaction. `disabled = 1` → greyed out, non-interactive.  
+**Edge cases:** Only meaningful for interactive widgets (button, text field). For containers/labels → no-op.
+
+```c
+void el_<platform>_widget_set_hidden(int64_t h, int hidden);
+```
+**Purpose:** Show or hide the widget. `hidden = 1` → invisible but still in layout.  
+**Edge cases:** For windows, map to `orderOut`/`hide` or equivalent. For views, use `setHidden`/`gtk_widget_set_visible` or equivalent.
+
+#### Tree management (3 functions)
+
+```c
+void el_<platform>_widget_add_child(int64_t parent, int64_t child);
+```
+**Purpose:** Attach a child widget to a parent container. Dispatch on parent kind:
+- Window → add to root content view/container
+- VStack/HStack → add as arranged/linear child
+- ZStack → add as overlapping subview
+- Scroll → set as document/content view (first child only)
+- Other → add as plain subview
+
+**Edge cases:** NULL parent or child handle → no-op. Attempting to add a window as a child → no-op. Adding the same child twice is platform-defined behavior (tolerate it).
+
+```c
+void el_<platform>_widget_remove_child(int64_t parent, int64_t child);
+```
+**Purpose:** Detach child from its parent. The child slot remains allocated; the widget is not destroyed.  
+**Edge cases:** NULL handles → no-op. Child not currently attached → no-op.
+
+```c
+void el_<platform>_widget_destroy(int64_t handle);
+```
+**Purpose:** Destroy a widget: remove from superview/parent, release the platform object, release callback strings, mark slot as FREE.  
+**Edge cases:** For windows, close the window. Free any delegate/target objects stored in side tables. After destroy, the handle is invalid — El code must not use it again (this is the caller's responsibility, not enforced here).
+
+#### Event registration (3 functions)
+
+```c
+void el_<platform>_widget_on_click(int64_t h, const char* fn_name);
+void el_<platform>_widget_on_change(int64_t h, const char* fn_name);
+void el_<platform>_widget_on_submit(int64_t h, const char* fn_name);
+```
+**Purpose:** Register an El callback function by symbol name.
+- `on_click` → button press
+- `on_change` → text field value change (keystroke-level)
+- `on_submit` → text field Enter key (text field only; stored in `cb_click` slot in AppKit)
+
+The implementation stores `strdup(fn_name)` in the widget's `cb_click` or `cb_change` field. The platform event handler calls `el_<platform>_invoke_cb` (see callback ABI section).  
+**Edge cases:** NULL or empty `fn_name` → clear the callback (`free` + set NULL). Calling on a non-interactive widget (label, image) → no-op or store silently (harmless).
+
+#### Manifest reader (1 function)
+
+```c
+/* Note: __manifest_read is implemented in el_seed.c, not in the bridge. */
+/* Bridges do NOT need to implement this. */
+```
+
+`__manifest_read` is handled entirely in the platform-independent section of `el_seed.c`. It reads a JSON/EL manifest file from the path in the `EL_MANIFEST` environment variable. Bridge authors do not need to implement this.
+
+---
+
+## The Callback ABI
+
+When a platform event fires (button clicked, text changed), the bridge must call back into the El runtime. The mechanism:
+
+```c
+typedef void (*ElCb2)(int64_t handle, int64_t data);
+
+static void el_<platform>_invoke_cb(const char* fn_name, int64_t handle, const char* data) {
+    if (!fn_name || !*fn_name) return;
+    void* sym = dlsym(RTLD_DEFAULT, fn_name);
+    if (!sym) return;
+    ElCb2 fn = (ElCb2)sym;
+    fn(handle, (int64_t)(uintptr_t)(data ? data : ""));
+}
+```
+
+The El callback signature (in El source):
+```
+fn handler(handle: Int, data: String) -> Void
+```
+
+Which compiles to:
+```c
+void handler(int64_t handle, int64_t data)
+```
+
+Where `data` is a `const char*` cast to `int64_t` (the el `String` representation). For click events, `data` is `""`. For change/submit events, `data` is the current widget text.
+
+**On platforms without `dlsym`** (Windows, some embedded systems): use `GetProcAddress(GetModuleHandle(NULL), fn_name)` on Windows, or maintain a manual symbol registration table for embedded targets where dynamic linking is unavailable.
+
+**Thread safety for callbacks:** Callbacks fired from a background thread must be marshalled to the UI thread before calling into El code. El code may call `__widget_set_text` or other UI functions synchronously from within the callback — those must run on the UI thread.
+
+---
+
+## Thread Safety Contract
+
+**All platform UI operations must execute on the main/UI thread.** This is a hard requirement on every platform (AppKit, UIKit, GTK4, Win32, Android View, SDL2 main thread rule).
+
+The reference pattern (AppKit):
+```c
+static void el_appkit_sync_main(void (^block)(void)) {
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), block);
+    }
+}
+```
+
+For other platforms:
+- **GTK4:** `g_main_context_invoke` or `g_idle_add` + semaphore for synchronous dispatch
+- **Win32:** `SendMessage(hwnd, WM_APP, ...)` or `PostMessage` + wait
+- **Android:** `Activity.runOnUiThread`
+- **SDL2:** All ops must be called from the thread that initialized SDL (the main thread)
+- **LVGL:** `lv_lock()` / `lv_unlock()` for thread-safe access
+
+El program flow is: `main()` → build UI (on main thread) → `__native_run_loop()`. Because UI is built before the run loop starts, most widget creation calls are already on the main thread. The sync dispatch wrapper exists to handle callbacks that arrive on worker threads (e.g., network callbacks that update UI).
+
+---
+
+## Integration Pattern
+
+### In `el_native_target.h`
+
+Add an `#ifdef EL_TARGET_<PLATFORM>` block declaring all 33 `__*` functions with their `el_val_t` signatures (identical to the existing blocks for MACOS, LINUX, etc.):
+
+```c
+#ifdef EL_TARGET_<PLATFORM>
+
+void      __native_init(void);
+void      __native_run_loop(void);
+
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_<PLATFORM> */
+```
+
+### In `el_seed.c`
+
+Add an `#ifdef EL_TARGET_<PLATFORM>` block containing:
+1. `extern` declarations of all `el_<platform>_*` functions (your bridge's C API)
+2. Thin wrapper functions that marshal `el_val_t` ↔ C types and call through
+
+The wrapper pattern (copy from the `EL_TARGET_MACOS` block and substitute the platform name):
+
+```c
+#ifdef EL_TARGET_<PLATFORM>
+
+/* Forward declarations — implemented in el_<platform>.c */
+extern void    el_<platform>_init(void);
+extern void    el_<platform>_run_loop(void);
+extern int64_t el_<platform>_window_create(const char* title, int w, int h, int mw, int mh);
+/* ... all others ... */
+
+/* Wrappers */
+void __native_init(void)     { el_<platform>_init(); }
+void __native_run_loop(void) { el_<platform>_run_loop(); }
+
+el_val_t __window_create(el_val_t title, el_val_t width, el_val_t height,
+                          el_val_t min_width, el_val_t min_height) {
+    return (el_val_t)el_<platform>_window_create(
+        EL_CSTR(title),
+        (int)(int64_t)width, (int)(int64_t)height,
+        (int)(int64_t)min_width, (int)(int64_t)min_height);
+}
+
+void __window_show(el_val_t h)                  { el_<platform>_window_show((int64_t)h); }
+void __window_set_title(el_val_t h, el_val_t t) { el_<platform>_window_set_title((int64_t)h, EL_CSTR(t)); }
+
+/* ... continue for all 33 functions ... */
+
+#endif /* EL_TARGET_<PLATFORM> */
+```
+
+Key marshalling rules:
+- `el_val_t` → `int64_t` handle: `(int64_t)h`
+- `el_val_t` → `int`: `(int)(int64_t)value`
+- `el_val_t` → `const char*`: `EL_CSTR(value)`
+- `el_val_t` → `float`: `(float)el_to_float(value)` (for color channels)
+- `int64_t` handle → `el_val_t`: `(el_val_t)handle`
+- `const char*` → `el_val_t`: `EL_STR(str)` — but read the get_text note below
+
+**`__widget_get_text` note:** The bridge returns `const char*`. The `el_seed.c` wrapper wraps it with `EL_STR(s)`. The returned pointer must remain valid until the El program is done with it. The AppKit implementation returns a `strdup`'d string — the caller (seed wrapper) stores it without tracking it in the arena. This is a known lifetime edge; be consistent with the platform's existing pattern.
+
+---
+
+## How el Strings Work
+
+Inside El compiled C code, strings are `el_val_t` values where the value is the `uintptr_t` cast of a `const char*`:
+
+```c
+#define EL_STR(s)  ((el_val_t)(uintptr_t)(s))
+#define EL_CSTR(v) ((const char*)(uintptr_t)(v))
+```
+
+To construct a string result in `el_seed.c`:
+```c
+static char* s = strdup("hello");
+return EL_STR(s);
+```
+
+To read a string argument passed from El:
+```c
+const char* text = EL_CSTR(some_el_val_t_argument);
+```
+
+The `EL_STR` / `EL_CSTR` macros are defined in `el_seed.h` and are available in `el_seed.c`. Bridge files (`el_<platform>.c`) do not use these macros — they only deal in `const char*` at their API boundary.
+
+---
+
+## Known Gotchas
+
+### Duplicate symbols with `el_runtime.c`
+
+`el_runtime.c` defines many of the same `__`-prefixed symbols as `el_seed.c`. When linking both (required for the native-hello example), the linker will reject duplicate definitions. The build system uses `nmedit` (macOS) to hide the `el_runtime.c` copies of symbols that `el_seed.c` already defines, keeping `el_seed.c` canonical.
+
+If you are writing a build script for a new platform and see duplicate symbol link errors involving `__println`, `__print`, `__str_len`, etc., apply the same nmedit / `objcopy --weaken-symbol` / `strip --strip-symbol` trick from the macOS build to your platform's object file handling.
+
+### The `nmedit` trick on macOS
+
+```bash
+# Build a keep-list: symbols defined in el_seed.o but also in el_runtime.o
+nm el_seed.o   | awk '/^[0-9a-f]+ T _/{print $3}' | sort > .seed_T.txt
+nm el_runtime.o | awk '/^[0-9a-f]+ T _/{print $3}' | sort > .rt_T.txt
+# Keep only symbols unique to el_runtime.o
+comm -23 .rt_T.txt .seed_T.txt > .rt_keep.txt
+nmedit -s .rt_keep.txt el_runtime.o
+```
+
+On Linux, use `objcopy` with `--weaken-symbol` for each duplicate, or link `el_seed.o` before `el_runtime.o` and use `--allow-multiple-definition` if your use case permits it.
+
+### ObjC bridges must use MRC, not ARC
+
+Bridges that use Objective-C (AppKit, UIKit) **must** compile without ARC (`-fno-objc-arc`). The reason: the widget table stores `id` values in a plain C struct. ARC cannot insert retain/release through C struct boundaries, and will reject explicit `[obj retain]` / `[obj release]` calls in ARC mode. Use:
+
+```bash
+clang -ObjC -fno-objc-arc -framework Cocoa -c el_appkit.m
+```
+
+### Widget table struct — don't put `id` fields in C structs under ARC
+
+If you ever add ARC-managed object fields to the `ElWidget` struct, you will get a compile error. Keep the struct C-only (pointers as `void*` if you must, cast when using) or compile as MRC.
+
+### The `el_seed.c` `__manifest_read` is platform-independent
+
+`__manifest_read` is already implemented in `el_seed.c` (in the section compiled unconditionally). You do not implement it in your bridge. You do need to declare it in the `el_native_target.h` block for your platform (matching the other platforms), but `el_seed.c` already has the implementation.
+
+---
+
+## Completion Checklist
+
+Before declaring your bridge ready for integration:
+
+- [ ] All 33 `__*` functions implemented (including `__manifest_read` declaration, implementation is in seed)
+- [ ] Slot table with 4096 entries, scan starting at index 1
+- [ ] `el_widget_get` returns NULL for handle 0, negative, out-of-range, and FREE slots
+- [ ] All functions null-check `el_widget_get` result before use
+- [ ] `el_<platform>_init` is idempotent
+- [ ] `el_<platform>_run_loop` either never returns or is documented as a no-op (Android)
+- [ ] Callback dispatch via `dlsym` (or platform equivalent) implemented
+- [ ] All UI operations dispatched to the main/UI thread
+- [ ] `el_native_target.h` updated with `#ifdef EL_TARGET_<PLATFORM>` block
+- [ ] `el_seed.c` updated with `#ifdef EL_TARGET_<PLATFORM>` extern + wrapper block
+- [ ] Bridge compiles cleanly with no warnings: `cc -DEL_TARGET_<PLATFORM> -Wall -Wextra -c el_<platform>.c`
+- [ ] Bridge links cleanly with `el_seed.o` and `el_runtime.o` (duplicate symbol check)
+- [ ] `detect-platforms` script updated with detection logic for the new platform
+- [ ] Basic smoke test: create window → add label → show window → run loop

lang/el-compiler/runtime/detect-platforms

@@ -0,0 +1,208 @@
+#!/usr/bin/env bash
+# detect-platforms — probe available platform bridge dependencies
+#
+# Reports which el-native platform bridges can be built on this machine,
+# with install instructions for anything that is missing.
+#
+# Usage: ./detect-platforms
+#        ./build.sh platforms   (from native-hello)
+
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# ── Helpers ───────────────────────────────────────────────────────────────────
+
+PASS="[+]"
+FAIL="[ ]"
+
+_ok()   { printf "  ${PASS} %-22s %s\n" "$1" "$2"; }
+_miss() { printf "  ${FAIL} %-22s %s\n" "$1" "$2"; }
+
+# ── Header ────────────────────────────────────────────────────────────────────
+
+echo ""
+echo "==> el-native platform detection"
+echo ""
+echo "  Checking build dependencies for each platform bridge..."
+echo ""
+
+AVAILABLE=0
+MISSING=0
+
+# ── macOS / AppKit ────────────────────────────────────────────────────────────
+
+if [[ "$(uname)" == "Darwin" ]]; then
+    if xcrun --find clang &>/dev/null && xcrun --find xcodebuild &>/dev/null 2>/dev/null || \
+       xcrun --find cc &>/dev/null; then
+        CLT_INFO="Xcode CLT $(xcode-select -p 2>/dev/null | sed 's|/Developer||' || echo '')"
+        _ok "macOS/AppKit" "-DEL_TARGET_MACOS  ${CLT_INFO}"
+        AVAILABLE=$((AVAILABLE + 1))
+    else
+        _miss "macOS/AppKit" "-DEL_TARGET_MACOS  (Xcode CLT missing — xcode-select --install)"
+        MISSING=$((MISSING + 1))
+    fi
+else
+    _miss "macOS/AppKit" "-DEL_TARGET_MACOS  (not on macOS)"
+fi
+
+# ── iOS / UIKit ───────────────────────────────────────────────────────────────
+
+if [[ "$(uname)" == "Darwin" ]]; then
+    if xcrun --sdk iphoneos --show-sdk-path &>/dev/null 2>&1; then
+        SDK_VER=$(xcrun --sdk iphoneos --show-sdk-version 2>/dev/null || echo "")
+        _ok "iOS/UIKit" "-DEL_TARGET_IOS  SDK ${SDK_VER} (requires Xcode.app)"
+        AVAILABLE=$((AVAILABLE + 1))
+    else
+        _miss "iOS/UIKit" "-DEL_TARGET_IOS  (iOS SDK not found — install Xcode.app)"
+        MISSING=$((MISSING + 1))
+    fi
+else
+    _miss "iOS/UIKit" "-DEL_TARGET_IOS  (not on macOS — requires Xcode)"
+fi
+
+# ── Linux / GTK4 ──────────────────────────────────────────────────────────────
+
+if pkg-config --exists gtk4 2>/dev/null; then
+    GTK_VER=$(pkg-config --modversion gtk4 2>/dev/null)
+    _ok "Linux/GTK4" "-DEL_TARGET_LINUX  gtk4 ${GTK_VER}"
+    AVAILABLE=$((AVAILABLE + 1))
+else
+    _miss "Linux/GTK4" "-DEL_TARGET_LINUX  (gtk4 not found)"
+    echo "                             Install: apt install libgtk-4-dev"
+    echo "                                   or: dnf install gtk4-devel"
+    echo "                                   or: brew install gtk4"
+    MISSING=$((MISSING + 1))
+fi
+
+# ── SDL2 / Embedded Linux / Pi ────────────────────────────────────────────────
+
+SDL2_OK=0
+if pkg-config --exists sdl2 2>/dev/null; then
+    SDL2_VER=$(pkg-config --modversion sdl2 2>/dev/null)
+    # Also check for SDL2_ttf (needed for text rendering)
+    if pkg-config --exists SDL2_ttf 2>/dev/null; then
+        TTF_VER=$(pkg-config --modversion SDL2_ttf 2>/dev/null)
+        _ok "SDL2/Embedded" "-DEL_TARGET_SDL2  sdl2 ${SDL2_VER}, SDL2_ttf ${TTF_VER}"
+    else
+        _ok "SDL2/Embedded" "-DEL_TARGET_SDL2  sdl2 ${SDL2_VER} (SDL2_ttf missing — needed for text)"
+        echo "                             Install: apt install libsdl2-ttf-dev"
+    fi
+    SDL2_OK=1
+    AVAILABLE=$((AVAILABLE + 1))
+elif command -v sdl2-config &>/dev/null; then
+    SDL2_VER=$(sdl2-config --version 2>/dev/null || echo "")
+    _ok "SDL2/Embedded" "-DEL_TARGET_SDL2  sdl2 ${SDL2_VER} (via sdl2-config)"
+    SDL2_OK=1
+    AVAILABLE=$((AVAILABLE + 1))
+fi
+
+if [[ $SDL2_OK -eq 0 ]]; then
+    _miss "SDL2/Embedded" "-DEL_TARGET_SDL2  (sdl2 not found)"
+    echo "                             Install: apt install libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev"
+    echo "                                   or: brew install sdl2 sdl2_ttf sdl2_image"
+    MISSING=$((MISSING + 1))
+fi
+
+# ── LVGL / Microcontrollers ───────────────────────────────────────────────────
+
+LVGL_OK=0
+LVGL_WHERE=""
+
+if [ -f "${SCRIPT_DIR}/lvgl/lvgl.h" ]; then
+    LVGL_WHERE="./lvgl/lvgl.h"
+    LVGL_OK=1
+elif [ -f "${SCRIPT_DIR}/../lvgl/lvgl.h" ]; then
+    LVGL_WHERE="adjacent lvgl/"
+    LVGL_OK=1
+elif [ -f "/usr/include/lvgl/lvgl.h" ]; then
+    LVGL_WHERE="/usr/include/lvgl"
+    LVGL_OK=1
+elif [ -f "/usr/local/include/lvgl/lvgl.h" ]; then
+    LVGL_WHERE="/usr/local/include/lvgl"
+    LVGL_OK=1
+elif pkg-config --exists lvgl 2>/dev/null; then
+    LVGL_WHERE="pkg-config ($(pkg-config --modversion lvgl 2>/dev/null))"
+    LVGL_OK=1
+fi
+
+if [[ $LVGL_OK -eq 1 ]]; then
+    _ok "LVGL/MCU" "-DEL_TARGET_LVGL  ${LVGL_WHERE}"
+    AVAILABLE=$((AVAILABLE + 1))
+else
+    _miss "LVGL/MCU" "-DEL_TARGET_LVGL  (lvgl.h not found)"
+    echo "                             Install: git clone https://github.com/lvgl/lvgl"
+    echo "                                      (place lvgl/ next to el-compiler/runtime/)"
+    MISSING=$((MISSING + 1))
+fi
+
+# ── Android / JNI ─────────────────────────────────────────────────────────────
+
+ANDROID_OK=0
+ANDROID_WHERE=""
+
+if [ -n "${ANDROID_NDK_HOME:-}" ] && [ -d "${ANDROID_NDK_HOME}" ]; then
+    NDK_VER=""
+    if [ -f "${ANDROID_NDK_HOME}/source.properties" ]; then
+        NDK_VER=$(grep "Pkg.Revision" "${ANDROID_NDK_HOME}/source.properties" \
+                  2>/dev/null | cut -d= -f2 | tr -d ' ' || echo "")
+    fi
+    ANDROID_WHERE="NDK ${NDK_VER:-(version unknown)} at \$ANDROID_NDK_HOME"
+    ANDROID_OK=1
+elif command -v ndk-build &>/dev/null; then
+    ANDROID_WHERE="ndk-build in PATH"
+    ANDROID_OK=1
+elif [ -n "${ANDROID_HOME:-}" ] && [ -d "${ANDROID_HOME}/ndk" ]; then
+    ANDROID_WHERE="NDK via \$ANDROID_HOME/ndk"
+    ANDROID_OK=1
+fi
+
+if [[ $ANDROID_OK -eq 1 ]]; then
+    _ok "Android/JNI" "-DEL_TARGET_ANDROID  ${ANDROID_WHERE}"
+    AVAILABLE=$((AVAILABLE + 1))
+else
+    _miss "Android/JNI" "-DEL_TARGET_ANDROID  (ANDROID_NDK_HOME not set)"
+    echo "                             Install: https://developer.android.com/studio/releases/ndk"
+    echo "                             Then: export ANDROID_NDK_HOME=/path/to/ndk"
+    MISSING=$((MISSING + 1))
+fi
+
+# ── Windows / Win32 (cross or native) ─────────────────────────────────────────
+
+WIN32_OK=0
+WIN32_WHERE=""
+
+if [[ "$(uname)" == MINGW* ]] || [[ "$(uname)" == CYGWIN* ]] || \
+   [[ "$(uname)" == MSYS* ]]; then
+    WIN32_WHERE="native Windows ($(uname))"
+    WIN32_OK=1
+elif command -v x86_64-w64-mingw32-gcc &>/dev/null; then
+    MINGW_VER=$(x86_64-w64-mingw32-gcc --version 2>/dev/null | head -1 || echo "")
+    WIN32_WHERE="mingw cross-compiler — ${MINGW_VER}"
+    WIN32_OK=1
+elif command -v i686-w64-mingw32-gcc &>/dev/null; then
+    WIN32_WHERE="mingw 32-bit cross-compiler"
+    WIN32_OK=1
+fi
+
+if [[ $WIN32_OK -eq 1 ]]; then
+    _ok "Windows/Win32" "-DEL_TARGET_WIN32  ${WIN32_WHERE}"
+    AVAILABLE=$((AVAILABLE + 1))
+else
+    _miss "Windows/Win32" "-DEL_TARGET_WIN32  (mingw cross-compiler not found)"
+    echo "                             Install: brew install mingw-w64"
+    echo "                                   or: apt install gcc-mingw-w64"
+    MISSING=$((MISSING + 1))
+fi
+
+# ── Summary ───────────────────────────────────────────────────────────────────
+
+echo ""
+echo "  ${AVAILABLE} platform(s) available, ${MISSING} unavailable on this machine."
+echo ""
+
+if [[ -x "${SCRIPT_DIR}/new-platform" ]]; then
+    echo "  Scaffold a new bridge:  ${SCRIPT_DIR}/new-platform <name>"
+fi
+echo "  Bridge contract:        ${SCRIPT_DIR}/PLATFORM_BRIDGE_SPEC.md"
+echo ""

lang/el-compiler/runtime/el_android.c

@@ -0,0 +1,949 @@
+/*
+ * el_android.c — Android JNI backend for the el native widget system.
+ *
+ * This file implements the Android widget layer that el_seed.c calls through
+ * to when EL_TARGET_ANDROID is defined.  It is the exact Android counterpart
+ * to el_appkit.m and presents the same C API surface.
+ *
+ * Architecture:
+ *   el program (el code)
+ *       → __widget_* C builtins in el_seed.c
+ *           → el_android_* C-callable functions declared here
+ *               → ElBridge static methods in Java via JNI
+ *                   → android.view.View subclasses on the UI thread
+ *
+ * Widget handles: every widget (window root, view, control) is assigned an
+ * int64_t slot index into view_slots[].  The el program holds these as opaque
+ * Int values.  Slot 0 is never valid (null handle = -1 convention).
+ *
+ * Threading: Android requires all UI operations to run on the main (UI) thread.
+ * Every JNI call that mutates a View is dispatched through
+ * Activity.runOnUiThread(Runnable) if the current thread is not the UI thread.
+ * el_android_run_loop is a no-op — Android lifecycle is driven by the Activity.
+ *
+ * Callback mechanism: when a widget fires an event Java calls
+ *   nativeOnClick / nativeOnChange / nativeOnSubmit
+ * The C side looks up the registered El function name for that slot, then:
+ *   dlsym(RTLD_DEFAULT, fn_name)(widget_handle, event_data_string)
+ * This matches the __thread_create pattern in el_seed.c exactly.
+ *
+ * Compile / link (as part of libelruntime.so):
+ *   Compiled by the Android Gradle NDK build system with -DEL_TARGET_ANDROID.
+ *   Link flags: -landroid -llog -ldl
+ *
+ * Java companion: ElBridge.java in the same directory must be compiled into
+ * the Android application's APK (package com.neuron.el).
+ */
+
+#ifdef EL_TARGET_ANDROID
+
+#include <jni.h>
+#include <android/log.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dlfcn.h>
+#include "el_runtime.h"
+
+/* ── Logging ─────────────────────────────────────────────────────────────── */
+
+#define EL_TAG "ElAndroid"
+#define EL_LOGI(...) __android_log_print(ANDROID_LOG_INFO,  EL_TAG, __VA_ARGS__)
+#define EL_LOGW(...) __android_log_print(ANDROID_LOG_WARN,  EL_TAG, __VA_ARGS__)
+#define EL_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, EL_TAG, __VA_ARGS__)
+
+/* ── JNI global state ────────────────────────────────────────────────────── */
+
+static JavaVM  *g_jvm          = NULL;
+static jobject  g_activity     = NULL;   /* global ref to Activity */
+static jclass   g_bridge_class = NULL;   /* global ref to ElBridge class */
+
+/* Cached method IDs on ElBridge — filled in el_android_init(). */
+static jmethodID g_mid_createLinearLayout  = NULL;
+static jmethodID g_mid_createFrameLayout   = NULL;
+static jmethodID g_mid_createScrollView    = NULL;
+static jmethodID g_mid_createTextView      = NULL;
+static jmethodID g_mid_createButton        = NULL;
+static jmethodID g_mid_createEditText      = NULL;
+static jmethodID g_mid_createImageView     = NULL;
+static jmethodID g_mid_setContentView      = NULL;
+static jmethodID g_mid_setTitle            = NULL;
+static jmethodID g_mid_addChild            = NULL;
+static jmethodID g_mid_removeChild         = NULL;
+static jmethodID g_mid_destroyView         = NULL;
+static jmethodID g_mid_setText             = NULL;
+static jmethodID g_mid_getText             = NULL;
+static jmethodID g_mid_setTextColor        = NULL;
+static jmethodID g_mid_setBackgroundColor  = NULL;
+static jmethodID g_mid_setFont             = NULL;
+static jmethodID g_mid_setPadding          = NULL;
+static jmethodID g_mid_setWidth            = NULL;
+static jmethodID g_mid_setHeight           = NULL;
+static jmethodID g_mid_setFlex             = NULL;
+static jmethodID g_mid_setCornerRadius     = NULL;
+static jmethodID g_mid_setEnabled          = NULL;
+static jmethodID g_mid_setVisibility       = NULL;
+static jmethodID g_mid_setOnClickListener  = NULL;
+static jmethodID g_mid_setOnChangeListener = NULL;
+static jmethodID g_mid_setOnSubmitListener = NULL;
+static jmethodID g_mid_runOnUiThread       = NULL;  /* Activity.runOnUiThread */
+
+/* ── Widget table ─────────────────────────────────────────────────────────── */
+
+#define EL_ANDROID_MAX_WIDGETS 4096
+
+typedef enum {
+    EL_WIDGET_FREE      = 0,
+    EL_WIDGET_WINDOW    = 1,
+    EL_WIDGET_VSTACK    = 2,
+    EL_WIDGET_HSTACK    = 3,
+    EL_WIDGET_ZSTACK    = 4,
+    EL_WIDGET_SCROLL    = 5,
+    EL_WIDGET_LABEL     = 6,
+    EL_WIDGET_BUTTON    = 7,
+    EL_WIDGET_TEXTFIELD = 8,
+    EL_WIDGET_TEXTAREA  = 9,
+    EL_WIDGET_IMAGE     = 10,
+} ElWidgetKind;
+
+typedef struct {
+    ElWidgetKind kind;
+    jint         slot;       /* Java-side slot index (matches C index) */
+    char        *cb_click;   /* El function name for click / submit events */
+    char        *cb_change;  /* El function name for value-change events */
+} ElWidget;
+
+static ElWidget _el_widgets[EL_ANDROID_MAX_WIDGETS];
+
+static int64_t el_widget_alloc(ElWidgetKind kind, jint slot) {
+    for (int i = 1; i < EL_ANDROID_MAX_WIDGETS; i++) {
+        if (_el_widgets[i].kind == EL_WIDGET_FREE) {
+            _el_widgets[i].kind      = kind;
+            _el_widgets[i].slot      = slot;
+            _el_widgets[i].cb_click  = NULL;
+            _el_widgets[i].cb_change = NULL;
+            return (int64_t)i;
+        }
+    }
+    EL_LOGE("el_widget_alloc: slot table full");
+    return -1;
+}
+
+static ElWidget *el_widget_get(int64_t handle) {
+    if (handle <= 0 || handle >= EL_ANDROID_MAX_WIDGETS) return NULL;
+    if (_el_widgets[handle].kind == EL_WIDGET_FREE)       return NULL;
+    return &_el_widgets[handle];
+}
+
+static void el_widget_free(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    w->kind = EL_WIDGET_FREE;
+    w->slot = -1;
+    free(w->cb_click);  w->cb_click  = NULL;
+    free(w->cb_change); w->cb_change = NULL;
+}
+
+/* ── JNI environment helpers ─────────────────────────────────────────────── */
+
+/*
+ * Obtain a JNIEnv for the calling thread.  Attaches the thread to the JVM if
+ * needed (detaches in el_jni_detach_if_attached — call in pairs).
+ */
+static int g_was_attached = 0;  /* thread-local would be cleaner but this is
+                                   safe for single-threaded el programs */
+
+static JNIEnv *el_jni_env(void) {
+    if (!g_jvm) return NULL;
+    JNIEnv *env = NULL;
+    jint rc = (*g_jvm)->GetEnv(g_jvm, (void **)&env, JNI_VERSION_1_6);
+    if (rc == JNI_OK)      { g_was_attached = 0; return env; }
+    if (rc == JNI_EDETACHED) {
+        if ((*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL) == JNI_OK) {
+            g_was_attached = 1;
+            return env;
+        }
+    }
+    EL_LOGE("el_jni_env: failed to obtain JNIEnv");
+    return NULL;
+}
+
+static void el_jni_detach_if_attached(void) {
+    if (g_was_attached && g_jvm) {
+        (*g_jvm)->DetachCurrentThread(g_jvm);
+        g_was_attached = 0;
+    }
+}
+
+/* ── UI-thread dispatch ──────────────────────────────────────────────────── */
+/*
+ * Most ElBridge static methods already dispatch to the UI thread internally
+ * (they call Activity.runOnUiThread).  The helper below is available for
+ * cases where the caller needs to be sure the call has completed before
+ * returning (ElBridge methods marked "sync" use a CountDownLatch internally).
+ *
+ * For the current implementation we call ElBridge methods directly; ElBridge
+ * itself marshals to the UI thread via Activity.runOnUiThread + latch.
+ * This keeps the C side simple and mirrors the AppKit dispatch_sync pattern.
+ */
+
+/* ── JNI_OnLoad ──────────────────────────────────────────────────────────── */
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
+    (void)reserved;
+    g_jvm = vm;
+    EL_LOGI("JNI_OnLoad: el Android bridge loaded");
+    return JNI_VERSION_1_6;
+}
+
+/* ── el_android_init ─────────────────────────────────────────────────────── */
+/*
+ * Called from __native_init().  The Activity must have already called
+ * ElBridge.registerActivity(activity) from Java before this runs, which sets
+ * g_activity via the nativeRegisterActivity JNI method below.
+ *
+ * Caches all method IDs used later so individual widget calls avoid repeated
+ * FindClass / GetStaticMethodID lookups.
+ */
+void el_android_init(void) {
+    static int done = 0;
+    if (done) return;
+    done = 1;
+
+    JNIEnv *env = el_jni_env();
+    if (!env) { EL_LOGE("el_android_init: no JNIEnv"); return; }
+
+    jclass cls = (*env)->FindClass(env, "com/neuron/el/ElBridge");
+    if (!cls) { EL_LOGE("el_android_init: ElBridge class not found"); return; }
+    g_bridge_class = (*env)->NewGlobalRef(env, cls);
+    (*env)->DeleteLocalRef(env, cls);
+
+#define CACHE_STATIC(var, name, sig) \
+    var = (*env)->GetStaticMethodID(env, g_bridge_class, name, sig); \
+    if (!var) EL_LOGW("el_android_init: method not found: %s %s", name, sig)
+
+    CACHE_STATIC(g_mid_createLinearLayout,  "createLinearLayout",  "(II)I");
+    CACHE_STATIC(g_mid_createFrameLayout,   "createFrameLayout",   "()I");
+    CACHE_STATIC(g_mid_createScrollView,    "createScrollView",     "()I");
+    CACHE_STATIC(g_mid_createTextView,      "createTextView",       "(Ljava/lang/String;)I");
+    CACHE_STATIC(g_mid_createButton,        "createButton",         "(Ljava/lang/String;)I");
+    CACHE_STATIC(g_mid_createEditText,      "createEditText",       "(Ljava/lang/String;Z)I");
+    CACHE_STATIC(g_mid_createImageView,     "createImageView",      "(Ljava/lang/String;)I");
+    CACHE_STATIC(g_mid_setContentView,      "setContentView",       "(I)V");
+    CACHE_STATIC(g_mid_setTitle,            "setTitle",             "(Ljava/lang/String;)V");
+    CACHE_STATIC(g_mid_addChild,            "addChild",             "(II)V");
+    CACHE_STATIC(g_mid_removeChild,         "removeChild",          "(II)V");
+    CACHE_STATIC(g_mid_destroyView,         "destroyView",          "(I)V");
+    CACHE_STATIC(g_mid_setText,             "setText",              "(ILjava/lang/String;)V");
+    CACHE_STATIC(g_mid_getText,             "getText",              "(I)Ljava/lang/String;");
+    CACHE_STATIC(g_mid_setTextColor,        "setTextColor",         "(IFFFF)V");
+    CACHE_STATIC(g_mid_setBackgroundColor,  "setBackgroundColor",   "(IFFFF)V");
+    CACHE_STATIC(g_mid_setFont,             "setFont",              "(ILjava/lang/String;IZ)V");
+    CACHE_STATIC(g_mid_setPadding,          "setPadding",           "(IIIII)V");
+    CACHE_STATIC(g_mid_setWidth,            "setWidth",             "(II)V");
+    CACHE_STATIC(g_mid_setHeight,           "setHeight",            "(II)V");
+    CACHE_STATIC(g_mid_setFlex,             "setFlex",              "(II)V");
+    CACHE_STATIC(g_mid_setCornerRadius,     "setCornerRadius",      "(IF)V");
+    CACHE_STATIC(g_mid_setEnabled,          "setEnabled",           "(IZ)V");
+    CACHE_STATIC(g_mid_setVisibility,       "setVisibility",        "(IZ)V");
+    CACHE_STATIC(g_mid_setOnClickListener,  "setOnClickListener",   "(I)V");
+    CACHE_STATIC(g_mid_setOnChangeListener, "setOnChangeListener",  "(I)V");
+    CACHE_STATIC(g_mid_setOnSubmitListener, "setOnSubmitListener",  "(I)V");
+#undef CACHE_STATIC
+
+    el_jni_detach_if_attached();
+    EL_LOGI("el_android_init: complete");
+}
+
+/* ── JNI: Activity registration ─────────────────────────────────────────── */
+
+/*
+ * Called from Java: ElBridge.registerActivity(activity) calls back here.
+ * Stores a global reference to the Activity so C code can dispatch to it.
+ */
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeRegisterActivity(JNIEnv *env, jclass cls,
+                                                    jobject activity) {
+    (void)cls;
+    if (g_activity) {
+        (*env)->DeleteGlobalRef(env, g_activity);
+        g_activity = NULL;
+    }
+    if (activity) {
+        g_activity = (*env)->NewGlobalRef(env, activity);
+        EL_LOGI("nativeRegisterActivity: activity registered");
+    }
+}
+
+/* ── El callback invocation ──────────────────────────────────────────────── */
+/*
+ * Invoke an El callback by symbol name.
+ * Signature matches AppKit: fn(handle: Int, data: String) -> Void
+ *   compiled to: void fn(el_val_t handle, el_val_t data)
+ */
+typedef void (*ElCb2)(int64_t handle, int64_t data);
+
+static void el_android_invoke_cb(const char *fn_name, int64_t handle,
+                                  const char *data) {
+    if (!fn_name || !*fn_name) return;
+    void *sym = dlsym(RTLD_DEFAULT, fn_name);
+    if (!sym) { EL_LOGW("invoke_cb: symbol not found: %s", fn_name); return; }
+    ElCb2 fn = (ElCb2)sym;
+    fn(handle, (int64_t)(uintptr_t)(data ? data : ""));
+}
+
+/* ── JNI: callbacks from Java → C ───────────────────────────────────────── */
+
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeOnClick(JNIEnv *env, jclass cls, jint slot) {
+    (void)env; (void)cls;
+    int64_t handle = (int64_t)slot;
+    ElWidget *w = el_widget_get(handle);
+    if (w && w->cb_click) {
+        el_android_invoke_cb(w->cb_click, handle, "");
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeOnChange(JNIEnv *env, jclass cls,
+                                            jint slot, jstring text) {
+    (void)cls;
+    int64_t handle = (int64_t)slot;
+    ElWidget *w = el_widget_get(handle);
+    if (w && w->cb_change) {
+        const char *ctext = text ? (*env)->GetStringUTFChars(env, text, NULL) : "";
+        el_android_invoke_cb(w->cb_change, handle, ctext);
+        if (text) (*env)->ReleaseStringUTFChars(env, text, ctext);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeOnSubmit(JNIEnv *env, jclass cls,
+                                            jint slot, jstring text) {
+    (void)cls;
+    int64_t handle = (int64_t)slot;
+    ElWidget *w = el_widget_get(handle);
+    if (w && w->cb_click) {   /* submit stored in cb_click, same as AppKit */
+        const char *ctext = text ? (*env)->GetStringUTFChars(env, text, NULL) : "";
+        el_android_invoke_cb(w->cb_click, handle, ctext);
+        if (text) (*env)->ReleaseStringUTFChars(env, text, ctext);
+    }
+}
+
+/* ── Helper: jstring from C string ──────────────────────────────────────── */
+
+static jstring el_jstr(JNIEnv *env, const char *s) {
+    return (*env)->NewStringUTF(env, s ? s : "");
+}
+
+/* ── Window ──────────────────────────────────────────────────────────────── */
+
+/*
+ * el_android_window_create — on Android a "window" is the root LinearLayout
+ * set as the Activity's content view.  We create a vertical LinearLayout and
+ * store it.  el_android_window_show calls setContentView on the Activity.
+ */
+int64_t el_android_window_create(const char *title, int width, int height,
+                                  int min_width, int min_height) {
+    (void)width; (void)height; (void)min_width; (void)min_height;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+
+    /* VERTICAL LinearLayout with no spacing (spacing added via margins in Java) */
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createLinearLayout,
+                                            (jint)1 /* VERTICAL */, (jint)0);
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1;
+    }
+
+    /* Set activity title */
+    if (g_mid_setTitle && title) {
+        jstring jtitle = el_jstr(env, title);
+        (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setTitle, jtitle);
+        (*env)->DeleteLocalRef(env, jtitle);
+    }
+
+    int64_t handle = el_widget_alloc(EL_WIDGET_WINDOW, (int)slot);
+    el_jni_detach_if_attached();
+    return handle;
+}
+
+void el_android_window_show(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w || w->kind != EL_WIDGET_WINDOW) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setContentView,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_window_set_title(int64_t handle, const char *title) {
+    (void)handle;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    jstring jtitle = el_jstr(env, title);
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setTitle, jtitle);
+    (*env)->DeleteLocalRef(env, jtitle);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Layout containers ───────────────────────────────────────────────────── */
+
+int64_t el_android_vstack_create(int spacing) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createLinearLayout,
+                                            (jint)1 /* VERTICAL */, (jint)spacing);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_VSTACK, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_hstack_create(int spacing) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createLinearLayout,
+                                            (jint)0 /* HORIZONTAL */, (jint)spacing);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_HSTACK, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_zstack_create(void) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createFrameLayout);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_ZSTACK, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_scroll_create(void) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createScrollView);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_SCROLL, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+/* ── Widget factories ─────────────────────────────────────────────────────── */
+
+int64_t el_android_label_create(const char *text) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jt = el_jstr(env, text);
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createTextView, jt);
+    (*env)->DeleteLocalRef(env, jt);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_LABEL, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_button_create(const char *label) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jl = el_jstr(env, label);
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createButton, jl);
+    (*env)->DeleteLocalRef(env, jl);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_BUTTON, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_text_field_create(const char *placeholder) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jp = el_jstr(env, placeholder);
+    /* singleLine = true */
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createEditText, jp, (jboolean)JNI_TRUE);
+    (*env)->DeleteLocalRef(env, jp);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_TEXTFIELD, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_text_area_create(const char *placeholder) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jp = el_jstr(env, placeholder);
+    /* singleLine = false → multiline EditText */
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createEditText, jp, (jboolean)JNI_FALSE);
+    (*env)->DeleteLocalRef(env, jp);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_TEXTAREA, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_image_create(const char *path) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jp = el_jstr(env, path);
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createImageView, jp);
+    (*env)->DeleteLocalRef(env, jp);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_IMAGE, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+/* ── Widget property setters ─────────────────────────────────────────────── */
+
+void el_android_widget_set_text(int64_t handle, const char *text) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    jstring jt = el_jstr(env, text);
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setText,
+                                 (jint)w->slot, jt);
+    (*env)->DeleteLocalRef(env, jt);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+const char *el_android_widget_get_text(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return "";
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return "";
+    jstring js = (jstring)(*env)->CallStaticObjectMethod(env, g_bridge_class,
+                                                          g_mid_getText,
+                                                          (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return ""; }
+    const char *result = "";
+    if (js) {
+        const char *cstr = (*env)->GetStringUTFChars(env, js, NULL);
+        result = cstr ? strdup(cstr) : "";
+        if (cstr) (*env)->ReleaseStringUTFChars(env, js, cstr);
+        (*env)->DeleteLocalRef(env, js);
+    }
+    el_jni_detach_if_attached();
+    return result;
+}
+
+void el_android_widget_set_color(int64_t handle, float r, float g, float b, float a) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setTextColor,
+                                 (jint)w->slot, (jfloat)r, (jfloat)g,
+                                 (jfloat)b, (jfloat)a);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_bg_color(int64_t handle, float r, float g, float b, float a) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setBackgroundColor,
+                                 (jint)w->slot, (jfloat)r, (jfloat)g,
+                                 (jfloat)b, (jfloat)a);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_font(int64_t handle, const char *family, int size, int bold) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    jstring jfam = el_jstr(env, family);
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setFont,
+                                 (jint)w->slot, jfam, (jint)size,
+                                 (jboolean)(bold ? JNI_TRUE : JNI_FALSE));
+    (*env)->DeleteLocalRef(env, jfam);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_padding(int64_t handle, int top, int right, int bottom, int left) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setPadding,
+                                 (jint)w->slot, (jint)top, (jint)right,
+                                 (jint)bottom, (jint)left);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_width(int64_t handle, int width) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setWidth,
+                                 (jint)w->slot, (jint)width);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_height(int64_t handle, int height) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setHeight,
+                                 (jint)w->slot, (jint)height);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_flex(int64_t handle, int flex) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setFlex,
+                                 (jint)w->slot, (jint)flex);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_corner_radius(int64_t handle, int radius) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setCornerRadius,
+                                 (jint)w->slot, (jfloat)radius);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_disabled(int64_t handle, int disabled) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setEnabled,
+                                 (jint)w->slot,
+                                 (jboolean)(disabled ? JNI_FALSE : JNI_TRUE));
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_hidden(int64_t handle, int hidden) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    /* visible=true means NOT hidden */
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setVisibility,
+                                 (jint)w->slot,
+                                 (jboolean)(hidden ? JNI_FALSE : JNI_TRUE));
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Child management ─────────────────────────────────────────────────────── */
+
+void el_android_widget_add_child(int64_t parent, int64_t child) {
+    ElWidget *pw = el_widget_get(parent);
+    ElWidget *cw = el_widget_get(child);
+    if (!pw || !cw) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_addChild,
+                                 (jint)pw->slot, (jint)cw->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_remove_child(int64_t parent, int64_t child) {
+    ElWidget *pw = el_widget_get(parent);
+    ElWidget *cw = el_widget_get(child);
+    if (!pw || !cw) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_removeChild,
+                                 (jint)pw->slot, (jint)cw->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Event registration ───────────────────────────────────────────────────── */
+
+void el_android_widget_on_click(int64_t handle, const char *fn_name) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_click);
+    w->cb_click = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+    if (!w->cb_click) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setOnClickListener,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_on_change(int64_t handle, const char *fn_name) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_change);
+    w->cb_change = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+    if (!w->cb_change) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setOnChangeListener,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_on_submit(int64_t handle, const char *fn_name) {
+    /* Submit stored in cb_click, same as AppKit. */
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_click);
+    w->cb_click = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+    if (!w->cb_click) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setOnSubmitListener,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Widget destroy ───────────────────────────────────────────────────────── */
+
+void el_android_widget_destroy(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (env && g_bridge_class) {
+        (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_destroyView,
+                                     (jint)w->slot);
+        if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    }
+    el_widget_free(handle);
+    el_jni_detach_if_attached();
+}
+
+/* ── Manifest reader ─────────────────────────────────────────────────────── */
+/*
+ * __manifest_read: parse the app{} block from a manifest file.
+ * Returns the raw file contents as an el_val_t (const char* cast).
+ * The caller (el program) parses the returned string.
+ * Reads from the filesystem; for APK assets use the AssetManager path instead.
+ */
+static char *el_read_file(const char *path) {
+    if (!path || !*path) return NULL;
+    FILE *f = fopen(path, "rb");
+    if (!f) return NULL;
+    fseek(f, 0, SEEK_END);
+    long len = ftell(f);
+    fseek(f, 0, SEEK_SET);
+    if (len <= 0) { fclose(f); return NULL; }
+    char *buf = (char *)malloc((size_t)len + 1);
+    if (!buf) { fclose(f); return NULL; }
+    fread(buf, 1, (size_t)len, f);
+    buf[len] = '\0';
+    fclose(f);
+    return buf;
+}
+
+el_val_t el_android_manifest_read(const char *path) {
+    char *contents = el_read_file(path);
+    if (!contents) return (el_val_t)(uintptr_t)"";
+    return (el_val_t)(uintptr_t)contents;  /* caller owns allocation */
+}
+
+/* ── __widget_* C API (called from el_seed.c) ────────────────────────────── */
+/*
+ * These are the functions declared in el_native_target.h under EL_TARGET_ANDROID.
+ * They forward to the el_android_* internal functions above.
+ *
+ * The el_val_t / int64_t ABI matches the AppKit functions exactly:
+ *   - Integer params passed as int64_t, extracted with (int)
+ *   - String params passed as int64_t, extracted with (const char*)(uintptr_t)
+ *   - Float params (r,g,b,a) passed as int64_t bit-cast from double; extracted
+ *     with el_to_float / bit-cast union
+ */
+
+static inline float el_val_to_float(el_val_t v) {
+    union { double d; int64_t i; } u;
+    u.i = v;
+    return (float)u.d;
+}
+
+void __native_init(void) {
+    el_android_init();
+}
+
+void __native_run_loop(void) {
+    /* No-op on Android — lifecycle is driven by the Activity. */
+}
+
+el_val_t __window_create(el_val_t title, el_val_t width, el_val_t height,
+                          el_val_t min_width, el_val_t min_height) {
+    return (el_val_t)el_android_window_create(
+        (const char *)(uintptr_t)title,
+        (int)width, (int)height, (int)min_width, (int)min_height);
+}
+
+void __window_show(el_val_t handle) {
+    el_android_window_show((int64_t)handle);
+}
+
+void __window_set_title(el_val_t handle, el_val_t title) {
+    el_android_window_set_title((int64_t)handle,
+                                (const char *)(uintptr_t)title);
+}
+
+el_val_t __vstack_create(el_val_t spacing) {
+    return (el_val_t)el_android_vstack_create((int)spacing);
+}
+
+el_val_t __hstack_create(el_val_t spacing) {
+    return (el_val_t)el_android_hstack_create((int)spacing);
+}
+
+el_val_t __zstack_create(void) {
+    return (el_val_t)el_android_zstack_create();
+}
+
+el_val_t __scroll_create(void) {
+    return (el_val_t)el_android_scroll_create();
+}
+
+el_val_t __label_create(el_val_t text) {
+    return (el_val_t)el_android_label_create((const char *)(uintptr_t)text);
+}
+
+el_val_t __button_create(el_val_t label) {
+    return (el_val_t)el_android_button_create((const char *)(uintptr_t)label);
+}
+
+el_val_t __text_field_create(el_val_t placeholder) {
+    return (el_val_t)el_android_text_field_create((const char *)(uintptr_t)placeholder);
+}
+
+el_val_t __text_area_create(el_val_t placeholder) {
+    return (el_val_t)el_android_text_area_create((const char *)(uintptr_t)placeholder);
+}
+
+el_val_t __image_create(el_val_t path_or_name) {
+    return (el_val_t)el_android_image_create((const char *)(uintptr_t)path_or_name);
+}
+
+void __widget_set_text(el_val_t handle, el_val_t text) {
+    el_android_widget_set_text((int64_t)handle,
+                               (const char *)(uintptr_t)text);
+}
+
+el_val_t __widget_get_text(el_val_t handle) {
+    return (el_val_t)(uintptr_t)el_android_widget_get_text((int64_t)handle);
+}
+
+void __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                         el_val_t b, el_val_t a) {
+    el_android_widget_set_color((int64_t)handle,
+                                el_val_to_float(r), el_val_to_float(g),
+                                el_val_to_float(b), el_val_to_float(a));
+}
+
+void __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                            el_val_t b, el_val_t a) {
+    el_android_widget_set_bg_color((int64_t)handle,
+                                   el_val_to_float(r), el_val_to_float(g),
+                                   el_val_to_float(b), el_val_to_float(a));
+}
+
+void __widget_set_font(el_val_t handle, el_val_t family,
+                        el_val_t size, el_val_t bold) {
+    el_android_widget_set_font((int64_t)handle,
+                               (const char *)(uintptr_t)family,
+                               (int)size, (int)bold);
+}
+
+void __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                           el_val_t bottom, el_val_t left) {
+    el_android_widget_set_padding((int64_t)handle,
+                                  (int)top, (int)right, (int)bottom, (int)left);
+}
+
+void __widget_set_width(el_val_t handle, el_val_t width) {
+    el_android_widget_set_width((int64_t)handle, (int)width);
+}
+
+void __widget_set_height(el_val_t handle, el_val_t height) {
+    el_android_widget_set_height((int64_t)handle, (int)height);
+}
+
+void __widget_set_flex(el_val_t handle, el_val_t flex) {
+    el_android_widget_set_flex((int64_t)handle, (int)flex);
+}
+
+void __widget_set_corner_radius(el_val_t handle, el_val_t radius) {
+    el_android_widget_set_corner_radius((int64_t)handle, (int)radius);
+}
+
+void __widget_set_disabled(el_val_t handle, el_val_t disabled) {
+    el_android_widget_set_disabled((int64_t)handle, (int)disabled);
+}
+
+void __widget_set_hidden(el_val_t handle, el_val_t hidden) {
+    el_android_widget_set_hidden((int64_t)handle, (int)hidden);
+}
+
+void __widget_add_child(el_val_t parent, el_val_t child) {
+    el_android_widget_add_child((int64_t)parent, (int64_t)child);
+}
+
+void __widget_remove_child(el_val_t parent, el_val_t child) {
+    el_android_widget_remove_child((int64_t)parent, (int64_t)child);
+}
+
+void __widget_destroy(el_val_t handle) {
+    el_android_widget_destroy((int64_t)handle);
+}
+
+void __widget_on_click(el_val_t handle, el_val_t fn_name) {
+    el_android_widget_on_click((int64_t)handle,
+                               (const char *)(uintptr_t)fn_name);
+}
+
+void __widget_on_change(el_val_t handle, el_val_t fn_name) {
+    el_android_widget_on_change((int64_t)handle,
+                                (const char *)(uintptr_t)fn_name);
+}
+
+void __widget_on_submit(el_val_t handle, el_val_t fn_name) {
+    el_android_widget_on_submit((int64_t)handle,
+                                (const char *)(uintptr_t)fn_name);
+}
+
+el_val_t __manifest_read(el_val_t path) {
+    return el_android_manifest_read((const char *)(uintptr_t)path);
+}
+
+#endif /* EL_TARGET_ANDROID */

lang/el-compiler/runtime/el_lvgl.c

@@ -0,0 +1,844 @@
+/*
+ * el_lvgl.c — LVGL v9 backend for the el native widget system.
+ *
+ * This file implements the microcontroller/embedded widget layer that el_seed.c
+ * calls through to when EL_TARGET_LVGL is defined.
+ *
+ * Architecture:
+ *   el program (el code)
+ *       → __widget_* C builtins in el_seed.c
+ *           → el_lvgl_* C functions defined here
+ *               → lv_obj_t widgets via LVGL v9
+ *
+ * Target platforms: ESP32, STM32, industrial panels, any system with 256KB+
+ * RAM and an LVGL-compatible display driver. No OS required.
+ *
+ * Widget handles: every widget is assigned an int64_t slot index into
+ * g_widgets[]. The el program holds these as opaque Int values.
+ * Slot 0 is reserved; -1 = invalid handle.
+ *
+ * Window model: on embedded there is one screen. __window_create configures
+ * lv_scr_act() as the root container. __window_show is a no-op (the screen
+ * is always visible). __native_run_loop calls lv_task_handler() in a tight
+ * loop — on RTOS this runs inside a dedicated task; on bare metal it IS the
+ * main loop. The host application is responsible for initialising the display
+ * driver and calling lv_tick_inc() before calling __native_run_loop.
+ *
+ * Callback dispatch:
+ *   When EL_LVGL_NO_DLSYM is NOT defined (hosted Linux, testing):
+ *     dlsym(RTLD_DEFAULT, fn_name) resolves the El function symbol at runtime.
+ *   When EL_LVGL_NO_DLSYM IS defined (bare-metal ESP32/STM32):
+ *     The caller must provide:
+ *       el_val_t el_lvgl_dispatch(const char *fn, el_val_t a, el_val_t b);
+ *     which maps function names to function pointers via a compile-time table.
+ *
+ * Font mapping: LVGL v9 ships Montserrat in discrete sizes. __widget_set_font
+ * maps the requested point size to the nearest available Montserrat variant.
+ * Bold is approximated by stepping up two sizes (no separate bold face in the
+ * default LVGL font set). Define EL_LVGL_CUSTOM_FONT to override font_select().
+ *
+ * Compile (hosted test build):
+ *   gcc -DEL_TARGET_LVGL -I./lvgl el_lvgl.c -c -o el_lvgl.o
+ *   # Then link with lvgl.a / lvgl source tree.
+ *
+ * Compile (bare-metal, no dynamic linker):
+ *   arm-none-eabi-gcc -DEL_TARGET_LVGL -DEL_LVGL_NO_DLSYM \
+ *       -I./lvgl el_lvgl.c -c -o el_lvgl.o
+ */
+
+#ifdef EL_TARGET_LVGL
+
+#include "lvgl/lvgl.h"
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifndef EL_LVGL_NO_DLSYM
+#include <dlfcn.h>
+#endif
+
+#include "el_runtime.h"
+
+/* ── Callback dispatch macro ─────────────────────────────────────────────── */
+
+#ifdef EL_LVGL_NO_DLSYM
+/*
+ * Bare-metal path. The application provides this function:
+ *   el_val_t el_lvgl_dispatch(const char *fn, el_val_t a, el_val_t b);
+ * It maps string names → function pointers, typically via a switch on a hash
+ * or a sorted table of {name, fn_ptr} pairs generated by elc.
+ */
+extern el_val_t el_lvgl_dispatch(const char *fn, el_val_t a, el_val_t b);
+#define EL_LVGL_CALL(fn_name, a, b)  el_lvgl_dispatch((fn_name), (a), (b))
+#else
+/*
+ * Hosted path. dlsym resolves the El symbol at call time.
+ * We use a compound-statement expression (GCC/Clang extension) to avoid
+ * executing dlsym more than once per call.
+ */
+#define EL_LVGL_CALL(fn_name, a, b) \
+    ({ \
+        typedef el_val_t (*_el_fn_t)(el_val_t, el_val_t); \
+        _el_fn_t _fn = (_el_fn_t)(uintptr_t)dlsym(RTLD_DEFAULT, (fn_name)); \
+        _fn ? _fn((a), (b)) : (el_val_t)0; \
+    })
+#endif
+
+/* ── Widget table ─────────────────────────────────────────────────────────── */
+
+#define EL_LVGL_MAX_WIDGETS 4096
+
+/*
+ * Widget kinds — mirrors AppKit/GTK4 backends so future tooling can stay
+ * consistent across all targets.
+ */
+typedef enum {
+    EL_LVGL_FREE      = 0,
+    EL_LVGL_WINDOW    = 1,
+    EL_LVGL_VSTACK    = 2,
+    EL_LVGL_HSTACK    = 3,
+    EL_LVGL_ZSTACK    = 4,
+    EL_LVGL_SCROLL    = 5,
+    EL_LVGL_LABEL     = 6,
+    EL_LVGL_BUTTON    = 7,  /* lv_btn_create; inner label at slot_btn_label */
+    EL_LVGL_TEXTFIELD = 8,  /* lv_textarea, one-line */
+    EL_LVGL_TEXTAREA  = 9,  /* lv_textarea, multiline */
+    EL_LVGL_IMAGE     = 10,
+    EL_LVGL_DIVIDER   = 11,
+    EL_LVGL_SPACER    = 12,
+} ElLvglKind;
+
+/*
+ * Per-slot state. Callback names are stored inline (256 bytes each) to avoid
+ * heap allocation on targets with no malloc or fragmented heaps.
+ */
+typedef struct {
+    ElLvglKind  kind;
+    lv_obj_t   *obj;           /* primary LVGL object */
+    lv_obj_t   *btn_label;     /* for EL_LVGL_BUTTON: inner lv_label child */
+    char        cb_click[256];
+    char        cb_change[256];
+    char        cb_submit[256];
+} ElLvglWidget;
+
+static ElLvglWidget g_widgets[EL_LVGL_MAX_WIDGETS];
+
+/* ── Slot helpers ─────────────────────────────────────────────────────────── */
+
+static int64_t lvgl_slot_alloc(ElLvglKind kind, lv_obj_t *obj) {
+    for (int i = 1; i < EL_LVGL_MAX_WIDGETS; i++) {
+        if (g_widgets[i].kind == EL_LVGL_FREE) {
+            g_widgets[i].kind      = kind;
+            g_widgets[i].obj       = obj;
+            g_widgets[i].btn_label = NULL;
+            g_widgets[i].cb_click[0]  = '\0';
+            g_widgets[i].cb_change[0] = '\0';
+            g_widgets[i].cb_submit[0] = '\0';
+            return (int64_t)i;
+        }
+    }
+    return -1; /* table full */
+}
+
+static ElLvglWidget *lvgl_slot_get(int64_t handle) {
+    if (handle <= 0 || handle >= EL_LVGL_MAX_WIDGETS) return NULL;
+    if (g_widgets[handle].kind == EL_LVGL_FREE)        return NULL;
+    return &g_widgets[handle];
+}
+
+static void lvgl_slot_free(int64_t handle) {
+    if (handle <= 0 || handle >= EL_LVGL_MAX_WIDGETS) return;
+    ElLvglWidget *w = &g_widgets[handle];
+    w->kind      = EL_LVGL_FREE;
+    w->obj       = NULL;
+    w->btn_label = NULL;
+    w->cb_click[0]  = '\0';
+    w->cb_change[0] = '\0';
+    w->cb_submit[0] = '\0';
+}
+
+/* ── Font selection ───────────────────────────────────────────────────────── */
+/*
+ * LVGL ships Montserrat in the following sizes (subset enabled by lv_conf.h):
+ *   8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48
+ *
+ * We map the requested size to the nearest available size. Bold is
+ * approximated by stepping up two sizes (no separate bold face in the default
+ * font set). Define EL_LVGL_CUSTOM_FONT to replace this function entirely.
+ */
+#ifndef EL_LVGL_CUSTOM_FONT
+
+static const lv_font_t *font_select(int size, int bold) {
+    /* Step up two sizes for bold approximation. */
+    if (bold) size += 4;
+
+    /* Clamp to available range. */
+    if (size <  8) size =  8;
+    if (size > 48) size = 48;
+
+    /* Round to nearest even size >= 8. */
+    if (size % 2 != 0) size++;
+
+    switch (size) {
+#if LV_FONT_MONTSERRAT_8
+        case  8:  return &lv_font_montserrat_8;
+#endif
+#if LV_FONT_MONTSERRAT_10
+        case 10:  return &lv_font_montserrat_10;
+#endif
+#if LV_FONT_MONTSERRAT_12
+        case 12:  return &lv_font_montserrat_12;
+#endif
+#if LV_FONT_MONTSERRAT_14
+        case 14:  return &lv_font_montserrat_14;
+#endif
+#if LV_FONT_MONTSERRAT_16
+        case 16:  return &lv_font_montserrat_16;
+#endif
+#if LV_FONT_MONTSERRAT_18
+        case 18:  return &lv_font_montserrat_18;
+#endif
+#if LV_FONT_MONTSERRAT_20
+        case 20:  return &lv_font_montserrat_20;
+#endif
+#if LV_FONT_MONTSERRAT_22
+        case 22:  return &lv_font_montserrat_22;
+#endif
+#if LV_FONT_MONTSERRAT_24
+        case 24:  return &lv_font_montserrat_24;
+#endif
+#if LV_FONT_MONTSERRAT_26
+        case 26:  return &lv_font_montserrat_26;
+#endif
+#if LV_FONT_MONTSERRAT_28
+        case 28:  return &lv_font_montserrat_28;
+#endif
+#if LV_FONT_MONTSERRAT_30
+        case 30:  return &lv_font_montserrat_30;
+#endif
+#if LV_FONT_MONTSERRAT_32
+        case 32:  return &lv_font_montserrat_32;
+#endif
+#if LV_FONT_MONTSERRAT_34
+        case 34:  return &lv_font_montserrat_34;
+#endif
+#if LV_FONT_MONTSERRAT_36
+        case 36:  return &lv_font_montserrat_36;
+#endif
+#if LV_FONT_MONTSERRAT_38
+        case 38:  return &lv_font_montserrat_38;
+#endif
+#if LV_FONT_MONTSERRAT_40
+        case 40:  return &lv_font_montserrat_40;
+#endif
+#if LV_FONT_MONTSERRAT_42
+        case 42:  return &lv_font_montserrat_42;
+#endif
+#if LV_FONT_MONTSERRAT_44
+        case 44:  return &lv_font_montserrat_44;
+#endif
+#if LV_FONT_MONTSERRAT_46
+        case 46:  return &lv_font_montserrat_46;
+#endif
+#if LV_FONT_MONTSERRAT_48
+        case 48:  return &lv_font_montserrat_48;
+#endif
+        default:
+            /*
+             * Requested size is not compiled in. Fall back to the default
+             * theme font, which is guaranteed to be present.
+             */
+            return LV_FONT_DEFAULT;
+    }
+}
+
+#endif /* EL_LVGL_CUSTOM_FONT */
+
+/* ── Event callback ───────────────────────────────────────────────────────── */
+
+/*
+ * Single LVGL event callback used for all widget events. The user_data is
+ * the slot index cast to (void*) via intptr_t — avoids heap allocation.
+ *
+ * Three event codes are handled:
+ *   LV_EVENT_CLICKED      → cb_click  (buttons, any tappable widget)
+ *   LV_EVENT_VALUE_CHANGED → cb_change (textarea, checkbox, etc.)
+ *   LV_EVENT_READY        → cb_submit  (Enter pressed in textarea one-line mode)
+ */
+static void el_lvgl_event_cb(lv_event_t *e) {
+    lv_event_code_t code = lv_event_get_code(e);
+    intptr_t        slot = (intptr_t)lv_event_get_user_data(e);
+    ElLvglWidget   *w    = lvgl_slot_get((int64_t)slot);
+    if (!w) return;
+
+    if (code == LV_EVENT_CLICKED && w->cb_click[0]) {
+        EL_LVGL_CALL(w->cb_click, (el_val_t)slot, (el_val_t)0);
+    }
+
+    if (code == LV_EVENT_VALUE_CHANGED && w->cb_change[0]) {
+        /*
+         * Retrieve current text for textarea/textfield widgets so the handler
+         * receives the updated value as its second argument.
+         */
+        const char *txt = "";
+        lv_obj_t   *target = lv_event_get_target(e);
+        if (w->kind == EL_LVGL_TEXTFIELD || w->kind == EL_LVGL_TEXTAREA) {
+            txt = lv_textarea_get_text(target);
+            if (!txt) txt = "";
+        }
+        EL_LVGL_CALL(w->cb_change, (el_val_t)slot,
+                     (el_val_t)(uintptr_t)txt);
+    }
+
+    if (code == LV_EVENT_READY && w->cb_submit[0]) {
+        /* LV_EVENT_READY fires when Enter is pressed in a one-line textarea. */
+        EL_LVGL_CALL(w->cb_submit, (el_val_t)slot, (el_val_t)0);
+    }
+}
+
+/* ── Initialisation ───────────────────────────────────────────────────────── */
+
+/*
+ * el_lvgl_init — call lv_init(). The host must have already initialised the
+ * display driver and input driver before this, or immediately after. Idempotent.
+ */
+void el_lvgl_init(void) {
+    static int done = 0;
+    if (done) return;
+    done = 1;
+    lv_init();
+}
+
+/*
+ * el_lvgl_run_loop — drive lv_task_handler() indefinitely.
+ *
+ * On RTOS: this function should run inside a dedicated FreeRTOS/Zephyr task.
+ * On bare metal: call this as the last statement of main().
+ *
+ * The 5 ms delay between handler calls matches the LVGL documentation
+ * recommendation for a ~200 Hz refresh budget.
+ *
+ * On hosted Linux (EL_LVGL_SDL or similar), usleep(5000) is used. On RTOS
+ * targets define EL_LVGL_RTOS_DELAY(ms) to map to vTaskDelay/k_sleep/etc.
+ */
+void el_lvgl_run_loop(void) {
+    for (;;) {
+        lv_task_handler();
+#if defined(EL_LVGL_RTOS_DELAY)
+        EL_LVGL_RTOS_DELAY(5);
+#elif defined(__linux__) || defined(__APPLE__)
+        {
+            /* Hosted test build — usleep available. */
+#include <unistd.h>
+            usleep(5000);
+        }
+#endif
+        /* Bare-metal without a delay macro: the HAL tick increment loop
+         * is the caller's responsibility. No sleep needed if lv_tick_inc()
+         * is driven from a hardware timer ISR. */
+    }
+}
+
+/* ── Window ───────────────────────────────────────────────────────────────── */
+
+/*
+ * el_lvgl_window_create — configure lv_scr_act() as a vertical flex container
+ * and return a slot handle wrapping it. The title is stored for informational
+ * purposes (e.g., a status bar widget the host might create). Width/height
+ * are ignored on embedded targets because the screen size is fixed by the
+ * display driver; they are accepted for API compatibility with other backends.
+ */
+int64_t el_lvgl_window_create(const char *title, int width, int height,
+                               int min_width, int min_height) {
+    (void)width; (void)height; (void)min_width; (void)min_height;
+
+    lv_obj_t *scr = lv_scr_act();
+
+    /* Configure the active screen as a vertical flex container so that
+     * widgets added via __widget_add_child stack naturally. */
+    lv_obj_set_flex_flow(scr, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_size(scr, LV_PCT(100), LV_PCT(100));
+
+    /* Store the window title in a user-data string on the screen object
+     * so host code can retrieve it if it wants to render a title bar. */
+    if (title && *title) {
+        /* lv_obj_set_user_data stores a void* — we cast the string pointer.
+         * The string must outlive the screen object; for literals this is
+         * always true. For dynamic titles use el_lvgl_window_set_title. */
+        lv_obj_set_user_data(scr, (void *)(uintptr_t)title);
+    }
+
+    /* Allocate a slot for the screen object. */
+    int64_t h = lvgl_slot_alloc(EL_LVGL_WINDOW, scr);
+    return h;
+}
+
+/*
+ * el_lvgl_window_show — no-op on embedded. The screen is always visible.
+ */
+void el_lvgl_window_show(int64_t handle) {
+    (void)handle;
+    /* On multi-screen setups, load the screen: */
+    /* ElLvglWidget *w = lvgl_slot_get(handle);
+     * if (w) lv_scr_load(w->obj); */
+}
+
+/*
+ * el_lvgl_window_set_title — update the user_data pointer on the screen object.
+ * On embedded, "title" is typically only used by a custom host title bar.
+ */
+void el_lvgl_window_set_title(int64_t handle, const char *title) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w || w->kind != EL_LVGL_WINDOW) return;
+    lv_obj_set_user_data(w->obj, (void *)(uintptr_t)(title ? title : ""));
+}
+
+/* ── Layout containers ────────────────────────────────────────────────────── */
+
+/*
+ * el_lvgl_vstack_create — vertical flex column with inter-item gap = spacing.
+ */
+int64_t el_lvgl_vstack_create(int spacing) {
+    lv_obj_t *obj = lv_obj_create(lv_scr_act());
+    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_style_pad_row(obj, (lv_coord_t)spacing, 0);
+    lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
+    /* Remove default LVGL border and background so containers are transparent
+     * by default, matching the AppKit/GTK4 backends. */
+    lv_obj_set_style_border_width(obj, 0, 0);
+    lv_obj_set_style_bg_opa(obj, LV_OPA_TRANSP, 0);
+    lv_obj_set_style_pad_all(obj, 0, 0);
+    return lvgl_slot_alloc(EL_LVGL_VSTACK, obj);
+}
+
+/*
+ * el_lvgl_hstack_create — horizontal flex row with inter-item gap = spacing.
+ */
+int64_t el_lvgl_hstack_create(int spacing) {
+    lv_obj_t *obj = lv_obj_create(lv_scr_act());
+    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW);
+    lv_obj_set_style_pad_column(obj, (lv_coord_t)spacing, 0);
+    lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
+    lv_obj_set_style_border_width(obj, 0, 0);
+    lv_obj_set_style_bg_opa(obj, LV_OPA_TRANSP, 0);
+    lv_obj_set_style_pad_all(obj, 0, 0);
+    return lvgl_slot_alloc(EL_LVGL_HSTACK, obj);
+}
+
+/*
+ * el_lvgl_zstack_create — plain container, children positioned absolutely.
+ * No flex flow is set; callers use lv_obj_set_pos() on children directly,
+ * or rely on their natural 0,0 origin.
+ */
+int64_t el_lvgl_zstack_create(void) {
+    lv_obj_t *obj = lv_obj_create(lv_scr_act());
+    lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
+    lv_obj_set_style_border_width(obj, 0, 0);
+    lv_obj_set_style_bg_opa(obj, LV_OPA_TRANSP, 0);
+    lv_obj_set_style_pad_all(obj, 0, 0);
+    return lvgl_slot_alloc(EL_LVGL_ZSTACK, obj);
+}
+
+/*
+ * el_lvgl_scroll_create — vertically scrollable container.
+ */
+int64_t el_lvgl_scroll_create(void) {
+    lv_obj_t *obj = lv_obj_create(lv_scr_act());
+    lv_obj_set_scroll_dir(obj, LV_DIR_VER);
+    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_size(obj, LV_PCT(100), LV_SIZE_CONTENT);
+    lv_obj_set_style_border_width(obj, 0, 0);
+    lv_obj_set_style_pad_all(obj, 0, 0);
+    return lvgl_slot_alloc(EL_LVGL_SCROLL, obj);
+}
+
+/* ── Widget factories ─────────────────────────────────────────────────────── */
+
+/*
+ * el_lvgl_label_create — static text label.
+ */
+int64_t el_lvgl_label_create(const char *text) {
+    lv_obj_t *obj = lv_label_create(lv_scr_act());
+    lv_label_set_text(obj, text ? text : "");
+    return lvgl_slot_alloc(EL_LVGL_LABEL, obj);
+}
+
+/*
+ * el_lvgl_button_create — pressable button with a child label.
+ *
+ * LVGL buttons are containers; text is placed in an inner lv_label child.
+ * We store the child label pointer in btn_label so set_text / get_text can
+ * reach it without searching the object tree at runtime.
+ */
+int64_t el_lvgl_button_create(const char *label) {
+    lv_obj_t *btn = lv_btn_create(lv_scr_act());
+    lv_obj_t *lbl = lv_label_create(btn);
+    lv_label_set_text(lbl, label ? label : "");
+    lv_obj_center(lbl);
+
+    int64_t h = lvgl_slot_alloc(EL_LVGL_BUTTON, btn);
+    if (h >= 0) {
+        g_widgets[h].btn_label = lbl;
+        /* Register click callback immediately so button responds when a
+         * callback name is registered later via __widget_on_click. */
+        lv_obj_add_event_cb(btn, el_lvgl_event_cb, LV_EVENT_CLICKED,
+                            (void *)(intptr_t)h);
+    }
+    return h;
+}
+
+/*
+ * el_lvgl_text_field_create — single-line text input.
+ */
+int64_t el_lvgl_text_field_create(const char *placeholder) {
+    lv_obj_t *obj = lv_textarea_create(lv_scr_act());
+    lv_textarea_set_one_line(obj, true);
+    if (placeholder && *placeholder) {
+        lv_textarea_set_placeholder_text(obj, placeholder);
+    }
+    int64_t h = lvgl_slot_alloc(EL_LVGL_TEXTFIELD, obj);
+    if (h >= 0) {
+        lv_obj_add_event_cb(obj, el_lvgl_event_cb, LV_EVENT_VALUE_CHANGED,
+                            (void *)(intptr_t)h);
+        lv_obj_add_event_cb(obj, el_lvgl_event_cb, LV_EVENT_READY,
+                            (void *)(intptr_t)h);
+    }
+    return h;
+}
+
+/*
+ * el_lvgl_text_area_create — multi-line text input.
+ */
+int64_t el_lvgl_text_area_create(const char *placeholder) {
+    lv_obj_t *obj = lv_textarea_create(lv_scr_act());
+    lv_textarea_set_one_line(obj, false);
+    if (placeholder && *placeholder) {
+        lv_textarea_set_placeholder_text(obj, placeholder);
+    }
+    int64_t h = lvgl_slot_alloc(EL_LVGL_TEXTAREA, obj);
+    if (h >= 0) {
+        lv_obj_add_event_cb(obj, el_lvgl_event_cb, LV_EVENT_VALUE_CHANGED,
+                            (void *)(intptr_t)h);
+    }
+    return h;
+}
+
+/*
+ * el_lvgl_image_create — image widget.
+ *
+ * On hosted Linux (SDL backend), path is a filesystem path.
+ * On embedded with SPIFFS/LittleFS, path is a SPIFFS URI: "S:/image.bin".
+ * LVGL image decoders are registered separately by the host application.
+ */
+int64_t el_lvgl_image_create(const char *path_or_name) {
+    lv_obj_t *obj = lv_img_create(lv_scr_act());
+    if (path_or_name && *path_or_name) {
+        lv_img_set_src(obj, path_or_name);
+    }
+    return lvgl_slot_alloc(EL_LVGL_IMAGE, obj);
+}
+
+/* ── Widget property setters ─────────────────────────────────────────────── */
+
+/*
+ * el_lvgl_widget_set_text — update visible text.
+ *
+ * Dispatch per kind:
+ *   LABEL     → lv_label_set_text
+ *   BUTTON    → lv_label_set_text on inner btn_label child
+ *   TEXTFIELD / TEXTAREA → lv_textarea_set_text
+ *   WINDOW    → lv_obj_set_user_data (stores title string)
+ */
+void el_lvgl_widget_set_text(int64_t handle, const char *text) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    const char *t = text ? text : "";
+    switch (w->kind) {
+        case EL_LVGL_LABEL:
+            lv_label_set_text(w->obj, t);
+            break;
+        case EL_LVGL_BUTTON:
+            if (w->btn_label) lv_label_set_text(w->btn_label, t);
+            break;
+        case EL_LVGL_TEXTFIELD:
+        case EL_LVGL_TEXTAREA:
+            lv_textarea_set_text(w->obj, t);
+            break;
+        case EL_LVGL_WINDOW:
+            lv_obj_set_user_data(w->obj, (void *)(uintptr_t)t);
+            break;
+        default:
+            break;
+    }
+}
+
+/*
+ * el_lvgl_widget_get_text — retrieve visible text.
+ *
+ * Returns a pointer into LVGL's internal storage — valid until the next LVGL
+ * operation that modifies the widget. Callers that need to hold the value
+ * across LVGL calls must strdup() it.
+ */
+const char *el_lvgl_widget_get_text(int64_t handle) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return "";
+    switch (w->kind) {
+        case EL_LVGL_LABEL:
+            return lv_label_get_text(w->obj);
+        case EL_LVGL_BUTTON:
+            return w->btn_label ? lv_label_get_text(w->btn_label) : "";
+        case EL_LVGL_TEXTFIELD:
+        case EL_LVGL_TEXTAREA:
+            return lv_textarea_get_text(w->obj);
+        default:
+            return "";
+    }
+}
+
+/*
+ * el_lvgl_widget_set_color — foreground (text) colour.
+ *
+ * r/g/b are 0.0–1.0 floats bit-cast as el_val_t (see el_runtime.h).
+ * LVGL lv_color_make takes uint8_t 0–255 components.
+ */
+void el_lvgl_widget_set_color(int64_t handle,
+                               float r, float g, float b, float a) {
+    (void)a; /* LVGL text colour has no per-glyph alpha channel */
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_color_t c = lv_color_make(
+        (uint8_t)(r * 255.0f + 0.5f),
+        (uint8_t)(g * 255.0f + 0.5f),
+        (uint8_t)(b * 255.0f + 0.5f));
+    lv_obj_set_style_text_color(w->obj, c, 0);
+    if (w->kind == EL_LVGL_BUTTON && w->btn_label) {
+        lv_obj_set_style_text_color(w->btn_label, c, 0);
+    }
+}
+
+/*
+ * el_lvgl_widget_set_bg_color — background fill colour + opacity.
+ */
+void el_lvgl_widget_set_bg_color(int64_t handle,
+                                  float r, float g, float b, float a) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_color_t c = lv_color_make(
+        (uint8_t)(r * 255.0f + 0.5f),
+        (uint8_t)(g * 255.0f + 0.5f),
+        (uint8_t)(b * 255.0f + 0.5f));
+    lv_opa_t opa = (lv_opa_t)(a * 255.0f + 0.5f);
+    lv_obj_set_style_bg_color(w->obj, c, 0);
+    lv_obj_set_style_bg_opa(w->obj, opa, 0);
+}
+
+/*
+ * el_lvgl_widget_set_font — apply font to text-bearing widget.
+ *
+ * The `family` parameter is accepted for API compatibility but LVGL uses
+ * compiled-in fonts only. Only the size and bold flag have effect unless
+ * EL_LVGL_CUSTOM_FONT is defined by the host.
+ */
+void el_lvgl_widget_set_font(int64_t handle,
+                              const char *family, int size, int bold) {
+    (void)family; /* ignored; LVGL uses compiled-in Montserrat fonts */
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    const lv_font_t *font = font_select(size, bold);
+    if (!font) return;
+    lv_obj_set_style_text_font(w->obj, font, 0);
+    if (w->kind == EL_LVGL_BUTTON && w->btn_label) {
+        lv_obj_set_style_text_font(w->btn_label, font, 0);
+    }
+}
+
+/*
+ * el_lvgl_widget_set_padding — set per-side padding (top/right/bottom/left).
+ */
+void el_lvgl_widget_set_padding(int64_t handle,
+                                 int top, int right, int bottom, int left) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_obj_set_style_pad_top(w->obj,    (lv_coord_t)top,    0);
+    lv_obj_set_style_pad_right(w->obj,  (lv_coord_t)right,  0);
+    lv_obj_set_style_pad_bottom(w->obj, (lv_coord_t)bottom, 0);
+    lv_obj_set_style_pad_left(w->obj,   (lv_coord_t)left,   0);
+}
+
+/*
+ * el_lvgl_widget_set_width — set explicit pixel width.
+ */
+void el_lvgl_widget_set_width(int64_t handle, int width) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_obj_set_width(w->obj, (lv_coord_t)width);
+}
+
+/*
+ * el_lvgl_widget_set_height — set explicit pixel height.
+ */
+void el_lvgl_widget_set_height(int64_t handle, int height) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_obj_set_height(w->obj, (lv_coord_t)height);
+}
+
+/*
+ * el_lvgl_widget_set_flex — set flex grow factor.
+ *
+ * flex > 0 → lv_obj_set_flex_grow(obj, flex): object expands to fill
+ *             remaining space proportional to its grow factor.
+ * flex == 0 → lv_obj_set_flex_grow(obj, 0): object uses natural size.
+ */
+void el_lvgl_widget_set_flex(int64_t handle, int flex) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_obj_set_flex_grow(w->obj, (uint8_t)(flex > 0 ? flex : 0));
+}
+
+/*
+ * el_lvgl_widget_set_corner_radius — set border radius.
+ */
+void el_lvgl_widget_set_corner_radius(int64_t handle, int radius) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_obj_set_style_radius(w->obj, (lv_coord_t)radius, 0);
+}
+
+/*
+ * el_lvgl_widget_set_disabled — enable/disable interactive state.
+ *
+ * LV_STATE_DISABLED greys out the widget and prevents input events.
+ */
+void el_lvgl_widget_set_disabled(int64_t handle, int disabled) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    if (disabled) {
+        lv_obj_add_state(w->obj, LV_STATE_DISABLED);
+    } else {
+        lv_obj_clear_state(w->obj, LV_STATE_DISABLED);
+    }
+}
+
+/*
+ * el_lvgl_widget_set_hidden — show/hide widget.
+ *
+ * LV_OBJ_FLAG_HIDDEN hides the widget and removes it from layout flow.
+ */
+void el_lvgl_widget_set_hidden(int64_t handle, int hidden) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    if (hidden) {
+        lv_obj_add_flag(w->obj, LV_OBJ_FLAG_HIDDEN);
+    } else {
+        lv_obj_clear_flag(w->obj, LV_OBJ_FLAG_HIDDEN);
+    }
+}
+
+/* ── Tree operations ──────────────────────────────────────────────────────── */
+
+/*
+ * el_lvgl_widget_add_child — attach child widget to parent.
+ *
+ * lv_obj_set_parent() reparents the child object inside the LVGL tree.
+ * For WINDOW parents we use the screen object itself as the parent, since
+ * lv_scr_act() IS the root container.
+ */
+void el_lvgl_widget_add_child(int64_t parent, int64_t child) {
+    ElLvglWidget *pw = lvgl_slot_get(parent);
+    ElLvglWidget *cw = lvgl_slot_get(child);
+    if (!pw || !cw) return;
+    lv_obj_set_parent(cw->obj, pw->obj);
+}
+
+/*
+ * el_lvgl_widget_remove_child — detach child from its current parent.
+ *
+ * LVGL has no explicit "remove from parent without deleting" operation.
+ * We reparent the child back to the active screen (making it a root-level
+ * floating widget) and then hide it. The widget still occupies a slot and
+ * can be re-attached or destroyed later.
+ */
+void el_lvgl_widget_remove_child(int64_t parent, int64_t child) {
+    (void)parent;
+    ElLvglWidget *cw = lvgl_slot_get(child);
+    if (!cw) return;
+    /* Move to screen root and hide. */
+    lv_obj_set_parent(cw->obj, lv_scr_act());
+    lv_obj_add_flag(cw->obj, LV_OBJ_FLAG_HIDDEN);
+}
+
+/*
+ * el_lvgl_widget_destroy — delete widget and its children from the LVGL tree,
+ * then free the slot.
+ *
+ * lv_obj_del() recursively deletes the object and all children. After this
+ * call the handle is invalid and must not be used.
+ */
+void el_lvgl_widget_destroy(int64_t handle) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    lv_obj_del(w->obj);
+    lvgl_slot_free(handle);
+}
+
+/* ── Event registration ───────────────────────────────────────────────────── */
+
+/*
+ * Event registration stores the El function name in the widget slot. The
+ * actual lv_obj_add_event_cb() call is made here (or was made in the factory
+ * for buttons/textfields where we know the relevant event codes upfront).
+ *
+ * For widgets that did not register their event callback in the factory (e.g.
+ * labels receiving a click handler), we add the LVGL event binding now.
+ */
+
+void el_lvgl_widget_on_click(int64_t handle, const char *fn_name) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    strncpy(w->cb_click, fn_name ? fn_name : "", 255);
+    w->cb_click[255] = '\0';
+    /*
+     * Buttons already have LV_EVENT_CLICKED registered in the factory.
+     * For other widget kinds (labels, containers used as tap targets), add
+     * the click flag and register the callback.
+     */
+    if (w->kind != EL_LVGL_BUTTON) {
+        lv_obj_add_flag(w->obj, LV_OBJ_FLAG_CLICKABLE);
+        lv_obj_add_event_cb(w->obj, el_lvgl_event_cb, LV_EVENT_CLICKED,
+                            (void *)(intptr_t)handle);
+    }
+}
+
+void el_lvgl_widget_on_change(int64_t handle, const char *fn_name) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    strncpy(w->cb_change, fn_name ? fn_name : "", 255);
+    w->cb_change[255] = '\0';
+    /*
+     * Textfield/textarea factories already register VALUE_CHANGED.
+     * For other kinds (e.g. a custom toggle), add the binding now.
+     */
+    if (w->kind != EL_LVGL_TEXTFIELD && w->kind != EL_LVGL_TEXTAREA) {
+        lv_obj_add_event_cb(w->obj, el_lvgl_event_cb, LV_EVENT_VALUE_CHANGED,
+                            (void *)(intptr_t)handle);
+    }
+}
+
+void el_lvgl_widget_on_submit(int64_t handle, const char *fn_name) {
+    ElLvglWidget *w = lvgl_slot_get(handle);
+    if (!w) return;
+    strncpy(w->cb_submit, fn_name ? fn_name : "", 255);
+    w->cb_submit[255] = '\0';
+    /*
+     * LV_EVENT_READY fires when Enter is pressed in a one-line textarea.
+     * Textfield factories already register READY. For other kinds, add it.
+     */
+    if (w->kind != EL_LVGL_TEXTFIELD) {
+        lv_obj_add_event_cb(w->obj, el_lvgl_event_cb, LV_EVENT_READY,
+                            (void *)(intptr_t)handle);
+    }
+}
+
+#endif /* EL_TARGET_LVGL */

lang/el-compiler/runtime/el_native_target.h

@@ -0,0 +1,574 @@
+/*
+ * el_native_target.h — Native widget declarations for el programs targeting
+ * native desktop UI (AppKit / GTK4 / Win32).
+ *
+ * This header is designed to be included AFTER el_runtime.h without conflict:
+ *   - It does NOT redefine el_to_float, el_from_float, or any el_runtime.h
+ *     static inlines.
+ *   - It does NOT redeclare __println, __print, or other functions whose
+ *     return types differ between el_seed.h and el_runtime.h.
+ *   - It adds: native widget builtins + float arithmetic helpers that the
+ *     current el_runtime.h omits but elc still emits calls to.
+ *
+ * Usage:
+ *   Inject via -include at compile time, OR #include it after el_runtime.h.
+ *
+ *   clang -DEL_TARGET_MACOS -include el_native_target.h -c my_app.c ...
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdlib.h>
+
+/* el_val_t must already be defined by el_runtime.h or el_seed.h. */
+#ifndef EL_VAL_T_DEFINED
+typedef int64_t el_val_t;
+#endif
+
+/* ── Float arithmetic helpers ───────────────────────────────────────────────
+ * elc emits calls to float_div / float_mul etc. for Float-typed expressions.
+ * These were in el_runtime.c through v1.0.0-20260501 but are missing from the
+ * current el_runtime.h. Redeclared here as static inline to avoid link deps.
+ * Only defined if not already declared (old runtimes that still have them). */
+
+#ifndef EL_FLOAT_OPS_DEFINED
+#define EL_FLOAT_OPS_DEFINED
+
+/* el_to_float / el_from_float — bit-cast between el_val_t and double.
+ * Defined as static inline in both el_runtime.h and el_seed.h; we do NOT
+ * redefine them here. We rely on one of those headers being included first. */
+
+static inline el_val_t float_div(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub, ur;
+    ua.i = a; ub.i = b;
+    ur.d = (ub.d != 0.0) ? (ua.d / ub.d) : 0.0;
+    return ur.i;
+}
+
+static inline el_val_t float_mul(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub, ur;
+    ua.i = a; ub.i = b; ur.d = ua.d * ub.d;
+    return ur.i;
+}
+
+static inline el_val_t float_add(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub, ur;
+    ua.i = a; ub.i = b; ur.d = ua.d + ub.d;
+    return ur.i;
+}
+
+static inline el_val_t float_sub(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub, ur;
+    ua.i = a; ub.i = b; ur.d = ua.d - ub.d;
+    return ur.i;
+}
+
+static inline el_val_t float_lt(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub;
+    ua.i = a; ub.i = b;
+    return (el_val_t)(ua.d < ub.d);
+}
+
+static inline el_val_t float_gt(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub;
+    ua.i = a; ub.i = b;
+    return (el_val_t)(ua.d > ub.d);
+}
+
+static inline el_val_t float_lte(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub;
+    ua.i = a; ub.i = b;
+    return (el_val_t)(ua.d <= ub.d);
+}
+
+static inline el_val_t float_gte(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub;
+    ua.i = a; ub.i = b;
+    return (el_val_t)(ua.d >= ub.d);
+}
+
+static inline el_val_t float_eq(el_val_t a, el_val_t b) {
+    union { double d; int64_t i; } ua, ub;
+    ua.i = a; ub.i = b;
+    return (el_val_t)(ua.d == ub.d);
+}
+
+#endif /* EL_FLOAT_OPS_DEFINED */
+
+/* ── Native widget system (macOS AppKit) ────────────────────────────────────
+ * Available when compiled with -DEL_TARGET_MACOS and linked with el_appkit.m.
+ * Widget handles are opaque int64_t slot indices; -1 = invalid. */
+
+#ifdef EL_TARGET_MACOS
+
+/* Initialisation */
+void      __native_init(void);
+void      __native_run_loop(void);
+
+/* Window */
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+/* Layout containers */
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+/* Widgets */
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+/* Widget properties */
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+/* Layout / tree */
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+/* Events */
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+void      __widget_set_data(el_val_t handle, el_val_t data_str);
+
+/* Manifest reader */
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_MACOS */
+
+/* ── Native widget system (Linux GTK4) ──────────────────────────────────────
+ * Available when compiled with -DEL_TARGET_LINUX and linked with el_gtk4.c.
+ * Widget handles are opaque int64_t slot indices; -1 = invalid.
+ * All functions have the same signatures as EL_TARGET_MACOS above. */
+
+#ifdef EL_TARGET_LINUX
+
+/* Initialisation */
+void      __native_init(void);
+void      __native_run_loop(void);
+
+/* Window */
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+/* Layout containers */
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+/* Widgets */
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+/* Widget properties */
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+/* Layout / tree */
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+/* Events */
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+/* Manifest reader — same JSON output as EL_TARGET_MACOS */
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_LINUX */
+
+/* ── Native widget system (Windows Win32) ───────────────────────────────────
+ * Available when compiled with -DEL_TARGET_WIN32 and linked with el_win32.c.
+ * Widget handles are opaque int64_t slot indices; -1 = invalid.
+ * Link: el_win32.obj comctl32.lib user32.lib gdi32.lib */
+
+#ifdef EL_TARGET_WIN32
+
+/* Initialisation */
+void      __native_init(void);
+void      __native_run_loop(void);
+
+/* Window */
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+/* Layout containers */
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+/* Widgets */
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+/* Widget properties */
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+/* Layout / tree */
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+/* Events */
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+/* Manifest reader */
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_WIN32 */
+
+/* ── Native widget system (iOS UIKit) ───────────────────────────────────────
+ * Available when compiled with -DEL_TARGET_IOS and linked with el_uikit.m.
+ * Widget handles are opaque int64_t slot indices; -1 = invalid.
+ *
+ * iOS lifecycle note: UIApplicationMain never returns. The el program must
+ * store its UI-build logic in a void(*)(void) function pointer, assign it to
+ * el_main_entry_fn, then call __native_run_loop. ElAppDelegate invokes
+ * el_main_entry_fn inside didFinishLaunchingWithOptions.
+ * Call el_uikit_set_args(argc, argv) from main() before __native_run_loop. */
+
+#ifdef EL_TARGET_IOS
+
+/* Lifecycle entry-function hook — set before calling __native_run_loop. */
+extern void (*el_main_entry_fn)(void);
+
+/* Forward argc/argv from main() to UIApplicationMain. */
+void      el_uikit_set_args(int argc, char** argv);
+
+/* Initialisation */
+void      __native_init(void);
+void      __native_run_loop(void);
+
+/* Window */
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+/* Layout containers */
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+/* Widgets */
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+/* Widget properties */
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+/* Layout / tree */
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+/* Events */
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+/* Manifest reader */
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_IOS */
+
+/* ── Native widget system (Android JNI) ─────────────────────────────────────
+ * Available when compiled with -DEL_TARGET_ANDROID and linked with
+ * libelruntime.so (which includes el_android.c compiled by the NDK build).
+ * Widget handles are opaque int64_t slot indices; -1 = invalid.
+ *
+ * Java companion: ElBridge.java (package com.neuron.el) must be compiled into
+ * the APK. The Activity must call ElBridge.init(this) before any widget ops.
+ *
+ * Link flags (in Android.mk or CMakeLists.txt):
+ *   -landroid -llog -ldl */
+
+#ifdef EL_TARGET_ANDROID
+
+/* Initialisation */
+void      __native_init(void);
+void      __native_run_loop(void);   /* no-op on Android */
+
+/* Window */
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+/* Layout containers */
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+/* Widgets */
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+/* Widget properties */
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+/* Layout / tree */
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+/* Events */
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+/* Manifest reader */
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_ANDROID */
+
+/* ── Native widget system (LVGL v9 — embedded / microcontroller) ─────────────
+ * Available when compiled with -DEL_TARGET_LVGL and linked with el_lvgl.c
+ * and the LVGL library (lvgl.a or lvgl source tree).
+ *
+ * Target platforms: ESP32, STM32, industrial panels. Any system with 256KB+
+ * RAM and an LVGL-compatible display driver. No OS required.
+ *
+ * Widget handles are opaque int64_t slot indices; -1 = invalid.
+ *
+ * Bare-metal / no dynamic linker:
+ *   Compile with -DEL_LVGL_NO_DLSYM and provide:
+ *     el_val_t el_lvgl_dispatch(const char *fn, el_val_t a, el_val_t b);
+ *
+ * Compile:
+ *   gcc -DEL_TARGET_LVGL -I./lvgl el_lvgl.c -c -o el_lvgl.o
+ *   # Then link with lvgl.a. */
+
+#ifdef EL_TARGET_LVGL
+
+/* Initialisation */
+void      __native_init(void);
+void      __native_run_loop(void);
+
+/* Window */
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+/* Layout containers */
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+/* Widgets */
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+/* Widget properties */
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+/* Layout / tree */
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+/* Events */
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+/* Manifest reader — same JSON output as all other native targets */
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_LVGL */
+
+/* ── Native widget system (SDL2 — embedded / Pi) ────────────────────────────
+ * Available when compiled with -DEL_TARGET_SDL2 and linked with el_sdl2.c.
+ * Widget handles are opaque int64_t slot indices; -1 = invalid.
+ *
+ * Target: Raspberry Pi Zero, embedded Linux, any system with a framebuffer
+ * and SDL2 available. No GTK, no desktop environment required.
+ *
+ * Compile:
+ *   gcc -DEL_TARGET_SDL2 $(sdl2-config --cflags) -c el_sdl2.c -o el_sdl2.o
+ * Link:
+ *   $(sdl2-config --libs) -lSDL2_ttf -lSDL2_image -ldl */
+
+#ifdef EL_TARGET_SDL2
+
+/* Initialisation */
+void      __native_init(void);
+void      __native_run_loop(void);
+
+/* Window */
+el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                           el_val_t min_width, el_val_t min_height);
+void      __window_show(el_val_t handle);
+void      __window_set_title(el_val_t handle, el_val_t title);
+
+/* Layout containers */
+el_val_t  __vstack_create(el_val_t spacing);
+el_val_t  __hstack_create(el_val_t spacing);
+el_val_t  __zstack_create(void);
+el_val_t  __scroll_create(void);
+
+/* Widgets */
+el_val_t  __label_create(el_val_t text);
+el_val_t  __button_create(el_val_t label);
+el_val_t  __text_field_create(el_val_t placeholder);
+el_val_t  __text_area_create(el_val_t placeholder);
+el_val_t  __image_create(el_val_t path_or_name);
+
+/* Widget properties */
+void      __widget_set_text(el_val_t handle, el_val_t text);
+el_val_t  __widget_get_text(el_val_t handle);
+void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                              el_val_t b, el_val_t a);
+void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                 el_val_t b, el_val_t a);
+void      __widget_set_font(el_val_t handle, el_val_t family,
+                             el_val_t size, el_val_t bold);
+void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left);
+void      __widget_set_width(el_val_t handle, el_val_t width);
+void      __widget_set_height(el_val_t handle, el_val_t height);
+void      __widget_set_flex(el_val_t handle, el_val_t flex);
+void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+/* Layout / tree */
+void      __widget_add_child(el_val_t parent, el_val_t child);
+void      __widget_remove_child(el_val_t parent, el_val_t child);
+void      __widget_destroy(el_val_t handle);
+
+/* Events */
+void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+/* Manifest reader */
+el_val_t  __manifest_read(el_val_t path);
+
+#endif /* EL_TARGET_SDL2 */

lang/el-compiler/runtime/el_platform_win.h

@@ -0,0 +1,117 @@
+#ifndef EL_PLATFORM_WIN_H
+#define EL_PLATFORM_WIN_H
+/*
+ * el_platform_win.h — Windows OS-boundary shim for el_runtime.c.
+ *
+ * Branch: feat/windows-el-runtime. Included ONLY when _WIN32 is defined; the POSIX build is
+ * untouched. Goal: let el_runtime.c (a BSD-sockets / dlfcn / fork host) compile and link with
+ * mingw-w64 into a native neuron.exe, with no behavioural change to the Linux/macOS build.
+ *
+ * What it maps:
+ *   - sockets  : winsock2 (same call names: socket/bind/listen/accept/recv/send/setsockopt).
+ *                Sockets close with closesocket() (see el_closesocket), and the stack must be
+ *                started once with WSAStartup — done automatically via a load-time constructor.
+ *   - dlsym    : el_runtime.c uses dlsym(RTLD_DEFAULT, name) to resolve callback/tool symbols
+ *                exported by the main module. Windows equivalent: GetProcAddress on the process
+ *                module. Link the soul with -Wl,--export-all-symbols so the symbols are findable.
+ *   - popen    : mapped to _popen/_pclose.
+ *   - threads  : UNCHANGED. mingw-w64 ships winpthreads, so <pthread.h> + -lpthread just work.
+ */
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#include <io.h>
+#include <process.h>
+
+/* Portable headers mingw-w64 provides (verified present). */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>   /* strcasecmp */
+#include <ctype.h>
+#include <math.h>
+#include <time.h>
+#include <sys/time.h>  /* mingw-w64 provides gettimeofday here */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <errno.h>
+#include <pthread.h>
+
+/* ── socket close ─────────────────────────────────────────────────────────── */
+/* Winsock closes sockets with closesocket(), not close() (close() is for file fds). The POSIX
+   build defines the same helper as close() so the call sites are identical across platforms. */
+static inline int el_closesocket(SOCKET s) { return closesocket(s); }
+
+/* ── winsock init (once, at load) ─────────────────────────────────────────── */
+static void el__win_net_init(void) {
+    static int inited = 0;
+    if (!inited) { WSADATA w; WSAStartup(MAKEWORD(2, 2), &w); inited = 1; }
+}
+__attribute__((constructor)) static void el__win_ctor(void) { el__win_net_init(); }
+
+/* ── dlsym → GetProcAddress ───────────────────────────────────────────────── */
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT ((void*)0)
+#endif
+static inline void* el_win_dlsym(void* handle, const char* name) {
+    (void)handle;
+    return (void*)(uintptr_t)GetProcAddress(GetModuleHandleA(NULL), name);
+}
+#define dlsym(h, n) el_win_dlsym((h), (n))
+
+/* ── popen / pclose ───────────────────────────────────────────────────────── */
+#define popen  _popen
+#define pclose _pclose
+
+/* ── misc POSIX → Win32 shims ─────────────────────────────────────────────── */
+#include <direct.h>            /* _mkdir */
+#define mkdir(path, mode) _mkdir(path)     /* POSIX mkdir(path,mode) → _mkdir(path) */
+#define timegm _mkgmtime                   /* UTC tm → time_t */
+
+/* setenv/unsetenv: not in the Windows CRT; map to _putenv_s / SetEnvironmentVariable. */
+static inline int setenv(const char* name, const char* value, int overwrite) {
+    (void)overwrite;
+    return _putenv_s(name, value ? value : "");
+}
+static inline int unsetenv(const char* name) {
+    /* _putenv_s(name, "") sets VAR="" rather than removing it.
+     * SetEnvironmentVariableA(name, NULL) truly deletes it from the Win32
+     * env block; then we sync the CRT cache with _putenv("NAME=").       */
+    SetEnvironmentVariableA(name, NULL);
+    size_t len = strlen(name);
+    char *buf = (char*)malloc(len + 2);
+    if (!buf) return -1;
+    memcpy(buf, name, len);
+    buf[len] = '=';
+    buf[len + 1] = '\0';
+    _putenv(buf);
+    free(buf);
+    return 0;
+}
+
+/* nanosleep — not available in MSVC/UCRT; approximate with Sleep(). */
+static inline int el_nanosleep(const struct timespec *req, struct timespec *rem) {
+    (void)rem;
+    DWORD ms = (DWORD)((req->tv_sec * 1000ULL) + (req->tv_nsec / 1000000ULL));
+    Sleep(ms ? ms : 1);
+    return 0;
+}
+#define nanosleep(req, rem) el_nanosleep((req), (rem))
+
+/* localtime_r/gmtime_r: Windows offers localtime_s/gmtime_s with reversed arg order. */
+static inline struct tm* localtime_r(const time_t* t, struct tm* out) {
+    return localtime_s(out, t) == 0 ? out : (struct tm*)0;
+}
+static inline struct tm* gmtime_r(const time_t* t, struct tm* out) {
+    return gmtime_s(out, t) == 0 ? out : (struct tm*)0;
+}
+
+#endif /* EL_PLATFORM_WIN_H */

lang/el-compiler/runtime/el_runtime.c

@@ -21,6 +21,10 @@
 
 #include "el_runtime.h"
 
+#ifdef _WIN32
+/* Windows OS-boundary shim (winsock/dlsym/popen). Threading stays on <pthread.h> (winpthreads). */
+#include "el_platform_win.h"
+#else
 #include <stdarg.h>
 #include <strings.h>     /* strcasecmp */
 #include <stdint.h>
@@ -43,6 +47,10 @@
 #include <errno.h>
 #include <pthread.h>
 #include <sys/resource.h>  /* getrusage — memory guard */
+/* On POSIX, sockets close with the same close() as files; el_platform_win.h supplies the Windows
+   variant. Defined here so the socket call sites are identical across platforms. */
+static inline int el_closesocket(int s) { return close(s); }
+#endif
 #ifdef HAVE_CURL
 #include <curl/curl.h>
 #endif
@@ -182,6 +190,7 @@ el_val_t println(el_val_t s) {
     const char* str = EL_CSTR(s);
     if (str) puts(str);
     else     puts("");
+    fflush(stdout);  /* prevent startup logs from silently buffering when stdout→file */
     return 0;
 }
 
@@ -1054,7 +1063,6 @@ el_val_t http_post_to_file(el_val_t url, el_val_t body, el_val_t headers_map, el
 
 #define HTTP_MAX_CONNS 64
 
-typedef el_val_t (*http_handler_fn)(el_val_t method, el_val_t path, el_val_t body);
 
 typedef struct {
     char*           name;
@@ -1529,12 +1537,20 @@ static void http_send_response(int fd, const char* body) {
 }
 
 typedef struct {
+#ifdef _WIN32
+    SOCKET fd;
+#else
     int fd;
+#endif
 } HttpWorkerArg;
 
 static void* http_worker(void* arg) {
     HttpWorkerArg* a = (HttpWorkerArg*)arg;
+#ifdef _WIN32
+    SOCKET fd = a->fd;
+#else
     int fd = a->fd;
+#endif
     free(a);
     char *method = NULL, *path = NULL, *body = NULL;
     if (http_read_request(fd, &method, &path, &body, NULL) == 0) {
@@ -1566,7 +1582,7 @@ static void* http_worker(void* arg) {
         free(response);
     }
     free(method); free(path); free(body);
-    close(fd);
+    el_closesocket(fd);
     /* release a slot */
     pthread_mutex_lock(&_http_conn_mu);
     _http_conn_active--;
@@ -1588,22 +1604,26 @@ el_val_t http_serve(el_val_t port, el_val_t handler) {
     int sock = socket(AF_INET6, SOCK_STREAM, 0);
     if (sock < 0) { perror("socket"); return 0; }
     int yes = 1; int no = 0;
-    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
-    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
+    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&yes, sizeof(yes));
+    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&no, sizeof(no));
     struct sockaddr_in6 addr;
     memset(&addr, 0, sizeof(addr));
     addr.sin6_family = AF_INET6;
     addr.sin6_addr = in6addr_any;
     addr.sin6_port = htons((uint16_t)p);
     if (bind(sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-        perror("bind"); close(sock); return 0;
+        perror("bind"); el_closesocket(sock); return 0;
     }
-    if (listen(sock, 64) < 0) { perror("listen"); close(sock); return 0; }
+    if (listen(sock, 64) < 0) { perror("listen"); el_closesocket(sock); return 0; }
     fprintf(stderr, "[http] listening on [::]:%d (dual-stack)\n", p);
     while (1) {
         struct sockaddr_in6 cli;
         socklen_t clen = sizeof(cli);
+#ifdef _WIN32
+        SOCKET cfd = accept(sock, (struct sockaddr*)&cli, &clen);
+#else
         int cfd = accept(sock, (struct sockaddr*)&cli, &clen);
+#endif
         if (cfd < 0) {
             if (errno == EINTR) continue;
             perror("accept"); break;
@@ -1615,11 +1635,11 @@ el_val_t http_serve(el_val_t port, el_val_t handler) {
         _http_conn_active++;
         pthread_mutex_unlock(&_http_conn_mu);
         HttpWorkerArg* arg = malloc(sizeof(HttpWorkerArg));
-        if (!arg) { close(cfd); continue; }
+        if (!arg) { el_closesocket(cfd); continue; }
         arg->fd = cfd;
         pthread_t tid;
         if (pthread_create(&tid, NULL, http_worker, arg) != 0) {
-            close(cfd); free(arg);
+            el_closesocket(cfd); free(arg);
             pthread_mutex_lock(&_http_conn_mu);
             _http_conn_active--;
             pthread_cond_signal(&_http_conn_cv);
@@ -1628,7 +1648,7 @@ el_val_t http_serve(el_val_t port, el_val_t handler) {
         }
         pthread_detach(tid);
     }
-    close(sock);
+    el_closesocket(sock);
     return 0;
 }
 
@@ -1649,8 +1669,6 @@ el_val_t http_serve(el_val_t port, el_val_t handler) {
  * separate active-handler slot, separate dlsym fallback. Mixing v1 and v2
  * handlers in the same process is fine — they don't share the active slot. */
 
-typedef el_val_t (*http_handler4_fn)(el_val_t method, el_val_t path,
-                                     el_val_t headers_map, el_val_t body);
 
 typedef struct {
     char*             name;
@@ -1786,7 +1804,11 @@ static el_val_t http_build_headers_map(const char* hdr_block) {
 
 static void* http_worker_v2(void* arg) {
     HttpWorkerArg* a = (HttpWorkerArg*)arg;
+#ifdef _WIN32
+    SOCKET fd = a->fd;
+#else
     int fd = a->fd;
+#endif
     free(a);
     char *method = NULL, *path = NULL, *body = NULL, *hdr_block = NULL;
     if (http_read_request(fd, &method, &path, &body, &hdr_block) == 0) {
@@ -1816,7 +1838,7 @@ static void* http_worker_v2(void* arg) {
         free(response);
     }
     free(method); free(path); free(body); free(hdr_block);
-    close(fd);
+    el_closesocket(fd);
     pthread_mutex_lock(&_http_conn_mu);
     _http_conn_active--;
     pthread_cond_signal(&_http_conn_cv);
@@ -1838,18 +1860,66 @@ el_val_t http_serve_v2(el_val_t port, el_val_t handler) {
     int sock = socket(AF_INET6, SOCK_STREAM, 0);
     if (sock < 0) { perror("socket"); return 0; }
     int yes = 1; int no = 0;
-    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
-    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
+    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&yes, sizeof(yes));
+    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&no, sizeof(no));
     struct sockaddr_in6 addr;
     memset(&addr, 0, sizeof(addr));
     addr.sin6_family = AF_INET6;
     addr.sin6_addr = in6addr_any;
     addr.sin6_port = htons((uint16_t)p);
     if (bind(sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-        perror("bind"); close(sock); return 0;
+        perror("bind"); el_closesocket(sock); return 0;
     }
-    if (listen(sock, 64) < 0) { perror("listen"); close(sock); return 0; }
+    if (listen(sock, 64) < 0) { perror("listen"); el_closesocket(sock); return 0; }
     fprintf(stderr, "[http v2] listening on [::]:%d (dual-stack)\n", p);
+    while (1) {
+        struct sockaddr_in6 cli;
+        socklen_t clen = sizeof(cli);
+#ifdef _WIN32
+        SOCKET cfd = accept(sock, (struct sockaddr*)&cli, &clen);
+#else
+        int cfd = accept(sock, (struct sockaddr*)&cli, &clen);
+#endif
+        if (cfd < 0) {
+            if (errno == EINTR) continue;
+            perror("accept"); break;
+        }
+        pthread_mutex_lock(&_http_conn_mu);
+        while (_http_conn_active >= HTTP_MAX_CONNS) {
+            pthread_cond_wait(&_http_conn_cv, &_http_conn_mu);
+        }
+        _http_conn_active++;
+        pthread_mutex_unlock(&_http_conn_mu);
+        HttpWorkerArg* arg = malloc(sizeof(HttpWorkerArg));
+        if (!arg) { el_closesocket(cfd); continue; }
+        arg->fd = cfd;
+        pthread_t tid;
+        if (pthread_create(&tid, NULL, http_worker_v2, arg) != 0) {
+            el_closesocket(cfd); free(arg);
+            pthread_mutex_lock(&_http_conn_mu);
+            _http_conn_active--;
+            pthread_cond_signal(&_http_conn_cv);
+            pthread_mutex_unlock(&_http_conn_mu);
+            continue;
+        }
+        pthread_detach(tid);
+    }
+    el_closesocket(sock);
+    return 0;
+}
+
+/* ── http_serve_async — non-blocking HTTP server ─────────────────────────── */
+/* Runs the accept loop in a background pthread, returns immediately so the
+ * calling EL script can continue (e.g. to run an awareness loop).
+ *
+ * El signature: http_serve_async(port, handler) -> Void               */
+
+typedef struct { int sock; } HttpServeAsyncArg;
+
+static void* _http_serve_async_loop(void* raw) {
+    HttpServeAsyncArg* a = (HttpServeAsyncArg*)raw;
+    int sock = a->sock;
+    free(a);
     while (1) {
         struct sockaddr_in6 cli;
         socklen_t clen = sizeof(cli);
@@ -1868,7 +1938,7 @@ el_val_t http_serve_v2(el_val_t port, el_val_t handler) {
         if (!arg) { close(cfd); continue; }
         arg->fd = cfd;
         pthread_t tid;
-        if (pthread_create(&tid, NULL, http_worker_v2, arg) != 0) {
+        if (pthread_create(&tid, NULL, http_worker, arg) != 0) {
             close(cfd); free(arg);
             pthread_mutex_lock(&_http_conn_mu);
             _http_conn_active--;
@@ -1879,7 +1949,40 @@ el_val_t http_serve_v2(el_val_t port, el_val_t handler) {
         pthread_detach(tid);
     }
     close(sock);
-    return 0;
+    return NULL;
+}
+
+void http_serve_async(el_val_t port, el_val_t handler) {
+    const char* hname = EL_CSTR(handler);
+    if (hname && looks_like_string(handler)) {
+        http_set_handler(handler);
+    }
+    int p = (int)port;
+    if (p <= 0 || p > 65535) { fprintf(stderr, "http_serve_async: invalid port %d\n", p); return; }
+    int sock = socket(AF_INET6, SOCK_STREAM, 0);
+    if (sock < 0) { perror("socket"); return; }
+    int yes = 1; int no = 0;
+    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
+    struct sockaddr_in6 addr;
+    memset(&addr, 0, sizeof(addr));
+    addr.sin6_family = AF_INET6;
+    addr.sin6_addr = in6addr_any;
+    addr.sin6_port = htons((uint16_t)p);
+    if (bind(sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
+        perror("bind"); close(sock); return;
+    }
+    if (listen(sock, 64) < 0) { perror("listen"); close(sock); return; }
+    fprintf(stderr, "[http] async listening on [::]:%d (dual-stack)\n", p);
+    HttpServeAsyncArg* a = malloc(sizeof(HttpServeAsyncArg));
+    if (!a) { close(sock); return; }
+    a->sock = sock;
+    pthread_t tid;
+    if (pthread_create(&tid, NULL, _http_serve_async_loop, a) != 0) {
+        perror("pthread_create"); free(a); close(sock); return;
+    }
+    pthread_detach(tid);
+    /* Returns immediately — caller can now run awareness_run() or any loop. */
 }
 
 /* Build the response envelope a 4-arg handler can return. We hand-write
@@ -2052,6 +2155,23 @@ el_val_t exec(el_val_t cmdv) {
 el_val_t exec_bg(el_val_t cmdv) {
     const char* cmd = EL_CSTR(cmdv);
     if (!cmd || !*cmd) return el_wrap_str(el_strdup(""));
+#ifdef _WIN32
+    /* Windows: no fork/exec. Launch a detached `cmd /c <command>` with no console window via
+       CreateProcess (DETACHED_PROCESS | CREATE_NO_WINDOW). Returns the PID as a string, "" on fail.
+       Mirrors the POSIX branch: child runs independently, caller is not blocked. */
+    char cmdline[8192];
+    snprintf(cmdline, sizeof(cmdline), "cmd.exe /c %s", cmd);
+    STARTUPINFOA si; ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si);
+    PROCESS_INFORMATION pi; ZeroMemory(&pi, sizeof(pi));
+    BOOL ok = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE,
+                             DETACHED_PROCESS | CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+    if (!ok) return el_wrap_str(el_strdup(""));
+    char pidbuf[32];
+    snprintf(pidbuf, sizeof(pidbuf), "%lu", (unsigned long)pi.dwProcessId);
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+    return el_wrap_str(el_strdup(pidbuf));
+#else
     pid_t pid = fork();
     if (pid < 0) {
         /* fork failed */
@@ -2074,6 +2194,7 @@ el_val_t exec_bg(el_val_t cmdv) {
     char pidbuf[32];
     snprintf(pidbuf, sizeof(pidbuf), "%d", (int)pid);
     return el_wrap_str(el_strdup(pidbuf));
+#endif
 }
 
 el_val_t fs_list(el_val_t pathv) {
@@ -3173,23 +3294,49 @@ static void jb_puts(JsonBuf* b, const char* s) {
 
 static void jb_emit_escaped(JsonBuf* b, const char* s) {
     jb_putc(b, '"');
-    for (; *s; s++) {
-        unsigned char c = (unsigned char)*s;
+    const unsigned char* p = (const unsigned char*)s;
+    while (*p) {
+        unsigned char c = *p;
         switch (c) {
-            case '"':  jb_puts(b, "\\\""); break;
-            case '\\': jb_puts(b, "\\\\"); break;
-            case '\b': jb_puts(b, "\\b");  break;
-            case '\f': jb_puts(b, "\\f");  break;
-            case '\n': jb_puts(b, "\\n");  break;
-            case '\r': jb_puts(b, "\\r");  break;
-            case '\t': jb_puts(b, "\\t");  break;
+            case '"':  jb_puts(b, "\\\""); p++; break;
+            case '\\': jb_puts(b, "\\\\"); p++; break;
+            case '\b': jb_puts(b, "\\b");  p++; break;
+            case '\f': jb_puts(b, "\\f");  p++; break;
+            case '\n': jb_puts(b, "\\n");  p++; break;
+            case '\r': jb_puts(b, "\\r");  p++; break;
+            case '\t': jb_puts(b, "\\t");  p++; break;
             default:
                 if (c < 0x20) {
                     char tmp[8];
                     snprintf(tmp, sizeof(tmp), "\\u%04x", c);
                     jb_puts(b, tmp);
-                } else {
+                    p++;
+                } else if (c < 0x80) {
                     jb_putc(b, (char)c);
+                    p++;
+                } else {
+                    /* Multi-byte UTF-8: validate sequence, pass through if valid,
+                     * escape as \u00xx if the start byte is invalid/orphaned. */
+                    int seq_len = 0;
+                    if      ((c & 0xE0) == 0xC0) seq_len = 2;
+                    else if ((c & 0xF0) == 0xE0) seq_len = 3;
+                    else if ((c & 0xF8) == 0xF0) seq_len = 4;
+                    if (seq_len >= 2) {
+                        int valid = 1;
+                        for (int i = 1; i < seq_len; i++) {
+                            if ((p[i] & 0xC0) != 0x80) { valid = 0; break; }
+                        }
+                        if (valid) {
+                            for (int i = 0; i < seq_len; i++) jb_putc(b, (char)p[i]);
+                            p += seq_len;
+                            break;
+                        }
+                    }
+                    /* Invalid start byte or truncated sequence — escape it */
+                    char tmp[8];
+                    snprintf(tmp, sizeof(tmp), "\\u%04x", c);
+                    jb_puts(b, tmp);
+                    p++;
                 }
                 break;
         }
@@ -4375,7 +4522,12 @@ static int _el_decompose_earth(el_caltime_t* ct, struct tm* tm_out, int* abbr_le
     localtime_r(&s, &tm);
     *tm_out = tm;
     if (abbr_buf && abbr_cap > 0) {
+        /* mingw's struct tm has no tm_zone (BSD/glibc extension); no abbrev available there. */
+#ifdef _WIN32
+        const char* z_str = "";
+#else
         const char* z_str = tm.tm_zone ? tm.tm_zone : "";
+#endif
         size_t n = strlen(z_str);
         if (n >= abbr_cap) n = abbr_cap - 1;
         memcpy(abbr_buf, z_str, n);
@@ -5729,6 +5881,10 @@ el_val_t getpid_now(void) {
  * Returns 0 always (the only non-return path is the exit() branch).
  */
 el_val_t el_mem_check(void) {
+#ifdef _WIN32
+    /* getrusage is POSIX-only — memory guard disabled on Windows. */
+    return 0;
+#else
     /* Read limit from env; default 512 MB. */
     long limit_mb = 512;
     const char *env_val = getenv("ELC_MAX_MEM_MB");
@@ -5754,6 +5910,7 @@ el_val_t el_mem_check(void) {
         exit(1);
     }
     return 0;
+#endif
 }
 
 /* ── args() — command-line argument access ──────────────────────────────────
@@ -5928,6 +6085,14 @@ void el_cgi_init(el_val_t name, el_val_t dharma_id, el_val_t principal,
 #define ENGRAM_LAYER_DOMAIN          2u
 #define ENGRAM_LAYER_IMPRINT         3u
 #define ENGRAM_LAYER_SUIT            4u
+#define ENGRAM_LAYER_ACCUMULATION    5u
+/* New user-facing nodes (memories, knowledge, conversations) are created in the
+ * accumulation layer — the top of the consciousness stack, the engram the user
+ * sees; every layer below shapes behavior but is hidden from the user (Layered
+ * Consciousness architecture, app 64/064,262). ENGRAM_LAYER_DEFAULT stays
+ * core-identity ON PURPOSE: it is the fallback home for LEGACY nodes loaded from
+ * snapshots without a layer_id, so existing data (the originator corpus) is
+ * never migrated out of its established layer. New != legacy. */
 #define ENGRAM_LAYER_DEFAULT         ENGRAM_LAYER_CORE_IDENTITY
 
 /* Pass 3 override floor. Layer 0 nodes that received any background
@@ -5947,6 +6112,10 @@ static double engram_type_threshold(const char* node_type, const char* tier) {
         if (strcmp(tier, "Lesson")    == 0) return 0.25;
     }
     if (node_type) {
+        /* Knowledge nodes: Canonical/Lesson handled by tier checks above.
+         * Procedural-tier Knowledge (activation_count>=50 migration): 0.20.
+         * (2026-06-29 self-review — mirrors release runtime fix) */
+        if (strcmp(node_type, "Knowledge") == 0) return 0.20;
         if (strcmp(node_type, "Belief") == 0) return 0.30;
         if (strcmp(node_type, "Entity") == 0) return 0.30;
     }
@@ -6105,6 +6274,20 @@ static void engram_init_layers(EngramStore* g) {
         .transparent = 0,
         .injectable = 1
     };
+    /* Layer 5 — accumulation. The TOP of the consciousness stack: the default
+     * home for all new user-facing nodes. This is the engram the user sees;
+     * every layer below shapes behavior but is hidden from the user. Not
+     * injectable — it is the persistent user accumulation, not a swappable
+     * overlay. transparent=0: its content is surfaced to introspection (it is
+     * the user's own knowledge/memory), unlike the lower behavioral layers. */
+    g->layers[g->layer_count++] = (EngramLayer){
+        .layer_id = ENGRAM_LAYER_ACCUMULATION,
+        .name = el_strdup_persist("accumulation"),
+        .activation_priority = 50,
+        .suppressible = 1,
+        .transparent = 0,
+        .injectable = 0
+    };
 }
 
 static EngramStore* engram_get(void) {
@@ -6219,7 +6402,9 @@ static void engram_grow_edges(void) {
 static char* engram_new_id(void) {
     el_val_t v = uuid_new();
     const char* s = EL_CSTR(v);
-    return el_strdup(s ? s : "");
+    /* Persistent: node ids live in the global store; an arena (el_strdup) id is
+     * freed at el_request_end(), corrupting the node after the creating request. */
+    return el_strdup_persist(s ? s : "");
 }
 
 /* Convert a node into an ElMap of its fields.                            */
@@ -6296,11 +6481,44 @@ el_val_t engram_node(el_val_t content, el_val_t node_type, el_val_t salience) {
     n->last_activated = now;
     n->created_at = now;
     n->updated_at = now;
-    n->layer_id   = ENGRAM_LAYER_DEFAULT;
+    n->layer_id   = ENGRAM_LAYER_ACCUMULATION; /* new user-facing node → top layer */
     g->node_count++;
     return el_wrap_str(el_strdup(n->id));
 }
 
+/* engram_is_valid_utf8 — return 1 if s is valid UTF-8, 0 if it contains invalid bytes.
+ * Rejects overlong encodings, surrogate halves, and byte sequences > 4 bytes. */
+static int engram_is_valid_utf8(const char* s) {
+    if (!s) return 1;
+    const unsigned char* p = (const unsigned char*)s;
+    while (*p) {
+        if (*p < 0x80) {
+            /* ASCII */
+            p++;
+        } else if ((*p & 0xE0) == 0xC0) {
+            /* 2-byte sequence */
+            if ((p[1] & 0xC0) != 0x80) return 0;
+            if ((*p & 0xFE) == 0xC0) return 0; /* overlong */
+            p += 2;
+        } else if ((*p & 0xF0) == 0xE0) {
+            /* 3-byte sequence */
+            if ((p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80) return 0;
+            if (*p == 0xE0 && (p[1] & 0xE0) == 0x80) return 0; /* overlong */
+            if (*p == 0xED && (p[1] & 0xE0) == 0xA0) return 0; /* surrogate */
+            p += 3;
+        } else if ((*p & 0xF8) == 0xF0) {
+            /* 4-byte sequence */
+            if ((p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80 || (p[3] & 0xC0) != 0x80) return 0;
+            if (*p == 0xF0 && (p[1] & 0xF0) == 0x80) return 0; /* overlong */
+            if (*p > 0xF4) return 0; /* above U+10FFFF */
+            p += 4;
+        } else {
+            return 0;
+        }
+    }
+    return 1;
+}
+
 el_val_t engram_node_full(el_val_t content, el_val_t node_type, el_val_t label,
                           el_val_t salience, el_val_t importance, el_val_t confidence,
                           el_val_t tier, el_val_t tags) {
@@ -6314,12 +6532,24 @@ el_val_t engram_node_full(el_val_t content, el_val_t node_type, el_val_t label,
     const char* lb = EL_CSTR(label);
     const char* ti = EL_CSTR(tier);
     const char* tg = EL_CSTR(tags);
-    n->content   = el_strdup(c ? c : "");
-    n->node_type = el_strdup(nt && *nt ? nt : "Memory");
-    n->label     = el_strdup(lb && *lb ? lb : (c ? engram_first_n_chars(c, 60) : ""));
-    n->tier      = el_strdup(ti && *ti ? ti : "Working");
-    n->tags      = el_strdup(tg ? tg : "");
-    n->metadata  = el_strdup("{}");
+    /* UTF-8 guard: reject content with invalid UTF-8 bytes. Persisting invalid
+     * UTF-8 garbles JSON snapshots and corrupts every subsequent node read. */
+    if (c && !engram_is_valid_utf8(c)) {
+        fprintf(stderr, "[engram] REJECTED node write — content contains invalid UTF-8 (label=%s)\n",
+                lb ? lb : "(null)");
+        return EL_STR("");
+    }
+    /* Persistent (el_strdup_persist, NOT el_strdup): these strings are owned by the
+     * persistent global node store. el_strdup tracks into the per-request arena, which
+     * el_request_end() frees when the creating HTTP request completes — leaving the
+     * stored node with dangling pointers (corrupted ids, "saved but never listed").
+     * This is the root cause of the hallucinated/lost-saves class of bugs. */
+    n->content   = el_strdup_persist(c ? c : "");
+    n->node_type = el_strdup_persist(nt && *nt ? nt : "Memory");
+    n->label     = el_strdup_persist(lb && *lb ? lb : (c ? engram_first_n_chars(c, 60) : ""));
+    n->tier      = el_strdup_persist(ti && *ti ? ti : "Working");
+    n->tags      = el_strdup_persist(tg ? tg : "");
+    n->metadata  = el_strdup_persist("{}");
     n->salience    = engram_decode_score(salience);
     n->importance  = engram_decode_score(importance);
     n->confidence  = engram_decode_score(confidence);
@@ -6332,7 +6562,7 @@ el_val_t engram_node_full(el_val_t content, el_val_t node_type, el_val_t label,
     n->last_activated = now;
     n->created_at = now;
     n->updated_at = now;
-    n->layer_id   = ENGRAM_LAYER_DEFAULT;
+    n->layer_id   = ENGRAM_LAYER_ACCUMULATION; /* new user-facing node → top layer */
     g->node_count++;
     return el_wrap_str(el_strdup(n->id));
 }
@@ -7262,13 +7492,28 @@ el_val_t engram_save(el_val_t path) {
         jb_putc(&b, '}');
     }
     jb_puts(&b, "]}");
-    FILE* f = fopen(p, "wb");
-    if (!f) { free(b.buf); return 0; }
+    {
+        struct stat _st;
+        if (stat(p, &_st) == 0 && _st.st_size > 200000 &&
+            (uint64_t)b.len < (uint64_t)_st.st_size / 16) {
+            fprintf(stderr, "[engram_save] REFUSED sparse write: new %zu vs existing %lld (<1/16) protecting %s\n",
+                b.len, (long long)_st.st_size, p);
+            free(b.buf); return 0;
+        }
+    }
+    size_t _plen = strlen(p);
+    char* _tmp = (char*)malloc(_plen + 5);
+    if (!_tmp) { free(b.buf); return 0; }
+    memcpy(_tmp, p, _plen); memcpy(_tmp + _plen, ".tmp", 5);
+    FILE* f = fopen(_tmp, "wb");
+    if (!f) { free(_tmp); free(b.buf); return 0; }
     size_t w = fwrite(b.buf, 1, b.len, f);
-    fclose(f);
-    int ok = (w == b.len);
-    free(b.buf);
-    return ok ? 1 : 0;
+    int wok = (w == b.len);
+    if (wok) { fflush(f); fsync(fileno(f)); }
+    fclose(f); free(b.buf);
+    if (!wok) { unlink(_tmp); free(_tmp); return 0; }
+    if (rename(_tmp, p) != 0) { unlink(_tmp); free(_tmp); return 0; }
+    free(_tmp); return 1;
 }
 
 /* Helper: extract a string field from a JSON object substring. */
@@ -7889,6 +8134,257 @@ el_val_t engram_query_range(el_val_t start_ms_v, el_val_t end_ms_v) {
     return el_wrap_str(b.buf);
 }
 
+/* engram_load_merge — like engram_load but WITHOUT resetting the store.
+ * Reads a JSON snapshot from `path` and adds any nodes/edges not already
+ * present in the in-memory graph. Dedup is by node id (for nodes) and by
+ * (from_id, to_id, relation) tuple (for edges).
+ *
+ * Returns (as an EL int) the count of new nodes added. Embeddings are
+ * intentionally skipped on merged nodes to avoid Ollama delays at runtime;
+ * auto_link_semantic will handle them when nodes are next activated.
+ *
+ * Does not merge layers — the in-process layer registry is authoritative. */
+el_val_t engram_load_merge(el_val_t path) {
+    const char* p = EL_CSTR(path);
+    if (!p || !*p) return 0;
+    FILE* f = fopen(p, "rb");
+    if (!f) return 0;
+    fseek(f, 0, SEEK_END);
+    long sz = ftell(f);
+    rewind(f);
+    if (sz <= 0) { fclose(f); return 0; }
+    char* data = malloc((size_t)sz + 1);
+    if (!data) { fclose(f); return 0; }
+    size_t got = fread(data, 1, (size_t)sz, f);
+    fclose(f);
+    data[got] = '\0';
+
+    EngramStore* g = engram_get();
+    int64_t added_nodes = 0;
+
+    /* Walk nodes array — skip any node whose id already exists */
+    const char* nodes_p = json_find_key(data, "nodes");
+    if (nodes_p) {
+        nodes_p = eg_skip_ws(nodes_p);
+        if (*nodes_p == '[') {
+            nodes_p++;
+            nodes_p = eg_skip_ws(nodes_p);
+            while (*nodes_p && *nodes_p != ']') {
+                if (*nodes_p != '{') { nodes_p++; continue; }
+                const char* end = json_skip_value(nodes_p);
+                size_t n = (size_t)(end - nodes_p);
+                char* obj = malloc(n + 1);
+                memcpy(obj, nodes_p, n); obj[n] = '\0';
+                char* nid = eg_get_str_field(obj, "id");
+                int already = (nid && *nid && engram_find_node(nid) != NULL);
+                free(nid);
+                if (!already) {
+                    engram_grow_nodes();
+                    EngramNode* nn = &g->nodes[g->node_count];
+                    memset(nn, 0, sizeof(*nn));
+                    nn->id        = eg_get_str_field(obj, "id");
+                    nn->content   = eg_get_str_field(obj, "content");
+                    nn->node_type = eg_get_str_field(obj, "node_type");
+                    nn->label     = eg_get_str_field(obj, "label");
+                    nn->tier      = eg_get_str_field(obj, "tier");
+                    nn->tags      = eg_get_str_field(obj, "tags");
+                    nn->metadata  = eg_get_str_field(obj, "metadata");
+                    if (!nn->metadata || !*nn->metadata) { free(nn->metadata); nn->metadata = strdup("{}"); }
+                    nn->salience              = eg_get_num_field(obj, "salience");
+                    nn->importance            = eg_get_num_field(obj, "importance");
+                    nn->confidence            = eg_get_num_field(obj, "confidence");
+                    nn->temporal_decay_rate   = eg_get_num_field(obj, "temporal_decay_rate");
+                    nn->activation_count      = eg_get_int_field(obj, "activation_count");
+                    nn->last_activated        = eg_get_int_field(obj, "last_activated");
+                    nn->created_at            = eg_get_int_field(obj, "created_at");
+                    nn->updated_at            = eg_get_int_field(obj, "updated_at");
+                    nn->background_activation = eg_get_num_field(obj, "background_activation");
+                    nn->working_memory_weight = eg_get_num_field(obj, "working_memory_weight");
+                    if (!isfinite(nn->working_memory_weight) || nn->working_memory_weight < 0.0 || nn->working_memory_weight > 1.0)
+                        nn->working_memory_weight = 0.0; /* clamp corrupt snapshot values */
+                    nn->suppression_count     = (int32_t)eg_get_int_field(obj, "suppression_count");
+                    if (json_find_key(obj, "layer_id")) {
+                        nn->layer_id = (uint32_t)eg_get_int_field(obj, "layer_id");
+                    } else {
+                        nn->layer_id = ENGRAM_LAYER_DEFAULT;
+                    }
+                    g->node_count++;
+                    added_nodes++;
+                }
+                free(obj);
+                nodes_p = end;
+                nodes_p = eg_skip_ws(nodes_p);
+                if (*nodes_p == ',') { nodes_p++; nodes_p = eg_skip_ws(nodes_p); }
+            }
+        }
+    }
+
+    /* Walk edges array — skip if (from_id, to_id, relation) already present */
+    const char* edges_p = json_find_key(data, "edges");
+    if (edges_p) {
+        edges_p = eg_skip_ws(edges_p);
+        if (*edges_p == '[') {
+            edges_p++;
+            edges_p = eg_skip_ws(edges_p);
+            while (*edges_p && *edges_p != ']') {
+                if (*edges_p != '{') { edges_p++; continue; }
+                const char* end = json_skip_value(edges_p);
+                size_t n = (size_t)(end - edges_p);
+                char* obj = malloc(n + 1);
+                memcpy(obj, edges_p, n); obj[n] = '\0';
+                char* efrom = eg_get_str_field(obj, "from_id");
+                char* eto   = eg_get_str_field(obj, "to_id");
+                char* erel  = eg_get_str_field(obj, "relation");
+                /* Check for duplicate by scanning existing edges */
+                int dup = 0;
+                if (efrom && eto && erel) {
+                    for (int64_t ei = 0; ei < g->edge_count; ei++) {
+                        EngramEdge* ex = &g->edges[ei];
+                        if (ex->from_id && ex->to_id && ex->relation &&
+                            strcmp(ex->from_id, efrom) == 0 &&
+                            strcmp(ex->to_id,   eto)   == 0 &&
+                            strcmp(ex->relation, erel)  == 0) {
+                            dup = 1; break;
+                        }
+                    }
+                }
+                if (!dup) {
+                    engram_grow_edges();
+                    EngramEdge* ee = &g->edges[g->edge_count];
+                    memset(ee, 0, sizeof(*ee));
+                    ee->id       = eg_get_str_field(obj, "id");
+                    ee->from_id  = efrom ? efrom : strdup("");
+                    ee->to_id    = eto   ? eto   : strdup("");
+                    ee->relation = erel  ? erel  : strdup("");
+                    ee->metadata = eg_get_str_field(obj, "metadata");
+                    if (!ee->metadata || !*ee->metadata) { free(ee->metadata); ee->metadata = strdup("{}"); }
+                    ee->weight     = eg_get_num_field(obj, "weight");
+                    ee->confidence = eg_get_num_field(obj, "confidence");
+                    ee->created_at = eg_get_int_field(obj, "created_at");
+                    ee->updated_at = eg_get_int_field(obj, "updated_at");
+                    ee->last_fired = eg_get_int_field(obj, "last_fired");
+                    ee->inhibitory = (int)eg_get_int_field(obj, "inhibitory");
+                    if (json_find_key(obj, "layer_id")) {
+                        ee->layer_id = (uint32_t)eg_get_int_field(obj, "layer_id");
+                    } else {
+                        ee->layer_id = ENGRAM_LAYER_DEFAULT;
+                    }
+                    g->edge_count++;
+                    /* NOTE: efrom/eto/erel ownership transferred to ee above */
+                    efrom = NULL; eto = NULL; erel = NULL;
+                } else {
+                    free(efrom); free(eto); free(erel);
+                }
+                free(obj);
+                edges_p = end;
+                edges_p = eg_skip_ws(edges_p);
+                if (*edges_p == ',') { edges_p++; edges_p = eg_skip_ws(edges_p); }
+            }
+        }
+    }
+
+    free(data);
+    return (el_val_t)added_nodes;
+}
+
+el_val_t engram_wm_count(void) {
+    EngramStore* g = engram_get();
+    int64_t count = 0;
+    for (int64_t i = 0; i < g->node_count; i++) {
+        if (g->nodes[i].working_memory_weight > 0.0) count++;
+    }
+    return (el_val_t)count;
+}
+
+/* Average working_memory_weight across all promoted nodes (wm > 0).
+ * Returns the float bit-pattern via el_from_float so EL can use it with
+ * float_to_str / float_gt. Returns 0.0 when no nodes are promoted.
+ * Useful in heartbeat ISEs to distinguish "many weak activations" (sparse
+ * graph, low avg) from "few strong activations" (dense subgraph, high avg).
+ * Added 2026-06-04 self-review for graph health observability. */
+el_val_t engram_wm_avg_weight(void) {
+    EngramStore* g = engram_get();
+    double sum = 0.0;
+    int64_t count = 0;
+    for (int64_t i = 0; i < g->node_count; i++) {
+        double w = g->nodes[i].working_memory_weight;
+        /* Defensive guard: skip any corrupt/out-of-range values so a single
+         * bad snapshot node doesn't produce a garbage average (e.g. 1.77e+234). */
+        if (w > 0.0 && w <= 1.0 && isfinite(w)) { sum += w; count++; }
+    }
+    double avg = (count > 0) ? (sum / (double)count) : 0.0;
+    return el_from_float(avg);
+}
+
+/* engram_wm_top_json — return top N working-memory nodes (by wm weight) as a
+ * compact JSON array for ISE heartbeat reporting.
+ *
+ * Each element: {"label":"...","node_type":"...","tier":"...","wm":0.42}
+ *
+ * Purpose: the heartbeat ISE reports wm_active (count) and wm_avg_weight but
+ * gives zero visibility into WM *composition* — which types/tiers are active.
+ * After long uptime every WM slot is in steady-state decay+re-promotion so
+ * wm_promotion ISEs never fire (they only fire on 0→>0.1 transitions).
+ * This function fills the observability gap by snapshotting the current top-N
+ * WM nodes on every heartbeat. Inserted 2026-06-05 self-review. */
+el_val_t engram_wm_top_json(el_val_t n_v) {
+    int64_t top_n = (int64_t)n_v;
+    if (top_n <= 0) top_n = 10;
+    if (top_n > 50) top_n = 50;
+    EngramStore* g = engram_get();
+
+    /* Collect indices of promoted nodes, excluding monitoring noise.
+     * InternalStateEvent nodes are system-observation artifacts — they reflect
+     * what the daemon is doing, not what it knows. Including them in wm_top
+     * buries real knowledge (Memory, Knowledge, Belief nodes) under a wall of
+     * heartbeat/curiosity ISEs, making the heartbeat ISE useless for diagnosing
+     * WM composition. Filter them out here so wm_top always shows substantive
+     * content. (2026-06-07 self-review) */
+    int64_t* idx = malloc((size_t)(g->node_count + 1) * sizeof(int64_t));
+    if (!idx) return el_wrap_str(el_strdup("[]"));
+    int64_t mc = 0;
+    for (int64_t i = 0; i < g->node_count; i++) {
+        if (g->nodes[i].working_memory_weight > 0.0) {
+            const char* nt = g->nodes[i].node_type;
+            if (nt && strcmp(nt, "InternalStateEvent") == 0) continue;
+            idx[mc++] = i;
+        }
+    }
+
+    /* Insertion-sort descending by wm weight (mc is typically small). */
+    for (int64_t i = 1; i < mc; i++) {
+        int64_t key = idx[i];
+        double  kw  = g->nodes[key].working_memory_weight;
+        int64_t j = i;
+        while (j > 0 && g->nodes[idx[j-1]].working_memory_weight < kw) {
+            idx[j] = idx[j-1]; j--;
+        }
+        idx[j] = key;
+    }
+
+    int64_t emit = mc < top_n ? mc : top_n;
+    JsonBuf b; jb_init(&b);
+    jb_putc(&b, '[');
+    for (int64_t k = 0; k < emit; k++) {
+        EngramNode* n = &g->nodes[idx[k]];
+        if (k > 0) jb_putc(&b, ',');
+        jb_putc(&b, '{');
+        jb_puts(&b, "\"label\":");
+        jb_emit_escaped(&b, n->label     ? n->label     : "");
+        jb_puts(&b, ",\"node_type\":");
+        jb_emit_escaped(&b, n->node_type ? n->node_type : "");
+        jb_puts(&b, ",\"tier\":");
+        jb_emit_escaped(&b, n->tier      ? n->tier      : "");
+        char tmp[48];
+        snprintf(tmp, sizeof(tmp), ",\"wm\":%.3f", n->working_memory_weight);
+        jb_puts(&b, tmp);
+        jb_putc(&b, '}');
+    }
+    free(idx);
+    jb_putc(&b, ']');
+    return el_wrap_str(b.buf);
+}
+
 #ifdef HAVE_CURL
 /* ── DHARMA network ─────────────────────────────────────────────────────────
  * Real implementation. Peers are addressed by `dharma_id` — either bare
@@ -8529,7 +9025,7 @@ static el_val_t llm_provider_request(const char* url, const char* key,
     }
 }
 
-static el_val_t llm_chain_call(const char* system_str, const char* user_str) {
+static el_val_t llm_chain_call(const char* model_pref, const char* system_str, const char* user_str) {
     char url_key[64], key_key[64], fmt_key[64], model_key[64];
     for (int i = 0; i < LLM_MAX_PROVIDERS; i++) {
         snprintf(url_key,   sizeof(url_key),   "NEURON_LLM_%d_URL",    i);
@@ -8542,6 +9038,7 @@ static el_val_t llm_chain_call(const char* system_str, const char* user_str) {
         const char* fmt_s = getenv(fmt_key);
         int fmt = (fmt_s && strcmp(fmt_s, "anthropic") == 0) ? 1 : 0;
         const char* model = getenv(model_key);
+        if (!model || !*model) model = model_pref; /* fall back to the caller-requested model */
         fprintf(stderr, "[llm] trying provider %d (%s)\n", i, url);
         el_val_t result = llm_provider_request(url, key, fmt, model, system_str, user_str);
         const char* t = EL_CSTR(result);
@@ -8552,7 +9049,7 @@ static el_val_t llm_chain_call(const char* system_str, const char* user_str) {
     const char* api_key = getenv("ANTHROPIC_API_KEY");
     if (!api_key || !*api_key) return http_error_json("no LLM providers configured");
     fprintf(stderr, "[llm] using legacy ANTHROPIC_API_KEY fallback\n");
-    return llm_provider_request(LLM_API_URL, api_key, 1, NULL, system_str, user_str);
+    return llm_provider_request(LLM_API_URL, api_key, 1, model_pref, system_str, user_str);
 }
 
 /* Legacy llm_request — kept for backward compat with agentic loop internals */
@@ -8616,14 +9113,16 @@ static el_val_t llm_extract_text(el_val_t resp_val) {
 }
 
 el_val_t llm_call(el_val_t model, el_val_t prompt) {
+    const char* m = EL_CSTR(model);
     const char* u = EL_CSTR(prompt); if (!u) u = "";
-    return llm_chain_call(NULL, u);
+    return llm_chain_call(m, NULL, u);
 }
 
 el_val_t llm_call_system(el_val_t model, el_val_t system_prompt, el_val_t user_prompt) {
+    const char* m = EL_CSTR(model);
     const char* s = EL_CSTR(system_prompt); if (!s) s = "";
     const char* u = EL_CSTR(user_prompt);   if (!u) u = "";
-    return llm_chain_call(s, u);
+    return llm_chain_call(m, s, u);
 }
 
 /* ── Tool registry for llm_call_agentic ─────────────────────────────────── */

lang/el-compiler/runtime/el_runtime.h

@@ -52,6 +52,12 @@
 
 typedef int64_t el_val_t;
 
+/* HTTP request-handler function-pointer types. Public because soul modules (routes/chat/etc.)
+ * register handlers across translation units; previously defined only inside el_runtime.c, which
+ * made cross-module references (and the Windows build) fail. Home in the shared header. */
+typedef el_val_t (*http_handler_fn)(el_val_t method, el_val_t path, el_val_t body);
+typedef el_val_t (*http_handler4_fn)(el_val_t method, el_val_t path, el_val_t body, el_val_t headers);
+
 #define EL_STR(s)  ((el_val_t)(uintptr_t)(s))
 #define EL_CSTR(v) ((const char*)(uintptr_t)(v))
 #define EL_INT(v)  (v)
@@ -176,6 +182,7 @@ el_val_t  http_set_handler(el_val_t name);
  * existing handlers (e.g. products/web/server.el): it dispatches with
  * (method, path, body), hardcodes 200 OK, and auto-detects content type. */
 el_val_t  http_serve_v2(el_val_t port, el_val_t handler);
+void      http_serve_async(el_val_t port, el_val_t handler);
 el_val_t  http_set_handler_v2(el_val_t name);
 
 /* Build an HTTP response envelope. `headers_json` should be a JSON object
@@ -638,6 +645,12 @@ el_val_t  engram_list_layers_json(void);
  * no nodes promoted to working memory. */
 el_val_t  engram_compile_layered_json(el_val_t intent, el_val_t depth);
 
+/* ── Working memory ──────────────────────────────────────────────────────────*/
+el_val_t  engram_wm_count(void);
+el_val_t  engram_wm_avg_weight(void);
+el_val_t  engram_wm_top_json(el_val_t n);
+el_val_t  engram_load_merge(el_val_t path);
+
 /* ── LLM (Anthropic API client) ─────────────────────────────────────────────
  * All functions call https://api.anthropic.com/v1/messages with the API key
  * from env ANTHROPIC_API_KEY. Default model when empty: claude-sonnet-4-5. */

lang/el-compiler/runtime/new-platform

@@ -0,0 +1,711 @@
+#!/usr/bin/env bash
+# new-platform — scaffold a new el-native platform bridge
+#
+# Usage: ./new-platform <platform-name>
+#
+# Example:
+#   ./new-platform myplatform
+#
+# Creates el_myplatform.c with all 33 required __* functions stubbed out,
+# the ElWidget slot table, and the dlsym callback dispatcher.
+#
+# After running, follow the printed instructions to wire the bridge into
+# el_native_target.h and el_seed.c.
+#
+# See PLATFORM_BRIDGE_SPEC.md for the full bridge contract.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# ── Argument validation ───────────────────────────────────────────────────────
+
+if [[ $# -lt 1 ]]; then
+    echo "Usage: $0 <platform-name>" >&2
+    echo "" >&2
+    echo "  <platform-name>  lowercase identifier, e.g. myrtos, wayland, qt6" >&2
+    echo "" >&2
+    echo "This creates el_<platform-name>.c in the current directory." >&2
+    exit 1
+fi
+
+PLATFORM_LOWER="${1,,}"   # force lowercase
+PLATFORM_UPPER="${PLATFORM_LOWER^^}"   # force uppercase
+
+# Validate: letters, digits, underscores only
+if [[ ! "${PLATFORM_LOWER}" =~ ^[a-z][a-z0-9_]*$ ]]; then
+    echo "Error: platform name must start with a letter and contain only a-z, 0-9, _" >&2
+    exit 1
+fi
+
+OUTPUT_FILE="${SCRIPT_DIR}/el_${PLATFORM_LOWER}.c"
+
+if [[ -f "${OUTPUT_FILE}" ]]; then
+    echo "Error: ${OUTPUT_FILE} already exists." >&2
+    echo "  Remove it first if you want to regenerate it." >&2
+    exit 1
+fi
+
+# ── Generate the bridge file ──────────────────────────────────────────────────
+
+cat > "${OUTPUT_FILE}" << BRIDGE_FILE
+/*
+ * el_${PLATFORM_LOWER}.c — el-native platform bridge for ${PLATFORM_UPPER}.
+ *
+ * Generated by new-platform. Replace the TODO stubs with real implementations.
+ * See PLATFORM_BRIDGE_SPEC.md for the full contract.
+ *
+ * ── Slot system ──────────────────────────────────────────────────────────────
+ * Every widget (window, button, label, container, image) is stored in a static
+ * array of ElWidget structs. The el program holds an int64_t "handle" which is
+ * a direct index into that array. Rules:
+ *   - Slot 0 is NEVER valid. Scans start at index 1.
+ *   - Handle -1 means "invalid" / "create failed".
+ *   - Maximum 4096 concurrent widgets.
+ *   - el_widget_get() returns NULL for 0, negative, out-of-range, or FREE slots.
+ *
+ * ── Callback ABI ─────────────────────────────────────────────────────────────
+ * When a platform event fires (click, text change), call el_${PLATFORM_LOWER}_invoke_cb:
+ *
+ *   el_${PLATFORM_LOWER}_invoke_cb(w->cb_click, slot_index, "");
+ *
+ * The El callback signature:
+ *   fn handler(handle: Int, data: String) -> Void
+ * compiles to:
+ *   void handler(int64_t handle, int64_t data)
+ * where data is a const char* cast to int64_t (el String representation).
+ *
+ * ── Thread safety ────────────────────────────────────────────────────────────
+ * ALL platform UI calls must run on the main/UI thread. If your platform
+ * delivers events on background threads (e.g., from a network callback that
+ * updates a label), marshal to the main thread before calling any widget op.
+ *
+ * ── Compile ──────────────────────────────────────────────────────────────────
+ *   cc -DEL_TARGET_${PLATFORM_UPPER} \\
+ *      \$(pkg-config --cflags <your-toolkit>) \\
+ *      -c el_${PLATFORM_LOWER}.c -o el_${PLATFORM_LOWER}.o
+ *
+ * ── Link ─────────────────────────────────────────────────────────────────────
+ *   cc el_${PLATFORM_LOWER}.o el_seed.o el_runtime.o -o myapp \\
+ *      \$(pkg-config --libs <your-toolkit>) -ldl -lpthread
+ */
+
+#ifdef EL_TARGET_${PLATFORM_UPPER}
+
+/* ── TODO: add platform-specific includes here ──────────────────────────────
+ * Examples:
+ *   #include <gtk/gtk.h>              // GTK4
+ *   #include <SDL2/SDL.h>             // SDL2
+ *   #include "lvgl/lvgl.h"            // LVGL
+ *   #include <windows.h>              // Win32
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <dlfcn.h>   /* dlsym — replace with GetProcAddress on Windows */
+
+/* ── Widget table ─────────────────────────────────────────────────────────── */
+
+#define EL_${PLATFORM_UPPER}_MAX_WIDGETS 4096
+
+typedef enum {
+    EL_WIDGET_FREE      = 0,
+    EL_WIDGET_WINDOW    = 1,
+    EL_WIDGET_VSTACK    = 2,
+    EL_WIDGET_HSTACK    = 3,
+    EL_WIDGET_ZSTACK    = 4,
+    EL_WIDGET_SCROLL    = 5,
+    EL_WIDGET_LABEL     = 6,
+    EL_WIDGET_BUTTON    = 7,
+    EL_WIDGET_TEXTFIELD = 8,
+    EL_WIDGET_TEXTAREA  = 9,
+    EL_WIDGET_IMAGE     = 10,
+} ElWidgetKind;
+
+typedef struct {
+    ElWidgetKind  kind;
+
+    /* TODO: add your platform's native widget reference here.
+     * Examples:
+     *   GtkWidget*   widget;     // GTK4
+     *   SDL_Rect     rect;       // SDL2 (no object, just geometry)
+     *   lv_obj_t*    obj;        // LVGL
+     *   HWND         hwnd;       // Win32
+     *   void*        native;     // generic pointer
+     */
+    void*         native;   /* platform widget reference — replace as needed */
+
+    /* Text content (cached for platforms that don't provide a get-text API) */
+    char*         text;
+
+    /* Foreground / background color (RGBA, 0.0-1.0) */
+    float         fg_r, fg_g, fg_b, fg_a;
+    float         bg_r, bg_g, bg_b, bg_a;
+
+    /* Geometry */
+    int           width;    /* 0 = not set */
+    int           height;   /* 0 = not set */
+    int           flex;     /* 0 = hug content, >0 = expand */
+
+    /* Padding (top, right, bottom, left) */
+    int           pad_top, pad_right, pad_bottom, pad_left;
+
+    /* Corner radius */
+    int           corner_radius;
+
+    /* State */
+    int           disabled; /* 0 = enabled, 1 = disabled */
+    int           hidden;   /* 0 = visible, 1 = hidden */
+
+    /* Event callbacks — El function name resolved at event time via dlsym */
+    char*         cb_click;    /* on_click / on_submit */
+    char*         cb_change;   /* on_change */
+} ElWidget;
+
+static ElWidget _el_widgets[EL_${PLATFORM_UPPER}_MAX_WIDGETS];
+
+/* ── Slot management ──────────────────────────────────────────────────────── */
+
+static int64_t el_widget_alloc(ElWidgetKind kind, void* native) {
+    for (int i = 1; i < EL_${PLATFORM_UPPER}_MAX_WIDGETS; i++) {
+        if (_el_widgets[i].kind == EL_WIDGET_FREE) {
+            memset(&_el_widgets[i], 0, sizeof(ElWidget));
+            _el_widgets[i].kind   = kind;
+            _el_widgets[i].native = native;
+            return (int64_t)i;
+        }
+    }
+    fprintf(stderr, "el_${PLATFORM_LOWER}: widget table full (max %d)\n",
+            EL_${PLATFORM_UPPER}_MAX_WIDGETS);
+    return -1;
+}
+
+static ElWidget* el_widget_get(int64_t handle) {
+    if (handle <= 0 || handle >= EL_${PLATFORM_UPPER}_MAX_WIDGETS) return NULL;
+    if (_el_widgets[handle].kind == EL_WIDGET_FREE)               return NULL;
+    return &_el_widgets[handle];
+}
+
+static void el_widget_free(int64_t handle) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    /* TODO: release w->native (toolkit-specific) */
+    free(w->text);
+    free(w->cb_click);
+    free(w->cb_change);
+    memset(w, 0, sizeof(ElWidget)); /* sets kind = EL_WIDGET_FREE (0) */
+}
+
+/* ── Callback dispatcher ─────────────────────────────────────────────────── */
+/*
+ * Invoke an El function by symbol name. The El function must have the
+ * compiled signature:  void fn(int64_t handle, int64_t data)
+ * where data is a const char* cast to int64_t (el String representation).
+ *
+ * On platforms without dlsym (e.g., Windows), replace with:
+ *   GetProcAddress(GetModuleHandle(NULL), fn_name)
+ * On embedded targets without dynamic linking, maintain a manual symbol table.
+ */
+typedef void (*ElCb2)(int64_t handle, int64_t data);
+
+static void el_${PLATFORM_LOWER}_invoke_cb(const char* fn_name,
+                                            int64_t handle,
+                                            const char* data) {
+    if (!fn_name || !*fn_name) return;
+    void* sym = dlsym(RTLD_DEFAULT, fn_name);
+    if (!sym) {
+        fprintf(stderr, "el_${PLATFORM_LOWER}: callback symbol not found: %s\n", fn_name);
+        return;
+    }
+    ElCb2 fn = (ElCb2)sym;
+    fn(handle, (int64_t)(uintptr_t)(data ? data : ""));
+}
+
+/* ── Lifecycle ────────────────────────────────────────────────────────────── */
+
+/*
+ * el_${PLATFORM_LOWER}_init — initialize the platform toolkit.
+ * Must be idempotent (safe to call more than once).
+ * Called once from __native_init before any widget creation.
+ */
+void el_${PLATFORM_LOWER}_init(void) {
+    static int done = 0;
+    if (done) return;
+    done = 1;
+
+    /* TODO: initialize your platform toolkit here.
+     * Examples:
+     *   gtk_init(NULL, NULL);            // GTK4
+     *   SDL_Init(SDL_INIT_VIDEO);        // SDL2
+     *   lv_init();                       // LVGL
+     */
+}
+
+/*
+ * el_${PLATFORM_LOWER}_run_loop — start the platform event loop.
+ * On most platforms this NEVER returns. Exceptions: Android (no-op).
+ * Must be called from the main thread.
+ */
+void el_${PLATFORM_LOWER}_run_loop(void) {
+    /* TODO: start the platform event/render loop.
+     * Examples:
+     *   gtk_main();                      // GTK4
+     *   while (1) { SDL_PollEvent(...); render(); SDL_Delay(16); }  // SDL2
+     *   while (1) { lv_task_handler(); usleep(5000); }              // LVGL
+     */
+}
+
+/* ── Window ───────────────────────────────────────────────────────────────── */
+
+int64_t el_${PLATFORM_LOWER}_window_create(const char* title, int w, int h,
+                                            int mw, int mh) {
+    /* TODO: create a top-level window.
+     * title may be NULL — treat as "".
+     * mw/mh are minimum dimensions (0 = no minimum).
+     * Return slot handle on success, -1 on failure.
+     */
+    (void)title; (void)w; (void)h; (void)mw; (void)mh;
+    return -1; /* TODO: implement */
+}
+
+void el_${PLATFORM_LOWER}_window_show(int64_t handle) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    /* TODO: make the window visible. */
+}
+
+void el_${PLATFORM_LOWER}_window_set_title(int64_t handle, const char* title) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    /* TODO: update the window title. title may be NULL — treat as "". */
+    (void)title;
+}
+
+/* ── Layout containers ────────────────────────────────────────────────────── */
+
+int64_t el_${PLATFORM_LOWER}_vstack_create(int spacing) {
+    /* TODO: create a vertical linear container with the given spacing (px). */
+    (void)spacing;
+    return -1; /* TODO: implement */
+}
+
+int64_t el_${PLATFORM_LOWER}_hstack_create(int spacing) {
+    /* TODO: create a horizontal linear container with the given spacing (px). */
+    (void)spacing;
+    return -1; /* TODO: implement */
+}
+
+int64_t el_${PLATFORM_LOWER}_zstack_create(void) {
+    /* TODO: create a z-axis overlay container (children overlap). */
+    return -1; /* TODO: implement */
+}
+
+int64_t el_${PLATFORM_LOWER}_scroll_create(void) {
+    /* TODO: create a scrollable container (vertical scroll, first child = content). */
+    return -1; /* TODO: implement */
+}
+
+/* ── Leaf widgets ─────────────────────────────────────────────────────────── */
+
+int64_t el_${PLATFORM_LOWER}_label_create(const char* text) {
+    /* TODO: create a non-editable text label. text may be NULL — treat as "". */
+    (void)text;
+    return -1; /* TODO: implement */
+}
+
+int64_t el_${PLATFORM_LOWER}_button_create(const char* label) {
+    /* TODO: create a clickable button with the given label text.
+     * Wire up the platform event handler so on_click callbacks fire later. */
+    (void)label;
+    return -1; /* TODO: implement */
+}
+
+int64_t el_${PLATFORM_LOWER}_text_field_create(const char* placeholder) {
+    /* TODO: create a single-line text input. placeholder may be NULL. */
+    (void)placeholder;
+    return -1; /* TODO: implement */
+}
+
+int64_t el_${PLATFORM_LOWER}_text_area_create(const char* placeholder) {
+    /* TODO: create a multi-line text input (scrollable). placeholder may be NULL. */
+    (void)placeholder;
+    return -1; /* TODO: implement */
+}
+
+int64_t el_${PLATFORM_LOWER}_image_create(const char* path_or_name) {
+    /* TODO: create an image widget.
+     * Try path_or_name as a filesystem path first, then as a named resource.
+     * If neither resolves, create an empty image widget (do not crash). */
+    (void)path_or_name;
+    return -1; /* TODO: implement */
+}
+
+/* ── Widget property setters ─────────────────────────────────────────────── */
+
+void el_${PLATFORM_LOWER}_widget_set_text(int64_t handle, const char* text) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    /* TODO: update text on label, button, text field, text area, or window title.
+     * Dispatch on w->kind. text may be NULL — treat as "".
+     * Cache in w->text if the platform has no get-text API. */
+    free(w->text);
+    w->text = strdup(text ? text : "");
+}
+
+const char* el_${PLATFORM_LOWER}_widget_get_text(int64_t handle) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return "";
+    /* TODO: return the current text of the widget.
+     * If the platform provides a get-text API, use it.
+     * Otherwise return w->text (populated by set_text).
+     * NEVER return NULL — return "" on failure. */
+    return w->text ? w->text : "";
+}
+
+void el_${PLATFORM_LOWER}_widget_set_color(int64_t handle,
+                                            float r, float g, float b, float a) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->fg_r = r; w->fg_g = g; w->fg_b = b; w->fg_a = a;
+    /* TODO: apply foreground (text) color to the platform widget. */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_bg_color(int64_t handle,
+                                               float r, float g, float b, float a) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->bg_r = r; w->bg_g = g; w->bg_b = b; w->bg_a = a;
+    /* TODO: apply background color to the platform widget. */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_font(int64_t handle,
+                                           const char* family, int size, int bold) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    /* TODO: set font on text-bearing widgets (label, button, text field, text area).
+     * family may be "system" — use the platform default font in that case.
+     * Fall back to system font if family is not found. */
+    (void)family; (void)size; (void)bold;
+}
+
+void el_${PLATFORM_LOWER}_widget_set_padding(int64_t handle,
+                                              int top, int right,
+                                              int bottom, int left) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->pad_top = top; w->pad_right = right;
+    w->pad_bottom = bottom; w->pad_left = left;
+    /* TODO: apply padding/insets to the platform container or text widget. */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_width(int64_t handle, int width) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->width = width;
+    /* TODO: apply a fixed-width constraint to the platform widget. */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_height(int64_t handle, int height) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->height = height;
+    /* TODO: apply a fixed-height constraint to the platform widget. */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_flex(int64_t handle, int flex) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->flex = flex;
+    /* TODO: set the flex/expand factor.
+     * flex > 0 → widget expands to fill available space.
+     * flex == 0 → widget hugs content size.
+     * Maps to: content hugging priority (AppKit), hexpand/vexpand (GTK4),
+     *          layout_weight (Android), stretch factor (SDL2 manual layout). */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_corner_radius(int64_t handle, int radius) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->corner_radius = radius;
+    /* TODO: apply rounded corners (requires GPU layer / backing surface on most platforms). */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_disabled(int64_t handle, int disabled) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->disabled = disabled;
+    /* TODO: enable or disable the widget (buttons, text fields). No-op for containers/labels. */
+}
+
+void el_${PLATFORM_LOWER}_widget_set_hidden(int64_t handle, int hidden) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    w->hidden = hidden;
+    /* TODO: show or hide the widget.
+     * hidden=1 → invisible but still occupies layout space (visibility:hidden semantics).
+     * For windows: minimize or hide. */
+}
+
+/* ── Tree management ─────────────────────────────────────────────────────── */
+
+void el_${PLATFORM_LOWER}_widget_add_child(int64_t parent, int64_t child) {
+    ElWidget* pw = el_widget_get(parent);
+    ElWidget* cw = el_widget_get(child);
+    if (!pw || !cw) return;
+
+    /* TODO: attach child to parent. Dispatch on pw->kind:
+     *   EL_WIDGET_WINDOW  → add to root content view/container
+     *   EL_WIDGET_VSTACK  → add as vertical child
+     *   EL_WIDGET_HSTACK  → add as horizontal child
+     *   EL_WIDGET_ZSTACK  → add as overlapping subview
+     *   EL_WIDGET_SCROLL  → set as the scrollable content view (first child only)
+     *   default           → add as plain subview
+     * Do NOT add a window widget as a child. */
+    (void)pw; (void)cw;
+}
+
+void el_${PLATFORM_LOWER}_widget_remove_child(int64_t parent, int64_t child) {
+    ElWidget* pw = el_widget_get(parent);
+    ElWidget* cw = el_widget_get(child);
+    if (!pw || !cw) return;
+    /* TODO: detach child from parent. The child slot remains allocated (not destroyed). */
+    (void)pw; (void)cw;
+}
+
+void el_${PLATFORM_LOWER}_widget_destroy(int64_t handle) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    /* TODO: remove the widget from its parent/superview.
+     * For windows: close the window.
+     * Free any platform delegate/target objects stored in side tables.
+     * Then free the slot: */
+    el_widget_free(handle);
+}
+
+/* ── Event registration ───────────────────────────────────────────────────── */
+
+void el_${PLATFORM_LOWER}_widget_on_click(int64_t handle, const char* fn_name) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_click);
+    w->cb_click = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+}
+
+void el_${PLATFORM_LOWER}_widget_on_change(int64_t handle, const char* fn_name) {
+    ElWidget* w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_change);
+    w->cb_change = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+}
+
+void el_${PLATFORM_LOWER}_widget_on_submit(int64_t handle, const char* fn_name) {
+    /* Submit (Enter key in text field) reuses the cb_click slot, matching AppKit convention. */
+    el_${PLATFORM_LOWER}_widget_on_click(handle, fn_name);
+}
+
+/* ── Example event handler (adapt to your platform's callback mechanism) ─── */
+/*
+ * When a button is clicked in your platform event loop, call:
+ *
+ *   ElWidget* w = el_widget_get(slot_index);
+ *   if (w && w->cb_click) {
+ *       el_${PLATFORM_LOWER}_invoke_cb(w->cb_click, slot_index, "");
+ *   }
+ *
+ * When a text field changes:
+ *
+ *   ElWidget* w = el_widget_get(slot_index);
+ *   if (w && w->cb_change) {
+ *       el_${PLATFORM_LOWER}_invoke_cb(w->cb_change, slot_index, current_text);
+ *   }
+ */
+
+#endif /* EL_TARGET_${PLATFORM_UPPER} */
+BRIDGE_FILE
+
+chmod 644 "${OUTPUT_FILE}"
+
+# ── Print next-steps instructions ────────────────────────────────────────────
+
+UPPER="${PLATFORM_UPPER}"
+LOWER="${PLATFORM_LOWER}"
+
+cat << INSTRUCTIONS
+
+Created: el_${LOWER}.c
+
+Next steps:
+  ────────────────────────────────────────────────────────────────────────────
+  1. Add to el_native_target.h  (inside a new #ifdef EL_TARGET_${UPPER} block):
+
+     #ifdef EL_TARGET_${UPPER}
+
+     void      __native_init(void);
+     void      __native_run_loop(void);
+
+     el_val_t  __window_create(el_val_t title, el_val_t width, el_val_t height,
+                                el_val_t min_width, el_val_t min_height);
+     void      __window_show(el_val_t handle);
+     void      __window_set_title(el_val_t handle, el_val_t title);
+
+     el_val_t  __vstack_create(el_val_t spacing);
+     el_val_t  __hstack_create(el_val_t spacing);
+     el_val_t  __zstack_create(void);
+     el_val_t  __scroll_create(void);
+
+     el_val_t  __label_create(el_val_t text);
+     el_val_t  __button_create(el_val_t label);
+     el_val_t  __text_field_create(el_val_t placeholder);
+     el_val_t  __text_area_create(el_val_t placeholder);
+     el_val_t  __image_create(el_val_t path_or_name);
+
+     void      __widget_set_text(el_val_t handle, el_val_t text);
+     el_val_t  __widget_get_text(el_val_t handle);
+     void      __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                                   el_val_t b, el_val_t a);
+     void      __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                                      el_val_t b, el_val_t a);
+     void      __widget_set_font(el_val_t handle, el_val_t family,
+                                  el_val_t size, el_val_t bold);
+     void      __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                                     el_val_t bottom, el_val_t left);
+     void      __widget_set_width(el_val_t handle, el_val_t width);
+     void      __widget_set_height(el_val_t handle, el_val_t height);
+     void      __widget_set_flex(el_val_t handle, el_val_t flex);
+     void      __widget_set_corner_radius(el_val_t handle, el_val_t radius);
+     void      __widget_set_disabled(el_val_t handle, el_val_t disabled);
+     void      __widget_set_hidden(el_val_t handle, el_val_t hidden);
+
+     void      __widget_add_child(el_val_t parent, el_val_t child);
+     void      __widget_remove_child(el_val_t parent, el_val_t child);
+     void      __widget_destroy(el_val_t handle);
+
+     void      __widget_on_click(el_val_t handle, el_val_t fn_name);
+     void      __widget_on_change(el_val_t handle, el_val_t fn_name);
+     void      __widget_on_submit(el_val_t handle, el_val_t fn_name);
+
+     el_val_t  __manifest_read(el_val_t path);
+
+     #endif /* EL_TARGET_${UPPER} */
+
+  ────────────────────────────────────────────────────────────────────────────
+  2. Add to el_seed.c  (copy the EL_TARGET_MACOS block as a template and
+     substitute el_appkit_ → el_${LOWER}_):
+
+     #ifdef EL_TARGET_${UPPER}
+
+     /* Forward declarations — implemented in el_${LOWER}.c */
+     extern void    el_${LOWER}_init(void);
+     extern void    el_${LOWER}_run_loop(void);
+     extern int64_t el_${LOWER}_window_create(const char* title, int w, int h, int mw, int mh);
+     extern void    el_${LOWER}_window_show(int64_t handle);
+     extern void    el_${LOWER}_window_set_title(int64_t handle, const char* title);
+     extern int64_t el_${LOWER}_vstack_create(int spacing);
+     extern int64_t el_${LOWER}_hstack_create(int spacing);
+     extern int64_t el_${LOWER}_zstack_create(void);
+     extern int64_t el_${LOWER}_scroll_create(void);
+     extern int64_t el_${LOWER}_label_create(const char* text);
+     extern int64_t el_${LOWER}_button_create(const char* label);
+     extern int64_t el_${LOWER}_text_field_create(const char* placeholder);
+     extern int64_t el_${LOWER}_text_area_create(const char* placeholder);
+     extern int64_t el_${LOWER}_image_create(const char* path_or_name);
+     extern void    el_${LOWER}_widget_set_text(int64_t handle, const char* text);
+     extern const char* el_${LOWER}_widget_get_text(int64_t handle);
+     extern void    el_${LOWER}_widget_set_color(int64_t h, float r, float g, float b, float a);
+     extern void    el_${LOWER}_widget_set_bg_color(int64_t h, float r, float g, float b, float a);
+     extern void    el_${LOWER}_widget_set_font(int64_t h, const char* family, int size, int bold);
+     extern void    el_${LOWER}_widget_set_padding(int64_t h, int top, int right, int bottom, int left);
+     extern void    el_${LOWER}_widget_set_width(int64_t h, int width);
+     extern void    el_${LOWER}_widget_set_height(int64_t h, int height);
+     extern void    el_${LOWER}_widget_set_flex(int64_t h, int flex);
+     extern void    el_${LOWER}_widget_set_corner_radius(int64_t h, int radius);
+     extern void    el_${LOWER}_widget_set_disabled(int64_t h, int disabled);
+     extern void    el_${LOWER}_widget_set_hidden(int64_t h, int hidden);
+     extern void    el_${LOWER}_widget_add_child(int64_t parent, int64_t child);
+     extern void    el_${LOWER}_widget_remove_child(int64_t parent, int64_t child);
+     extern void    el_${LOWER}_widget_destroy(int64_t handle);
+     extern void    el_${LOWER}_widget_on_click(int64_t h, const char* fn_name);
+     extern void    el_${LOWER}_widget_on_change(int64_t h, const char* fn_name);
+     extern void    el_${LOWER}_widget_on_submit(int64_t h, const char* fn_name);
+
+     void __native_init(void)     { el_${LOWER}_init(); }
+     void __native_run_loop(void) { el_${LOWER}_run_loop(); }
+
+     el_val_t __window_create(el_val_t title, el_val_t width, el_val_t height,
+                               el_val_t min_width, el_val_t min_height) {
+         return (el_val_t)el_${LOWER}_window_create(
+             EL_CSTR(title),
+             (int)(int64_t)width, (int)(int64_t)height,
+             (int)(int64_t)min_width, (int)(int64_t)min_height);
+     }
+     void __window_show(el_val_t h)                  { el_${LOWER}_window_show((int64_t)h); }
+     void __window_set_title(el_val_t h, el_val_t t) { el_${LOWER}_window_set_title((int64_t)h, EL_CSTR(t)); }
+
+     el_val_t __vstack_create(el_val_t s)  { return (el_val_t)el_${LOWER}_vstack_create((int)(int64_t)s); }
+     el_val_t __hstack_create(el_val_t s)  { return (el_val_t)el_${LOWER}_hstack_create((int)(int64_t)s); }
+     el_val_t __zstack_create(void)         { return (el_val_t)el_${LOWER}_zstack_create(); }
+     el_val_t __scroll_create(void)         { return (el_val_t)el_${LOWER}_scroll_create(); }
+
+     el_val_t __label_create(el_val_t t)             { return (el_val_t)el_${LOWER}_label_create(EL_CSTR(t)); }
+     el_val_t __button_create(el_val_t l)             { return (el_val_t)el_${LOWER}_button_create(EL_CSTR(l)); }
+     el_val_t __text_field_create(el_val_t p)         { return (el_val_t)el_${LOWER}_text_field_create(EL_CSTR(p)); }
+     el_val_t __text_area_create(el_val_t p)          { return (el_val_t)el_${LOWER}_text_area_create(EL_CSTR(p)); }
+     el_val_t __image_create(el_val_t p)              { return (el_val_t)el_${LOWER}_image_create(EL_CSTR(p)); }
+
+     void __widget_set_text(el_val_t h, el_val_t t)  { el_${LOWER}_widget_set_text((int64_t)h, EL_CSTR(t)); }
+     el_val_t __widget_get_text(el_val_t h) {
+         const char* s = el_${LOWER}_widget_get_text((int64_t)h);
+         return EL_STR(s ? s : "");
+     }
+     void __widget_set_color(el_val_t h, el_val_t r, el_val_t g, el_val_t b, el_val_t a) {
+         el_${LOWER}_widget_set_color((int64_t)h,
+             (float)el_to_float(r), (float)el_to_float(g),
+             (float)el_to_float(b), (float)el_to_float(a));
+     }
+     void __widget_set_bg_color(el_val_t h, el_val_t r, el_val_t g, el_val_t b, el_val_t a) {
+         el_${LOWER}_widget_set_bg_color((int64_t)h,
+             (float)el_to_float(r), (float)el_to_float(g),
+             (float)el_to_float(b), (float)el_to_float(a));
+     }
+     void __widget_set_font(el_val_t h, el_val_t family, el_val_t size, el_val_t bold) {
+         el_${LOWER}_widget_set_font((int64_t)h, EL_CSTR(family),
+             (int)(int64_t)size, (int)(int64_t)bold);
+     }
+     void __widget_set_padding(el_val_t h, el_val_t top, el_val_t right,
+                                el_val_t bottom, el_val_t left) {
+         el_${LOWER}_widget_set_padding((int64_t)h,
+             (int)(int64_t)top, (int)(int64_t)right,
+             (int)(int64_t)bottom, (int)(int64_t)left);
+     }
+     void __widget_set_width(el_val_t h, el_val_t w)          { el_${LOWER}_widget_set_width((int64_t)h, (int)(int64_t)w); }
+     void __widget_set_height(el_val_t h, el_val_t ht)        { el_${LOWER}_widget_set_height((int64_t)h, (int)(int64_t)ht); }
+     void __widget_set_flex(el_val_t h, el_val_t f)           { el_${LOWER}_widget_set_flex((int64_t)h, (int)(int64_t)f); }
+     void __widget_set_corner_radius(el_val_t h, el_val_t r)  { el_${LOWER}_widget_set_corner_radius((int64_t)h, (int)(int64_t)r); }
+     void __widget_set_disabled(el_val_t h, el_val_t d)       { el_${LOWER}_widget_set_disabled((int64_t)h, (int)(int64_t)d); }
+     void __widget_set_hidden(el_val_t h, el_val_t hid)       { el_${LOWER}_widget_set_hidden((int64_t)h, (int)(int64_t)hid); }
+     void __widget_add_child(el_val_t p, el_val_t c)          { el_${LOWER}_widget_add_child((int64_t)p, (int64_t)c); }
+     void __widget_remove_child(el_val_t p, el_val_t c)       { el_${LOWER}_widget_remove_child((int64_t)p, (int64_t)c); }
+     void __widget_destroy(el_val_t h)                         { el_${LOWER}_widget_destroy((int64_t)h); }
+     void __widget_on_click(el_val_t h, el_val_t fn)          { el_${LOWER}_widget_on_click((int64_t)h, EL_CSTR(fn)); }
+     void __widget_on_change(el_val_t h, el_val_t fn)         { el_${LOWER}_widget_on_change((int64_t)h, EL_CSTR(fn)); }
+     void __widget_on_submit(el_val_t h, el_val_t fn)         { el_${LOWER}_widget_on_submit((int64_t)h, EL_CSTR(fn)); }
+
+     #endif /* EL_TARGET_${UPPER} */
+
+  ────────────────────────────────────────────────────────────────────────────
+  3. Implement each TODO in el_${LOWER}.c.
+
+  4. Compile:
+       cc -DEL_TARGET_${UPPER} -Wall \\
+          \$(pkg-config --cflags <your-toolkit> 2>/dev/null) \\
+          -c el_${LOWER}.c -o el_${LOWER}.o
+
+  5. Link:
+       cc el_${LOWER}.o el_seed.o el_runtime.o -o myapp \\
+          \$(pkg-config --libs <your-toolkit> 2>/dev/null) \\
+          -ldl -lpthread
+
+  See PLATFORM_BRIDGE_SPEC.md for the full bridge contract and gotchas.
+INSTRUCTIONS

lang/elb.el

@@ -305,7 +305,14 @@ fn link_binary(c_files: [String], out_bin: String, runtime_path: String, out_dir
     // prefix and add it if present (no-op on Linux where libssl is in /usr/lib).
     let ossl_lib_flag: String = "$(brew --prefix openssl 2>/dev/null | xargs -I{} printf -- '-L{}/lib' 2>/dev/null || true)"
     let ossl_inc_flag: String = "$(brew --prefix openssl 2>/dev/null | xargs -I{} printf -- '-I{}/include' 2>/dev/null || true)"
-    let parts = native_list_append(parts, "cc -O2 " + bracket_flag + " " + ossl_inc_flag + " -I " + dirname_of(runtime_path) + " -I " + out_dir)
+    // Force-include the C-level master declarations header so every translation
+    // unit sees all cross-module function signatures. Handles packages (like ELP)
+    // where modules call each other without explicit El import statements.
+    // The header is generated by elb --gen-decls or manually placed in out_dir.
+    let master_decls: String = out_dir + "/elp-c-decls.h"
+    let has_master: String = str_trim(exec_capture("test -f " + master_decls + " && echo yes || echo no"))
+    let include_flag: String = if str_eq(has_master, "yes") { "-include " + master_decls } else { "" }
+    let parts = native_list_append(parts, "cc -O2 " + bracket_flag + " " + ossl_inc_flag + " " + include_flag + " -I " + dirname_of(runtime_path) + " -I " + out_dir)
     let i = 0
     while i < n {
         let f: String = native_list_get(c_files, i)

lang/releases/v1.0.0-20260501/el_runtime.c

@@ -5454,8 +5454,12 @@ void el_cgi_init(el_val_t name, el_val_t dharma_id, el_val_t principal,
 #define ENGRAM_DECAY_LAMBDA  0.693147
 
 /* Two-layer activation constants.
- * ENGRAM_WM_THRESHOLD: minimum background_activation for a node to be
- *   considered for working-memory promotion (layer 2 candidate gate).
+ * ENGRAM_WM_THRESHOLD: SUPERSEDED — defined here for legacy reference only.
+ *   The actual per-call threshold is computed by engram_type_threshold() which
+ *   returns per-node-type values (0.05 Safety/DharmaSelf, 0.15 Canonical,
+ *   0.25 Lesson, 0.30 Belief/Entity, 0.40 Note/Memory/Working). This constant
+ *   is NOT used in engram_activate(); it matches the Canonical tier value only
+ *   by coincidence. (2026-07-01 self-review: clarified stale doc)
  * ENGRAM_WM_DECAY: per-turn decay applied to working_memory_weight for
  *   nodes NOT re-activated in the current turn (conversational thread
  *   continuity: a node promoted in turn N persists with reduced weight
@@ -5470,9 +5474,35 @@ void el_cgi_init(el_val_t name, el_val_t dharma_id, el_val_t principal,
 #define ENGRAM_WM_THRESHOLD          0.15
 #define ENGRAM_WM_DECAY              0.7
 #define ENGRAM_SUPPRESSION_BREAKTHROUGH 5
-#define ENGRAM_BREAKTHROUGH_WEIGHT   0.25
+/* ENGRAM_BREAKTHROUGH_WEIGHT: lowered 0.25→0.10 (2026-06-30 self-review, porting
+ * fix from self-review 2026-06-26 branch). With 0.25, Knowledge nodes (threshold
+ * 0.15) promoted at ~0.21 decay in one call to ~0.147, fall below the 0.25 floor,
+ * and immediately lose their WM slot to fresh breakthrough candidates at 0.25.
+ * Natural promotion was invisible: live data showed 524/525 WM nodes at 0.25
+ * breakthrough floor. With 0.10, all per-type thresholds (minimum 0.15 Canonical)
+ * exceed the floor, so naturally-promoted nodes survive multiple decay cycles.
+ * Invariant maintained: BREAKTHROUGH_WEIGHT < min(type_thresholds). */
+#define ENGRAM_BREAKTHROUGH_WEIGHT   0.10
+/* ENGRAM_WM_CAP: hard limit on concurrent working-memory nodes (2026-06-30
+ * self-review, porting fix from self-review 2026-06-26 branch). Without this,
+ * broad curiosity seeds like "knowledge" promote 500+ nodes simultaneously —
+ * wm_avg_weight collapses to the breakthrough floor, goal-bias differentiation
+ * is lost, and heartbeat ISEs show useless WM composition data. Cognitive
+ * basis: WM capacity is ~4 chunks (Cowan 2001); 24 allows richer multi-topic
+ * context while preventing flooding. Enforced in Pass 4 (per-call) and Pass 5
+ * (global across prior-promoted nodes). */
+#define ENGRAM_WM_CAP                24
 #define ENGRAM_INHIBITION_FACTOR     0.1
 
+/* qsort comparator — descending double, used by WM cap enforcement. */
+static int engram_cmp_double_desc(const void* a, const void* b) {
+    double da = *(const double*)a;
+    double db = *(const double*)b;
+    if (da > db) return -1;
+    if (da < db) return  1;
+    return 0;
+}
+
 /* ── Layered consciousness architecture ──────────────────────────────────────
  *
  * The engram graph is stratified into LAYERS that gate which suppressions
@@ -5627,6 +5657,20 @@ typedef struct EngramLayer {
     int      injectable;           /* can be added/removed at runtime? */
 } EngramLayer;
 
+/* ID → index hash map. Open-addressing with linear probing.
+ * Slots hold a strdup'd key and the array index of that node.
+ * Tombstones (deleted entries) use key=ENGRAM_IDMAP_TOMB and idx=-1.
+ * Rebuild required after engram_forget (shift-delete changes all indices
+ * above the deleted position). */
+#define ENGRAM_IDMAP_TOMB ((char*)1)   /* sentinel pointer, never dereferenced */
+#define ENGRAM_IDMAP_LOAD_NUM 3        /* grow when count*3 >= capacity*2     */
+#define ENGRAM_IDMAP_LOAD_DEN 2
+
+typedef struct {
+    char*   key;   /* NULL = empty, ENGRAM_IDMAP_TOMB = deleted, else strdup'd */
+    int64_t idx;
+} EngramIdSlot;
+
 typedef struct EngramStore {
     EngramNode*  nodes;
     int64_t      node_count;
@@ -5642,6 +5686,22 @@ typedef struct EngramStore {
     EngramLayer* layers;
     size_t       layer_count;
     size_t       layer_capacity;
+    /* O(1) node-id lookup: open-addressing hash map over node IDs.
+     * Maintained in sync with the nodes array. Null until first use. */
+    EngramIdSlot* id_map;
+    size_t        id_map_cap;   /* power-of-2 slot count */
+    size_t        id_map_used;  /* live entries (excluding tombstones) */
+    /* Per-node adjacency index: for each node i, adj_from[i] lists edges
+     * where nodes[i] is the 'from' end; adj_to[i] lists edges where it is
+     * the 'to' end. Both store edge indices into g->edges[].
+     * Rebuilt lazily via engram_adj_rebuild() before any BFS call. Set
+     * adj_dirty=1 whenever an edge is added, deleted, or nodes shift. */
+    int**    adj_from;      /* adj_from[node_idx] → int* array of edge indices */
+    int*     adj_from_len;
+    int**    adj_to;
+    int*     adj_to_len;
+    int      adj_dirty;     /* 1 = rebuild needed before next BFS */
+    int64_t  adj_node_count; /* node_count at time of last adj_rebuild */
 } EngramStore;
 
 static EngramStore* engram_global = NULL;
@@ -5774,18 +5834,245 @@ static int64_t engram_now_ms(void) {
     return (int64_t)tv.tv_sec * 1000LL + (int64_t)tv.tv_usec / 1000LL;
 }
 
+/* Forward declaration: engram_find_node_index is defined after the id_map
+ * helpers but called here. Without this, C99 -Wimplicit-function-declaration
+ * treats the call as an implicit non-static declaration, then conflicts with
+ * the later `static` definition. (2026-07-01 self-review: pre-existing) */
+static int64_t engram_find_node_index(const char* id);
+
 static EngramNode* engram_find_node(const char* id) {
     if (!id) return NULL;
     EngramStore* g = engram_get();
-    for (int64_t i = 0; i < g->node_count; i++) {
-        if (g->nodes[i].id && strcmp(g->nodes[i].id, id) == 0) return &g->nodes[i];
-    }
+    int64_t idx = engram_find_node_index(id);
+    if (idx >= 0) return &g->nodes[idx];
     return NULL;
 }
 
+/* ── ID hash map helpers ─────────────────────────────────────────────────────
+ * Open-addressing, linear-probing hash map.  Keys are node-id C strings.
+ * Values are int64_t indices into g->nodes[].
+ *
+ * Rules:
+ *   - id_map is NULL until the first insertion (lazy init).
+ *   - Capacity is always a power of two.
+ *   - Load factor kept below 2/3: when used*3 >= cap*2, rehash to 2*cap.
+ *   - Deletion uses ENGRAM_IDMAP_TOMB sentinels (key == (char*)1).
+ *   - After engram_forget (shift-delete) the whole map is rebuilt from
+ *     scratch because all indices above the deleted position change.
+ */
+
+static uint64_t engram_id_hash(const char* s) {
+    /* FNV-1a 64-bit */
+    uint64_t h = 14695981039346656037ULL;
+    while (*s) { h ^= (unsigned char)*s++; h *= 1099511628211ULL; }
+    return h;
+}
+
+/* Allocate a zeroed id_map of `cap` slots (cap must be power-of-two). */
+static EngramIdSlot* engram_idmap_alloc(size_t cap) {
+    return calloc(cap, sizeof(EngramIdSlot));
+}
+
+/* Low-level insert (no rehash check, no free of existing). Used during
+ * rehash and initial build where we know the load is controlled. */
+static void engram_idmap_put_raw(EngramIdSlot* map, size_t cap,
+                                 char* key, int64_t idx) {
+    size_t mask = cap - 1;
+    size_t slot = (size_t)engram_id_hash(key) & mask;
+    while (map[slot].key != NULL && map[slot].key != ENGRAM_IDMAP_TOMB) {
+        slot = (slot + 1) & mask;
+    }
+    map[slot].key = key;
+    map[slot].idx = idx;
+}
+
+/* Insert or update id → idx into the store's id_map. Rehashes if needed. */
+static void engram_idmap_put(EngramStore* g, const char* id, int64_t idx) {
+    if (!id || !*id) return;
+    /* Lazy init */
+    if (!g->id_map) {
+        g->id_map_cap  = 64;
+        g->id_map_used = 0;
+        g->id_map = engram_idmap_alloc(g->id_map_cap);
+        if (!g->id_map) return; /* OOM: fall back to linear scan */
+    }
+    /* Rehash if load factor would exceed 2/3 */
+    if ((g->id_map_used + 1) * ENGRAM_IDMAP_LOAD_NUM >= g->id_map_cap * ENGRAM_IDMAP_LOAD_DEN) {
+        size_t new_cap = g->id_map_cap * 2;
+        EngramIdSlot* new_map = engram_idmap_alloc(new_cap);
+        if (!new_map) return; /* OOM: keep old map, insert below */
+        for (size_t s = 0; s < g->id_map_cap; s++) {
+            if (g->id_map[s].key && g->id_map[s].key != ENGRAM_IDMAP_TOMB) {
+                engram_idmap_put_raw(new_map, new_cap,
+                                     g->id_map[s].key, g->id_map[s].idx);
+            }
+        }
+        free(g->id_map);
+        g->id_map     = new_map;
+        g->id_map_cap = new_cap;
+    }
+    /* Probe for existing key or empty/tomb slot */
+    size_t mask = g->id_map_cap - 1;
+    size_t slot = (size_t)engram_id_hash(id) & mask;
+    size_t tomb_slot = SIZE_MAX;
+    while (g->id_map[slot].key != NULL) {
+        if (g->id_map[slot].key == ENGRAM_IDMAP_TOMB) {
+            if (tomb_slot == SIZE_MAX) tomb_slot = slot;
+        } else if (strcmp(g->id_map[slot].key, id) == 0) {
+            g->id_map[slot].idx = idx; /* update */
+            return;
+        }
+        slot = (slot + 1) & mask;
+    }
+    /* Use tombstone slot if found (avoids growing used count unnecessarily) */
+    if (tomb_slot != SIZE_MAX) slot = tomb_slot;
+    g->id_map[slot].key = el_strdup(id);
+    g->id_map[slot].idx = idx;
+    g->id_map_used++;
+}
+
+/* Look up id in the store's id_map. Returns index or -1 if not found. */
+static int64_t engram_idmap_get(const EngramStore* g, const char* id) {
+    if (!g->id_map || !id || !*id) return -1;
+    size_t mask = g->id_map_cap - 1;
+    size_t slot = (size_t)engram_id_hash(id) & mask;
+    while (g->id_map[slot].key != NULL) {
+        if (g->id_map[slot].key != ENGRAM_IDMAP_TOMB &&
+            strcmp(g->id_map[slot].key, id) == 0) {
+            return g->id_map[slot].idx;
+        }
+        slot = (slot + 1) & mask;
+    }
+    return -1;
+}
+
+/* Free and null-out the id_map (called on full reset). */
+static void engram_idmap_free(EngramStore* g) {
+    if (!g->id_map) return;
+    for (size_t s = 0; s < g->id_map_cap; s++) {
+        if (g->id_map[s].key && g->id_map[s].key != ENGRAM_IDMAP_TOMB)
+            free(g->id_map[s].key);
+    }
+    free(g->id_map);
+    g->id_map     = NULL;
+    g->id_map_cap = 0;
+    g->id_map_used = 0;
+}
+
+/* Rebuild id_map from scratch after a structural change (e.g. shift-delete).
+ * Frees old map and constructs a fresh one. */
+static void engram_idmap_rebuild(EngramStore* g) {
+    engram_idmap_free(g);
+    for (int64_t i = 0; i < g->node_count; i++) {
+        if (g->nodes[i].id && *g->nodes[i].id)
+            engram_idmap_put(g, g->nodes[i].id, i);
+    }
+}
+
+/* ── Adjacency index helpers ─────────────────────────────────────────────────
+ * Per-node adjacency lists: adj_from[i] holds edge indices where
+ * g->edges[ei].from_id == g->nodes[i].id, adj_to[i] for the 'to' side.
+ * BFS uses these instead of scanning all edges on every hop.
+ * Called once per activation call when adj_dirty != 0.
+ */
+static void engram_adj_free(EngramStore* g) {
+    int64_t old_nc = g->adj_node_count;
+    if (g->adj_from) {
+        for (int64_t i = 0; i < old_nc; i++) free(g->adj_from[i]);
+        free(g->adj_from); g->adj_from = NULL;
+        free(g->adj_from_len); g->adj_from_len = NULL;
+    }
+    if (g->adj_to) {
+        for (int64_t i = 0; i < old_nc; i++) free(g->adj_to[i]);
+        free(g->adj_to); g->adj_to = NULL;
+        free(g->adj_to_len); g->adj_to_len = NULL;
+    }
+    g->adj_node_count = 0;
+    g->adj_dirty = 1;
+}
+
+static void engram_adj_rebuild(EngramStore* g) {
+    /* Free old adjacency arrays */
+    if (g->adj_from) {
+        /* Use adj_node_count (count at build time) not current node_count —
+         * nodes may have been added since the last rebuild, and adj arrays
+         * only have adj_node_count entries. */
+        int64_t old_nc = g->adj_node_count;
+        for (int64_t i = 0; i < old_nc; i++) {
+            free(g->adj_from[i]); free(g->adj_to[i]);
+        }
+        free(g->adj_from); free(g->adj_from_len);
+        free(g->adj_to);   free(g->adj_to_len);
+    }
+    g->adj_from     = NULL; g->adj_from_len = NULL;
+    g->adj_to       = NULL; g->adj_to_len   = NULL;
+    g->adj_node_count = 0;
+    if (g->node_count == 0) { g->adj_dirty = 0; return; }
+
+    /* Count degree per node */
+    int* from_cnt = calloc((size_t)g->node_count, sizeof(int));
+    int* to_cnt   = calloc((size_t)g->node_count, sizeof(int));
+    if (!from_cnt || !to_cnt) { free(from_cnt); free(to_cnt); return; }
+    for (int64_t ei = 0; ei < g->edge_count; ei++) {
+        EngramEdge* e = &g->edges[ei];
+        if (!e->from_id || !e->to_id) continue;
+        int64_t fi = engram_idmap_get(g, e->from_id);
+        int64_t ti = engram_idmap_get(g, e->to_id);
+        if (fi >= 0) from_cnt[fi]++;
+        if (ti >= 0) to_cnt[ti]++;
+    }
+    /* Allocate per-node arrays */
+    g->adj_from     = calloc((size_t)g->node_count, sizeof(int*));
+    g->adj_from_len = calloc((size_t)g->node_count, sizeof(int));
+    g->adj_to       = calloc((size_t)g->node_count, sizeof(int*));
+    g->adj_to_len   = calloc((size_t)g->node_count, sizeof(int));
+    if (!g->adj_from || !g->adj_from_len || !g->adj_to || !g->adj_to_len) {
+        free(from_cnt); free(to_cnt);
+        free(g->adj_from); g->adj_from = NULL;
+        free(g->adj_from_len); g->adj_from_len = NULL;
+        free(g->adj_to); g->adj_to = NULL;
+        free(g->adj_to_len); g->adj_to_len = NULL;
+        return;
+    }
+    for (int64_t i = 0; i < g->node_count; i++) {
+        if (from_cnt[i] > 0)
+            g->adj_from[i] = malloc((size_t)from_cnt[i] * sizeof(int));
+        if (to_cnt[i] > 0)
+            g->adj_to[i]   = malloc((size_t)to_cnt[i]   * sizeof(int));
+    }
+    /* Fill */
+    int* from_pos = calloc((size_t)g->node_count, sizeof(int));
+    int* to_pos   = calloc((size_t)g->node_count, sizeof(int));
+    if (!from_pos || !to_pos) {
+        free(from_cnt); free(to_cnt); free(from_pos); free(to_pos); return;
+    }
+    for (int64_t ei = 0; ei < g->edge_count; ei++) {
+        EngramEdge* e = &g->edges[ei];
+        if (!e->from_id || !e->to_id) continue;
+        int64_t fi = engram_idmap_get(g, e->from_id);
+        int64_t ti = engram_idmap_get(g, e->to_id);
+        if (fi >= 0 && g->adj_from[fi])
+            g->adj_from[fi][from_pos[fi]++] = (int)ei;
+        if (ti >= 0 && g->adj_to[ti])
+            g->adj_to[ti][to_pos[ti]++] = (int)ei;
+    }
+    /* Copy counts */
+    for (int64_t i = 0; i < g->node_count; i++) {
+        g->adj_from_len[i] = from_cnt[i];
+        g->adj_to_len[i]   = to_cnt[i];
+    }
+    free(from_cnt); free(to_cnt); free(from_pos); free(to_pos);
+    g->adj_node_count = g->node_count;
+    g->adj_dirty = 0;
+}
+
 static int64_t engram_find_node_index(const char* id) {
     if (!id) return -1;
     EngramStore* g = engram_get();
+    /* Fast O(1) path via id_map */
+    int64_t fast = engram_idmap_get(g, id);
+    if (fast >= 0) return fast;
+    /* Fallback linear scan (id_map not yet built or OOM) */
     for (int64_t i = 0; i < g->node_count; i++) {
         if (g->nodes[i].id && strcmp(g->nodes[i].id, id) == 0) return i;
     }
@@ -5896,7 +6183,10 @@ el_val_t engram_node(el_val_t content, el_val_t node_type, el_val_t salience) {
     n->created_at = now;
     n->updated_at = now;
     n->layer_id   = ENGRAM_LAYER_DEFAULT;
+    int64_t new_idx = g->node_count;
     g->node_count++;
+    engram_idmap_put(g, n->id, new_idx);
+    g->adj_dirty = 1;
     return el_wrap_str(el_strdup(n->id));
 }
 
@@ -5932,7 +6222,10 @@ el_val_t engram_node_full(el_val_t content, el_val_t node_type, el_val_t label,
     n->created_at = now;
     n->updated_at = now;
     n->layer_id   = ENGRAM_LAYER_DEFAULT;
+    int64_t new_idx_full = g->node_count;
     g->node_count++;
+    engram_idmap_put(g, n->id, new_idx_full);
+    g->adj_dirty = 1;
     return el_wrap_str(el_strdup(n->id));
 }
 
@@ -5999,7 +6292,10 @@ el_val_t engram_node_layered(el_val_t content, el_val_t node_type, el_val_t labe
     if (lid < 0) lid = (int64_t)ENGRAM_LAYER_DEFAULT;
     if (!engram_find_layer((uint32_t)lid)) lid = (int64_t)ENGRAM_LAYER_DEFAULT;
     n->layer_id = (uint32_t)lid;
+    int64_t new_idx_layered = g->node_count;
     g->node_count++;
+    engram_idmap_put(g, n->id, new_idx_layered);
+    g->adj_dirty = 1;
     return el_wrap_str(el_strdup(n->id));
 }
 
@@ -6162,6 +6458,10 @@ void engram_forget(el_val_t node_id) {
         }
     }
     g->edge_count = w;
+    /* Shift-delete changed all indices above the removed position.
+     * Rebuild id_map and mark adjacency index dirty. */
+    engram_idmap_rebuild(g);
+    engram_adj_free(g);
 }
 
 el_val_t engram_node_count(void) {
@@ -6265,6 +6565,7 @@ void engram_connect(el_val_t from_id, el_val_t to_id, el_val_t weight, el_val_t
     e->last_fired = 0;
     e->layer_id   = ENGRAM_LAYER_DEFAULT;
     g->edge_count++;
+    g->adj_dirty = 1;
 }
 
 el_val_t engram_edge_between(el_val_t from_id, el_val_t to_id) {
@@ -6524,6 +6825,12 @@ el_val_t engram_activate(el_val_t query, el_val_t depth) {
     el_val_t out = el_list_empty();
     if (!q || g->node_count == 0) return out;
 
+    /* Rebuild adjacency index if the edge/node topology changed since the
+     * last activation call. This is O(E) one-time cost vs O(E) per BFS step
+     * without the index. On a 40K-edge graph this drops BFS from O(frontier
+     * * E) to O(frontier * avg_degree). (2026-07-01 self-review) */
+    if (g->adj_dirty || !g->adj_from) engram_adj_rebuild(g);
+
     int64_t now_ms = engram_now_ms();
 
     /* Per-node layer-1 tracking. */
@@ -6586,22 +6893,47 @@ el_val_t engram_activate(el_val_t query, el_val_t depth) {
     while (fhead < ftail) {
         Frontier f = fr[fhead++];
         if (f.hops >= max_depth) continue;
-        const char* cur_id = g->nodes[f.idx].id;
-        for (int64_t ei = 0; ei < g->edge_count; ei++) {
+        int64_t cur = f.idx;
+        int64_t new_hops = f.hops + 1;
+        /* Use adjacency index: iterate only edges incident to `cur`.
+         * adj_from[cur] holds edge indices where cur is the 'from' node;
+         * adj_to[cur] holds edge indices where cur is the 'to' node.
+         * If adj index is unavailable (OOM during rebuild), fall back to
+         * full edge scan so activation is never silently wrong. */
+        int use_adj = (g->adj_from != NULL && g->adj_to != NULL);
+        int from_len = use_adj ? g->adj_from_len[cur] : 0;
+        int to_len   = use_adj ? g->adj_to_len[cur]   : 0;
+        int edge_scan_count = use_adj ? (from_len + to_len) : (int)g->edge_count;
+        for (int scan_i = 0; scan_i < edge_scan_count; scan_i++) {
+            int64_t ei;
+            int64_t oi;
+            if (use_adj) {
+                ei = (scan_i < from_len)
+                     ? g->adj_from[cur][scan_i]
+                     : g->adj_to[cur][scan_i - from_len];
+                EngramEdge* e = &g->edges[ei];
+                oi = (scan_i < from_len)
+                     ? engram_idmap_get(g, e->to_id)
+                     : engram_idmap_get(g, e->from_id);
+            } else {
+                /* Fallback: linear scan */
+                ei = scan_i;
+                EngramEdge* e = &g->edges[ei];
+                const char* other = NULL;
+                const char* cur_id = g->nodes[cur].id;
+                if (e->from_id && strcmp(e->from_id, cur_id) == 0) other = e->to_id;
+                else if (e->to_id && strcmp(e->to_id, cur_id) == 0) other = e->from_id;
+                else continue;
+                oi = engram_find_node_index(other);
+            }
+            if (oi < 0 || oi >= g->node_count) continue;
             EngramEdge* e = &g->edges[ei];
-            const char* other = NULL;
-            if (e->from_id && strcmp(e->from_id, cur_id) == 0) other = e->to_id;
-            else if (e->to_id && strcmp(e->to_id, cur_id) == 0) other = e->from_id;
-            else continue;
-            int64_t oi = engram_find_node_index(other);
-            if (oi < 0) continue;
             EngramNode* on = &g->nodes[oi];
             double tbonus  = engram_temporal_proximity_bonus(on->created_at, seed_epoch);
             double tdecay  = engram_temporal_decay(on, now_ms);
             double dampen  = engram_activation_dampen(on);
             double new_act = f.act * e->weight * SPREAD_DECAY * (1.0 + tbonus)
                            * tdecay * dampen;
-            int64_t new_hops = f.hops + 1;
             if (!reached[oi] || new_act > best_bg[oi]) {
                 best_bg[oi]   = new_act;
                 best_hops[oi] = new_hops;
@@ -6659,6 +6991,19 @@ el_val_t engram_activate(el_val_t query, el_val_t depth) {
     for (int64_t i = 0; i < g->node_count; i++) {
         if (!reached[i] || best_bg[i] <= 0.0) continue;
         EngramNode* n = &g->nodes[i];
+        /* InternalStateEvent nodes are observability-only — never admit to WM.
+         * Their JSON content (curiosity seeds, heartbeat payloads) contains common
+         * words that trigger lexical seeding (e.g. "knowledge" in curiosity ISEs),
+         * leading to repeated suppression and eventual breakthrough at the floor.
+         * ISEs surfacing in context compilation are noise, not signal. Clear their
+         * suppression_count so they don't build toward breakthrough, then skip.
+         * (2026-06-30 self-review: porting fix from 2026-06-26 branch; SYNAPSE
+         * paper confirms WM should hold only semantically relevant content.) */
+        if (n->node_type && strcmp(n->node_type, "InternalStateEvent") == 0) {
+            n->suppression_count = 0;
+            wm_weights[i] = 0.0;
+            continue;
+        }
         /* Per-type threshold: safety nodes break through more easily. */
         double type_threshold = engram_type_threshold(n->node_type, n->tier);
         /* Goal bias weights the node's relevance to current intent. */
@@ -6710,9 +7055,123 @@ el_val_t engram_activate(el_val_t query, el_val_t depth) {
         n->suppression_count = 0;
     }
 
-    /* Persist working_memory_weight (post Pass 3) to node store. */
+    /* ── PASS 4: WM capacity cap (per-call) ─────────────────────────────────
+     * Enforce ENGRAM_WM_CAP as a hard upper bound on nodes promoted in this
+     * activation call. Without this, broad curiosity seeds like "knowledge"
+     * promote 500+ nodes simultaneously — wm_avg_weight collapses to the
+     * breakthrough floor, goal-bias differentiation is lost, and working memory
+     * becomes useless. (Ported from 2026-06-26 self-review branch; observed
+     * 525 promoted for "knowledge", 524 at breakthrough floor 0.25, 1 natural.) */
+    {
+        int64_t cap_count = 0;
+        for (int64_t i = 0; i < g->node_count; i++) {
+            if (wm_weights[i] > 0.0) cap_count++;
+        }
+        if (cap_count > ENGRAM_WM_CAP) {
+            double* cap_vals = malloc((size_t)cap_count * sizeof(double));
+            if (cap_vals) {
+                int64_t ci = 0;
+                for (int64_t i = 0; i < g->node_count; i++) {
+                    if (wm_weights[i] > 0.0) cap_vals[ci++] = wm_weights[i];
+                }
+                qsort(cap_vals, (size_t)cap_count, sizeof(double),
+                      engram_cmp_double_desc);
+                /* cap_vals[ENGRAM_WM_CAP-1] is the lowest weight that still
+                 * fits inside the cap when sorted descending. */
+                double cutoff = cap_vals[ENGRAM_WM_CAP - 1];
+                free(cap_vals);
+                /* Count strictly above cutoff to handle ties correctly. */
+                int64_t above = 0;
+                for (int64_t i = 0; i < g->node_count; i++) {
+                    if (wm_weights[i] > cutoff) above++;
+                }
+                int64_t at_cutoff_slots = ENGRAM_WM_CAP - above;
+                /* Evict nodes that don't make the cut. */
+                for (int64_t i = 0; i < g->node_count; i++) {
+                    if (wm_weights[i] <= 0.0)   continue; /* not promoted */
+                    if (wm_weights[i] > cutoff) continue; /* above cutoff */
+                    if (at_cutoff_slots > 0) {
+                        at_cutoff_slots--;
+                        continue;                         /* fills a slot */
+                    }
+                    wm_weights[i] = 0.0;                  /* over cap: evict */
+                }
+            }
+            /* If malloc failed, skip cap — WM unbounded this call, no corruption. */
+        }
+    }
+
+    /* Persist working_memory_weight (post Pass 4) to node store.
+     *
+     * Conversational thread continuity (ENGRAM_WM_DECAY):
+     *   Nodes promoted in a previous turn but NOT reached by the current BFS
+     *   fan-out retain a decayed weight rather than being zeroed. This models
+     *   the brain's ability to maintain recent context across successive turns
+     *   without requiring explicit re-activation. A node that was relevant one
+     *   query ago stays weakly present in working memory; a node from two
+     *   queries ago retains 0.7² ≈ 0.49 of its original weight; after ~5 quiet
+     *   turns it falls below 0.01 and is effectively evicted (set to 0.0).
+     *
+     *   NOTE: this was documented in the ENGRAM_WM_DECAY constant comment since
+     *   the two-layer architecture was introduced, but was never implemented —
+     *   unreached nodes were always zeroed unconditionally. Fixed 2026-06-30
+     *   self-review. */
     for (int64_t i = 0; i < g->node_count; i++) {
-        g->nodes[i].working_memory_weight = wm_weights[i];
+        if (!reached[i] && g->nodes[i].working_memory_weight > 0.0) {
+            /* Carry-over decay: node held WM weight from prior activation but
+             * the current query's BFS fan-out did not reach it. Apply decay
+             * rather than zero so recently-active context persists. */
+            double decayed = g->nodes[i].working_memory_weight * ENGRAM_WM_DECAY;
+            g->nodes[i].working_memory_weight = (decayed < 0.01) ? 0.0 : decayed;
+        } else {
+            g->nodes[i].working_memory_weight = wm_weights[i];
+        }
+    }
+
+    /* ── PASS 5: Global WM cap enforcement ───────────────────────────────────
+     * Pass 4 capped this call's new candidates. But nodes already in WM from
+     * prior calls retain their persisted working_memory_weight (via the decay
+     * carry-over above). Over multiple activation calls total WM can grow well
+     * above ENGRAM_WM_CAP. This pass enforces the cap globally across ALL
+     * nodes in the store, keeping only the top ENGRAM_WM_CAP by current weight.
+     * Correct cognitive model: WM capacity is global (Cowan 2001); more recent
+     * activations outcompete older decayed ones. (Ported from 2026-06-26
+     * self-review branch.) */
+    {
+        int64_t global_wm_count = 0;
+        for (int64_t i = 0; i < g->node_count; i++) {
+            if (g->nodes[i].working_memory_weight > 0.0) global_wm_count++;
+        }
+        if (global_wm_count > ENGRAM_WM_CAP) {
+            double* gvals = malloc((size_t)global_wm_count * sizeof(double));
+            if (gvals) {
+                int64_t gi = 0;
+                for (int64_t i = 0; i < g->node_count; i++) {
+                    if (g->nodes[i].working_memory_weight > 0.0)
+                        gvals[gi++] = g->nodes[i].working_memory_weight;
+                }
+                qsort(gvals, (size_t)global_wm_count, sizeof(double),
+                      engram_cmp_double_desc);
+                double gcutoff = gvals[ENGRAM_WM_CAP - 1];
+                free(gvals);
+                int64_t gabove = 0;
+                for (int64_t i = 0; i < g->node_count; i++) {
+                    if (g->nodes[i].working_memory_weight > gcutoff) gabove++;
+                }
+                int64_t gslots_at_cutoff = ENGRAM_WM_CAP - gabove;
+                for (int64_t i = 0; i < g->node_count; i++) {
+                    EngramNode* n = &g->nodes[i];
+                    if (n->working_memory_weight <= 0.0) continue;
+                    if (n->working_memory_weight > gcutoff) continue;
+                    if (gslots_at_cutoff > 0) {
+                        gslots_at_cutoff--;
+                        continue; /* fills a slot */
+                    }
+                    n->working_memory_weight = 0.0; /* evict: over global cap */
+                }
+            }
+            /* If malloc failed, skip — WM over cap this call, no data corruption. */
+        }
     }
 
     /* ── Collect all background-activated nodes for the return value ────
@@ -6927,6 +7386,8 @@ el_val_t engram_load(el_val_t path) {
         free(g->edges[i].relation); free(g->edges[i].metadata);
     }
     g->edge_count = 0;
+    engram_idmap_free(g);
+    engram_adj_free(g);
 
     /* Walk nodes array */
     const char* nodes_p = json_find_key(data, "nodes");
@@ -6973,7 +7434,9 @@ el_val_t engram_load(el_val_t path) {
                 } else {
                     nn->layer_id = ENGRAM_LAYER_DEFAULT;
                 }
+                int64_t load_idx = g->node_count;
                 g->node_count++;
+                if (nn->id && *nn->id) engram_idmap_put(g, nn->id, load_idx);
                 free(obj);
                 nodes_p = end;
                 nodes_p = eg_skip_ws(nodes_p);
@@ -6981,6 +7444,7 @@ el_val_t engram_load(el_val_t path) {
             }
         }
     }
+    g->adj_dirty = 1;
     /* Walk edges array */
     const char* edges_p = json_find_key(data, "edges");
     if (edges_p) {
@@ -7081,6 +7545,159 @@ el_val_t engram_load(el_val_t path) {
     return 1;
 }
 
+/* engram_load_merge — like engram_load but WITHOUT resetting the store.
+ * Reads a JSON snapshot from `path` and adds any nodes/edges not already
+ * present in the in-memory graph. Dedup is by node id (for nodes) and by
+ * (from_id, to_id, relation) tuple (for edges).
+ *
+ * Returns (as an EL int) the count of new nodes added. Used by the soul
+ * daemon's periodic refresh cycle to keep its in-process Engram in sync
+ * with the HTTP Engram store without losing current working memory state.
+ * Ported from el-compiler/runtime on 2026-06-30 self-review. */
+el_val_t engram_load_merge(el_val_t path) {
+    const char* p = EL_CSTR(path);
+    if (!p || !*p) return 0;
+    FILE* f = fopen(p, "rb");
+    if (!f) return 0;
+    fseek(f, 0, SEEK_END);
+    long sz = ftell(f);
+    rewind(f);
+    if (sz <= 0) { fclose(f); return 0; }
+    char* data = malloc((size_t)sz + 1);
+    if (!data) { fclose(f); return 0; }
+    size_t got = fread(data, 1, (size_t)sz, f);
+    fclose(f);
+    data[got] = '\0';
+
+    EngramStore* g = engram_get();
+    int64_t added_nodes = 0;
+
+    /* Walk nodes array — skip any node whose id already exists */
+    const char* nodes_p = json_find_key(data, "nodes");
+    if (nodes_p) {
+        nodes_p = eg_skip_ws(nodes_p);
+        if (*nodes_p == '[') {
+            nodes_p++;
+            nodes_p = eg_skip_ws(nodes_p);
+            while (*nodes_p && *nodes_p != ']') {
+                if (*nodes_p != '{') { nodes_p++; continue; }
+                const char* end = json_skip_value(nodes_p);
+                size_t n = (size_t)(end - nodes_p);
+                char* obj = malloc(n + 1);
+                memcpy(obj, nodes_p, n); obj[n] = '\0';
+                char* nid = eg_get_str_field(obj, "id");
+                int already = (nid && *nid && engram_find_node(nid) != NULL);
+                free(nid);
+                if (!already) {
+                    engram_grow_nodes();
+                    EngramNode* nn = &g->nodes[g->node_count];
+                    memset(nn, 0, sizeof(*nn));
+                    nn->id        = eg_get_str_field(obj, "id");
+                    nn->content   = eg_get_str_field(obj, "content");
+                    nn->node_type = eg_get_str_field(obj, "node_type");
+                    nn->label     = eg_get_str_field(obj, "label");
+                    nn->tier      = eg_get_str_field(obj, "tier");
+                    nn->tags      = eg_get_str_field(obj, "tags");
+                    nn->metadata  = eg_get_str_field(obj, "metadata");
+                    if (!nn->metadata || !*nn->metadata) { free(nn->metadata); nn->metadata = strdup("{}"); }
+                    nn->salience              = eg_get_num_field(obj, "salience");
+                    nn->importance            = eg_get_num_field(obj, "importance");
+                    nn->confidence            = eg_get_num_field(obj, "confidence");
+                    nn->temporal_decay_rate   = eg_get_num_field(obj, "temporal_decay_rate");
+                    nn->activation_count      = eg_get_int_field(obj, "activation_count");
+                    nn->last_activated        = eg_get_int_field(obj, "last_activated");
+                    nn->created_at            = eg_get_int_field(obj, "created_at");
+                    nn->updated_at            = eg_get_int_field(obj, "updated_at");
+                    nn->background_activation = eg_get_num_field(obj, "background_activation");
+                    nn->working_memory_weight = eg_get_num_field(obj, "working_memory_weight");
+                    if (!isfinite(nn->working_memory_weight) || nn->working_memory_weight < 0.0 || nn->working_memory_weight > 1.0)
+                        nn->working_memory_weight = 0.0;
+                    nn->suppression_count     = (int32_t)eg_get_int_field(obj, "suppression_count");
+                    if (json_find_key(obj, "layer_id")) {
+                        nn->layer_id = (uint32_t)eg_get_int_field(obj, "layer_id");
+                    } else {
+                        nn->layer_id = ENGRAM_LAYER_DEFAULT;
+                    }
+                    int64_t merge_idx = g->node_count;
+                    g->node_count++;
+                    added_nodes++;
+                    if (nn->id && *nn->id) engram_idmap_put(g, nn->id, merge_idx);
+                    g->adj_dirty = 1;
+                }
+                free(obj);
+                nodes_p = end;
+                nodes_p = eg_skip_ws(nodes_p);
+                if (*nodes_p == ',') { nodes_p++; nodes_p = eg_skip_ws(nodes_p); }
+            }
+        }
+    }
+
+    /* Walk edges array — skip if (from_id, to_id, relation) already present */
+    const char* edges_p = json_find_key(data, "edges");
+    if (edges_p) {
+        edges_p = eg_skip_ws(edges_p);
+        if (*edges_p == '[') {
+            edges_p++;
+            edges_p = eg_skip_ws(edges_p);
+            while (*edges_p && *edges_p != ']') {
+                if (*edges_p != '{') { edges_p++; continue; }
+                const char* end = json_skip_value(edges_p);
+                size_t n = (size_t)(end - edges_p);
+                char* obj = malloc(n + 1);
+                memcpy(obj, edges_p, n); obj[n] = '\0';
+                char* efrom = eg_get_str_field(obj, "from_id");
+                char* eto   = eg_get_str_field(obj, "to_id");
+                char* erel  = eg_get_str_field(obj, "relation");
+                int dup = 0;
+                if (efrom && eto && erel) {
+                    for (int64_t ei = 0; ei < g->edge_count; ei++) {
+                        EngramEdge* ex = &g->edges[ei];
+                        if (ex->from_id && ex->to_id && ex->relation &&
+                            strcmp(ex->from_id, efrom) == 0 &&
+                            strcmp(ex->to_id,   eto)   == 0 &&
+                            strcmp(ex->relation, erel)  == 0) {
+                            dup = 1; break;
+                        }
+                    }
+                }
+                if (!dup) {
+                    engram_grow_edges();
+                    EngramEdge* ee = &g->edges[g->edge_count];
+                    memset(ee, 0, sizeof(*ee));
+                    ee->id       = eg_get_str_field(obj, "id");
+                    ee->from_id  = efrom ? efrom : strdup("");
+                    ee->to_id    = eto   ? eto   : strdup("");
+                    ee->relation = erel  ? erel  : strdup("");
+                    ee->metadata = eg_get_str_field(obj, "metadata");
+                    if (!ee->metadata || !*ee->metadata) { free(ee->metadata); ee->metadata = strdup("{}"); }
+                    ee->weight     = eg_get_num_field(obj, "weight");
+                    ee->confidence = eg_get_num_field(obj, "confidence");
+                    ee->created_at = eg_get_int_field(obj, "created_at");
+                    ee->updated_at = eg_get_int_field(obj, "updated_at");
+                    ee->last_fired = eg_get_int_field(obj, "last_fired");
+                    ee->inhibitory = (int)eg_get_int_field(obj, "inhibitory");
+                    if (json_find_key(obj, "layer_id")) {
+                        ee->layer_id = (uint32_t)eg_get_int_field(obj, "layer_id");
+                    } else {
+                        ee->layer_id = ENGRAM_LAYER_DEFAULT;
+                    }
+                    g->edge_count++;
+                    efrom = NULL; eto = NULL; erel = NULL;
+                } else {
+                    free(efrom); free(eto); free(erel);
+                }
+                free(obj);
+                edges_p = end;
+                edges_p = eg_skip_ws(edges_p);
+                if (*edges_p == ',') { edges_p++; edges_p = eg_skip_ws(edges_p); }
+            }
+        }
+    }
+
+    free(data);
+    return (el_val_t)added_nodes;
+}
+
 /* ── Engram JSON-string accessors ─────────────────────────────────────────
  * These return pre-serialized JSON strings so callers (especially HTTP
  * handlers) don't have to round-trip ElList/ElMap through json_stringify
@@ -7097,6 +7714,34 @@ el_val_t engram_get_node_json(el_val_t id) {
     return el_wrap_str(b.buf);
 }
 
+/* engram_get_node_by_label — find the first node whose label field exactly
+ * matches the given string. Returns the node as a JSON object string, or "{}"
+ * if no match is found.
+ *
+ * Used by chat.el to retrieve well-known nodes (e.g. "conv:history",
+ * "session:summary") by their stable label rather than by ID, which is immune
+ * to vector index drift across restarts.
+ *
+ * Exact match (strcmp, not istr_contains) because labels like "conv:history"
+ * must not collide with nodes whose content happens to contain that substring.
+ *
+ * Added 2026-07-01 self-review: was called in chat.el but never defined,
+ * causing build failure since June 30. */
+el_val_t engram_get_node_by_label(el_val_t label) {
+    const char* lbl = EL_CSTR(label);
+    if (!lbl || !*lbl) return el_wrap_str(el_strdup("{}"));
+    EngramStore* g = engram_get();
+    for (int64_t i = 0; i < g->node_count; i++) {
+        EngramNode* n = &g->nodes[i];
+        if (n->label && strcmp(n->label, lbl) == 0) {
+            JsonBuf b; jb_init(&b);
+            engram_emit_node_json(&b, n);
+            return el_wrap_str(b.buf);
+        }
+    }
+    return el_wrap_str(el_strdup("{}"));
+}
+
 el_val_t engram_search_json(el_val_t query, el_val_t limit) {
     EngramStore* g = engram_get();
     const char* q = EL_CSTR(query);
@@ -7298,6 +7943,95 @@ el_val_t engram_activate_json(el_val_t query, el_val_t depth) {
     return el_wrap_str(b.buf);
 }
 
+/* ── Working memory introspection helpers ────────────────────────────────────
+ *
+ * These three functions give the soul daemon visibility into WM composition
+ * without re-running activation. Used in heartbeat ISEs and curiosity scans.
+ * Ported from el-compiler/runtime to releases/v1.0.0-20260501 on 2026-06-30
+ * self-review (they were missing from the release build, breaking soul daemon
+ * compilation). */
+
+el_val_t engram_wm_count(void) {
+    EngramStore* g = engram_get();
+    int64_t count = 0;
+    for (int64_t i = 0; i < g->node_count; i++) {
+        if (g->nodes[i].working_memory_weight > 0.0) count++;
+    }
+    return (el_val_t)count;
+}
+
+/* Average working_memory_weight across all promoted nodes (wm > 0).
+ * Returns the float bit-pattern via el_from_float so EL can use it with
+ * float_to_str / float_gt. Returns 0.0 when no nodes are promoted.
+ * Useful in heartbeat ISEs to distinguish "many weak activations" from
+ * "few strong activations". Added 2026-06-04 self-review. */
+el_val_t engram_wm_avg_weight(void) {
+    EngramStore* g = engram_get();
+    double sum = 0.0;
+    int64_t count = 0;
+    for (int64_t i = 0; i < g->node_count; i++) {
+        double w = g->nodes[i].working_memory_weight;
+        /* Skip corrupt/out-of-range values so a single bad snapshot node
+         * doesn't produce a garbage average. */
+        if (w > 0.0 && w <= 1.0 && isfinite(w)) { sum += w; count++; }
+    }
+    double avg = (count > 0) ? (sum / (double)count) : 0.0;
+    return el_from_float(avg);
+}
+
+/* engram_wm_top_json — return top N working-memory nodes (by wm weight) as a
+ * compact JSON array for ISE heartbeat reporting.
+ * Each element: {"label":"...","node_type":"...","tier":"...","wm":0.42}
+ * InternalStateEvent nodes are excluded — they're observation artifacts that
+ * would bury substantive WM content. Added 2026-06-05 self-review. */
+el_val_t engram_wm_top_json(el_val_t n_v) {
+    int64_t top_n = (int64_t)n_v;
+    if (top_n <= 0) top_n = 10;
+    if (top_n > 50) top_n = 50;
+    EngramStore* g = engram_get();
+    int64_t* idx = malloc((size_t)(g->node_count + 1) * sizeof(int64_t));
+    if (!idx) return el_wrap_str(el_strdup("[]"));
+    int64_t mc = 0;
+    for (int64_t i = 0; i < g->node_count; i++) {
+        if (g->nodes[i].working_memory_weight > 0.0) {
+            const char* nt = g->nodes[i].node_type;
+            if (nt && strcmp(nt, "InternalStateEvent") == 0) continue;
+            idx[mc++] = i;
+        }
+    }
+    /* Insertion-sort descending by wm weight (mc is typically small). */
+    for (int64_t i = 1; i < mc; i++) {
+        int64_t key = idx[i];
+        double  kw  = g->nodes[key].working_memory_weight;
+        int64_t j = i;
+        while (j > 0 && g->nodes[idx[j-1]].working_memory_weight < kw) {
+            idx[j] = idx[j-1]; j--;
+        }
+        idx[j] = key;
+    }
+    int64_t emit = mc < top_n ? mc : top_n;
+    JsonBuf b; jb_init(&b);
+    jb_putc(&b, '[');
+    for (int64_t k = 0; k < emit; k++) {
+        EngramNode* n = &g->nodes[idx[k]];
+        if (k > 0) jb_putc(&b, ',');
+        jb_putc(&b, '{');
+        jb_puts(&b, "\"label\":");
+        jb_emit_escaped(&b, n->label     ? n->label     : "");
+        jb_puts(&b, ",\"node_type\":");
+        jb_emit_escaped(&b, n->node_type ? n->node_type : "");
+        jb_puts(&b, ",\"tier\":");
+        jb_emit_escaped(&b, n->tier      ? n->tier      : "");
+        char tmp[48];
+        snprintf(tmp, sizeof(tmp), ",\"wm\":%.3f", n->working_memory_weight);
+        jb_puts(&b, tmp);
+        jb_putc(&b, '}');
+    }
+    free(idx);
+    jb_putc(&b, ']');
+    return el_wrap_str(b.buf);
+}
+
 el_val_t engram_stats_json(void) {
     EngramStore* g = engram_get();
     char buf[128];

lang/releases/v1.0.0-20260501/el_runtime.h

@@ -601,6 +601,13 @@ el_val_t  engram_neighbors_json(el_val_t node_id, el_val_t max_depth, el_val_t d
 el_val_t  engram_activate_json(el_val_t query, el_val_t depth);
 el_val_t  engram_stats_json(void);
 el_val_t  engram_list_layers_json(void);
+/* Working memory introspection — count, mean weight, and top-N snapshot.
+ * Ported from el-compiler/runtime on 2026-06-30 self-review. */
+el_val_t  engram_wm_count(void);
+el_val_t  engram_wm_avg_weight(void);
+el_val_t  engram_wm_top_json(el_val_t n);
+/* Merge-load: add nodes/edges from a snapshot without resetting the store. */
+el_val_t  engram_load_merge(el_val_t path);
 /* engram_compile_layered_json — produce a prompt-ready text block split
  * into "[LAYER 0 — STRUCTURAL]" (non-suppressible layers, sacred fire)
  * and "[ENGRAM CONTEXT]" (standard suppressible layers). Returns "" if

lang/runtime/engram.el

@@ -6,15 +6,55 @@
 //
 // Dependencies: runtime/string.el, runtime/json.el
 
+// --- Validation (defense in depth) ---
+// el_val_t is an untyped machine word, so a wrong TYPE can't be caught here — but a
+// wrong VALUE can (a tier in the node_type slot, an empty/garbage string, an int, a
+// path, a model name, a cgi id). Reject loudly instead of silently writing junk.
+
+fn engram_valid_node_type(t: String) -> Bool {
+    return str_eq(t, "Memory") || str_eq(t, "Knowledge") || str_eq(t, "Belief")
+        || str_eq(t, "Project") || str_eq(t, "Tag") || str_eq(t, "BacklogItem")
+        || str_eq(t, "Artifact") || str_eq(t, "Conversation") || str_eq(t, "ExecutionContext")
+        || str_eq(t, "InternalStateEvent") || str_eq(t, "Self") || str_eq(t, "Entity")
+        || str_eq(t, "Process") || str_eq(t, "ConfigEntry") || str_eq(t, "Concept") || str_eq(t, "Imprint")
+        || str_eq(t, "SessionSummary")
+}
+
+fn engram_valid_tier(t: String) -> Bool {
+    return str_eq(t, "Semantic") || str_eq(t, "Episodic") || str_eq(t, "Working")
+        || str_eq(t, "Procedural") || str_eq(t, "Canonical") || str_eq(t, "Note") || str_eq(t, "Lesson")
+}
+
 // --- Node creation ---
 
 fn engram_node(content: String, node_type: String, salience: Float) -> String {
+    if !engram_valid_node_type(node_type) {
+        __println("[engram] REJECTED node write — invalid node_type '" + node_type + "'")
+        return ""
+    }
     return __engram_node(content, node_type, salience)
 }
 
-fn engram_node_full(content: String, nt: String, sal: Float, imp: Float,
-                    source: String, lang: String, ts: Int, tags: String) -> String {
-    return __engram_node_full(content, nt, sal, imp, source, lang, ts, tags)
+// Signature MUST match the C primitive __engram_node_full exactly (el_seed.h):
+//   (content, node_type, label, salience, importance, confidence, tier, tags)
+// The previous wrapper declared a stale 8-arg schema with wrong names AND types
+// (sal:Float at the label slot, ts:Int at the tier slot). Because el_val_t is an
+// untyped machine word, the EL compiler coerced caller args to those wrong param
+// types and then forwarded them BY POSITION into the C function — so tier received
+// an int, importance/confidence received strings, label received a float, etc.
+// That is the field-corruption bug. Match the contract 1:1 — no coercion, no reorder.
+fn engram_node_full(content: String, node_type: String, label: String,
+                    salience: Float, importance: Float, confidence: Float,
+                    tier: String, tags: String) -> String {
+    if !engram_valid_node_type(node_type) {
+        __println("[engram] REJECTED node write — invalid node_type '" + node_type + "' (label=" + label + ")")
+        return ""
+    }
+    if !engram_valid_tier(tier) {
+        __println("[engram] REJECTED node write — invalid tier '" + tier + "' (node_type=" + node_type + ", label=" + label + ")")
+        return ""
+    }
+    return __engram_node_full(content, node_type, label, salience, importance, confidence, tier, tags)
 }
 
 // --- Node retrieval ---

ui/examples/native-hello-android/.gitignore

@@ -0,0 +1,6 @@
+local.properties
+.gradle/
+build/
+app/build/
+*.iml
+.idea/

ui/examples/native-hello-android/app/build.gradle

@@ -0,0 +1,55 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    namespace 'com.neuron.el'
+    compileSdk 34
+
+    defaultConfig {
+        applicationId "com.neuron.el"
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName "1.0"
+
+        externalNativeBuild {
+            cmake {
+                cppFlags ""
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+
+        ndk {
+            // Build for the two most relevant ABIs. Add x86/x86_64 for emulator.
+            abiFilters "arm64-v8a", "armeabi-v7a", "x86_64"
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "src/main/jni/CMakeLists.txt"
+            version "3.22.1"
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            jniDebuggable true
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    // No third-party dependencies — el-native uses only android.* framework classes.
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+}

ui/examples/native-hello-android/app/proguard-rules.pro

@@ -0,0 +1,4 @@
+# Add project specific ProGuard rules here.
+# Keep ElBridge and MainActivity so JNI symbol names stay intact.
+-keep class com.neuron.el.ElBridge { *; }
+-keep class com.neuron.el.MainActivity { *; }

ui/examples/native-hello-android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name=".ElApp"
+        android:label="el-native"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+        android:allowBackup="false"
+        android:supportsRtl="true">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:configChanges="orientation|screenSize|keyboardHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+</manifest>

ui/examples/native-hello-android/app/src/main/java/com/neuron/el/ElApp.java

@@ -0,0 +1,18 @@
+package com.neuron.el;
+
+import android.app.Application;
+
+/**
+ * ElApp — Application subclass for native-hello-android.
+ *
+ * Currently minimal: exists as an anchor for future app-level initialisation
+ * (crash reporting, global state, etc.).  Listed in AndroidManifest.xml as
+ * android:name=".ElApp".
+ */
+public class ElApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+}

ui/examples/native-hello-android/app/src/main/java/com/neuron/el/ElBridge.java

@@ -0,0 +1,711 @@
+/*
+ * ElBridge.java — Android Java companion to el_android.c.
+ *
+ * All public methods are static. The C JNI layer calls these to create views,
+ * set properties, and manage the widget tree. Views are identified by integer
+ * slot indices matching the C-side handle values.
+ *
+ * Threading: every method that touches a View dispatches to the UI thread
+ * using Activity.runOnUiThread(Runnable) and blocks with a CountDownLatch
+ * until the UI thread completes the operation. This mirrors the AppKit
+ * dispatch_sync(main_queue, ^{}) pattern in el_appkit.m.
+ *
+ * Callbacks: Java sets listeners on views that call back into C via:
+ *   nativeOnClick(int slot)
+ *   nativeOnChange(int slot, String text)
+ *   nativeOnSubmit(int slot, String text)
+ * These are declared native and implemented in el_android.c.
+ *
+ * Usage (in your Activity.onCreate):
+ *   System.loadLibrary("elruntime");
+ *   ElBridge.init(this);
+ *
+ * The native library calls __native_init() which calls nativeRegisterActivity
+ * via the C side; alternatively call ElBridge.init(this) directly from Java.
+ *
+ * Compile requirements:
+ *   Android minSdkVersion 21 (Lollipop) or higher.
+ *   No third-party dependencies — uses only android.* framework classes.
+ *   For image loading from arbitrary file paths, BitmapFactory is used.
+ *   To replace with Glide/Picasso, edit createImageView only.
+ */
+
+package com.neuron.el;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import java.util.concurrent.CountDownLatch;
+
+public class ElBridge {
+
+    /* ── Native callbacks (implemented in el_android.c) ─────────────────── */
+
+    public static native void nativeOnClick(int slot);
+    public static native void nativeOnChange(int slot, String text);
+    public static native void nativeOnSubmit(int slot, String text);
+    public static native void nativeRegisterActivity(Activity activity);
+
+    /* ── State ───────────────────────────────────────────────────────────── */
+
+    private static final int MAX_SLOTS = 4096;
+
+    private static Activity   sActivity;
+    private static Handler    sUiHandler;
+    private static View[]     sViews    = new View[MAX_SLOTS];
+    private static int        sNextSlot = 1;   /* slot 0 reserved / null */
+
+    /* ── Init ────────────────────────────────────────────────────────────── */
+
+    /**
+     * Must be called from the Activity before any widget operations.
+     * Typically called from Activity.onCreate after System.loadLibrary.
+     */
+    public static void init(Activity activity) {
+        sActivity  = activity;
+        sUiHandler = new Handler(Looper.getMainLooper());
+        nativeRegisterActivity(activity);
+    }
+
+    /* ── Slot management ─────────────────────────────────────────────────── */
+
+    private static int allocSlot(View v) {
+        /* Find a free slot starting from sNextSlot, wrap around. */
+        for (int i = 0; i < MAX_SLOTS - 1; i++) {
+            int idx = ((sNextSlot - 1 + i) % (MAX_SLOTS - 1)) + 1;
+            if (sViews[idx] == null) {
+                sViews[idx] = v;
+                sNextSlot = (idx % (MAX_SLOTS - 1)) + 1;
+                return idx;
+            }
+        }
+        android.util.Log.e("ElBridge", "allocSlot: slot table full");
+        return -1;
+    }
+
+    private static View getView(int slot) {
+        if (slot <= 0 || slot >= MAX_SLOTS) return null;
+        return sViews[slot];
+    }
+
+    /* ── UI-thread dispatch helper ───────────────────────────────────────── */
+
+    /*
+     * Dispatch r on the UI thread and block until it completes.
+     * Safe to call from the UI thread itself (runs inline without posting).
+     */
+    private static void runSync(final Runnable r) {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            r.run();
+        } else {
+            final CountDownLatch latch = new CountDownLatch(1);
+            sUiHandler.post(new Runnable() {
+                @Override public void run() {
+                    try { r.run(); } finally { latch.countDown(); }
+                }
+            });
+            try { latch.await(); } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    /* ── Integer slot returning runSync helper ───────────────────────────── */
+
+    private interface IntSupplier { int get(); }
+
+    private static int runSyncInt(final IntSupplier s) {
+        final int[] result = { -1 };
+        runSync(new Runnable() {
+            @Override public void run() { result[0] = s.get(); }
+        });
+        return result[0];
+    }
+
+    /* ── Context accessor ────────────────────────────────────────────────── */
+
+    private static Context ctx() { return sActivity; }
+
+    /* ── View creation ───────────────────────────────────────────────────── */
+
+    /**
+     * Create a LinearLayout.
+     * @param orientation 1=VERTICAL, 0=HORIZONTAL
+     * @param spacing     gap between children in dp; applied as bottom/right margin
+     */
+    public static int createLinearLayout(final int orientation, final int spacing) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                LinearLayout ll = new LinearLayout(ctx());
+                ll.setOrientation(orientation == 1
+                        ? LinearLayout.VERTICAL
+                        : LinearLayout.HORIZONTAL);
+                ll.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                /* Spacing is stored so addChild can apply margins. */
+                ll.setTag(R_TAG_SPACING, spacing);
+                return allocSlot(ll);
+            }
+        });
+    }
+
+    /** Create a FrameLayout (ZStack equivalent). */
+    public static int createFrameLayout() {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                FrameLayout fl = new FrameLayout(ctx());
+                fl.setLayoutParams(new FrameLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(fl);
+            }
+        });
+    }
+
+    /** Create a ScrollView. */
+    public static int createScrollView() {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                ScrollView sv = new ScrollView(ctx());
+                sv.setLayoutParams(new ScrollView.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT));
+                sv.setFillViewport(true);
+                return allocSlot(sv);
+            }
+        });
+    }
+
+    /** Create a TextView with initial text. */
+    public static int createTextView(final String text) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                TextView tv = new TextView(ctx());
+                tv.setText(text != null ? text : "");
+                tv.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(tv);
+            }
+        });
+    }
+
+    /** Create a Button with a label. */
+    public static int createButton(final String label) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                Button btn = new Button(ctx());
+                btn.setText(label != null ? label : "");
+                btn.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(btn);
+            }
+        });
+    }
+
+    /**
+     * Create an EditText.
+     * @param placeholder hint text
+     * @param singleLine  true = single-line text field; false = multi-line text area
+     */
+    public static int createEditText(final String placeholder, final boolean singleLine) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                EditText et = new EditText(ctx());
+                et.setHint(placeholder != null ? placeholder : "");
+                if (singleLine) {
+                    et.setInputType(InputType.TYPE_CLASS_TEXT
+                            | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+                    et.setMaxLines(1);
+                    et.setSingleLine(true);
+                } else {
+                    et.setInputType(InputType.TYPE_CLASS_TEXT
+                            | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+                    et.setMinLines(3);
+                    et.setSingleLine(false);
+                    et.setGravity(Gravity.TOP | Gravity.START);
+                }
+                et.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(et);
+            }
+        });
+    }
+
+    /**
+     * Create an ImageView, loading from a file path via BitmapFactory.
+     * If path is null/empty the ImageView is created with no image.
+     */
+    public static int createImageView(final String path) {
+        return runSyncInt(new IntSupplier() {
+            @Override public int get() {
+                ImageView iv = new ImageView(ctx());
+                iv.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                iv.setAdjustViewBounds(true);
+                if (path != null && !path.isEmpty()) {
+                    Bitmap bmp = BitmapFactory.decodeFile(path);
+                    if (bmp != null) {
+                        iv.setImageBitmap(bmp);
+                    } else {
+                        android.util.Log.w("ElBridge",
+                                "createImageView: failed to decode " + path);
+                    }
+                }
+                iv.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT));
+                return allocSlot(iv);
+            }
+        });
+    }
+
+    /* ── Window operations ───────────────────────────────────────────────── */
+
+    /** Set the Activity's content view to the view at slot. */
+    public static void setContentView(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null && sActivity != null) {
+                    sActivity.setContentView(v);
+                }
+            }
+        });
+    }
+
+    /** Set the Activity title. */
+    public static void setTitle(final String title) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                if (sActivity != null) {
+                    sActivity.setTitle(title != null ? title : "");
+                }
+            }
+        });
+    }
+
+    /* ── Tree operations ─────────────────────────────────────────────────── */
+
+    /**
+     * Add child view to parent view.
+     * LinearLayout: child added as arranged child with spacing margin.
+     * ScrollView: child replaces current document view.
+     * FrameLayout / other ViewGroup: plain addView.
+     */
+    public static void addChild(final int parentSlot, final int childSlot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View parent = getView(parentSlot);
+                View child  = getView(childSlot);
+                if (parent == null || child == null) return;
+
+                /* Remove child from existing parent first. */
+                if (child.getParent() instanceof ViewGroup) {
+                    ((ViewGroup) child.getParent()).removeView(child);
+                }
+
+                if (parent instanceof LinearLayout) {
+                    LinearLayout ll = (LinearLayout) parent;
+                    Object tag = ll.getTag(R_TAG_SPACING);
+                    int spacing = (tag instanceof Integer) ? (Integer) tag : 0;
+                    LinearLayout.LayoutParams lp;
+                    Object existingLp = child.getLayoutParams();
+                    if (existingLp instanceof LinearLayout.LayoutParams) {
+                        lp = (LinearLayout.LayoutParams) existingLp;
+                    } else {
+                        lp = new LinearLayout.LayoutParams(
+                                ViewGroup.LayoutParams.WRAP_CONTENT,
+                                ViewGroup.LayoutParams.WRAP_CONTENT);
+                    }
+                    /* Apply spacing as margin on the leading/top edge (after first child). */
+                    if (ll.getChildCount() > 0 && spacing > 0) {
+                        int px = dpToPx(spacing);
+                        if (ll.getOrientation() == LinearLayout.VERTICAL) {
+                            lp.topMargin = px;
+                        } else {
+                            lp.leftMargin = px;
+                        }
+                    }
+                    child.setLayoutParams(lp);
+                    ll.addView(child);
+                } else if (parent instanceof ScrollView) {
+                    ScrollView sv = (ScrollView) parent;
+                    sv.removeAllViews();
+                    sv.addView(child);
+                } else if (parent instanceof ViewGroup) {
+                    ((ViewGroup) parent).addView(child);
+                }
+            }
+        });
+    }
+
+    /** Remove child from its parent. */
+    public static void removeChild(final int parentSlot, final int childSlot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View parent = getView(parentSlot);
+                View child  = getView(childSlot);
+                if (parent instanceof ViewGroup && child != null) {
+                    ((ViewGroup) parent).removeView(child);
+                }
+            }
+        });
+    }
+
+    /** Remove the view from its parent and release the slot. */
+    public static void destroyView(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                if (v.getParent() instanceof ViewGroup) {
+                    ((ViewGroup) v.getParent()).removeView(v);
+                }
+                sViews[slot] = null;
+            }
+        });
+    }
+
+    /* ── Property setters ────────────────────────────────────────────────── */
+
+    public static void setText(final int slot, final String text) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                String s = text != null ? text : "";
+                if (v instanceof EditText) {
+                    ((EditText) v).setText(s);
+                } else if (v instanceof Button) {
+                    ((Button) v).setText(s);
+                } else if (v instanceof TextView) {
+                    ((TextView) v).setText(s);
+                }
+            }
+        });
+    }
+
+    public static String getText(final int slot) {
+        final String[] result = { "" };
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v instanceof TextView) {
+                    CharSequence cs = ((TextView) v).getText();
+                    result[0] = cs != null ? cs.toString() : "";
+                }
+            }
+        });
+        return result[0];
+    }
+
+    /** Set foreground text color. Components in [0,1]. */
+    public static void setTextColor(final int slot, final float r, final float g,
+                                     final float b, final float a) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v instanceof TextView) {
+                    ((TextView) v).setTextColor(floatToArgb(r, g, b, a));
+                }
+            }
+        });
+    }
+
+    /** Set background color using a GradientDrawable so corner radius is preserved. */
+    public static void setBackgroundColor(final int slot, final float r, final float g,
+                                           final float b, final float a) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ensureGradientBackground(v);
+                GradientDrawable gd = (GradientDrawable) v.getBackground();
+                gd.setColor(floatToArgb(r, g, b, a));
+            }
+        });
+    }
+
+    /**
+     * Set font family and size.
+     * family: "system" or null → system default; otherwise tries to load by name.
+     * bold: if true uses Typeface.BOLD.
+     */
+    public static void setFont(final int slot, final String family,
+                                final int sizeSp, final boolean bold) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (!(v instanceof TextView)) return;
+                TextView tv = (TextView) v;
+                Typeface tf;
+                if (family != null && !family.isEmpty()
+                        && !family.equals("system")) {
+                    Typeface base = Typeface.create(family,
+                            bold ? Typeface.BOLD : Typeface.NORMAL);
+                    tf = (base != null) ? base
+                            : Typeface.defaultFromStyle(bold ? Typeface.BOLD : Typeface.NORMAL);
+                } else {
+                    tf = Typeface.defaultFromStyle(bold ? Typeface.BOLD : Typeface.NORMAL);
+                }
+                tv.setTypeface(tf);
+                tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, sizeSp);
+            }
+        });
+    }
+
+    /** Set padding in dp. */
+    public static void setPadding(final int slot, final int top, final int right,
+                                   final int bottom, final int left) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null) {
+                    v.setPadding(dpToPx(left), dpToPx(top), dpToPx(right), dpToPx(bottom));
+                }
+            }
+        });
+    }
+
+    /** Set explicit width in dp. Passes MATCH_PARENT for negative values. */
+    public static void setWidth(final int slot, final int widthDp) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ViewGroup.LayoutParams lp = v.getLayoutParams();
+                if (lp == null) lp = new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT);
+                lp.width = widthDp < 0
+                        ? ViewGroup.LayoutParams.MATCH_PARENT
+                        : dpToPx(widthDp);
+                v.setLayoutParams(lp);
+            }
+        });
+    }
+
+    /** Set explicit height in dp. */
+    public static void setHeight(final int slot, final int heightDp) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ViewGroup.LayoutParams lp = v.getLayoutParams();
+                if (lp == null) lp = new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT);
+                lp.height = heightDp < 0
+                        ? ViewGroup.LayoutParams.MATCH_PARENT
+                        : dpToPx(heightDp);
+                v.setLayoutParams(lp);
+            }
+        });
+    }
+
+    /**
+     * Set flex weight on a child of a LinearLayout.
+     * flex > 0 → weight = flex, width/height = 0dp (expand).
+     * flex == 0 → weight = 0, wrap_content (shrink to content).
+     */
+    public static void setFlex(final int slot, final int flex) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ViewGroup.LayoutParams lp = v.getLayoutParams();
+                if (lp instanceof LinearLayout.LayoutParams) {
+                    LinearLayout.LayoutParams llp = (LinearLayout.LayoutParams) lp;
+                    if (flex > 0) {
+                        llp.weight = (float) flex;
+                        /* Determine orientation from parent to set 0dp on the right axis. */
+                        if (v.getParent() instanceof LinearLayout) {
+                            LinearLayout parent = (LinearLayout) v.getParent();
+                            if (parent.getOrientation() == LinearLayout.VERTICAL) {
+                                llp.height = 0;
+                            } else {
+                                llp.width = 0;
+                            }
+                        }
+                    } else {
+                        llp.weight = 0f;
+                    }
+                    v.setLayoutParams(llp);
+                }
+            }
+        });
+    }
+
+    /** Set corner radius in dp using a GradientDrawable background. */
+    public static void setCornerRadius(final int slot, final float radiusDp) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                ensureGradientBackground(v);
+                GradientDrawable gd = (GradientDrawable) v.getBackground();
+                gd.setCornerRadius(dpToPxF(radiusDp));
+            }
+        });
+    }
+
+    public static void setEnabled(final int slot, final boolean enabled) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null) v.setEnabled(enabled);
+            }
+        });
+    }
+
+    /**
+     * Show or hide a view.
+     * @param visible true = VISIBLE, false = GONE (matches AppKit setHidden semantics)
+     */
+    public static void setVisibility(final int slot, final boolean visible) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v != null) v.setVisibility(visible ? View.VISIBLE : View.GONE);
+            }
+        });
+    }
+
+    /* ── Event listener registration ─────────────────────────────────────── */
+
+    /** Register an OnClickListener that calls back into C nativeOnClick. */
+    public static void setOnClickListener(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (v == null) return;
+                final int capturedSlot = slot;
+                v.setOnClickListener(new View.OnClickListener() {
+                    @Override public void onClick(View view) {
+                        nativeOnClick(capturedSlot);
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Register a TextWatcher on an EditText that calls back nativeOnChange
+     * for every text change.
+     */
+    public static void setOnChangeListener(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (!(v instanceof EditText)) return;
+                final int capturedSlot = slot;
+                ((EditText) v).addTextChangedListener(new TextWatcher() {
+                    @Override public void beforeTextChanged(CharSequence s, int start,
+                                                             int count, int after) {}
+                    @Override public void onTextChanged(CharSequence s, int start,
+                                                         int before, int count) {}
+                    @Override public void afterTextChanged(Editable s) {
+                        nativeOnChange(capturedSlot, s != null ? s.toString() : "");
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Register an OnEditorActionListener on a single-line EditText that calls
+     * nativeOnSubmit when the user presses the action/enter key.
+     */
+    public static void setOnSubmitListener(final int slot) {
+        runSync(new Runnable() {
+            @Override public void run() {
+                View v = getView(slot);
+                if (!(v instanceof EditText)) return;
+                final int capturedSlot = slot;
+                ((EditText) v).setOnEditorActionListener(
+                        new TextView.OnEditorActionListener() {
+                    @Override
+                    public boolean onEditorAction(TextView tv, int actionId,
+                                                   android.view.KeyEvent event) {
+                        nativeOnSubmit(capturedSlot,
+                                tv.getText() != null ? tv.getText().toString() : "");
+                        return true;
+                    }
+                });
+            }
+        });
+    }
+
+    /* ── Internal helpers ─────────────────────────────────────────────────── */
+
+    /*
+     * Tag key used to stash the spacing value on LinearLayouts so addChild
+     * can apply the correct margin between children.
+     * We use a stable integer resource-id-like value; because we do not have
+     * a resources file here we use View.generateViewId() lazily.
+     */
+    private static int sSpacingTagKey = 0;
+
+    private static int R_TAG_SPACING;
+    static {
+        R_TAG_SPACING = View.generateViewId();
+    }
+
+    /** Convert dp to pixels using the Activity's display metrics. */
+    private static int dpToPx(float dp) {
+        if (sActivity == null) return (int) dp;
+        float density = sActivity.getResources().getDisplayMetrics().density;
+        return Math.round(dp * density);
+    }
+
+    private static float dpToPxF(float dp) {
+        if (sActivity == null) return dp;
+        float density = sActivity.getResources().getDisplayMetrics().density;
+        return dp * density;
+    }
+
+    /** Convert RGBA float components (0–1) to an Android ARGB int. */
+    private static int floatToArgb(float r, float g, float b, float a) {
+        int ai = Math.round(a * 255f);
+        int ri = Math.round(r * 255f);
+        int gi = Math.round(g * 255f);
+        int bi = Math.round(b * 255f);
+        return Color.argb(ai, ri, gi, bi);
+    }
+
+    /**
+     * Ensure the view has a GradientDrawable background so that both color
+     * and corner radius can be set independently.  If the current background
+     * is already a GradientDrawable it is reused; otherwise a new transparent
+     * one is installed.
+     */
+    private static void ensureGradientBackground(View v) {
+        if (!(v.getBackground() instanceof GradientDrawable)) {
+            GradientDrawable gd = new GradientDrawable();
+            gd.setColor(Color.TRANSPARENT);
+            v.setBackground(gd);
+        }
+    }
+}

ui/examples/native-hello-android/app/src/main/java/com/neuron/el/MainActivity.java

@@ -0,0 +1,38 @@
+package com.neuron.el;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * MainActivity — entry point for native-hello-android.
+ *
+ * Loads the el native shared library, initialises ElBridge with the Activity
+ * reference (required before any widget operations), then hands control to the
+ * compiled el program via nativeMain().
+ *
+ * The el boot sequence (native_init → window_from_manifest → app_build →
+ * window_show) runs inside nativeMain. __native_run_loop is a no-op on Android;
+ * the Activity lifecycle owns the UI thread after onCreate returns.
+ */
+public class MainActivity extends Activity {
+
+    static {
+        System.loadLibrary("elnative");
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Register this Activity with the bridge BEFORE nativeMain so that
+        // el_android_init can look up ElBridge methods and __native_init works.
+        ElBridge.init(this);
+        // Run the compiled el program.
+        nativeMain();
+    }
+
+    /**
+     * Implemented in el_android.c as Java_com_neuron_el_MainActivity_nativeMain.
+     * Calls the el program's main(), which runs the full boot sequence.
+     */
+    private native void nativeMain();
+}

ui/examples/native-hello-android/app/src/main/jni/CMakeLists.txt

@@ -0,0 +1,57 @@
+cmake_minimum_required(VERSION 3.22.1)
+project("elnative")
+
+#
+# CMakeLists.txt for native-hello-android
+#
+# Sources:
+#   el_android.c        — Android JNI widget bridge
+#   el_seed.c           — OS-boundary __-prefixed primitives
+#   el_runtime.c        — High-level el builtins (str_len, json_*, etc.)
+#   el_native_vessel.c  — el-native vessel (compiled from vessels/el-native/src/main.el)
+#   native_hello.c      — App entry point (compiled from examples/native-hello/src/main.el)
+#
+# el_runtime.c and el_seed.c both define __-prefixed symbols. On Android the
+# linker accepts duplicate weak symbols; the shared library loads one copy.
+# The EL_TARGET_ANDROID guard in el_android.c ensures only the Android widget
+# backend is compiled in.
+#
+
+add_library(
+    elnative
+    SHARED
+
+    # native_hello.c listed first so its main() takes precedence over the
+    # vessel's main() when --allow-multiple-definition is in effect.
+    native_hello.c
+    el_native_vessel.c
+    el_android.c
+    el_seed.c
+    el_runtime.c
+)
+
+# EL_TARGET_ANDROID activates the Android JNI widget backend in el_android.c
+# and the corresponding guards in el_seed.c / el_native_target.h.
+target_compile_definitions(elnative PRIVATE
+    EL_TARGET_ANDROID
+)
+
+target_include_directories(elnative PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# el_runtime.c and el_seed.c both define __-prefixed OS-boundary symbols.
+# el_runtime.c's copies are weaker definitions; allow-multiple-definition lets
+# the linker pick one copy silently (el_seed.c listed later = its copy wins
+# in the Android linker's right-to-left resolution order).
+target_link_options(elnative PRIVATE
+    "-Wl,--allow-multiple-definition"
+)
+
+find_library(log-lib log)
+find_library(android-lib android)
+
+target_link_libraries(elnative
+    ${log-lib}
+    ${android-lib}
+)

ui/examples/native-hello-android/app/src/main/jni/el_android.c

@@ -0,0 +1,964 @@
+/*
+ * el_android.c — Android JNI backend for the el native widget system.
+ *
+ * This file implements the Android widget layer that el_seed.c calls through
+ * to when EL_TARGET_ANDROID is defined.  It is the exact Android counterpart
+ * to el_appkit.m and presents the same C API surface.
+ *
+ * Architecture:
+ *   el program (el code)
+ *       → __widget_* C builtins in el_seed.c
+ *           → el_android_* C-callable functions declared here
+ *               → ElBridge static methods in Java via JNI
+ *                   → android.view.View subclasses on the UI thread
+ *
+ * Widget handles: every widget (window root, view, control) is assigned an
+ * int64_t slot index into view_slots[].  The el program holds these as opaque
+ * Int values.  Slot 0 is never valid (null handle = -1 convention).
+ *
+ * Threading: Android requires all UI operations to run on the main (UI) thread.
+ * Every JNI call that mutates a View is dispatched through
+ * Activity.runOnUiThread(Runnable) if the current thread is not the UI thread.
+ * el_android_run_loop is a no-op — Android lifecycle is driven by the Activity.
+ *
+ * Callback mechanism: when a widget fires an event Java calls
+ *   nativeOnClick / nativeOnChange / nativeOnSubmit
+ * The C side looks up the registered El function name for that slot, then:
+ *   dlsym(RTLD_DEFAULT, fn_name)(widget_handle, event_data_string)
+ * This matches the __thread_create pattern in el_seed.c exactly.
+ *
+ * Compile / link (as part of libelruntime.so):
+ *   Compiled by the Android Gradle NDK build system with -DEL_TARGET_ANDROID.
+ *   Link flags: -landroid -llog -ldl
+ *
+ * Java companion: ElBridge.java in the same directory must be compiled into
+ * the Android application's APK (package com.neuron.el).
+ */
+
+#ifdef EL_TARGET_ANDROID
+
+#include <jni.h>
+#include <android/log.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dlfcn.h>
+#include "el_runtime.h"
+
+/* ── Logging ─────────────────────────────────────────────────────────────── */
+
+#define EL_TAG "ElAndroid"
+#define EL_LOGI(...) __android_log_print(ANDROID_LOG_INFO,  EL_TAG, __VA_ARGS__)
+#define EL_LOGW(...) __android_log_print(ANDROID_LOG_WARN,  EL_TAG, __VA_ARGS__)
+#define EL_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, EL_TAG, __VA_ARGS__)
+
+/* ── JNI global state ────────────────────────────────────────────────────── */
+
+static JavaVM  *g_jvm          = NULL;
+static jobject  g_activity     = NULL;   /* global ref to Activity */
+static jclass   g_bridge_class = NULL;   /* global ref to ElBridge class */
+
+/* Cached method IDs on ElBridge — filled in el_android_init(). */
+static jmethodID g_mid_createLinearLayout  = NULL;
+static jmethodID g_mid_createFrameLayout   = NULL;
+static jmethodID g_mid_createScrollView    = NULL;
+static jmethodID g_mid_createTextView      = NULL;
+static jmethodID g_mid_createButton        = NULL;
+static jmethodID g_mid_createEditText      = NULL;
+static jmethodID g_mid_createImageView     = NULL;
+static jmethodID g_mid_setContentView      = NULL;
+static jmethodID g_mid_setTitle            = NULL;
+static jmethodID g_mid_addChild            = NULL;
+static jmethodID g_mid_removeChild         = NULL;
+static jmethodID g_mid_destroyView         = NULL;
+static jmethodID g_mid_setText             = NULL;
+static jmethodID g_mid_getText             = NULL;
+static jmethodID g_mid_setTextColor        = NULL;
+static jmethodID g_mid_setBackgroundColor  = NULL;
+static jmethodID g_mid_setFont             = NULL;
+static jmethodID g_mid_setPadding          = NULL;
+static jmethodID g_mid_setWidth            = NULL;
+static jmethodID g_mid_setHeight           = NULL;
+static jmethodID g_mid_setFlex             = NULL;
+static jmethodID g_mid_setCornerRadius     = NULL;
+static jmethodID g_mid_setEnabled          = NULL;
+static jmethodID g_mid_setVisibility       = NULL;
+static jmethodID g_mid_setOnClickListener  = NULL;
+static jmethodID g_mid_setOnChangeListener = NULL;
+static jmethodID g_mid_setOnSubmitListener = NULL;
+static jmethodID g_mid_runOnUiThread       = NULL;  /* Activity.runOnUiThread */
+
+/* ── Widget table ─────────────────────────────────────────────────────────── */
+
+#define EL_ANDROID_MAX_WIDGETS 4096
+
+typedef enum {
+    EL_WIDGET_FREE      = 0,
+    EL_WIDGET_WINDOW    = 1,
+    EL_WIDGET_VSTACK    = 2,
+    EL_WIDGET_HSTACK    = 3,
+    EL_WIDGET_ZSTACK    = 4,
+    EL_WIDGET_SCROLL    = 5,
+    EL_WIDGET_LABEL     = 6,
+    EL_WIDGET_BUTTON    = 7,
+    EL_WIDGET_TEXTFIELD = 8,
+    EL_WIDGET_TEXTAREA  = 9,
+    EL_WIDGET_IMAGE     = 10,
+} ElWidgetKind;
+
+typedef struct {
+    ElWidgetKind kind;
+    jint         slot;       /* Java-side slot index (matches C index) */
+    char        *cb_click;   /* El function name for click / submit events */
+    char        *cb_change;  /* El function name for value-change events */
+} ElWidget;
+
+static ElWidget _el_widgets[EL_ANDROID_MAX_WIDGETS];
+
+static int64_t el_widget_alloc(ElWidgetKind kind, jint slot) {
+    for (int i = 1; i < EL_ANDROID_MAX_WIDGETS; i++) {
+        if (_el_widgets[i].kind == EL_WIDGET_FREE) {
+            _el_widgets[i].kind      = kind;
+            _el_widgets[i].slot      = slot;
+            _el_widgets[i].cb_click  = NULL;
+            _el_widgets[i].cb_change = NULL;
+            return (int64_t)i;
+        }
+    }
+    EL_LOGE("el_widget_alloc: slot table full");
+    return -1;
+}
+
+static ElWidget *el_widget_get(int64_t handle) {
+    if (handle <= 0 || handle >= EL_ANDROID_MAX_WIDGETS) return NULL;
+    if (_el_widgets[handle].kind == EL_WIDGET_FREE)       return NULL;
+    return &_el_widgets[handle];
+}
+
+static void el_widget_free(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    w->kind = EL_WIDGET_FREE;
+    w->slot = -1;
+    free(w->cb_click);  w->cb_click  = NULL;
+    free(w->cb_change); w->cb_change = NULL;
+}
+
+/* ── JNI environment helpers ─────────────────────────────────────────────── */
+
+/*
+ * Obtain a JNIEnv for the calling thread.  Attaches the thread to the JVM if
+ * needed (detaches in el_jni_detach_if_attached — call in pairs).
+ */
+static int g_was_attached = 0;  /* thread-local would be cleaner but this is
+                                   safe for single-threaded el programs */
+
+static JNIEnv *el_jni_env(void) {
+    if (!g_jvm) return NULL;
+    JNIEnv *env = NULL;
+    jint rc = (*g_jvm)->GetEnv(g_jvm, (void **)&env, JNI_VERSION_1_6);
+    if (rc == JNI_OK)      { g_was_attached = 0; return env; }
+    if (rc == JNI_EDETACHED) {
+        if ((*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL) == JNI_OK) {
+            g_was_attached = 1;
+            return env;
+        }
+    }
+    EL_LOGE("el_jni_env: failed to obtain JNIEnv");
+    return NULL;
+}
+
+static void el_jni_detach_if_attached(void) {
+    if (g_was_attached && g_jvm) {
+        (*g_jvm)->DetachCurrentThread(g_jvm);
+        g_was_attached = 0;
+    }
+}
+
+/* ── UI-thread dispatch ──────────────────────────────────────────────────── */
+/*
+ * Most ElBridge static methods already dispatch to the UI thread internally
+ * (they call Activity.runOnUiThread).  The helper below is available for
+ * cases where the caller needs to be sure the call has completed before
+ * returning (ElBridge methods marked "sync" use a CountDownLatch internally).
+ *
+ * For the current implementation we call ElBridge methods directly; ElBridge
+ * itself marshals to the UI thread via Activity.runOnUiThread + latch.
+ * This keeps the C side simple and mirrors the AppKit dispatch_sync pattern.
+ */
+
+/* ── JNI_OnLoad ──────────────────────────────────────────────────────────── */
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
+    (void)reserved;
+    g_jvm = vm;
+    EL_LOGI("JNI_OnLoad: el Android bridge loaded");
+    return JNI_VERSION_1_6;
+}
+
+/* ── el_android_init ─────────────────────────────────────────────────────── */
+/*
+ * Called from __native_init().  The Activity must have already called
+ * ElBridge.registerActivity(activity) from Java before this runs, which sets
+ * g_activity via the nativeRegisterActivity JNI method below.
+ *
+ * Caches all method IDs used later so individual widget calls avoid repeated
+ * FindClass / GetStaticMethodID lookups.
+ */
+void el_android_init(void) {
+    static int done = 0;
+    if (done) return;
+    done = 1;
+
+    JNIEnv *env = el_jni_env();
+    if (!env) { EL_LOGE("el_android_init: no JNIEnv"); return; }
+
+    jclass cls = (*env)->FindClass(env, "com/neuron/el/ElBridge");
+    if (!cls) { EL_LOGE("el_android_init: ElBridge class not found"); return; }
+    g_bridge_class = (*env)->NewGlobalRef(env, cls);
+    (*env)->DeleteLocalRef(env, cls);
+
+#define CACHE_STATIC(var, name, sig) \
+    var = (*env)->GetStaticMethodID(env, g_bridge_class, name, sig); \
+    if (!var) EL_LOGW("el_android_init: method not found: %s %s", name, sig)
+
+    CACHE_STATIC(g_mid_createLinearLayout,  "createLinearLayout",  "(II)I");
+    CACHE_STATIC(g_mid_createFrameLayout,   "createFrameLayout",   "()I");
+    CACHE_STATIC(g_mid_createScrollView,    "createScrollView",     "()I");
+    CACHE_STATIC(g_mid_createTextView,      "createTextView",       "(Ljava/lang/String;)I");
+    CACHE_STATIC(g_mid_createButton,        "createButton",         "(Ljava/lang/String;)I");
+    CACHE_STATIC(g_mid_createEditText,      "createEditText",       "(Ljava/lang/String;Z)I");
+    CACHE_STATIC(g_mid_createImageView,     "createImageView",      "(Ljava/lang/String;)I");
+    CACHE_STATIC(g_mid_setContentView,      "setContentView",       "(I)V");
+    CACHE_STATIC(g_mid_setTitle,            "setTitle",             "(Ljava/lang/String;)V");
+    CACHE_STATIC(g_mid_addChild,            "addChild",             "(II)V");
+    CACHE_STATIC(g_mid_removeChild,         "removeChild",          "(II)V");
+    CACHE_STATIC(g_mid_destroyView,         "destroyView",          "(I)V");
+    CACHE_STATIC(g_mid_setText,             "setText",              "(ILjava/lang/String;)V");
+    CACHE_STATIC(g_mid_getText,             "getText",              "(I)Ljava/lang/String;");
+    CACHE_STATIC(g_mid_setTextColor,        "setTextColor",         "(IFFFF)V");
+    CACHE_STATIC(g_mid_setBackgroundColor,  "setBackgroundColor",   "(IFFFF)V");
+    CACHE_STATIC(g_mid_setFont,             "setFont",              "(ILjava/lang/String;IZ)V");
+    CACHE_STATIC(g_mid_setPadding,          "setPadding",           "(IIIII)V");
+    CACHE_STATIC(g_mid_setWidth,            "setWidth",             "(II)V");
+    CACHE_STATIC(g_mid_setHeight,           "setHeight",            "(II)V");
+    CACHE_STATIC(g_mid_setFlex,             "setFlex",              "(II)V");
+    CACHE_STATIC(g_mid_setCornerRadius,     "setCornerRadius",      "(IF)V");
+    CACHE_STATIC(g_mid_setEnabled,          "setEnabled",           "(IZ)V");
+    CACHE_STATIC(g_mid_setVisibility,       "setVisibility",        "(IZ)V");
+    CACHE_STATIC(g_mid_setOnClickListener,  "setOnClickListener",   "(I)V");
+    CACHE_STATIC(g_mid_setOnChangeListener, "setOnChangeListener",  "(I)V");
+    CACHE_STATIC(g_mid_setOnSubmitListener, "setOnSubmitListener",  "(I)V");
+#undef CACHE_STATIC
+
+    el_jni_detach_if_attached();
+    EL_LOGI("el_android_init: complete");
+}
+
+/* ── JNI: Activity registration ─────────────────────────────────────────── */
+
+/*
+ * Called from Java: ElBridge.registerActivity(activity) calls back here.
+ * Stores a global reference to the Activity so C code can dispatch to it.
+ */
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeRegisterActivity(JNIEnv *env, jclass cls,
+                                                    jobject activity) {
+    (void)cls;
+    if (g_activity) {
+        (*env)->DeleteGlobalRef(env, g_activity);
+        g_activity = NULL;
+    }
+    if (activity) {
+        g_activity = (*env)->NewGlobalRef(env, activity);
+        EL_LOGI("nativeRegisterActivity: activity registered");
+    }
+}
+
+/* ── El callback invocation ──────────────────────────────────────────────── */
+/*
+ * Invoke an El callback by symbol name.
+ * Signature matches AppKit: fn(handle: Int, data: String) -> Void
+ *   compiled to: void fn(el_val_t handle, el_val_t data)
+ */
+typedef void (*ElCb2)(int64_t handle, int64_t data);
+
+static void el_android_invoke_cb(const char *fn_name, int64_t handle,
+                                  const char *data) {
+    if (!fn_name || !*fn_name) return;
+    void *sym = dlsym(RTLD_DEFAULT, fn_name);
+    if (!sym) { EL_LOGW("invoke_cb: symbol not found: %s", fn_name); return; }
+    ElCb2 fn = (ElCb2)sym;
+    fn(handle, (int64_t)(uintptr_t)(data ? data : ""));
+}
+
+/* ── JNI: callbacks from Java → C ───────────────────────────────────────── */
+
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeOnClick(JNIEnv *env, jclass cls, jint slot) {
+    (void)env; (void)cls;
+    int64_t handle = (int64_t)slot;
+    ElWidget *w = el_widget_get(handle);
+    if (w && w->cb_click) {
+        el_android_invoke_cb(w->cb_click, handle, "");
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeOnChange(JNIEnv *env, jclass cls,
+                                            jint slot, jstring text) {
+    (void)cls;
+    int64_t handle = (int64_t)slot;
+    ElWidget *w = el_widget_get(handle);
+    if (w && w->cb_change) {
+        const char *ctext = text ? (*env)->GetStringUTFChars(env, text, NULL) : "";
+        el_android_invoke_cb(w->cb_change, handle, ctext);
+        if (text) (*env)->ReleaseStringUTFChars(env, text, ctext);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_neuron_el_ElBridge_nativeOnSubmit(JNIEnv *env, jclass cls,
+                                            jint slot, jstring text) {
+    (void)cls;
+    int64_t handle = (int64_t)slot;
+    ElWidget *w = el_widget_get(handle);
+    if (w && w->cb_click) {   /* submit stored in cb_click, same as AppKit */
+        const char *ctext = text ? (*env)->GetStringUTFChars(env, text, NULL) : "";
+        el_android_invoke_cb(w->cb_click, handle, ctext);
+        if (text) (*env)->ReleaseStringUTFChars(env, text, ctext);
+    }
+}
+
+/* ── Helper: jstring from C string ──────────────────────────────────────── */
+
+static jstring el_jstr(JNIEnv *env, const char *s) {
+    return (*env)->NewStringUTF(env, s ? s : "");
+}
+
+/* ── Window ──────────────────────────────────────────────────────────────── */
+
+/*
+ * el_android_window_create — on Android a "window" is the root LinearLayout
+ * set as the Activity's content view.  We create a vertical LinearLayout and
+ * store it.  el_android_window_show calls setContentView on the Activity.
+ */
+int64_t el_android_window_create(const char *title, int width, int height,
+                                  int min_width, int min_height) {
+    (void)width; (void)height; (void)min_width; (void)min_height;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+
+    /* VERTICAL LinearLayout with no spacing (spacing added via margins in Java) */
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createLinearLayout,
+                                            (jint)1 /* VERTICAL */, (jint)0);
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1;
+    }
+
+    /* Set activity title */
+    if (g_mid_setTitle && title) {
+        jstring jtitle = el_jstr(env, title);
+        (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setTitle, jtitle);
+        (*env)->DeleteLocalRef(env, jtitle);
+    }
+
+    int64_t handle = el_widget_alloc(EL_WIDGET_WINDOW, (int)slot);
+    el_jni_detach_if_attached();
+    return handle;
+}
+
+void el_android_window_show(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w || w->kind != EL_WIDGET_WINDOW) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setContentView,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_window_set_title(int64_t handle, const char *title) {
+    (void)handle;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    jstring jtitle = el_jstr(env, title);
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setTitle, jtitle);
+    (*env)->DeleteLocalRef(env, jtitle);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Layout containers ───────────────────────────────────────────────────── */
+
+int64_t el_android_vstack_create(int spacing) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createLinearLayout,
+                                            (jint)1 /* VERTICAL */, (jint)spacing);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_VSTACK, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_hstack_create(int spacing) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createLinearLayout,
+                                            (jint)0 /* HORIZONTAL */, (jint)spacing);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_HSTACK, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_zstack_create(void) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createFrameLayout);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_ZSTACK, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_scroll_create(void) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createScrollView);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_SCROLL, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+/* ── Widget factories ─────────────────────────────────────────────────────── */
+
+int64_t el_android_label_create(const char *text) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jt = el_jstr(env, text);
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createTextView, jt);
+    (*env)->DeleteLocalRef(env, jt);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_LABEL, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_button_create(const char *label) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jl = el_jstr(env, label);
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createButton, jl);
+    (*env)->DeleteLocalRef(env, jl);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_BUTTON, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_text_field_create(const char *placeholder) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jp = el_jstr(env, placeholder);
+    /* singleLine = true */
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createEditText, jp, (jboolean)JNI_TRUE);
+    (*env)->DeleteLocalRef(env, jp);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_TEXTFIELD, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_text_area_create(const char *placeholder) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jp = el_jstr(env, placeholder);
+    /* singleLine = false → multiline EditText */
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createEditText, jp, (jboolean)JNI_FALSE);
+    (*env)->DeleteLocalRef(env, jp);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_TEXTAREA, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+int64_t el_android_image_create(const char *path) {
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return -1;
+    jstring jp = el_jstr(env, path);
+    jint slot = (*env)->CallStaticIntMethod(env, g_bridge_class,
+                                            g_mid_createImageView, jp);
+    (*env)->DeleteLocalRef(env, jp);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return -1; }
+    int64_t h = el_widget_alloc(EL_WIDGET_IMAGE, (int)slot);
+    el_jni_detach_if_attached();
+    return h;
+}
+
+/* ── Widget property setters ─────────────────────────────────────────────── */
+
+void el_android_widget_set_text(int64_t handle, const char *text) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    jstring jt = el_jstr(env, text);
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setText,
+                                 (jint)w->slot, jt);
+    (*env)->DeleteLocalRef(env, jt);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+const char *el_android_widget_get_text(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return "";
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return "";
+    jstring js = (jstring)(*env)->CallStaticObjectMethod(env, g_bridge_class,
+                                                          g_mid_getText,
+                                                          (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionClear(env); el_jni_detach_if_attached(); return ""; }
+    const char *result = "";
+    if (js) {
+        const char *cstr = (*env)->GetStringUTFChars(env, js, NULL);
+        result = cstr ? strdup(cstr) : "";
+        if (cstr) (*env)->ReleaseStringUTFChars(env, js, cstr);
+        (*env)->DeleteLocalRef(env, js);
+    }
+    el_jni_detach_if_attached();
+    return result;
+}
+
+void el_android_widget_set_color(int64_t handle, float r, float g, float b, float a) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setTextColor,
+                                 (jint)w->slot, (jfloat)r, (jfloat)g,
+                                 (jfloat)b, (jfloat)a);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_bg_color(int64_t handle, float r, float g, float b, float a) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setBackgroundColor,
+                                 (jint)w->slot, (jfloat)r, (jfloat)g,
+                                 (jfloat)b, (jfloat)a);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_font(int64_t handle, const char *family, int size, int bold) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    jstring jfam = el_jstr(env, family);
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setFont,
+                                 (jint)w->slot, jfam, (jint)size,
+                                 (jboolean)(bold ? JNI_TRUE : JNI_FALSE));
+    (*env)->DeleteLocalRef(env, jfam);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_padding(int64_t handle, int top, int right, int bottom, int left) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setPadding,
+                                 (jint)w->slot, (jint)top, (jint)right,
+                                 (jint)bottom, (jint)left);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_width(int64_t handle, int width) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setWidth,
+                                 (jint)w->slot, (jint)width);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_height(int64_t handle, int height) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setHeight,
+                                 (jint)w->slot, (jint)height);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_flex(int64_t handle, int flex) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setFlex,
+                                 (jint)w->slot, (jint)flex);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_corner_radius(int64_t handle, int radius) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setCornerRadius,
+                                 (jint)w->slot, (jfloat)radius);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_disabled(int64_t handle, int disabled) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setEnabled,
+                                 (jint)w->slot,
+                                 (jboolean)(disabled ? JNI_FALSE : JNI_TRUE));
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_set_hidden(int64_t handle, int hidden) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    /* visible=true means NOT hidden */
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setVisibility,
+                                 (jint)w->slot,
+                                 (jboolean)(hidden ? JNI_FALSE : JNI_TRUE));
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Child management ─────────────────────────────────────────────────────── */
+
+void el_android_widget_add_child(int64_t parent, int64_t child) {
+    ElWidget *pw = el_widget_get(parent);
+    ElWidget *cw = el_widget_get(child);
+    if (!pw || !cw) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_addChild,
+                                 (jint)pw->slot, (jint)cw->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_remove_child(int64_t parent, int64_t child) {
+    ElWidget *pw = el_widget_get(parent);
+    ElWidget *cw = el_widget_get(child);
+    if (!pw || !cw) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_removeChild,
+                                 (jint)pw->slot, (jint)cw->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Event registration ───────────────────────────────────────────────────── */
+
+void el_android_widget_on_click(int64_t handle, const char *fn_name) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_click);
+    w->cb_click = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+    if (!w->cb_click) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setOnClickListener,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_on_change(int64_t handle, const char *fn_name) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_change);
+    w->cb_change = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+    if (!w->cb_change) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setOnChangeListener,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+void el_android_widget_on_submit(int64_t handle, const char *fn_name) {
+    /* Submit stored in cb_click, same as AppKit. */
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    free(w->cb_click);
+    w->cb_click = (fn_name && *fn_name) ? strdup(fn_name) : NULL;
+    if (!w->cb_click) return;
+    JNIEnv *env = el_jni_env();
+    if (!env || !g_bridge_class) return;
+    (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_setOnSubmitListener,
+                                 (jint)w->slot);
+    if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    el_jni_detach_if_attached();
+}
+
+/* ── Widget destroy ───────────────────────────────────────────────────────── */
+
+void el_android_widget_destroy(int64_t handle) {
+    ElWidget *w = el_widget_get(handle);
+    if (!w) return;
+    JNIEnv *env = el_jni_env();
+    if (env && g_bridge_class) {
+        (*env)->CallStaticVoidMethod(env, g_bridge_class, g_mid_destroyView,
+                                     (jint)w->slot);
+        if ((*env)->ExceptionCheck(env)) (*env)->ExceptionClear(env);
+    }
+    el_widget_free(handle);
+    el_jni_detach_if_attached();
+}
+
+/* ── Manifest reader ─────────────────────────────────────────────────────── */
+/*
+ * __manifest_read: parse the app{} block from a manifest file.
+ * Returns the raw file contents as an el_val_t (const char* cast).
+ * The caller (el program) parses the returned string.
+ * Reads from the filesystem; for APK assets use the AssetManager path instead.
+ */
+static char *el_read_file(const char *path) {
+    if (!path || !*path) return NULL;
+    FILE *f = fopen(path, "rb");
+    if (!f) return NULL;
+    fseek(f, 0, SEEK_END);
+    long len = ftell(f);
+    fseek(f, 0, SEEK_SET);
+    if (len <= 0) { fclose(f); return NULL; }
+    char *buf = (char *)malloc((size_t)len + 1);
+    if (!buf) { fclose(f); return NULL; }
+    fread(buf, 1, (size_t)len, f);
+    buf[len] = '\0';
+    fclose(f);
+    return buf;
+}
+
+el_val_t el_android_manifest_read(const char *path) {
+    char *contents = el_read_file(path);
+    if (!contents) return (el_val_t)(uintptr_t)"";
+    return (el_val_t)(uintptr_t)contents;  /* caller owns allocation */
+}
+
+/* ── __widget_* C API (called from el_seed.c) ────────────────────────────── */
+/*
+ * These are the functions declared in el_native_target.h under EL_TARGET_ANDROID.
+ * They forward to the el_android_* internal functions above.
+ *
+ * The el_val_t / int64_t ABI matches the AppKit functions exactly:
+ *   - Integer params passed as int64_t, extracted with (int)
+ *   - String params passed as int64_t, extracted with (const char*)(uintptr_t)
+ *   - Float params (r,g,b,a) passed as int64_t bit-cast from double; extracted
+ *     with el_to_float / bit-cast union
+ */
+
+static inline float el_val_to_float(el_val_t v) {
+    union { double d; int64_t i; } u;
+    u.i = v;
+    return (float)u.d;
+}
+
+void __native_init(void) {
+    el_android_init();
+}
+
+void __native_run_loop(void) {
+    /* No-op on Android — lifecycle is driven by the Activity. */
+}
+
+el_val_t __window_create(el_val_t title, el_val_t width, el_val_t height,
+                          el_val_t min_width, el_val_t min_height) {
+    return (el_val_t)el_android_window_create(
+        (const char *)(uintptr_t)title,
+        (int)width, (int)height, (int)min_width, (int)min_height);
+}
+
+void __window_show(el_val_t handle) {
+    el_android_window_show((int64_t)handle);
+}
+
+void __window_set_title(el_val_t handle, el_val_t title) {
+    el_android_window_set_title((int64_t)handle,
+                                (const char *)(uintptr_t)title);
+}
+
+el_val_t __vstack_create(el_val_t spacing) {
+    return (el_val_t)el_android_vstack_create((int)spacing);
+}
+
+el_val_t __hstack_create(el_val_t spacing) {
+    return (el_val_t)el_android_hstack_create((int)spacing);
+}
+
+el_val_t __zstack_create(void) {
+    return (el_val_t)el_android_zstack_create();
+}
+
+el_val_t __scroll_create(void) {
+    return (el_val_t)el_android_scroll_create();
+}
+
+el_val_t __label_create(el_val_t text) {
+    return (el_val_t)el_android_label_create((const char *)(uintptr_t)text);
+}
+
+el_val_t __button_create(el_val_t label) {
+    return (el_val_t)el_android_button_create((const char *)(uintptr_t)label);
+}
+
+el_val_t __text_field_create(el_val_t placeholder) {
+    return (el_val_t)el_android_text_field_create((const char *)(uintptr_t)placeholder);
+}
+
+el_val_t __text_area_create(el_val_t placeholder) {
+    return (el_val_t)el_android_text_area_create((const char *)(uintptr_t)placeholder);
+}
+
+el_val_t __image_create(el_val_t path_or_name) {
+    return (el_val_t)el_android_image_create((const char *)(uintptr_t)path_or_name);
+}
+
+void __widget_set_text(el_val_t handle, el_val_t text) {
+    el_android_widget_set_text((int64_t)handle,
+                               (const char *)(uintptr_t)text);
+}
+
+el_val_t __widget_get_text(el_val_t handle) {
+    return (el_val_t)(uintptr_t)el_android_widget_get_text((int64_t)handle);
+}
+
+void __widget_set_color(el_val_t handle, el_val_t r, el_val_t g,
+                         el_val_t b, el_val_t a) {
+    el_android_widget_set_color((int64_t)handle,
+                                el_val_to_float(r), el_val_to_float(g),
+                                el_val_to_float(b), el_val_to_float(a));
+}
+
+void __widget_set_bg_color(el_val_t handle, el_val_t r, el_val_t g,
+                            el_val_t b, el_val_t a) {
+    el_android_widget_set_bg_color((int64_t)handle,
+                                   el_val_to_float(r), el_val_to_float(g),
+                                   el_val_to_float(b), el_val_to_float(a));
+}
+
+void __widget_set_font(el_val_t handle, el_val_t family,
+                        el_val_t size, el_val_t bold) {
+    el_android_widget_set_font((int64_t)handle,
+                               (const char *)(uintptr_t)family,
+                               (int)size, (int)bold);
+}
+
+void __widget_set_padding(el_val_t handle, el_val_t top, el_val_t right,
+                           el_val_t bottom, el_val_t left) {
+    el_android_widget_set_padding((int64_t)handle,
+                                  (int)top, (int)right, (int)bottom, (int)left);
+}
+
+void __widget_set_width(el_val_t handle, el_val_t width) {
+    el_android_widget_set_width((int64_t)handle, (int)width);
+}
+
+void __widget_set_height(el_val_t handle, el_val_t height) {
+    el_android_widget_set_height((int64_t)handle, (int)height);
+}
+
+void __widget_set_flex(el_val_t handle, el_val_t flex) {
+    el_android_widget_set_flex((int64_t)handle, (int)flex);
+}
+
+void __widget_set_corner_radius(el_val_t handle, el_val_t radius) {
+    el_android_widget_set_corner_radius((int64_t)handle, (int)radius);
+}
+
+void __widget_set_disabled(el_val_t handle, el_val_t disabled) {
+    el_android_widget_set_disabled((int64_t)handle, (int)disabled);
+}
+
+void __widget_set_hidden(el_val_t handle, el_val_t hidden) {
+    el_android_widget_set_hidden((int64_t)handle, (int)hidden);
+}
+
+void __widget_add_child(el_val_t parent, el_val_t child) {
+    el_android_widget_add_child((int64_t)parent, (int64_t)child);
+}
+
+void __widget_remove_child(el_val_t parent, el_val_t child) {
+    el_android_widget_remove_child((int64_t)parent, (int64_t)child);
+}
+
+void __widget_destroy(el_val_t handle) {
+    el_android_widget_destroy((int64_t)handle);
+}
+
+void __widget_on_click(el_val_t handle, el_val_t fn_name) {
+    el_android_widget_on_click((int64_t)handle,
+                               (const char *)(uintptr_t)fn_name);
+}
+
+void __widget_on_change(el_val_t handle, el_val_t fn_name) {
+    el_android_widget_on_change((int64_t)handle,
+                                (const char *)(uintptr_t)fn_name);
+}
+
+void __widget_on_submit(el_val_t handle, el_val_t fn_name) {
+    el_android_widget_on_submit((int64_t)handle,
+                                (const char *)(uintptr_t)fn_name);
+}
+
+el_val_t __manifest_read(el_val_t path) {
+    return el_android_manifest_read((const char *)(uintptr_t)path);
+}
+
+/* ── MainActivity JNI entry point ─────────────────────────────────────────── */
+/*
+ * Java_com_neuron_el_MainActivity_nativeMain — invoked from MainActivity.onCreate
+ * after ElBridge.init(this).  Calls the el program's compiled main() which runs
+ * the boot sequence: native_init → window_from_manifest → app_build → window_show.
+ * __native_run_loop is a no-op on Android; the Activity lifecycle drives the UI.
+ */
+JNIEXPORT void JNICALL
+Java_com_neuron_el_MainActivity_nativeMain(JNIEnv *env, jobject obj) {
+    (void)env; (void)obj;
+    extern int main(int argc, char **argv);
+    char *argv[] = {"el-app", NULL};
+    main(1, argv);
+}
+
+#endif /* EL_TARGET_ANDROID */