OCaml CEK machine compiled to WebAssembly for browser execution

- wasm_of_ocaml compiles OCaml SX engine to WASM (722/722 spec tests)
- js_of_ocaml fallback also working (722/722 spec tests)
- Thin JS platform layer (sx-platform.js) with ~80 DOM/browser natives
- Lambda callback bridge: SX lambdas callable from JS via handle table
- Side-channel pattern bypasses js_of_ocaml return-value property stripping
- Web adapters (signals, deps, router, adapter-html) load as SX source
- Render mode dispatch: HTML tags + fragments route to OCaml renderer
- Island/component accessors handle both Component and Island types
- Dict-based signal support (signals.sx creates dicts, not native Signal)
- Scope stack implementation (collect!/collected/emit!/emitted/context)
- Bundle script embeds web adapters + WASM loader + platform layer
- SX_USE_WASM env var toggles WASM engine in dev/production
- Bootstrap extended: --web flag transpiles web adapters, :effects stripping

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

.gitignore

@@ -11,3 +11,7 @@ build/
 venv/
 _snapshot/
 _debug/
+sx-haskell/
+sx-rust/
+shared/static/scripts/sx-full-test.js
+hosts/ocaml/_build/

RESTRUCTURE_PLAN.md

@@ -0,0 +1,91 @@
+# Restructure Plan
+
+Reorganise from flat `shared/sx/ref/` to layered `spec/` + `hosts/` + `web/` + `sx/`.
+
+Recovery point: commit `1a3d7b3` on branch `macros`.
+
+## Phase 1: Directory structure
+Create all directories. No file moves.
+```
+spec/tests/
+hosts/python/
+hosts/javascript/
+web/adapters/
+web/tests/
+web/platforms/python/
+web/platforms/javascript/
+sx/platforms/python/
+sx/platforms/javascript/
+```
+
+## Phase 2: Spec files (git mv)
+Move from `shared/sx/ref/` to `spec/`:
+- eval.sx, parser.sx, primitives.sx, render.sx
+- cek.sx, frames.sx, special-forms.sx
+- continuations.sx, callcc.sx, types.sx
+Move tests to `spec/tests/`:
+- test-framework.sx, test.sx, test-eval.sx, test-parser.sx
+- test-render.sx, test-cek.sx, test-continuations.sx, test-types.sx
+Remove boundary-core.sx from spec/ (it's a contract doc, not spec)
+
+## Phase 3: Host files (git mv)
+Python host - move from `shared/sx/ref/` to `hosts/python/`:
+- bootstrap_py.py → hosts/python/bootstrap.py
+- platform_py.py → hosts/python/platform.py
+- py.sx → hosts/python/transpiler.sx
+- boundary_parser.py → hosts/python/boundary_parser.py
+- run_signal_tests.py, run_cek_tests.py, run_cek_reactive_tests.py,
+  run_continuation_tests.py, run_type_tests.py → hosts/python/tests/
+
+JS host - move from `shared/sx/ref/` to `hosts/javascript/`:
+- run_js_sx.py → hosts/javascript/bootstrap.py
+- bootstrap_js.py → hosts/javascript/cli.py
+- platform_js.py → hosts/javascript/platform.py
+- js.sx → hosts/javascript/transpiler.sx
+
+Generated output stays in place:
+- shared/sx/ref/sx_ref.py (Python runtime)
+- shared/static/scripts/sx-browser.js (JS runtime)
+
+## Phase 4: Web framework files (git mv)
+Move from `shared/sx/ref/` to `web/`:
+- signals.sx → web/signals.sx
+- engine.sx, orchestration.sx, boot.sx → web/
+- router.sx, deps.sx, forms.sx, page-helpers.sx → web/
+Move adapters to `web/adapters/`:
+- adapter-dom.sx → web/adapters/dom.sx
+- adapter-html.sx → web/adapters/html.sx
+- adapter-sx.sx → web/adapters/sx.sx
+- adapter-async.sx → web/adapters/async.sx
+Move web tests to `web/tests/`:
+- test-signals.sx, test-aser.sx, test-engine.sx, etc.
+Move boundary-web.sx to `web/boundary.sx`
+Move boundary-app.sx to `web/boundary-app.sx`
+
+## Phase 5: Platform bindings
+Web platforms:
+- Extract DOM/browser primitives from platform_js.py → web/platforms/javascript/
+- Extract IO/server primitives from platform_py.py → web/platforms/python/
+App platforms:
+- sx/sxc/pages/helpers.py → sx/platforms/python/helpers.py
+- sx/sxc/init-client.sx.txt → sx/platforms/javascript/init.sx
+
+## Phase 6: Update imports
+- All Python imports referencing shared.sx.ref.*
+- Bootstrapper paths (ref_dir, _source_dirs, _find_sx)
+- Docker volume mounts in docker-compose*.yml
+- Test runner paths
+- CLAUDE.md paths
+
+## Phase 7: Verify
+- Both bootstrappers build
+- All tests pass
+- Dev container starts
+- Website works
+- Remove duplicate files from shared/sx/ref/
+
+## Notes
+- Generated files (sx_ref.py, sx-browser.js) stay where they are
+- The runtime imports from shared.sx.ref.sx_ref — that doesn't change
+- Only the SOURCE .sx files and bootstrapper tools move
+- Each phase is a separate commit for safe rollback

_config/dev-sh-config.yaml

@@ -0,0 +1,86 @@
+root: "/rose-ash-wholefood-coop"  # no trailing slash needed (we normalize it)
+host: "https://rose-ash.com"
+base_host: "wholesale.suma.coop"
+base_login: https://wholesale.suma.coop/customer/account/login/
+base_url: https://wholesale.suma.coop/
+title: sx-web
+market_root: /market
+market_title: Market
+blog_root: /
+blog_title: all the news
+cart_root: /cart
+app_urls:
+  blog: "https://blog.rose-ash.com"
+  market: "https://market.rose-ash.com"
+  cart: "https://cart.rose-ash.com"
+  events: "https://events.rose-ash.com"
+  federation: "https://federation.rose-ash.com"
+  account: "https://account.rose-ash.com"
+  sx: "https://sx.rose-ash.com"
+  test: "https://test.rose-ash.com"
+  orders: "https://orders.rose-ash.com"
+cache:
+  fs_root: /app/_snapshot  # <- absolute path to your snapshot dir
+categories:
+  allow:
+    Basics: basics
+    Branded Goods: branded-goods
+    Chilled: chilled
+    Frozen: frozen
+    Non-foods: non-foods
+    Supplements: supplements
+    Christmas: christmas
+slugs:
+  skip:
+    - ""
+    - customer
+    - account
+    - checkout
+    - wishlist
+    - sales
+    - contact
+    - privacy-policy
+    - terms-and-conditions
+    - delivery
+    - catalogsearch
+    - quickorder
+    - apply
+    - search
+    - static
+    - media
+section-titles:
+    - ingredients
+    - allergy information
+    - allergens
+    - nutritional information
+    - nutrition
+    - storage
+    - directions
+    - preparation
+    - serving suggestions
+    - origin
+    - country of origin
+    - recycling
+    - general information
+    - additional information
+    - a note about prices
+
+blacklist:
+  category:
+    - branded-goods/alcoholic-drinks
+    - branded-goods/beers
+    - branded-goods/ciders
+    - branded-goods/wines
+  product:
+    - list-price-suma-current-suma-price-list-each-bk012-2-html
+  product-details:
+    - General Information
+    - A Note About Prices
+sumup:
+  merchant_code: "ME4J6100"
+  currency: "GBP"
+  # Name of the environment variable that holds your SumUp API key
+  api_key_env: "SUMUP_API_KEY"
+  webhook_secret: "jfwlekjfwef798ewf769ew8f679ew8f7weflwef"
+
+

dev-sx.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Dev mode for sx_docs only (standalone, no DB)
+# Bind-mounted source + auto-reload on externalnet
+# Browse to sx.rose-ash.com
+#
+# Usage:
+#   ./dev-sx.sh              # Start sx_docs dev
+#   ./dev-sx.sh down          # Stop
+#   ./dev-sx.sh logs          # Tail logs
+#   ./dev-sx.sh --build       # Rebuild image then start
+
+COMPOSE="docker compose -p sx-dev -f docker-compose.dev-sx.yml"
+
+case "${1:-up}" in
+  down)
+    $COMPOSE down
+    ;;
+  logs)
+    $COMPOSE logs -f sx_docs
+    ;;
+  *)
+    BUILD_FLAG=""
+    if [[ "${1:-}" == "--build" ]]; then
+      BUILD_FLAG="--build"
+    fi
+    $COMPOSE up $BUILD_FLAG
+    ;;
+esac

docker-compose.dev-sx.yml

@@ -0,0 +1,65 @@
+# Standalone dev mode for sx_docs only
+# Replaces ~/sx-web production stack with bind-mounted source + auto-reload
+# Accessible at sx.rose-ash.com via Caddy on externalnet
+
+services:
+  sx_docs:
+    image: registry.rose-ash.com:5000/sx_docs:latest
+    environment:
+      SX_STANDALONE: "true"
+      SECRET_KEY: "${SECRET_KEY:-sx-dev-secret}"
+      REDIS_URL: redis://redis:6379/0
+      WORKERS: "1"
+      ENVIRONMENT: development
+      RELOAD: "true"
+      SX_USE_REF: "1"
+      SX_USE_OCAML: "1"
+      SX_OCAML_BIN: "/app/bin/sx_server"
+      SX_BOUNDARY_STRICT: "1"
+      SX_USE_WASM: "1"
+      SX_DEV: "1"
+    volumes:
+      - /root/rose-ash/_config/dev-sh-config.yaml:/app/config/app-config.yaml:ro
+      - ./shared:/app/shared
+      - ./sx/app.py:/app/app.py
+      - ./sx/sxc:/app/sxc
+      - ./sx/bp:/app/bp
+      - ./sx/services:/app/services
+      - ./sx/content:/app/content
+      - ./sx/sx:/app/sx
+      - ./sx/path_setup.py:/app/path_setup.py
+      - ./sx/entrypoint.sh:/usr/local/bin/entrypoint.sh
+      # OCaml SX kernel binary (built with: cd hosts/ocaml && eval $(opam env) && dune build)
+      - ./hosts/ocaml/_build/default/bin/sx_server.exe:/app/bin/sx_server:ro
+      - ./sx/__init__.py:/app/__init__.py:ro
+      # sibling models for cross-domain SQLAlchemy imports
+      - ./blog/__init__.py:/app/blog/__init__.py:ro
+      - ./blog/models:/app/blog/models:ro
+      - ./market/__init__.py:/app/market/__init__.py:ro
+      - ./market/models:/app/market/models:ro
+      - ./cart/__init__.py:/app/cart/__init__.py:ro
+      - ./cart/models:/app/cart/models:ro
+      - ./events/__init__.py:/app/events/__init__.py:ro
+      - ./events/models:/app/events/models:ro
+      - ./federation/__init__.py:/app/federation/__init__.py:ro
+      - ./federation/models:/app/federation/models:ro
+      - ./account/__init__.py:/app/account/__init__.py:ro
+      - ./account/models:/app/account/models:ro
+      - ./relations/__init__.py:/app/relations/__init__.py:ro
+      - ./relations/models:/app/relations/models:ro
+      - ./likes/__init__.py:/app/likes/__init__.py:ro
+      - ./likes/models:/app/likes/models:ro
+      - ./orders/__init__.py:/app/orders/__init__.py:ro
+      - ./orders/models:/app/orders/models:ro
+    networks:
+      - externalnet
+      - default
+    restart: unless-stopped
+
+  redis:
+    image: redis:7-alpine
+    restart: unless-stopped
+
+networks:
+  externalnet:
+    external: true

docker-compose.yml

@@ -228,6 +228,8 @@ services:
       <<: *app-env
       REDIS_URL: redis://redis:6379/10
       WORKERS: "1"
+      SX_USE_OCAML: "1"
+      SX_OCAML_BIN: "/app/bin/sx_server"
 
   db:
     image: postgres:16

hosts/javascript/bootstrap.py

@@ -16,19 +16,20 @@ import os
 import sys
 
 _HERE = os.path.dirname(os.path.abspath(__file__))
-_PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", ".."))
 if _PROJECT not in sys.path:
     sys.path.insert(0, _PROJECT)
 
 from shared.sx.parser import parse_all
 from shared.sx.types import Symbol
-from shared.sx.ref.platform_js import (
+from hosts.javascript.platform import (
     extract_defines,
-    ADAPTER_FILES, ADAPTER_DEPS, SPEC_MODULES, EXTENSION_NAMES,
+    ADAPTER_FILES, ADAPTER_DEPS, SPEC_MODULES, SPEC_MODULE_ORDER, EXTENSION_NAMES,
     PREAMBLE, PLATFORM_JS_PRE, PLATFORM_JS_POST,
     PRIMITIVES_JS_MODULES, _ALL_JS_MODULES, _assemble_primitives_js,
     PLATFORM_DEPS_JS, PLATFORM_PARSER_JS, PLATFORM_DOM_JS,
     PLATFORM_ENGINE_PURE_JS, PLATFORM_ORCHESTRATION_JS, PLATFORM_BOOT_JS,
+    PLATFORM_CEK_JS, CEK_FIXUPS_JS,
     CONTINUATIONS_JS, ASYNC_IO_JS,
     fixups_js, public_api_js, EPILOGUE,
 )
@@ -43,7 +44,7 @@ def load_js_sx() -> dict:
     if _js_sx_env is not None:
         return _js_sx_env
 
-    js_sx_path = os.path.join(_HERE, "js.sx")
+    js_sx_path = os.path.join(_HERE, "transpiler.sx")
     with open(js_sx_path) as f:
         source = f.read()
 
@@ -76,7 +77,13 @@ def compile_ref_to_js(
     from datetime import datetime, timezone
     from shared.sx.ref.sx_ref import evaluate
 
-    ref_dir = _HERE
+    ref_dir = os.path.join(_PROJECT, "shared", "sx", "ref")
+    # Source directories: core spec, web framework, and legacy ref (for bootstrapper tools)
+    _source_dirs = [
+        os.path.join(_PROJECT, "spec"),      # Core spec
+        os.path.join(_PROJECT, "web"),        # Web framework
+        ref_dir,                              # Legacy location (fallback)
+    ]
     env = load_js_sx()
 
     # Resolve adapter set
@@ -105,6 +112,8 @@ def compile_ref_to_js(
         spec_mod_set.add("deps")
         if "page-helpers" in SPEC_MODULES:
             spec_mod_set.add("page-helpers")
+    # CEK is always included (part of evaluator.sx core file)
+    has_cek = True
     has_deps = "deps" in spec_mod_set
     has_router = "router" in spec_mod_set
     has_page_helpers = "page-helpers" in spec_mod_set
@@ -118,16 +127,23 @@ def compile_ref_to_js(
             ext_set.add(e)
     has_continuations = "continuations" in ext_set
 
-    # Build file list: core + adapters + spec modules
+    # Build file list: core evaluator + adapters + spec modules
+    # evaluator.sx = merged frames + eval utilities + CEK machine
     sx_files = [
-        ("eval.sx", "eval"),
+        ("evaluator.sx", "evaluator (frames + eval + CEK)"),
         ("render.sx", "render (core)"),
     ]
     for name in ("parser", "html", "sx", "dom", "engine", "orchestration", "boot"):
         if name in adapter_set:
             sx_files.append(ADAPTER_FILES[name])
+    # Use explicit ordering for spec modules (respects dependencies)
+    for name in SPEC_MODULE_ORDER:
+        if name in spec_mod_set:
+            sx_files.append(SPEC_MODULES[name])
+    # Any spec modules not in the order list (future-proofing)
     for name in sorted(spec_mod_set):
-        sx_files.append(SPEC_MODULES[name])
+        if name not in SPEC_MODULE_ORDER:
+            sx_files.append(SPEC_MODULES[name])
 
     has_html = "html" in adapter_set
     has_sx = "sx" in adapter_set
@@ -175,10 +191,21 @@ def compile_ref_to_js(
     if has_parser:
         parts.append(adapter_platform["parser"])
 
+    # CEK platform aliases must come before transpiled cek.sx (which uses them)
+    if has_cek:
+        parts.append(PLATFORM_CEK_JS)
+
     # Translate each spec file using js.sx
+    def _find_sx(filename):
+        for d in _source_dirs:
+            p = os.path.join(d, filename)
+            if os.path.exists(p):
+                return p
+        return None
+
     for filename, label in sx_files:
-        filepath = os.path.join(ref_dir, filename)
-        if not os.path.exists(filepath):
+        filepath = _find_sx(filename)
+        if not filepath:
             continue
         with open(filepath) as f:
             src = f.read()
@@ -197,16 +224,23 @@ def compile_ref_to_js(
     # Platform JS for selected adapters
     if not has_dom:
         parts.append("\n  var _hasDom = false;\n")
+
+    # CEK fixups + general fixups BEFORE boot (boot hydrates islands that need these)
+    parts.append(fixups_js(has_html, has_sx, has_dom, has_signals, has_deps, has_page_helpers))
+    if has_cek:
+        parts.append(CEK_FIXUPS_JS)
+
     for name in ("dom", "engine", "orchestration", "boot"):
         if name in adapter_set and name in adapter_platform:
             parts.append(adapter_platform[name])
-
-    parts.append(fixups_js(has_html, has_sx, has_dom, has_signals, has_deps, has_page_helpers))
-    if has_continuations:
-        parts.append(CONTINUATIONS_JS)
+    # CONTINUATIONS_JS is the tree-walk shift/reset extension.
+    # With CEK as sole evaluator, continuations are handled natively by
+    # cek.sx (step-sf-reset, step-sf-shift). Skip the tree-walk extension.
+    # if has_continuations:
+    #     parts.append(CONTINUATIONS_JS)
     if has_dom:
         parts.append(ASYNC_IO_JS)
-    parts.append(public_api_js(has_html, has_sx, has_dom, has_engine, has_orch, has_boot, has_parser, adapter_label, has_deps, has_router, has_signals, has_page_helpers))
+    parts.append(public_api_js(has_html, has_sx, has_dom, has_engine, has_orch, has_boot, has_parser, adapter_label, has_deps, has_router, has_signals, has_page_helpers, has_cek))
     parts.append(EPILOGUE)
 
     build_ts = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")

hosts/javascript/cli.py

@@ -20,8 +20,10 @@ if _PROJECT not in sys.path:
 
 # Re-export everything that consumers import from this module.
 # Canonical source is now run_js_sx.py (self-hosting via js.sx) and platform_js.py.
-from shared.sx.ref.run_js_sx import compile_ref_to_js, load_js_sx  # noqa: F401
-from shared.sx.ref.platform_js import (  # noqa: F401
+import sys, os
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
+from hosts.javascript.bootstrap import compile_ref_to_js, load_js_sx  # noqa: F401
+from hosts.javascript.platform import (  # noqa: F401
     extract_defines,
     ADAPTER_FILES, ADAPTER_DEPS, SPEC_MODULES, EXTENSION_NAMES,
     PREAMBLE, PLATFORM_JS_PRE, PLATFORM_JS_POST,
@@ -44,7 +46,7 @@ if __name__ == "__main__":
                     help="Comma-separated extensions (continuations). Default: none.")
     p.add_argument("--spec-modules",
                     help="Comma-separated spec modules (deps). Default: none.")
-    default_output = os.path.join(_HERE, "..", "..", "static", "scripts", "sx-browser.js")
+    default_output = os.path.join(_HERE, "..", "..", "shared", "static", "scripts", "sx-browser.js")
     p.add_argument("--output", "-o", default=default_output,
                     help="Output file (default: shared/static/scripts/sx-browser.js)")
     args = p.parse_args()

hosts/javascript/platform.py

@@ -46,7 +46,12 @@ SPEC_MODULES = {
     "router": ("router.sx", "router (client-side route matching)"),
     "signals": ("signals.sx", "signals (reactive signal runtime)"),
     "page-helpers": ("page-helpers.sx", "page-helpers (pure data transformation helpers)"),
+    "types": ("types.sx", "types (gradual type system)"),
 }
+# Note: frames and cek are now part of evaluator.sx (always loaded as core)
+
+# Explicit ordering for spec modules with dependencies.
+SPEC_MODULE_ORDER = ["deps", "page-helpers", "router", "signals", "types"]
 
 
 EXTENSION_NAMES = {"continuations"}
@@ -55,9 +60,13 @@ CONTINUATIONS_JS = '''
   // Extension: Delimited continuations (shift/reset)
   // =========================================================================
 
-  function Continuation(fn) { this.fn = fn; }
-  Continuation.prototype._continuation = true;
-  Continuation.prototype.call = function(value) { return this.fn(value !== undefined ? value : NIL); };
+  function Continuation(fn) {
+    var c = function(value) { return fn(value !== undefined ? value : NIL); };
+    c.fn = fn;
+    c._continuation = true;
+    c.call = function(value) { return fn(value !== undefined ? value : NIL); };
+    return c;
+  }
 
   function ShiftSignal(kName, body, env) {
     this.kName = kName;
@@ -851,20 +860,6 @@ PREAMBLE = '''\
   }
   Island.prototype._island = true;
 
-  function SxSignal(value) {
-    this.value = value;
-    this.subscribers = [];
-    this.deps = [];
-  }
-  SxSignal.prototype._signal = true;
-
-  function TrackingCtx(notifyFn) {
-    this.notifyFn = notifyFn;
-    this.deps = [];
-  }
-
-  var _trackingContext = null;
-
   function Macro(params, restParam, body, closure, name) {
     this.params = params;
     this.restParam = restParam;
@@ -883,8 +878,7 @@ PREAMBLE = '''\
   function SxSpread(attrs) { this.attrs = attrs || {}; }
   SxSpread.prototype._spread = true;
 
-  var _collectBuckets = {};
-  var _provideStacks = {};
+  var _scopeStacks = {};
 
   function isSym(x) { return x != null && x._sym === true; }
   function isKw(x) { return x != null && x._kw === true; }
@@ -960,6 +954,8 @@ PRIMITIVES_JS_MODULES: dict[str, str] = {
   PRIMITIVES["even?"] = function(n) { return n % 2 === 0; };
   PRIMITIVES["zero?"] = function(n) { return n === 0; };
   PRIMITIVES["boolean?"] = function(x) { return x === true || x === false; };
+  PRIMITIVES["symbol?"] = function(x) { return x != null && x._sym === true; };
+  PRIMITIVES["keyword?"] = function(x) { return x != null && x._kw === true; };
   PRIMITIVES["component-affinity"] = componentAffinity;
 ''',
 
@@ -985,6 +981,7 @@ PRIMITIVES_JS_MODULES: dict[str, str] = {
   PRIMITIVES["substring"] = function(s, a, b) { return String(s).substring(a, b); };
   PRIMITIVES["char-from-code"] = function(n) { return String.fromCharCode(n); };
   PRIMITIVES["string-length"] = function(s) { return String(s).length; };
+  var stringLength = PRIMITIVES["string-length"];
   PRIMITIVES["string-contains?"] = function(s, sub) { return String(s).indexOf(String(sub)) !== -1; };
   PRIMITIVES["concat"] = function() {
     var out = [];
@@ -1013,7 +1010,7 @@ PRIMITIVES_JS_MODULES: dict[str, str] = {
   PRIMITIVES["rest"] = function(c) { if (c && typeof c.slice !== "function") { console.error("[sx-debug] rest called on non-sliceable:", typeof c, c, new Error().stack); return []; } return c ? c.slice(1) : []; };
   PRIMITIVES["nth"] = function(c, n) { return c && n >= 0 && n < c.length ? c[n] : NIL; };
   PRIMITIVES["cons"] = function(x, c) { return [x].concat(c || []); };
-  PRIMITIVES["append"] = function(c, x) { return (c || []).concat([x]); };
+  PRIMITIVES["append"] = function(c, x) { return (c || []).concat(Array.isArray(x) ? x : [x]); };
   PRIMITIVES["append!"] = function(arr, x) { arr.push(x); return arr; };
   PRIMITIVES["chunk-every"] = function(c, n) {
     var r = []; for (var i = 0; i < c.length; i += n) r.push(c.slice(i, i + n)); return r;
@@ -1098,14 +1095,17 @@ PRIMITIVES_JS_MODULES: dict[str, str] = {
 ''',
 
     "stdlib.spread": '''
-  // stdlib.spread — spread + collect primitives
+  // stdlib.spread — spread + collect + scope primitives
   PRIMITIVES["make-spread"] = makeSpread;
   PRIMITIVES["spread?"] = isSpread;
   PRIMITIVES["spread-attrs"] = spreadAttrs;
   PRIMITIVES["collect!"] = sxCollect;
   PRIMITIVES["collected"] = sxCollected;
   PRIMITIVES["clear-collected!"] = sxClearCollected;
-  // provide/context/emit! — render-time dynamic scope
+  // scope — unified render-time dynamic scope
+  PRIMITIVES["scope-push!"] = scopePush;
+  PRIMITIVES["scope-pop!"] = scopePop;
+  // provide-push!/provide-pop! — aliases for scope-push!/scope-pop!
   PRIMITIVES["provide-push!"] = providePush;
   PRIMITIVES["provide-pop!"] = providePop;
   PRIMITIVES["context"] = sxContext;
@@ -1146,7 +1146,6 @@ PLATFORM_JS_PRE = '''
     if (x._lambda) return "lambda";
     if (x._component) return "component";
     if (x._island) return "island";
-    if (x._signal) return "signal";
     if (x._spread) return "spread";
     if (x._macro) return "macro";
     if (x._raw) return "raw-html";
@@ -1161,12 +1160,12 @@ PLATFORM_JS_PRE = '''
   function makeSymbol(n) { return new Symbol(n); }
   function makeKeyword(n) { return new Keyword(n); }
 
-  function makeLambda(params, body, env) { return new Lambda(params, body, merge(env)); }
+  function makeLambda(params, body, env) { return new Lambda(params, body, env); }
   function makeComponent(name, params, hasChildren, body, env, affinity) {
-    return new Component(name, params, hasChildren, body, merge(env), affinity);
+    return new Component(name, params, hasChildren, body, env, affinity);
   }
   function makeMacro(params, restParam, body, env, name) {
-    return new Macro(params, restParam, body, merge(env), name);
+    return new Macro(params, restParam, body, env, name);
   }
   function makeThunk(expr, env) { return new Thunk(expr, env); }
 
@@ -1174,44 +1173,54 @@ PLATFORM_JS_PRE = '''
   function isSpread(x) { return x != null && x._spread === true; }
   function spreadAttrs(s) { return s && s._spread ? s.attrs : {}; }
 
-  function sxCollect(bucket, value) {
-    if (!_collectBuckets[bucket]) _collectBuckets[bucket] = [];
-    var items = _collectBuckets[bucket];
-    if (items.indexOf(value) === -1) items.push(value);
+  function scopePush(name, value) {
+    if (!_scopeStacks[name]) _scopeStacks[name] = [];
+    _scopeStacks[name].push({value: value !== undefined ? value : NIL, emitted: [], dedup: false});
   }
-  function sxCollected(bucket) {
-    return _collectBuckets[bucket] ? _collectBuckets[bucket].slice() : [];
-  }
-  function sxClearCollected(bucket) {
-    if (_collectBuckets[bucket]) _collectBuckets[bucket] = [];
+  function scopePop(name) {
+    if (_scopeStacks[name] && _scopeStacks[name].length) _scopeStacks[name].pop();
   }
+  // Aliases — provide-push!/provide-pop! map to scope-push!/scope-pop!
+  var providePush = scopePush;
+  var providePop = scopePop;
 
-  function providePush(name, value) {
-    if (!_provideStacks[name]) _provideStacks[name] = [];
-    _provideStacks[name].push({value: value !== undefined ? value : NIL, emitted: []});
-  }
-  function providePop(name) {
-    if (_provideStacks[name] && _provideStacks[name].length) _provideStacks[name].pop();
-  }
   function sxContext(name) {
-    if (_provideStacks[name] && _provideStacks[name].length) {
-      return _provideStacks[name][_provideStacks[name].length - 1].value;
+    if (_scopeStacks[name] && _scopeStacks[name].length) {
+      return _scopeStacks[name][_scopeStacks[name].length - 1].value;
     }
     if (arguments.length > 1) return arguments[1];
     throw new Error("No provider for: " + name);
   }
   function sxEmit(name, value) {
-    if (_provideStacks[name] && _provideStacks[name].length) {
-      _provideStacks[name][_provideStacks[name].length - 1].emitted.push(value);
+    if (_scopeStacks[name] && _scopeStacks[name].length) {
+      var entry = _scopeStacks[name][_scopeStacks[name].length - 1];
+      if (entry.dedup && entry.emitted.indexOf(value) !== -1) return NIL;
+      entry.emitted.push(value);
     }
     return NIL;
   }
   function sxEmitted(name) {
-    if (_provideStacks[name] && _provideStacks[name].length) {
-      return _provideStacks[name][_provideStacks[name].length - 1].emitted.slice();
+    if (_scopeStacks[name] && _scopeStacks[name].length) {
+      return _scopeStacks[name][_scopeStacks[name].length - 1].emitted.slice();
     }
     return [];
   }
+  function sxCollect(bucket, value) {
+    if (!_scopeStacks[bucket] || !_scopeStacks[bucket].length) {
+      if (!_scopeStacks[bucket]) _scopeStacks[bucket] = [];
+      _scopeStacks[bucket].push({value: NIL, emitted: [], dedup: true});
+    }
+    var entry = _scopeStacks[bucket][_scopeStacks[bucket].length - 1];
+    if (entry.emitted.indexOf(value) === -1) entry.emitted.push(value);
+  }
+  function sxCollected(bucket) {
+    return sxEmitted(bucket);
+  }
+  function sxClearCollected(bucket) {
+    if (_scopeStacks[bucket] && _scopeStacks[bucket].length) {
+      _scopeStacks[bucket][_scopeStacks[bucket].length - 1].emitted = [];
+    }
+  }
 
   function lambdaParams(f) { return f.params; }
   function lambdaBody(f) { return f.body; }
@@ -1225,6 +1234,8 @@ PLATFORM_JS_PRE = '''
   function componentHasChildren(c) { return c.hasChildren; }
   function componentName(c) { return c.name; }
   function componentAffinity(c) { return c.affinity || "auto"; }
+  function componentParamTypes(c) { return (c && c._paramTypes) ? c._paramTypes : NIL; }
+  function componentSetParamTypes_b(c, t) { if (c) c._paramTypes = t; return NIL; }
 
   function macroParams(m) { return m.params; }
   function macroRestParam(m) { return m.restParam; }
@@ -1244,35 +1255,7 @@ PLATFORM_JS_PRE = '''
 
   // Island platform
   function makeIsland(name, params, hasChildren, body, env) {
-    return new Island(name, params, hasChildren, body, merge(env));
-  }
-
-  // Signal platform
-  function makeSignal(value) { return new SxSignal(value); }
-  function isSignal(x) { return x != null && x._signal === true; }
-  function signalValue(s) { return s.value; }
-  function signalSetValue(s, v) { s.value = v; }
-  function signalSubscribers(s) { return s.subscribers.slice(); }
-  function signalAddSub(s, fn) { if (s.subscribers.indexOf(fn) < 0) s.subscribers.push(fn); }
-  function signalRemoveSub(s, fn) { var i = s.subscribers.indexOf(fn); if (i >= 0) s.subscribers.splice(i, 1); }
-  function signalDeps(s) { return s.deps.slice(); }
-  function signalSetDeps(s, deps) { s.deps = Array.isArray(deps) ? deps.slice() : []; }
-  function setTrackingContext(ctx) { _trackingContext = ctx; }
-  function getTrackingContext() { return _trackingContext || NIL; }
-  function makeTrackingContext(notifyFn) { return new TrackingCtx(notifyFn); }
-  function trackingContextDeps(ctx) { return ctx ? ctx.deps : []; }
-  function trackingContextAddDep(ctx, s) { if (ctx && ctx.deps.indexOf(s) < 0) ctx.deps.push(s); }
-  function trackingContextNotifyFn(ctx) { return ctx ? ctx.notifyFn : NIL; }
-
-  // invoke — call any callable (native fn or SX lambda) with args.
-  // Transpiled code emits direct calls f(args) which fail on SX lambdas
-  // from runtime-evaluated island bodies. invoke dispatches correctly.
-  function invoke() {
-    var f = arguments[0];
-    var args = Array.prototype.slice.call(arguments, 1);
-    if (isLambda(f)) return trampoline(callLambda(f, args, lambdaClosure(f)));
-    if (typeof f === 'function') return f.apply(null, args);
-    return NIL;
+    return new Island(name, params, hasChildren, body, env);
   }
 
   // JSON / dict helpers for island state serialization
@@ -1287,6 +1270,11 @@ PLATFORM_JS_PRE = '''
 
   function envHas(env, name) { return name in env; }
   function envGet(env, name) { return env[name]; }
+  function envBind(env, name, val) {
+    // Direct property set — creates or overwrites on THIS env only.
+    // Used by let, define, defcomp, lambda param binding.
+    env[name] = val;
+  }
   function envSet(env, name, val) {
     // Walk prototype chain to find where the variable is defined (for set!)
     var obj = env;
@@ -1377,6 +1365,16 @@ PLATFORM_JS_POST = '''
   }
   function mapDict(fn, d) { var r = {}; for (var k in d) r[k] = fn(k, d[k]); return r; }
 
+  // Predicate aliases used by transpiled code
+  // Both naming conventions: isX (from js-renames) and x_p (from js-mangle of x?)
+  var isNumber = PRIMITIVES["number?"];  var number_p = isNumber;
+  var isString = PRIMITIVES["string?"];  var string_p = isString;
+  var isBoolean = PRIMITIVES["boolean?"]; var boolean_p = isBoolean;
+  var isDict = PRIMITIVES["dict?"];
+  var isList = PRIMITIVES["list?"];       var list_p = isList;
+  var isKeyword = PRIMITIVES["keyword?"]; var keyword_p = isKeyword;
+  var isSymbol = PRIMITIVES["symbol?"];   var symbol_p = isSymbol;
+
   // List primitives used directly by transpiled code
   var len = PRIMITIVES["len"];
   var first = PRIMITIVES["first"];
@@ -1493,6 +1491,97 @@ PLATFORM_JS_POST = '''
   };'''
 
 
+PLATFORM_CEK_JS = '''
+  // String/number utilities needed by transpiled spec code (content-hash etc)
+  PRIMITIVES["char-code-at"] = function(s, i) { return s.charCodeAt(i); };
+  var charCodeAt = PRIMITIVES["char-code-at"];
+  PRIMITIVES["to-hex"] = function(n) { return (n >>> 0).toString(16); };
+  var toHex = PRIMITIVES["to-hex"];
+
+  // =========================================================================
+  // Platform: CEK module — explicit CEK machine
+  // =========================================================================
+
+  // Continuation type — callable as JS function so isCallable/apply work.
+  // CEK is the canonical evaluator; continuations are always available.
+  function Continuation(fn) {
+    var c = function(value) { return fn(value !== undefined ? value : NIL); };
+    c.fn = fn;
+    c._continuation = true;
+    c.call = function(value) { return fn(value !== undefined ? value : NIL); };
+    return c;
+  }
+  PRIMITIVES["continuation?"] = function(x) { return x != null && x._continuation === true; };
+
+  // Standalone aliases for primitives used by cek.sx / frames.sx
+  var inc = PRIMITIVES["inc"];
+  var dec = PRIMITIVES["dec"];
+  var zip_pairs = PRIMITIVES["zip-pairs"];
+
+  var continuation_p = PRIMITIVES["continuation?"];
+
+  function makeCekContinuation(captured, restKont) {
+    var c = new Continuation(function(v) { return v !== undefined ? v : NIL; });
+    c._cek_data = {"captured": captured, "rest-kont": restKont};
+    return c;
+  }
+  function continuationData(c) {
+    return (c && c._cek_data) ? c._cek_data : {};
+  }
+'''
+
+# Iterative override for cek_run — replaces transpiled recursive version
+CEK_FIXUPS_JS = '''
+  // Override recursive cekRun with iterative loop (avoids stack overflow)
+  cekRun = function(state) {
+    while (!cekTerminal_p(state)) { state = cekStep(state); }
+    return cekValue(state);
+  };
+
+  // CEK is the canonical evaluator — override evalExpr to use it.
+  // The tree-walk evaluator (evalExpr from eval.sx) is superseded.
+  var _treeWalkEvalExpr = evalExpr;
+  evalExpr = function(expr, env) {
+    return cekRun(makeCekState(expr, env, []));
+  };
+
+  // CEK never produces thunks — trampoline resolves any legacy thunks
+  var _treeWalkTrampoline = trampoline;
+  trampoline = function(val) {
+    if (isThunk(val)) return evalExpr(thunkExpr(val), thunkEnv(val));
+    return val;
+  };
+
+  // Platform functions — defined in platform_js.py, not in .sx spec files.
+  // Spec defines self-register via js-emit-define; these are the platform interface.
+  PRIMITIVES["type-of"] = typeOf;
+  PRIMITIVES["symbol-name"] = symbolName;
+  PRIMITIVES["keyword-name"] = keywordName;
+  PRIMITIVES["callable?"] = isCallable;
+  PRIMITIVES["lambda?"] = isLambda;
+  PRIMITIVES["lambda-name"] = lambdaName;
+  PRIMITIVES["component?"] = isComponent;
+  PRIMITIVES["island?"] = isIsland;
+  PRIMITIVES["make-symbol"] = function(n) { return new Symbol(n); };
+  PRIMITIVES["is-html-tag?"] = function(n) { return HTML_TAGS.indexOf(n) >= 0; };
+  PRIMITIVES["make-env"] = function() { return merge(componentEnv, PRIMITIVES); };
+
+  // localStorage — defined here (before boot) so islands can use at hydration
+  PRIMITIVES["local-storage-get"] = function(key) {
+    try { var v = localStorage.getItem(key); return v === null ? NIL : v; }
+    catch (e) { return NIL; }
+  };
+  PRIMITIVES["local-storage-set"] = function(key, val) {
+    try { localStorage.setItem(key, val); } catch (e) {}
+    return NIL;
+  };
+  PRIMITIVES["local-storage-remove"] = function(key) {
+    try { localStorage.removeItem(key); } catch (e) {}
+    return NIL;
+  };
+'''
+
+
 PLATFORM_DEPS_JS = '''
   // =========================================================================
   // Platform: deps module — component dependency analysis
@@ -1587,10 +1676,10 @@ PLATFORM_PARSER_JS = r"""
   // =========================================================================
   // Character classification derived from the grammar:
   //   ident-start → [a-zA-Z_~*+\-><=/!?&]
-  //   ident-char  → ident-start + [0-9.:\/\[\]#,]
+  //   ident-char  → ident-start + [0-9.:\/\#,]
 
   var _identStartRe = /[a-zA-Z_~*+\-><=/!?&]/;
-  var _identCharRe = /[a-zA-Z0-9_~*+\-><=/!?.:&/\[\]#,]/;
+  var _identCharRe = /[a-zA-Z0-9_~*+\-><=/!?.:&/#,]/;
 
   function isIdentStart(ch) { return _identStartRe.test(ch); }
   function isIdentChar(ch) { return _identCharRe.test(ch); }
@@ -1780,8 +1869,8 @@ PLATFORM_DOM_JS = """
     // If lambda takes 0 params, call without event arg (convenience for on-click handlers)
     var wrapped = isLambda(handler)
       ? (lambdaParams(handler).length === 0
-        ? function(e) { try { invoke(handler); } catch(err) { console.error("[sx-ref] domListen handler error:", name, err); } }
-        : function(e) { try { invoke(handler, e); } catch(err) { console.error("[sx-ref] domListen handler error:", name, err); } })
+        ? function(e) { try { cekCall(handler, NIL); } catch(err) { console.error("[sx-ref] domListen handler error:", name, err); } finally { runPostRenderHooks(); } }
+        : function(e) { try { cekCall(handler, [e]); } catch(err) { console.error("[sx-ref] domListen handler error:", name, err); } finally { runPostRenderHooks(); } })
       : handler;
     if (name === "click") logInfo("domListen: click on <" + (el.tagName||"?").toLowerCase() + "> text=" + (el.textContent||"").substring(0,20) + " isLambda=" + isLambda(handler));
     el.addEventListener(name, wrapped);
@@ -1789,7 +1878,7 @@ PLATFORM_DOM_JS = """
   }
 
   function eventDetail(e) {
-    return (e && e.detail != null) ? e.detail : nil;
+    return (e && e.detail != null) ? e.detail : NIL;
   }
 
   function domQuery(sel) {
@@ -1834,7 +1923,7 @@ PLATFORM_DOM_JS = """
     if (el) { if (!el._sxData) el._sxData = {}; el._sxData[key] = val; }
   }
   function domGetData(el, key) {
-    return (el && el._sxData) ? (el._sxData[key] != null ? el._sxData[key] : nil) : nil;
+    return (el && el._sxData) ? (el._sxData[key] != null ? el._sxData[key] : NIL) : NIL;
   }
   function domInnerHtml(el) {
     return (el && el.innerHTML != null) ? el.innerHTML : "";
@@ -2415,6 +2504,10 @@ PLATFORM_ORCHESTRATION_JS = """
   }
   function scheduleIdle(fn) {
     var cb = _wrapSxFn(fn);
+    if (typeof cb !== "function") {
+      console.error("[sx-ref] scheduleIdle: callback not callable, fn type:", typeof fn, "fn:", fn, "_lambda:", fn && fn._lambda);
+      return;
+    }
     if (typeof requestIdleCallback !== "undefined") requestIdleCallback(cb);
     else setTimeout(cb, 0);
   }
@@ -2504,8 +2597,12 @@ PLATFORM_ORCHESTRATION_JS = """
       e.preventDefault();
       // Re-read href from element at click time (not closed-over value)
       var liveHref = el.getAttribute("href") || _href;
+      console.log("[sx-debug] bindBoostLink click:", liveHref, "el:", el.tagName, el.textContent.slice(0,30));
       executeRequest(el, { method: "GET", url: liveHref }).then(function() {
+        console.log("[sx-debug] boost fetch OK, pushState:", liveHref);
         try { history.pushState({ sxUrl: liveHref, scrollY: window.scrollY }, "", liveHref); } catch (err) {}
+      }).catch(function(err) {
+        console.error("[sx-debug] boost fetch ERROR:", err);
       });
     });
   }
@@ -2530,21 +2627,25 @@ PLATFORM_ORCHESTRATION_JS = """
       // Re-read href from element at click time (not closed-over value)
       var liveHref = link.getAttribute("href") || _href;
       var pathname = urlPathname(liveHref);
+      console.log("[sx-debug] bindClientRouteClick:", pathname, "el:", link.tagName, link.textContent.slice(0,30));
       // Find target selector: sx-boost ancestor, explicit sx-target, or #main-panel
       var boostEl = link.closest("[sx-boost]");
       var targetSel = boostEl ? boostEl.getAttribute("sx-boost") : null;
       if (!targetSel || targetSel === "true") {
         targetSel = link.getAttribute("sx-target") || "#main-panel";
       }
+      console.log("[sx-debug] targetSel:", targetSel, "trying client route...");
       if (tryClientRoute(pathname, targetSel)) {
+        console.log("[sx-debug] client route SUCCESS, pushState:", liveHref);
         try { history.pushState({ sxUrl: liveHref, scrollY: window.scrollY }, "", liveHref); } catch (err) {}
         if (typeof window !== "undefined") window.scrollTo(0, 0);
       } else {
-        logInfo("sx:route server " + pathname);
+        console.log("[sx-debug] client route FAILED, server fetch:", liveHref);
         executeRequest(link, { method: "GET", url: liveHref }).then(function() {
+          console.log("[sx-debug] server fetch OK, pushState:", liveHref);
           try { history.pushState({ sxUrl: liveHref, scrollY: window.scrollY }, "", liveHref); } catch (err) {}
         }).catch(function(err) {
-          logWarn("sx:route server fetch error: " + (err && err.message ? err.message : err));
+          console.error("[sx-debug] server fetch ERROR:", err);
         });
       }
     });
@@ -2859,6 +2960,7 @@ PLATFORM_BOOT_JS = """
   function localStorageRemove(key) {
     try { localStorage.removeItem(key); } catch (e) {}
   }
+  // localStorage primitives registered in CEK_FIXUPS_JS for ordering
 
   // --- Cookies ---
 
@@ -2982,7 +3084,6 @@ def fixups_js(has_html, has_sx, has_dom, has_signals=False, has_deps=False, has_
   PRIMITIVES["stop-propagation"] = stopPropagation_;
   PRIMITIVES["error-message"] = errorMessage;
   PRIMITIVES["schedule-idle"] = scheduleIdle;
-  PRIMITIVES["invoke"] = invoke;
   PRIMITIVES["error"] = function(msg) { throw new Error(msg); };
   PRIMITIVES["filter"] = filter;
   // DOM primitives for sx-on:* handlers and data-init scripts
@@ -3004,6 +3105,9 @@ def fixups_js(has_html, has_sx, has_dom, has_signals=False, has_deps=False, has_
   if (typeof domOuterHtml === "function") PRIMITIVES["dom-outer-html"] = domOuterHtml;
   if (typeof domInnerHtml === "function") PRIMITIVES["dom-inner-html"] = domInnerHtml;
   if (typeof domTextContent === "function") PRIMITIVES["dom-text-content"] = domTextContent;
+  if (typeof domCreateElement === "function") PRIMITIVES["dom-create-element"] = domCreateElement;
+  if (typeof domAppend === "function") PRIMITIVES["dom-append"] = domAppend;
+  if (typeof domAppendToHead === "function") PRIMITIVES["dom-append-to-head"] = domAppendToHead;
   if (typeof jsonParse === "function") PRIMITIVES["json-parse"] = jsonParse;
   if (typeof nowMs === "function") PRIMITIVES["now-ms"] = nowMs;
   PRIMITIVES["sx-parse"] = sxParse;
@@ -3055,7 +3159,7 @@ def fixups_js(has_html, has_sx, has_dom, has_signals=False, has_deps=False, has_
     return "\n".join(lines)
 
 
-def public_api_js(has_html, has_sx, has_dom, has_engine, has_orch, has_boot, has_parser, adapter_label, has_deps=False, has_router=False, has_signals=False, has_page_helpers=False):
+def public_api_js(has_html, has_sx, has_dom, has_engine, has_orch, has_boot, has_parser, adapter_label, has_deps=False, has_router=False, has_signals=False, has_page_helpers=False, has_cek=False):
     # Parser: use compiled sxParse from parser.sx, or inline a minimal fallback
     if has_parser:
         parser = '''
@@ -3152,6 +3256,7 @@ def public_api_js(has_html, has_sx, has_dom, has_engine, has_orch, has_boot, has
     isNil: isNil,
     componentEnv: componentEnv,''')
 
+    api_lines.append('    setRenderActive: function(val) { setRenderActiveB(val); },')
     if has_html:
         api_lines.append('    renderToHtml: function(expr, env) { return renderToHtml(expr, env || merge(componentEnv)); },')
     if has_sx:
@@ -3244,11 +3349,22 @@ def public_api_js(has_html, has_sx, has_dom, has_engine, has_orch, has_boot, has
     api_lines.append('    collect: sxCollect,')
     api_lines.append('    collected: sxCollected,')
     api_lines.append('    clearCollected: sxClearCollected,')
+    api_lines.append('    scopePush: scopePush,')
+    api_lines.append('    scopePop: scopePop,')
     api_lines.append('    providePush: providePush,')
     api_lines.append('    providePop: providePop,')
     api_lines.append('    context: sxContext,')
     api_lines.append('    emit: sxEmit,')
     api_lines.append('    emitted: sxEmitted,')
+    if has_cek:
+        api_lines.append('    cekRun: cekRun,')
+        api_lines.append('    makeCekState: makeCekState,')
+        api_lines.append('    makeCekValue: makeCekValue,')
+        api_lines.append('    cekStep: cekStep,')
+        api_lines.append('    cekTerminal: cekTerminal_p,')
+        api_lines.append('    cekValue: cekValue,')
+        api_lines.append('    makeReactiveResetFrame: makeReactiveResetFrame,')
+        api_lines.append('    evalExpr: evalExpr,')
     api_lines.append(f'    _version: "{version}"')
     api_lines.append('  };')
     api_lines.append('')

hosts/javascript/run_tests.js

@@ -0,0 +1,320 @@
+#!/usr/bin/env node
+/**
+ * Run SX spec tests in Node.js using the bootstrapped evaluator.
+ *
+ * Usage:
+ *   node hosts/javascript/run_tests.js                    # all spec tests
+ *   node hosts/javascript/run_tests.js test-primitives    # specific test
+ */
+const fs = require("fs");
+const path = require("path");
+
+// Provide globals that sx-browser.js expects
+global.window = global;
+global.addEventListener = () => {};
+global.self = global;
+global.document = {
+  createElement: () => ({ style: {}, setAttribute: () => {}, appendChild: () => {}, children: [] }),
+  createDocumentFragment: () => ({ appendChild: () => {}, children: [], childNodes: [] }),
+  head: { appendChild: () => {} },
+  body: { appendChild: () => {} },
+  querySelector: () => null,
+  querySelectorAll: () => [],
+  createTextNode: (s) => ({ textContent: s }),
+  addEventListener: () => {},
+};
+global.localStorage = { getItem: () => null, setItem: () => {}, removeItem: () => {} };
+global.CustomEvent = class CustomEvent { constructor(n, o) { this.type = n; this.detail = (o||{}).detail||{}; } };
+global.MutationObserver = class { observe() {} disconnect() {} };
+global.requestIdleCallback = (fn) => setTimeout(fn, 0);
+global.matchMedia = () => ({ matches: false });
+global.navigator = { serviceWorker: { register: () => Promise.resolve() } };
+global.location = { href: "", pathname: "/", hostname: "localhost" };
+global.history = { pushState: () => {}, replaceState: () => {} };
+global.fetch = () => Promise.resolve({ ok: true, text: () => Promise.resolve("") });
+global.setTimeout = setTimeout;
+global.clearTimeout = clearTimeout;
+global.console = console;
+
+// Load the bootstrapped evaluator
+// Use --full flag to load a full-spec build (if available)
+const fullBuild = process.argv.includes("--full");
+const jsPath = fullBuild
+  ? path.join(__dirname, "..", "..", "shared", "static", "scripts", "sx-full-test.js")
+  : path.join(__dirname, "..", "..", "shared", "static", "scripts", "sx-browser.js");
+if (fullBuild && !fs.existsSync(jsPath)) {
+  console.error("Full test build not found. Run: python3 hosts/javascript/cli.py --extensions continuations --spec-modules types --output shared/static/scripts/sx-full-test.js");
+  process.exit(1);
+}
+const Sx = require(jsPath);
+if (!Sx || !Sx.parse) {
+  console.error("Failed to load Sx evaluator");
+  process.exit(1);
+}
+
+// Reset render mode — boot process may have set it to true
+if (Sx.setRenderActive) Sx.setRenderActive(false);
+
+// Test infrastructure
+let passCount = 0;
+let failCount = 0;
+const suiteStack = [];
+
+// Build env with all primitives + spec functions
+const env = Sx.getEnv ? Object.assign({}, Sx.getEnv()) : {};
+
+// Additional test helpers needed by spec tests
+env["sx-parse"] = function(s) { return Sx.parse(s); };
+env["sx-parse-one"] = function(s) { const r = Sx.parse(s); return r && r.length > 0 ? r[0] : null; };
+env["test-env"] = function() { return Sx.getEnv ? Object.assign({}, Sx.getEnv()) : {}; };
+env["cek-eval"] = function(s) {
+  const parsed = Sx.parse(s);
+  if (!parsed || parsed.length === 0) return null;
+  return Sx.eval(parsed[0], Sx.getEnv ? Object.assign({}, Sx.getEnv()) : {});
+};
+env["eval-expr-cek"] = function(expr, e) { return Sx.eval(expr, e || env); };
+env["env-get"] = function(e, k) { return e && e[k] !== undefined ? e[k] : null; };
+env["env-has?"] = function(e, k) { return e && k in e; };
+env["env-bind!"] = function(e, k, v) { if (e) e[k] = v; return v; };
+env["env-set!"] = function(e, k, v) { if (e) e[k] = v; return v; };
+env["env-extend"] = function(e) { return Object.create(e); };
+env["env-merge"] = function(a, b) { return Object.assign({}, a, b); };
+
+// Missing primitives referenced by tests
+env["upcase"] = function(s) { return s.toUpperCase(); };
+env["downcase"] = function(s) { return s.toLowerCase(); };
+env["make-keyword"] = function(name) { return new Sx.Keyword(name); };
+env["string-length"] = function(s) { return s.length; };
+env["dict-get"] = function(d, k) { return d && d[k] !== undefined ? d[k] : null; };
+env["apply"] = function(f) {
+  var args = Array.prototype.slice.call(arguments, 1);
+  var lastArg = args.pop();
+  if (Array.isArray(lastArg)) args = args.concat(lastArg);
+  return f.apply(null, args);
+};
+
+// Deep equality
+function deepEqual(a, b) {
+  if (a === b) return true;
+  if (a == null || b == null) return a == b;
+  if (typeof a !== typeof b) return false;
+  if (Array.isArray(a) && Array.isArray(b)) {
+    if (a.length !== b.length) return false;
+    return a.every((v, i) => deepEqual(v, b[i]));
+  }
+  if (typeof a === "object") {
+    const ka = Object.keys(a).filter(k => k !== "_nil");
+    const kb = Object.keys(b).filter(k => k !== "_nil");
+    if (ka.length !== kb.length) return false;
+    return ka.every(k => deepEqual(a[k], b[k]));
+  }
+  return false;
+}
+env["equal?"] = deepEqual;
+env["identical?"] = function(a, b) { return a === b; };
+
+// Continuation support
+env["make-continuation"] = function(fn) {
+  // Continuation must be callable as a function AND have _continuation flag
+  var c = function(v) { return fn(v !== undefined ? v : null); };
+  c._continuation = true;
+  c.fn = fn;
+  c.call = function(v) { return fn(v !== undefined ? v : null); };
+  return c;
+};
+env["continuation?"] = function(x) { return x != null && x._continuation === true; };
+env["continuation-fn"] = function(c) { return c.fn; };
+
+// Render helpers
+// render-html: the tests call this with an SX source string, parse it, and render to HTML
+// IMPORTANT: renderToHtml sets a global _renderMode flag but never resets it.
+// We must reset it after each call so subsequent eval calls don't go through the render path.
+env["render-html"] = function(src, e) {
+  var result;
+  if (typeof src === "string") {
+    var parsed = Sx.parse(src);
+    if (!parsed || parsed.length === 0) return "";
+    var expr = parsed.length === 1 ? parsed[0] : [{ name: "do" }].concat(parsed);
+    if (Sx.renderToHtml) {
+      result = Sx.renderToHtml(expr, e || (Sx.getEnv ? Object.assign({}, Sx.getEnv()) : {}));
+    } else {
+      result = Sx.serialize(expr);
+    }
+  } else {
+    if (Sx.renderToHtml) {
+      result = Sx.renderToHtml(src, e || env);
+    } else {
+      result = Sx.serialize(src);
+    }
+  }
+  // Reset render mode so subsequent eval calls don't go through DOM/HTML render path
+  if (Sx.setRenderActive) Sx.setRenderActive(false);
+  return result;
+};
+// Also register render-to-html directly
+env["render-to-html"] = env["render-html"];
+
+// Type system helpers — available when types module is included
+
+// test-prim-types: dict of primitive return types for type inference
+env["test-prim-types"] = function() {
+  return {
+    "+": "number", "-": "number", "*": "number", "/": "number",
+    "mod": "number", "inc": "number", "dec": "number",
+    "abs": "number", "min": "number", "max": "number",
+    "floor": "number", "ceil": "number", "round": "number",
+    "str": "string", "upper": "string", "lower": "string",
+    "trim": "string", "join": "string", "replace": "string",
+    "format": "string", "substr": "string",
+    "=": "boolean", "<": "boolean", ">": "boolean",
+    "<=": "boolean", ">=": "boolean", "!=": "boolean",
+    "not": "boolean", "nil?": "boolean", "empty?": "boolean",
+    "number?": "boolean", "string?": "boolean", "boolean?": "boolean",
+    "list?": "boolean", "dict?": "boolean", "symbol?": "boolean",
+    "keyword?": "boolean", "contains?": "boolean", "has-key?": "boolean",
+    "starts-with?": "boolean", "ends-with?": "boolean",
+    "len": "number", "first": "any", "rest": "list",
+    "last": "any", "nth": "any", "cons": "list",
+    "append": "list", "concat": "list", "reverse": "list",
+    "sort": "list", "slice": "list", "range": "list",
+    "flatten": "list", "keys": "list", "vals": "list",
+    "map-dict": "dict", "assoc": "dict", "dissoc": "dict",
+    "merge": "dict", "dict": "dict",
+    "get": "any", "type-of": "string",
+  };
+};
+
+// test-prim-param-types: dict of primitive param type specs
+env["test-prim-param-types"] = function() {
+  return {
+    "+": {"positional": [["a", "number"]], "rest-type": "number"},
+    "-": {"positional": [["a", "number"]], "rest-type": "number"},
+    "*": {"positional": [["a", "number"]], "rest-type": "number"},
+    "/": {"positional": [["a", "number"]], "rest-type": "number"},
+    "inc": {"positional": [["n", "number"]], "rest-type": null},
+    "dec": {"positional": [["n", "number"]], "rest-type": null},
+    "upper": {"positional": [["s", "string"]], "rest-type": null},
+    "lower": {"positional": [["s", "string"]], "rest-type": null},
+    "keys": {"positional": [["d", "dict"]], "rest-type": null},
+    "vals": {"positional": [["d", "dict"]], "rest-type": null},
+  };
+};
+
+// Component type accessors
+env["component-param-types"] = function(c) {
+  return c && c._paramTypes ? c._paramTypes : null;
+};
+env["component-set-param-types!"] = function(c, t) {
+  if (c) c._paramTypes = t;
+  return null;
+};
+env["component-params"] = function(c) {
+  return c && c.params ? c.params : null;
+};
+env["component-body"] = function(c) {
+  return c && c.body ? c.body : null;
+};
+env["component-has-children"] = function(c) {
+  return c && c.has_children ? c.has_children : false;
+};
+
+// Platform test functions
+env["try-call"] = function(thunk) {
+  try {
+    Sx.eval([thunk], env);
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e.message || String(e) };
+  }
+};
+
+env["report-pass"] = function(name) {
+  passCount++;
+  const ctx = suiteStack.join(" > ");
+  console.log(`  PASS: ${ctx} > ${name}`);
+  return null;
+};
+
+env["report-fail"] = function(name, error) {
+  failCount++;
+  const ctx = suiteStack.join(" > ");
+  console.log(`  FAIL: ${ctx} > ${name}: ${error}`);
+  return null;
+};
+
+env["push-suite"] = function(name) {
+  suiteStack.push(name);
+  console.log(`${"  ".repeat(suiteStack.length - 1)}Suite: ${name}`);
+  return null;
+};
+
+env["pop-suite"] = function() {
+  suiteStack.pop();
+  return null;
+};
+
+// Load test framework
+const projectDir = path.join(__dirname, "..", "..");
+const specTests = path.join(projectDir, "spec", "tests");
+const webTests = path.join(projectDir, "web", "tests");
+
+const frameworkSrc = fs.readFileSync(path.join(specTests, "test-framework.sx"), "utf8");
+const frameworkExprs = Sx.parse(frameworkSrc);
+for (const expr of frameworkExprs) {
+  Sx.eval(expr, env);
+}
+
+// Determine which tests to run
+const args = process.argv.slice(2).filter(a => !a.startsWith("--"));
+let testFiles = [];
+
+if (args.length > 0) {
+  // Specific test files
+  for (const arg of args) {
+    const name = arg.endsWith(".sx") ? arg : `${arg}.sx`;
+    const specPath = path.join(specTests, name);
+    const webPath = path.join(webTests, name);
+    if (fs.existsSync(specPath)) testFiles.push(specPath);
+    else if (fs.existsSync(webPath)) testFiles.push(webPath);
+    else console.error(`Test file not found: ${name}`);
+  }
+} else {
+  // Tests requiring optional modules (only run with --full)
+  const requiresFull = new Set(["test-continuations.sx", "test-types.sx", "test-freeze.sx"]);
+  // All spec tests
+  for (const f of fs.readdirSync(specTests).sort()) {
+    if (f.startsWith("test-") && f.endsWith(".sx") && f !== "test-framework.sx") {
+      if (!fullBuild && requiresFull.has(f)) {
+        console.log(`Skipping ${f} (requires --full)`);
+        continue;
+      }
+      testFiles.push(path.join(specTests, f));
+    }
+  }
+}
+
+// Run tests
+for (const testFile of testFiles) {
+  const name = path.basename(testFile);
+  console.log("=" .repeat(60));
+  console.log(`Running ${name}`);
+  console.log("=" .repeat(60));
+
+  try {
+    const src = fs.readFileSync(testFile, "utf8");
+    const exprs = Sx.parse(src);
+    for (const expr of exprs) {
+      Sx.eval(expr, env);
+    }
+  } catch (e) {
+    console.error(`ERROR in ${name}: ${e.message}`);
+    failCount++;
+  }
+}
+
+// Summary
+console.log("=" .repeat(60));
+console.log(`Results: ${passCount} passed, ${failCount} failed`);
+console.log("=" .repeat(60));
+
+process.exit(failCount > 0 ? 1 : 0);

hosts/javascript/transpiler.sx

@@ -87,12 +87,6 @@
   "signal-remove-sub!" "signalRemoveSub"
   "signal-deps" "signalDeps"
   "signal-set-deps!" "signalSetDeps"
-  "set-tracking-context!" "setTrackingContext"
-  "get-tracking-context" "getTrackingContext"
-  "make-tracking-context" "makeTrackingContext"
-  "tracking-context-deps" "trackingContextDeps"
-  "tracking-context-add-dep!" "trackingContextAddDep"
-  "tracking-context-notify-fn" "trackingContextNotifyFn"
   "identical?" "isIdentical"
   "notify-subscribers" "notifySubscribers"
   "flush-subscribers" "flushSubscribers"
@@ -101,7 +95,6 @@
   "register-in-scope" "registerInScope"
   "*batch-depth*" "_batchDepth"
   "*batch-queue*" "_batchQueue"
-  "*island-scope*" "_islandScope"
   "*store-registry*" "_storeRegistry"
   "def-store" "defStore"
   "use-store" "useStore"
@@ -114,6 +107,7 @@
   "get-primitive" "getPrimitive"
   "env-has?" "envHas"
   "env-get" "envGet"
+  "env-bind!" "envBind"
   "env-set!" "envSet"
   "env-extend" "envExtend"
   "env-merge" "envMerge"
@@ -221,6 +215,10 @@
   "render-dom-island" "renderDomIsland"
   "reactive-text" "reactiveText"
   "reactive-attr" "reactiveAttr"
+  "cek-reactive-text" "cekReactiveText"
+  "cek-reactive-attr" "cekReactiveAttr"
+  "*use-cek-reactive*" "_useCekReactive"
+  "enable-cek-reactive!" "enableCekReactive"
   "reactive-fragment" "reactiveFragment"
   "reactive-list" "reactiveList"
   "dom-create-element" "domCreateElement"
@@ -527,6 +525,82 @@
   "collect!" "sxCollect"
   "collected" "sxCollected"
   "clear-collected!" "sxClearCollected"
+  "make-cek-continuation" "makeCekContinuation"
+  "continuation-data" "continuationData"
+  "make-cek-state" "makeCekState"
+  "make-cek-value" "makeCekValue"
+  "cek-terminal?" "cekTerminal_p"
+  "cek-run" "cekRun"
+  "cek-step" "cekStep"
+  "cek-control" "cekControl"
+  "cek-env" "cekEnv"
+  "cek-kont" "cekKont"
+  "cek-phase" "cekPhase"
+  "cek-value" "cekValue"
+  "kont-push" "kontPush"
+  "kont-top" "kontTop"
+  "kont-pop" "kontPop"
+  "kont-empty?" "kontEmpty_p"
+  "kont-capture-to-reset" "kontCaptureToReset"
+  "kont-capture-to-reactive-reset" "kontCaptureToReactiveReset"
+  "has-reactive-reset-frame?" "hasReactiveResetFrame_p"
+  "frame-type" "frameType"
+  "make-if-frame" "makeIfFrame"
+  "make-when-frame" "makeWhenFrame"
+  "make-begin-frame" "makeBeginFrame"
+  "make-let-frame" "makeLetFrame"
+  "make-define-frame" "makeDefineFrame"
+  "make-set-frame" "makeSetFrame"
+  "make-arg-frame" "makeArgFrame"
+  "make-call-frame" "makeCallFrame"
+  "make-cond-frame" "makeCondFrame"
+  "make-case-frame" "makeCaseFrame"
+  "make-thread-frame" "makeThreadFrame"
+  "make-map-frame" "makeMapFrame"
+  "make-filter-frame" "makeFilterFrame"
+  "make-reduce-frame" "makeReduceFrame"
+  "make-for-each-frame" "makeForEachFrame"
+  "make-scope-frame" "makeScopeFrame"
+  "make-reset-frame" "makeResetFrame"
+  "make-dict-frame" "makeDictFrame"
+  "make-and-frame" "makeAndFrame"
+  "make-or-frame" "makeOrFrame"
+  "make-dynamic-wind-frame" "makeDynamicWindFrame"
+  "make-reactive-reset-frame" "makeReactiveResetFrame"
+  "make-deref-frame" "makeDerefFrame"
+  "step-eval" "stepEval"
+  "step-continue" "stepContinue"
+  "step-eval-list" "stepEvalList"
+  "step-eval-call" "stepEvalCall"
+  "step-sf-if" "stepSfIf"
+  "step-sf-when" "stepSfWhen"
+  "step-sf-begin" "stepSfBegin"
+  "step-sf-let" "stepSfLet"
+  "step-sf-define" "stepSfDefine"
+  "step-sf-set!" "stepSfSet"
+  "step-sf-and" "stepSfAnd"
+  "step-sf-or" "stepSfOr"
+  "step-sf-cond" "stepSfCond"
+  "step-sf-case" "stepSfCase"
+  "step-sf-thread-first" "stepSfThreadFirst"
+  "step-sf-lambda" "stepSfLambda"
+  "step-sf-scope" "stepSfScope"
+  "step-sf-provide" "stepSfProvide"
+  "step-sf-reset" "stepSfReset"
+  "step-sf-shift" "stepSfShift"
+  "step-sf-deref" "stepSfDeref"
+  "step-ho-map" "stepHoMap"
+  "step-ho-filter" "stepHoFilter"
+  "step-ho-reduce" "stepHoReduce"
+  "step-ho-for-each" "stepHoForEach"
+  "continue-with-call" "continueWithCall"
+  "sf-case-step-loop" "sfCaseStepLoop"
+  "eval-expr-cek" "evalExprCek"
+  "trampoline-cek" "trampolineCek"
+  "reactive-shift-deref" "reactiveShiftDeref"
+  "cond-scheme?" "condScheme_p"
+  "scope-push!" "scopePush"
+  "scope-pop!" "scopePop"
   "provide-push!" "providePush"
   "provide-pop!" "providePop"
   "context" "sxContext"
@@ -545,7 +619,7 @@
       (if (not (nil? renamed))
         renamed
         ;; General mangling rules
-        (let ((result name))
+        (let ((result (replace name "*" "_")))
           ;; Handle trailing ? and !
           (let ((result (cond
                   (ends-with? result "?")
@@ -582,7 +656,7 @@
   (fn ((s :as string))
     (str "\""
          (replace (replace (replace (replace (replace (replace
-           s "\\" "\\\\") "\"" "\\\"") "\n" "\\n") "\r" "\\r") "\t" "\\t") "\0" "\\0")
+           s "\\" "\\\\") "\"" "\\\"") "\n" "\\n") "\r" "\\r") "\t" "\\t") (char-from-code 0) "\\u0000")
          "\"")))
 
 
@@ -916,6 +990,11 @@
                    ", " (js-expr (nth args 1))
                    ", " (js-expr (nth args 2)) ")")
 
+            (= op "env-bind!")
+              (str "envBind(" (js-expr (nth args 0))
+                   ", " (js-expr (nth args 1))
+                   ", " (js-expr (nth args 2)) ")")
+
             (= op "env-set!")
               (str "envSet(" (js-expr (nth args 0))
                    ", " (js-expr (nth args 1))
@@ -1323,6 +1402,10 @@
                  "] = " (js-expr (nth expr 3)) ";")
           (= name "append!")
             (str (js-expr (nth expr 1)) ".push(" (js-expr (nth expr 2)) ");")
+          (= name "env-bind!")
+            (str "envBind(" (js-expr (nth expr 1))
+                 ", " (js-expr (nth expr 2))
+                 ", " (js-expr (nth expr 3)) ");")
           (= name "env-set!")
             (str "envSet(" (js-expr (nth expr 1))
                  ", " (js-expr (nth expr 2))
@@ -1349,23 +1432,27 @@
                              (= (keyword-name (nth expr 2)) "effects"))
                       (nth expr 4)
                       (nth expr 2))))
-      (if (nil? val-expr)
-        (str "var " (js-mangle name) " = NIL;")
-        ;; Detect zero-arg self-tail-recursive functions → while loops
-        (if (and (list? val-expr)
-                 (not (empty? val-expr))
-                 (= (type-of (first val-expr)) "symbol")
-                 (or (= (symbol-name (first val-expr)) "fn")
-                     (= (symbol-name (first val-expr)) "lambda"))
-                 (list? (nth val-expr 1))
-                 (= (len (nth val-expr 1)) 0)
-                 (js-is-self-tail-recursive? name (rest (rest val-expr))))
-          ;; While loop optimization
-          (let ((body (rest (rest val-expr)))
-                (loop-body (js-emit-loop-body name body)))
-            (str "var " (js-mangle name) " = function() { while(true) { " loop-body " } };"))
-          ;; Normal define
-          (str "var " (js-mangle name) " = " (js-expr val-expr) ";"))))))
+      (let ((mangled (js-mangle name))
+            (var-decl
+              (if (nil? val-expr)
+                (str "var " (js-mangle name) " = NIL;")
+                ;; Detect zero-arg self-tail-recursive functions → while loops
+                (if (and (list? val-expr)
+                         (not (empty? val-expr))
+                         (= (type-of (first val-expr)) "symbol")
+                         (or (= (symbol-name (first val-expr)) "fn")
+                             (= (symbol-name (first val-expr)) "lambda"))
+                         (list? (nth val-expr 1))
+                         (= (len (nth val-expr 1)) 0)
+                         (js-is-self-tail-recursive? name (rest (rest val-expr))))
+                  ;; While loop optimization
+                  (let ((body (rest (rest val-expr)))
+                        (loop-body (js-emit-loop-body name body)))
+                    (str "var " mangled " = function() { while(true) { " loop-body " } };"))
+                  ;; Normal define
+                  (str "var " mangled " = " (js-expr val-expr) ";")))))
+        ;; Self-register: every spec define is available to evaluated SX code
+        (str var-decl "\nPRIMITIVES[\"" name "\"] = " mangled ";")))))
 
 
 ;; --------------------------------------------------------------------------

hosts/ocaml/bin/debug_set.ml

@@ -0,0 +1,36 @@
+module T = Sx_types
+module P = Sx_parser
+module R = Sx_ref
+open T
+
+let () =
+  let env = T.make_env () in
+  let eval src =
+    let exprs = P.parse_all src in
+    let result = ref Nil in
+    List.iter (fun e -> result := R.eval_expr e (Env env)) exprs;
+    !result
+  in
+  (* Test 1: basic set! in closure *)
+  let r = eval "(let ((x 0)) (set! x 42) x)" in
+  Printf.printf "basic set!: %s (expect 42)\n%!" (T.inspect r);
+
+  (* Test 2: set! through lambda call *)
+  let r = eval "(let ((x 0)) (let ((f (fn () (set! x 99)))) (f) x))" in
+  Printf.printf "set! via lambda: %s (expect 99)\n%!" (T.inspect r);
+
+  (* Test 3: counter pattern *)
+  let r = eval "(do (define make-counter (fn () (let ((c 0)) (fn () (set! c (+ c 1)) c)))) (let ((counter (make-counter))) (counter) (counter) (counter)))" in
+  Printf.printf "counter: %s (expect 3)\n%!" (T.inspect r);
+
+  (* Test 4: set! in for-each *)
+  let r = eval "(let ((total 0)) (for-each (fn (n) (set! total (+ total n))) (list 1 2 3 4 5)) total)" in
+  Printf.printf "set! in for-each: %s (expect 15)\n%!" (T.inspect r);
+
+  (* Test 5: append! in for-each *)
+  ignore (T.env_bind env "append!" (NativeFn ("append!", fun args ->
+    match args with
+    | [List items; v] -> List (items @ [v])
+    | _ -> raise (Eval_error "append!: expected list and value"))));
+  let r = eval "(let ((log (list))) (for-each (fn (x) (append! log x)) (list 1 2 3)) log)" in
+  Printf.printf "append! in for-each: %s (expect (1 2 3))\n%!" (T.inspect r)

hosts/ocaml/bin/dune

@@ -0,0 +1,3 @@
+(executables
+ (names run_tests debug_set sx_server)
+ (libraries sx))

hosts/ocaml/bin/dune_debug

@@ -0,0 +1 @@
+(executable (name debug_macro) (libraries sx))

hosts/ocaml/bin/run_tests.ml

@@ -0,0 +1,694 @@
+(** Test runner — runs the SX spec test suite against the transpiled CEK evaluator.
+
+    Provides the 5 platform functions required by test-framework.sx:
+      try-call, report-pass, report-fail, push-suite, pop-suite
+
+    Plus test helpers: sx-parse, cek-eval, env-*, equal?, etc.
+
+    Usage:
+      dune exec bin/run_tests.exe                    # foundation + spec tests
+      dune exec bin/run_tests.exe -- test-primitives  # specific test
+      dune exec bin/run_tests.exe -- --foundation     # foundation only *)
+
+open Sx_types
+open Sx_parser
+open Sx_primitives
+open Sx_runtime
+open Sx_ref
+
+(* ====================================================================== *)
+(* Test state                                                              *)
+(* ====================================================================== *)
+
+let pass_count = ref 0
+let fail_count = ref 0
+let suite_stack : string list ref = ref []
+
+(* ====================================================================== *)
+(* Deep equality — SX structural comparison                                *)
+(* ====================================================================== *)
+
+let rec deep_equal a b =
+  match a, b with
+  | Nil, Nil -> true
+  | Bool a, Bool b -> a = b
+  | Number a, Number b -> a = b
+  | String a, String b -> a = b
+  | Symbol a, Symbol b -> a = b
+  | Keyword a, Keyword b -> a = b
+  | (List a | ListRef { contents = a }), (List b | ListRef { contents = b }) ->
+    List.length a = List.length b &&
+    List.for_all2 deep_equal a b
+  | Dict a, Dict b ->
+    let ka = Hashtbl.fold (fun k _ acc -> k :: acc) a [] in
+    let kb = Hashtbl.fold (fun k _ acc -> k :: acc) b [] in
+    List.length ka = List.length kb &&
+    List.for_all (fun k ->
+      Hashtbl.mem b k &&
+      deep_equal
+        (match Hashtbl.find_opt a k with Some v -> v | None -> Nil)
+        (match Hashtbl.find_opt b k with Some v -> v | None -> Nil)) ka
+  | Lambda _, Lambda _ -> a == b  (* identity *)
+  | NativeFn _, NativeFn _ -> a == b
+  | _ -> false
+
+(* ====================================================================== *)
+(* Build evaluator environment with test platform functions                *)
+(* ====================================================================== *)
+
+let make_test_env () =
+  let env = Sx_types.make_env () in
+
+  let bind name fn =
+    ignore (Sx_types.env_bind env name (NativeFn (name, fn)))
+  in
+
+  (* --- 5 platform functions required by test-framework.sx --- *)
+
+  bind "try-call" (fun args ->
+    match args with
+    | [thunk] ->
+      (try
+        (* Call the thunk: it's a lambda with no params *)
+        let result = eval_expr (List [thunk]) (Env env) in
+        ignore result;
+        let d = Hashtbl.create 2 in
+        Hashtbl.replace d "ok" (Bool true);
+        Dict d
+      with
+      | Eval_error msg ->
+        let d = Hashtbl.create 2 in
+        Hashtbl.replace d "ok" (Bool false);
+        Hashtbl.replace d "error" (String msg);
+        Dict d
+      | exn ->
+        let d = Hashtbl.create 2 in
+        Hashtbl.replace d "ok" (Bool false);
+        Hashtbl.replace d "error" (String (Printexc.to_string exn));
+        Dict d)
+    | _ -> raise (Eval_error "try-call: expected 1 arg"));
+
+  bind "report-pass" (fun args ->
+    match args with
+    | [String name] ->
+      incr pass_count;
+      let ctx = String.concat " > " (List.rev !suite_stack) in
+      Printf.printf "  PASS: %s > %s\n%!" ctx name;
+      Nil
+    | [v] ->
+      incr pass_count;
+      let ctx = String.concat " > " (List.rev !suite_stack) in
+      Printf.printf "  PASS: %s > %s\n%!" ctx (Sx_types.inspect v);
+      Nil
+    | _ -> raise (Eval_error "report-pass: expected 1 arg"));
+
+  bind "report-fail" (fun args ->
+    match args with
+    | [String name; String error] ->
+      incr fail_count;
+      let ctx = String.concat " > " (List.rev !suite_stack) in
+      Printf.printf "  FAIL: %s > %s: %s\n%!" ctx name error;
+      Nil
+    | [name_v; error_v] ->
+      incr fail_count;
+      let ctx = String.concat " > " (List.rev !suite_stack) in
+      Printf.printf "  FAIL: %s > %s: %s\n%!" ctx
+        (Sx_types.value_to_string name_v)
+        (Sx_types.value_to_string error_v);
+      Nil
+    | _ -> raise (Eval_error "report-fail: expected 2 args"));
+
+  bind "push-suite" (fun args ->
+    match args with
+    | [String name] ->
+      suite_stack := name :: !suite_stack;
+      let indent = String.make ((List.length !suite_stack - 1) * 2) ' ' in
+      Printf.printf "%sSuite: %s\n%!" indent name;
+      Nil
+    | [v] ->
+      let name = Sx_types.value_to_string v in
+      suite_stack := name :: !suite_stack;
+      let indent = String.make ((List.length !suite_stack - 1) * 2) ' ' in
+      Printf.printf "%sSuite: %s\n%!" indent name;
+      Nil
+    | _ -> raise (Eval_error "push-suite: expected 1 arg"));
+
+  bind "pop-suite" (fun _args ->
+    suite_stack := (match !suite_stack with _ :: t -> t | [] -> []);
+    Nil);
+
+  (* --- Test helpers --- *)
+
+  bind "sx-parse" (fun args ->
+    match args with
+    | [String s] -> List (parse_all s)
+    | _ -> raise (Eval_error "sx-parse: expected string"));
+
+  bind "sx-parse-one" (fun args ->
+    match args with
+    | [String s] ->
+      let exprs = parse_all s in
+      (match exprs with e :: _ -> e | [] -> Nil)
+    | _ -> raise (Eval_error "sx-parse-one: expected string"));
+
+  bind "cek-eval" (fun args ->
+    match args with
+    | [String s] ->
+      let exprs = parse_all s in
+      (match exprs with
+       | e :: _ -> eval_expr e (Env env)
+       | [] -> Nil)
+    | _ -> raise (Eval_error "cek-eval: expected string"));
+
+  bind "eval-expr-cek" (fun args ->
+    match args with
+    | [expr; e] -> eval_expr expr e
+    | [expr] -> eval_expr expr (Env env)
+    | _ -> raise (Eval_error "eval-expr-cek: expected 1-2 args"));
+
+  bind "test-env" (fun _args -> Env (Sx_types.env_extend env));
+
+  (* --- Environment operations --- *)
+
+  bind "env-get" (fun args ->
+    match args with
+    | [Env e; String k] -> Sx_types.env_get e k
+    | [Env e; Keyword k] -> Sx_types.env_get e k
+    | _ -> raise (Eval_error "env-get: expected env and string"));
+
+  bind "env-has?" (fun args ->
+    match args with
+    | [Env e; String k] -> Bool (Sx_types.env_has e k)
+    | [Env e; Keyword k] -> Bool (Sx_types.env_has e k)
+    | _ -> raise (Eval_error "env-has?: expected env and string"));
+
+  bind "env-bind!" (fun args ->
+    match args with
+    | [Env e; String k; v] -> Sx_types.env_bind e k v
+    | [Env e; Keyword k; v] -> Sx_types.env_bind e k v
+    | _ -> raise (Eval_error "env-bind!: expected env, key, value"));
+
+  bind "env-set!" (fun args ->
+    match args with
+    | [Env e; String k; v] -> Sx_types.env_set e k v
+    | [Env e; Keyword k; v] -> Sx_types.env_set e k v
+    | _ -> raise (Eval_error "env-set!: expected env, key, value"));
+
+  bind "env-extend" (fun args ->
+    match args with
+    | [Env e] -> Env (Sx_types.env_extend e)
+    | _ -> raise (Eval_error "env-extend: expected env"));
+
+  bind "env-merge" (fun args ->
+    match args with
+    | [Env a; Env b] -> Env (Sx_types.env_merge a b)
+    | _ -> raise (Eval_error "env-merge: expected 2 envs"));
+
+  (* --- Equality --- *)
+
+  bind "equal?" (fun args ->
+    match args with
+    | [a; b] -> Bool (deep_equal a b)
+    | _ -> raise (Eval_error "equal?: expected 2 args"));
+
+  bind "identical?" (fun args ->
+    match args with
+    | [a; b] -> Bool (a == b)
+    | _ -> raise (Eval_error "identical?: expected 2 args"));
+
+  (* --- Continuation support --- *)
+
+  bind "make-continuation" (fun args ->
+    match args with
+    | [f] ->
+      let k v = sx_call f [v] in
+      Continuation (k, None)
+    | _ -> raise (Eval_error "make-continuation: expected 1 arg"));
+
+  bind "continuation?" (fun args ->
+    match args with
+    | [Continuation _] -> Bool true
+    | [_] -> Bool false
+    | _ -> raise (Eval_error "continuation?: expected 1 arg"));
+
+  bind "continuation-fn" (fun args ->
+    match args with
+    | [Continuation (f, _)] -> NativeFn ("continuation-fn-result", fun args ->
+        match args with [v] -> f v | _ -> f Nil)
+    | _ -> raise (Eval_error "continuation-fn: expected continuation"));
+
+  (* --- Core builtins used by test framework / test code --- *)
+
+  bind "assert" (fun args ->
+    match args with
+    | [cond] ->
+      if not (sx_truthy cond) then raise (Eval_error "Assertion failed");
+      Bool true
+    | [cond; String msg] ->
+      if not (sx_truthy cond) then raise (Eval_error ("Assertion error: " ^ msg));
+      Bool true
+    | [cond; msg] ->
+      if not (sx_truthy cond) then
+        raise (Eval_error ("Assertion error: " ^ Sx_types.value_to_string msg));
+      Bool true
+    | _ -> raise (Eval_error "assert: expected 1-2 args"));
+
+  bind "append!" (fun args ->
+    match args with
+    | [ListRef r; v] -> r := !r @ [v]; ListRef r  (* mutate in place *)
+    | [List items; v] -> List (items @ [v])  (* immutable fallback *)
+    | _ -> raise (Eval_error "append!: expected list and value"));
+
+  (* --- HTML Renderer (from sx_render.ml library module) --- *)
+  Sx_render.setup_render_env env;
+
+  (* --- Missing primitives referenced by tests --- *)
+
+  bind "upcase" (fun args ->
+    match args with
+    | [String s] -> String (String.uppercase_ascii s)
+    | _ -> raise (Eval_error "upcase: expected string"));
+
+  bind "downcase" (fun args ->
+    match args with
+    | [String s] -> String (String.lowercase_ascii s)
+    | _ -> raise (Eval_error "downcase: expected string"));
+
+  bind "make-keyword" (fun args ->
+    match args with
+    | [String s] -> Keyword s
+    | _ -> raise (Eval_error "make-keyword: expected string"));
+
+  bind "string-length" (fun args ->
+    match args with
+    | [String s] -> Number (float_of_int (String.length s))
+    | _ -> raise (Eval_error "string-length: expected string"));
+
+  bind "dict-get" (fun args ->
+    match args with
+    | [Dict d; String k] -> Sx_types.dict_get d k
+    | [Dict d; Keyword k] -> Sx_types.dict_get d k
+    | _ -> raise (Eval_error "dict-get: expected dict and key"));
+
+  bind "apply" (fun args ->
+    match args with
+    | f :: rest ->
+      let all_args = match List.rev rest with
+        | List last :: prefix -> List.rev prefix @ last
+        | _ -> rest
+      in
+      sx_call f all_args
+    | _ -> raise (Eval_error "apply: expected function and args"));
+
+  (* --- Type system helpers (for --full tests) --- *)
+
+  bind "test-prim-types" (fun _args ->
+    let d = Hashtbl.create 40 in
+    List.iter (fun (k, v) -> Hashtbl.replace d k (String v)) [
+      "+", "number"; "-", "number"; "*", "number"; "/", "number";
+      "mod", "number"; "inc", "number"; "dec", "number";
+      "abs", "number"; "min", "number"; "max", "number";
+      "floor", "number"; "ceil", "number"; "round", "number";
+      "str", "string"; "upper", "string"; "lower", "string";
+      "trim", "string"; "join", "string"; "replace", "string";
+      "format", "string"; "substr", "string";
+      "=", "boolean"; "<", "boolean"; ">", "boolean";
+      "<=", "boolean"; ">=", "boolean"; "!=", "boolean";
+      "not", "boolean"; "nil?", "boolean"; "empty?", "boolean";
+      "number?", "boolean"; "string?", "boolean"; "boolean?", "boolean";
+      "list?", "boolean"; "dict?", "boolean"; "symbol?", "boolean";
+      "keyword?", "boolean"; "contains?", "boolean"; "has-key?", "boolean";
+      "starts-with?", "boolean"; "ends-with?", "boolean";
+      "len", "number"; "first", "any"; "rest", "list";
+      "last", "any"; "nth", "any"; "cons", "list";
+      "append", "list"; "concat", "list"; "reverse", "list";
+      "sort", "list"; "slice", "list"; "range", "list";
+      "flatten", "list"; "keys", "list"; "vals", "list";
+      "map-dict", "dict"; "assoc", "dict"; "dissoc", "dict";
+      "merge", "dict"; "dict", "dict";
+      "get", "any"; "type-of", "string";
+    ];
+    Dict d);
+
+  bind "test-prim-param-types" (fun _args ->
+    let d = Hashtbl.create 10 in
+    let pos name typ =
+      let d2 = Hashtbl.create 2 in
+      Hashtbl.replace d2 "positional" (List [List [String name; String typ]]);
+      Hashtbl.replace d2 "rest-type" Nil;
+      Dict d2
+    in
+    let pos_rest name typ rt =
+      let d2 = Hashtbl.create 2 in
+      Hashtbl.replace d2 "positional" (List [List [String name; String typ]]);
+      Hashtbl.replace d2 "rest-type" (String rt);
+      Dict d2
+    in
+    Hashtbl.replace d "+" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "-" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "*" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "/" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "inc" (pos "n" "number");
+    Hashtbl.replace d "dec" (pos "n" "number");
+    Hashtbl.replace d "upper" (pos "s" "string");
+    Hashtbl.replace d "lower" (pos "s" "string");
+    Hashtbl.replace d "keys" (pos "d" "dict");
+    Hashtbl.replace d "vals" (pos "d" "dict");
+    Dict d);
+
+  (* --- Component accessors --- *)
+
+  bind "component-param-types" (fun _args -> Nil);
+
+  bind "component-set-param-types!" (fun _args -> Nil);
+
+  bind "component-params" (fun args ->
+    match args with
+    | [Component c] -> List (List.map (fun s -> String s) c.c_params)
+    | _ -> Nil);
+
+  bind "component-body" (fun args ->
+    match args with
+    | [Component c] -> c.c_body
+    | _ -> Nil);
+
+  bind "component-has-children" (fun args ->
+    match args with
+    | [Component c] -> Bool c.c_has_children
+    | _ -> Bool false);
+
+  bind "component-affinity" (fun args ->
+    match args with
+    | [Component c] -> String c.c_affinity
+    | _ -> String "auto");
+
+  (* --- Parser test helpers --- *)
+
+  bind "keyword-name" (fun args ->
+    match args with
+    | [Keyword k] -> String k
+    | _ -> raise (Eval_error "keyword-name: expected keyword"));
+
+  bind "symbol-name" (fun args ->
+    match args with
+    | [Symbol s] -> String s
+    | _ -> raise (Eval_error "symbol-name: expected symbol"));
+
+  bind "sx-serialize" (fun args ->
+    match args with
+    | [v] -> String (Sx_types.inspect v)
+    | _ -> raise (Eval_error "sx-serialize: expected 1 arg"));
+
+  (* --- make-symbol --- *)
+
+  bind "make-symbol" (fun args ->
+    match args with
+    | [String s] -> Symbol s
+    | [v] -> Symbol (Sx_types.value_to_string v)
+    | _ -> raise (Eval_error "make-symbol: expected 1 arg"));
+
+  (* --- CEK stepping / introspection --- *)
+
+  bind "make-cek-state" (fun args ->
+    match args with
+    | [ctrl; env'; kont] -> Sx_ref.make_cek_state ctrl env' kont
+    | _ -> raise (Eval_error "make-cek-state: expected 3 args"));
+
+  bind "cek-step" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_step state
+    | _ -> raise (Eval_error "cek-step: expected 1 arg"));
+
+  bind "cek-phase" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_phase state
+    | _ -> raise (Eval_error "cek-phase: expected 1 arg"));
+
+  bind "cek-value" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_value state
+    | _ -> raise (Eval_error "cek-value: expected 1 arg"));
+
+  bind "cek-terminal?" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_terminal_p state
+    | _ -> raise (Eval_error "cek-terminal?: expected 1 arg"));
+
+  bind "cek-kont" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_kont state
+    | _ -> raise (Eval_error "cek-kont: expected 1 arg"));
+
+  bind "frame-type" (fun args ->
+    match args with
+    | [frame] -> Sx_ref.frame_type frame
+    | _ -> raise (Eval_error "frame-type: expected 1 arg"));
+
+  (* --- Strict mode --- *)
+  (* *strict* is a plain value in the env, mutated via env_set by set-strict! *)
+  ignore (Sx_types.env_bind env "*strict*" (Bool false));
+  ignore (Sx_types.env_bind env "*prim-param-types*" Nil);
+
+  bind "set-strict!" (fun args ->
+    match args with
+    | [v] ->
+      Sx_ref._strict_ref := v;
+      ignore (Sx_types.env_set env "*strict*" v); Nil
+    | _ -> raise (Eval_error "set-strict!: expected 1 arg"));
+
+  bind "set-prim-param-types!" (fun args ->
+    match args with
+    | [v] ->
+      Sx_ref._prim_param_types_ref := v;
+      ignore (Sx_types.env_set env "*prim-param-types*" v); Nil
+    | _ -> raise (Eval_error "set-prim-param-types!: expected 1 arg"));
+
+  bind "value-matches-type?" (fun args ->
+    match args with
+    | [v; String expected] -> Sx_ref.value_matches_type_p v (String expected)
+    | _ -> raise (Eval_error "value-matches-type?: expected value and type string"));
+
+  env
+
+(* ====================================================================== *)
+(* Foundation tests (direct, no evaluator)                                 *)
+(* ====================================================================== *)
+
+let run_foundation_tests () =
+  Printf.printf "=== SX OCaml Foundation Tests ===\n\n";
+
+  let assert_eq name expected actual =
+    if deep_equal expected actual then begin
+      incr pass_count;
+      Printf.printf "  PASS: %s\n" name
+    end else begin
+      incr fail_count;
+      Printf.printf "  FAIL: %s — expected %s, got %s\n" name
+        (Sx_types.inspect expected) (Sx_types.inspect actual)
+    end
+  in
+  let assert_true name v =
+    if sx_truthy v then begin
+      incr pass_count;
+      Printf.printf "  PASS: %s\n" name
+    end else begin
+      incr fail_count;
+      Printf.printf "  FAIL: %s — expected truthy, got %s\n" name (Sx_types.inspect v)
+    end
+  in
+  let call name args =
+    match Hashtbl.find_opt primitives name with
+    | Some f -> f args
+    | None -> failwith ("Unknown primitive: " ^ name)
+  in
+
+  Printf.printf "Suite: parser\n";
+  assert_eq "number" (Number 42.0) (List.hd (parse_all "42"));
+  assert_eq "string" (String "hello") (List.hd (parse_all "\"hello\""));
+  assert_eq "bool true" (Bool true) (List.hd (parse_all "true"));
+  assert_eq "nil" Nil (List.hd (parse_all "nil"));
+  assert_eq "keyword" (Keyword "class") (List.hd (parse_all ":class"));
+  assert_eq "symbol" (Symbol "foo") (List.hd (parse_all "foo"));
+  assert_eq "list" (List [Symbol "+"; Number 1.0; Number 2.0]) (List.hd (parse_all "(+ 1 2)"));
+  (match List.hd (parse_all "(div :class \"card\" (p \"hi\"))") with
+   | List [Symbol "div"; Keyword "class"; String "card"; List [Symbol "p"; String "hi"]] ->
+     incr pass_count; Printf.printf "  PASS: nested list\n"
+   | v -> incr fail_count; Printf.printf "  FAIL: nested list — got %s\n" (Sx_types.inspect v));
+  (match List.hd (parse_all "'(1 2 3)") with
+   | List [Symbol "quote"; List [Number 1.0; Number 2.0; Number 3.0]] ->
+     incr pass_count; Printf.printf "  PASS: quote sugar\n"
+   | v -> incr fail_count; Printf.printf "  FAIL: quote sugar — got %s\n" (Sx_types.inspect v));
+  (match List.hd (parse_all "{:a 1 :b 2}") with
+   | Dict d when dict_has d "a" && dict_has d "b" ->
+     incr pass_count; Printf.printf "  PASS: dict literal\n"
+   | v -> incr fail_count; Printf.printf "  FAIL: dict literal — got %s\n" (Sx_types.inspect v));
+  assert_eq "comment" (Number 42.0) (List.hd (parse_all ";; comment\n42"));
+  assert_eq "string escape" (String "hello\nworld") (List.hd (parse_all "\"hello\\nworld\""));
+  assert_eq "multiple exprs" (Number 2.0) (Number (float_of_int (List.length (parse_all "(1 2 3) (4 5)"))));
+
+  Printf.printf "\nSuite: primitives\n";
+  assert_eq "+" (Number 6.0) (call "+" [Number 1.0; Number 2.0; Number 3.0]);
+  assert_eq "-" (Number 3.0) (call "-" [Number 5.0; Number 2.0]);
+  assert_eq "*" (Number 12.0) (call "*" [Number 3.0; Number 4.0]);
+  assert_eq "/" (Number 2.5) (call "/" [Number 5.0; Number 2.0]);
+  assert_eq "mod" (Number 1.0) (call "mod" [Number 5.0; Number 2.0]);
+  assert_eq "inc" (Number 6.0) (call "inc" [Number 5.0]);
+  assert_eq "abs" (Number 5.0) (call "abs" [Number (-5.0)]);
+  assert_true "=" (call "=" [Number 1.0; Number 1.0]);
+  assert_true "!=" (call "!=" [Number 1.0; Number 2.0]);
+  assert_true "<" (call "<" [Number 1.0; Number 2.0]);
+  assert_true ">" (call ">" [Number 2.0; Number 1.0]);
+  assert_true "nil?" (call "nil?" [Nil]);
+  assert_true "number?" (call "number?" [Number 1.0]);
+  assert_true "string?" (call "string?" [String "hi"]);
+  assert_true "list?" (call "list?" [List [Number 1.0]]);
+  assert_true "empty? list" (call "empty?" [List []]);
+  assert_true "empty? string" (call "empty?" [String ""]);
+  assert_eq "str" (String "hello42") (call "str" [String "hello"; Number 42.0]);
+  assert_eq "upper" (String "HI") (call "upper" [String "hi"]);
+  assert_eq "trim" (String "hi") (call "trim" [String "  hi  "]);
+  assert_eq "join" (String "a,b,c") (call "join" [String ","; List [String "a"; String "b"; String "c"]]);
+  assert_true "starts-with?" (call "starts-with?" [String "hello"; String "hel"]);
+  assert_true "contains?" (call "contains?" [List [Number 1.0; Number 2.0; Number 3.0]; Number 2.0]);
+  assert_eq "list" (List [Number 1.0; Number 2.0]) (call "list" [Number 1.0; Number 2.0]);
+  assert_eq "len" (Number 3.0) (call "len" [List [Number 1.0; Number 2.0; Number 3.0]]);
+  assert_eq "first" (Number 1.0) (call "first" [List [Number 1.0; Number 2.0]]);
+  assert_eq "rest" (List [Number 2.0; Number 3.0]) (call "rest" [List [Number 1.0; Number 2.0; Number 3.0]]);
+  assert_eq "nth" (Number 2.0) (call "nth" [List [Number 1.0; Number 2.0]; Number 1.0]);
+  assert_eq "cons" (List [Number 0.0; Number 1.0]) (call "cons" [Number 0.0; List [Number 1.0]]);
+  assert_eq "append" (List [Number 1.0; Number 2.0; Number 3.0])
+    (call "append" [List [Number 1.0]; List [Number 2.0; Number 3.0]]);
+  assert_eq "reverse" (List [Number 3.0; Number 2.0; Number 1.0])
+    (call "reverse" [List [Number 1.0; Number 2.0; Number 3.0]]);
+  assert_eq "range" (List [Number 0.0; Number 1.0; Number 2.0]) (call "range" [Number 3.0]);
+  assert_eq "slice" (List [Number 2.0; Number 3.0])
+    (call "slice" [List [Number 1.0; Number 2.0; Number 3.0]; Number 1.0]);
+  assert_eq "type-of" (String "number") (call "type-of" [Number 1.0]);
+  assert_eq "type-of nil" (String "nil") (call "type-of" [Nil]);
+
+  Printf.printf "\nSuite: env\n";
+  let e = Sx_types.make_env () in
+  ignore (Sx_types.env_bind e "x" (Number 42.0));
+  assert_eq "env-bind + get" (Number 42.0) (Sx_types.env_get e "x");
+  assert_true "env-has" (Bool (Sx_types.env_has e "x"));
+  let child = Sx_types.env_extend e in
+  ignore (Sx_types.env_bind child "y" (Number 10.0));
+  assert_eq "child sees parent" (Number 42.0) (Sx_types.env_get child "x");
+  assert_eq "child own binding" (Number 10.0) (Sx_types.env_get child "y");
+  ignore (Sx_types.env_set child "x" (Number 99.0));
+  assert_eq "set! walks chain" (Number 99.0) (Sx_types.env_get e "x");
+
+  Printf.printf "\nSuite: types\n";
+  assert_true "sx_truthy true" (Bool (sx_truthy (Bool true)));
+  assert_true "sx_truthy 0" (Bool (sx_truthy (Number 0.0)));
+  assert_true "sx_truthy \"\"" (Bool (sx_truthy (String "")));
+  assert_eq "not truthy nil" (Bool false) (Bool (sx_truthy Nil));
+  assert_eq "not truthy false" (Bool false) (Bool (sx_truthy (Bool false)));
+  let l = { l_params = ["x"]; l_body = Symbol "x"; l_closure = Sx_types.make_env (); l_name = None } in
+  assert_true "is_lambda" (Bool (Sx_types.is_lambda (Lambda l)));
+  ignore (Sx_types.set_lambda_name (Lambda l) "my-fn");
+  assert_eq "lambda name mutated" (String "my-fn") (lambda_name (Lambda l))
+
+
+(* ====================================================================== *)
+(* Spec test runner                                                        *)
+(* ====================================================================== *)
+
+let run_spec_tests env test_files =
+  (* Find project root: walk up from cwd until we find spec/tests *)
+  let rec find_root dir =
+    let candidate = Filename.concat dir "spec/tests" in
+    if Sys.file_exists candidate then dir
+    else
+      let parent = Filename.dirname dir in
+      if parent = dir then Sys.getcwd ()  (* reached filesystem root *)
+      else find_root parent
+  in
+  let project_dir = find_root (Sys.getcwd ()) in
+  let spec_tests_dir = Filename.concat project_dir "spec/tests" in
+  let framework_path = Filename.concat spec_tests_dir "test-framework.sx" in
+
+  if not (Sys.file_exists framework_path) then begin
+    Printf.eprintf "test-framework.sx not found at %s\n" framework_path;
+    Printf.eprintf "Run from the project root directory.\n";
+    exit 1
+  end;
+
+  let load_and_eval path =
+    let ic = open_in path in
+    let n = in_channel_length ic in
+    let s = Bytes.create n in
+    really_input ic s 0 n;
+    close_in ic;
+    let src = Bytes.to_string s in
+    let exprs = parse_all src in
+    List.iter (fun expr ->
+      ignore (eval_expr expr (Env env))
+    ) exprs
+  in
+
+  Printf.printf "\nLoading test framework...\n%!";
+  load_and_eval framework_path;
+
+  (* Determine test files *)
+  let files = if test_files = [] then begin
+    let entries = Sys.readdir spec_tests_dir in
+    Array.sort String.compare entries;
+    let requires_full = ["test-continuations.sx"; "test-types.sx"; "test-freeze.sx";
+                          "test-continuations-advanced.sx"; "test-signals-advanced.sx"] in
+    Array.to_list entries
+    |> List.filter (fun f ->
+      String.length f > 5 &&
+      String.sub f 0 5 = "test-" &&
+      Filename.check_suffix f ".sx" &&
+      f <> "test-framework.sx" &&
+      not (List.mem f requires_full))
+  end else
+    List.map (fun name ->
+      if Filename.check_suffix name ".sx" then name
+      else name ^ ".sx") test_files
+  in
+
+  List.iter (fun name ->
+    let path = Filename.concat spec_tests_dir name in
+    if Sys.file_exists path then begin
+      Printf.printf "\n%s\n" (String.make 60 '=');
+      Printf.printf "Running %s\n" name;
+      Printf.printf "%s\n%!" (String.make 60 '=');
+      (try
+        load_and_eval path
+      with
+      | Eval_error msg ->
+        incr fail_count;
+        Printf.printf "  ERROR in %s: %s\n%!" name msg
+      | exn ->
+        incr fail_count;
+        Printf.printf "  ERROR in %s: %s\n%!" name (Printexc.to_string exn))
+    end else
+      Printf.eprintf "Test file not found: %s\n" path
+  ) files
+
+
+(* ====================================================================== *)
+(* Main                                                                    *)
+(* ====================================================================== *)
+
+let () =
+  let args = Array.to_list Sys.argv |> List.tl in
+  let foundation_only = List.mem "--foundation" args in
+  let test_files = List.filter (fun a -> not (String.length a > 0 && a.[0] = '-')) args in
+
+  (* Always run foundation tests *)
+  run_foundation_tests ();
+
+  if not foundation_only then begin
+    Printf.printf "\n=== SX Spec Tests (CEK Evaluator) ===\n%!";
+    let env = make_test_env () in
+    run_spec_tests env test_files
+  end;
+
+  (* Summary *)
+  Printf.printf "\n%s\n" (String.make 60 '=');
+  Printf.printf "Results: %d passed, %d failed\n" !pass_count !fail_count;
+  Printf.printf "%s\n" (String.make 60 '=');
+  if !fail_count > 0 then exit 1

hosts/ocaml/bin/sx_server.ml

@@ -0,0 +1,420 @@
+(** SX coroutine subprocess server.
+
+    Persistent process that accepts commands on stdin and writes
+    responses on stdout.  All messages are single-line SX expressions,
+    newline-delimited.
+
+    Protocol:
+      Python → OCaml: (ping), (load path), (load-source src),
+                       (eval src), (render src), (reset),
+                       (io-response value)
+      OCaml → Python: (ready), (ok), (ok value), (error msg),
+                       (io-request name args...)
+
+    IO primitives (query, action, request-arg, request-method, ctx)
+    yield (io-request ...) and block on stdin for (io-response ...). *)
+
+open Sx_types
+
+
+(* ====================================================================== *)
+(* Output helpers                                                          *)
+(* ====================================================================== *)
+
+(** Escape a string for embedding in an SX string literal. *)
+let escape_sx_string s =
+  let buf = Buffer.create (String.length s + 16) in
+  String.iter (function
+    | '"'  -> Buffer.add_string buf "\\\""
+    | '\\' -> Buffer.add_string buf "\\\\"
+    | '\n' -> Buffer.add_string buf "\\n"
+    | '\r' -> Buffer.add_string buf "\\r"
+    | '\t' -> Buffer.add_string buf "\\t"
+    | c    -> Buffer.add_char buf c) s;
+  Buffer.contents buf
+
+(** Serialize a value to SX text (for io-request args). *)
+let rec serialize_value = function
+  | Nil -> "nil"
+  | Bool true -> "true"
+  | Bool false -> "false"
+  | Number n ->
+    if Float.is_integer n then string_of_int (int_of_float n)
+    else Printf.sprintf "%g" n
+  | String s -> "\"" ^ escape_sx_string s ^ "\""
+  | Symbol s -> s
+  | Keyword k -> ":" ^ k
+  | List items | ListRef { contents = items } ->
+    "(list " ^ String.concat " " (List.map serialize_value items) ^ ")"
+  | Dict d ->
+    let pairs = Hashtbl.fold (fun k v acc ->
+      (Printf.sprintf ":%s %s" k (serialize_value v)) :: acc) d [] in
+    "{" ^ String.concat " " pairs ^ "}"
+  | RawHTML s -> "\"" ^ escape_sx_string s ^ "\""
+  | _ -> "nil"
+
+let send line =
+  print_string line;
+  print_char '\n';
+  flush stdout
+
+let send_ok () = send "(ok)"
+let send_ok_value v = send (Printf.sprintf "(ok %s)" (serialize_value v))
+let send_ok_string s = send (Printf.sprintf "(ok \"%s\")" (escape_sx_string s))
+let send_error msg = send (Printf.sprintf "(error \"%s\")" (escape_sx_string msg))
+
+
+(* ====================================================================== *)
+(* IO bridge — primitives that yield to Python                             *)
+(* ====================================================================== *)
+
+(** Read a line from stdin (blocking). *)
+let read_line_blocking () =
+  try Some (input_line stdin)
+  with End_of_file -> None
+
+(** Send an io-request and block until io-response arrives. *)
+let io_request name args =
+  let args_str = String.concat " " (List.map serialize_value args) in
+  send (Printf.sprintf "(io-request \"%s\" %s)" name args_str);
+  (* Block on stdin for io-response *)
+  match read_line_blocking () with
+  | None -> raise (Eval_error "IO bridge: stdin closed while waiting for io-response")
+  | Some line ->
+    let exprs = Sx_parser.parse_all line in
+    match exprs with
+    | [List [Symbol "io-response"; value]] -> value
+    | [List (Symbol "io-response" :: values)] ->
+      (match values with
+       | [v] -> v
+       | _ -> List values)
+    | _ -> raise (Eval_error ("IO bridge: unexpected response: " ^ line))
+
+(** Bind IO primitives into the environment. *)
+let setup_io_env env =
+  let bind name fn =
+    ignore (env_bind env name (NativeFn (name, fn)))
+  in
+
+  bind "query" (fun args ->
+    match args with
+    | service :: query_name :: rest ->
+      io_request "query" (service :: query_name :: rest)
+    | _ -> raise (Eval_error "query: expected (query service name ...)"));
+
+  bind "action" (fun args ->
+    match args with
+    | service :: action_name :: rest ->
+      io_request "action" (service :: action_name :: rest)
+    | _ -> raise (Eval_error "action: expected (action service name ...)"));
+
+  bind "request-arg" (fun args ->
+    match args with
+    | [name] -> io_request "request-arg" [name]
+    | _ -> raise (Eval_error "request-arg: expected 1 arg"));
+
+  bind "request-method" (fun _args ->
+    io_request "request-method" []);
+
+  bind "ctx" (fun args ->
+    match args with
+    | [key] -> io_request "ctx" [key]
+    | _ -> raise (Eval_error "ctx: expected 1 arg"))
+
+
+(* ====================================================================== *)
+(* Environment setup                                                       *)
+(* ====================================================================== *)
+
+let make_server_env () =
+  let env = make_env () in
+
+  (* Evaluator bindings — same as run_tests.ml's make_test_env,
+     but only the ones needed for rendering (not test helpers). *)
+  let bind name fn =
+    ignore (env_bind env name (NativeFn (name, fn)))
+  in
+
+  bind "assert" (fun args ->
+    match args with
+    | [cond] ->
+      if not (sx_truthy cond) then raise (Eval_error "Assertion failed");
+      Bool true
+    | [cond; String msg] ->
+      if not (sx_truthy cond) then raise (Eval_error ("Assertion error: " ^ msg));
+      Bool true
+    | [cond; msg] ->
+      if not (sx_truthy cond) then
+        raise (Eval_error ("Assertion error: " ^ value_to_string msg));
+      Bool true
+    | _ -> raise (Eval_error "assert: expected 1-2 args"));
+
+  bind "append!" (fun args ->
+    match args with
+    | [ListRef r; v] -> r := !r @ [v]; ListRef r
+    | [List items; v] -> List (items @ [v])
+    | _ -> raise (Eval_error "append!: expected list and value"));
+
+  (* HTML renderer *)
+  Sx_render.setup_render_env env;
+
+  (* Missing primitives that may be referenced *)
+  bind "upcase" (fun args ->
+    match args with
+    | [String s] -> String (String.uppercase_ascii s)
+    | _ -> raise (Eval_error "upcase: expected string"));
+
+  bind "downcase" (fun args ->
+    match args with
+    | [String s] -> String (String.lowercase_ascii s)
+    | _ -> raise (Eval_error "downcase: expected string"));
+
+  bind "make-keyword" (fun args ->
+    match args with
+    | [String s] -> Keyword s
+    | _ -> raise (Eval_error "make-keyword: expected string"));
+
+  bind "string-length" (fun args ->
+    match args with
+    | [String s] -> Number (float_of_int (String.length s))
+    | _ -> raise (Eval_error "string-length: expected string"));
+
+  bind "dict-get" (fun args ->
+    match args with
+    | [Dict d; String k] -> dict_get d k
+    | [Dict d; Keyword k] -> dict_get d k
+    | _ -> raise (Eval_error "dict-get: expected dict and key"));
+
+  bind "apply" (fun args ->
+    match args with
+    | f :: rest ->
+      let all_args = match List.rev rest with
+        | List last :: prefix -> List.rev prefix @ last
+        | _ -> rest
+      in
+      Sx_runtime.sx_call f all_args
+    | _ -> raise (Eval_error "apply: expected function and args"));
+
+  bind "equal?" (fun args ->
+    match args with
+    | [a; b] -> Bool (a = b)
+    | _ -> raise (Eval_error "equal?: expected 2 args"));
+
+  bind "identical?" (fun args ->
+    match args with
+    | [a; b] -> Bool (a == b)
+    | _ -> raise (Eval_error "identical?: expected 2 args"));
+
+  bind "make-continuation" (fun args ->
+    match args with
+    | [f] ->
+      let k v = Sx_runtime.sx_call f [v] in
+      Continuation (k, None)
+    | _ -> raise (Eval_error "make-continuation: expected 1 arg"));
+
+  bind "continuation?" (fun args ->
+    match args with
+    | [Continuation _] -> Bool true
+    | [_] -> Bool false
+    | _ -> raise (Eval_error "continuation?: expected 1 arg"));
+
+  bind "make-symbol" (fun args ->
+    match args with
+    | [String s] -> Symbol s
+    | [v] -> Symbol (value_to_string v)
+    | _ -> raise (Eval_error "make-symbol: expected 1 arg"));
+
+  bind "sx-serialize" (fun args ->
+    match args with
+    | [v] -> String (inspect v)
+    | _ -> raise (Eval_error "sx-serialize: expected 1 arg"));
+
+  (* Env operations *)
+  bind "env-get" (fun args ->
+    match args with
+    | [Env e; String k] -> env_get e k
+    | [Env e; Keyword k] -> env_get e k
+    | _ -> raise (Eval_error "env-get: expected env and string"));
+
+  bind "env-has?" (fun args ->
+    match args with
+    | [Env e; String k] -> Bool (env_has e k)
+    | [Env e; Keyword k] -> Bool (env_has e k)
+    | _ -> raise (Eval_error "env-has?: expected env and string"));
+
+  bind "env-bind!" (fun args ->
+    match args with
+    | [Env e; String k; v] -> env_bind e k v
+    | [Env e; Keyword k; v] -> env_bind e k v
+    | _ -> raise (Eval_error "env-bind!: expected env, key, value"));
+
+  bind "env-set!" (fun args ->
+    match args with
+    | [Env e; String k; v] -> env_set e k v
+    | [Env e; Keyword k; v] -> env_set e k v
+    | _ -> raise (Eval_error "env-set!: expected env, key, value"));
+
+  bind "env-extend" (fun args ->
+    match args with
+    | [Env e] -> Env (env_extend e)
+    | _ -> raise (Eval_error "env-extend: expected env"));
+
+  bind "env-merge" (fun args ->
+    match args with
+    | [Env a; Env b] -> Env (env_merge a b)
+    | _ -> raise (Eval_error "env-merge: expected 2 envs"));
+
+  (* Strict mode state *)
+  ignore (env_bind env "*strict*" (Bool false));
+  ignore (env_bind env "*prim-param-types*" Nil);
+
+  bind "set-strict!" (fun args ->
+    match args with
+    | [v] ->
+      Sx_ref._strict_ref := v;
+      ignore (env_set env "*strict*" v); Nil
+    | _ -> raise (Eval_error "set-strict!: expected 1 arg"));
+
+  bind "set-prim-param-types!" (fun args ->
+    match args with
+    | [v] ->
+      Sx_ref._prim_param_types_ref := v;
+      ignore (env_set env "*prim-param-types*" v); Nil
+    | _ -> raise (Eval_error "set-prim-param-types!: expected 1 arg"));
+
+  bind "component-param-types" (fun _args -> Nil);
+  bind "component-set-param-types!" (fun _args -> Nil);
+
+  bind "component-params" (fun args ->
+    match args with
+    | [Component c] -> List (List.map (fun s -> String s) c.c_params)
+    | _ -> Nil);
+
+  bind "component-body" (fun args ->
+    match args with
+    | [Component c] -> c.c_body
+    | _ -> Nil);
+
+  bind "component-has-children" (fun args ->
+    match args with
+    | [Component c] -> Bool c.c_has_children
+    | _ -> Bool false);
+
+  bind "component-affinity" (fun args ->
+    match args with
+    | [Component c] -> String c.c_affinity
+    | _ -> String "auto");
+
+  bind "keyword-name" (fun args ->
+    match args with
+    | [Keyword k] -> String k
+    | _ -> raise (Eval_error "keyword-name: expected keyword"));
+
+  bind "symbol-name" (fun args ->
+    match args with
+    | [Symbol s] -> String s
+    | _ -> raise (Eval_error "symbol-name: expected symbol"));
+
+  (* IO primitives *)
+  setup_io_env env;
+
+  env
+
+
+(* ====================================================================== *)
+(* Command dispatch                                                        *)
+(* ====================================================================== *)
+
+let dispatch env cmd =
+  match cmd with
+  | List [Symbol "ping"] ->
+    send_ok_string "ocaml-cek"
+
+  | List [Symbol "load"; String path] ->
+    (try
+      let exprs = Sx_parser.parse_file path in
+      let count = ref 0 in
+      List.iter (fun expr ->
+        ignore (Sx_ref.eval_expr expr (Env env));
+        incr count
+      ) exprs;
+      send_ok_value (Number (float_of_int !count))
+    with
+    | Eval_error msg -> send_error msg
+    | Sys_error msg -> send_error ("File error: " ^ msg)
+    | exn -> send_error (Printexc.to_string exn))
+
+  | List [Symbol "load-source"; String src] ->
+    (try
+      let exprs = Sx_parser.parse_all src in
+      let count = ref 0 in
+      List.iter (fun expr ->
+        ignore (Sx_ref.eval_expr expr (Env env));
+        incr count
+      ) exprs;
+      send_ok_value (Number (float_of_int !count))
+    with
+    | Eval_error msg -> send_error msg
+    | exn -> send_error (Printexc.to_string exn))
+
+  | List [Symbol "eval"; String src] ->
+    (try
+      let exprs = Sx_parser.parse_all src in
+      let result = List.fold_left (fun _acc expr ->
+        Sx_ref.eval_expr expr (Env env)
+      ) Nil exprs in
+      send_ok_value result
+    with
+    | Eval_error msg -> send_error msg
+    | exn -> send_error (Printexc.to_string exn))
+
+  | List [Symbol "render"; String src] ->
+    (try
+      let exprs = Sx_parser.parse_all src in
+      let expr = match exprs with
+        | [e] -> e
+        | [] -> Nil
+        | _ -> List (Symbol "do" :: exprs)
+      in
+      let html = Sx_render.render_to_html expr env in
+      send_ok_string html
+    with
+    | Eval_error msg -> send_error msg
+    | exn -> send_error (Printexc.to_string exn))
+
+  | List [Symbol "reset"] ->
+    (* Clear all bindings and rebuild env.
+       We can't reassign env, so clear and re-populate. *)
+    Hashtbl.clear env.bindings;
+    let fresh = make_server_env () in
+    Hashtbl.iter (fun k v -> Hashtbl.replace env.bindings k v) fresh.bindings;
+    send_ok ()
+
+  | _ ->
+    send_error ("Unknown command: " ^ inspect cmd)
+
+
+(* ====================================================================== *)
+(* Main loop                                                               *)
+(* ====================================================================== *)
+
+let () =
+  let env = make_server_env () in
+  send "(ready)";
+  (* Main command loop *)
+  try
+    while true do
+      match read_line_blocking () with
+      | None -> exit 0  (* stdin closed *)
+      | Some line ->
+        let line = String.trim line in
+        if line = "" then ()  (* skip blank lines *)
+        else begin
+          let exprs = Sx_parser.parse_all line in
+          match exprs with
+          | [cmd] -> dispatch env cmd
+          | _ -> send_error ("Expected single command, got " ^ string_of_int (List.length exprs))
+        end
+    done
+  with
+  | End_of_file -> ()

hosts/ocaml/bootstrap.py

@@ -0,0 +1,373 @@
+#!/usr/bin/env python3
+"""
+Bootstrap compiler: SX spec -> OCaml.
+
+Loads the SX-to-OCaml transpiler (transpiler.sx), feeds it the spec files,
+and produces sx_ref.ml — the transpiled evaluator as native OCaml.
+
+Usage:
+    python3 hosts/ocaml/bootstrap.py --output hosts/ocaml/lib/sx_ref.ml
+"""
+from __future__ import annotations
+
+import os
+import sys
+
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", ".."))
+sys.path.insert(0, _PROJECT)
+
+from shared.sx.parser import parse_all
+from shared.sx.types import Symbol
+
+
+def extract_defines(source: str) -> list[tuple[str, list]]:
+    """Parse .sx source, return list of (name, define-expr) for top-level defines.
+    Strips :effects [...] annotations from defines."""
+    from shared.sx.types import Keyword
+    exprs = parse_all(source)
+    defines = []
+    for expr in exprs:
+        if isinstance(expr, list) and expr and isinstance(expr[0], Symbol):
+            if expr[0].name == "define":
+                name = expr[1].name if isinstance(expr[1], Symbol) else str(expr[1])
+                # Strip :effects [...] annotation if present
+                # (define name :effects [...] body) → (define name body)
+                cleaned = list(expr)
+                if (len(cleaned) >= 4 and isinstance(cleaned[2], Keyword)
+                        and cleaned[2].name == "effects"):
+                    cleaned = [cleaned[0], cleaned[1]] + cleaned[4:]
+                defines.append((name, cleaned))
+    return defines
+
+
+# OCaml preamble — opens and runtime helpers
+PREAMBLE = """\
+(* sx_ref.ml — Auto-generated from SX spec by hosts/ocaml/bootstrap.py *)
+(* Do not edit — regenerate with: python3 hosts/ocaml/bootstrap.py *)
+
+[@@@warning "-26-27"]
+
+open Sx_types
+open Sx_runtime
+
+(* Trampoline — evaluates thunks via the CEK machine.
+   eval_expr is defined in the transpiled block below. *)
+let trampoline v = v  (* CEK machine doesn't produce thunks *)
+
+"""
+
+
+# OCaml fixups — override iterative CEK run + reactive subscriber fix
+FIXUPS = """\
+
+(* Override recursive cek_run with iterative loop *)
+let cek_run_iterative state =
+  let s = ref state in
+  while not (match cek_terminal_p !s with Bool true -> true | _ -> false) do
+    s := cek_step !s
+  done;
+  cek_value !s
+
+(* Strict mode refs — used by test runner, stubbed here *)
+let _strict_ref = ref Nil
+let _prim_param_types_ref = ref Nil
+let value_matches_type_p _v _t = Bool true
+
+(* Override reactive_shift_deref to wrap subscriber as NativeFn.
+   The transpiler emits bare OCaml closures for (fn () ...) but
+   signal_add_sub_b expects SX values. *)
+let reactive_shift_deref sig' env kont =
+  let scan_result = kont_capture_to_reactive_reset kont in
+  let captured_frames = first scan_result in
+  let reset_frame = nth scan_result (Number 1.0) in
+  let remaining_kont = nth scan_result (Number 2.0) in
+  let update_fn = get reset_frame (String "update-fn") in
+  let sub_disposers = ref (List []) in
+  let subscriber_fn () =
+    List.iter (fun d -> ignore (cek_call d Nil)) (sx_to_list !sub_disposers);
+    sub_disposers := List [];
+    let new_reset = make_reactive_reset_frame env update_fn (Bool false) in
+    let new_kont = prim_call "concat" [captured_frames; List [new_reset]; remaining_kont] in
+    ignore (with_island_scope
+      (fun d -> sub_disposers := sx_append_b !sub_disposers d; Nil)
+      (fun () -> cek_run (make_cek_value (signal_value sig') env new_kont)));
+    Nil
+  in
+  let subscriber = NativeFn ("reactive-subscriber", fun _args -> subscriber_fn ()) in
+  ignore (signal_add_sub_b sig' subscriber);
+  ignore (register_in_scope (fun () ->
+    ignore (signal_remove_sub_b sig' subscriber);
+    List.iter (fun d -> ignore (cek_call d Nil)) (sx_to_list !sub_disposers);
+    Nil));
+  let initial_kont = prim_call "concat" [captured_frames; List [reset_frame]; remaining_kont] in
+  make_cek_value (signal_value sig') env initial_kont
+
+"""
+
+
+def compile_spec_to_ml(spec_dir: str | None = None) -> str:
+    """Compile the SX spec to OCaml source."""
+    from shared.sx.ref.sx_ref import eval_expr, trampoline, make_env, sx_parse
+
+    if spec_dir is None:
+        spec_dir = os.path.join(_PROJECT, "spec")
+
+    # Load the transpiler
+    env = make_env()
+    transpiler_path = os.path.join(_HERE, "transpiler.sx")
+    with open(transpiler_path) as f:
+        transpiler_src = f.read()
+    for expr in sx_parse(transpiler_src):
+        trampoline(eval_expr(expr, env))
+
+    # Spec files to transpile (in dependency order)
+    sx_files = [
+        ("evaluator.sx", "evaluator (frames + eval + CEK)"),
+    ]
+
+    parts = [PREAMBLE]
+
+    for filename, label in sx_files:
+        filepath = os.path.join(spec_dir, filename)
+        if not os.path.exists(filepath):
+            print(f"Warning: {filepath} not found, skipping", file=sys.stderr)
+            continue
+
+        with open(filepath) as f:
+            src = f.read()
+        defines = extract_defines(src)
+
+        # Skip defines provided by preamble/fixups or that belong in web module
+        skip = {"trampoline",
+                # Freeze functions depend on signals.sx (web spec)
+                "freeze-registry", "freeze-signal", "freeze-scope",
+                "cek-freeze-scope", "cek-freeze-all",
+                "cek-thaw-scope", "cek-thaw-all",
+                "freeze-to-sx", "thaw-from-sx",
+                "freeze-to-cid", "thaw-from-cid",
+                "content-hash", "content-put", "content-get", "content-store"}
+        defines = [(n, e) for n, e in defines if n not in skip]
+
+        # Deduplicate — keep last definition for each name (CEK overrides tree-walk)
+        seen = {}
+        for i, (n, e) in enumerate(defines):
+            seen[n] = i
+        defines = [(n, e) for i, (n, e) in enumerate(defines) if seen[n] == i]
+
+        # Build the defines list for the transpiler
+        defines_list = [[name, expr] for name, expr in defines]
+        env["_defines"] = defines_list
+
+        # Pass known define names so the transpiler can distinguish
+        # static (OCaml fn) calls from dynamic (SX value) calls
+        env["_known_defines"] = [name for name, _ in defines]
+
+        # Call ml-translate-file — emits as single let rec block
+        translate_expr = sx_parse("(ml-translate-file _defines)")[0]
+        result = trampoline(eval_expr(translate_expr, env))
+
+        parts.append(f"\n(* === Transpiled from {label} === *)\n")
+        parts.append(result)
+
+    parts.append(FIXUPS)
+    return "\n".join(parts)
+
+
+WEB_PREAMBLE = """\
+(* sx_web.ml — Auto-generated from web adapters by hosts/ocaml/bootstrap.py *)
+(* Do not edit — regenerate with: python3 hosts/ocaml/bootstrap.py --web *)
+
+[@@@warning "-26-27"]
+
+open Sx_types
+open Sx_runtime
+
+"""
+
+# Web adapter files to transpile (dependency order)
+WEB_ADAPTER_FILES = [
+    ("signals.sx", "signals (reactive signal runtime)"),
+    ("deps.sx", "deps (component dependency analysis)"),
+    ("page-helpers.sx", "page-helpers (pure data transformation helpers)"),
+    ("router.sx", "router (client-side route matching)"),
+    ("adapter-html.sx", "adapter-html (HTML rendering adapter)"),
+]
+
+
+def compile_web_to_ml(web_dir: str | None = None) -> str:
+    """Compile web adapter SX files to OCaml source."""
+    from shared.sx.ref.sx_ref import eval_expr, trampoline, make_env, sx_parse
+
+    if web_dir is None:
+        web_dir = os.path.join(_PROJECT, "web")
+
+    # Load the transpiler
+    env = make_env()
+    transpiler_path = os.path.join(_HERE, "transpiler.sx")
+    with open(transpiler_path) as f:
+        transpiler_src = f.read()
+    for expr in sx_parse(transpiler_src):
+        trampoline(eval_expr(expr, env))
+
+    # Also load the evaluator defines so the transpiler knows about them
+    spec_dir = os.path.join(_PROJECT, "spec")
+    eval_path = os.path.join(spec_dir, "evaluator.sx")
+    if os.path.exists(eval_path):
+        with open(eval_path) as f:
+            eval_defines = extract_defines(f.read())
+        eval_names = [n for n, _ in eval_defines]
+    else:
+        eval_names = []
+
+    parts = [WEB_PREAMBLE]
+
+    # Collect all web adapter defines
+    all_defines = []
+    for filename, label in WEB_ADAPTER_FILES:
+        filepath = os.path.join(web_dir, filename)
+        if not os.path.exists(filepath):
+            print(f"Warning: {filepath} not found, skipping", file=sys.stderr)
+            continue
+
+        with open(filepath) as f:
+            src = f.read()
+        defines = extract_defines(src)
+
+        # Deduplicate within file
+        seen = {}
+        for i, (n, e) in enumerate(defines):
+            seen[n] = i
+        defines = [(n, e) for i, (n, e) in enumerate(defines) if seen[n] == i]
+
+        all_defines.extend(defines)
+        print(f"  {filename}: {len(defines)} defines", file=sys.stderr)
+
+    # Deduplicate across files (last wins)
+    seen = {}
+    for i, (n, e) in enumerate(all_defines):
+        seen[n] = i
+    all_defines = [(n, e) for i, (n, e) in enumerate(all_defines) if seen[n] == i]
+
+    print(f"  Total: {len(all_defines)} unique defines", file=sys.stderr)
+
+    # Build the defines list for the transpiler
+    defines_list = [[name, expr] for name, expr in all_defines]
+    env["_defines"] = defines_list
+
+    # Known defines = evaluator names + web adapter names
+    env["_known_defines"] = eval_names + [name for name, _ in all_defines]
+
+    # Translate
+    translate_expr = sx_parse("(ml-translate-file _defines)")[0]
+    result = trampoline(eval_expr(translate_expr, env))
+
+    parts.append("\n(* === Transpiled from web adapters === *)\n")
+    parts.append(result)
+
+    # Registration function — extract actual OCaml names from transpiled output
+    # by using the same transpiler mangling.
+    # Ask the transpiler for the mangled name of each define.
+    name_map = {}
+    for name, _ in all_defines:
+        mangle_expr = sx_parse(f'(ml-mangle "{name}")')[0]
+        mangled = trampoline(eval_expr(mangle_expr, env))
+        name_map[name] = mangled
+
+    def count_params(expr):
+        """Count actual params from a (define name [annotations] (fn (params...) body)) form."""
+        # Find the (fn ...) form — it might be at index 2, 3, or 4 depending on annotations
+        fn_expr = None
+        for i in range(2, min(len(expr), 6)):
+            if (isinstance(expr[i], list) and expr[i] and
+                isinstance(expr[i][0], Symbol) and expr[i][0].name in ("fn", "lambda")):
+                fn_expr = expr[i]
+                break
+        if fn_expr is None:
+            return -1  # not a function
+        params = fn_expr[1] if isinstance(fn_expr[1], list) else []
+        n = 0
+        skip = False
+        for p in params:
+            if skip:
+                skip = False
+                continue
+            if isinstance(p, Symbol) and p.name in ("&key", "&rest"):
+                skip = True
+                continue
+            if isinstance(p, list) and len(p) >= 3:  # (name :as type)
+                n += 1
+            elif isinstance(p, Symbol):
+                n += 1
+        return n
+
+    parts.append("\n\n(* Register all web adapter functions into an environment *)\n")
+    parts.append("let register_web_adapters env =\n")
+    for name, expr in all_defines:
+        mangled = name_map[name]
+        n = count_params(expr)
+        if n < 0:
+            # Non-function define (constant)
+            parts.append(f'  ignore (Sx_types.env_bind env "{name}" {mangled});\n')
+        elif n == 0:
+            parts.append(f'  ignore (Sx_types.env_bind env "{name}" '
+                         f'(NativeFn ("{name}", fun _args -> {mangled} Nil)));\n')
+        else:
+            # Generate match with correct arity
+            arg_names = [chr(97 + i) for i in range(n)]  # a, b, c, ...
+            pat = "; ".join(arg_names)
+            call = " ".join(arg_names)
+            # Pad with Nil for partial application
+            pad_call = " ".join(arg_names[:1] + ["Nil"] * (n - 1)) if n > 1 else arg_names[0]
+            parts.append(f'  ignore (Sx_types.env_bind env "{name}" '
+                         f'(NativeFn ("{name}", fun args -> match args with '
+                         f'| [{pat}] -> {mangled} {call} '
+                         f'| _ -> raise (Eval_error "{name}: expected {n} args"))));\n')
+    parts.append("  ()\n")
+
+    return "\n".join(parts)
+
+
+def main():
+    import argparse
+    parser = argparse.ArgumentParser(description="Bootstrap SX spec -> OCaml")
+    parser.add_argument(
+        "--output", "-o",
+        default=None,
+        help="Output file (default: stdout)",
+    )
+    parser.add_argument(
+        "--web",
+        action="store_true",
+        help="Compile web adapters instead of evaluator spec",
+    )
+    parser.add_argument(
+        "--web-output",
+        default=None,
+        help="Output file for web adapters (default: stdout)",
+    )
+    args = parser.parse_args()
+
+    if args.web or args.web_output:
+        result = compile_web_to_ml()
+        out = args.web_output or args.output
+        if out:
+            with open(out, "w") as f:
+                f.write(result)
+            size = os.path.getsize(out)
+            print(f"Wrote {out} ({size} bytes)", file=sys.stderr)
+        else:
+            print(result)
+    else:
+        result = compile_spec_to_ml()
+        if args.output:
+            with open(args.output, "w") as f:
+                f.write(result)
+            size = os.path.getsize(args.output)
+            print(f"Wrote {args.output} ({size} bytes)", file=sys.stderr)
+        else:
+            print(result)
+
+
+if __name__ == "__main__":
+    main()

hosts/ocaml/browser/build.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Build the OCaml SX engine for browser use (WASM + JS fallback).
+#
+# Outputs:
+#   _build/default/browser/sx_browser.bc.wasm.js       WASM loader
+#   _build/default/browser/sx_browser.bc.wasm.assets/   WASM modules
+#   _build/default/browser/sx_browser.bc.js             JS fallback
+#
+# Usage:
+#   cd hosts/ocaml && ./browser/build.sh
+
+set -euo pipefail
+cd "$(dirname "$0")/.."
+
+eval $(opam env 2>/dev/null || true)
+
+echo "=== Building OCaml SX browser engine ==="
+
+# Build all targets: bytecode, JS, WASM
+dune build browser/sx_browser.bc.js browser/sx_browser.bc.wasm.js
+
+echo ""
+echo "--- Output sizes ---"
+echo -n "JS (unoptimized):  "; ls -lh _build/default/browser/sx_browser.bc.js | awk '{print $5}'
+echo -n "WASM loader:       "; ls -lh _build/default/browser/sx_browser.bc.wasm.js | awk '{print $5}'
+echo -n "WASM modules:      "; du -sh _build/default/browser/sx_browser.bc.wasm.assets/*.wasm | awk '{s+=$1}END{print s"K"}'
+
+# Optimized JS build
+js_of_ocaml --opt=3 -o _build/default/browser/sx_browser.opt.js _build/default/browser/sx_browser.bc
+echo -n "JS (optimized):    "; ls -lh _build/default/browser/sx_browser.opt.js | awk '{print $5}'
+
+echo ""
+echo "=== Build complete ==="
+echo ""
+echo "Test with:"
+echo "  node hosts/ocaml/browser/run_tests_js.js                                    # JS"
+echo "  node --experimental-wasm-imported-strings hosts/ocaml/browser/run_tests_wasm.js  # WASM"

hosts/ocaml/browser/bundle.sh

@@ -0,0 +1,139 @@
+#!/usr/bin/env bash
+# Bundle the WASM engine + platform + web adapters into shared/static/scripts/
+#
+# Usage: hosts/ocaml/browser/bundle.sh
+
+set -euo pipefail
+cd "$(dirname "$0")/../../.."
+
+WASM_LOADER="hosts/ocaml/_build/default/browser/sx_browser.bc.wasm.js"
+WASM_ASSETS="hosts/ocaml/_build/default/browser/sx_browser.bc.wasm.assets"
+PLATFORM="hosts/ocaml/browser/sx-platform.js"
+OUT="shared/static/scripts/sx-wasm.js"
+ASSET_DIR="shared/static/scripts/sx-wasm-assets"
+
+if [ ! -f "$WASM_LOADER" ]; then
+  echo "Build first: cd hosts/ocaml && eval \$(opam env) && dune build browser/sx_browser.bc.wasm.js"
+  exit 1
+fi
+
+# 1. WASM loader (patched asset path)
+sed 's|"src":"sx_browser.bc.wasm.assets"|"src":"sx-wasm-assets"|' \
+  "$WASM_LOADER" > "$OUT"
+
+# 2. Platform layer
+echo "" >> "$OUT"
+cat "$PLATFORM" >> "$OUT"
+
+# 3. Embedded web adapters — SX source as JS string constants
+echo "" >> "$OUT"
+echo "// =========================================================================" >> "$OUT"
+echo "// Embedded web adapters (loaded into WASM engine at boot)" >> "$OUT"
+echo "// =========================================================================" >> "$OUT"
+echo "globalThis.__sxAdapters = {};" >> "$OUT"
+
+# Adapters to embed (order matters for dependencies)
+ADAPTERS="signals deps page-helpers router adapter-html"
+
+for name in $ADAPTERS; do
+  file="web/${name}.sx"
+  if [ -f "$file" ]; then
+    echo -n "globalThis.__sxAdapters[\"${name}\"] = " >> "$OUT"
+    # Escape the SX source for embedding in a JS string
+    python3 -c "
+import json, sys
+with open('$file') as f:
+    print(json.dumps(f.read()) + ';')
+" >> "$OUT"
+  fi
+done
+
+# 4. Boot shim
+cat >> "$OUT" << 'BOOT'
+
+// =========================================================================
+// WASM Boot: load adapters, then process inline <script type="text/sx">
+// =========================================================================
+(function() {
+  "use strict";
+  if (typeof document === "undefined") return;
+
+  function sxWasmBoot() {
+    var K = globalThis.SxKernel;
+    if (!K || !globalThis.Sx) { setTimeout(sxWasmBoot, 50); return; }
+
+    console.log("[sx-wasm] booting, engine:", K.engine());
+
+    // Load embedded web adapters
+    var adapters = globalThis.__sxAdapters || {};
+    var adapterOrder = ["signals", "deps", "page-helpers", "router", "adapter-html"];
+    for (var j = 0; j < adapterOrder.length; j++) {
+      var name = adapterOrder[j];
+      if (adapters[name]) {
+        var r = K.loadSource(adapters[name]);
+        if (typeof r === "string" && r.startsWith("Error:")) {
+          console.error("[sx-wasm] adapter " + name + " error:", r);
+        } else {
+          console.log("[sx-wasm] loaded " + name + " (" + r + " defs)");
+        }
+      }
+    }
+    delete globalThis.__sxAdapters;  // Free memory
+
+    // Process <script type="text/sx" data-components>
+    var scripts = document.querySelectorAll('script[type="text/sx"]');
+    for (var i = 0; i < scripts.length; i++) {
+      var s = scripts[i], src = s.textContent.trim();
+      if (!src) continue;
+      if (s.hasAttribute("data-components")) {
+        var result = K.loadSource(src);
+        if (typeof result === "string" && result.startsWith("Error:"))
+          console.error("[sx-wasm] component load error:", result);
+      }
+    }
+
+    // Process <script type="text/sx" data-init>
+    for (var i = 0; i < scripts.length; i++) {
+      var s = scripts[i];
+      if (s.hasAttribute("data-init")) {
+        var src = s.textContent.trim();
+        if (src) K.loadSource(src);
+      }
+    }
+
+    // Process <script type="text/sx" data-mount="...">
+    for (var i = 0; i < scripts.length; i++) {
+      var s = scripts[i];
+      if (s.hasAttribute("data-mount")) {
+        var mount = s.getAttribute("data-mount"), src = s.textContent.trim();
+        if (!src) continue;
+        var target = mount === "body" ? document.body : document.querySelector(mount);
+        if (!target) continue;
+        try {
+          var parsed = K.parse(src);
+          if (parsed && parsed.length > 0) {
+            var html = K.renderToHtml(parsed[0]);
+            if (html && typeof html === "string") {
+              target.innerHTML = html;
+              console.log("[sx-wasm] mounted to", mount);
+            }
+          }
+        } catch(e) { console.error("[sx-wasm] mount error:", e); }
+      }
+    }
+
+    console.log("[sx-wasm] boot complete");
+  }
+
+  if (document.readyState === "loading") document.addEventListener("DOMContentLoaded", sxWasmBoot);
+  else sxWasmBoot();
+})();
+BOOT
+
+# 5. Copy WASM assets
+mkdir -p "$ASSET_DIR"
+cp "$WASM_ASSETS"/*.wasm "$ASSET_DIR/"
+
+echo "=== Bundle complete ==="
+ls -lh "$OUT"
+echo -n "WASM assets: "; du -sh "$ASSET_DIR" | awk '{print $1}'

hosts/ocaml/browser/dune

@@ -0,0 +1,5 @@
+(executable
+ (name sx_browser)
+ (libraries sx js_of_ocaml)
+ (modes byte js wasm)
+ (preprocess (pps js_of_ocaml-ppx)))

hosts/ocaml/browser/run_tests_js.js

@@ -0,0 +1,149 @@
+#!/usr/bin/env node
+/**
+ * Test runner for the js_of_ocaml-compiled SX engine.
+ *
+ * Loads the OCaml CEK machine (compiled to JS) and runs the spec test suite.
+ *
+ * Usage:
+ *   node hosts/ocaml/browser/run_tests_js.js           # standard tests
+ *   node hosts/ocaml/browser/run_tests_js.js --full     # full suite
+ */
+
+const fs = require("fs");
+const path = require("path");
+
+// Load the compiled OCaml engine
+const enginePath = path.join(__dirname, "../_build/default/browser/sx_browser.bc.js");
+if (!fs.existsSync(enginePath)) {
+  console.error("Build first: cd hosts/ocaml && eval $(opam env) && dune build browser/sx_browser.bc.js");
+  process.exit(1);
+}
+require(enginePath);
+
+const K = globalThis.SxKernel;
+const full = process.argv.includes("--full");
+
+// Test state
+let passed = 0;
+let failed = 0;
+let errors = [];
+let suiteStack = [];
+
+function currentSuite() {
+  return suiteStack.length > 0 ? suiteStack.join(" > ") : "";
+}
+
+// Register platform test functions
+K.registerNative("report-pass", (args) => {
+  const name = typeof args[0] === "string" ? args[0] : JSON.stringify(args[0]);
+  passed++;
+  if (process.env.VERBOSE) {
+    console.log(`  PASS: ${currentSuite()} > ${name}`);
+  } else {
+    process.stdout.write(".");
+    if (passed % 80 === 0) process.stdout.write("\n");
+  }
+  return null;
+});
+
+K.registerNative("report-fail", (args) => {
+  const name = typeof args[0] === "string" ? args[0] : JSON.stringify(args[0]);
+  const error = args.length > 1 && args[1] != null
+    ? (typeof args[1] === "string" ? args[1] : JSON.stringify(args[1]))
+    : "unknown";
+  failed++;
+  const fullName = currentSuite() ? `${currentSuite()} > ${name}` : name;
+  errors.push(`FAIL: ${fullName}\n  ${error}`);
+  process.stdout.write("F");
+});
+
+K.registerNative("push-suite", (args) => {
+  const name = typeof args[0] === "string" ? args[0] : String(args[0]);
+  suiteStack.push(name);
+  return null;
+});
+
+K.registerNative("pop-suite", (_args) => {
+  suiteStack.pop();
+  return null;
+});
+
+console.log(`=== SX OCaml→JS Engine Test Runner ===`);
+console.log(`Engine: ${K.engine()}`);
+console.log(`Mode: ${full ? "full" : "standard"}`);
+console.log("");
+
+// Load a .sx file by reading it from disk and evaluating via loadSource
+function loadFile(filePath) {
+  const src = fs.readFileSync(filePath, "utf8");
+  return K.loadSource(src);
+}
+
+// Test files
+const specDir = path.join(__dirname, "../../../spec");
+const testDir = path.join(specDir, "tests");
+
+const standardTests = [
+  "test-framework.sx",
+  "test-eval.sx",
+  "test-parser.sx",
+  "test-primitives.sx",
+  "test-collections.sx",
+  "test-closures.sx",
+  "test-defcomp.sx",
+  "test-macros.sx",
+  "test-errors.sx",
+  "test-render.sx",
+  "test-tco.sx",
+  "test-scope.sx",
+  "test-cek.sx",
+  "test-advanced.sx",
+];
+
+const fullOnlyTests = [
+  "test-freeze.sx",
+  "test-continuations.sx",
+  "test-continuations-advanced.sx",
+  "test-cek-advanced.sx",
+  "test-signals-advanced.sx",
+  "test-render-advanced.sx",
+  "test-integration.sx",
+  "test-strict.sx",
+  "test-types.sx",
+];
+
+const testFiles = full ? [...standardTests, ...fullOnlyTests] : standardTests;
+
+for (const file of testFiles) {
+  const filePath = path.join(testDir, file);
+  if (!fs.existsSync(filePath)) {
+    console.log(`\nSkipping ${file} (not found)`);
+    continue;
+  }
+
+  const label = file.replace(".sx", "").replace("test-", "");
+  process.stdout.write(`\n[${label}] `);
+
+  const result = loadFile(filePath);
+  if (typeof result === "string" && result.startsWith("Error:")) {
+    console.log(`\n  LOAD ERROR: ${result}`);
+    failed++;
+    errors.push(`LOAD ERROR: ${file}\n  ${result}`);
+  }
+}
+
+console.log("\n");
+
+if (errors.length > 0) {
+  console.log(`--- Failures (${errors.length}) ---`);
+  for (const e of errors.slice(0, 20)) {
+    console.log(e);
+  }
+  if (errors.length > 20) {
+    console.log(`... and ${errors.length - 20} more`);
+  }
+  console.log("");
+}
+
+console.log(`Results: ${passed} passed, ${failed} failed, ${passed + failed} total`);
+process.exit(failed > 0 ? 1 : 0);

hosts/ocaml/browser/run_tests_wasm.js

@@ -0,0 +1,146 @@
+#!/usr/bin/env node
+/**
+ * Test runner for the wasm_of_ocaml-compiled SX engine.
+ *
+ * Loads the OCaml CEK machine (compiled to WASM) and runs the spec test suite.
+ * Requires Node.js 22+ with --experimental-wasm-imported-strings flag.
+ *
+ * Usage:
+ *   node --experimental-wasm-imported-strings hosts/ocaml/browser/run_tests_wasm.js
+ *   node --experimental-wasm-imported-strings hosts/ocaml/browser/run_tests_wasm.js --full
+ */
+
+const fs = require("fs");
+const path = require("path");
+
+const wasmDir = path.join(__dirname, "../_build/default/browser");
+const loaderPath = path.join(wasmDir, "sx_browser.bc.wasm.js");
+
+if (!fs.existsSync(loaderPath)) {
+  console.error("Build first: cd hosts/ocaml && eval $(opam env) && dune build browser/sx_browser.bc.wasm.js");
+  process.exit(1);
+}
+
+// Set require.main.filename so the WASM loader can find .wasm assets
+if (!require.main) {
+  require.main = { filename: path.join(wasmDir, "test.js") };
+} else {
+  require.main.filename = path.join(wasmDir, "test.js");
+}
+
+require(loaderPath);
+
+const full = process.argv.includes("--full");
+
+// WASM loader is async — wait for SxKernel to be available
+setTimeout(() => {
+  const K = globalThis.SxKernel;
+  if (!K) {
+    console.error("SxKernel not available — WASM initialization failed");
+    process.exit(1);
+  }
+
+  let passed = 0;
+  let failed = 0;
+  let errors = [];
+  let suiteStack = [];
+
+  function currentSuite() {
+    return suiteStack.length > 0 ? suiteStack.join(" > ") : "";
+  }
+
+  // Register platform test functions
+  K.registerNative("report-pass", (args) => {
+    const name = typeof args[0] === "string" ? args[0] : JSON.stringify(args[0]);
+    passed++;
+    if (process.env.VERBOSE) {
+      console.log(`  PASS: ${currentSuite()} > ${name}`);
+    } else {
+      process.stdout.write(".");
+      if (passed % 80 === 0) process.stdout.write("\n");
+    }
+    return null;
+  });
+
+  K.registerNative("report-fail", (args) => {
+    const name = typeof args[0] === "string" ? args[0] : JSON.stringify(args[0]);
+    const error = args.length > 1 && args[1] != null
+      ? (typeof args[1] === "string" ? args[1] : JSON.stringify(args[1]))
+      : "unknown";
+    failed++;
+    const fullName = currentSuite() ? `${currentSuite()} > ${name}` : name;
+    errors.push(`FAIL: ${fullName}\n  ${error}`);
+    process.stdout.write("F");
+  });
+
+  K.registerNative("push-suite", (args) => {
+    const name = typeof args[0] === "string" ? args[0] : String(args[0]);
+    suiteStack.push(name);
+    return null;
+  });
+
+  K.registerNative("pop-suite", (_args) => {
+    suiteStack.pop();
+    return null;
+  });
+
+  console.log(`=== SX OCaml→WASM Engine Test Runner ===`);
+  console.log(`Engine: ${K.engine()}`);
+  console.log(`Mode: ${full ? "full" : "standard"}`);
+  console.log("");
+
+  const specDir = path.join(__dirname, "../../../spec");
+  const testDir = path.join(specDir, "tests");
+
+  const standardTests = [
+    "test-framework.sx", "test-eval.sx", "test-parser.sx",
+    "test-primitives.sx", "test-collections.sx", "test-closures.sx",
+    "test-defcomp.sx", "test-macros.sx", "test-errors.sx",
+    "test-render.sx", "test-tco.sx", "test-scope.sx",
+    "test-cek.sx", "test-advanced.sx",
+  ];
+
+  const fullOnlyTests = [
+    "test-freeze.sx", "test-continuations.sx",
+    "test-continuations-advanced.sx", "test-cek-advanced.sx",
+    "test-signals-advanced.sx", "test-render-advanced.sx",
+    "test-integration.sx", "test-strict.sx", "test-types.sx",
+  ];
+
+  const testFiles = full ? [...standardTests, ...fullOnlyTests] : standardTests;
+
+  for (const file of testFiles) {
+    const filePath = path.join(testDir, file);
+    if (!fs.existsSync(filePath)) {
+      console.log(`\nSkipping ${file} (not found)`);
+      continue;
+    }
+
+    const label = file.replace(".sx", "").replace("test-", "");
+    process.stdout.write(`\n[${label}] `);
+
+    const src = fs.readFileSync(filePath, "utf8");
+    const result = K.loadSource(src);
+    if (typeof result === "string" && result.startsWith("Error:")) {
+      console.log(`\n  LOAD ERROR: ${result}`);
+      failed++;
+      errors.push(`LOAD ERROR: ${file}\n  ${result}`);
+    }
+  }
+
+  console.log("\n");
+
+  if (errors.length > 0) {
+    console.log(`--- Failures (${errors.length}) ---`);
+    for (const e of errors.slice(0, 20)) {
+      console.log(e);
+    }
+    if (errors.length > 20) {
+      console.log(`... and ${errors.length - 20} more`);
+    }
+    console.log("");
+  }
+
+  console.log(`Results: ${passed} passed, ${failed} failed, ${passed + failed} total`);
+  process.exit(failed > 0 ? 1 : 0);
+}, 1000);

hosts/ocaml/browser/sx-platform.js

@@ -0,0 +1,676 @@
+/**
+ * sx-platform.js — Thin JS platform layer for the OCaml SX WASM engine.
+ *
+ * This file provides browser-native primitives (DOM, fetch, timers, etc.)
+ * to the WASM-compiled OCaml CEK machine. It:
+ *   1. Loads the WASM module (SxKernel)
+ *   2. Registers ~80 native browser functions via registerNative
+ *   3. Loads web adapters (.sx files) into the engine
+ *   4. Exports the public Sx API
+ *
+ * Both wasm_of_ocaml and js_of_ocaml targets bind to this same layer.
+ */
+
+(function(global) {
+  "use strict";
+
+  function initPlatform() {
+  var K = global.SxKernel;
+  if (!K) {
+    // WASM loader is async — wait and retry
+    setTimeout(initPlatform, 20);
+    return;
+  }
+
+  var _hasDom = typeof document !== "undefined";
+  var NIL = null;
+  var SVG_NS = "http://www.w3.org/2000/svg";
+
+  // =========================================================================
+  // Helper: wrap SX lambda for use as JS callback
+  // =========================================================================
+
+  function wrapLambda(fn) {
+    // For now, SX lambdas from registerNative are opaque — we can't call them
+    // directly from JS. They need to go through the engine.
+    // TODO: add callLambda API to SxKernel
+    return fn;
+  }
+
+  // =========================================================================
+  // 1. DOM Creation & Manipulation
+  // =========================================================================
+
+  K.registerNative("dom-create-element", function(args) {
+    if (!_hasDom) return NIL;
+    var tag = args[0], ns = args[1];
+    if (ns && ns !== NIL) return document.createElementNS(ns, tag);
+    return document.createElement(tag);
+  });
+
+  K.registerNative("create-text-node", function(args) {
+    return _hasDom ? document.createTextNode(args[0] || "") : NIL;
+  });
+
+  K.registerNative("create-comment", function(args) {
+    return _hasDom ? document.createComment(args[0] || "") : NIL;
+  });
+
+  K.registerNative("create-fragment", function(_args) {
+    return _hasDom ? document.createDocumentFragment() : NIL;
+  });
+
+  K.registerNative("dom-clone", function(args) {
+    var node = args[0];
+    return node && node.cloneNode ? node.cloneNode(true) : node;
+  });
+
+  K.registerNative("dom-parse-html", function(args) {
+    if (!_hasDom) return NIL;
+    var tpl = document.createElement("template");
+    tpl.innerHTML = args[0] || "";
+    return tpl.content;
+  });
+
+  K.registerNative("dom-parse-html-document", function(args) {
+    if (!_hasDom) return NIL;
+    var parser = new DOMParser();
+    return parser.parseFromString(args[0] || "", "text/html");
+  });
+
+  // =========================================================================
+  // 2. DOM Queries
+  // =========================================================================
+
+  K.registerNative("dom-query", function(args) {
+    return _hasDom ? document.querySelector(args[0]) || NIL : NIL;
+  });
+
+  K.registerNative("dom-query-all", function(args) {
+    var root = args[0] || (_hasDom ? document : null);
+    if (!root || !root.querySelectorAll) return [];
+    return Array.prototype.slice.call(root.querySelectorAll(args[1] || args[0]));
+  });
+
+  K.registerNative("dom-query-by-id", function(args) {
+    return _hasDom ? document.getElementById(args[0]) || NIL : NIL;
+  });
+
+  K.registerNative("dom-body", function(_args) {
+    return _hasDom ? document.body : NIL;
+  });
+
+  K.registerNative("dom-ensure-element", function(args) {
+    if (!_hasDom) return NIL;
+    var sel = args[0];
+    var el = document.querySelector(sel);
+    if (el) return el;
+    if (sel.charAt(0) === "#") {
+      el = document.createElement("div");
+      el.id = sel.slice(1);
+      document.body.appendChild(el);
+      return el;
+    }
+    return NIL;
+  });
+
+  // =========================================================================
+  // 3. DOM Attributes
+  // =========================================================================
+
+  K.registerNative("dom-get-attr", function(args) {
+    var el = args[0], name = args[1];
+    if (!el || !el.getAttribute) return NIL;
+    var v = el.getAttribute(name);
+    return v === null ? NIL : v;
+  });
+
+  K.registerNative("dom-set-attr", function(args) {
+    var el = args[0], name = args[1], val = args[2];
+    if (el && el.setAttribute) el.setAttribute(name, val);
+    return NIL;
+  });
+
+  K.registerNative("dom-remove-attr", function(args) {
+    if (args[0] && args[0].removeAttribute) args[0].removeAttribute(args[1]);
+    return NIL;
+  });
+
+  K.registerNative("dom-has-attr?", function(args) {
+    return !!(args[0] && args[0].hasAttribute && args[0].hasAttribute(args[1]));
+  });
+
+  K.registerNative("dom-attr-list", function(args) {
+    var el = args[0];
+    if (!el || !el.attributes) return [];
+    var r = [];
+    for (var i = 0; i < el.attributes.length; i++) {
+      r.push([el.attributes[i].name, el.attributes[i].value]);
+    }
+    return r;
+  });
+
+  // =========================================================================
+  // 4. DOM Content
+  // =========================================================================
+
+  K.registerNative("dom-text-content", function(args) {
+    var el = args[0];
+    return el ? el.textContent || el.nodeValue || "" : "";
+  });
+
+  K.registerNative("dom-set-text-content", function(args) {
+    var el = args[0], s = args[1];
+    if (el) {
+      if (el.nodeType === 3 || el.nodeType === 8) el.nodeValue = s;
+      else el.textContent = s;
+    }
+    return NIL;
+  });
+
+  K.registerNative("dom-inner-html", function(args) {
+    return args[0] && args[0].innerHTML != null ? args[0].innerHTML : "";
+  });
+
+  K.registerNative("dom-set-inner-html", function(args) {
+    if (args[0]) args[0].innerHTML = args[1] || "";
+    return NIL;
+  });
+
+  K.registerNative("dom-insert-adjacent-html", function(args) {
+    var el = args[0], pos = args[1], html = args[2];
+    if (el && el.insertAdjacentHTML) el.insertAdjacentHTML(pos, html);
+    return NIL;
+  });
+
+  K.registerNative("dom-body-inner-html", function(args) {
+    var doc = args[0];
+    return doc && doc.body ? doc.body.innerHTML : "";
+  });
+
+  // =========================================================================
+  // 5. DOM Structure & Navigation
+  // =========================================================================
+
+  K.registerNative("dom-parent", function(args) { return args[0] ? args[0].parentNode || NIL : NIL; });
+  K.registerNative("dom-first-child", function(args) { return args[0] ? args[0].firstChild || NIL : NIL; });
+  K.registerNative("dom-next-sibling", function(args) { return args[0] ? args[0].nextSibling || NIL : NIL; });
+  K.registerNative("dom-id", function(args) { return args[0] && args[0].id ? args[0].id : NIL; });
+  K.registerNative("dom-node-type", function(args) { return args[0] ? args[0].nodeType : 0; });
+  K.registerNative("dom-node-name", function(args) { return args[0] ? args[0].nodeName : ""; });
+  K.registerNative("dom-tag-name", function(args) { return args[0] && args[0].tagName ? args[0].tagName : ""; });
+
+  K.registerNative("dom-child-list", function(args) {
+    var el = args[0];
+    if (!el || !el.childNodes) return [];
+    return Array.prototype.slice.call(el.childNodes);
+  });
+
+  K.registerNative("dom-child-nodes", function(args) {
+    var el = args[0];
+    if (!el || !el.childNodes) return [];
+    return Array.prototype.slice.call(el.childNodes);
+  });
+
+  // =========================================================================
+  // 6. DOM Insertion & Removal
+  // =========================================================================
+
+  K.registerNative("dom-append", function(args) {
+    var parent = args[0], child = args[1];
+    if (parent && child) parent.appendChild(child);
+    return NIL;
+  });
+
+  K.registerNative("dom-prepend", function(args) {
+    var parent = args[0], child = args[1];
+    if (parent && child) parent.insertBefore(child, parent.firstChild);
+    return NIL;
+  });
+
+  K.registerNative("dom-insert-before", function(args) {
+    var parent = args[0], node = args[1], ref = args[2];
+    if (parent && node) parent.insertBefore(node, ref || null);
+    return NIL;
+  });
+
+  K.registerNative("dom-insert-after", function(args) {
+    var ref = args[0], node = args[1];
+    if (ref && ref.parentNode && node) {
+      ref.parentNode.insertBefore(node, ref.nextSibling);
+    }
+    return NIL;
+  });
+
+  K.registerNative("dom-remove", function(args) {
+    var node = args[0];
+    if (node && node.parentNode) node.parentNode.removeChild(node);
+    return NIL;
+  });
+
+  K.registerNative("dom-remove-child", function(args) {
+    var parent = args[0], child = args[1];
+    if (parent && child && child.parentNode === parent) parent.removeChild(child);
+    return NIL;
+  });
+
+  K.registerNative("dom-replace-child", function(args) {
+    var parent = args[0], newC = args[1], oldC = args[2];
+    if (parent && newC && oldC) parent.replaceChild(newC, oldC);
+    return NIL;
+  });
+
+  K.registerNative("dom-remove-children-after", function(args) {
+    var marker = args[0];
+    if (!marker || !marker.parentNode) return NIL;
+    var parent = marker.parentNode;
+    while (marker.nextSibling) parent.removeChild(marker.nextSibling);
+    return NIL;
+  });
+
+  K.registerNative("dom-append-to-head", function(args) {
+    if (_hasDom && args[0]) document.head.appendChild(args[0]);
+    return NIL;
+  });
+
+  // =========================================================================
+  // 7. DOM Type Checks
+  // =========================================================================
+
+  K.registerNative("dom-is-fragment?", function(args) { return args[0] ? args[0].nodeType === 11 : false; });
+  K.registerNative("dom-is-child-of?", function(args) { return !!(args[1] && args[0] && args[0].parentNode === args[1]); });
+  K.registerNative("dom-is-active-element?", function(args) { return _hasDom && args[0] === document.activeElement; });
+  K.registerNative("dom-is-input-element?", function(args) {
+    if (!args[0] || !args[0].tagName) return false;
+    var t = args[0].tagName;
+    return t === "INPUT" || t === "TEXTAREA" || t === "SELECT";
+  });
+
+  // =========================================================================
+  // 8. DOM Styles & Classes
+  // =========================================================================
+
+  K.registerNative("dom-get-style", function(args) {
+    return args[0] && args[0].style ? args[0].style[args[1]] || "" : "";
+  });
+
+  K.registerNative("dom-set-style", function(args) {
+    if (args[0] && args[0].style) args[0].style[args[1]] = args[2];
+    return NIL;
+  });
+
+  K.registerNative("dom-add-class", function(args) {
+    if (args[0] && args[0].classList) args[0].classList.add(args[1]);
+    return NIL;
+  });
+
+  K.registerNative("dom-remove-class", function(args) {
+    if (args[0] && args[0].classList) args[0].classList.remove(args[1]);
+    return NIL;
+  });
+
+  K.registerNative("dom-has-class?", function(args) {
+    return !!(args[0] && args[0].classList && args[0].classList.contains(args[1]));
+  });
+
+  // =========================================================================
+  // 9. DOM Properties & Data
+  // =========================================================================
+
+  K.registerNative("dom-get-prop", function(args) { return args[0] ? args[0][args[1]] : NIL; });
+  K.registerNative("dom-set-prop", function(args) { if (args[0]) args[0][args[1]] = args[2]; return NIL; });
+
+  K.registerNative("dom-set-data", function(args) {
+    var el = args[0], key = args[1], val = args[2];
+    if (el) { if (!el._sxData) el._sxData = {}; el._sxData[key] = val; }
+    return NIL;
+  });
+
+  K.registerNative("dom-get-data", function(args) {
+    var el = args[0], key = args[1];
+    return (el && el._sxData) ? (el._sxData[key] != null ? el._sxData[key] : NIL) : NIL;
+  });
+
+  K.registerNative("dom-call-method", function(args) {
+    var obj = args[0], method = args[1];
+    var callArgs = args.slice(2);
+    if (obj && typeof obj[method] === "function") {
+      try { return obj[method].apply(obj, callArgs); }
+      catch(e) { return NIL; }
+    }
+    return NIL;
+  });
+
+  // =========================================================================
+  // 10. DOM Events
+  // =========================================================================
+
+  K.registerNative("dom-listen", function(args) {
+    var el = args[0], name = args[1], handler = args[2];
+    if (!_hasDom || !el) return function() {};
+
+    // handler is a wrapped SX lambda (JS function with __sx_handle).
+    // Wrap it to:
+    //   - Pass the event object as arg (or no args for 0-arity handlers)
+    //   - Catch errors from the CEK machine
+    var arity = K.fnArity(handler);
+    var wrapped;
+    if (arity === 0) {
+      wrapped = function(_e) {
+        try { K.callFn(handler, []); }
+        catch(err) { console.error("[sx] event handler error:", name, err); }
+      };
+    } else {
+      wrapped = function(e) {
+        try { K.callFn(handler, [e]); }
+        catch(err) { console.error("[sx] event handler error:", name, err); }
+      };
+    }
+    el.addEventListener(name, wrapped);
+    return function() { el.removeEventListener(name, wrapped); };
+  });
+
+  K.registerNative("dom-dispatch", function(args) {
+    if (!_hasDom || !args[0]) return false;
+    var evt = new CustomEvent(args[1], { bubbles: true, cancelable: true, detail: args[2] || {} });
+    return args[0].dispatchEvent(evt);
+  });
+
+  K.registerNative("event-detail", function(args) {
+    return (args[0] && args[0].detail != null) ? args[0].detail : NIL;
+  });
+
+  // =========================================================================
+  // 11. Browser Navigation & History
+  // =========================================================================
+
+  K.registerNative("browser-location-href", function(_args) {
+    return typeof location !== "undefined" ? location.href : "";
+  });
+
+  K.registerNative("browser-same-origin?", function(args) {
+    try { return new URL(args[0], location.href).origin === location.origin; }
+    catch (e) { return true; }
+  });
+
+  K.registerNative("browser-push-state", function(args) {
+    if (typeof history !== "undefined") {
+      try { history.pushState({ sxUrl: args[0], scrollY: typeof window !== "undefined" ? window.scrollY : 0 }, "", args[0]); }
+      catch (e) {}
+    }
+    return NIL;
+  });
+
+  K.registerNative("browser-replace-state", function(args) {
+    if (typeof history !== "undefined") {
+      try { history.replaceState({ sxUrl: args[0], scrollY: typeof window !== "undefined" ? window.scrollY : 0 }, "", args[0]); }
+      catch (e) {}
+    }
+    return NIL;
+  });
+
+  K.registerNative("browser-navigate", function(args) {
+    if (typeof location !== "undefined") location.assign(args[0]);
+    return NIL;
+  });
+
+  K.registerNative("browser-reload", function(_args) {
+    if (typeof location !== "undefined") location.reload();
+    return NIL;
+  });
+
+  K.registerNative("browser-scroll-to", function(args) {
+    if (typeof window !== "undefined") window.scrollTo(args[0] || 0, args[1] || 0);
+    return NIL;
+  });
+
+  K.registerNative("browser-media-matches?", function(args) {
+    if (typeof window === "undefined") return false;
+    return window.matchMedia(args[0]).matches;
+  });
+
+  K.registerNative("browser-confirm", function(args) {
+    if (typeof window === "undefined") return false;
+    return window.confirm(args[0]);
+  });
+
+  K.registerNative("browser-prompt", function(args) {
+    if (typeof window === "undefined") return NIL;
+    var r = window.prompt(args[0]);
+    return r === null ? NIL : r;
+  });
+
+  // =========================================================================
+  // 12. Timers
+  // =========================================================================
+
+  K.registerNative("set-timeout", function(args) {
+    var fn = args[0], ms = args[1] || 0;
+    var cb = (typeof fn === "function" && fn.__sx_handle != null)
+      ? function() { try { K.callFn(fn, []); } catch(e) { console.error("[sx] timeout error:", e); } }
+      : fn;
+    return setTimeout(cb, ms);
+  });
+
+  K.registerNative("set-interval", function(args) {
+    var fn = args[0], ms = args[1] || 1000;
+    var cb = (typeof fn === "function" && fn.__sx_handle != null)
+      ? function() { try { K.callFn(fn, []); } catch(e) { console.error("[sx] interval error:", e); } }
+      : fn;
+    return setInterval(cb, ms);
+  });
+
+  K.registerNative("clear-timeout", function(args) { clearTimeout(args[0]); return NIL; });
+  K.registerNative("clear-interval", function(args) { clearInterval(args[0]); return NIL; });
+  K.registerNative("now-ms", function(_args) {
+    return (typeof performance !== "undefined") ? performance.now() : Date.now();
+  });
+
+  K.registerNative("request-animation-frame", function(args) {
+    var fn = args[0];
+    var cb = (typeof fn === "function" && fn.__sx_handle != null)
+      ? function() { try { K.callFn(fn, []); } catch(e) { console.error("[sx] raf error:", e); } }
+      : fn;
+    if (typeof requestAnimationFrame !== "undefined") requestAnimationFrame(cb);
+    else setTimeout(cb, 16);
+    return NIL;
+  });
+
+  // =========================================================================
+  // 13. Promises
+  // =========================================================================
+
+  K.registerNative("promise-resolve", function(args) { return Promise.resolve(args[0]); });
+
+  K.registerNative("promise-then", function(args) {
+    var p = args[0];
+    if (!p || !p.then) return p;
+    var onResolve = function(v) { return K.callFn(args[1], [v]); };
+    var onReject = args[2] ? function(e) { return K.callFn(args[2], [e]); } : undefined;
+    return onReject ? p.then(onResolve, onReject) : p.then(onResolve);
+  });
+
+  K.registerNative("promise-catch", function(args) {
+    if (!args[0] || !args[0].catch) return args[0];
+    return args[0].catch(function(e) { return K.callFn(args[1], [e]); });
+  });
+
+  K.registerNative("promise-delayed", function(args) {
+    return new Promise(function(resolve) {
+      setTimeout(function() { resolve(args[1]); }, args[0]);
+    });
+  });
+
+  // =========================================================================
+  // 14. Abort Controllers
+  // =========================================================================
+
+  var _controllers = typeof WeakMap !== "undefined" ? new WeakMap() : null;
+  var _targetControllers = typeof WeakMap !== "undefined" ? new WeakMap() : null;
+
+  K.registerNative("new-abort-controller", function(_args) {
+    return typeof AbortController !== "undefined" ? new AbortController() : { signal: null, abort: function() {} };
+  });
+
+  K.registerNative("abort-previous", function(args) {
+    if (_controllers) { var prev = _controllers.get(args[0]); if (prev) prev.abort(); }
+    return NIL;
+  });
+
+  K.registerNative("track-controller", function(args) {
+    if (_controllers) _controllers.set(args[0], args[1]);
+    return NIL;
+  });
+
+  K.registerNative("abort-previous-target", function(args) {
+    if (_targetControllers) { var prev = _targetControllers.get(args[0]); if (prev) prev.abort(); }
+    return NIL;
+  });
+
+  K.registerNative("track-controller-target", function(args) {
+    if (_targetControllers) _targetControllers.set(args[0], args[1]);
+    return NIL;
+  });
+
+  K.registerNative("controller-signal", function(args) { return args[0] ? args[0].signal : NIL; });
+  K.registerNative("is-abort-error", function(args) { return args[0] && args[0].name === "AbortError"; });
+
+  // =========================================================================
+  // 15. Fetch
+  // =========================================================================
+
+  K.registerNative("fetch-request", function(args) {
+    var config = args[0], successFn = args[1], errorFn = args[2];
+    var opts = { method: config.method, headers: config.headers };
+    if (config.signal) opts.signal = config.signal;
+    if (config.body && config.method !== "GET") opts.body = config.body;
+    if (config["cross-origin"]) opts.credentials = "include";
+
+    return fetch(config.url, opts).then(function(resp) {
+      return resp.text().then(function(text) {
+        var getHeader = function(name) {
+          var v = resp.headers.get(name);
+          return v === null ? NIL : v;
+        };
+        return K.callFn(successFn, [resp.ok, resp.status, getHeader, text]);
+      });
+    }).catch(function(err) {
+      return K.callFn(errorFn, [err]);
+    });
+  });
+
+  K.registerNative("csrf-token", function(_args) {
+    if (!_hasDom) return NIL;
+    var m = document.querySelector('meta[name="csrf-token"]');
+    return m ? m.getAttribute("content") : NIL;
+  });
+
+  K.registerNative("is-cross-origin", function(args) {
+    try {
+      var h = new URL(args[0], location.href).hostname;
+      return h !== location.hostname &&
+        (h.indexOf(".rose-ash.com") >= 0 || h.indexOf(".localhost") >= 0);
+    } catch (e) { return false; }
+  });
+
+  // =========================================================================
+  // 16. localStorage
+  // =========================================================================
+
+  K.registerNative("local-storage-get", function(args) {
+    try { var v = localStorage.getItem(args[0]); return v === null ? NIL : v; }
+    catch(e) { return NIL; }
+  });
+
+  K.registerNative("local-storage-set", function(args) {
+    try { localStorage.setItem(args[0], args[1]); } catch(e) {}
+    return NIL;
+  });
+
+  K.registerNative("local-storage-remove", function(args) {
+    try { localStorage.removeItem(args[0]); } catch(e) {}
+    return NIL;
+  });
+
+  // =========================================================================
+  // 17. Document Head & Title
+  // =========================================================================
+
+  K.registerNative("set-document-title", function(args) {
+    if (_hasDom) document.title = args[0] || "";
+    return NIL;
+  });
+
+  K.registerNative("remove-head-element", function(args) {
+    if (_hasDom) {
+      var el = document.head.querySelector(args[0]);
+      if (el) el.remove();
+    }
+    return NIL;
+  });
+
+  // =========================================================================
+  // 18. Logging
+  // =========================================================================
+
+  K.registerNative("log-info", function(args) { console.log("[sx]", args[0]); return NIL; });
+  K.registerNative("log-warn", function(args) { console.warn("[sx]", args[0]); return NIL; });
+  K.registerNative("log-error", function(args) { console.error("[sx]", args[0]); return NIL; });
+
+  // =========================================================================
+  // 19. JSON
+  // =========================================================================
+
+  K.registerNative("json-parse", function(args) {
+    try { return JSON.parse(args[0]); } catch(e) { return {}; }
+  });
+
+  K.registerNative("try-parse-json", function(args) {
+    try { return JSON.parse(args[0]); } catch(e) { return NIL; }
+  });
+
+  // =========================================================================
+  // 20. Processing markers
+  // =========================================================================
+
+  K.registerNative("mark-processed!", function(args) {
+    var el = args[0], key = args[1] || "sx";
+    if (el) { if (!el._sxProcessed) el._sxProcessed = {}; el._sxProcessed[key] = true; }
+    return NIL;
+  });
+
+  K.registerNative("is-processed?", function(args) {
+    var el = args[0], key = args[1] || "sx";
+    return !!(el && el._sxProcessed && el._sxProcessed[key]);
+  });
+
+  // =========================================================================
+  // Public Sx API (wraps SxKernel for compatibility with existing code)
+  // =========================================================================
+
+  var Sx = {
+    // Core (delegated to WASM engine)
+    parse: K.parse,
+    eval: K.eval,
+    evalExpr: K.evalExpr,
+    load: K.load,
+    loadSource: K.loadSource,
+    renderToHtml: K.renderToHtml,
+    typeOf: K.typeOf,
+    inspect: K.inspect,
+    engine: K.engine,
+
+    // Will be populated after web adapters load:
+    // mount, hydrate, processElements, etc.
+  };
+
+  global.Sx = Sx;
+  global.SxKernel = K;  // Keep kernel available for direct access
+
+  console.log("[sx-platform] registered, engine:", K.engine());
+
+  } // end initPlatform
+
+  initPlatform();
+
+})(typeof globalThis !== "undefined" ? globalThis : this);

hosts/ocaml/browser/sx_browser.ml

@@ -0,0 +1,946 @@
+(** sx_browser.ml — OCaml SX engine compiled to WASM/JS for browser use.
+
+    Exposes the CEK machine, parser, and primitives as a global [Sx] object
+    that the thin JS platform layer binds to. *)
+
+open Js_of_ocaml
+open Sx_types
+
+(* ================================================================== *)
+(* Value conversion: OCaml <-> JS                                      *)
+(* ================================================================== *)
+
+(* ------------------------------------------------------------------ *)
+(* Opaque value handle table                                           *)
+(*                                                                     *)
+(* Non-primitive SX values (lambdas, components, signals, etc.) are    *)
+(* stored in a handle table and represented on the JS side as objects  *)
+(* with an __sx_handle integer key.  This preserves identity across    *)
+(* the JS↔OCaml boundary — the same handle always resolves to the     *)
+(* same OCaml value.                                                   *)
+(*                                                                     *)
+(* Callable values (Lambda, NativeFn, Continuation) are additionally  *)
+(* wrapped as JS functions so they can be used directly as event       *)
+(* listeners, setTimeout callbacks, etc.                               *)
+(* ------------------------------------------------------------------ *)
+
+let _next_handle = ref 0
+let _handle_table : (int, value) Hashtbl.t = Hashtbl.create 256
+
+(** Store a value in the handle table, return its handle id. *)
+let alloc_handle (v : value) : int =
+  let id = !_next_handle in
+  incr _next_handle;
+  Hashtbl.replace _handle_table id v;
+  id
+
+(** Look up a value by handle. *)
+let get_handle (id : int) : value =
+  match Hashtbl.find_opt _handle_table id with
+  | Some v -> v
+  | None -> raise (Eval_error (Printf.sprintf "Invalid SX handle: %d" id))
+
+(** Late-bound reference to global env (set after global_env is created). *)
+let _global_env_ref : env option ref = ref None
+let get_global_env () = match !_global_env_ref with
+  | Some e -> e | None -> raise (Eval_error "Global env not initialized")
+
+(** Call an SX callable through the CEK machine.
+    Constructs (fn arg1 arg2 ...) and evaluates it. *)
+let call_sx_fn (fn : value) (args : value list) : value =
+  Sx_ref.eval_expr (List (fn :: args)) (Env (get_global_env ()))
+
+(** Convert an OCaml SX value to a JS representation.
+    Primitive types map directly.
+    Callable values become JS functions (with __sx_handle).
+    Other compound types become tagged objects (with __sx_handle). *)
+let rec value_to_js (v : value) : Js.Unsafe.any =
+  match v with
+  | Nil -> Js.Unsafe.inject Js.null
+  | Bool b -> Js.Unsafe.inject (Js.bool b)
+  | Number n -> Js.Unsafe.inject (Js.number_of_float n)
+  | String s -> Js.Unsafe.inject (Js.string s)
+  | Symbol s ->
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string "symbol"));
+                                ("name", Js.Unsafe.inject (Js.string s)) |] in
+    Js.Unsafe.inject obj
+  | Keyword k ->
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string "keyword"));
+                                ("name", Js.Unsafe.inject (Js.string k)) |] in
+    Js.Unsafe.inject obj
+  | List items ->
+    let arr = items |> List.map value_to_js |> Array.of_list in
+    let js_arr = Js.array arr in
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string "list"));
+                                ("items", Js.Unsafe.inject js_arr) |] in
+    Js.Unsafe.inject obj
+  | ListRef r ->
+    let arr = !r |> List.map value_to_js |> Array.of_list in
+    let js_arr = Js.array arr in
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string "list"));
+                                ("items", Js.Unsafe.inject js_arr) |] in
+    Js.Unsafe.inject obj
+  | Dict d ->
+    let obj = Js.Unsafe.obj [||] in
+    Js.Unsafe.set obj (Js.string "_type") (Js.string "dict");
+    Hashtbl.iter (fun k v ->
+      Js.Unsafe.set obj (Js.string k) (value_to_js v)
+    ) d;
+    Js.Unsafe.inject obj
+  | RawHTML s -> Js.Unsafe.inject (Js.string s)
+  (* Callable values: wrap as JS functions *)
+  | Lambda _ | NativeFn _ | Continuation _ ->
+    let handle = alloc_handle v in
+    (* Create a JS function that calls back into the CEK machine.
+       Use _tagFn helper (registered on globalThis) to create a function
+       with __sx_handle and _type properties that survive js_of_ocaml
+       return-value wrapping. *)
+    let inner = Js.wrap_callback (fun args_js ->
+      try
+        let arg = js_to_value args_js in
+        let args = match arg with Nil -> [] | _ -> [arg] in
+        let result = call_sx_fn v args in
+        value_to_js result
+      with Eval_error msg ->
+        ignore (Js.Unsafe.meth_call (Js.Unsafe.get Js.Unsafe.global (Js.string "console"))
+          "error" [| Js.Unsafe.inject (Js.string (Printf.sprintf "[sx] callback error: %s" msg)) |]);
+        Js.Unsafe.inject Js.null
+    ) in
+    let tag_fn = Js.Unsafe.get Js.Unsafe.global (Js.string "__sxTagFn") in
+    Js.Unsafe.fun_call tag_fn [|
+      Js.Unsafe.inject inner;
+      Js.Unsafe.inject handle;
+      Js.Unsafe.inject (Js.string (type_of v))
+    |]
+  (* Non-callable compound values: tagged objects with handle *)
+  | Component c ->
+    let handle = alloc_handle v in
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string "component"));
+                                ("name", Js.Unsafe.inject (Js.string c.c_name));
+                                ("__sx_handle", Js.Unsafe.inject handle) |] in
+    Js.Unsafe.inject obj
+  | Island i ->
+    let handle = alloc_handle v in
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string "island"));
+                                ("name", Js.Unsafe.inject (Js.string i.i_name));
+                                ("__sx_handle", Js.Unsafe.inject handle) |] in
+    Js.Unsafe.inject obj
+  | Signal _ ->
+    let handle = alloc_handle v in
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string "signal"));
+                                ("__sx_handle", Js.Unsafe.inject handle) |] in
+    Js.Unsafe.inject obj
+  | _ ->
+    let handle = alloc_handle v in
+    let obj = Js.Unsafe.obj [| ("_type", Js.Unsafe.inject (Js.string (type_of v)));
+                                ("__sx_handle", Js.Unsafe.inject handle) |] in
+    Js.Unsafe.inject obj
+
+(** Convert a JS value back to an OCaml SX value. *)
+and js_to_value (js : Js.Unsafe.any) : value =
+  (* Check null/undefined *)
+  if Js.Unsafe.equals js Js.null || Js.Unsafe.equals js Js.undefined then
+    Nil
+  else
+    let ty = Js.to_string (Js.typeof js) in
+    match ty with
+    | "number" ->
+      Number (Js.float_of_number (Js.Unsafe.coerce js))
+    | "boolean" ->
+      Bool (Js.to_bool (Js.Unsafe.coerce js))
+    | "string" ->
+      String (Js.to_string (Js.Unsafe.coerce js))
+    | "function" ->
+      (* Check for __sx_handle — this is a wrapped SX callable *)
+      let handle_field = Js.Unsafe.get js (Js.string "__sx_handle") in
+      if not (Js.Unsafe.equals handle_field Js.undefined) then
+        let id = Js.float_of_number (Js.Unsafe.coerce handle_field) |> int_of_float in
+        get_handle id
+      else
+        (* Plain JS function — wrap as NativeFn *)
+        NativeFn ("js-callback", fun args ->
+          let js_args = args |> List.map value_to_js |> Array.of_list in
+          let result = Js.Unsafe.fun_call js
+            (Array.map (fun a -> a) js_args) in
+          js_to_value result)
+    | "object" ->
+      (* Check for __sx_handle — this is a wrapped SX value *)
+      let handle_field = Js.Unsafe.get js (Js.string "__sx_handle") in
+      if not (Js.Unsafe.equals handle_field Js.undefined) then begin
+        let id = Js.float_of_number (Js.Unsafe.coerce handle_field) |> int_of_float in
+        get_handle id
+      end else begin
+        (* Check for _type tag *)
+        let type_field = Js.Unsafe.get js (Js.string "_type") in
+        if Js.Unsafe.equals type_field Js.undefined then begin
+          (* Check if it's an array *)
+          let is_arr = Js.to_bool (Js.Unsafe.global##._Array##isArray js) in
+          if is_arr then begin
+            let len_js = Js.Unsafe.get js (Js.string "length") in
+            let n = Js.float_of_number (Js.Unsafe.coerce len_js) |> int_of_float in
+            let items = List.init n (fun i ->
+              js_to_value (Js.array_get (Js.Unsafe.coerce js) i
+                           |> Js.Optdef.to_option |> Option.get)
+            ) in
+            List items
+          end else begin
+            (* Plain JS object — convert to dict *)
+            let d = Hashtbl.create 8 in
+            let keys = Js.Unsafe.global##._Object##keys js in
+            let len = keys##.length in
+            for i = 0 to len - 1 do
+              let k = Js.to_string (Js.array_get keys i |> Js.Optdef.to_option |> Option.get) in
+              let v = Js.Unsafe.get js (Js.string k) in
+              Hashtbl.replace d k (js_to_value v)
+            done;
+            Dict d
+          end
+        end else begin
+          let tag = Js.to_string (Js.Unsafe.coerce type_field) in
+          match tag with
+          | "symbol" ->
+            Symbol (Js.to_string (Js.Unsafe.get js (Js.string "name")))
+          | "keyword" ->
+            Keyword (Js.to_string (Js.Unsafe.get js (Js.string "name")))
+          | "list" ->
+            let items_js = Js.Unsafe.get js (Js.string "items") in
+            let len = Js.Unsafe.get items_js (Js.string "length") in
+            let n = Js.float_of_number (Js.Unsafe.coerce len) |> int_of_float in
+            let items = List.init n (fun i ->
+              js_to_value (Js.array_get (Js.Unsafe.coerce items_js) i
+                           |> Js.Optdef.to_option |> Option.get)
+            ) in
+            List items
+          | "dict" ->
+            let d = Hashtbl.create 8 in
+            let keys = Js.Unsafe.global##._Object##keys js in
+            let len = keys##.length in
+            for i = 0 to len - 1 do
+              let k = Js.to_string (Js.array_get keys i |> Js.Optdef.to_option |> Option.get) in
+              if k <> "_type" then begin
+                let v = Js.Unsafe.get js (Js.string k) in
+                Hashtbl.replace d k (js_to_value v)
+              end
+            done;
+            Dict d
+          | _ -> Nil
+        end
+      end
+    | _ -> Nil
+
+(* ================================================================== *)
+(* Global environment                                                  *)
+(* ================================================================== *)
+
+let global_env = make_env ()
+let () = _global_env_ref := Some global_env
+
+(* Render mode flag — set true during renderToHtml/loadSource calls
+   that should dispatch HTML tags to the renderer. *)
+let _sx_render_mode = ref false
+
+(* Register JS helpers.
+   __sxTagFn: tag a function with __sx_handle and _type properties.
+   __sxR: side-channel for return values (bypasses Js.wrap_callback
+          which strips custom properties from function objects). *)
+let () =
+  let tag_fn = Js.Unsafe.pure_js_expr
+    "(function(fn, handle, type) { fn.__sx_handle = handle; fn._type = type; return fn; })" in
+  Js.Unsafe.set Js.Unsafe.global (Js.string "__sxTagFn") tag_fn
+
+(** Store a value in the side-channel and return a sentinel.
+    The JS wrapper picks up __sxR instead of the return value. *)
+let return_via_side_channel (v : Js.Unsafe.any) : Js.Unsafe.any =
+  Js.Unsafe.set Js.Unsafe.global (Js.string "__sxR") v;
+  v
+
+(* ================================================================== *)
+(* Core API functions                                                  *)
+(* ================================================================== *)
+
+(** Parse SX source string into a list of values. *)
+let api_parse src_js =
+  let src = Js.to_string src_js in
+  try
+    let values = Sx_parser.parse_all src in
+    let arr = values |> List.map value_to_js |> Array.of_list in
+    Js.Unsafe.inject (Js.array arr)
+  with Parse_error msg ->
+    Js.Unsafe.inject (Js.string ("Parse error: " ^ msg))
+
+(** Serialize an SX value to source text. *)
+let api_stringify v_js =
+  let v = js_to_value v_js in
+  Js.Unsafe.inject (Js.string (inspect v))
+
+(** Evaluate a single SX expression in the global environment. *)
+let api_eval_expr expr_js env_js =
+  let expr = js_to_value expr_js in
+  let _env = if Js.Unsafe.equals env_js Js.undefined then global_env
+             else global_env in
+  try
+    let result = Sx_ref.eval_expr expr (Env _env) in
+    return_via_side_channel (value_to_js result)
+  with Eval_error msg ->
+    Js.Unsafe.inject (Js.string ("Error: " ^ msg))
+
+(** Evaluate SX source string and return the last result. *)
+let api_eval src_js =
+  let src = Js.to_string src_js in
+  try
+    let exprs = Sx_parser.parse_all src in
+    let env = Env global_env in
+    let result = List.fold_left (fun _acc expr ->
+      Sx_ref.eval_expr expr env
+    ) Nil exprs in
+    return_via_side_channel (value_to_js result)
+  with
+  | Eval_error msg -> Js.Unsafe.inject (Js.string ("Error: " ^ msg))
+  | Parse_error msg -> Js.Unsafe.inject (Js.string ("Parse error: " ^ msg))
+
+(** Run the CEK machine on an expression, return result. *)
+let api_cek_run expr_js =
+  let expr = js_to_value expr_js in
+  try
+    let state = Sx_ref.make_cek_state expr (Env global_env) Nil in
+    let result = Sx_ref.cek_run_iterative state in
+    return_via_side_channel (value_to_js result)
+  with Eval_error msg ->
+    Js.Unsafe.inject (Js.string ("Error: " ^ msg))
+
+(** Render SX expression to HTML string. *)
+let api_render_to_html expr_js =
+  let expr = js_to_value expr_js in
+  let prev = !_sx_render_mode in
+  _sx_render_mode := true;
+  try
+    let html = Sx_render.render_to_html expr global_env in
+    _sx_render_mode := prev;
+    Js.Unsafe.inject (Js.string html)
+  with Eval_error msg ->
+    _sx_render_mode := prev;
+    Js.Unsafe.inject (Js.string ("Error: " ^ msg))
+
+(** Load SX source for side effects (define, defcomp, defmacro). *)
+let api_load src_js =
+  let src = Js.to_string src_js in
+  try
+    let exprs = Sx_parser.parse_all src in
+    let env = Env global_env in
+    let count = ref 0 in
+    List.iter (fun expr ->
+      ignore (Sx_ref.eval_expr expr env);
+      incr count
+    ) exprs;
+    Js.Unsafe.inject !count
+  with
+  | Eval_error msg -> Js.Unsafe.inject (Js.string ("Error: " ^ msg))
+  | Parse_error msg -> Js.Unsafe.inject (Js.string ("Parse error: " ^ msg))
+
+(** Get the type of an SX value. *)
+let api_type_of v_js =
+  let v = js_to_value v_js in
+  Js.Unsafe.inject (Js.string (type_of v))
+
+(** Inspect an SX value (debug string). *)
+let api_inspect v_js =
+  let v = js_to_value v_js in
+  Js.Unsafe.inject (Js.string (inspect v))
+
+(** Get engine identity. *)
+let api_engine () =
+  Js.Unsafe.inject (Js.string "ocaml-cek-wasm")
+
+(** Register a JS callback as a named native function in the global env.
+    JS callback receives JS-converted args and should return a JS value. *)
+let api_register_native name_js callback_js =
+  let name = Js.to_string name_js in
+  let native_fn args =
+    let js_args = args |> List.map value_to_js |> Array.of_list in
+    let result = Js.Unsafe.fun_call callback_js
+      [| Js.Unsafe.inject (Js.array js_args) |] in
+    js_to_value result
+  in
+  ignore (env_bind global_env name (NativeFn (name, native_fn)));
+  Js.Unsafe.inject Js.null
+
+(** Call an SX callable (lambda, native fn) with JS args.
+    fn_js can be a wrapped SX callable (with __sx_handle) or a JS value.
+    args_js is a JS array of arguments. *)
+let api_call_fn fn_js args_js =
+  try
+    let fn = js_to_value fn_js in
+    let args_arr = Js.to_array (Js.Unsafe.coerce args_js) in
+    let args = Array.to_list (Array.map js_to_value args_arr) in
+    let result = call_sx_fn fn args in
+    return_via_side_channel (value_to_js result)
+  with
+  | Eval_error msg ->
+    ignore (Js.Unsafe.meth_call (Js.Unsafe.get Js.Unsafe.global (Js.string "console"))
+      "error" [| Js.Unsafe.inject (Js.string (Printf.sprintf "[sx] callFn error: %s" msg)) |]);
+    Js.Unsafe.inject Js.null
+  | exn ->
+    ignore (Js.Unsafe.meth_call (Js.Unsafe.get Js.Unsafe.global (Js.string "console"))
+      "error" [| Js.Unsafe.inject (Js.string (Printf.sprintf "[sx] callFn error: %s" (Printexc.to_string exn))) |]);
+    Js.Unsafe.inject Js.null
+
+(** Check if a JS value is a wrapped SX callable. *)
+let api_is_callable fn_js =
+  if Js.Unsafe.equals fn_js Js.null || Js.Unsafe.equals fn_js Js.undefined then
+    Js.Unsafe.inject (Js.bool false)
+  else
+    let handle_field = Js.Unsafe.get fn_js (Js.string "__sx_handle") in
+    if not (Js.Unsafe.equals handle_field Js.undefined) then begin
+      let id = Js.float_of_number (Js.Unsafe.coerce handle_field) |> int_of_float in
+      let v = get_handle id in
+      Js.Unsafe.inject (Js.bool (is_callable v))
+    end else
+      Js.Unsafe.inject (Js.bool false)
+
+(** Get the parameter count of an SX callable (for zero-arg optimization). *)
+let api_fn_arity fn_js =
+  let handle_field = Js.Unsafe.get fn_js (Js.string "__sx_handle") in
+  if Js.Unsafe.equals handle_field Js.undefined then
+    Js.Unsafe.inject (Js.number_of_float (-1.0))
+  else
+    let id = Js.float_of_number (Js.Unsafe.coerce handle_field) |> int_of_float in
+    let v = get_handle id in
+    match v with
+    | Lambda l -> Js.Unsafe.inject (Js.number_of_float (float_of_int (List.length l.l_params)))
+    | _ -> Js.Unsafe.inject (Js.number_of_float (-1.0))
+
+(** Load and evaluate SX source string with error wrapping (for test runner). *)
+let api_load_source src_js =
+  let src = Js.to_string src_js in
+  try
+    let exprs = Sx_parser.parse_all src in
+    let env = Env global_env in
+    let count = ref 0 in
+    List.iter (fun expr ->
+      ignore (Sx_ref.eval_expr expr env);
+      incr count
+    ) exprs;
+    Js.Unsafe.inject !count
+  with
+  | Eval_error msg -> Js.Unsafe.inject (Js.string ("Error: " ^ msg))
+  | Parse_error msg -> Js.Unsafe.inject (Js.string ("Parse error: " ^ msg))
+  | exn -> Js.Unsafe.inject (Js.string ("Error: " ^ Printexc.to_string exn))
+
+(* ================================================================== *)
+(* Register global Sx object                                           *)
+(* ================================================================== *)
+
+(* ================================================================== *)
+(* Platform test functions (registered in global env)                   *)
+(* ================================================================== *)
+
+let () =
+  let bind name fn =
+    ignore (env_bind global_env name (NativeFn (name, fn)))
+  in
+
+  (* --- Deep equality --- *)
+  let rec deep_equal a b =
+    match a, b with
+    | Nil, Nil -> true
+    | Bool a, Bool b -> a = b
+    | Number a, Number b -> a = b
+    | String a, String b -> a = b
+    | Symbol a, Symbol b -> a = b
+    | Keyword a, Keyword b -> a = b
+    | (List a | ListRef { contents = a }), (List b | ListRef { contents = b }) ->
+      List.length a = List.length b && List.for_all2 deep_equal a b
+    | Dict a, Dict b ->
+      let ka = Hashtbl.fold (fun k _ acc -> k :: acc) a [] in
+      let kb = Hashtbl.fold (fun k _ acc -> k :: acc) b [] in
+      List.length ka = List.length kb &&
+      List.for_all (fun k ->
+        Hashtbl.mem b k &&
+        deep_equal
+          (match Hashtbl.find_opt a k with Some v -> v | None -> Nil)
+          (match Hashtbl.find_opt b k with Some v -> v | None -> Nil)) ka
+    | Lambda _, Lambda _ -> a == b
+    | NativeFn _, NativeFn _ -> a == b
+    | _ -> false
+  in
+
+  (* --- try-call --- *)
+  bind "try-call" (fun args ->
+    match args with
+    | [thunk] ->
+      (try
+        ignore (Sx_ref.eval_expr (List [thunk]) (Env global_env));
+        let d = Hashtbl.create 2 in
+        Hashtbl.replace d "ok" (Bool true); Dict d
+      with
+      | Eval_error msg ->
+        let d = Hashtbl.create 2 in
+        Hashtbl.replace d "ok" (Bool false);
+        Hashtbl.replace d "error" (String msg); Dict d
+      | exn ->
+        let d = Hashtbl.create 2 in
+        Hashtbl.replace d "ok" (Bool false);
+        Hashtbl.replace d "error" (String (Printexc.to_string exn)); Dict d)
+    | _ -> raise (Eval_error "try-call: expected 1 arg"));
+
+  (* --- Evaluation --- *)
+  bind "cek-eval" (fun args ->
+    match args with
+    | [expr] -> Sx_ref.eval_expr expr (Env global_env)
+    | [expr; env_val] -> Sx_ref.eval_expr expr env_val
+    | _ -> raise (Eval_error "cek-eval: expected 1-2 args"));
+
+  bind "eval-expr-cek" (fun args ->
+    match args with
+    | [expr] -> Sx_ref.eval_expr expr (Env global_env)
+    | [expr; env_val] -> Sx_ref.eval_expr expr env_val
+    | _ -> raise (Eval_error "eval-expr-cek: expected 1-2 args"));
+
+  bind "sx-parse" (fun args ->
+    match args with
+    | [String src] -> List (Sx_parser.parse_all src)
+    | _ -> raise (Eval_error "sx-parse: expected string"));
+
+  (* --- Equality and assertions --- *)
+  bind "equal?" (fun args ->
+    match args with
+    | [a; b] -> Bool (deep_equal a b)
+    | _ -> raise (Eval_error "equal?: expected 2 args"));
+
+  bind "identical?" (fun args ->
+    match args with
+    | [a; b] -> Bool (a == b)
+    | _ -> raise (Eval_error "identical?: expected 2 args"));
+
+  bind "assert" (fun args ->
+    match args with
+    | [cond] ->
+      if not (sx_truthy cond) then raise (Eval_error "Assertion failed");
+      Bool true
+    | [cond; String msg] ->
+      if not (sx_truthy cond) then raise (Eval_error ("Assertion error: " ^ msg));
+      Bool true
+    | [cond; msg] ->
+      if not (sx_truthy cond) then
+        raise (Eval_error ("Assertion error: " ^ value_to_string msg));
+      Bool true
+    | _ -> raise (Eval_error "assert: expected 1-2 args"));
+
+  (* --- List mutation --- *)
+  bind "append!" (fun args ->
+    match args with
+    | [ListRef r; v] -> r := !r @ [v]; ListRef r
+    | [List items; v] -> List (items @ [v])
+    | _ -> raise (Eval_error "append!: expected list and value"));
+
+  (* --- Environment ops --- *)
+  bind "make-env" (fun _args -> Env (make_env ()));
+
+  bind "env-has?" (fun args ->
+    match args with
+    | [Env e; String k] -> Bool (env_has e k)
+    | [Env e; Keyword k] -> Bool (env_has e k)
+    | _ -> raise (Eval_error "env-has?: expected env and key"));
+
+  bind "env-get" (fun args ->
+    match args with
+    | [Env e; String k] -> env_get e k
+    | [Env e; Keyword k] -> env_get e k
+    | _ -> raise (Eval_error "env-get: expected env and key"));
+
+  bind "env-bind!" (fun args ->
+    match args with
+    | [Env e; String k; v] -> env_bind e k v
+    | [Env e; Keyword k; v] -> env_bind e k v
+    | _ -> raise (Eval_error "env-bind!: expected env, key, value"));
+
+  bind "env-set!" (fun args ->
+    match args with
+    | [Env e; String k; v] -> env_set e k v
+    | [Env e; Keyword k; v] -> env_set e k v
+    | _ -> raise (Eval_error "env-set!: expected env, key, value"));
+
+  bind "env-extend" (fun args ->
+    match args with
+    | [Env e] -> Env (env_extend e)
+    | _ -> raise (Eval_error "env-extend: expected env"));
+
+  bind "env-merge" (fun args ->
+    match args with
+    | [Env a; Env b] -> Env (env_merge a b)
+    | _ -> raise (Eval_error "env-merge: expected 2 envs"));
+
+  (* --- Continuation support --- *)
+  bind "make-continuation" (fun args ->
+    match args with
+    | [f] ->
+      let k v = Sx_runtime.sx_call f [v] in
+      Continuation (k, None)
+    | _ -> raise (Eval_error "make-continuation: expected 1 arg"));
+
+  bind "continuation?" (fun args ->
+    match args with
+    | [Continuation _] -> Bool true
+    | [_] -> Bool false
+    | _ -> raise (Eval_error "continuation?: expected 1 arg"));
+
+  bind "continuation-fn" (fun args ->
+    match args with
+    | [Continuation (f, _)] -> NativeFn ("continuation-fn-result", fun args ->
+        (match args with [v] -> f v | _ -> f Nil))
+    | _ -> raise (Eval_error "continuation-fn: expected continuation"));
+
+  (* --- Missing primitives --- *)
+  bind "make-keyword" (fun args ->
+    match args with
+    | [String s] -> Keyword s
+    | _ -> raise (Eval_error "make-keyword: expected string"));
+
+  (* --- Test helpers --- *)
+  bind "sx-parse-one" (fun args ->
+    match args with
+    | [String src] ->
+      let exprs = Sx_parser.parse_all src in
+      (match exprs with e :: _ -> e | [] -> Nil)
+    | _ -> raise (Eval_error "sx-parse-one: expected string"));
+
+  bind "test-env" (fun _args -> Env (env_extend global_env));
+
+  (* cek-eval takes a string in the native runner *)
+  bind "cek-eval" (fun args ->
+    match args with
+    | [String s] ->
+      let exprs = Sx_parser.parse_all s in
+      (match exprs with
+       | e :: _ -> Sx_ref.eval_expr e (Env global_env)
+       | [] -> Nil)
+    | [expr] -> Sx_ref.eval_expr expr (Env global_env)
+    | [expr; env_val] -> Sx_ref.eval_expr expr env_val
+    | _ -> raise (Eval_error "cek-eval: expected 1-2 args"));
+
+  bind "eval-expr-cek" (fun args ->
+    match args with
+    | [expr; e] -> Sx_ref.eval_expr expr e
+    | [expr] -> Sx_ref.eval_expr expr (Env global_env)
+    | _ -> raise (Eval_error "eval-expr-cek: expected 1-2 args"));
+
+  (* --- Component accessors --- *)
+  bind "component-params" (fun args ->
+    match args with
+    | [Component c] -> List (List.map (fun s -> String s) c.c_params)
+    | _ -> Nil);
+
+  bind "component-body" (fun args ->
+    match args with
+    | [Component c] -> c.c_body
+    | _ -> Nil);
+
+  bind "component-has-children" (fun args ->
+    match args with
+    | [Component c] -> Bool c.c_has_children
+    | _ -> Bool false);
+
+  bind "component-affinity" (fun args ->
+    match args with
+    | [Component c] -> String c.c_affinity
+    | _ -> String "auto");
+
+  bind "component-param-types" (fun _args -> Nil);
+  bind "component-set-param-types!" (fun _args -> Nil);
+
+  (* --- Parser/symbol helpers --- *)
+  bind "keyword-name" (fun args ->
+    match args with
+    | [Keyword k] -> String k
+    | _ -> raise (Eval_error "keyword-name: expected keyword"));
+
+  bind "symbol-name" (fun args ->
+    match args with
+    | [Symbol s] -> String s
+    | _ -> raise (Eval_error "symbol-name: expected symbol"));
+
+  bind "sx-serialize" (fun args ->
+    match args with
+    | [v] -> String (inspect v)
+    | _ -> raise (Eval_error "sx-serialize: expected 1 arg"));
+
+  bind "make-symbol" (fun args ->
+    match args with
+    | [String s] -> Symbol s
+    | [v] -> Symbol (value_to_string v)
+    | _ -> raise (Eval_error "make-symbol: expected 1 arg"));
+
+  (* --- CEK stepping / introspection --- *)
+  bind "make-cek-state" (fun args ->
+    match args with
+    | [ctrl; env'; kont] -> Sx_ref.make_cek_state ctrl env' kont
+    | _ -> raise (Eval_error "make-cek-state: expected 3 args"));
+
+  bind "cek-step" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_step state
+    | _ -> raise (Eval_error "cek-step: expected 1 arg"));
+
+  bind "cek-phase" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_phase state
+    | _ -> raise (Eval_error "cek-phase: expected 1 arg"));
+
+  bind "cek-value" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_value state
+    | _ -> raise (Eval_error "cek-value: expected 1 arg"));
+
+  bind "cek-terminal?" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_terminal_p state
+    | _ -> raise (Eval_error "cek-terminal?: expected 1 arg"));
+
+  bind "cek-kont" (fun args ->
+    match args with
+    | [state] -> Sx_ref.cek_kont state
+    | _ -> raise (Eval_error "cek-kont: expected 1 arg"));
+
+  bind "frame-type" (fun args ->
+    match args with
+    | [frame] -> Sx_ref.frame_type frame
+    | _ -> raise (Eval_error "frame-type: expected 1 arg"));
+
+  (* --- Strict mode --- *)
+  ignore (env_bind global_env "*strict*" (Bool false));
+  ignore (env_bind global_env "*prim-param-types*" Nil);
+
+  bind "set-strict!" (fun args ->
+    match args with
+    | [v] ->
+      Sx_ref._strict_ref := v;
+      ignore (env_set global_env "*strict*" v); Nil
+    | _ -> raise (Eval_error "set-strict!: expected 1 arg"));
+
+  bind "set-prim-param-types!" (fun args ->
+    match args with
+    | [v] ->
+      Sx_ref._prim_param_types_ref := v;
+      ignore (env_set global_env "*prim-param-types*" v); Nil
+    | _ -> raise (Eval_error "set-prim-param-types!: expected 1 arg"));
+
+  bind "value-matches-type?" (fun args ->
+    match args with
+    | [v; String expected] -> Sx_ref.value_matches_type_p v (String expected)
+    | _ -> raise (Eval_error "value-matches-type?: expected value and type string"));
+
+  (* --- Apply --- *)
+  bind "apply" (fun args ->
+    match args with
+    | f :: rest ->
+      let all_args = match List.rev rest with
+        | List last :: prefix -> List.rev prefix @ last
+        | _ -> rest
+      in
+      Sx_runtime.sx_call f all_args
+    | _ -> raise (Eval_error "apply: expected function and args"));
+
+  (* --- Type system test helpers (for --full tests) --- *)
+  bind "test-prim-types" (fun _args ->
+    let d = Hashtbl.create 40 in
+    List.iter (fun (k, v) -> Hashtbl.replace d k (String v)) [
+      "+", "number"; "-", "number"; "*", "number"; "/", "number";
+      "mod", "number"; "inc", "number"; "dec", "number";
+      "abs", "number"; "min", "number"; "max", "number";
+      "floor", "number"; "ceil", "number"; "round", "number";
+      "str", "string"; "upper", "string"; "lower", "string";
+      "trim", "string"; "join", "string"; "replace", "string";
+      "format", "string"; "substr", "string";
+      "=", "boolean"; "<", "boolean"; ">", "boolean";
+      "<=", "boolean"; ">=", "boolean"; "!=", "boolean";
+      "not", "boolean"; "nil?", "boolean"; "empty?", "boolean";
+      "number?", "boolean"; "string?", "boolean"; "boolean?", "boolean";
+      "list?", "boolean"; "dict?", "boolean"; "symbol?", "boolean";
+      "keyword?", "boolean"; "contains?", "boolean"; "has-key?", "boolean";
+      "starts-with?", "boolean"; "ends-with?", "boolean";
+      "len", "number"; "first", "any"; "rest", "list";
+      "last", "any"; "nth", "any"; "cons", "list";
+      "append", "list"; "concat", "list"; "reverse", "list";
+      "sort", "list"; "slice", "list"; "range", "list";
+      "flatten", "list"; "keys", "list"; "vals", "list";
+      "map-dict", "dict"; "assoc", "dict"; "dissoc", "dict";
+      "merge", "dict"; "dict", "dict";
+      "get", "any"; "type-of", "string";
+    ];
+    Dict d);
+
+  bind "test-prim-param-types" (fun _args ->
+    let d = Hashtbl.create 10 in
+    let pos name typ =
+      let d2 = Hashtbl.create 2 in
+      Hashtbl.replace d2 "positional" (List [List [String name; String typ]]);
+      Hashtbl.replace d2 "rest-type" Nil; Dict d2
+    in
+    let pos_rest name typ rt =
+      let d2 = Hashtbl.create 2 in
+      Hashtbl.replace d2 "positional" (List [List [String name; String typ]]);
+      Hashtbl.replace d2 "rest-type" (String rt); Dict d2
+    in
+    Hashtbl.replace d "+" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "-" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "*" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "/" (pos_rest "a" "number" "number");
+    Hashtbl.replace d "inc" (pos "n" "number");
+    Hashtbl.replace d "dec" (pos "n" "number");
+    Hashtbl.replace d "upper" (pos "s" "string");
+    Hashtbl.replace d "lower" (pos "s" "string");
+    Hashtbl.replace d "keys" (pos "d" "dict");
+    Hashtbl.replace d "vals" (pos "d" "dict");
+    Dict d);
+
+  (* --- HTML renderer --- *)
+  Sx_render.setup_render_env global_env;
+
+  (* Web adapters loaded as SX source at boot time via bundle.sh *)
+
+  (* Wire up render mode — the CEK machine checks these to dispatch
+     HTML tags and components to the renderer instead of eval. *)
+  Sx_runtime._render_active_p_fn :=
+    (fun () -> Bool !_sx_render_mode);
+  Sx_runtime._is_render_expr_fn :=
+    (fun expr -> match expr with
+      | List (Symbol tag :: _) ->
+        Bool (Sx_render.is_html_tag tag || tag = "<>" || tag = "raw!")
+      | _ -> Bool false);
+  Sx_runtime._render_expr_fn :=
+    (fun expr env -> match env with
+      | Env e -> RawHTML (Sx_render.render_to_html expr e)
+      | _ -> RawHTML (Sx_render.render_to_html expr global_env));
+
+  (* --- Scope stack primitives (called by transpiled evaluator via prim_call) --- *)
+  Sx_primitives.register "collect!" (fun args ->
+    match args with [a; b] -> Sx_runtime.sx_collect a b | _ -> Nil);
+  Sx_primitives.register "collected" (fun args ->
+    match args with [a] -> Sx_runtime.sx_collected a | _ -> List []);
+  Sx_primitives.register "clear-collected!" (fun args ->
+    match args with [a] -> Sx_runtime.sx_clear_collected a | _ -> Nil);
+  Sx_primitives.register "emit!" (fun args ->
+    match args with [a; b] -> Sx_runtime.sx_emit a b | _ -> Nil);
+  Sx_primitives.register "emitted" (fun args ->
+    match args with [a] -> Sx_runtime.sx_emitted a | _ -> List []);
+  Sx_primitives.register "context" (fun args ->
+    match args with [a; b] -> Sx_runtime.sx_context a b | [a] -> Sx_runtime.sx_context a Nil | _ -> Nil);
+
+  (* --- Fragment and raw HTML (always available, not just in render mode) --- *)
+  bind "<>" (fun args ->
+    let parts = List.map (fun a ->
+      match a with
+      | String s -> s
+      | RawHTML s -> s
+      | Nil -> ""
+      | List _ -> Sx_render.render_to_html a global_env
+      | _ -> value_to_string a
+    ) args in
+    RawHTML (String.concat "" parts));
+
+  bind "raw!" (fun args ->
+    match args with
+    | [String s] -> RawHTML s
+    | [RawHTML s] -> RawHTML s
+    | [Nil] -> RawHTML ""
+    | _ -> RawHTML (String.concat "" (List.map (fun a ->
+        match a with String s | RawHTML s -> s | _ -> value_to_string a
+      ) args)));
+
+  (* --- Scope stack functions (used by signals.sx, evaluator scope forms) --- *)
+  bind "scope-push!" (fun args ->
+    match args with
+    | [name; value] -> Sx_runtime.scope_push name value
+    | _ -> raise (Eval_error "scope-push!: expected 2 args"));
+
+  bind "scope-pop!" (fun args ->
+    match args with
+    | [_name] -> Sx_runtime.scope_pop _name
+    | _ -> raise (Eval_error "scope-pop!: expected 1 arg"));
+
+  bind "provide-push!" (fun args ->
+    match args with
+    | [name; value] -> Sx_runtime.provide_push name value
+    | _ -> raise (Eval_error "provide-push!: expected 2 args"));
+
+  bind "provide-pop!" (fun args ->
+    match args with
+    | [_name] -> Sx_runtime.provide_pop _name
+    | _ -> raise (Eval_error "provide-pop!: expected 1 arg"));
+
+  (* define-page-helper: registers a named page helper — stub for browser *)
+  bind "define-page-helper" (fun args ->
+    match args with
+    | [String _name; _body] -> Nil  (* Page helpers are server-side; noop in browser *)
+    | _ -> Nil);
+
+  (* cek-call: call a function via the CEK machine (used by signals, orchestration)
+     (cek-call fn nil)      → call with no args
+     (cek-call fn (list a)) → call with args list
+     (cek-call fn a)        → call with single arg *)
+  bind "cek-call" (fun args ->
+    match args with
+    | [f; Nil] -> Sx_ref.eval_expr (List [f]) (Env global_env)
+    | [f; List arg_list] -> Sx_ref.eval_expr (List (f :: arg_list)) (Env global_env)
+    | [f; a] -> Sx_ref.eval_expr (List [f; a]) (Env global_env)
+    | [f] -> Sx_ref.eval_expr (List [f]) (Env global_env)
+    | f :: rest -> Sx_ref.eval_expr (List (f :: rest)) (Env global_env)
+    | _ -> raise (Eval_error "cek-call: expected function and args"));
+
+  (* not : logical negation (sometimes missing from evaluator prims) *)
+  (if not (Sx_primitives.is_primitive "not") then
+    bind "not" (fun args ->
+      match args with
+      | [v] -> Bool (not (sx_truthy v))
+      | _ -> raise (Eval_error "not: expected 1 arg")))
+
+let () =
+  let sx = Js.Unsafe.obj [||] in
+
+  (* __sxWrap: wraps an OCaml API function so that after calling it,
+     the JS side picks up the result from globalThis.__sxR if set.
+     This bypasses js_of_ocaml stripping properties from function return values. *)
+  let wrap = Js.Unsafe.pure_js_expr
+    {|(function(fn) {
+        return function() {
+          globalThis.__sxR = undefined;
+          var r = fn.apply(null, arguments);
+          return globalThis.__sxR !== undefined ? globalThis.__sxR : r;
+        };
+      })|} in
+  let w fn = Js.Unsafe.fun_call wrap [| Js.Unsafe.inject (Js.wrap_callback fn) |] in
+
+  (* Core evaluation *)
+  Js.Unsafe.set sx (Js.string "parse")
+    (Js.wrap_callback api_parse);
+  Js.Unsafe.set sx (Js.string "stringify")
+    (Js.wrap_callback api_stringify);
+  Js.Unsafe.set sx (Js.string "eval")
+    (w api_eval);
+  Js.Unsafe.set sx (Js.string "evalExpr")
+    (w api_eval_expr);
+  Js.Unsafe.set sx (Js.string "cekRun")
+    (w api_cek_run);
+  Js.Unsafe.set sx (Js.string "renderToHtml")
+    (Js.wrap_callback api_render_to_html);
+  Js.Unsafe.set sx (Js.string "load")
+    (Js.wrap_callback api_load);
+  Js.Unsafe.set sx (Js.string "typeOf")
+    (Js.wrap_callback api_type_of);
+  Js.Unsafe.set sx (Js.string "inspect")
+    (Js.wrap_callback api_inspect);
+  Js.Unsafe.set sx (Js.string "engine")
+    (Js.wrap_callback api_engine);
+  Js.Unsafe.set sx (Js.string "registerNative")
+    (Js.wrap_callback api_register_native);
+  Js.Unsafe.set sx (Js.string "loadSource")
+    (Js.wrap_callback api_load_source);
+  Js.Unsafe.set sx (Js.string "callFn")
+    (w api_call_fn);
+  Js.Unsafe.set sx (Js.string "isCallable")
+    (Js.wrap_callback api_is_callable);
+  Js.Unsafe.set sx (Js.string "fnArity")
+    (Js.wrap_callback api_fn_arity);
+
+  (* Expose globally *)
+  Js.Unsafe.set Js.Unsafe.global (Js.string "SxKernel") sx

hosts/ocaml/dune-project

@@ -0,0 +1,2 @@
+(lang dune 3.19)
+(name sx)

hosts/ocaml/lib/dune

@@ -0,0 +1,3 @@
+(library
+ (name sx)
+ (wrapped false))

hosts/ocaml/lib/sx_parser.ml

@@ -0,0 +1,206 @@
+(** S-expression parser.
+
+    Recursive descent over a string, producing [Sx_types.value list].
+    Supports: lists, dicts, symbols, keywords, strings (with escapes),
+    numbers, booleans, nil, comments, quote/quasiquote/unquote sugar. *)
+
+open Sx_types
+
+type state = {
+  src : string;
+  len : int;
+  mutable pos : int;
+}
+
+let make_state src = { src; len = String.length src; pos = 0 }
+
+let peek s = if s.pos < s.len then Some s.src.[s.pos] else None
+let advance s = s.pos <- s.pos + 1
+let at_end s = s.pos >= s.len
+
+let skip_whitespace_and_comments s =
+  let rec go () =
+    if at_end s then ()
+    else match s.src.[s.pos] with
+    | ' ' | '\t' | '\n' | '\r' -> advance s; go ()
+    | ';' ->
+      while s.pos < s.len && s.src.[s.pos] <> '\n' do advance s done;
+      if s.pos < s.len then advance s;
+      go ()
+    | _ -> ()
+  in go ()
+
+let is_symbol_char = function
+  | '(' | ')' | '[' | ']' | '{' | '}' | '"' | '\'' | '`'
+  | ' ' | '\t' | '\n' | '\r' | ',' | ';' -> false
+  | _ -> true
+
+let read_string s =
+  (* s.pos is on the opening quote *)
+  advance s;
+  let buf = Buffer.create 64 in
+  let rec go () =
+    if at_end s then raise (Parse_error "Unterminated string");
+    let c = s.src.[s.pos] in
+    advance s;
+    if c = '"' then Buffer.contents buf
+    else if c = '\\' then begin
+      if at_end s then raise (Parse_error "Unterminated string escape");
+      let esc = s.src.[s.pos] in
+      advance s;
+      (match esc with
+       | 'n' -> Buffer.add_char buf '\n'
+       | 't' -> Buffer.add_char buf '\t'
+       | 'r' -> Buffer.add_char buf '\r'
+       | '"' -> Buffer.add_char buf '"'
+       | '\\' -> Buffer.add_char buf '\\'
+       | 'u' ->
+         (* \uXXXX — read 4 hex digits, encode as UTF-8 *)
+         if s.pos + 4 > s.len then raise (Parse_error "Incomplete \\u escape");
+         let hex = String.sub s.src s.pos 4 in
+         s.pos <- s.pos + 4;
+         let code = int_of_string ("0x" ^ hex) in
+         let ubuf = Buffer.create 4 in
+         Buffer.add_utf_8_uchar ubuf (Uchar.of_int code);
+         Buffer.add_string buf (Buffer.contents ubuf)
+       | '`' -> Buffer.add_char buf '`'
+       | _ -> Buffer.add_char buf '\\'; Buffer.add_char buf esc);
+      go ()
+    end else begin
+      Buffer.add_char buf c;
+      go ()
+    end
+  in go ()
+
+let read_symbol s =
+  let start = s.pos in
+  while s.pos < s.len && is_symbol_char s.src.[s.pos] do advance s done;
+  String.sub s.src start (s.pos - start)
+
+let try_number str =
+  match float_of_string_opt str with
+  | Some n -> Some (Number n)
+  | None -> None
+
+let rec read_value s : value =
+  skip_whitespace_and_comments s;
+  if at_end s then raise (Parse_error "Unexpected end of input");
+  match s.src.[s.pos] with
+  | '(' -> read_list s ')'
+  | '[' -> read_list s ']'
+  | '{' -> read_dict s
+  | '"' -> String (read_string s)
+  | '\'' -> advance s; List [Symbol "quote"; read_value s]
+  | '`' -> advance s; List [Symbol "quasiquote"; read_value s]
+  | '#' when s.pos + 1 < s.len && s.src.[s.pos + 1] = ';' ->
+    (* Datum comment: #; discards next expression *)
+    advance s; advance s;
+    ignore (read_value s);
+    read_value s
+  | '#' when s.pos + 1 < s.len && s.src.[s.pos + 1] = '\'' ->
+    (* Quote shorthand: #'expr -> (quote expr) *)
+    advance s; advance s;
+    List [Symbol "quote"; read_value s]
+  | '#' when s.pos + 1 < s.len && s.src.[s.pos + 1] = '|' ->
+    (* Raw string: #|...|  — ends at next | *)
+    advance s; advance s;
+    let buf = Buffer.create 64 in
+    let rec go () =
+      if at_end s then raise (Parse_error "Unterminated raw string");
+      let c = s.src.[s.pos] in
+      advance s;
+      if c = '|' then
+        String (Buffer.contents buf)
+      else begin
+        Buffer.add_char buf c;
+        go ()
+      end
+    in go ()
+  | '~' when s.pos + 1 < s.len && s.src.[s.pos + 1] = '@' ->
+    advance s; advance s; (* skip ~@ *)
+    List [Symbol "splice-unquote"; read_value s]
+  | _ ->
+    (* Check for unquote: , followed by non-whitespace *)
+    if s.src.[s.pos] = ',' && s.pos + 1 < s.len &&
+       s.src.[s.pos + 1] <> ' ' && s.src.[s.pos + 1] <> '\n' then begin
+      advance s;
+      if s.pos < s.len && s.src.[s.pos] = '@' then begin
+        advance s;
+        List [Symbol "splice-unquote"; read_value s]
+      end else
+        List [Symbol "unquote"; read_value s]
+    end else begin
+      (* Symbol, keyword, number, or boolean *)
+      let token = read_symbol s in
+      if token = "" then raise (Parse_error ("Unexpected char: " ^ String.make 1 s.src.[s.pos]));
+      match token with
+      | "true" -> Bool true
+      | "false" -> Bool false
+      | "nil" -> Nil
+      | _ when token.[0] = ':' ->
+        Keyword (String.sub token 1 (String.length token - 1))
+      | _ ->
+        match try_number token with
+        | Some n -> n
+        | None -> Symbol token
+    end
+
+and read_list s close_char =
+  advance s; (* skip opening paren/bracket *)
+  let items = ref [] in
+  let rec go () =
+    skip_whitespace_and_comments s;
+    if at_end s then raise (Parse_error "Unterminated list");
+    if s.src.[s.pos] = close_char then begin
+      advance s;
+      List (List.rev !items)
+    end else begin
+      items := read_value s :: !items;
+      go ()
+    end
+  in go ()
+
+and read_dict s =
+  advance s; (* skip { *)
+  let d = make_dict () in
+  let rec go () =
+    skip_whitespace_and_comments s;
+    if at_end s then raise (Parse_error "Unterminated dict");
+    if s.src.[s.pos] = '}' then begin
+      advance s;
+      Dict d
+    end else begin
+      let key = read_value s in
+      let key_str = match key with
+        | Keyword k -> k
+        | String k -> k
+        | Symbol k -> k
+        | _ -> raise (Parse_error "Dict key must be keyword, string, or symbol")
+      in
+      let v = read_value s in
+      dict_set d key_str v;
+      go ()
+    end
+  in go ()
+
+
+(** Parse a string into a list of SX values. *)
+let parse_all src =
+  let s = make_state src in
+  let results = ref [] in
+  let rec go () =
+    skip_whitespace_and_comments s;
+    if at_end s then List.rev !results
+    else begin
+      results := read_value s :: !results;
+      go ()
+    end
+  in go ()
+
+(** Parse a file into a list of SX values. *)
+let parse_file path =
+  let ic = open_in path in
+  let n = in_channel_length ic in
+  let src = really_input_string ic n in
+  close_in ic;
+  parse_all src

hosts/ocaml/lib/sx_primitives.ml

@@ -0,0 +1,578 @@
+(** Built-in primitive functions (~80 pure functions).
+
+    Registered in a global table; the evaluator checks this table
+    when a symbol isn't found in the lexical environment. *)
+
+open Sx_types
+
+let primitives : (string, value list -> value) Hashtbl.t = Hashtbl.create 128
+
+let register name fn = Hashtbl.replace primitives name fn
+
+let is_primitive name = Hashtbl.mem primitives name
+
+let get_primitive name =
+  match Hashtbl.find_opt primitives name with
+  | Some fn -> NativeFn (name, fn)
+  | None -> raise (Eval_error ("Unknown primitive: " ^ name))
+
+(* --- Helpers --- *)
+
+let as_number = function
+  | Number n -> n
+  | Bool true -> 1.0
+  | Bool false -> 0.0
+  | Nil -> 0.0
+  | String s -> (match float_of_string_opt s with Some n -> n | None -> Float.nan)
+  | v -> raise (Eval_error ("Expected number, got " ^ type_of v))
+
+let as_string = function
+  | String s -> s
+  | v -> raise (Eval_error ("Expected string, got " ^ type_of v))
+
+let as_list = function
+  | List l -> l
+  | ListRef r -> !r
+  | Nil -> []
+  | v -> raise (Eval_error ("Expected list, got " ^ type_of v))
+
+let as_bool = function
+  | Bool b -> b
+  | v -> sx_truthy v
+
+let to_string = function
+  | String s -> s
+  | Number n ->
+    if Float.is_integer n then string_of_int (int_of_float n)
+    else Printf.sprintf "%g" n
+  | Bool true -> "true"
+  | Bool false -> "false"
+  | Nil -> ""
+  | Symbol s -> s
+  | Keyword k -> k
+  | v -> inspect v
+
+let () =
+  (* === Arithmetic === *)
+  register "+" (fun args ->
+    Number (List.fold_left (fun acc a -> acc +. as_number a) 0.0 args));
+  register "-" (fun args ->
+    match args with
+    | [] -> Number 0.0
+    | [a] -> Number (-. (as_number a))
+    | a :: rest -> Number (List.fold_left (fun acc x -> acc -. as_number x) (as_number a) rest));
+  register "*" (fun args ->
+    Number (List.fold_left (fun acc a -> acc *. as_number a) 1.0 args));
+  register "/" (fun args ->
+    match args with
+    | [a; b] -> Number (as_number a /. as_number b)
+    | _ -> raise (Eval_error "/: expected 2 args"));
+  register "mod" (fun args ->
+    match args with
+    | [a; b] -> Number (Float.rem (as_number a) (as_number b))
+    | _ -> raise (Eval_error "mod: expected 2 args"));
+  register "inc" (fun args ->
+    match args with [a] -> Number (as_number a +. 1.0) | _ -> raise (Eval_error "inc: 1 arg"));
+  register "dec" (fun args ->
+    match args with [a] -> Number (as_number a -. 1.0) | _ -> raise (Eval_error "dec: 1 arg"));
+  register "abs" (fun args ->
+    match args with [a] -> Number (Float.abs (as_number a)) | _ -> raise (Eval_error "abs: 1 arg"));
+  register "floor" (fun args ->
+    match args with [a] -> Number (Float.of_int (int_of_float (Float.round (as_number a -. 0.5))))
+    | _ -> raise (Eval_error "floor: 1 arg"));
+  register "ceil" (fun args ->
+    match args with [a] -> Number (Float.of_int (int_of_float (Float.round (as_number a +. 0.5))))
+    | _ -> raise (Eval_error "ceil: 1 arg"));
+  register "round" (fun args ->
+    match args with
+    | [a] -> Number (Float.round (as_number a))
+    | [a; b] ->
+      let n = as_number a and places = int_of_float (as_number b) in
+      let factor = 10.0 ** float_of_int places in
+      Number (Float.round (n *. factor) /. factor)
+    | _ -> raise (Eval_error "round: 1-2 args"));
+  register "min" (fun args ->
+    match args with
+    | [] -> raise (Eval_error "min: at least 1 arg")
+    | _ -> Number (List.fold_left (fun acc a -> Float.min acc (as_number a)) Float.infinity args));
+  register "max" (fun args ->
+    match args with
+    | [] -> raise (Eval_error "max: at least 1 arg")
+    | _ -> Number (List.fold_left (fun acc a -> Float.max acc (as_number a)) Float.neg_infinity args));
+  register "sqrt" (fun args ->
+    match args with [a] -> Number (Float.sqrt (as_number a)) | _ -> raise (Eval_error "sqrt: 1 arg"));
+  register "pow" (fun args ->
+    match args with [a; b] -> Number (as_number a ** as_number b)
+    | _ -> raise (Eval_error "pow: 2 args"));
+  register "clamp" (fun args ->
+    match args with
+    | [x; lo; hi] ->
+      let x = as_number x and lo = as_number lo and hi = as_number hi in
+      Number (Float.max lo (Float.min hi x))
+    | _ -> raise (Eval_error "clamp: 3 args"));
+  register "parse-int" (fun args ->
+    match args with
+    | [String s] -> (match int_of_string_opt s with Some n -> Number (float_of_int n) | None -> Nil)
+    | [Number n] -> Number (float_of_int (int_of_float n))
+    | _ -> Nil);
+  register "parse-float" (fun args ->
+    match args with
+    | [String s] -> (match float_of_string_opt s with Some n -> Number n | None -> Nil)
+    | [Number n] -> Number n
+    | _ -> Nil);
+
+  (* === Comparison === *)
+  (* Normalize ListRef to List for structural equality *)
+  let rec normalize_for_eq = function
+    | ListRef { contents = items } -> List (List.map normalize_for_eq items)
+    | List items -> List (List.map normalize_for_eq items)
+    | v -> v
+  in
+  register "=" (fun args ->
+    match args with
+    | [a; b] -> Bool (normalize_for_eq a = normalize_for_eq b)
+    | _ -> raise (Eval_error "=: 2 args"));
+  register "!=" (fun args ->
+    match args with
+    | [a; b] -> Bool (normalize_for_eq a <> normalize_for_eq b)
+    | _ -> raise (Eval_error "!=: 2 args"));
+  register "<" (fun args ->
+    match args with
+    | [String a; String b] -> Bool (a < b)
+    | [a; b] -> Bool (as_number a < as_number b)
+    | _ -> raise (Eval_error "<: 2 args"));
+  register ">" (fun args ->
+    match args with
+    | [String a; String b] -> Bool (a > b)
+    | [a; b] -> Bool (as_number a > as_number b)
+    | _ -> raise (Eval_error ">: 2 args"));
+  register "<=" (fun args ->
+    match args with
+    | [String a; String b] -> Bool (a <= b)
+    | [a; b] -> Bool (as_number a <= as_number b)
+    | _ -> raise (Eval_error "<=: 2 args"));
+  register ">=" (fun args ->
+    match args with
+    | [String a; String b] -> Bool (a >= b)
+    | [a; b] -> Bool (as_number a >= as_number b)
+    | _ -> raise (Eval_error ">=: 2 args"));
+
+  (* === Logic === *)
+  register "not" (fun args ->
+    match args with [a] -> Bool (not (sx_truthy a)) | _ -> raise (Eval_error "not: 1 arg"));
+
+  (* === Predicates === *)
+  register "nil?" (fun args ->
+    match args with [a] -> Bool (is_nil a) | _ -> raise (Eval_error "nil?: 1 arg"));
+  register "number?" (fun args ->
+    match args with [Number _] -> Bool true | [_] -> Bool false | _ -> raise (Eval_error "number?: 1 arg"));
+  register "string?" (fun args ->
+    match args with [String _] -> Bool true | [_] -> Bool false | _ -> raise (Eval_error "string?: 1 arg"));
+  register "boolean?" (fun args ->
+    match args with [Bool _] -> Bool true | [_] -> Bool false | _ -> raise (Eval_error "boolean?: 1 arg"));
+  register "list?" (fun args ->
+    match args with [List _] | [ListRef _] -> Bool true | [_] -> Bool false | _ -> raise (Eval_error "list?: 1 arg"));
+  register "dict?" (fun args ->
+    match args with [Dict _] -> Bool true | [_] -> Bool false | _ -> raise (Eval_error "dict?: 1 arg"));
+  register "symbol?" (fun args ->
+    match args with [Symbol _] -> Bool true | [_] -> Bool false | _ -> raise (Eval_error "symbol?: 1 arg"));
+  register "keyword?" (fun args ->
+    match args with [Keyword _] -> Bool true | [_] -> Bool false | _ -> raise (Eval_error "keyword?: 1 arg"));
+  register "empty?" (fun args ->
+    match args with
+    | [List []] | [ListRef { contents = [] }] -> Bool true
+    | [List _] | [ListRef _] -> Bool false
+    | [String ""] -> Bool true | [String _] -> Bool false
+    | [Dict d] -> Bool (Hashtbl.length d = 0)
+    | [Nil] -> Bool true
+    | [_] -> Bool false
+    | _ -> raise (Eval_error "empty?: 1 arg"));
+  register "odd?" (fun args ->
+    match args with [a] -> Bool (int_of_float (as_number a) mod 2 <> 0) | _ -> raise (Eval_error "odd?: 1 arg"));
+  register "even?" (fun args ->
+    match args with [a] -> Bool (int_of_float (as_number a) mod 2 = 0) | _ -> raise (Eval_error "even?: 1 arg"));
+  register "zero?" (fun args ->
+    match args with [a] -> Bool (as_number a = 0.0) | _ -> raise (Eval_error "zero?: 1 arg"));
+
+  (* === Strings === *)
+  register "str" (fun args -> String (String.concat "" (List.map to_string args)));
+  register "upper" (fun args ->
+    match args with [a] -> String (String.uppercase_ascii (as_string a)) | _ -> raise (Eval_error "upper: 1 arg"));
+  register "upcase" (fun args ->
+    match args with [a] -> String (String.uppercase_ascii (as_string a)) | _ -> raise (Eval_error "upcase: 1 arg"));
+  register "lower" (fun args ->
+    match args with [a] -> String (String.lowercase_ascii (as_string a)) | _ -> raise (Eval_error "lower: 1 arg"));
+  register "downcase" (fun args ->
+    match args with [a] -> String (String.lowercase_ascii (as_string a)) | _ -> raise (Eval_error "downcase: 1 arg"));
+  register "trim" (fun args ->
+    match args with [a] -> String (String.trim (as_string a)) | _ -> raise (Eval_error "trim: 1 arg"));
+  register "string-length" (fun args ->
+    match args with [a] -> Number (float_of_int (String.length (as_string a)))
+    | _ -> raise (Eval_error "string-length: 1 arg"));
+  register "string-contains?" (fun args ->
+    match args with
+    | [String haystack; String needle] ->
+      let rec find i =
+        if i + String.length needle > String.length haystack then false
+        else if String.sub haystack i (String.length needle) = needle then true
+        else find (i + 1)
+      in Bool (find 0)
+    | _ -> raise (Eval_error "string-contains?: 2 string args"));
+  register "starts-with?" (fun args ->
+    match args with
+    | [String s; String prefix] ->
+      Bool (String.length s >= String.length prefix &&
+            String.sub s 0 (String.length prefix) = prefix)
+    | _ -> raise (Eval_error "starts-with?: 2 string args"));
+  register "ends-with?" (fun args ->
+    match args with
+    | [String s; String suffix] ->
+      let sl = String.length s and xl = String.length suffix in
+      Bool (sl >= xl && String.sub s (sl - xl) xl = suffix)
+    | _ -> raise (Eval_error "ends-with?: 2 string args"));
+  register "index-of" (fun args ->
+    match args with
+    | [String haystack; String needle] ->
+      let nl = String.length needle and hl = String.length haystack in
+      let rec find i =
+        if i + nl > hl then Number (-1.0)
+        else if String.sub haystack i nl = needle then Number (float_of_int i)
+        else find (i + 1)
+      in find 0
+    | _ -> raise (Eval_error "index-of: 2 string args"));
+  register "substring" (fun args ->
+    match args with
+    | [String s; Number start; Number end_] ->
+      let i = int_of_float start and j = int_of_float end_ in
+      let len = String.length s in
+      let i = max 0 (min i len) and j = max 0 (min j len) in
+      String (String.sub s i (max 0 (j - i)))
+    | _ -> raise (Eval_error "substring: 3 args"));
+  register "substr" (fun args ->
+    match args with
+    | [String s; Number start; Number len] ->
+      let i = int_of_float start and n = int_of_float len in
+      let sl = String.length s in
+      let i = max 0 (min i sl) in
+      let n = max 0 (min n (sl - i)) in
+      String (String.sub s i n)
+    | [String s; Number start] ->
+      let i = int_of_float start in
+      let sl = String.length s in
+      let i = max 0 (min i sl) in
+      String (String.sub s i (sl - i))
+    | _ -> raise (Eval_error "substr: 2-3 args"));
+  register "split" (fun args ->
+    match args with
+    | [String s; String sep] ->
+      List (List.map (fun p -> String p) (String.split_on_char sep.[0] s))
+    | _ -> raise (Eval_error "split: 2 args"));
+  register "join" (fun args ->
+    match args with
+    | [String sep; (List items | ListRef { contents = items })] ->
+      String (String.concat sep (List.map to_string items))
+    | _ -> raise (Eval_error "join: 2 args"));
+  register "replace" (fun args ->
+    match args with
+    | [String s; String old_s; String new_s] ->
+      let ol = String.length old_s in
+      if ol = 0 then String s
+      else begin
+        let buf = Buffer.create (String.length s) in
+        let rec go i =
+          if i >= String.length s then ()
+          else if i + ol <= String.length s && String.sub s i ol = old_s then begin
+            Buffer.add_string buf new_s;
+            go (i + ol)
+          end else begin
+            Buffer.add_char buf s.[i];
+            go (i + 1)
+          end
+        in go 0;
+        String (Buffer.contents buf)
+      end
+    | _ -> raise (Eval_error "replace: 3 string args"));
+  register "char-from-code" (fun args ->
+    match args with
+    | [Number n] ->
+      let buf = Buffer.create 4 in
+      Buffer.add_utf_8_uchar buf (Uchar.of_int (int_of_float n));
+      String (Buffer.contents buf)
+    | _ -> raise (Eval_error "char-from-code: 1 arg"));
+
+  (* === Collections === *)
+  register "list" (fun args -> ListRef (ref args));
+  register "len" (fun args ->
+    match args with
+    | [List l] | [ListRef { contents = l }] -> Number (float_of_int (List.length l))
+    | [String s] -> Number (float_of_int (String.length s))
+    | [Dict d] -> Number (float_of_int (Hashtbl.length d))
+    | [Nil] -> Number 0.0
+    | _ -> raise (Eval_error "len: 1 arg"));
+  register "first" (fun args ->
+    match args with
+    | [List (x :: _)] | [ListRef { contents = x :: _ }] -> x
+    | [List []] | [ListRef { contents = [] }] -> Nil | [Nil] -> Nil
+    | _ -> raise (Eval_error "first: 1 list arg"));
+  register "rest" (fun args ->
+    match args with
+    | [List (_ :: xs)] | [ListRef { contents = _ :: xs }] -> List xs
+    | [List []] | [ListRef { contents = [] }] -> List [] | [Nil] -> List []
+    | _ -> raise (Eval_error "rest: 1 list arg"));
+  register "last" (fun args ->
+    match args with
+    | [List l] | [ListRef { contents = l }] ->
+      (match List.rev l with x :: _ -> x | [] -> Nil)
+    | _ -> raise (Eval_error "last: 1 list arg"));
+  register "nth" (fun args ->
+    match args with
+    | [List l; Number n] | [ListRef { contents = l }; Number n] ->
+      (try List.nth l (int_of_float n) with _ -> Nil)
+    | _ -> raise (Eval_error "nth: list and number"));
+  register "cons" (fun args ->
+    match args with
+    | [x; List l] | [x; ListRef { contents = l }] -> List (x :: l)
+    | [x; Nil] -> List [x]
+    | _ -> raise (Eval_error "cons: value and list"));
+  register "append" (fun args ->
+    let all = List.concat_map (fun a -> as_list a) args in
+    List all);
+  register "reverse" (fun args ->
+    match args with
+    | [List l] | [ListRef { contents = l }] -> List (List.rev l)
+    | _ -> raise (Eval_error "reverse: 1 list"));
+  register "flatten" (fun args ->
+    let rec flat = function
+      | List items | ListRef { contents = items } -> List.concat_map flat items
+      | x -> [x]
+    in
+    match args with
+    | [List l] | [ListRef { contents = l }] -> List (List.concat_map flat l)
+    | _ -> raise (Eval_error "flatten: 1 list"));
+  register "concat" (fun args -> List (List.concat_map as_list args));
+  register "contains?" (fun args ->
+    match args with
+    | [List l; item] | [ListRef { contents = l }; item] -> Bool (List.mem item l)
+    | [String s; String sub] ->
+      let rec find i =
+        if i + String.length sub > String.length s then false
+        else if String.sub s i (String.length sub) = sub then true
+        else find (i + 1)
+      in Bool (find 0)
+    | _ -> raise (Eval_error "contains?: 2 args"));
+  register "range" (fun args ->
+    match args with
+    | [Number stop] ->
+      let n = int_of_float stop in
+      List (List.init (max 0 n) (fun i -> Number (float_of_int i)))
+    | [Number start; Number stop] ->
+      let s = int_of_float start and e = int_of_float stop in
+      let len = max 0 (e - s) in
+      List (List.init len (fun i -> Number (float_of_int (s + i))))
+    | [Number start; Number stop; Number step] ->
+      let s = start and e = stop and st = step in
+      if st = 0.0 then List []
+      else
+        let items = ref [] in
+        let i = ref s in
+        if st > 0.0 then
+          (while !i < e do items := Number !i :: !items; i := !i +. st done)
+        else
+          (while !i > e do items := Number !i :: !items; i := !i +. st done);
+        List (List.rev !items)
+    | _ -> raise (Eval_error "range: 1-3 args"));
+  register "slice" (fun args ->
+    match args with
+    | [(List l | ListRef { contents = l }); Number start] ->
+      let i = max 0 (int_of_float start) in
+      let rec drop n = function _ :: xs when n > 0 -> drop (n-1) xs | l -> l in
+      List (drop i l)
+    | [(List l | ListRef { contents = l }); Number start; Number end_] ->
+      let i = max 0 (int_of_float start) and j = int_of_float end_ in
+      let len = List.length l in
+      let j = min j len in
+      let rec take_range idx = function
+        | [] -> []
+        | x :: xs ->
+          if idx >= j then []
+          else if idx >= i then x :: take_range (idx+1) xs
+          else take_range (idx+1) xs
+      in List (take_range 0 l)
+    | [String s; Number start] ->
+      let i = max 0 (int_of_float start) in
+      String (String.sub s i (max 0 (String.length s - i)))
+    | [String s; Number start; Number end_] ->
+      let i = max 0 (int_of_float start) and j = int_of_float end_ in
+      let sl = String.length s in
+      let j = min j sl in
+      String (String.sub s i (max 0 (j - i)))
+    | _ -> raise (Eval_error "slice: 2-3 args"));
+  register "sort" (fun args ->
+    match args with
+    | [List l] | [ListRef { contents = l }] -> List (List.sort compare l)
+    | _ -> raise (Eval_error "sort: 1 list"));
+  register "zip" (fun args ->
+    match args with
+    | [a; b] ->
+      let la = as_list a and lb = as_list b in
+      let rec go l1 l2 acc = match l1, l2 with
+        | x :: xs, y :: ys -> go xs ys (List [x; y] :: acc)
+        | _ -> List.rev acc
+      in List (go la lb [])
+    | _ -> raise (Eval_error "zip: 2 lists"));
+  register "zip-pairs" (fun args ->
+    match args with
+    | [v] ->
+      let l = as_list v in
+      let rec go = function
+        | a :: b :: rest -> List [a; b] :: go rest
+        | _ -> []
+      in List (go l)
+    | _ -> raise (Eval_error "zip-pairs: 1 list"));
+  register "take" (fun args ->
+    match args with
+    | [(List l | ListRef { contents = l }); Number n] ->
+      let rec take_n i = function
+        | x :: xs when i > 0 -> x :: take_n (i-1) xs
+        | _ -> []
+      in List (take_n (int_of_float n) l)
+    | _ -> raise (Eval_error "take: list and number"));
+  register "drop" (fun args ->
+    match args with
+    | [(List l | ListRef { contents = l }); Number n] ->
+      let rec drop_n i = function
+        | _ :: xs when i > 0 -> drop_n (i-1) xs
+        | l -> l
+      in List (drop_n (int_of_float n) l)
+    | _ -> raise (Eval_error "drop: list and number"));
+  register "chunk-every" (fun args ->
+    match args with
+    | [(List l | ListRef { contents = l }); Number n] ->
+      let size = int_of_float n in
+      let rec go = function
+        | [] -> []
+        | l ->
+          let rec take_n i = function
+            | x :: xs when i > 0 -> x :: take_n (i-1) xs
+            | _ -> []
+          in
+          let rec drop_n i = function
+            | _ :: xs when i > 0 -> drop_n (i-1) xs
+            | l -> l
+          in
+          List (take_n size l) :: go (drop_n size l)
+      in List (go l)
+    | _ -> raise (Eval_error "chunk-every: list and number"));
+  register "unique" (fun args ->
+    match args with
+    | [(List l | ListRef { contents = l })] ->
+      let seen = Hashtbl.create 16 in
+      let result = List.filter (fun x ->
+        let key = inspect x in
+        if Hashtbl.mem seen key then false
+        else (Hashtbl.replace seen key true; true)
+      ) l in
+      List result
+    | _ -> raise (Eval_error "unique: 1 list"));
+
+  (* === Dict === *)
+  register "dict" (fun args ->
+    let d = make_dict () in
+    let rec go = function
+      | [] -> Dict d
+      | Keyword k :: v :: rest -> dict_set d k v; go rest
+      | String k :: v :: rest -> dict_set d k v; go rest
+      | _ -> raise (Eval_error "dict: pairs of key value")
+    in go args);
+  register "get" (fun args ->
+    match args with
+    | [Dict d; String k] -> dict_get d k
+    | [Dict d; Keyword k] -> dict_get d k
+    | [List l; Number n] | [ListRef { contents = l }; Number n] ->
+      (try List.nth l (int_of_float n) with _ -> Nil)
+    | _ -> raise (Eval_error "get: dict+key or list+index"));
+  register "has-key?" (fun args ->
+    match args with
+    | [Dict d; String k] -> Bool (dict_has d k)
+    | [Dict d; Keyword k] -> Bool (dict_has d k)
+    | _ -> raise (Eval_error "has-key?: dict and key"));
+  register "assoc" (fun args ->
+    match args with
+    | Dict d :: rest ->
+      let d2 = Hashtbl.copy d in
+      let rec go = function
+        | [] -> Dict d2
+        | String k :: v :: rest -> Hashtbl.replace d2 k v; go rest
+        | Keyword k :: v :: rest -> Hashtbl.replace d2 k v; go rest
+        | _ -> raise (Eval_error "assoc: pairs")
+      in go rest
+    | _ -> raise (Eval_error "assoc: dict + pairs"));
+  register "dissoc" (fun args ->
+    match args with
+    | Dict d :: keys ->
+      let d2 = Hashtbl.copy d in
+      List.iter (fun k -> Hashtbl.remove d2 (to_string k)) keys;
+      Dict d2
+    | _ -> raise (Eval_error "dissoc: dict + keys"));
+  register "merge" (fun args ->
+    let d = make_dict () in
+    List.iter (function
+      | Dict src -> Hashtbl.iter (fun k v -> Hashtbl.replace d k v) src
+      | _ -> raise (Eval_error "merge: all args must be dicts")
+    ) args;
+    Dict d);
+  register "keys" (fun args ->
+    match args with [Dict d] -> List (dict_keys d) | _ -> raise (Eval_error "keys: 1 dict"));
+  register "vals" (fun args ->
+    match args with [Dict d] -> List (dict_vals d) | _ -> raise (Eval_error "vals: 1 dict"));
+  register "dict-set!" (fun args ->
+    match args with
+    | [Dict d; String k; v] -> dict_set d k v; v
+    | [Dict d; Keyword k; v] -> dict_set d k v; v
+    | _ -> raise (Eval_error "dict-set!: dict key val"));
+  register "dict-get" (fun args ->
+    match args with
+    | [Dict d; String k] -> dict_get d k
+    | [Dict d; Keyword k] -> dict_get d k
+    | _ -> raise (Eval_error "dict-get: dict and key"));
+  register "dict-has?" (fun args ->
+    match args with
+    | [Dict d; String k] -> Bool (dict_has d k)
+    | _ -> raise (Eval_error "dict-has?: dict and key"));
+  register "dict-delete!" (fun args ->
+    match args with
+    | [Dict d; String k] -> dict_delete d k; Nil
+    | _ -> raise (Eval_error "dict-delete!: dict and key"));
+
+  (* === Misc === *)
+  register "type-of" (fun args ->
+    match args with [a] -> String (type_of a) | _ -> raise (Eval_error "type-of: 1 arg"));
+  register "inspect" (fun args ->
+    match args with [a] -> String (inspect a) | _ -> raise (Eval_error "inspect: 1 arg"));
+  register "error" (fun args ->
+    match args with [String msg] -> raise (Eval_error msg)
+    | [a] -> raise (Eval_error (to_string a))
+    | _ -> raise (Eval_error "error: 1 arg"));
+  register "apply" (fun args ->
+    match args with
+    | [NativeFn (_, f); List a] -> f a
+    | _ -> raise (Eval_error "apply: function and list"));
+  register "identical?" (fun args ->
+    match args with [a; b] -> Bool (a == b) | _ -> raise (Eval_error "identical?: 2 args"));
+  register "make-spread" (fun args ->
+    match args with
+    | [Dict d] ->
+      let pairs = Hashtbl.fold (fun k v acc -> (k, v) :: acc) d [] in
+      Spread pairs
+    | _ -> raise (Eval_error "make-spread: 1 dict"));
+  register "spread?" (fun args ->
+    match args with [Spread _] -> Bool true | [_] -> Bool false
+    | _ -> raise (Eval_error "spread?: 1 arg"));
+  register "spread-attrs" (fun args ->
+    match args with
+    | [Spread pairs] ->
+      let d = make_dict () in
+      List.iter (fun (k, v) -> dict_set d k v) pairs;
+      Dict d
+    | _ -> raise (Eval_error "spread-attrs: 1 spread"));
+  ()

hosts/ocaml/lib/sx_render.ml

@@ -0,0 +1,444 @@
+(** HTML renderer for SX values.
+
+    Extracted from run_tests.ml — renders an SX expression tree to an
+    HTML string, expanding components and macros along the way.
+
+    Depends on [Sx_ref.eval_expr] for evaluating sub-expressions
+    during rendering (keyword arg values, conditionals, etc.). *)
+
+open Sx_types
+
+(* ====================================================================== *)
+(* Tag / attribute registries                                              *)
+(* ====================================================================== *)
+
+let html_tags = [
+  "html"; "head"; "body"; "title"; "meta"; "link"; "script"; "style"; "noscript";
+  "header"; "nav"; "main"; "section"; "article"; "aside"; "footer";
+  "h1"; "h2"; "h3"; "h4"; "h5"; "h6"; "hgroup";
+  "div"; "p"; "blockquote"; "pre"; "figure"; "figcaption"; "address"; "hr";
+  "ul"; "ol"; "li"; "dl"; "dt"; "dd"; "menu";
+  "a"; "span"; "em"; "strong"; "small"; "b"; "i"; "u"; "s"; "sub"; "sup";
+  "mark"; "del"; "ins"; "q"; "cite"; "dfn"; "abbr"; "code"; "var"; "samp";
+  "kbd"; "data"; "time"; "ruby"; "rt"; "rp"; "bdi"; "bdo"; "wbr"; "br";
+  "table"; "thead"; "tbody"; "tfoot"; "tr"; "th"; "td"; "caption"; "colgroup"; "col";
+  "form"; "input"; "textarea"; "select"; "option"; "optgroup"; "button"; "label";
+  "fieldset"; "legend"; "datalist"; "output"; "progress"; "meter";
+  "details"; "summary"; "dialog";
+  "img"; "video"; "audio"; "source"; "picture"; "canvas"; "iframe"; "embed"; "object"; "param";
+  "svg"; "path"; "circle"; "rect"; "line"; "polyline"; "polygon"; "ellipse";
+  "g"; "defs"; "use"; "text"; "tspan"; "clipPath"; "mask"; "pattern";
+  "linearGradient"; "radialGradient"; "stop"; "filter"; "feBlend"; "feFlood";
+  "feGaussianBlur"; "feOffset"; "feMerge"; "feMergeNode"; "feComposite";
+  "template"; "slot";
+]
+
+let void_elements = [
+  "area"; "base"; "br"; "col"; "embed"; "hr"; "img"; "input";
+  "link"; "meta"; "param"; "source"; "track"; "wbr"
+]
+
+let boolean_attrs = [
+  "async"; "autofocus"; "autoplay"; "checked"; "controls"; "default";
+  "defer"; "disabled"; "formnovalidate"; "hidden"; "inert"; "ismap";
+  "loop"; "multiple"; "muted"; "nomodule"; "novalidate"; "open";
+  "playsinline"; "readonly"; "required"; "reversed"; "selected"
+]
+
+let is_html_tag name = List.mem name html_tags
+let is_void name = List.mem name void_elements
+let is_boolean_attr name = List.mem name boolean_attrs
+
+
+(* ====================================================================== *)
+(* HTML escaping                                                           *)
+(* ====================================================================== *)
+
+let escape_html s =
+  let buf = Buffer.create (String.length s) in
+  String.iter (function
+    | '&' -> Buffer.add_string buf "&"
+    | '<' -> Buffer.add_string buf "&lt;"
+    | '>' -> Buffer.add_string buf "&gt;"
+    | '"' -> Buffer.add_string buf "&quot;"
+    | c -> Buffer.add_char buf c) s;
+  Buffer.contents buf
+
+
+(* ====================================================================== *)
+(* Attribute rendering                                                     *)
+(* ====================================================================== *)
+
+let render_attrs attrs =
+  let buf = Buffer.create 64 in
+  Hashtbl.iter (fun k v ->
+    if is_boolean_attr k then begin
+      if sx_truthy v then begin
+        Buffer.add_char buf ' ';
+        Buffer.add_string buf k
+      end
+    end else if not (is_nil v) then begin
+      Buffer.add_char buf ' ';
+      Buffer.add_string buf k;
+      Buffer.add_string buf "=\"";
+      Buffer.add_string buf (escape_html (value_to_string v));
+      Buffer.add_char buf '"'
+    end) attrs;
+  Buffer.contents buf
+
+
+(* ====================================================================== *)
+(* HTML renderer                                                           *)
+(* ====================================================================== *)
+
+(* Forward ref — resolved at setup time *)
+let render_to_html_ref : (value -> env -> string) ref =
+  ref (fun _expr _env -> "")
+
+let render_to_html expr env = !render_to_html_ref expr env
+
+let render_children children env =
+  String.concat "" (List.map (fun c -> render_to_html c env) children)
+
+(** Parse keyword attrs and positional children from an element call's args.
+    Attrs are evaluated; children are returned UNEVALUATED for render dispatch. *)
+let parse_element_args args env =
+  let attrs = Hashtbl.create 8 in
+  let children = ref [] in
+  let skip = ref false in
+  let len = List.length args in
+  List.iteri (fun idx arg ->
+    if !skip then skip := false
+    else match arg with
+    | Keyword k when idx + 1 < len ->
+      let v = Sx_ref.eval_expr (List.nth args (idx + 1)) (Env env) in
+      Hashtbl.replace attrs k v;
+      skip := true
+    | Spread pairs ->
+      List.iter (fun (k, v) -> Hashtbl.replace attrs k v) pairs
+    | _ ->
+      children := arg :: !children
+  ) args;
+  (attrs, List.rev !children)
+
+let render_html_element tag args env =
+  let (attrs, children) = parse_element_args args env in
+  let attr_str = render_attrs attrs in
+  if is_void tag then
+    "<" ^ tag ^ attr_str ^ " />"
+  else
+    let content = String.concat ""
+      (List.map (fun c -> render_to_html c env) children) in
+    "<" ^ tag ^ attr_str ^ ">" ^ content ^ "</" ^ tag ^ ">"
+
+let render_component_generic ~params ~has_children ~body ~closure args env =
+  let kwargs = Hashtbl.create 8 in
+  let children_exprs = ref [] in
+  let skip = ref false in
+  let len = List.length args in
+  List.iteri (fun idx arg ->
+    if !skip then skip := false
+    else match arg with
+    | Keyword k when idx + 1 < len ->
+      let v = Sx_ref.eval_expr (List.nth args (idx + 1)) (Env env) in
+      Hashtbl.replace kwargs k v;
+      skip := true
+    | _ ->
+      children_exprs := arg :: !children_exprs
+  ) args;
+  let children = List.rev !children_exprs in
+  let local = env_merge closure env in
+  List.iter (fun p ->
+    let v = match Hashtbl.find_opt kwargs p with Some v -> v | None -> Nil in
+    ignore (env_bind local p v)
+  ) params;
+  if has_children then begin
+    let rendered_children = String.concat ""
+      (List.map (fun c -> render_to_html c env) children) in
+    ignore (env_bind local "children" (RawHTML rendered_children))
+  end;
+  render_to_html body local
+
+let render_component comp args env =
+  match comp with
+  | Component c ->
+    render_component_generic
+      ~params:c.c_params ~has_children:c.c_has_children
+      ~body:c.c_body ~closure:c.c_closure args env
+  | Island i ->
+    render_component_generic
+      ~params:i.i_params ~has_children:i.i_has_children
+      ~body:i.i_body ~closure:i.i_closure args env
+  | _ -> ""
+
+let expand_macro (m : macro) args _env =
+  let local = env_extend m.m_closure in
+  let params = m.m_params in
+  let rec bind_params ps as' =
+    match ps, as' with
+    | [], rest ->
+      (match m.m_rest_param with
+       | Some rp -> ignore (env_bind local rp (List rest))
+       | None -> ())
+    | p :: ps_rest, a :: as_rest ->
+      ignore (env_bind local p a);
+      bind_params ps_rest as_rest
+    | _ :: _, [] ->
+      List.iter (fun p -> ignore (env_bind local p Nil)) (List.rev ps)
+  in
+  bind_params params args;
+  Sx_ref.eval_expr m.m_body (Env local)
+
+let rec do_render_to_html (expr : value) (env : env) : string =
+  match expr with
+  | Nil -> ""
+  | Bool true -> "true"
+  | Bool false -> "false"
+  | Number n ->
+    if Float.is_integer n then string_of_int (int_of_float n)
+    else Printf.sprintf "%g" n
+  | String s -> escape_html s
+  | Keyword k -> escape_html k
+  | RawHTML s -> s
+  | Symbol s ->
+    let v = Sx_ref.eval_expr (Symbol s) (Env env) in
+    do_render_to_html v env
+  | List [] | ListRef { contents = [] } -> ""
+  | List (head :: args) | ListRef { contents = head :: args } ->
+    render_list_to_html head args env
+  | _ ->
+    let v = Sx_ref.eval_expr expr (Env env) in
+    do_render_to_html v env
+
+and render_list_to_html head args env =
+  match head with
+  | Symbol "<>" ->
+    render_children args env
+  | Symbol tag when is_html_tag tag ->
+    render_html_element tag args env
+  | Symbol "if" ->
+    let cond_val = Sx_ref.eval_expr (List.hd args) (Env env) in
+    if sx_truthy cond_val then
+      (if List.length args > 1 then do_render_to_html (List.nth args 1) env else "")
+    else
+      (if List.length args > 2 then do_render_to_html (List.nth args 2) env else "")
+  | Symbol "when" ->
+    let cond_val = Sx_ref.eval_expr (List.hd args) (Env env) in
+    if sx_truthy cond_val then
+      String.concat "" (List.map (fun e -> do_render_to_html e env) (List.tl args))
+    else ""
+  | Symbol "cond" ->
+    render_cond args env
+  | Symbol "case" ->
+    let v = Sx_ref.eval_expr (List (head :: args)) (Env env) in
+    do_render_to_html v env
+  | Symbol ("let" | "let*") ->
+    render_let args env
+  | Symbol ("begin" | "do") ->
+    let rec go = function
+      | [] -> ""
+      | [last] -> do_render_to_html last env
+      | e :: rest ->
+        ignore (Sx_ref.eval_expr e (Env env));
+        go rest
+    in go args
+  | Symbol ("define" | "defcomp" | "defmacro" | "defisland") ->
+    ignore (Sx_ref.eval_expr (List (head :: args)) (Env env));
+    ""
+  | Symbol "map" ->
+    render_map args env false
+  | Symbol "map-indexed" ->
+    render_map args env true
+  | Symbol "filter" ->
+    let v = Sx_ref.eval_expr (List (head :: args)) (Env env) in
+    do_render_to_html v env
+  | Symbol "for-each" ->
+    render_for_each args env
+  | Symbol name ->
+    (try
+      let v = env_get env name in
+      (match v with
+       | Component _ | Island _ -> render_component v args env
+       | Macro m ->
+         let expanded = expand_macro m args env in
+         do_render_to_html expanded env
+       | _ ->
+         let result = Sx_ref.eval_expr (List (head :: args)) (Env env) in
+         do_render_to_html result env)
+    with Eval_error _ ->
+      let result = Sx_ref.eval_expr (List (head :: args)) (Env env) in
+      do_render_to_html result env)
+  | _ ->
+    let result = Sx_ref.eval_expr (List (head :: args)) (Env env) in
+    do_render_to_html result env
+
+and render_cond args env =
+  let as_list = function List l | ListRef { contents = l } -> Some l | _ -> None in
+  let is_scheme = List.for_all (fun a -> match as_list a with
+    | Some items when List.length items = 2 -> true
+    | _ -> false) args
+  in
+  if is_scheme then begin
+    let rec go = function
+      | [] -> ""
+      | clause :: rest ->
+        (match as_list clause with
+         | Some [test; body] ->
+           let is_else = match test with
+             | Keyword "else" -> true
+             | Symbol "else" | Symbol ":else" -> true
+             | _ -> false
+           in
+           if is_else then do_render_to_html body env
+           else
+             let v = Sx_ref.eval_expr test (Env env) in
+             if sx_truthy v then do_render_to_html body env
+             else go rest
+         | _ -> "")
+    in go args
+  end else begin
+    let rec go = function
+      | [] -> ""
+      | [_] -> ""
+      | test :: body :: rest ->
+        let is_else = match test with
+          | Keyword "else" -> true
+          | Symbol "else" | Symbol ":else" -> true
+          | _ -> false
+        in
+        if is_else then do_render_to_html body env
+        else
+          let v = Sx_ref.eval_expr test (Env env) in
+          if sx_truthy v then do_render_to_html body env
+          else go rest
+    in go args
+  end
+
+and render_let args env =
+  let as_list = function List l | ListRef { contents = l } -> Some l | _ -> None in
+  let bindings_expr = List.hd args in
+  let body = List.tl args in
+  let local = env_extend env in
+  let bindings = match as_list bindings_expr with Some l -> l | None -> [] in
+  let is_scheme = match bindings with
+    | (List _ :: _) | (ListRef _ :: _) -> true
+    | _ -> false
+  in
+  if is_scheme then
+    List.iter (fun b ->
+      match as_list b with
+      | Some [Symbol name; expr] | Some [String name; expr] ->
+        let v = Sx_ref.eval_expr expr (Env local) in
+        ignore (env_bind local name v)
+      | _ -> ()
+    ) bindings
+  else begin
+    let rec go = function
+      | [] -> ()
+      | (Symbol name) :: expr :: rest | (String name) :: expr :: rest ->
+        let v = Sx_ref.eval_expr expr (Env local) in
+        ignore (env_bind local name v);
+        go rest
+      | _ -> ()
+    in go bindings
+  end;
+  let rec render_body = function
+    | [] -> ""
+    | [last] -> do_render_to_html last local
+    | e :: rest ->
+      ignore (Sx_ref.eval_expr e (Env local));
+      render_body rest
+  in render_body body
+
+and render_map args env indexed =
+  let (fn_val, coll_val) = match args with
+    | [a; b] ->
+      let va = Sx_ref.eval_expr a (Env env) in
+      let vb = Sx_ref.eval_expr b (Env env) in
+      (match va, vb with
+       | (Lambda _ | NativeFn _), _ -> (va, vb)
+       | _, (Lambda _ | NativeFn _) -> (vb, va)
+       | _ -> (va, vb))
+    | _ -> (Nil, Nil)
+  in
+  let items = match coll_val with List l | ListRef { contents = l } -> l | _ -> [] in
+  String.concat "" (List.mapi (fun i item ->
+    let call_args = if indexed then [Number (float_of_int i); item] else [item] in
+    match fn_val with
+    | Lambda l ->
+      let local = env_extend l.l_closure in
+      List.iter2 (fun p a -> ignore (env_bind local p a))
+        l.l_params call_args;
+      do_render_to_html l.l_body local
+    | _ ->
+      let result = Sx_runtime.sx_call fn_val call_args in
+      do_render_to_html result env
+  ) items)
+
+and render_for_each args env =
+  let (fn_val, coll_val) = match args with
+    | [a; b] ->
+      let va = Sx_ref.eval_expr a (Env env) in
+      let vb = Sx_ref.eval_expr b (Env env) in
+      (match va, vb with
+       | (Lambda _ | NativeFn _), _ -> (va, vb)
+       | _, (Lambda _ | NativeFn _) -> (vb, va)
+       | _ -> (va, vb))
+    | _ -> (Nil, Nil)
+  in
+  let items = match coll_val with List l | ListRef { contents = l } -> l | _ -> [] in
+  String.concat "" (List.map (fun item ->
+    match fn_val with
+    | Lambda l ->
+      let local = env_extend l.l_closure in
+      List.iter2 (fun p a -> ignore (env_bind local p a))
+        l.l_params [item];
+      do_render_to_html l.l_body local
+    | _ ->
+      let result = Sx_runtime.sx_call fn_val [item] in
+      do_render_to_html result env
+  ) items)
+
+
+(* ====================================================================== *)
+(* Setup — bind render primitives in an env and wire up the ref            *)
+(* ====================================================================== *)
+
+let setup_render_env env =
+  render_to_html_ref := do_render_to_html;
+
+  let bind name fn =
+    ignore (env_bind env name (NativeFn (name, fn)))
+  in
+
+  bind "render-html" (fun args ->
+    match args with
+    | [String src] ->
+      let exprs = Sx_parser.parse_all src in
+      let expr = match exprs with
+        | [e] -> e
+        | [] -> Nil
+        | _ -> List (Symbol "do" :: exprs)
+      in
+      String (render_to_html expr env)
+    | [expr] ->
+      String (render_to_html expr env)
+    | [expr; Env e] ->
+      String (render_to_html expr e)
+    | _ -> String "");
+
+  bind "render-to-html" (fun args ->
+    match args with
+    | [String src] ->
+      let exprs = Sx_parser.parse_all src in
+      let expr = match exprs with
+        | [e] -> e
+        | [] -> Nil
+        | _ -> List (Symbol "do" :: exprs)
+      in
+      String (render_to_html expr env)
+    | [expr] ->
+      String (render_to_html expr env)
+    | [expr; Env e] ->
+      String (render_to_html expr e)
+    | _ -> String "")

hosts/ocaml/lib/sx_runtime.ml

@@ -0,0 +1,470 @@
+(** Runtime helpers for transpiled code.
+
+    These bridge the gap between the transpiler's output and the
+    foundation types/primitives. The transpiled evaluator calls these
+    functions directly. *)
+
+open Sx_types
+
+(** Call a registered primitive by name. *)
+let prim_call name args =
+  match Hashtbl.find_opt Sx_primitives.primitives name with
+  | Some f -> f args
+  | None -> raise (Eval_error ("Unknown primitive: " ^ name))
+
+(** Convert any SX value to an OCaml string (internal). *)
+let value_to_str = function
+  | String s -> s
+  | Number n ->
+    if Float.is_integer n then string_of_int (int_of_float n)
+    else Printf.sprintf "%g" n
+  | Bool true -> "true"
+  | Bool false -> "false"
+  | Nil -> ""
+  | Symbol s -> s
+  | Keyword k -> k
+  | v -> inspect v
+
+(** sx_to_string returns a value (String) for transpiled code. *)
+let sx_to_string v = String (value_to_str v)
+
+(** String concatenation helper — [sx_str] takes a list of values. *)
+let sx_str args =
+  String.concat "" (List.map value_to_str args)
+
+(** Convert a value to a list. *)
+let sx_to_list = function
+  | List l -> l
+  | ListRef r -> !r
+  | Nil -> []
+  | v -> raise (Eval_error ("Expected list, got " ^ type_of v))
+
+(** Call an SX callable (lambda, native fn, continuation). *)
+let sx_call f args =
+  match f with
+  | NativeFn (_, fn) -> fn args
+  | Lambda l ->
+    let local = Sx_types.env_extend l.l_closure in
+    List.iter2 (fun p a -> ignore (Sx_types.env_bind local p a)) l.l_params args;
+    (* Return the body + env for the trampoline to evaluate *)
+    Thunk (l.l_body, local)
+  | Continuation (k, _) ->
+    k (match args with x :: _ -> x | [] -> Nil)
+  | _ -> raise (Eval_error ("Not callable: " ^ inspect f))
+
+(** Apply a function to a list of args. *)
+let sx_apply f args_list =
+  sx_call f (sx_to_list args_list)
+
+(** Mutable append — add item to a list ref or accumulator.
+    In transpiled code, lists that get appended to are mutable refs. *)
+let sx_append_b lst item =
+  match lst with
+  | List items -> List (items @ [item])
+  | ListRef r -> r := !r @ [item]; lst  (* mutate in place, return same ref *)
+  | _ -> raise (Eval_error ("append!: expected list, got " ^ type_of lst))
+
+(** Mutable dict-set — set key in dict, return value. *)
+let sx_dict_set_b d k v =
+  match d, k with
+  | Dict tbl, String key -> Hashtbl.replace tbl key v; v
+  | Dict tbl, Keyword key -> Hashtbl.replace tbl key v; v
+  | _ -> raise (Eval_error "dict-set!: expected dict and string key")
+
+(** Get from dict or list. *)
+let get_val container key =
+  match container, key with
+  | Dict d, String k -> dict_get d k
+  | Dict d, Keyword k -> dict_get d k
+  | (List l | ListRef { contents = l }), Number n ->
+    (try List.nth l (int_of_float n) with _ -> Nil)
+  | _ -> raise (Eval_error ("get: unsupported " ^ type_of container ^ " / " ^ type_of key))
+
+(** Register get as a primitive override — transpiled code calls (get d k). *)
+let () =
+  Sx_primitives.register "get" (fun args ->
+    match args with
+    | [c; k] -> get_val c k
+    | [c; k; default] ->
+      (try
+        let v = get_val c k in
+        if v = Nil then default else v
+      with _ -> default)
+    | _ -> raise (Eval_error "get: 2-3 args"))
+
+
+(* ====================================================================== *)
+(* Primitive aliases — top-level functions called by transpiled code       *)
+(* ====================================================================== *)
+
+(** The transpiled evaluator calls primitives directly by their mangled
+    OCaml name. These aliases delegate to the primitives table so the
+    transpiled code compiles without needing [prim_call] everywhere. *)
+
+let _prim name = match Hashtbl.find_opt Sx_primitives.primitives name with
+  | Some f -> f | None -> (fun _ -> raise (Eval_error ("Missing prim: " ^ name)))
+
+(* Collection ops *)
+let first args = _prim "first" [args]
+let rest args = _prim "rest" [args]
+let last args = _prim "last" [args]
+let nth coll i = _prim "nth" [coll; i]
+let cons x l = _prim "cons" [x; l]
+let append a b = _prim "append" [a; b]
+let reverse l = _prim "reverse" [l]
+let flatten l = _prim "flatten" [l]
+let concat a b = _prim "concat" [a; b]
+let slice a b = _prim "slice" [a; b]
+let len a = _prim "len" [a]
+let get a b = get_val a b
+let sort' a = _prim "sort" [a]
+let range' a = _prim "range" [a]
+let unique a = _prim "unique" [a]
+let zip a b = _prim "zip" [a; b]
+let zip_pairs a = _prim "zip-pairs" [a]
+let take a b = _prim "take" [a; b]
+let drop a b = _prim "drop" [a; b]
+let chunk_every a b = _prim "chunk-every" [a; b]
+
+(* Predicates *)
+let empty_p a = _prim "empty?" [a]
+let nil_p a = _prim "nil?" [a]
+let number_p a = _prim "number?" [a]
+let string_p a = _prim "string?" [a]
+let boolean_p a = _prim "boolean?" [a]
+let list_p a = _prim "list?" [a]
+let dict_p a = _prim "dict?" [a]
+let symbol_p a = _prim "symbol?" [a]
+let keyword_p a = _prim "keyword?" [a]
+let contains_p a b = _prim "contains?" [a; b]
+let has_key_p a b = _prim "has-key?" [a; b]
+let starts_with_p a b = _prim "starts-with?" [a; b]
+let ends_with_p a b = _prim "ends-with?" [a; b]
+let string_contains_p a b = _prim "string-contains?" [a; b]
+let odd_p a = _prim "odd?" [a]
+let even_p a = _prim "even?" [a]
+let zero_p a = _prim "zero?" [a]
+
+(* String ops *)
+let str' args = String (sx_str args)
+let upper a = _prim "upper" [a]
+let upcase a = _prim "upcase" [a]
+let lower a = _prim "lower" [a]
+let downcase a = _prim "downcase" [a]
+let trim a = _prim "trim" [a]
+let split a b = _prim "split" [a; b]
+let join a b = _prim "join" [a; b]
+let replace a b c = _prim "replace" [a; b; c]
+let index_of a b = _prim "index-of" [a; b]
+let substring a b c = _prim "substring" [a; b; c]
+let string_length a = _prim "string-length" [a]
+let char_from_code a = _prim "char-from-code" [a]
+
+(* Dict ops *)
+let assoc d k v = _prim "assoc" [d; k; v]
+let dissoc d k = _prim "dissoc" [d; k]
+let merge' a b = _prim "merge" [a; b]
+let keys a = _prim "keys" [a]
+let vals a = _prim "vals" [a]
+let dict_set a b c = _prim "dict-set!" [a; b; c]
+let dict_get a b = _prim "dict-get" [a; b]
+let dict_has_p a b = _prim "dict-has?" [a; b]
+let dict_delete a b = _prim "dict-delete!" [a; b]
+
+(* Math *)
+let abs' a = _prim "abs" [a]
+let sqrt' a = _prim "sqrt" [a]
+let pow' a b = _prim "pow" [a; b]
+let floor' a = _prim "floor" [a]
+let ceil' a = _prim "ceil" [a]
+let round' a = _prim "round" [a]
+let min' a b = _prim "min" [a; b]
+let max' a b = _prim "max" [a; b]
+let clamp a b c = _prim "clamp" [a; b; c]
+let parse_int a = _prim "parse-int" [a]
+let parse_float a = _prim "parse-float" [a]
+
+(* Misc *)
+let error msg = raise (Eval_error (value_to_str msg))
+
+(* inspect wrapper — returns String value instead of OCaml string *)
+let inspect v = String (Sx_types.inspect v)
+let apply' f args = sx_apply f args
+let identical_p a b = _prim "identical?" [a; b]
+let _is_spread_prim a = _prim "spread?" [a]
+let spread_attrs a = _prim "spread-attrs" [a]
+let make_spread a = _prim "make-spread" [a]
+
+(* Scope stacks — thread-local stacks keyed by name string.
+   collect!/collected implement accumulator scopes.
+   emit!/emitted implement event emission scopes.
+   context reads the top of a named scope stack. *)
+let _scope_stacks : (string, value list) Hashtbl.t = Hashtbl.create 8
+
+let sx_collect name value =
+  let key = value_to_str name in
+  let stack = match Hashtbl.find_opt _scope_stacks key with
+    | Some s -> s | None -> [] in
+  (* Push value onto the top list of the stack *)
+  (match stack with
+   | List items :: rest ->
+     Hashtbl.replace _scope_stacks key (List (items @ [value]) :: rest)
+   | _ ->
+     Hashtbl.replace _scope_stacks key (List [value] :: stack));
+  Nil
+
+let sx_collected name =
+  let key = value_to_str name in
+  match Hashtbl.find_opt _scope_stacks key with
+  | Some (List items :: _) -> List items
+  | _ -> List []
+
+let sx_clear_collected name =
+  let key = value_to_str name in
+  (match Hashtbl.find_opt _scope_stacks key with
+   | Some (_ :: rest) -> Hashtbl.replace _scope_stacks key (List [] :: rest)
+   | _ -> ());
+  Nil
+
+let sx_emit name value =
+  let key = value_to_str name in
+  let stack = match Hashtbl.find_opt _scope_stacks key with
+    | Some s -> s | None -> [] in
+  (match stack with
+   | List items :: rest ->
+     Hashtbl.replace _scope_stacks key (List (items @ [value]) :: rest)
+   | _ ->
+     Hashtbl.replace _scope_stacks key (List [value] :: stack));
+  Nil
+
+let sx_emitted name =
+  let key = value_to_str name in
+  match Hashtbl.find_opt _scope_stacks key with
+  | Some (List items :: _) -> List items
+  | _ -> List []
+
+let sx_context name default =
+  let key = value_to_str name in
+  match Hashtbl.find_opt _scope_stacks key with
+  | Some (v :: _) -> v
+  | _ -> default
+
+(* Trampoline — forward-declared in sx_ref.ml, delegates to CEK eval_expr *)
+(* This is a stub; the real trampoline is wired up in sx_ref.ml after eval_expr is defined *)
+let trampoline v = v
+
+(* Value-returning type predicates — the transpiled code passes these through
+   sx_truthy, so they need to return Bool, not OCaml bool. *)
+(* type_of returns value, not string *)
+let type_of v = String (Sx_types.type_of v)
+
+(* Env operations — accept Env-wrapped values and value keys.
+   The transpiled CEK machine stores envs in dicts as Env values. *)
+let unwrap_env = function
+  | Env e -> e
+  | _ -> raise (Eval_error "Expected env")
+
+let env_has e name = Bool (Sx_types.env_has (unwrap_env e) (value_to_str name))
+let env_get e name = Sx_types.env_get (unwrap_env e) (value_to_str name)
+let env_bind e name v = Sx_types.env_bind (unwrap_env e) (value_to_str name) v
+let env_set e name v = Sx_types.env_set (unwrap_env e) (value_to_str name) v
+
+let make_env () = Env (Sx_types.make_env ())
+let env_extend e = Env (Sx_types.env_extend (unwrap_env e))
+let env_merge a b = Env (Sx_types.env_merge (unwrap_env a) (unwrap_env b))
+
+(* set_lambda_name wrapper — accepts value, extracts string *)
+let set_lambda_name l n = Sx_types.set_lambda_name l (value_to_str n)
+
+let is_nil v = Bool (Sx_types.is_nil v)
+let is_thunk v = Bool (Sx_types.is_thunk v)
+let is_lambda v = Bool (Sx_types.is_lambda v)
+let is_component v = Bool (Sx_types.is_component v)
+let is_island v = Bool (Sx_types.is_island v)
+let is_macro v = Bool (Sx_types.is_macro v)
+let is_signal v = Bool (Sx_types.is_signal v)
+let is_callable v = Bool (Sx_types.is_callable v)
+let is_identical a b = Bool (a == b)
+let is_primitive name = Bool (Sx_primitives.is_primitive (value_to_str name))
+let get_primitive name = Sx_primitives.get_primitive (value_to_str name)
+let is_spread v = match v with Spread _ -> Bool true | _ -> Bool false
+
+(* Stubs for functions defined in sx_ref.ml — resolved at link time *)
+(* These are forward-declared here; sx_ref.ml defines the actual implementations *)
+
+(* strip-prefix *)
+(* Stubs for evaluator functions — defined in sx_ref.ml but
+   sometimes referenced before their definition via forward calls.
+   These get overridden by the actual transpiled definitions. *)
+
+let map_indexed fn coll =
+  List (List.mapi (fun i x -> sx_call fn [Number (float_of_int i); x]) (sx_to_list coll))
+
+let map_dict fn d =
+  match d with
+  | Dict tbl ->
+    let result = Hashtbl.create (Hashtbl.length tbl) in
+    Hashtbl.iter (fun k v -> Hashtbl.replace result k (sx_call fn [String k; v])) tbl;
+    Dict result
+  | _ -> raise (Eval_error "map-dict: expected dict")
+
+let for_each fn coll =
+  List.iter (fun x -> ignore (sx_call fn [x])) (sx_to_list coll);
+  Nil
+
+let for_each_indexed fn coll =
+  List.iteri (fun i x -> ignore (sx_call fn [Number (float_of_int i); x])) (sx_to_list coll);
+  Nil
+
+(* Continuation support *)
+let continuation_p v = match v with Continuation (_, _) -> Bool true | _ -> Bool false
+
+let make_cek_continuation captured rest_kont =
+  let data = Hashtbl.create 2 in
+  Hashtbl.replace data "captured" captured;
+  Hashtbl.replace data "rest-kont" rest_kont;
+  Continuation ((fun v -> v), Some data)
+
+let continuation_data v = match v with
+  | Continuation (_, Some d) -> Dict d
+  | Continuation (_, None) -> Dict (Hashtbl.create 0)
+  | _ -> raise (Eval_error "not a continuation")
+
+(* Dynamic wind — simplified for OCaml (no async) *)
+let dynamic_wind_call before body after _env =
+  ignore (sx_call before []);
+  let result = sx_call body [] in
+  ignore (sx_call after []);
+  result
+
+(* Scope stack stubs — delegated to primitives when available *)
+let scope_push name value =
+  let key = value_to_str name in
+  let stack = match Hashtbl.find_opt _scope_stacks key with
+    | Some s -> s | None -> [] in
+  Hashtbl.replace _scope_stacks key (value :: stack);
+  Nil
+
+let scope_pop name =
+  let key = value_to_str name in
+  (match Hashtbl.find_opt _scope_stacks key with
+   | Some (_ :: rest) -> Hashtbl.replace _scope_stacks key rest
+   | _ -> ());
+  Nil
+
+let provide_push name value = scope_push name value
+let provide_pop name = scope_pop name
+
+(* Render mode — mutable refs so browser entry point can wire up the renderer *)
+let _render_active_p_fn : (unit -> value) ref = ref (fun () -> Bool false)
+let _render_expr_fn : (value -> value -> value) ref = ref (fun _expr _env -> Nil)
+let _is_render_expr_fn : (value -> value) ref = ref (fun _expr -> Bool false)
+
+let render_active_p () = !_render_active_p_fn ()
+let render_expr expr env = !_render_expr_fn expr env
+let is_render_expr expr = !_is_render_expr_fn expr
+
+(* Signal accessors — handle both native Signal type and dict-based signals
+   from web/signals.sx which use {__signal: true, value: ..., subscribers: ..., deps: ...} *)
+let is_dict_signal d = Hashtbl.mem d "__signal"
+
+let signal_value s = match s with
+  | Signal sig' -> sig'.s_value
+  | Dict d when is_dict_signal d -> Sx_types.dict_get d "value"
+  | _ -> raise (Eval_error ("not a signal: " ^ Sx_types.type_of s))
+
+let signal_set_value s v = match s with
+  | Signal sig' -> sig'.s_value <- v; v
+  | Dict d when is_dict_signal d -> Hashtbl.replace d "value" v; v
+  | _ -> raise (Eval_error "not a signal")
+
+let signal_subscribers s = match s with
+  | Signal sig' -> List (List.map (fun _ -> Nil) sig'.s_subscribers)
+  | Dict d when is_dict_signal d -> Sx_types.dict_get d "subscribers"
+  | _ -> List []
+
+(* These use Obj.magic to accept both SX values and OCaml closures.
+   The transpiler generates bare (fun () -> ...) for reactive subscribers
+   but signal_add_sub_b expects value. This is a known transpiler limitation. *)
+let signal_add_sub_b s (f : _ ) = match s with
+  | Dict d when is_dict_signal d ->
+    let f_val : value = Obj.magic f in
+    let subs = match Sx_types.dict_get d "subscribers" with
+      | List l -> l | ListRef r -> !r | _ -> [] in
+    Hashtbl.replace d "subscribers" (List (subs @ [f_val])); Nil
+  | _ -> Nil
+
+let signal_remove_sub_b s (f : _) = match s with
+  | Dict d when is_dict_signal d ->
+    let f_val : value = Obj.magic f in
+    let subs = match Sx_types.dict_get d "subscribers" with
+      | List l -> l | ListRef r -> !r | _ -> [] in
+    Hashtbl.replace d "subscribers" (List (List.filter (fun x -> x != f_val) subs)); Nil
+  | _ -> Nil
+
+let signal_deps s = match s with
+  | Dict d when is_dict_signal d -> Sx_types.dict_get d "deps"
+  | _ -> List []
+
+let signal_set_deps s deps = match s with
+  | Dict d when is_dict_signal d -> Hashtbl.replace d "deps" deps; Nil
+  | _ -> Nil
+
+let notify_subscribers s = match s with
+  | Dict d when is_dict_signal d ->
+    let subs = match Sx_types.dict_get d "subscribers" with
+      | List l -> l | ListRef r -> !r | _ -> [] in
+    List.iter (fun sub ->
+      match sub with
+      | NativeFn (_, f) -> ignore (f [])
+      | Lambda _ -> ignore (Sx_types.env_bind (Sx_types.make_env ()) "_" Nil) (* TODO: call through CEK *)
+      | _ -> ()
+    ) subs; Nil
+  | _ -> Nil
+
+let flush_subscribers _s = Nil
+let dispose_computed _s = Nil
+
+(* Island scope stubs — accept OCaml functions from transpiled code.
+   Use Obj.magic for the same reason as signal_add_sub_b. *)
+let with_island_scope (_register_fn : _) (body_fn : _) =
+  let body : unit -> value = Obj.magic body_fn in
+  body ()
+let register_in_scope (_dispose_fn : _) = Nil
+
+(* Component type annotation stub *)
+let component_set_param_types_b _comp _types = Nil
+
+(* Parse keyword args from a call — this is defined in evaluator.sx,
+   the transpiled version will override this stub. *)
+(* Forward-reference stubs for evaluator functions used before definition *)
+let parse_comp_params _params = List [List []; Nil; Bool false]
+let parse_macro_params _params = List [List []; Nil]
+
+let parse_keyword_args _raw_args _env =
+  (* Stub — the real implementation is transpiled from evaluator.sx *)
+  List [Dict (Hashtbl.create 0); List []]
+
+(* Make handler/query/action/page def stubs *)
+let make_handler_def name params body _env = Dict (let d = Hashtbl.create 4 in Hashtbl.replace d "type" (String "handler"); Hashtbl.replace d "name" name; Hashtbl.replace d "params" params; Hashtbl.replace d "body" body; d)
+let make_query_def name params body _env = make_handler_def name params body _env
+let make_action_def name params body _env = make_handler_def name params body _env
+let make_page_def name _opts = Dict (let d = Hashtbl.create 4 in Hashtbl.replace d "type" (String "page"); Hashtbl.replace d "name" name; d)
+
+(* sf-def* stubs — platform-specific def-forms, not in the SX spec *)
+let sf_defhandler args env =
+  let name = first args in let rest_args = rest args in
+  make_handler_def name (first rest_args) (nth rest_args (Number 1.0)) env
+let sf_defquery args env = sf_defhandler args env
+let sf_defaction args env = sf_defhandler args env
+let sf_defpage args _env =
+  let name = first args in make_page_def name (rest args)
+
+let strip_prefix s prefix =
+  match s, prefix with
+  | String s, String p ->
+    let pl = String.length p in
+    if String.length s >= pl && String.sub s 0 pl = p
+    then String (String.sub s pl (String.length s - pl))
+    else String s
+  | _ -> s

hosts/ocaml/lib/sx_types.ml

@@ -0,0 +1,401 @@
+(** Core types for the SX language.
+
+    The [value] sum type represents every possible SX runtime value.
+    OCaml's algebraic types make the CEK machine's frame dispatch a
+    pattern match — exactly what the spec describes. *)
+
+(** {1 Environment} *)
+
+(** Lexical scope chain.  Each frame holds a mutable binding table and
+    an optional parent link for scope-chain lookup. *)
+type env = {
+  bindings : (string, value) Hashtbl.t;
+  parent   : env option;
+}
+
+(** {1 Values} *)
+
+and value =
+  | Nil
+  | Bool   of bool
+  | Number of float
+  | String of string
+  | Symbol of string
+  | Keyword of string
+  | List   of value list
+  | Dict   of dict
+  | Lambda of lambda
+  | Component of component
+  | Island of island
+  | Macro  of macro
+  | Thunk  of value * env
+  | Continuation of (value -> value) * dict option
+  | NativeFn of string * (value list -> value)
+  | Signal of signal
+  | RawHTML of string
+  | Spread of (string * value) list
+  | SxExpr of string  (** Opaque SX wire-format string — aser output. *)
+  | Env of env  (** First-class environment — used by CEK machine state dicts. *)
+  | ListRef of value list ref  (** Mutable list — JS-style array for append! *)
+
+(** Mutable string-keyed table (SX dicts support [dict-set!]). *)
+and dict = (string, value) Hashtbl.t
+
+and lambda = {
+  l_params  : string list;
+  l_body    : value;
+  l_closure : env;
+  mutable l_name : string option;
+}
+
+and component = {
+  c_name         : string;
+  c_params       : string list;
+  c_has_children : bool;
+  c_body         : value;
+  c_closure      : env;
+  c_affinity     : string;  (** "auto" | "client" | "server" *)
+}
+
+and island = {
+  i_name         : string;
+  i_params       : string list;
+  i_has_children : bool;
+  i_body         : value;
+  i_closure      : env;
+}
+
+and macro = {
+  m_params     : string list;
+  m_rest_param : string option;
+  m_body       : value;
+  m_closure    : env;
+  m_name       : string option;
+}
+
+and signal = {
+  mutable s_value       : value;
+  mutable s_subscribers : (unit -> unit) list;
+  mutable s_deps        : signal list;
+}
+
+
+(** {1 Errors} *)
+
+exception Eval_error of string
+exception Parse_error of string
+
+
+(** {1 Environment operations} *)
+
+let make_env () =
+  { bindings = Hashtbl.create 16; parent = None }
+
+let env_extend parent =
+  { bindings = Hashtbl.create 16; parent = Some parent }
+
+let env_bind env name v =
+  Hashtbl.replace env.bindings name v; Nil
+
+let rec env_has env name =
+  Hashtbl.mem env.bindings name ||
+  match env.parent with Some p -> env_has p name | None -> false
+
+let rec env_get env name =
+  match Hashtbl.find_opt env.bindings name with
+  | Some v -> v
+  | None ->
+    match env.parent with
+    | Some p -> env_get p name
+    | None -> raise (Eval_error ("Undefined symbol: " ^ name))
+
+let rec env_set env name v =
+  if Hashtbl.mem env.bindings name then
+    (Hashtbl.replace env.bindings name v; Nil)
+  else
+    match env.parent with
+    | Some p -> env_set p name v
+    | None -> Hashtbl.replace env.bindings name v; Nil
+
+let env_merge base overlay =
+  (* If base and overlay are the same env (physical equality) or overlay
+     is a descendant of base, just extend base — no copying needed.
+     This prevents set! inside lambdas from modifying shadow copies. *)
+  if base == overlay then
+    { bindings = Hashtbl.create 16; parent = Some base }
+  else begin
+    (* Check if overlay is a descendant of base *)
+    let rec is_descendant e depth =
+      if depth > 100 then false
+      else if e == base then true
+      else match e.parent with Some p -> is_descendant p (depth + 1) | None -> false
+    in
+    if is_descendant overlay 0 then
+      { bindings = Hashtbl.create 16; parent = Some base }
+    else begin
+      (* General case: extend base, copy ONLY overlay bindings that don't
+         exist anywhere in the base chain (avoids shadowing closure bindings). *)
+      let e = { bindings = Hashtbl.create 16; parent = Some base } in
+      Hashtbl.iter (fun k v ->
+        if not (env_has base k) then Hashtbl.replace e.bindings k v
+      ) overlay.bindings;
+      e
+    end
+  end
+
+
+(** {1 Value extraction helpers} *)
+
+let value_to_string = function
+  | String s -> s | Symbol s -> s | Keyword k -> k
+  | Number n -> if Float.is_integer n then string_of_int (int_of_float n) else Printf.sprintf "%g" n
+  | Bool true -> "true" | Bool false -> "false"
+  | Nil -> "" | _ -> "<value>"
+
+let value_to_string_list = function
+  | List items | ListRef { contents = items } -> List.map value_to_string items
+  | _ -> []
+
+let value_to_bool = function
+  | Bool b -> b | Nil -> false | _ -> true
+
+let value_to_string_opt = function
+  | String s -> Some s | Symbol s -> Some s | Nil -> None | _ -> None
+
+
+(** {1 Constructors — accept [value] args from transpiled code} *)
+
+let unwrap_env_val = function
+  | Env e -> e
+  | _ -> raise (Eval_error "make_lambda: expected env for closure")
+
+let make_lambda params body closure =
+  let ps = match params with
+    | List items -> List.map value_to_string items
+    | _ -> value_to_string_list params
+  in
+  Lambda { l_params = ps; l_body = body; l_closure = unwrap_env_val closure; l_name = None }
+
+let make_component name params has_children body closure affinity =
+  let n = value_to_string name in
+  let ps = value_to_string_list params in
+  let hc = value_to_bool has_children in
+  let aff = match affinity with String s -> s | _ -> "auto" in
+  Component {
+    c_name = n; c_params = ps; c_has_children = hc;
+    c_body = body; c_closure = unwrap_env_val closure; c_affinity = aff;
+  }
+
+let make_island name params has_children body closure =
+  let n = value_to_string name in
+  let ps = value_to_string_list params in
+  let hc = value_to_bool has_children in
+  Island {
+    i_name = n; i_params = ps; i_has_children = hc;
+    i_body = body; i_closure = unwrap_env_val closure;
+  }
+
+let make_macro params rest_param body closure name =
+  let ps = value_to_string_list params in
+  let rp = value_to_string_opt rest_param in
+  let n = value_to_string_opt name in
+  Macro {
+    m_params = ps; m_rest_param = rp;
+    m_body = body; m_closure = unwrap_env_val closure; m_name = n;
+  }
+
+let make_thunk expr env = Thunk (expr, unwrap_env_val env)
+
+let make_symbol name = Symbol (value_to_string name)
+let make_keyword name = Keyword (value_to_string name)
+
+
+(** {1 Type inspection} *)
+
+let type_of = function
+  | Nil            -> "nil"
+  | Bool _         -> "boolean"
+  | Number _       -> "number"
+  | String _       -> "string"
+  | Symbol _       -> "symbol"
+  | Keyword _      -> "keyword"
+  | List _ | ListRef _ -> "list"
+  | Dict _         -> "dict"
+  | Lambda _       -> "lambda"
+  | Component _    -> "component"
+  | Island _       -> "island"
+  | Macro _        -> "macro"
+  | Thunk _        -> "thunk"
+  | Continuation (_, _) -> "continuation"
+  | NativeFn _     -> "function"
+  | Signal _       -> "signal"
+  | RawHTML _      -> "raw-html"
+  | Spread _       -> "spread"
+  | SxExpr _       -> "sx-expr"
+  | Env _          -> "env"
+
+let is_nil = function Nil -> true | _ -> false
+let is_lambda = function Lambda _ -> true | _ -> false
+let is_component = function Component _ -> true | _ -> false
+let is_island = function Island _ -> true | _ -> false
+let is_macro = function Macro _ -> true | _ -> false
+let is_thunk = function Thunk _ -> true | _ -> false
+let is_signal = function
+  | Signal _ -> true
+  | Dict d -> Hashtbl.mem d "__signal"
+  | _ -> false
+
+let is_callable = function
+  | Lambda _ | NativeFn _ | Continuation (_, _) -> true
+  | _ -> false
+
+
+(** {1 Truthiness} *)
+
+(** SX truthiness: everything is truthy except [Nil] and [Bool false]. *)
+let sx_truthy = function
+  | Nil | Bool false -> false
+  | _ -> true
+
+
+(** {1 Accessors} *)
+
+let symbol_name = function
+  | Symbol s -> String s
+  | v -> raise (Eval_error ("Expected symbol, got " ^ type_of v))
+
+let keyword_name = function
+  | Keyword k -> String k
+  | v -> raise (Eval_error ("Expected keyword, got " ^ type_of v))
+
+let lambda_params = function
+  | Lambda l -> List (List.map (fun s -> String s) l.l_params)
+  | v -> raise (Eval_error ("Expected lambda, got " ^ type_of v))
+
+let lambda_body = function
+  | Lambda l -> l.l_body
+  | v -> raise (Eval_error ("Expected lambda, got " ^ type_of v))
+
+let lambda_closure = function
+  | Lambda l -> Env l.l_closure
+  | v -> raise (Eval_error ("Expected lambda, got " ^ type_of v))
+
+let lambda_name = function
+  | Lambda l -> (match l.l_name with Some n -> String n | None -> Nil)
+  | v -> raise (Eval_error ("Expected lambda, got " ^ type_of v))
+
+let set_lambda_name l n = match l with
+  | Lambda l -> l.l_name <- Some n; Nil
+  | _ -> raise (Eval_error "set-lambda-name!: not a lambda")
+
+let component_name = function
+  | Component c -> String c.c_name
+  | Island i -> String i.i_name
+  | v -> raise (Eval_error ("Expected component, got " ^ type_of v))
+
+let component_params = function
+  | Component c -> List (List.map (fun s -> String s) c.c_params)
+  | Island i -> List (List.map (fun s -> String s) i.i_params)
+  | v -> raise (Eval_error ("Expected component, got " ^ type_of v))
+
+let component_body = function
+  | Component c -> c.c_body
+  | Island i -> i.i_body
+  | v -> raise (Eval_error ("Expected component, got " ^ type_of v))
+
+let component_closure = function
+  | Component c -> Env c.c_closure
+  | Island i -> Env i.i_closure
+  | v -> raise (Eval_error ("Expected component, got " ^ type_of v))
+
+let component_has_children = function
+  | Component c -> Bool c.c_has_children
+  | Island i -> Bool i.i_has_children
+  | v -> raise (Eval_error ("Expected component, got " ^ type_of v))
+
+let component_affinity = function
+  | Component c -> String c.c_affinity
+  | Island _ -> String "client"
+  | _ -> String "auto"
+
+let macro_params = function
+  | Macro m -> List (List.map (fun s -> String s) m.m_params)
+  | v -> raise (Eval_error ("Expected macro, got " ^ type_of v))
+
+let macro_rest_param = function
+  | Macro m -> (match m.m_rest_param with Some s -> String s | None -> Nil)
+  | v -> raise (Eval_error ("Expected macro, got " ^ type_of v))
+
+let macro_body = function
+  | Macro m -> m.m_body
+  | v -> raise (Eval_error ("Expected macro, got " ^ type_of v))
+
+let macro_closure = function
+  | Macro m -> Env m.m_closure
+  | v -> raise (Eval_error ("Expected macro, got " ^ type_of v))
+
+let thunk_expr = function
+  | Thunk (e, _) -> e
+  | v -> raise (Eval_error ("Expected thunk, got " ^ type_of v))
+
+let thunk_env = function
+  | Thunk (_, e) -> Env e
+  | v -> raise (Eval_error ("Expected thunk, got " ^ type_of v))
+
+
+(** {1 Dict operations} *)
+
+let make_dict () : dict = Hashtbl.create 8
+
+let dict_get (d : dict) key =
+  match Hashtbl.find_opt d key with Some v -> v | None -> Nil
+
+let dict_has (d : dict) key = Hashtbl.mem d key
+
+let dict_set (d : dict) key v = Hashtbl.replace d key v
+
+let dict_delete (d : dict) key = Hashtbl.remove d key
+
+let dict_keys (d : dict) =
+  Hashtbl.fold (fun k _ acc -> String k :: acc) d []
+
+let dict_vals (d : dict) =
+  Hashtbl.fold (fun _ v acc -> v :: acc) d []
+
+
+(** {1 Value display} *)
+
+let rec inspect = function
+  | Nil -> "nil"
+  | Bool true -> "true"
+  | Bool false -> "false"
+  | Number n ->
+    if Float.is_integer n then Printf.sprintf "%d" (int_of_float n)
+    else Printf.sprintf "%g" n
+  | String s -> Printf.sprintf "%S" s
+  | Symbol s -> s
+  | Keyword k -> ":" ^ k
+  | List items | ListRef { contents = items } ->
+    "(" ^ String.concat " " (List.map inspect items) ^ ")"
+  | Dict d ->
+    let pairs = Hashtbl.fold (fun k v acc ->
+      (Printf.sprintf ":%s %s" k (inspect v)) :: acc) d [] in
+    "{" ^ String.concat " " pairs ^ "}"
+  | Lambda l ->
+    let tag = match l.l_name with Some n -> n | None -> "lambda" in
+    Printf.sprintf "<%s(%s)>" tag (String.concat ", " l.l_params)
+  | Component c ->
+    Printf.sprintf "<Component ~%s(%s)>" c.c_name (String.concat ", " c.c_params)
+  | Island i ->
+    Printf.sprintf "<Island ~%s(%s)>" i.i_name (String.concat ", " i.i_params)
+  | Macro m ->
+    let tag = match m.m_name with Some n -> n | None -> "macro" in
+    Printf.sprintf "<%s(%s)>" tag (String.concat ", " m.m_params)
+  | Thunk _ -> "<thunk>"
+  | Continuation (_, _) -> "<continuation>"
+  | NativeFn (name, _) -> Printf.sprintf "<native:%s>" name
+  | Signal _ -> "<signal>"
+  | RawHTML s -> Printf.sprintf "<raw-html:%d chars>" (String.length s)
+  | Spread _ -> "<spread>"
+  | SxExpr s -> Printf.sprintf "<sx-expr:%d chars>" (String.length s)
+  | Env _ -> "<env>"

hosts/python/bootstrap.py

@@ -20,7 +20,7 @@ import sys
 
 # Add project root to path for imports
 _HERE = os.path.dirname(os.path.abspath(__file__))
-_PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", ".."))
 sys.path.insert(0, _PROJECT)
 
 from shared.sx.parser import parse_all
@@ -85,7 +85,12 @@ class PyEmitter:
                 if name == "define-async":
                     return self._emit_define_async(expr, indent)
                 if name == "set!":
-                    return f"{pad}{self._mangle(expr[1].name)} = {self.emit(expr[2])}"
+                    varname = expr[1].name if isinstance(expr[1], Symbol) else str(expr[1])
+                    py_var = self._mangle(varname)
+                    cell_vars = getattr(self, '_current_cell_vars', set())
+                    if py_var in cell_vars:
+                        return f"{pad}_cells[{self._py_string(py_var)}] = {self.emit(expr[2])}"
+                    return f"{pad}{py_var} = {self.emit(expr[2])}"
                 if name == "when":
                     return self._emit_when_stmt(expr, indent)
                 if name == "do" or name == "begin":
@@ -165,12 +170,6 @@ class PyEmitter:
             "signal-remove-sub!": "signal_remove_sub",
             "signal-deps": "signal_deps",
             "signal-set-deps!": "signal_set_deps",
-            "set-tracking-context!": "set_tracking_context",
-            "get-tracking-context": "get_tracking_context",
-            "make-tracking-context": "make_tracking_context",
-            "tracking-context-deps": "tracking_context_deps",
-            "tracking-context-add-dep!": "tracking_context_add_dep",
-            "tracking-context-notify-fn": "tracking_context_notify_fn",
             "identical?": "is_identical",
             "notify-subscribers": "notify_subscribers",
             "flush-subscribers": "flush_subscribers",
@@ -179,7 +178,6 @@ class PyEmitter:
             "register-in-scope": "register_in_scope",
             "*batch-depth*": "_batch_depth",
             "*batch-queue*": "_batch_queue",
-            "*island-scope*": "_island_scope",
             "*store-registry*": "_store_registry",
             "def-store": "def_store",
             "use-store": "use_store",
@@ -293,6 +291,8 @@ class PyEmitter:
             "collect!": "sx_collect",
             "collected": "sx_collected",
             "clear-collected!": "sx_clear_collected",
+            "scope-push!": "scope_push",
+            "scope-pop!": "scope_pop",
             "provide-push!": "provide_push",
             "provide-pop!": "provide_pop",
             "context": "sx_context",
@@ -752,15 +752,24 @@ class PyEmitter:
         nested_set_vars = self._find_nested_set_vars(body)
         def_kw = "async def" if is_async else "def"
         lines = [f"{pad}{def_kw} {py_name}({params_str}):"]
-        if nested_set_vars:
-            lines.append(f"{pad}    _cells = {{}}")
         # Emit body with cell var tracking (and async context if needed)
         old_cells = getattr(self, '_current_cell_vars', set())
+        if nested_set_vars and not old_cells:
+            lines.append(f"{pad}    _cells = {{}}")
         old_async = self._in_async
-        self._current_cell_vars = nested_set_vars
+        self._current_cell_vars = old_cells | nested_set_vars
         if is_async:
             self._in_async = True
-        self._emit_body_stmts(body, lines, indent + 1)
+        # Self-tail-recursive 0-param functions: wrap body in while True
+        if (not param_names and not is_async
+                and self._has_self_tail_call(body, name)):
+            lines.append(f"{pad}    while True:")
+            old_loop = getattr(self, '_current_loop_name', None)
+            self._current_loop_name = name
+            self._emit_body_stmts(body, lines, indent + 2)
+            self._current_loop_name = old_loop
+        else:
+            self._emit_body_stmts(body, lines, indent + 1)
         self._current_cell_vars = old_cells
         self._in_async = old_async
         return "\n".join(lines)
@@ -799,14 +808,20 @@ class PyEmitter:
         Handles let as local variable declarations, and returns the last
         expression.  Control flow in tail position (if, cond, case, when)
         is flattened to if/elif statements with returns in each branch.
+
+        Detects self-tail-recursive (define name (fn () ...)) followed by
+        (name) and emits as while True loop instead of recursive def.
         """
         pad = "    " * indent
-        for i, expr in enumerate(body):
-            is_last = (i == len(body) - 1)
+        idx = 0
+        while idx < len(body):
+            expr = body[idx]
+            is_last = (idx == len(body) - 1)
             if isinstance(expr, list) and expr and isinstance(expr[0], Symbol):
                 name = expr[0].name
                 if name in ("let", "let*"):
                     self._emit_let_as_stmts(expr, lines, indent, is_last)
+                    idx += 1
                     continue
                 if name in ("do", "begin"):
                     sub_body = expr[1:]
@@ -815,15 +830,172 @@ class PyEmitter:
                     else:
                         for sub in sub_body:
                             lines.append(self.emit_statement(sub, indent))
+                    idx += 1
                     continue
+                # Detect self-tail-recursive loop pattern:
+                #   (define loop-name (fn () body...))
+                #   (loop-name)
+                # Emit as: while True: <body with self-calls as continue>
+                if (name == "define" and not is_last
+                        and idx + 1 < len(body)):
+                    loop_info = self._detect_tail_loop(expr, body[idx + 1])
+                    if loop_info:
+                        loop_name, fn_body = loop_info
+                        remaining = body[idx + 2:]
+                        # Only optimize if the function isn't called again later
+                        if not self._name_in_exprs(loop_name, remaining):
+                            self._emit_while_loop(loop_name, fn_body, lines, indent)
+                            # Skip the invocation; emit remaining body
+                            for j, rem in enumerate(remaining):
+                                if j == len(remaining) - 1:
+                                    self._emit_return_expr(rem, lines, indent)
+                                else:
+                                    self._emit_stmt_recursive(rem, lines, indent)
+                            return
             if is_last:
                 self._emit_return_expr(expr, lines, indent)
             else:
                 self._emit_stmt_recursive(expr, lines, indent)
+            idx += 1
+
+    def _detect_tail_loop(self, define_expr, next_expr):
+        """Detect pattern: (define name (fn () body...)) followed by (name).
+
+        Returns (loop_name, fn_body) if tail-recursive, else None.
+        The function must have 0 params and body must end with self-call
+        in all tail positions.
+        """
+        # Extract name and fn from define
+        dname = define_expr[1].name if isinstance(define_expr[1], Symbol) else None
+        if not dname:
+            return None
+        # Skip :effects annotation
+        if (len(define_expr) >= 5 and isinstance(define_expr[2], Keyword)
+                and define_expr[2].name == "effects"):
+            val_expr = define_expr[4]
+        else:
+            val_expr = define_expr[2] if len(define_expr) > 2 else None
+        if not (isinstance(val_expr, list) and val_expr
+                and isinstance(val_expr[0], Symbol)
+                and val_expr[0].name in ("fn", "lambda")):
+            return None
+        params = val_expr[1]
+        if not isinstance(params, list) or len(params) != 0:
+            return None  # Must be 0-param function
+        fn_body = val_expr[2:]
+        # Check next expression is (name) — invocation
+        if not (isinstance(next_expr, list) and len(next_expr) == 1
+                and isinstance(next_expr[0], Symbol)
+                and next_expr[0].name == dname):
+            return None
+        # Check that fn_body has self-call in tail position(s)
+        if not self._has_self_tail_call(fn_body, dname):
+            return None
+        return (dname, fn_body)
+
+    def _has_self_tail_call(self, body, name):
+        """Check if body is safe for while-loop optimization.
+
+        Returns True only when ALL tail positions are either:
+        - self-calls (name) → will become continue
+        - nil/void returns → will become break
+        - error() calls → raise, don't return
+        - when blocks → implicit nil else is fine
+        No tail position may return a computed value, since while-loop
+        break discards return values.
+        """
+        if not body:
+            return False
+        last = body[-1]
+        # Non-list terminal: nil is ok, anything else is a value return
+        if not isinstance(last, list) or not last:
+            return (last is None or last is SX_NIL
+                    or (isinstance(last, Symbol) and last.name == "nil"))
+        head = last[0] if isinstance(last[0], Symbol) else None
+        if not head:
+            return False
+        # Direct self-call in tail position
+        if head.name == name and len(last) == 1:
+            return True
+        # error() — raises, safe
+        if head.name == "error":
+            return True
+        # if — ALL branches must be safe
+        if head.name == "if":
+            then_ok = self._has_self_tail_call(
+                [last[2]] if len(last) > 2 else [None], name)
+            else_ok = self._has_self_tail_call(
+                [last[3]] if len(last) > 3 else [None], name)
+            return then_ok and else_ok
+        # do/begin — check last expression
+        if head.name in ("do", "begin"):
+            return self._has_self_tail_call(last[1:], name)
+        # when — body must be safe (implicit nil else is ok)
+        if head.name == "when":
+            return self._has_self_tail_call(last[2:], name)
+        # let/let* — check body (skip bindings)
+        if head.name in ("let", "let*"):
+            return self._has_self_tail_call(last[2:], name)
+        # cond — ALL branches must be safe
+        if head.name == "cond":
+            clauses = last[1:]
+            is_scheme = (
+                all(isinstance(c, list) and len(c) == 2 for c in clauses)
+                and not any(isinstance(c, Keyword) for c in clauses)
+            )
+            if is_scheme:
+                for clause in clauses:
+                    if not self._has_self_tail_call([clause[1]], name):
+                        return False
+                return True
+            else:
+                i = 0
+                while i < len(clauses) - 1:
+                    if not self._has_self_tail_call([clauses[i + 1]], name):
+                        return False
+                    i += 2
+                return True
+        return False
+
+    def _name_in_exprs(self, name, exprs):
+        """Check if a symbol name appears anywhere in a list of expressions."""
+        for expr in exprs:
+            if isinstance(expr, Symbol) and expr.name == name:
+                return True
+            if isinstance(expr, list):
+                if self._name_in_exprs(name, expr):
+                    return True
+        return False
+
+    def _emit_while_loop(self, loop_name, fn_body, lines, indent):
+        """Emit a self-tail-recursive function body as a while True loop."""
+        pad = "    " * indent
+        lines.append(f"{pad}while True:")
+        # Track the loop name so _emit_return_expr can emit 'continue'
+        old_loop = getattr(self, '_current_loop_name', None)
+        self._current_loop_name = loop_name
+        self._emit_body_stmts(fn_body, lines, indent + 1)
+        self._current_loop_name = old_loop
+
+    def _emit_nil_return(self, lines: list, indent: int) -> None:
+        """Emit 'return NIL' or 'break' depending on while-loop context."""
+        pad = "    " * indent
+        if getattr(self, '_current_loop_name', None):
+            lines.append(f"{pad}break")
+        else:
+            lines.append(f"{pad}return NIL")
 
     def _emit_return_expr(self, expr, lines: list, indent: int) -> None:
         """Emit an expression in return position, flattening control flow."""
         pad = "    " * indent
+        # Inside a while loop (self-tail-recursive define optimization):
+        # self-call → continue
+        loop_name = getattr(self, '_current_loop_name', None)
+        if loop_name:
+            if (isinstance(expr, list) and len(expr) == 1
+                    and isinstance(expr[0], Symbol) and expr[0].name == loop_name):
+                lines.append(f"{pad}continue")
+                return
         if isinstance(expr, list) and expr and isinstance(expr[0], Symbol):
             name = expr[0].name
             if name == "if":
@@ -845,11 +1017,17 @@ class PyEmitter:
                 self._emit_body_stmts(expr[1:], lines, indent)
                 return
             if name == "for-each":
-                # for-each in return position: emit as statement, return NIL
+                # for-each in return position: emit as statement, then return/break
                 lines.append(self._emit_for_each_stmt(expr, indent))
-                lines.append(f"{pad}return NIL")
+                self._emit_nil_return(lines, indent)
                 return
-        lines.append(f"{pad}return {self.emit(expr)}")
+        if loop_name:
+            emitted = self.emit(expr)
+            if emitted != "NIL":
+                lines.append(f"{pad}{emitted}")
+            lines.append(f"{pad}break")
+        else:
+            lines.append(f"{pad}return {self.emit(expr)}")
 
     def _emit_if_return(self, expr, lines: list, indent: int) -> None:
         """Emit if as statement with returns in each branch."""
@@ -860,7 +1038,7 @@ class PyEmitter:
             lines.append(f"{pad}else:")
             self._emit_return_expr(expr[3], lines, indent + 1)
         else:
-            lines.append(f"{pad}return NIL")
+            self._emit_nil_return(lines, indent)
 
     def _emit_when_return(self, expr, lines: list, indent: int) -> None:
         """Emit when as statement with return in body, else return NIL."""
@@ -873,7 +1051,7 @@ class PyEmitter:
             for b in body_parts[:-1]:
                 lines.append(self.emit_statement(b, indent + 1))
             self._emit_return_expr(body_parts[-1], lines, indent + 1)
-        lines.append(f"{pad}return NIL")
+        self._emit_nil_return(lines, indent)
 
     def _emit_cond_return(self, expr, lines: list, indent: int) -> None:
         """Emit cond as if/elif/else with returns in each branch."""
@@ -915,7 +1093,7 @@ class PyEmitter:
                 self._emit_return_expr(body, lines, indent + 1)
                 i += 2
         if not has_else:
-            lines.append(f"{pad}return NIL")
+            self._emit_nil_return(lines, indent)
 
     def _emit_case_return(self, expr, lines: list, indent: int) -> None:
         """Emit case as if/elif/else with returns in each branch."""
@@ -940,7 +1118,7 @@ class PyEmitter:
             self._emit_return_expr(body, lines, indent + 1)
             i += 2
         if not has_else:
-            lines.append(f"{pad}return NIL")
+            self._emit_nil_return(lines, indent)
 
     def _emit_let_as_stmts(self, expr, lines: list, indent: int, is_last: bool) -> None:
         """Emit a let expression as local variable declarations."""
@@ -1127,23 +1305,37 @@ try:
     from .platform_py import (
         PREAMBLE, PLATFORM_PY, PRIMITIVES_PY_PRE, PRIMITIVES_PY_POST,
         PRIMITIVES_PY_MODULES, _ALL_PY_MODULES,
-        PLATFORM_DEPS_PY, PLATFORM_ASYNC_PY, FIXUPS_PY, CONTINUATIONS_PY,
+        PLATFORM_PARSER_PY,
+        PLATFORM_DEPS_PY, PLATFORM_CEK_PY, CEK_FIXUPS_PY, PLATFORM_ASYNC_PY,
+        FIXUPS_PY, CONTINUATIONS_PY,
         _assemble_primitives_py, public_api_py,
-        ADAPTER_FILES, SPEC_MODULES, EXTENSION_NAMES, EXTENSION_FORMS,
+        ADAPTER_FILES, SPEC_MODULES, SPEC_MODULE_ORDER,
+        EXTENSION_NAMES, EXTENSION_FORMS,
     )
 except ImportError:
-    from shared.sx.ref.platform_py import (
+    from hosts.python.platform import (
         PREAMBLE, PLATFORM_PY, PRIMITIVES_PY_PRE, PRIMITIVES_PY_POST,
         PRIMITIVES_PY_MODULES, _ALL_PY_MODULES,
-        PLATFORM_DEPS_PY, PLATFORM_ASYNC_PY, FIXUPS_PY, CONTINUATIONS_PY,
+        PLATFORM_PARSER_PY,
+        PLATFORM_DEPS_PY, PLATFORM_CEK_PY, CEK_FIXUPS_PY, PLATFORM_ASYNC_PY,
+        FIXUPS_PY, CONTINUATIONS_PY,
         _assemble_primitives_py, public_api_py,
-        ADAPTER_FILES, SPEC_MODULES, EXTENSION_NAMES, EXTENSION_FORMS,
+        ADAPTER_FILES, SPEC_MODULES, SPEC_MODULE_ORDER,
+        EXTENSION_NAMES, EXTENSION_FORMS,
     )
 
 
-def _parse_special_forms_spec(ref_dir: str) -> set[str]:
+def _parse_special_forms_spec(ref_dir: str, source_dirs=None) -> set[str]:
     """Parse special-forms.sx to extract declared form names."""
-    filepath = os.path.join(ref_dir, "special-forms.sx")
+    filepath = None
+    if source_dirs:
+        for d in source_dirs:
+            p = os.path.join(d, "special-forms.sx")
+            if os.path.exists(p):
+                filepath = p
+                break
+    if not filepath:
+        filepath = os.path.join(ref_dir, "special-forms.sx")
     if not os.path.exists(filepath):
         return set()
     with open(filepath) as f:
@@ -1175,9 +1367,9 @@ def _extract_eval_dispatch_names(all_sections: list) -> set[str]:
 
 
 def _validate_special_forms(ref_dir: str, all_sections: list,
-                            has_continuations: bool) -> None:
+                            has_continuations: bool, source_dirs=None) -> None:
     """Cross-check special-forms.sx against eval.sx dispatch. Warn on mismatches."""
-    spec_names = _parse_special_forms_spec(ref_dir)
+    spec_names = _parse_special_forms_spec(ref_dir, source_dirs=source_dirs)
     if not spec_names:
         return
 
@@ -1225,7 +1417,7 @@ def compile_ref_to_py(
 
     Args:
         adapters: List of adapter names to include.
-                  Valid names: html, sx.
+                  Valid names: parser, html, sx.
                   None = include all server-side adapters.
         modules: List of primitive module names to include.
                  core.* are always included. stdlib.* are opt-in.
@@ -1247,7 +1439,21 @@ def compile_ref_to_py(
                     raise ValueError(f"Unknown module: {m!r}. Valid: {', '.join(PRIMITIVES_PY_MODULES)}")
                 prim_modules.append(m)
 
-    ref_dir = os.path.dirname(os.path.abspath(__file__))
+    ref_dir = os.path.join(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..")), "shared", "sx", "ref")
+    _project = os.path.abspath(os.path.join(ref_dir, "..", "..", ".."))
+    _source_dirs = [
+        os.path.join(_project, "spec"),
+        os.path.join(_project, "web"),
+        ref_dir,
+    ]
+
+    def _find_sx(filename):
+        for d in _source_dirs:
+            p = os.path.join(d, filename)
+            if os.path.exists(p):
+                return p
+        return None
+
     emitter = PyEmitter()
 
     # Resolve adapter set
@@ -1278,26 +1484,38 @@ def compile_ref_to_py(
             spec_mod_set.add("page-helpers")
         if "router" in SPEC_MODULES:
             spec_mod_set.add("router")
+    # CEK is always included (part of evaluator.sx core file)
+    has_cek = True
     has_deps = "deps" in spec_mod_set
 
     # Core files always included, then selected adapters, then spec modules
+    # evaluator.sx = merged frames + eval utilities + CEK machine
     sx_files = [
-        ("eval.sx", "eval"),
+        ("evaluator.sx", "evaluator (frames + eval + CEK)"),
         ("forms.sx", "forms (server definition forms)"),
         ("render.sx", "render (core)"),
     ]
+    # Parser before html/sx — provides serialize used by adapters
+    if "parser" in adapter_set:
+        sx_files.append(ADAPTER_FILES["parser"])
     for name in ("html", "sx"):
         if name in adapter_set:
             sx_files.append(ADAPTER_FILES[name])
+    # Use explicit ordering for spec modules (respects dependencies)
+    for name in SPEC_MODULE_ORDER:
+        if name in spec_mod_set:
+            sx_files.append(SPEC_MODULES[name])
+    # Any spec modules not in the order list (future-proofing)
     for name in sorted(spec_mod_set):
-        sx_files.append(SPEC_MODULES[name])
+        if name not in SPEC_MODULE_ORDER:
+            sx_files.append(SPEC_MODULES[name])
 
     # Pre-scan define-async names (needed before transpilation so emitter
     # knows which calls require 'await')
     has_async = "async" in adapter_set
     if has_async:
         async_filename = ADAPTER_FILES["async"][0]
-        async_filepath = os.path.join(ref_dir, async_filename)
+        async_filepath = _find_sx(async_filename) or os.path.join(ref_dir, async_filename)
         if os.path.exists(async_filepath):
             with open(async_filepath) as f:
                 async_src = f.read()
@@ -1316,7 +1534,7 @@ def compile_ref_to_py(
 
     all_sections = []
     for filename, label in sx_files:
-        filepath = os.path.join(ref_dir, filename)
+        filepath = _find_sx(filename) or os.path.join(ref_dir, filename)
         if not os.path.exists(filepath):
             continue
         with open(filepath) as f:
@@ -1334,11 +1552,12 @@ def compile_ref_to_py(
     has_continuations = "continuations" in ext_set
 
     # Validate special forms
-    _validate_special_forms(ref_dir, all_sections, has_continuations)
+    _validate_special_forms(ref_dir, all_sections, has_continuations, source_dirs=_source_dirs)
 
     # Build output
     has_html = "html" in adapter_set
     has_sx = "sx" in adapter_set
+    has_parser = "parser" in adapter_set
 
     parts = []
     parts.append(PREAMBLE)
@@ -1347,9 +1566,15 @@ def compile_ref_to_py(
     parts.append(_assemble_primitives_py(prim_modules))
     parts.append(PRIMITIVES_PY_POST)
 
+    if has_parser:
+        parts.append(PLATFORM_PARSER_PY)
+
     if has_deps:
         parts.append(PLATFORM_DEPS_PY)
 
+    if has_cek:
+        parts.append(PLATFORM_CEK_PY)
+
     if has_async:
         parts.append(PLATFORM_ASYNC_PY)
 
@@ -1361,6 +1586,8 @@ def compile_ref_to_py(
             parts.append("")
 
     parts.append(FIXUPS_PY)
+    if has_cek:
+        parts.append(CEK_FIXUPS_PY)
     if has_continuations:
         parts.append(CONTINUATIONS_PY)
     parts.append(public_api_py(has_html, has_sx, has_deps, has_async))

hosts/python/boundary_parser.py

@@ -20,17 +20,21 @@ logger = logging.getLogger("sx.boundary_parser")
 
 # Allow standalone use (from bootstrappers) or in-project imports
 try:
-    from shared.sx.parser import parse_all
     from shared.sx.types import Symbol, Keyword, NIL as SX_NIL
 except ImportError:
     import sys
     _HERE = os.path.dirname(os.path.abspath(__file__))
     _PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
     sys.path.insert(0, _PROJECT)
-    from shared.sx.parser import parse_all
     from shared.sx.types import Symbol, Keyword, NIL as SX_NIL
 
 
+def _get_parse_all():
+    """Lazy import to avoid circular dependency when parser.py loads sx_ref.py."""
+    from shared.sx.parser import parse_all
+    return parse_all
+
+
 def _ref_dir() -> str:
     return os.path.dirname(os.path.abspath(__file__))
 
@@ -81,7 +85,7 @@ def _extract_declarations(
 
     Returns (io_names, {service: helper_names}).
     """
-    exprs = parse_all(source)
+    exprs = _get_parse_all()(source)
     io_names: set[str] = set()
     helpers: dict[str, set[str]] = {}
 
@@ -144,7 +148,7 @@ def parse_primitives_sx() -> frozenset[str]:
 def parse_primitives_by_module() -> dict[str, frozenset[str]]:
     """Parse primitives.sx and return primitives grouped by module."""
     source = _read_file("primitives.sx")
-    exprs = parse_all(source)
+    exprs = _get_parse_all()(source)
     modules: dict[str, set[str]] = {}
     current_module = "_unscoped"
 
@@ -204,7 +208,7 @@ def parse_primitive_param_types() -> dict[str, dict]:
     type of the &rest parameter (or None if no &rest, or None if untyped &rest).
     """
     source = _read_file("primitives.sx")
-    exprs = parse_all(source)
+    exprs = _get_parse_all()(source)
     result: dict[str, dict] = {}
 
     for expr in exprs:
@@ -283,10 +287,62 @@ def parse_boundary_sx() -> tuple[frozenset[str], dict[str, frozenset[str]]]:
     return frozenset(all_io), frozen_helpers
 
 
+def parse_boundary_effects() -> dict[str, list[str]]:
+    """Parse boundary.sx and return effect annotations for all declared primitives.
+
+    Returns a dict mapping primitive name to its declared effects list.
+    E.g. {"current-user": ["io"], "reset!": ["mutation"], "signal": []}.
+
+    Only includes primitives that have an explicit :effects declaration.
+    Pure primitives from primitives.sx are not included (they have no effects).
+    """
+    source = _read_file("boundary.sx")
+    exprs = _get_parse_all()(source)
+    result: dict[str, list[str]] = {}
+
+    _DECL_FORMS = {
+        "define-io-primitive", "declare-signal-primitive",
+        "declare-spread-primitive",
+    }
+
+    for expr in exprs:
+        if not isinstance(expr, list) or len(expr) < 2:
+            continue
+        head = expr[0]
+        if not isinstance(head, Symbol) or head.name not in _DECL_FORMS:
+            continue
+
+        name = expr[1]
+        if not isinstance(name, str):
+            continue
+
+        effects_val = _extract_keyword_arg(expr, "effects")
+        if effects_val is None:
+            # IO primitives default to [io] if no explicit :effects
+            if head.name == "define-io-primitive":
+                result[name] = ["io"]
+            continue
+
+        if isinstance(effects_val, list):
+            effect_names = []
+            for item in effects_val:
+                if isinstance(item, Symbol):
+                    effect_names.append(item.name)
+                elif isinstance(item, str):
+                    effect_names.append(item)
+            result[name] = effect_names
+        else:
+            # Might be a single symbol
+            if isinstance(effects_val, Symbol):
+                result[name] = [effects_val.name]
+
+    return result
+
+
 def parse_boundary_types() -> frozenset[str]:
     """Parse boundary.sx and return the declared boundary type names."""
     source = _read_file("boundary.sx")
-    exprs = parse_all(source)
+    exprs = _get_parse_all()(source)
     for expr in exprs:
         if (isinstance(expr, list) and len(expr) >= 2
                 and isinstance(expr[0], Symbol)

hosts/python/platform.py

@@ -91,51 +91,56 @@ class _Spread:
         self.attrs = dict(attrs) if attrs else {}
 
 
-# Render-time accumulator buckets (per render pass)
-_collect_buckets: dict[str, list] = {}
+# Unified scope stacks — backing store for provide/context/emit!/collect!
+# Each entry: {"value": v, "emitted": [], "dedup": bool}
+_scope_stacks: dict[str, list[dict]] = {}
 
 
 def _collect_reset():
-    """Reset all collect buckets (call at start of each render pass)."""
-    global _collect_buckets
-    _collect_buckets = {}
+    """Reset all scope stacks (call at start of each render pass)."""
+    global _scope_stacks
+    _scope_stacks = {}
 
 
-# Render-time dynamic scope stacks (provide/context/emit!)
-_provide_stacks: dict[str, list[dict]] = {}
+def scope_push(name, value=None):
+    """Push a scope with name, value, and empty accumulator."""
+    _scope_stacks.setdefault(name, []).append({"value": value, "emitted": [], "dedup": False})
 
 
-def provide_push(name, value=None):
-    """Push a provider scope with name, value, and empty emitted list."""
-    _provide_stacks.setdefault(name, []).append({"value": value, "emitted": []})
+def scope_pop(name):
+    """Pop the most recent scope for name."""
+    if name in _scope_stacks and _scope_stacks[name]:
+        _scope_stacks[name].pop()
 
 
-def provide_pop(name):
-    """Pop the most recent provider scope for name."""
-    if name in _provide_stacks and _provide_stacks[name]:
-        _provide_stacks[name].pop()
+# Aliases — provide-push!/provide-pop! map to scope-push!/scope-pop!
+provide_push = scope_push
+provide_pop = scope_pop
 
 
 def sx_context(name, *default):
-    """Read value from nearest enclosing provider. Error if no provider and no default."""
-    if name in _provide_stacks and _provide_stacks[name]:
-        return _provide_stacks[name][-1]["value"]
+    """Read value from nearest enclosing scope. Error if no scope and no default."""
+    if name in _scope_stacks and _scope_stacks[name]:
+        return _scope_stacks[name][-1]["value"]
     if default:
         return default[0]
     raise RuntimeError(f"No provider for: {name}")
 
 
 def sx_emit(name, value):
-    """Append value to nearest enclosing provider's accumulator. No-op if no provider."""
-    if name in _provide_stacks and _provide_stacks[name]:
-        _provide_stacks[name][-1]["emitted"].append(value)
+    """Append value to nearest enclosing scope's accumulator. Respects dedup flag."""
+    if name in _scope_stacks and _scope_stacks[name]:
+        entry = _scope_stacks[name][-1]
+        if entry["dedup"] and value in entry["emitted"]:
+            return NIL
+        entry["emitted"].append(value)
     return NIL
 
 
 def sx_emitted(name):
-    """Return list of values emitted into nearest matching provider."""
-    if name in _provide_stacks and _provide_stacks[name]:
-        return list(_provide_stacks[name][-1]["emitted"])
+    """Return list of values emitted into nearest matching scope."""
+    if name in _scope_stacks and _scope_stacks[name]:
+        return list(_scope_stacks[name][-1]["emitted"])
     return []
 
 
@@ -220,8 +225,6 @@ def type_of(x):
         return "component"
     if isinstance(x, Island):
         return "island"
-    if isinstance(x, _Signal):
-        return "signal"
     if isinstance(x, _Spread):
         return "spread"
     if isinstance(x, Macro):
@@ -340,23 +343,23 @@ def spread_attrs(s):
 
 
 def sx_collect(bucket, value):
-    """Add value to named render-time accumulator (deduplicated)."""
-    if bucket not in _collect_buckets:
-        _collect_buckets[bucket] = []
-    items = _collect_buckets[bucket]
-    if value not in items:
-        items.append(value)
+    """Add value to named scope accumulator (deduplicated). Lazily creates root scope."""
+    if bucket not in _scope_stacks or not _scope_stacks[bucket]:
+        _scope_stacks.setdefault(bucket, []).append({"value": None, "emitted": [], "dedup": True})
+    entry = _scope_stacks[bucket][-1]
+    if value not in entry["emitted"]:
+        entry["emitted"].append(value)
 
 
 def sx_collected(bucket):
-    """Return all values in named render-time accumulator."""
-    return list(_collect_buckets.get(bucket, []))
+    """Return all values collected in named scope accumulator."""
+    return sx_emitted(bucket)
 
 
 def sx_clear_collected(bucket):
-    """Clear a named render-time accumulator bucket."""
-    if bucket in _collect_buckets:
-        _collect_buckets[bucket] = []
+    """Clear nearest scope's accumulator for name."""
+    if bucket in _scope_stacks and _scope_stacks[bucket]:
+        _scope_stacks[bucket][-1]["emitted"] = []
 
 
 def lambda_params(f):
@@ -463,105 +466,6 @@ def is_identical(a, b):
     return a is b
 
 
-# -------------------------------------------------------------------------
-# Signal platform -- reactive state primitives
-# -------------------------------------------------------------------------
-
-class _Signal:
-    """Reactive signal container."""
-    __slots__ = ("value", "subscribers", "deps")
-    def __init__(self, value):
-        self.value = value
-        self.subscribers = []
-        self.deps = []
-
-
-class _TrackingContext:
-    """Context for discovering signal dependencies."""
-    __slots__ = ("notify_fn", "deps")
-    def __init__(self, notify_fn):
-        self.notify_fn = notify_fn
-        self.deps = []
-
-
-_tracking_context = None
-
-
-def make_signal(value):
-    return _Signal(value)
-
-
-def is_signal(x):
-    return isinstance(x, _Signal)
-
-
-def signal_value(s):
-    return s.value if isinstance(s, _Signal) else s
-
-
-def signal_set_value(s, v):
-    if isinstance(s, _Signal):
-        s.value = v
-
-
-def signal_subscribers(s):
-    return list(s.subscribers) if isinstance(s, _Signal) else []
-
-
-def signal_add_sub(s, fn):
-    if isinstance(s, _Signal) and fn not in s.subscribers:
-        s.subscribers.append(fn)
-
-
-def signal_remove_sub(s, fn):
-    if isinstance(s, _Signal) and fn in s.subscribers:
-        s.subscribers.remove(fn)
-
-
-def signal_deps(s):
-    return list(s.deps) if isinstance(s, _Signal) else []
-
-
-def signal_set_deps(s, deps):
-    if isinstance(s, _Signal):
-        s.deps = list(deps) if isinstance(deps, list) else []
-
-
-def set_tracking_context(ctx):
-    global _tracking_context
-    _tracking_context = ctx
-
-
-def get_tracking_context():
-    global _tracking_context
-    return _tracking_context if _tracking_context is not None else NIL
-
-
-def make_tracking_context(notify_fn):
-    return _TrackingContext(notify_fn)
-
-
-def tracking_context_deps(ctx):
-    return ctx.deps if isinstance(ctx, _TrackingContext) else []
-
-
-def tracking_context_add_dep(ctx, s):
-    if isinstance(ctx, _TrackingContext) and s not in ctx.deps:
-        ctx.deps.append(s)
-
-
-def tracking_context_notify_fn(ctx):
-    return ctx.notify_fn if isinstance(ctx, _TrackingContext) else NIL
-
-
-def invoke(f, *args):
-    """Call f with args — handles both native callables and SX lambdas.
-
-    In Python, all transpiled lambdas are natively callable, so this is
-    just a direct call. The JS host needs dispatch logic here because
-    SX lambdas from runtime-evaluated code are objects, not functions.
-    """
-    return f(*args)
 
 
 def json_serialize(obj):
@@ -594,10 +498,23 @@ def env_get(env, name):
     return env.get(name, NIL)
 
 
-def env_set(env, name, val):
+def env_bind(env, name, val):
+    """Create/overwrite binding on THIS env only (let, define, param binding)."""
     env[name] = val
 
 
+def env_set(env, name, val):
+    """Mutate existing binding, walking scope chain (set!)."""
+    if hasattr(env, 'set'):
+        try:
+            env.set(name, val)
+        except KeyError:
+            # Not found anywhere — bind on immediate env
+            env[name] = val
+    else:
+        env[name] = val
+
+
 def env_extend(env):
     return _ensure_env(env).extend()
 
@@ -608,13 +525,24 @@ def env_merge(base, overlay):
     if base is overlay:
         # Same env — just extend with empty local scope for params
         return base.extend()
-    # Check if base is an ancestor of overlay — if so, no need to merge
-    # (common for self-recursive calls where closure == caller's ancestor)
+    # Check if base is an ancestor of overlay — if so, overlay contains
+    # everything in base. But overlay scopes between overlay and base may
+    # have extra local bindings (e.g. page helpers injected at request time).
+    # Only take the shortcut if no intermediate scope has local bindings.
     p = overlay
     depth = 0
     while p is not None and depth < 100:
         if p is base:
-            return base.extend()
+            q = overlay
+            has_extra = False
+            while q is not base:
+                if hasattr(q, '_bindings') and q._bindings:
+                    has_extra = True
+                    break
+                q = getattr(q, '_parent', None)
+            if not has_extra:
+                return base.extend()
+            break
         p = getattr(p, '_parent', None)
         depth += 1
     # MergedEnv: reads walk base then overlay; set! walks base only
@@ -746,51 +674,6 @@ def escape_string(s):
         .replace("</script", "<\\\\/script"))
 
 
-def serialize(val):
-    """Serialize an SX value to SX source text.
-
-    Note: parser.sx defines sx-serialize with a serialize alias, but parser.sx
-    is only included in JS builds (for client-side parsing). Python builds
-    provide this as a platform function.
-    """
-    t = type_of(val)
-    if t == "sx-expr":
-        return val.source
-    if t == "nil":
-        return "nil"
-    if t == "boolean":
-        return "true" if val else "false"
-    if t == "number":
-        return str(val)
-    if t == "string":
-        return '"' + escape_string(val) + '"'
-    if t == "symbol":
-        return symbol_name(val)
-    if t == "keyword":
-        return ":" + keyword_name(val)
-    if t == "raw-html":
-        escaped = escape_string(raw_html_content(val))
-        return '(raw! "' + escaped + '")'
-    if t == "list":
-        if not val:
-            return "()"
-        items = [serialize(x) for x in val]
-        return "(" + " ".join(items) + ")"
-    if t == "dict":
-        items = []
-        for k, v in val.items():
-            items.append(":" + str(k))
-            items.append(serialize(v))
-        return "{" + " ".join(items) + "}"
-    if callable(val):
-        return "nil"
-    return str(val)
-
-# Aliases for transpiled code — parser.sx defines sx-serialize/sx-serialize-dict
-# but parser.sx is JS-only. Provide aliases so transpiled render.sx works.
-sx_serialize = serialize
-sx_serialize_dict = lambda d: serialize(d)
-
 _SPECIAL_FORM_NAMES = frozenset()  # Placeholder — overridden by transpiled adapter-sx.sx
 _HO_FORM_NAMES = frozenset()
 
@@ -862,6 +745,9 @@ PRIMITIVES["number?"] = lambda x: isinstance(x, (int, float)) and not isinstance
 PRIMITIVES["string?"] = lambda x: isinstance(x, str)
 PRIMITIVES["list?"] = lambda x: isinstance(x, _b_list)
 PRIMITIVES["dict?"] = lambda x: isinstance(x, _b_dict)
+PRIMITIVES["boolean?"] = lambda x: isinstance(x, bool)
+PRIMITIVES["symbol?"] = lambda x: isinstance(x, Symbol)
+PRIMITIVES["keyword?"] = lambda x: isinstance(x, Keyword)
 PRIMITIVES["continuation?"] = lambda x: isinstance(x, Continuation)
 PRIMITIVES["empty?"] = lambda c: (
     c is None or c is NIL or
@@ -974,14 +860,17 @@ PRIMITIVES["assert"] = lambda cond, msg="Assertion failed": (_ for _ in ()).thro
 ''',
 
     "stdlib.spread": '''
-# stdlib.spread — spread + collect primitives
+# stdlib.spread — spread + collect + scope primitives
 PRIMITIVES["make-spread"] = make_spread
 PRIMITIVES["spread?"] = is_spread
 PRIMITIVES["spread-attrs"] = spread_attrs
 PRIMITIVES["collect!"] = sx_collect
 PRIMITIVES["collected"] = sx_collected
 PRIMITIVES["clear-collected!"] = sx_clear_collected
-# provide/context/emit! — render-time dynamic scope
+# scope — unified render-time dynamic scope
+PRIMITIVES["scope-push!"] = scope_push
+PRIMITIVES["scope-pop!"] = scope_pop
+# provide-push!/provide-pop! — aliases for scope-push!/scope-pop!
 PRIMITIVES["provide-push!"] = provide_push
 PRIMITIVES["provide-pop!"] = provide_pop
 PRIMITIVES["context"] = sx_context
@@ -1087,6 +976,37 @@ def for_each_indexed(fn, coll):
 def map_dict(fn, d):
     return {k: fn(k, v) for k, v in d.items()}
 
+# Dynamic wind support (used by sf-dynamic-wind in eval.sx)
+_wind_stack = []
+
+def push_wind_b(before, after):
+    _wind_stack.append((before, after))
+    return NIL
+
+def pop_wind_b():
+    if _wind_stack:
+        _wind_stack.pop()
+    return NIL
+
+def call_thunk(f, env):
+    """Call a zero-arg function/lambda."""
+    if is_callable(f) and not is_lambda(f):
+        return f()
+    if is_lambda(f):
+        return trampoline(call_lambda(f, [], env))
+    return trampoline(eval_expr([f], env))
+
+def dynamic_wind_call(before, body, after, env):
+    """Execute dynamic-wind with try/finally for error safety."""
+    call_thunk(before, env)
+    push_wind_b(before, after)
+    try:
+        result = call_thunk(body, env)
+    finally:
+        pop_wind_b()
+        call_thunk(after, env)
+    return result
+
 # Aliases used directly by transpiled code
 first = PRIMITIVES["first"]
 last = PRIMITIVES["last"]
@@ -1116,8 +1036,68 @@ replace = PRIMITIVES["replace"]
 parse_int = PRIMITIVES["parse-int"]
 upper = PRIMITIVES["upper"]
 has_key_p = PRIMITIVES["has-key?"]
+dict_p = PRIMITIVES["dict?"]
+boolean_p = PRIMITIVES["boolean?"]
+symbol_p = PRIMITIVES["symbol?"]
+keyword_p = PRIMITIVES["keyword?"]
+number_p = PRIMITIVES["number?"]
+string_p = PRIMITIVES["string?"]
+list_p = PRIMITIVES["list?"]
 dissoc = PRIMITIVES["dissoc"]
+PRIMITIVES["char-code-at"] = lambda s, i: ord(s[int(i)]) if 0 <= int(i) < len(s) else 0
+PRIMITIVES["to-hex"] = lambda n: hex(int(n) & 0xFFFFFFFF)[2:]
+char_code_at = PRIMITIVES["char-code-at"]
+to_hex = PRIMITIVES["to-hex"]
 index_of = PRIMITIVES["index-of"]
+lower = PRIMITIVES["lower"]
+char_from_code = PRIMITIVES["char-from-code"]
+'''
+
+# ---------------------------------------------------------------------------
+# Platform: parser module — character classification, number parsing,
+# reader macro registry
+# ---------------------------------------------------------------------------
+
+PLATFORM_PARSER_PY = '''
+# =========================================================================
+# Platform interface — Parser
+# =========================================================================
+
+import re as _re_parser
+
+_IDENT_START_RE = _re_parser.compile(r"[a-zA-Z_~*+\\-><=/!?&]")
+_IDENT_CHAR_RE = _re_parser.compile(r"[a-zA-Z0-9_~*+\\-><=/!?.:&/#,]")
+
+
+def ident_start_p(ch):
+    return bool(_IDENT_START_RE.match(ch))
+
+
+def ident_char_p(ch):
+    return bool(_IDENT_CHAR_RE.match(ch))
+
+
+def parse_number(s):
+    """Parse a numeric string to int or float."""
+    try:
+        if "." in s or "e" in s or "E" in s:
+            return float(s)
+        return int(s)
+    except (ValueError, TypeError):
+        return float(s)
+
+
+# Reader macro registry
+_reader_macros = {}
+
+
+def reader_macro_get(name):
+    return _reader_macros.get(name, NIL)
+
+
+def reader_macro_set_b(name, handler):
+    _reader_macros[name] = handler
+    return NIL
 '''
 
 # ---------------------------------------------------------------------------
@@ -1176,6 +1156,60 @@ PLATFORM_DEPS_PY = (
     '    c.io_refs = set(refs) if not isinstance(refs, set) else refs\n'
 )
 
+# ---------------------------------------------------------------------------
+# Platform: CEK module — explicit CEK machine support
+# ---------------------------------------------------------------------------
+
+PLATFORM_CEK_PY = '''
+# =========================================================================
+# Platform: CEK module — explicit CEK machine
+# =========================================================================
+
+# Standalone aliases for primitives used by cek.sx / frames.sx
+inc = PRIMITIVES["inc"]
+dec = PRIMITIVES["dec"]
+zip_pairs = PRIMITIVES["zip-pairs"]
+
+continuation_p = PRIMITIVES["continuation?"]
+
+def make_cek_continuation(captured, rest_kont):
+    """Create a Continuation storing captured CEK frames as data."""
+    c = Continuation(lambda v=NIL: v)
+    c._cek_data = {"captured": captured, "rest-kont": rest_kont}
+    return c
+
+def continuation_data(c):
+    """Return the _cek_data dict from a CEK continuation."""
+    return getattr(c, '_cek_data', {}) or {}
+'''
+
+# Iterative override for cek_run — replaces transpiled recursive version
+CEK_FIXUPS_PY = '''
+# Override recursive cek_run with iterative loop (avoids Python stack overflow)
+def cek_run(state):
+    """Drive CEK machine to completion (iterative)."""
+    while not cek_terminal_p(state):
+        state = cek_step(state)
+    return cek_value(state)
+
+# CEK is the canonical evaluator — override eval_expr to use it.
+# The tree-walk evaluator (eval_expr from eval.sx) is superseded.
+_tree_walk_eval_expr = eval_expr
+
+def eval_expr(expr, env):
+    """Evaluate expr using the CEK machine."""
+    return cek_run(make_cek_state(expr, env, []))
+
+# CEK never produces thunks — trampoline becomes identity
+_tree_walk_trampoline = trampoline
+
+def trampoline(val):
+    """In CEK mode, values are immediate — resolve any legacy thunks."""
+    if is_thunk(val):
+        return eval_expr(thunk_expr(val), thunk_env(val))
+    return val
+'''
+
 # ---------------------------------------------------------------------------
 # Platform: async adapter — async evaluation, I/O dispatch
 # ---------------------------------------------------------------------------
@@ -1186,7 +1220,7 @@ PLATFORM_ASYNC_PY = '''
 # =========================================================================
 
 import contextvars
-import inspect
+import inspect as _inspect
 
 from shared.sx.primitives_io import (
     IO_PRIMITIVES, RequestContext, execute_io,
@@ -1273,13 +1307,8 @@ def number_p(x):
     return isinstance(x, (int, float)) and not isinstance(x, bool)
 
 
-def sx_parse(src):
-    from shared.sx.parser import parse_all
-    return parse_all(src)
-
-
 def is_async_coroutine(x):
-    return inspect.iscoroutine(x)
+    return _inspect.iscoroutine(x)
 
 
 async def async_await(x):
@@ -1534,6 +1563,68 @@ def public_api_py(has_html: bool, has_sx: bool, has_deps: bool = False,
         'def make_env(**kwargs):',
         '    """Create an environment with initial bindings."""',
         '    return _Env(dict(kwargs))',
+        '',
+        '',
+        'def populate_effect_annotations(env, effect_map=None):',
+        '    """Populate *effect-annotations* in env from boundary declarations.',
+        '',
+        '    If effect_map is provided, use it directly (dict of name -> effects list).',
+        '    Otherwise, parse boundary.sx via boundary_parser.',
+        '    """',
+        '    if effect_map is None:',
+        '        from shared.sx.ref.boundary_parser import parse_boundary_effects',
+        '        effect_map = parse_boundary_effects()',
+        '    anns = env.get("*effect-annotations*", {})',
+        '    if not isinstance(anns, dict):',
+        '        anns = {}',
+        '    anns.update(effect_map)',
+        '    env["*effect-annotations*"] = anns',
+        '    return anns',
+        '',
+        '',
+        'def check_component_effects(env, comp_name=None):',
+        '    """Check effect violations for components in env.',
+        '',
+        '    If comp_name is given, check only that component.',
+        '    Returns list of diagnostic dicts (warnings, not errors).',
+        '    """',
+        '    anns = env.get("*effect-annotations*")',
+        '    if not anns:',
+        '        return []',
+        '    diagnostics = []',
+        '    names = [comp_name] if comp_name else [k for k in env if isinstance(k, str) and k.startswith("~")]',
+        '    for name in names:',
+        '        val = env.get(name)',
+        '        if val is not None and type_of(val) == "component":',
+        '            comp_effects = anns.get(name)',
+        '            if comp_effects is None:',
+        '                continue  # unannotated — skip',
+        '            body = val.body if hasattr(val, "body") else None',
+        '            if body is None:',
+        '                continue',
+        '            _walk_effects(body, name, comp_effects, anns, diagnostics)',
+        '    return diagnostics',
+        '',
+        '',
+        'def _walk_effects(node, comp_name, caller_effects, anns, diagnostics):',
+        '    """Walk AST node and check effect calls."""',
+        '    if not isinstance(node, list) or not node:',
+        '        return',
+        '    head = node[0]',
+        '    if isinstance(head, Symbol):',
+        '        callee = head.name',
+        '        callee_effects = anns.get(callee)',
+        '        if callee_effects is not None and caller_effects is not None:',
+        '            for e in callee_effects:',
+        '                if e not in caller_effects:',
+        '                    diagnostics.append({',
+        '                        "level": "warning",',
+        '                        "message": f"`{callee}` has effects {callee_effects} but `{comp_name}` only allows {caller_effects or \'[pure]\'}",',
+        '                        "component": comp_name,',
+        '                    })',
+        '                    break',
+        '    for child in node[1:]:',
+        '        _walk_effects(child, comp_name, caller_effects, anns, diagnostics)',
     ])
     return '\n'.join(lines)
 
@@ -1543,9 +1634,10 @@ def public_api_py(has_html: bool, has_sx: bool, has_deps: bool = False,
 # ---------------------------------------------------------------------------
 
 ADAPTER_FILES = {
-    "html":  ("adapter-html.sx",  "adapter-html"),
-    "sx":    ("adapter-sx.sx",    "adapter-sx"),
-    "async": ("adapter-async.sx", "adapter-async"),
+    "parser": ("parser.sx",       "parser"),
+    "html":   ("adapter-html.sx", "adapter-html"),
+    "sx":     ("adapter-sx.sx",   "adapter-sx"),
+    "async":  ("adapter-async.sx", "adapter-async"),
 }
 
 SPEC_MODULES = {
@@ -1556,6 +1648,12 @@ SPEC_MODULES = {
     "page-helpers": ("page-helpers.sx", "page-helpers (pure data transformation helpers)"),
     "types": ("types.sx", "types (gradual type system)"),
 }
+# Note: frames and cek are now part of evaluator.sx (always loaded as core)
+
+# Explicit ordering for spec modules with dependencies.
+SPEC_MODULE_ORDER = [
+    "deps", "engine", "page-helpers", "router", "signals", "types",
+]
 
 EXTENSION_NAMES = {"continuations"}
 

hosts/python/tests/run_cek_reactive_tests.py

@@ -0,0 +1,251 @@
+#!/usr/bin/env python3
+"""Run test-cek-reactive.sx — tests for deref-as-shift reactive rendering."""
+from __future__ import annotations
+import os, sys
+
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_SPEC_TESTS = os.path.join(_PROJECT, "spec", "tests")
+_WEB_TESTS = os.path.join(_PROJECT, "web", "tests")
+sys.path.insert(0, _PROJECT)
+sys.setrecursionlimit(20000)
+
+from shared.sx.parser import parse_all
+from shared.sx.ref import sx_ref
+from shared.sx.ref.sx_ref import (
+    make_env, env_get, env_has, env_set,
+    env_extend, env_merge,
+)
+# Use tree-walk evaluator for interpreting .sx test files.
+# The CEK override (eval_expr = cek_run) would cause the interpreted cek.sx
+# to delegate to the transpiled CEK, not the interpreted one being tested.
+# Override both the local names AND the module-level names so that transpiled
+# functions (ho_map, call_lambda, etc.) also use tree-walk internally.
+eval_expr = sx_ref._tree_walk_eval_expr
+trampoline = sx_ref._tree_walk_trampoline
+sx_ref.eval_expr = eval_expr
+sx_ref.trampoline = trampoline
+from shared.sx.types import (
+    NIL, Symbol, Keyword, Lambda, Component, Island, Continuation, Macro,
+    _ShiftSignal,
+)
+
+# Build env with primitives
+env = make_env()
+
+# Platform test functions
+_suite_stack: list[str] = []
+_pass_count = 0
+_fail_count = 0
+
+def _try_call(thunk):
+    try:
+        trampoline(eval_expr([thunk], env))
+        return {"ok": True}
+    except Exception as e:
+        return {"ok": False, "error": str(e)}
+
+def _report_pass(name):
+    global _pass_count
+    _pass_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  PASS: {ctx} > {name}")
+    return NIL
+
+def _report_fail(name, error):
+    global _fail_count
+    _fail_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  FAIL: {ctx} > {name}: {error}")
+    return NIL
+
+def _push_suite(name):
+    _suite_stack.append(name)
+    print(f"{'  ' * (len(_suite_stack)-1)}Suite: {name}")
+    return NIL
+
+def _pop_suite():
+    if _suite_stack:
+        _suite_stack.pop()
+    return NIL
+
+def _test_env():
+    return env
+
+def _sx_parse(source):
+    return parse_all(source)
+
+def _sx_parse_one(source):
+    """Parse a single expression."""
+    exprs = parse_all(source)
+    return exprs[0] if exprs else NIL
+
+def _make_continuation(fn):
+    return Continuation(fn)
+
+env["try-call"] = _try_call
+env["report-pass"] = _report_pass
+env["report-fail"] = _report_fail
+env["push-suite"] = _push_suite
+env["pop-suite"] = _pop_suite
+env["test-env"] = _test_env
+env["sx-parse"] = _sx_parse
+env["sx-parse-one"] = _sx_parse_one
+env["env-get"] = env_get
+env["env-has?"] = env_has
+env["env-set!"] = env_set
+env["env-extend"] = env_extend
+env["make-continuation"] = _make_continuation
+env["continuation?"] = lambda x: isinstance(x, Continuation)
+env["continuation-fn"] = lambda c: c.fn
+
+def _make_cek_continuation_with_data(captured, rest_kont):
+    c = Continuation(lambda v=NIL: v)
+    c._cek_data = {"captured": captured, "rest-kont": rest_kont}
+    return c
+
+env["make-cek-continuation"] = _make_cek_continuation_with_data
+env["continuation-data"] = lambda c: getattr(c, '_cek_data', {})
+
+# Type predicates and constructors
+env["callable?"] = lambda x: callable(x) or isinstance(x, (Lambda, Component, Island, Continuation))
+env["lambda?"] = lambda x: isinstance(x, Lambda)
+env["component?"] = lambda x: isinstance(x, Component)
+env["island?"] = lambda x: isinstance(x, Island)
+env["macro?"] = lambda x: isinstance(x, Macro)
+env["thunk?"] = sx_ref.is_thunk
+env["thunk-expr"] = sx_ref.thunk_expr
+env["thunk-env"] = sx_ref.thunk_env
+env["make-thunk"] = sx_ref.make_thunk
+env["make-lambda"] = sx_ref.make_lambda
+env["make-component"] = sx_ref.make_component
+env["make-island"] = sx_ref.make_island
+env["make-macro"] = sx_ref.make_macro
+env["make-symbol"] = lambda n: Symbol(n)
+env["lambda-params"] = lambda f: f.params
+env["lambda-body"] = lambda f: f.body
+env["lambda-closure"] = lambda f: f.closure
+env["lambda-name"] = lambda f: f.name
+env["set-lambda-name!"] = lambda f, n: setattr(f, 'name', n) or NIL
+env["component-params"] = lambda c: c.params
+env["component-body"] = lambda c: c.body
+env["component-closure"] = lambda c: c.closure
+env["component-has-children?"] = lambda c: c.has_children
+env["component-affinity"] = lambda c: getattr(c, 'affinity', 'auto')
+env["component-set-param-types!"] = lambda c, t: setattr(c, 'param_types', t) or NIL
+env["macro-params"] = lambda m: m.params
+env["macro-rest-param"] = lambda m: m.rest_param
+env["macro-body"] = lambda m: m.body
+env["macro-closure"] = lambda m: m.closure
+env["env-merge"] = env_merge
+env["symbol-name"] = lambda s: s.name if isinstance(s, Symbol) else str(s)
+env["keyword-name"] = lambda k: k.name if isinstance(k, Keyword) else str(k)
+env["type-of"] = sx_ref.type_of
+env["primitive?"] = sx_ref.is_primitive
+env["get-primitive"] = sx_ref.get_primitive
+env["strip-prefix"] = lambda s, p: s[len(p):] if s.startswith(p) else s
+env["inspect"] = repr
+env["debug-log"] = lambda *args: None
+env["error"] = sx_ref.error
+env["apply"] = lambda f, args: f(*args)
+
+# Functions from eval.sx that cek.sx references
+env["trampoline"] = trampoline
+env["eval-expr"] = eval_expr
+env["eval-list"] = sx_ref.eval_list
+env["eval-call"] = sx_ref.eval_call
+env["call-lambda"] = sx_ref.call_lambda
+env["call-component"] = sx_ref.call_component
+env["parse-keyword-args"] = sx_ref.parse_keyword_args
+env["sf-lambda"] = sx_ref.sf_lambda
+env["sf-defcomp"] = sx_ref.sf_defcomp
+env["sf-defisland"] = sx_ref.sf_defisland
+env["sf-defmacro"] = sx_ref.sf_defmacro
+env["sf-defstyle"] = sx_ref.sf_defstyle
+env["sf-deftype"] = sx_ref.sf_deftype
+env["sf-defeffect"] = sx_ref.sf_defeffect
+env["sf-letrec"] = sx_ref.sf_letrec
+env["sf-named-let"] = sx_ref.sf_named_let
+env["sf-dynamic-wind"] = sx_ref.sf_dynamic_wind
+env["sf-scope"] = sx_ref.sf_scope
+env["sf-provide"] = sx_ref.sf_provide
+env["qq-expand"] = sx_ref.qq_expand
+env["expand-macro"] = sx_ref.expand_macro
+env["cond-scheme?"] = sx_ref.cond_scheme_p
+
+# Higher-order form handlers
+env["ho-map"] = sx_ref.ho_map
+env["ho-map-indexed"] = sx_ref.ho_map_indexed
+env["ho-filter"] = sx_ref.ho_filter
+env["ho-reduce"] = sx_ref.ho_reduce
+env["ho-some"] = sx_ref.ho_some
+env["ho-every"] = sx_ref.ho_every
+env["ho-for-each"] = sx_ref.ho_for_each
+env["call-fn"] = sx_ref.call_fn
+
+# Render-related (stub for testing — no active rendering)
+env["render-active?"] = lambda: False
+env["is-render-expr?"] = lambda expr: False
+env["render-expr"] = lambda expr, env: NIL
+
+# Scope primitives (needed for reactive-shift-deref island cleanup)
+env["scope-push!"] = sx_ref.PRIMITIVES.get("scope-push!", lambda *a: NIL)
+env["scope-pop!"] = sx_ref.PRIMITIVES.get("scope-pop!", lambda *a: NIL)
+env["context"] = sx_ref.PRIMITIVES.get("context", lambda *a: NIL)
+env["emit!"] = sx_ref.PRIMITIVES.get("emit!", lambda *a: NIL)
+env["emitted"] = sx_ref.PRIMITIVES.get("emitted", lambda *a: [])
+
+# Dynamic wind
+env["push-wind!"] = lambda before, after: NIL
+env["pop-wind!"] = lambda: NIL
+env["call-thunk"] = lambda f, e: f() if callable(f) else trampoline(eval_expr([f], e))
+
+# Mutation helpers
+env["dict-get"] = lambda d, k: d.get(k, NIL) if isinstance(d, dict) else NIL
+env["identical?"] = lambda a, b: a is b
+
+# defhandler, defpage, defquery, defaction stubs
+for name in ["sf-defhandler", "sf-defpage", "sf-defquery", "sf-defaction"]:
+    pyname = name.replace("-", "_")
+    fn = getattr(sx_ref, pyname, None)
+    if fn:
+        env[name] = fn
+    else:
+        env[name] = lambda args, e, _n=name: NIL
+
+# Load test framework
+with open(os.path.join(_SPEC_TESTS, "test-framework.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Load signals module
+print("Loading signals.sx ...")
+with open(os.path.join(_PROJECT, "web", "signals.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Load frames module
+print("Loading frames.sx ...")
+with open(os.path.join(_PROJECT, "spec", "frames.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Load CEK module
+print("Loading cek.sx ...")
+with open(os.path.join(_PROJECT, "spec", "cek.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Run tests
+print("=" * 60)
+print("Running test-cek-reactive.sx")
+print("=" * 60)
+
+with open(os.path.join(_WEB_TESTS, "test-cek-reactive.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+print("=" * 60)
+print(f"Results: {_pass_count} passed, {_fail_count} failed")
+print("=" * 60)
+sys.exit(1 if _fail_count > 0 else 0)

hosts/python/tests/run_cek_tests.py

@@ -0,0 +1,267 @@
+#!/usr/bin/env python3
+"""Run test-cek.sx using the bootstrapped evaluator with CEK module loaded."""
+from __future__ import annotations
+import os, sys
+
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_SPEC_TESTS = os.path.join(_PROJECT, "spec", "tests")
+_WEB_TESTS = os.path.join(_PROJECT, "web", "tests")
+sys.path.insert(0, _PROJECT)
+
+from shared.sx.ref.sx_ref import sx_parse as parse_all
+from shared.sx.ref import sx_ref
+from shared.sx.ref.sx_ref import (
+    make_env, env_get, env_has, env_set,
+    env_extend, env_merge,
+)
+# Use tree-walk evaluator for interpreting .sx test files.
+# The CEK override (eval_expr = cek_run) would cause the interpreted cek.sx
+# to delegate to the transpiled CEK, not the interpreted one being tested.
+# Override both the local names AND the module-level names so that transpiled
+# functions (ho_map, call_lambda, etc.) also use tree-walk internally.
+eval_expr = sx_ref._tree_walk_eval_expr
+trampoline = sx_ref._tree_walk_trampoline
+sx_ref.eval_expr = eval_expr
+sx_ref.trampoline = trampoline
+from shared.sx.types import (
+    NIL, Symbol, Keyword, Lambda, Component, Island, Continuation, Macro,
+    _ShiftSignal,
+)
+
+# Build env with primitives
+env = make_env()
+
+# Platform test functions
+_suite_stack: list[str] = []
+_pass_count = 0
+_fail_count = 0
+
+def _try_call(thunk):
+    try:
+        trampoline(eval_expr([thunk], env))
+        return {"ok": True}
+    except Exception as e:
+        return {"ok": False, "error": str(e)}
+
+def _report_pass(name):
+    global _pass_count
+    _pass_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  PASS: {ctx} > {name}")
+    return NIL
+
+def _report_fail(name, error):
+    global _fail_count
+    _fail_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  FAIL: {ctx} > {name}: {error}")
+    return NIL
+
+def _push_suite(name):
+    _suite_stack.append(name)
+    print(f"{'  ' * (len(_suite_stack)-1)}Suite: {name}")
+    return NIL
+
+def _pop_suite():
+    if _suite_stack:
+        _suite_stack.pop()
+    return NIL
+
+def _test_env():
+    return env
+
+def _sx_parse(source):
+    return parse_all(source)
+
+def _sx_parse_one(source):
+    """Parse a single expression."""
+    exprs = parse_all(source)
+    return exprs[0] if exprs else NIL
+
+def _make_continuation(fn):
+    return Continuation(fn)
+
+env["try-call"] = _try_call
+env["report-pass"] = _report_pass
+env["report-fail"] = _report_fail
+env["push-suite"] = _push_suite
+env["pop-suite"] = _pop_suite
+env["test-env"] = _test_env
+env["sx-parse"] = _sx_parse
+env["sx-parse-one"] = _sx_parse_one
+env["env-get"] = env_get
+env["env-has?"] = env_has
+env["env-set!"] = env_set
+env["env-extend"] = env_extend
+env["make-continuation"] = _make_continuation
+env["continuation?"] = lambda x: isinstance(x, Continuation)
+env["continuation-fn"] = lambda c: c.fn
+
+def _make_cek_continuation(captured, rest_kont):
+    """Create a Continuation that stores captured CEK frames as data."""
+    data = {"captured": captured, "rest-kont": rest_kont}
+    # The fn is a dummy — invocation happens via CEK's continue-with-call
+    return Continuation(lambda v=NIL: v)
+
+# Monkey-patch to store data
+_orig_make_cek_cont = _make_cek_continuation
+def _make_cek_continuation_with_data(captured, rest_kont):
+    c = _orig_make_cek_cont(captured, rest_kont)
+    c._cek_data = {"captured": captured, "rest-kont": rest_kont}
+    return c
+
+env["make-cek-continuation"] = _make_cek_continuation_with_data
+env["continuation-data"] = lambda c: getattr(c, '_cek_data', {})
+
+# Register platform functions from sx_ref that cek.sx and eval.sx need
+# These are normally available as transpiled Python but need to be in the
+# SX env when interpreting .sx files directly.
+
+# Type predicates and constructors
+env["callable?"] = lambda x: callable(x) or isinstance(x, (Lambda, Component, Island, Continuation))
+env["lambda?"] = lambda x: isinstance(x, Lambda)
+env["component?"] = lambda x: isinstance(x, Component)
+env["island?"] = lambda x: isinstance(x, Island)
+env["macro?"] = lambda x: isinstance(x, Macro)
+env["thunk?"] = sx_ref.is_thunk
+env["thunk-expr"] = sx_ref.thunk_expr
+env["thunk-env"] = sx_ref.thunk_env
+env["make-thunk"] = sx_ref.make_thunk
+env["make-lambda"] = sx_ref.make_lambda
+env["make-component"] = sx_ref.make_component
+env["make-island"] = sx_ref.make_island
+env["make-macro"] = sx_ref.make_macro
+env["make-symbol"] = lambda n: Symbol(n)
+env["lambda-params"] = lambda f: f.params
+env["lambda-body"] = lambda f: f.body
+env["lambda-closure"] = lambda f: f.closure
+env["lambda-name"] = lambda f: f.name
+env["set-lambda-name!"] = lambda f, n: setattr(f, 'name', n) or NIL
+env["component-params"] = lambda c: c.params
+env["component-body"] = lambda c: c.body
+env["component-closure"] = lambda c: c.closure
+env["component-has-children?"] = lambda c: c.has_children
+env["component-affinity"] = lambda c: getattr(c, 'affinity', 'auto')
+env["component-set-param-types!"] = lambda c, t: setattr(c, 'param_types', t) or NIL
+env["macro-params"] = lambda m: m.params
+env["macro-rest-param"] = lambda m: m.rest_param
+env["macro-body"] = lambda m: m.body
+env["macro-closure"] = lambda m: m.closure
+env["env-merge"] = env_merge
+env["symbol-name"] = lambda s: s.name if isinstance(s, Symbol) else str(s)
+env["keyword-name"] = lambda k: k.name if isinstance(k, Keyword) else str(k)
+env["type-of"] = sx_ref.type_of
+env["primitive?"] = lambda n: n in sx_ref.PRIMITIVES
+env["get-primitive"] = lambda n: sx_ref.PRIMITIVES.get(n)
+env["strip-prefix"] = lambda s, p: s[len(p):] if s.startswith(p) else s
+env["inspect"] = repr
+env["debug-log"] = lambda *args: None
+env["error"] = sx_ref.error
+env["apply"] = lambda f, args: f(*args)
+
+# Functions from eval.sx that cek.sx references
+env["trampoline"] = trampoline
+env["eval-expr"] = eval_expr
+env["eval-list"] = sx_ref.eval_list
+env["eval-call"] = sx_ref.eval_call
+env["call-lambda"] = sx_ref.call_lambda
+env["call-component"] = sx_ref.call_component
+env["parse-keyword-args"] = sx_ref.parse_keyword_args
+env["sf-lambda"] = sx_ref.sf_lambda
+env["sf-defcomp"] = sx_ref.sf_defcomp
+env["sf-defisland"] = sx_ref.sf_defisland
+env["sf-defmacro"] = sx_ref.sf_defmacro
+env["sf-defstyle"] = sx_ref.sf_defstyle
+env["sf-deftype"] = sx_ref.sf_deftype
+env["sf-defeffect"] = sx_ref.sf_defeffect
+env["sf-letrec"] = sx_ref.sf_letrec
+env["sf-named-let"] = sx_ref.sf_named_let
+env["sf-dynamic-wind"] = sx_ref.sf_dynamic_wind
+env["sf-scope"] = sx_ref.sf_scope
+env["sf-provide"] = sx_ref.sf_provide
+env["qq-expand"] = sx_ref.qq_expand
+env["expand-macro"] = sx_ref.expand_macro
+env["cond-scheme?"] = sx_ref.cond_scheme_p
+
+# Higher-order form handlers
+env["ho-map"] = sx_ref.ho_map
+env["ho-map-indexed"] = sx_ref.ho_map_indexed
+env["ho-filter"] = sx_ref.ho_filter
+env["ho-reduce"] = sx_ref.ho_reduce
+env["ho-some"] = sx_ref.ho_some
+env["ho-every"] = sx_ref.ho_every
+env["ho-for-each"] = sx_ref.ho_for_each
+env["call-fn"] = sx_ref.call_fn
+
+# Render-related (stub for testing — no active rendering)
+env["render-active?"] = lambda: False
+env["is-render-expr?"] = lambda expr: False
+env["render-expr"] = lambda expr, env: NIL
+
+# Scope primitives
+env["scope-push!"] = sx_ref.PRIMITIVES.get("scope-push!", lambda *a: NIL)
+env["scope-pop!"] = sx_ref.PRIMITIVES.get("scope-pop!", lambda *a: NIL)
+env["context"] = sx_ref.PRIMITIVES.get("context", lambda *a: NIL)
+env["emit!"] = sx_ref.PRIMITIVES.get("emit!", lambda *a: NIL)
+env["emitted"] = sx_ref.PRIMITIVES.get("emitted", lambda *a: [])
+
+# Dynamic wind
+env["push-wind!"] = lambda before, after: NIL
+env["pop-wind!"] = lambda: NIL
+env["call-thunk"] = lambda f, e: f() if callable(f) else trampoline(eval_expr([f], e))
+
+# Mutation helpers used by parse-keyword-args etc
+env["dict-get"] = lambda d, k: d.get(k, NIL) if isinstance(d, dict) else NIL
+
+# defhandler, defpage, defquery, defaction — these are registrations
+# Use the bootstrapped versions if they exist, otherwise stub
+for name in ["sf-defhandler", "sf-defpage", "sf-defquery", "sf-defaction"]:
+    pyname = name.replace("-", "_")
+    fn = getattr(sx_ref, pyname, None)
+    if fn:
+        env[name] = fn
+    else:
+        env[name] = lambda args, e, _n=name: NIL
+
+# Load test framework
+with open(os.path.join(_SPEC_TESTS, "test-framework.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Load frames module
+print("Loading frames.sx ...")
+with open(os.path.join(_PROJECT, "spec", "frames.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Load CEK module
+print("Loading cek.sx ...")
+with open(os.path.join(_PROJECT, "spec", "cek.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Define cek-eval helper in SX
+for expr in parse_all("""
+(define cek-eval
+  (fn (source)
+    (let ((exprs (sx-parse source)))
+      (let ((result nil))
+        (for-each (fn (e) (set! result (eval-expr-cek e (test-env)))) exprs)
+        result))))
+"""):
+    trampoline(eval_expr(expr, env))
+
+# Run tests
+print("=" * 60)
+print("Running test-cek.sx")
+print("=" * 60)
+
+with open(os.path.join(_SPEC_TESTS, "test-cek.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+print("=" * 60)
+print(f"Results: {_pass_count} passed, {_fail_count} failed")
+print("=" * 60)
+sys.exit(1 if _fail_count > 0 else 0)

hosts/python/tests/run_continuation_tests.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+"""Run test-continuations.sx using the bootstrapped evaluator with continuations enabled."""
+from __future__ import annotations
+import os, sys, subprocess, tempfile
+
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_SPEC_TESTS = os.path.join(_PROJECT, "spec", "tests")
+_WEB_TESTS = os.path.join(_PROJECT, "web", "tests")
+sys.path.insert(0, _PROJECT)
+
+# Bootstrap a fresh sx_ref with continuations enabled
+print("Bootstrapping with --extensions continuations ...")
+result = subprocess.run(
+    [sys.executable, os.path.join(_HERE, "..", "bootstrap.py"),
+     "--extensions", "continuations"],
+    capture_output=True, text=True, cwd=_PROJECT,
+)
+if result.returncode != 0:
+    print("Bootstrap FAILED:")
+    print(result.stderr)
+    sys.exit(1)
+
+# Write to temp file and import
+tmp = tempfile.NamedTemporaryFile(mode="w", suffix=".py", delete=False, dir=_HERE)
+tmp.write(result.stdout)
+tmp.close()
+
+try:
+    import importlib.util
+    spec = importlib.util.spec_from_file_location("sx_ref_cont", tmp.name)
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+finally:
+    os.unlink(tmp.name)
+
+from shared.sx.types import NIL
+parse_all = mod.sx_parse
+
+# Use tree-walk evaluator for interpreting .sx test files.
+# CEK is now the default, but test runners need tree-walk so that
+# transpiled HO forms (ho_map, etc.) don't re-enter CEK mid-evaluation.
+eval_expr = mod._tree_walk_eval_expr
+trampoline = mod._tree_walk_trampoline
+mod.eval_expr = eval_expr
+mod.trampoline = trampoline
+env = mod.make_env()
+
+# Platform test functions
+_suite_stack: list[str] = []
+_pass_count = 0
+_fail_count = 0
+
+def _try_call(thunk):
+    try:
+        trampoline(eval_expr([thunk], env))
+        return {"ok": True}
+    except Exception as e:
+        return {"ok": False, "error": str(e)}
+
+def _report_pass(name):
+    global _pass_count
+    _pass_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  PASS: {ctx} > {name}")
+    return NIL
+
+def _report_fail(name, error):
+    global _fail_count
+    _fail_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  FAIL: {ctx} > {name}: {error}")
+    return NIL
+
+def _push_suite(name):
+    _suite_stack.append(name)
+    print(f"{'  ' * (len(_suite_stack)-1)}Suite: {name}")
+    return NIL
+
+def _pop_suite():
+    if _suite_stack:
+        _suite_stack.pop()
+    return NIL
+
+env["try-call"] = _try_call
+env["report-pass"] = _report_pass
+env["report-fail"] = _report_fail
+env["push-suite"] = _push_suite
+env["pop-suite"] = _pop_suite
+
+# Load test framework
+with open(os.path.join(_SPEC_TESTS, "test-framework.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Run tests
+print("=" * 60)
+print("Running test-continuations.sx")
+print("=" * 60)
+
+with open(os.path.join(_SPEC_TESTS, "test-continuations.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+print("=" * 60)
+print(f"Results: {_pass_count} passed, {_fail_count} failed")
+print("=" * 60)
+sys.exit(1 if _fail_count > 0 else 0)

hosts/python/tests/run_signal_tests.py

@@ -0,0 +1,164 @@
+#!/usr/bin/env python3
+"""Run test-signals.sx using the bootstrapped evaluator with signal primitives.
+
+Uses bootstrapped signal functions from sx_ref.py directly, patching apply
+to handle SX lambdas from the interpreter (test expressions create lambdas
+that need evaluator dispatch).
+"""
+from __future__ import annotations
+import os, sys
+
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_SPEC_TESTS = os.path.join(_PROJECT, "spec", "tests")
+_WEB_TESTS = os.path.join(_PROJECT, "web", "tests")
+sys.path.insert(0, _PROJECT)
+
+from shared.sx.ref.sx_ref import sx_parse as parse_all
+from shared.sx.ref import sx_ref
+from shared.sx.ref.sx_ref import make_env, scope_push, scope_pop, sx_context
+from shared.sx.types import NIL, Island, Lambda
+# Use tree-walk evaluator for interpreting .sx test files.
+eval_expr = sx_ref._tree_walk_eval_expr
+trampoline = sx_ref._tree_walk_trampoline
+sx_ref.eval_expr = eval_expr
+sx_ref.trampoline = trampoline
+
+# Build env with primitives
+env = make_env()
+
+# --- Patch apply BEFORE anything else ---
+# Test expressions create SX Lambdas that bootstrapped code calls via apply.
+# Patch the module-level function so all bootstrapped functions see it.
+
+# apply is used by swap! and other forms to call functions with arg lists
+def _apply(f, args):
+    if isinstance(f, Lambda):
+        return trampoline(eval_expr([f] + list(args), env))
+    return f(*args)
+sx_ref.__dict__["apply"] = _apply
+
+# cons needs to handle tuples from Python *args (swap! passes &rest as tuple)
+_orig_cons = sx_ref.PRIMITIVES.get("cons")
+def _cons(x, c):
+    if isinstance(c, tuple):
+        c = list(c)
+    return [x] + (c or [])
+sx_ref.__dict__["cons"] = _cons
+sx_ref.PRIMITIVES["cons"] = _cons
+
+# Platform test functions
+_suite_stack: list[str] = []
+_pass_count = 0
+_fail_count = 0
+
+def _try_call(thunk):
+    try:
+        trampoline(eval_expr([thunk], env))
+        return {"ok": True}
+    except Exception as e:
+        return {"ok": False, "error": str(e)}
+
+def _report_pass(name):
+    global _pass_count
+    _pass_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  PASS: {ctx} > {name}")
+    return NIL
+
+def _report_fail(name, error):
+    global _fail_count
+    _fail_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  FAIL: {ctx} > {name}: {error}")
+    return NIL
+
+def _push_suite(name):
+    _suite_stack.append(name)
+    print(f"{'  ' * (len(_suite_stack)-1)}Suite: {name}")
+    return NIL
+
+def _pop_suite():
+    if _suite_stack:
+        _suite_stack.pop()
+    return NIL
+
+env["try-call"] = _try_call
+env["report-pass"] = _report_pass
+env["report-fail"] = _report_fail
+env["push-suite"] = _push_suite
+env["pop-suite"] = _pop_suite
+
+# Signal functions are now pure SX (transpiled into sx_ref.py from signals.sx)
+# Wire both low-level dict-based signal functions and high-level API
+env["identical?"] = sx_ref.is_identical
+env["island?"] = lambda x: isinstance(x, Island)
+
+# Scope primitives (used by signals.sx for reactive tracking)
+env["scope-push!"] = scope_push
+env["scope-pop!"] = scope_pop
+env["context"] = sx_context
+
+# Low-level signal functions (now pure SX, transpiled from signals.sx)
+env["make-signal"] = sx_ref.make_signal
+env["signal?"] = sx_ref.is_signal
+env["signal-value"] = sx_ref.signal_value
+env["signal-set-value!"] = sx_ref.signal_set_value
+env["signal-subscribers"] = sx_ref.signal_subscribers
+env["signal-add-sub!"] = sx_ref.signal_add_sub
+env["signal-remove-sub!"] = sx_ref.signal_remove_sub
+env["signal-deps"] = sx_ref.signal_deps
+env["signal-set-deps!"] = sx_ref.signal_set_deps
+
+# Bootstrapped signal functions from sx_ref.py
+env["signal"] = sx_ref.signal
+env["deref"] = sx_ref.deref
+env["reset!"] = sx_ref.reset_b
+env["swap!"] = sx_ref.swap_b
+env["computed"] = sx_ref.computed
+env["effect"] = sx_ref.effect
+# batch has a bootstrapper issue with _batch_depth global variable access.
+# Wrap it to work correctly in the test context.
+def _batch(thunk):
+    sx_ref._batch_depth = getattr(sx_ref, '_batch_depth', 0) + 1
+    sx_ref.cek_call(thunk, None)
+    sx_ref._batch_depth -= 1
+    if sx_ref._batch_depth == 0:
+        queue = list(sx_ref._batch_queue)
+        sx_ref._batch_queue = []
+        seen = []
+        pending = []
+        for s in queue:
+            for sub in sx_ref.signal_subscribers(s):
+                if sub not in seen:
+                    seen.append(sub)
+                    pending.append(sub)
+        for sub in pending:
+            sub()
+    return NIL
+env["batch"] = _batch
+env["notify-subscribers"] = sx_ref.notify_subscribers
+env["flush-subscribers"] = sx_ref.flush_subscribers
+env["dispose-computed"] = sx_ref.dispose_computed
+env["with-island-scope"] = sx_ref.with_island_scope
+env["register-in-scope"] = sx_ref.register_in_scope
+env["callable?"] = sx_ref.is_callable
+
+# Load test framework
+with open(os.path.join(_SPEC_TESTS, "test-framework.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+# Run tests
+print("=" * 60)
+print("Running test-signals.sx")
+print("=" * 60)
+
+with open(os.path.join(_WEB_TESTS, "test-signals.sx")) as f:
+    for expr in parse_all(f.read()):
+        trampoline(eval_expr(expr, env))
+
+print("=" * 60)
+print(f"Results: {_pass_count} passed, {_fail_count} failed")
+print("=" * 60)
+sys.exit(1 if _fail_count > 0 else 0)

hosts/python/tests/run_tests.py

@@ -0,0 +1,316 @@
+#!/usr/bin/env python3
+"""
+Run SX spec tests using the bootstrapped Python evaluator.
+
+Usage:
+    python3 hosts/python/tests/run_tests.py                    # all spec tests
+    python3 hosts/python/tests/run_tests.py test-primitives     # specific test
+    python3 hosts/python/tests/run_tests.py --full              # include optional modules
+"""
+from __future__ import annotations
+import os, sys
+
+# Increase recursion limit for TCO tests (Python's default 1000 is too low)
+sys.setrecursionlimit(5000)
+
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_SPEC_TESTS = os.path.join(_PROJECT, "spec", "tests")
+sys.path.insert(0, _PROJECT)
+
+from shared.sx.ref.sx_ref import sx_parse as parse_all
+from shared.sx.ref import sx_ref
+from shared.sx.ref.sx_ref import (
+    make_env, env_get, env_has, env_set, env_extend, env_merge,
+)
+from shared.sx.types import (
+    NIL, Symbol, Keyword, Lambda, Component, Island, Macro,
+)
+
+# Use tree-walk evaluator
+eval_expr = sx_ref._tree_walk_eval_expr
+trampoline = sx_ref._tree_walk_trampoline
+sx_ref.eval_expr = eval_expr
+sx_ref.trampoline = trampoline
+
+# Check for --full flag
+full_build = "--full" in sys.argv
+
+# Build env with primitives
+env = make_env()
+
+# ---------------------------------------------------------------------------
+# Test infrastructure
+# ---------------------------------------------------------------------------
+_suite_stack: list[str] = []
+_pass_count = 0
+_fail_count = 0
+
+
+def _try_call(thunk):
+    try:
+        trampoline(eval_expr([thunk], env))
+        return {"ok": True}
+    except Exception as e:
+        return {"ok": False, "error": str(e)}
+
+
+def _report_pass(name):
+    global _pass_count
+    _pass_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  PASS: {ctx} > {name}")
+    return NIL
+
+
+def _report_fail(name, error):
+    global _fail_count
+    _fail_count += 1
+    ctx = " > ".join(_suite_stack)
+    print(f"  FAIL: {ctx} > {name}: {error}")
+    return NIL
+
+
+def _push_suite(name):
+    _suite_stack.append(name)
+    print(f"{'  ' * (len(_suite_stack)-1)}Suite: {name}")
+    return NIL
+
+
+def _pop_suite():
+    if _suite_stack:
+        _suite_stack.pop()
+    return NIL
+
+
+env["try-call"] = _try_call
+env["report-pass"] = _report_pass
+env["report-fail"] = _report_fail
+env["push-suite"] = _push_suite
+env["pop-suite"] = _pop_suite
+
+# ---------------------------------------------------------------------------
+# Test helpers
+# ---------------------------------------------------------------------------
+
+
+def _deep_equal(a, b):
+    if a is b:
+        return True
+    if a is NIL and b is NIL:
+        return True
+    if a is NIL or b is NIL:
+        return a is None and b is NIL or b is None and a is NIL
+    if type(a) != type(b):
+        # number comparison: int vs float
+        if isinstance(a, (int, float)) and isinstance(b, (int, float)):
+            return a == b
+        return False
+    if isinstance(a, list):
+        if len(a) != len(b):
+            return False
+        return all(_deep_equal(x, y) for x, y in zip(a, b))
+    if isinstance(a, dict):
+        ka = {k for k in a if k != "_nil"}
+        kb = {k for k in b if k != "_nil"}
+        if ka != kb:
+            return False
+        return all(_deep_equal(a[k], b[k]) for k in ka)
+    return a == b
+
+
+env["equal?"] = _deep_equal
+env["identical?"] = lambda a, b: a is b
+
+
+def _test_env():
+    return make_env()
+
+
+def _sx_parse(source):
+    return parse_all(source)
+
+
+def _sx_parse_one(source):
+    exprs = parse_all(source)
+    return exprs[0] if exprs else NIL
+
+
+env["test-env"] = _test_env
+env["sx-parse"] = _sx_parse
+env["sx-parse-one"] = _sx_parse_one
+env["cek-eval"] = lambda s: trampoline(eval_expr(parse_all(s)[0], make_env())) if parse_all(s) else NIL
+env["eval-expr-cek"] = lambda expr, e=None: trampoline(eval_expr(expr, e or env))
+
+# Env operations
+env["env-get"] = env_get
+env["env-has?"] = env_has
+env["env-set!"] = env_set
+env["env-bind!"] = lambda e, k, v: e.__setitem__(k, v) or v
+env["env-extend"] = env_extend
+env["env-merge"] = env_merge
+
+# Missing primitives
+env["upcase"] = lambda s: str(s).upper()
+env["downcase"] = lambda s: str(s).lower()
+env["make-keyword"] = lambda name: Keyword(name)
+env["make-symbol"] = lambda name: Symbol(name)
+env["string-length"] = lambda s: len(str(s))
+env["dict-get"] = lambda d, k: d.get(k, NIL) if isinstance(d, dict) else NIL
+env["apply"] = lambda f, *args: f(*args[-1]) if args and isinstance(args[-1], list) else f()
+
+# Render helpers
+def _render_html(src, e=None):
+    if isinstance(src, str):
+        parsed = parse_all(src)
+        if not parsed:
+            return ""
+        expr = parsed[0] if len(parsed) == 1 else [Symbol("do")] + parsed
+        result = sx_ref.render_to_html(expr, e or make_env())
+        # Reset render mode
+        sx_ref._render_mode = False
+        return result
+    result = sx_ref.render_to_html(src, e or env)
+    sx_ref._render_mode = False
+    return result
+
+
+env["render-html"] = _render_html
+env["render-to-html"] = _render_html
+env["string-contains?"] = lambda s, sub: str(sub) in str(s)
+
+# Type system helpers
+env["test-prim-types"] = lambda: {
+    "+": "number", "-": "number", "*": "number", "/": "number",
+    "mod": "number", "inc": "number", "dec": "number",
+    "abs": "number", "min": "number", "max": "number",
+    "str": "string", "upper": "string", "lower": "string",
+    "trim": "string", "join": "string", "replace": "string",
+    "=": "boolean", "<": "boolean", ">": "boolean",
+    "<=": "boolean", ">=": "boolean",
+    "not": "boolean", "nil?": "boolean", "empty?": "boolean",
+    "number?": "boolean", "string?": "boolean", "boolean?": "boolean",
+    "list?": "boolean", "dict?": "boolean",
+    "contains?": "boolean", "has-key?": "boolean",
+    "starts-with?": "boolean", "ends-with?": "boolean",
+    "len": "number", "first": "any", "rest": "list",
+    "last": "any", "nth": "any", "cons": "list",
+    "append": "list", "concat": "list", "reverse": "list",
+    "sort": "list", "slice": "list", "range": "list",
+    "flatten": "list", "keys": "list", "vals": "list",
+    "assoc": "dict", "dissoc": "dict", "merge": "dict", "dict": "dict",
+    "get": "any", "type-of": "string",
+}
+env["test-prim-param-types"] = lambda: {
+    "+": {"positional": [["a", "number"]], "rest-type": "number"},
+    "-": {"positional": [["a", "number"]], "rest-type": "number"},
+    "*": {"positional": [["a", "number"]], "rest-type": "number"},
+    "/": {"positional": [["a", "number"]], "rest-type": "number"},
+    "inc": {"positional": [["n", "number"]], "rest-type": NIL},
+    "dec": {"positional": [["n", "number"]], "rest-type": NIL},
+    "upper": {"positional": [["s", "string"]], "rest-type": NIL},
+    "lower": {"positional": [["s", "string"]], "rest-type": NIL},
+    "keys": {"positional": [["d", "dict"]], "rest-type": NIL},
+    "vals": {"positional": [["d", "dict"]], "rest-type": NIL},
+}
+env["component-param-types"] = lambda c: getattr(c, "_param_types", NIL)
+env["component-set-param-types!"] = lambda c, t: setattr(c, "_param_types", t) or NIL
+env["component-params"] = lambda c: c.params
+env["component-body"] = lambda c: c.body
+env["component-has-children"] = lambda c: c.has_children
+env["component-affinity"] = lambda c: getattr(c, "affinity", "auto")
+
+# Type accessors
+env["callable?"] = lambda x: callable(x) or isinstance(x, (Lambda, Component, Island))
+env["lambda?"] = lambda x: isinstance(x, Lambda)
+env["component?"] = lambda x: isinstance(x, Component)
+env["island?"] = lambda x: isinstance(x, Island)
+env["macro?"] = lambda x: isinstance(x, Macro)
+env["thunk?"] = sx_ref.is_thunk
+env["thunk-expr"] = sx_ref.thunk_expr
+env["thunk-env"] = sx_ref.thunk_env
+env["make-thunk"] = sx_ref.make_thunk
+env["make-lambda"] = sx_ref.make_lambda
+env["make-component"] = sx_ref.make_component
+env["make-macro"] = sx_ref.make_macro
+env["lambda-params"] = lambda f: f.params
+env["lambda-body"] = lambda f: f.body
+env["lambda-closure"] = lambda f: f.closure
+env["lambda-name"] = lambda f: f.name
+env["set-lambda-name!"] = lambda f, n: setattr(f, "name", n) or NIL
+env["component-closure"] = lambda c: c.closure
+env["component-name"] = lambda c: c.name
+env["component-has-children?"] = lambda c: c.has_children
+env["macro-params"] = lambda m: m.params
+env["macro-rest-param"] = lambda m: m.rest_param
+env["macro-body"] = lambda m: m.body
+env["macro-closure"] = lambda m: m.closure
+env["symbol-name"] = lambda s: s.name if isinstance(s, Symbol) else str(s)
+env["keyword-name"] = lambda k: k.name if isinstance(k, Keyword) else str(k)
+env["sx-serialize"] = sx_ref.sx_serialize if hasattr(sx_ref, "sx_serialize") else lambda x: str(x)
+env["is-render-expr?"] = lambda expr: False
+env["render-active?"] = lambda: False
+env["render-expr"] = lambda expr, env: NIL
+
+# Strict mode stubs (not yet bootstrapped to Python — no-ops for now)
+env["set-strict!"] = lambda val: NIL
+env["set-prim-param-types!"] = lambda types: NIL
+env["value-matches-type?"] = lambda val, t: True
+env["*strict*"] = False
+env["primitive?"] = lambda name: name in env
+env["get-primitive"] = lambda name: env.get(name, NIL)
+
+# ---------------------------------------------------------------------------
+# Load test framework
+# ---------------------------------------------------------------------------
+framework_src = open(os.path.join(_SPEC_TESTS, "test-framework.sx")).read()
+for expr in parse_all(framework_src):
+    trampoline(eval_expr(expr, env))
+
+# ---------------------------------------------------------------------------
+# Determine which tests to run
+# ---------------------------------------------------------------------------
+args = [a for a in sys.argv[1:] if not a.startswith("--")]
+
+# Tests requiring optional modules (only with --full)
+REQUIRES_FULL = {"test-continuations.sx", "test-continuations-advanced.sx", "test-types.sx", "test-freeze.sx", "test-strict.sx", "test-cek.sx", "test-cek-advanced.sx", "test-signals-advanced.sx"}
+
+test_files = []
+if args:
+    for arg in args:
+        name = arg if arg.endswith(".sx") else f"{arg}.sx"
+        p = os.path.join(_SPEC_TESTS, name)
+        if os.path.exists(p):
+            test_files.append(p)
+        else:
+            print(f"Test file not found: {name}")
+else:
+    for f in sorted(os.listdir(_SPEC_TESTS)):
+        if f.startswith("test-") and f.endswith(".sx") and f != "test-framework.sx":
+            if not full_build and f in REQUIRES_FULL:
+                print(f"Skipping {f} (requires --full)")
+                continue
+            test_files.append(os.path.join(_SPEC_TESTS, f))
+
+# ---------------------------------------------------------------------------
+# Run tests
+# ---------------------------------------------------------------------------
+for test_file in test_files:
+    name = os.path.basename(test_file)
+    print("=" * 60)
+    print(f"Running {name}")
+    print("=" * 60)
+    try:
+        src = open(test_file).read()
+        exprs = parse_all(src)
+        for expr in exprs:
+            trampoline(eval_expr(expr, env))
+    except Exception as e:
+        print(f"ERROR in {name}: {e}")
+        _fail_count += 1
+
+# Summary
+print("=" * 60)
+print(f"Results: {_pass_count} passed, {_fail_count} failed")
+print("=" * 60)
+sys.exit(1 if _fail_count > 0 else 0)

hosts/python/tests/run_type_tests.py

@@ -5,11 +5,22 @@ import os, sys
 
 _HERE = os.path.dirname(os.path.abspath(__file__))
 _PROJECT = os.path.abspath(os.path.join(_HERE, "..", "..", ".."))
+_SPEC_DIR = os.path.join(_PROJECT, "spec")
+_SPEC_TESTS = os.path.join(_PROJECT, "spec", "tests")
+_WEB_TESTS = os.path.join(_PROJECT, "web", "tests")
 sys.path.insert(0, _PROJECT)
 
-from shared.sx.parser import parse_all
-from shared.sx.ref.sx_ref import eval_expr, trampoline, make_env
+from shared.sx.ref.sx_ref import sx_parse as parse_all
+from shared.sx.ref import sx_ref
+from shared.sx.ref.sx_ref import make_env, env_get, env_has, env_set
 from shared.sx.types import NIL, Component
+# Use tree-walk evaluator for interpreting .sx test files.
+# CEK is now the default, but the test runners need tree-walk so that
+# transpiled HO forms (ho_map, etc.) don't re-enter CEK mid-evaluation.
+eval_expr = sx_ref._tree_walk_eval_expr
+trampoline = sx_ref._tree_walk_trampoline
+sx_ref.eval_expr = eval_expr
+sx_ref.trampoline = trampoline
 
 # Build env with primitives
 env = make_env()
@@ -154,14 +165,17 @@ env["component-params"] = _component_params
 env["component-body"] = _component_body
 env["component-has-children"] = _component_has_children
 env["map-dict"] = _map_dict
+env["env-get"] = env_get
+env["env-has?"] = env_has
+env["env-set!"] = env_set
 
 # Load test framework (macros + assertion helpers)
-with open(os.path.join(_HERE, "test-framework.sx")) as f:
+with open(os.path.join(_SPEC_TESTS, "test-framework.sx")) as f:
     for expr in parse_all(f.read()):
         trampoline(eval_expr(expr, env))
 
 # Load types module
-with open(os.path.join(_HERE, "types.sx")) as f:
+with open(os.path.join(_SPEC_DIR, "types.sx")) as f:
     for expr in parse_all(f.read()):
         trampoline(eval_expr(expr, env))
 
@@ -170,7 +184,7 @@ print("=" * 60)
 print("Running test-types.sx")
 print("=" * 60)
 
-with open(os.path.join(_HERE, "test-types.sx")) as f:
+with open(os.path.join(_SPEC_TESTS, "test-types.sx")) as f:
     for expr in parse_all(f.read()):
         trampoline(eval_expr(expr, env))
 

hosts/python/transpiler.sx

@@ -84,12 +84,6 @@
   "signal-remove-sub!" "signal_remove_sub"
   "signal-deps" "signal_deps"
   "signal-set-deps!" "signal_set_deps"
-  "set-tracking-context!" "set_tracking_context"
-  "get-tracking-context" "get_tracking_context"
-  "make-tracking-context" "make_tracking_context"
-  "tracking-context-deps" "tracking_context_deps"
-  "tracking-context-add-dep!" "tracking_context_add_dep"
-  "tracking-context-notify-fn" "tracking_context_notify_fn"
   "identical?" "is_identical"
   "notify-subscribers" "notify_subscribers"
   "flush-subscribers" "flush_subscribers"
@@ -98,7 +92,6 @@
   "register-in-scope" "register_in_scope"
   "*batch-depth*" "_batch_depth"
   "*batch-queue*" "_batch_queue"
-  "*island-scope*" "_island_scope"
   "*store-registry*" "_store_registry"
   "def-store" "def_store"
   "use-store" "use_store"
@@ -114,6 +107,7 @@
   "get-primitive" "get_primitive"
   "env-has?" "env_has"
   "env-get" "env_get"
+  "env-bind!" "env_bind"
   "env-set!" "env_set"
   "env-extend" "env_extend"
   "env-merge" "env_merge"
@@ -252,6 +246,8 @@
   "collect!" "sx_collect"
   "collected" "sx_collected"
   "clear-collected!" "sx_clear_collected"
+  "scope-push!" "scope_push"
+  "scope-pop!" "scope_pop"
   "provide-push!" "provide_push"
   "provide-pop!" "provide_pop"
   "context" "sx_context"
@@ -529,11 +525,16 @@
                    ", " (py-expr-with-cells (nth args 1) cell-vars)
                    ", " (py-expr-with-cells (nth args 2) cell-vars) ")")
 
-            (= op "env-set!")
+            (= op "env-bind!")
               (str "_sx_dict_set(" (py-expr-with-cells (nth args 0) cell-vars)
                    ", " (py-expr-with-cells (nth args 1) cell-vars)
                    ", " (py-expr-with-cells (nth args 2) cell-vars) ")")
 
+            (= op "env-set!")
+              (str "env_set(" (py-expr-with-cells (nth args 0) cell-vars)
+                   ", " (py-expr-with-cells (nth args 1) cell-vars)
+                   ", " (py-expr-with-cells (nth args 2) cell-vars) ")")
+
             (= op "set-lambda-name!")
               (str "_sx_set_attr(" (py-expr-with-cells (nth args 0) cell-vars)
                    ", 'name', " (py-expr-with-cells (nth args 1) cell-vars) ")")
@@ -906,10 +907,14 @@
             (= name "append!")
               (str pad (py-expr-with-cells (nth expr 1) cell-vars)
                    ".append(" (py-expr-with-cells (nth expr 2) cell-vars) ")")
-            (= name "env-set!")
+            (= name "env-bind!")
               (str pad (py-expr-with-cells (nth expr 1) cell-vars)
                    "[" (py-expr-with-cells (nth expr 2) cell-vars)
                    "] = " (py-expr-with-cells (nth expr 3) cell-vars))
+            (= name "env-set!")
+              (str pad "env_set(" (py-expr-with-cells (nth expr 1) cell-vars)
+                   ", " (py-expr-with-cells (nth expr 2) cell-vars)
+                   ", " (py-expr-with-cells (nth expr 3) cell-vars) ")")
             (= name "set-lambda-name!")
               (str pad (py-expr-with-cells (nth expr 1) cell-vars)
                    ".name = " (py-expr-with-cells (nth expr 2) cell-vars))
@@ -1103,10 +1108,14 @@
                 (append! lines (str pad (py-expr-with-cells (nth expr 1) cell-vars)
                                     "[" (py-expr-with-cells (nth expr 2) cell-vars)
                                     "] = " (py-expr-with-cells (nth expr 3) cell-vars)))
-              (= name "env-set!")
+              (= name "env-bind!")
                 (append! lines (str pad (py-expr-with-cells (nth expr 1) cell-vars)
                                     "[" (py-expr-with-cells (nth expr 2) cell-vars)
                                     "] = " (py-expr-with-cells (nth expr 3) cell-vars)))
+              (= name "env-set!")
+                (append! lines (str pad "env_set(" (py-expr-with-cells (nth expr 1) cell-vars)
+                                    ", " (py-expr-with-cells (nth expr 2) cell-vars)
+                                    ", " (py-expr-with-cells (nth expr 3) cell-vars) ")"))
               :else
                 (append! lines (py-statement-with-cells expr indent cell-vars)))))))))
 

shared/infrastructure/factory.py

@@ -49,6 +49,7 @@ def create_base_app(
     domain_services_fn: Callable[[], None] | None = None,
     no_oauth: bool = False,
     no_db: bool = False,
+    css_extras: Sequence[str] | None = None,
 ) -> Quart:
     """
     Create a Quart app with shared infrastructure.
@@ -139,17 +140,24 @@ def create_base_app(
     _styles = BASE_DIR / "static" / "styles"
     _fa_css = BASE_DIR / "static" / "fontawesome" / "css"
     if (_styles / "tw.css").exists() and not registry_loaded():
-        load_css_registry(
-            _styles / "tw.css",
-            extra_css=[
+        if css_extras is None:
+            # Legacy default: all shared CSS for blog/market/etc apps
+            _extra = [
                 _styles / "basics.css",
                 _styles / "cards.css",
                 _styles / "blog-content.css",
                 _styles / "prism.css",
                 _fa_css / "all.min.css",
                 _fa_css / "v4-shims.min.css",
-            ],
-            url_rewrites={"../webfonts/": "/static/fontawesome/webfonts/"},
+            ]
+            _rewrites = {"../webfonts/": "/static/fontawesome/webfonts/"}
+        else:
+            _extra = [_styles / e if "/" not in e else e for e in css_extras]
+            _rewrites = {}
+        load_css_registry(
+            _styles / "tw.css",
+            extra_css=_extra,
+            url_rewrites=_rewrites,
         )
 
     # Dev-mode: auto-reload sx templates when files change on disk

shared/sx/boundary.py

@@ -39,10 +39,10 @@ def _load_declarations() -> None:
             len(_DECLARED_PURE), len(_DECLARED_IO), len(_DECLARED_HELPERS),
         )
     except Exception as e:
-        logger.warning("Failed to load boundary declarations: %s", e)
-        _DECLARED_PURE = frozenset()
-        _DECLARED_IO = frozenset()
-        _DECLARED_HELPERS = {}
+        # Don't cache failure — parser may not be ready yet (circular import
+        # during startup). Will retry on next call. Validation functions
+        # skip checks when declarations aren't loaded.
+        logger.debug("Boundary declarations not ready yet: %s", e)
 
 
 def _is_strict() -> bool:
@@ -63,7 +63,8 @@ def _report(message: str) -> None:
 def validate_primitive(name: str) -> None:
     """Validate that a pure primitive is declared in primitives.sx."""
     _load_declarations()
-    assert _DECLARED_PURE is not None
+    if _DECLARED_PURE is None:
+        return  # Not ready yet (circular import during startup), skip
     if name not in _DECLARED_PURE:
         _report(f"Undeclared pure primitive: {name!r}. Add to primitives.sx.")
 
@@ -71,7 +72,8 @@ def validate_primitive(name: str) -> None:
 def validate_io(name: str) -> None:
     """Validate that an I/O primitive is declared in boundary.sx or boundary-app.sx."""
     _load_declarations()
-    assert _DECLARED_IO is not None
+    if _DECLARED_IO is None:
+        return  # Not ready yet, skip
     if name not in _DECLARED_IO:
         _report(
             f"Undeclared I/O primitive: {name!r}. "
@@ -82,7 +84,8 @@ def validate_io(name: str) -> None:
 def validate_helper(service: str, name: str) -> None:
     """Validate that a page helper is declared in {service}/sx/boundary.sx."""
     _load_declarations()
-    assert _DECLARED_HELPERS is not None
+    if _DECLARED_HELPERS is None:
+        return  # Not ready yet, skip
     svc_helpers = _DECLARED_HELPERS.get(service, frozenset())
     if name not in svc_helpers:
         _report(
@@ -129,17 +132,14 @@ def validate_boundary_value(value: Any, context: str = "") -> None:
 
 def declared_pure() -> frozenset[str]:
     _load_declarations()
-    assert _DECLARED_PURE is not None
-    return _DECLARED_PURE
+    return _DECLARED_PURE or frozenset()
 
 
 def declared_io() -> frozenset[str]:
     _load_declarations()
-    assert _DECLARED_IO is not None
-    return _DECLARED_IO
+    return _DECLARED_IO or frozenset()
 
 
 def declared_helpers() -> dict[str, frozenset[str]]:
     _load_declarations()
-    assert _DECLARED_HELPERS is not None
-    return dict(_DECLARED_HELPERS)
+    return dict(_DECLARED_HELPERS) if _DECLARED_HELPERS else {}

shared/sx/helpers.py

@@ -852,6 +852,9 @@ async def sx_page(ctx: dict, page_sx: str, *,
     if body_scripts is None:
         body_scripts = _shell_cfg.get("body_scripts")
 
+    import os as _os
+    _sx_js_file = "sx-wasm.js" if _os.environ.get("SX_USE_WASM") == "1" else "sx-browser.js"
+
     shell_kwargs: dict[str, Any] = dict(
         title=_html_escape(title),
         asset_url=asset_url,
@@ -863,7 +866,8 @@ async def sx_page(ctx: dict, page_sx: str, *,
         page_sx=page_sx,
         sx_css=sx_css,
         sx_css_classes=sx_css_classes,
-        sx_js_hash=_script_hash("sx-browser.js"),
+        sx_js_file=_sx_js_file,
+        sx_js_hash=_script_hash(_sx_js_file),
         body_js_hash=_script_hash("body.js"),
     )
     if head_scripts is not None:

shared/sx/jinja_bridge.py

@@ -31,7 +31,13 @@ from typing import Any
 from .types import NIL, Component, Island, Keyword, Lambda, Macro, Symbol
 from .parser import parse
 import os as _os
-if _os.environ.get("SX_USE_REF") == "1":
+if _os.environ.get("SX_USE_OCAML") == "1":
+    # OCaml kernel bridge — render via persistent subprocess.
+    # html_render and _render_component are set up lazily since the bridge
+    # requires an async event loop.  The sync sx() function falls back to
+    # the ref renderer; async callers use ocaml_bridge directly.
+    from .ref.sx_ref import render as html_render, render_html_component as _render_component
+elif _os.environ.get("SX_USE_REF") == "1":
     from .ref.sx_ref import render as html_render, render_html_component as _render_component
 else:
     from .html import render as html_render, _render_component
@@ -348,6 +354,12 @@ def reload_if_changed() -> None:
         reload_logger.info("Reloaded %d file(s), components in %.1fms",
                      len(changed_files), (t1 - t0) * 1000)
 
+        # Invalidate OCaml bridge component cache so next render reloads
+        if _os.environ.get("SX_USE_OCAML") == "1":
+            from .ocaml_bridge import _bridge
+            if _bridge is not None:
+                _bridge._components_loaded = False
+
         # Recompute render plans for all services that have pages
         from .pages import _PAGE_REGISTRY, compute_page_render_plans
         for svc in _PAGE_REGISTRY:
@@ -430,6 +442,9 @@ def finalize_components() -> None:
     compute_all_io_refs(_COMPONENT_ENV, get_all_io_names())
     _compute_component_hash()
 
+    # OCaml bridge loads components lazily on first render via
+    # OcamlBridge._ensure_components() — no sync needed here.
+
 
 # ---------------------------------------------------------------------------
 # sx() — render s-expression from Jinja template
@@ -482,7 +497,16 @@ async def sx_async(source: str, **kwargs: Any) -> str:
     Use when the s-expression contains I/O nodes::
 
         {{ sx_async('(frag "blog" "card" :slug "apple")') | safe }}
+
+    When SX_USE_OCAML=1, renders via the OCaml kernel subprocess which
+    yields io-requests back to Python for async fulfillment.
     """
+    if _os.environ.get("SX_USE_OCAML") == "1":
+        from .ocaml_bridge import get_bridge
+        bridge = await get_bridge()
+        ctx = dict(kwargs)
+        return await bridge.render(source, ctx=ctx)
+
     from .resolver import resolve, RequestContext
 
     env = dict(_COMPONENT_ENV)

shared/sx/ocaml_bridge.py

@@ -0,0 +1,408 @@
+"""
+OCaml SX kernel ↔ Python coroutine bridge.
+
+Manages a persistent OCaml subprocess (sx_server) that evaluates SX
+expressions.  When the OCaml kernel needs IO (database queries, service
+calls), it yields an ``(io-request ...)`` back to Python, which fulfills
+it asynchronously and sends an ``(io-response ...)`` back.
+
+Usage::
+
+    bridge = OcamlBridge()
+    await bridge.start()
+    html = await bridge.render('(div (p "hello"))')
+    await bridge.stop()
+"""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+import os
+from typing import Any
+
+_logger = logging.getLogger("sx.ocaml")
+
+# Default binary path — can be overridden via SX_OCAML_BIN env var
+_DEFAULT_BIN = os.path.join(
+    os.path.dirname(__file__),
+    "../../hosts/ocaml/_build/default/bin/sx_server.exe",
+)
+
+
+class OcamlBridgeError(Exception):
+    """Error from the OCaml SX kernel."""
+
+
+class OcamlBridge:
+    """Async bridge to a persistent OCaml SX subprocess."""
+
+    def __init__(self, binary: str | None = None):
+        self._binary = binary or os.environ.get("SX_OCAML_BIN") or _DEFAULT_BIN
+        self._proc: asyncio.subprocess.Process | None = None
+        self._lock = asyncio.Lock()
+        self._started = False
+        self._components_loaded = False
+
+    async def start(self) -> None:
+        """Launch the OCaml subprocess and wait for (ready)."""
+        if self._started:
+            return
+
+        bin_path = os.path.abspath(self._binary)
+        if not os.path.isfile(bin_path):
+            raise FileNotFoundError(
+                f"OCaml SX server binary not found: {bin_path}\n"
+                f"Build with: cd hosts/ocaml && eval $(opam env) && dune build"
+            )
+
+        _logger.info("Starting OCaml SX kernel: %s", bin_path)
+        self._proc = await asyncio.create_subprocess_exec(
+            bin_path,
+            stdin=asyncio.subprocess.PIPE,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+
+        # Wait for (ready)
+        line = await self._readline()
+        if line != "(ready)":
+            raise OcamlBridgeError(f"Expected (ready), got: {line!r}")
+
+        self._started = True
+
+        # Verify engine identity
+        self._send("(ping)")
+        kind, engine = await self._read_response()
+        engine_name = engine if kind == "ok" else "unknown"
+        _logger.info("OCaml SX kernel ready (pid=%d, engine=%s)", self._proc.pid, engine_name)
+
+    async def stop(self) -> None:
+        """Terminate the subprocess."""
+        if self._proc and self._proc.returncode is None:
+            self._proc.stdin.close()
+            try:
+                await asyncio.wait_for(self._proc.wait(), timeout=5.0)
+            except asyncio.TimeoutError:
+                self._proc.kill()
+                await self._proc.wait()
+            _logger.info("OCaml SX kernel stopped")
+        self._proc = None
+        self._started = False
+
+    async def ping(self) -> str:
+        """Health check — returns engine name (e.g. 'ocaml-cek')."""
+        async with self._lock:
+            self._send("(ping)")
+            kind, value = await self._read_response()
+            return value or "" if kind == "ok" else ""
+
+    async def load(self, path: str) -> int:
+        """Load an .sx file for side effects (defcomp, define, defmacro)."""
+        async with self._lock:
+            self._send(f'(load "{_escape(path)}")')
+            kind, value = await self._read_response()
+            if kind == "error":
+                raise OcamlBridgeError(f"load {path}: {value}")
+            return int(float(value)) if value else 0
+
+    async def load_source(self, source: str) -> int:
+        """Evaluate SX source for side effects."""
+        async with self._lock:
+            self._send(f'(load-source "{_escape(source)}")')
+            kind, value = await self._read_response()
+            if kind == "error":
+                raise OcamlBridgeError(f"load-source: {value}")
+            return int(float(value)) if value else 0
+
+    async def eval(self, source: str) -> str:
+        """Evaluate SX expression, return serialized result."""
+        async with self._lock:
+            self._send(f'(eval "{_escape(source)}")')
+            kind, value = await self._read_response()
+            if kind == "error":
+                raise OcamlBridgeError(f"eval: {value}")
+            return value or ""
+
+    async def render(
+        self,
+        source: str,
+        ctx: dict[str, Any] | None = None,
+    ) -> str:
+        """Render SX to HTML, handling io-requests via Python async IO."""
+        await self._ensure_components()
+        async with self._lock:
+            self._send(f'(render "{_escape(source)}")')
+            return await self._read_until_ok(ctx)
+
+    async def _ensure_components(self) -> None:
+        """Load component definitions into the kernel on first use."""
+        if self._components_loaded:
+            return
+        self._components_loaded = True
+        try:
+            from .jinja_bridge import get_component_env, _CLIENT_LIBRARY_SOURCES
+            from .parser import serialize
+            from .types import Component, Island, Macro
+
+            env = get_component_env()
+            parts: list[str] = list(_CLIENT_LIBRARY_SOURCES)
+            for key, val in env.items():
+                if isinstance(val, Island):
+                    ps = ["&key"] + list(val.params)
+                    if val.has_children:
+                        ps.extend(["&rest", "children"])
+                    parts.append(f"(defisland ~{val.name} ({' '.join(ps)}) {serialize(val.body)})")
+                elif isinstance(val, Component):
+                    ps = ["&key"] + list(val.params)
+                    if val.has_children:
+                        ps.extend(["&rest", "children"])
+                    parts.append(f"(defcomp ~{val.name} ({' '.join(ps)}) {serialize(val.body)})")
+                elif isinstance(val, Macro):
+                    ps = list(val.params)
+                    if val.rest_param:
+                        ps.extend(["&rest", val.rest_param])
+                    parts.append(f"(defmacro {val.name} ({' '.join(ps)}) {serialize(val.body)})")
+            if parts:
+                source = "\n".join(parts)
+                await self.load_source(source)
+                _logger.info("Loaded %d definitions into OCaml kernel", len(parts))
+        except Exception as e:
+            _logger.error("Failed to load components into OCaml kernel: %s", e)
+            self._components_loaded = False  # retry next time
+
+    async def reset(self) -> None:
+        """Reset the kernel environment to pristine state."""
+        async with self._lock:
+            self._send("(reset)")
+            kind, value = await self._read_response()
+            if kind == "error":
+                raise OcamlBridgeError(f"reset: {value}")
+
+    # ------------------------------------------------------------------
+    # Internal protocol handling
+    # ------------------------------------------------------------------
+
+    def _send(self, line: str) -> None:
+        """Write a line to the subprocess stdin."""
+        assert self._proc and self._proc.stdin
+        self._proc.stdin.write((line + "\n").encode())
+
+    async def _readline(self) -> str:
+        """Read a line from the subprocess stdout."""
+        assert self._proc and self._proc.stdout
+        data = await self._proc.stdout.readline()
+        if not data:
+            # Process died — collect stderr for diagnostics
+            stderr = b""
+            if self._proc.stderr:
+                stderr = await self._proc.stderr.read()
+            raise OcamlBridgeError(
+                f"OCaml subprocess died unexpectedly. stderr: {stderr.decode(errors='replace')}"
+            )
+        return data.decode().rstrip("\n")
+
+    async def _read_response(self) -> tuple[str, str | None]:
+        """Read a single (ok ...) or (error ...) response.
+
+        Returns (kind, value) where kind is "ok" or "error".
+        """
+        line = await self._readline()
+        return _parse_response(line)
+
+    async def _read_until_ok(
+        self,
+        ctx: dict[str, Any] | None = None,
+    ) -> str:
+        """Read lines until (ok ...) or (error ...).
+
+        Handles (io-request ...) by fulfilling IO and sending (io-response ...).
+        """
+        while True:
+            line = await self._readline()
+
+            if line.startswith("(io-request "):
+                result = await self._handle_io_request(line, ctx)
+                # Send response back to OCaml
+                self._send(f"(io-response {_serialize_for_ocaml(result)})")
+                continue
+
+            kind, value = _parse_response(line)
+            if kind == "error":
+                raise OcamlBridgeError(value or "Unknown error")
+            # kind == "ok"
+            return value or ""
+
+    async def _handle_io_request(
+        self,
+        line: str,
+        ctx: dict[str, Any] | None,
+    ) -> Any:
+        """Dispatch an io-request to the appropriate Python handler."""
+        from .parser import parse_all
+
+        # Parse the io-request
+        parsed = parse_all(line)
+        if not parsed or not isinstance(parsed[0], list):
+            raise OcamlBridgeError(f"Malformed io-request: {line}")
+
+        parts = parsed[0]
+        # parts = [Symbol("io-request"), name_str, ...args]
+        if len(parts) < 2:
+            raise OcamlBridgeError(f"Malformed io-request: {line}")
+
+        req_name = _to_str(parts[1])
+        args = parts[2:]
+
+        if req_name == "query":
+            return await self._io_query(args)
+        elif req_name == "action":
+            return await self._io_action(args)
+        elif req_name == "request-arg":
+            return self._io_request_arg(args)
+        elif req_name == "request-method":
+            return self._io_request_method()
+        elif req_name == "ctx":
+            return self._io_ctx(args, ctx)
+        else:
+            raise OcamlBridgeError(f"Unknown io-request type: {req_name}")
+
+    async def _io_query(self, args: list) -> Any:
+        """Handle (io-request "query" service name params...)."""
+        from shared.infrastructure.internal import fetch_data
+
+        service = _to_str(args[0]) if len(args) > 0 else ""
+        query = _to_str(args[1]) if len(args) > 1 else ""
+        params = _to_dict(args[2]) if len(args) > 2 else {}
+        return await fetch_data(service, query, params)
+
+    async def _io_action(self, args: list) -> Any:
+        """Handle (io-request "action" service name payload...)."""
+        from shared.infrastructure.internal import call_action
+
+        service = _to_str(args[0]) if len(args) > 0 else ""
+        action = _to_str(args[1]) if len(args) > 1 else ""
+        payload = _to_dict(args[2]) if len(args) > 2 else {}
+        return await call_action(service, action, payload)
+
+    def _io_request_arg(self, args: list) -> Any:
+        """Handle (io-request "request-arg" name)."""
+        try:
+            from quart import request
+            name = _to_str(args[0]) if args else ""
+            return request.args.get(name)
+        except RuntimeError:
+            return None
+
+    def _io_request_method(self) -> str:
+        """Handle (io-request "request-method")."""
+        try:
+            from quart import request
+            return request.method
+        except RuntimeError:
+            return "GET"
+
+    def _io_ctx(self, args: list, ctx: dict[str, Any] | None) -> Any:
+        """Handle (io-request "ctx" key)."""
+        if ctx is None:
+            return None
+        key = _to_str(args[0]) if args else ""
+        return ctx.get(key)
+
+
+# ------------------------------------------------------------------
+# Module-level singleton
+# ------------------------------------------------------------------
+
+_bridge: OcamlBridge | None = None
+
+
+async def get_bridge() -> OcamlBridge:
+    """Get or create the singleton bridge instance."""
+    global _bridge
+    if _bridge is None:
+        _bridge = OcamlBridge()
+    if not _bridge._started:
+        await _bridge.start()
+    return _bridge
+
+
+# ------------------------------------------------------------------
+# Helpers
+# ------------------------------------------------------------------
+
+def _escape(s: str) -> str:
+    """Escape a string for embedding in an SX string literal."""
+    return s.replace("\\", "\\\\").replace('"', '\\"').replace("\n", "\\n").replace("\r", "\\r").replace("\t", "\\t")
+
+
+def _parse_response(line: str) -> tuple[str, str | None]:
+    """Parse an (ok ...) or (error ...) response line.
+
+    Returns (kind, value) tuple.
+    """
+    line = line.strip()
+    if line == "(ok)":
+        return ("ok", None)
+    if line.startswith("(ok "):
+        value = line[4:-1]  # strip (ok  and )
+        # If the value is a quoted string, unquote it
+        if value.startswith('"') and value.endswith('"'):
+            value = _unescape(value[1:-1])
+        return ("ok", value)
+    if line.startswith("(error "):
+        msg = line[7:-1]
+        if msg.startswith('"') and msg.endswith('"'):
+            msg = _unescape(msg[1:-1])
+        return ("error", msg)
+    return ("error", f"Unexpected response: {line}")
+
+
+def _unescape(s: str) -> str:
+    """Unescape an SX string literal."""
+    return (
+        s.replace("\\n", "\n")
+        .replace("\\r", "\r")
+        .replace("\\t", "\t")
+        .replace('\\"', '"')
+        .replace("\\\\", "\\")
+    )
+
+
+def _to_str(val: Any) -> str:
+    """Convert an SX parsed value to a Python string."""
+    if isinstance(val, str):
+        return val
+    if hasattr(val, "name"):
+        return val.name
+    return str(val)
+
+
+def _to_dict(val: Any) -> dict:
+    """Convert an SX parsed value to a Python dict."""
+    if isinstance(val, dict):
+        return val
+    return {}
+
+
+def _serialize_for_ocaml(val: Any) -> str:
+    """Serialize a Python value to SX text for sending to OCaml."""
+    if val is None:
+        return "nil"
+    if isinstance(val, bool):
+        return "true" if val else "false"
+    if isinstance(val, (int, float)):
+        if isinstance(val, float) and val == int(val):
+            return str(int(val))
+        return str(val)
+    if isinstance(val, str):
+        return f'"{_escape(val)}"'
+    if isinstance(val, (list, tuple)):
+        items = " ".join(_serialize_for_ocaml(v) for v in val)
+        return f"(list {items})"
+    if isinstance(val, dict):
+        pairs = " ".join(
+            f":{k} {_serialize_for_ocaml(v)}" for k, v in val.items()
+        )
+        return "{" + pairs + "}"
+    return f'"{_escape(str(val))}"'

shared/sx/pages.py

@@ -23,11 +23,28 @@ import logging
 import os
 from typing import Any
 
-from .types import PageDef
+import traceback
+
+from .types import EvalError, PageDef
 
 logger = logging.getLogger("sx.pages")
 
 
+def _eval_error_sx(e: EvalError, context: str) -> str:
+    """Render an EvalError as SX content that's visible to the developer."""
+    from .ref.sx_ref import escape_html as _esc
+    msg = _esc(str(e))
+    ctx = _esc(context)
+    return (
+        f'(div :class "sx-eval-error" :style '
+        f'"background:#fef2f2;border:1px solid #fca5a5;'
+        f'color:#991b1b;padding:1rem;margin:1rem 0;'
+        f'border-radius:0.5rem;font-family:monospace;white-space:pre-wrap"'
+        f' (p :style "font-weight:700;margin:0 0 0.5rem" "SX EvalError in {ctx}")'
+        f' (p :style "margin:0" "{msg}"))'
+    )
+
+
 # ---------------------------------------------------------------------------
 # Registry — service → page-name → PageDef
 # ---------------------------------------------------------------------------
@@ -511,8 +528,12 @@ async def execute_page_streaming(
             aside_sx = await _eval_slot(page_def.aside_expr, data_env, ctx) if page_def.aside_expr else ""
             menu_sx = await _eval_slot(page_def.menu_expr, data_env, ctx) if page_def.menu_expr else ""
             await _stream_queue.put(("data-single", content_sx, filter_sx, aside_sx, menu_sx))
+        except EvalError as e:
+            logger.error("Streaming data task failed (EvalError): %s\n%s", e, traceback.format_exc())
+            error_sx = _eval_error_sx(e, "page content")
+            await _stream_queue.put(("data-single", error_sx, "", "", ""))
         except Exception as e:
-            logger.error("Streaming data task failed: %s", e)
+            logger.error("Streaming data task failed: %s\n%s", e, traceback.format_exc())
             await _stream_queue.put(("data-done",))
 
     async def _eval_headers():
@@ -524,7 +545,7 @@ async def execute_page_streaming(
             menu = await layout.mobile_menu(tctx, **layout_kwargs)
             await _stream_queue.put(("headers", rows, menu))
         except Exception as e:
-            logger.error("Streaming headers task failed: %s", e)
+            logger.error("Streaming headers task failed: %s\n%s", e, traceback.format_exc())
             await _stream_queue.put(("headers", "", ""))
 
     data_task = asyncio.create_task(_eval_data_and_content())
@@ -629,7 +650,7 @@ async def execute_page_streaming(
                 elif kind == "data-done":
                     remaining -= 1
             except Exception as e:
-                logger.error("Streaming resolve failed for %s: %s", kind, e)
+                logger.error("Streaming resolve failed for %s: %s\n%s", kind, e, traceback.format_exc())
 
         yield "\n</body>\n</html>"
 
@@ -733,8 +754,13 @@ async def execute_page_streaming_oob(
                     await _stream_queue.put(("data-done",))
                     return
             await _stream_queue.put(("data-done",))
+        except EvalError as e:
+            logger.error("Streaming OOB data task failed (EvalError): %s\n%s", e, traceback.format_exc())
+            error_sx = _eval_error_sx(e, "page content")
+            await _stream_queue.put(("data", "stream-content", error_sx))
+            await _stream_queue.put(("data-done",))
         except Exception as e:
-            logger.error("Streaming OOB data task failed: %s", e)
+            logger.error("Streaming OOB data task failed: %s\n%s", e, traceback.format_exc())
             await _stream_queue.put(("data-done",))
 
     async def _eval_oob_headers():
@@ -745,7 +771,7 @@ async def execute_page_streaming_oob(
             else:
                 await _stream_queue.put(("headers", ""))
         except Exception as e:
-            logger.error("Streaming OOB headers task failed: %s", e)
+            logger.error("Streaming OOB headers task failed: %s\n%s", e, traceback.format_exc())
             await _stream_queue.put(("headers", ""))
 
     data_task = asyncio.create_task(_eval_data())
@@ -836,7 +862,7 @@ async def execute_page_streaming_oob(
                 elif kind == "data-done":
                     remaining -= 1
             except Exception as e:
-                logger.error("Streaming OOB resolve failed for %s: %s", kind, e)
+                logger.error("Streaming OOB resolve failed for %s: %s\n%s", kind, e, traceback.format_exc())
 
     return _stream_oob_chunks()
 

shared/sx/primitives.py

@@ -573,3 +573,32 @@ def prim_json_encode(value) -> str:
     import json
     return json.dumps(value, indent=2)
 
+
+# ---------------------------------------------------------------------------
+# Scope primitives — delegate to sx_ref.py's scope stack implementation
+# (shared global state between transpiled and hand-written evaluators)
+# ---------------------------------------------------------------------------
+
+def _lazy_scope_primitives():
+    """Register scope/provide/collect primitives from sx_ref.py.
+
+    Called at import time — if sx_ref.py isn't built yet, silently skip.
+    These are needed by the hand-written _aser in async_eval.py when
+    expanding components that use scoped effects (e.g. ~cssx/flush).
+    """
+    try:
+        from .ref.sx_ref import (
+            sx_collect, sx_collected, sx_clear_collected,
+            sx_emitted, sx_emit, sx_context,
+        )
+        _PRIMITIVES["collect!"] = sx_collect
+        _PRIMITIVES["collected"] = sx_collected
+        _PRIMITIVES["clear-collected!"] = sx_clear_collected
+        _PRIMITIVES["emitted"] = sx_emitted
+        _PRIMITIVES["emit!"] = sx_emit
+        _PRIMITIVES["context"] = sx_context
+    except ImportError:
+        pass
+
+_lazy_scope_primitives()
+

shared/sx/ref/boundary-app.sx

@@ -1,206 +0,0 @@
-;; ==========================================================================
-;; boundary-app.sx — Deployment-specific boundary declarations
-;;
-;; I/O primitives specific to THIS deployment's architecture:
-;; inter-service communication, framework bindings, domain concepts,
-;; and layout context providers.
-;;
-;; These are NOT part of the SX language contract — a different deployment
-;; would declare different primitives here.
-;;
-;; The core SX I/O contract lives in boundary.sx.
-;; Per-service page helpers live in {service}/sx/boundary.sx.
-;; ==========================================================================
-
-
-;; --------------------------------------------------------------------------
-;; Inter-service communication — microservice architecture
-;; --------------------------------------------------------------------------
-
-(define-io-primitive "frag"
-  :params (service frag-type &key)
-  :returns "string"
-  :async true
-  :doc "Fetch cross-service HTML fragment."
-  :context :request)
-
-(define-io-primitive "query"
-  :params (service query-name &key)
-  :returns "any"
-  :async true
-  :doc "Fetch data from another service via internal HTTP."
-  :context :request)
-
-(define-io-primitive "action"
-  :params (service action-name &key)
-  :returns "any"
-  :async true
-  :doc "Call an action on another service via internal HTTP."
-  :context :request)
-
-(define-io-primitive "service"
-  :params (service-or-method &rest args &key)
-  :returns "any"
-  :async true
-  :doc "Call a domain service method. Two-arg: (service svc method). One-arg: (service method) uses bound handler service."
-  :context :request)
-
-
-;; --------------------------------------------------------------------------
-;; Framework bindings — Quart/Jinja2/HTMX specifics
-;; --------------------------------------------------------------------------
-
-(define-io-primitive "htmx-request?"
-  :params ()
-  :returns "boolean"
-  :async true
-  :doc "True if current request has HX-Request header."
-  :context :request)
-
-(define-io-primitive "g"
-  :params (key)
-  :returns "any"
-  :async true
-  :doc "Read a value from the Quart request-local g object."
-  :context :request)
-
-(define-io-primitive "jinja-global"
-  :params (key &rest default)
-  :returns "any"
-  :async false
-  :doc "Read a Jinja environment global."
-  :context :request)
-
-
-;; --------------------------------------------------------------------------
-;; Domain concepts — navigation, relations
-;; --------------------------------------------------------------------------
-
-(define-io-primitive "nav-tree"
-  :params ()
-  :returns "list"
-  :async true
-  :doc "Navigation tree as list of node dicts."
-  :context :request)
-
-(define-io-primitive "get-children"
-  :params (&key parent-type parent-id)
-  :returns "list"
-  :async true
-  :doc "Fetch child entities for a parent."
-  :context :request)
-
-(define-io-primitive "relations-from"
-  :params (entity-type)
-  :returns "list"
-  :async false
-  :doc "List of RelationDef dicts for an entity type."
-  :context :config)
-
-
-;; --------------------------------------------------------------------------
-;; Layout context providers — per-service header/page context
-;; --------------------------------------------------------------------------
-
-;; Shared across all services (root layout)
-
-(define-io-primitive "root-header-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with root header values (cart-mini, auth-menu, nav-tree, etc.)."
-  :context :request)
-
-(define-io-primitive "select-colours"
-  :params ()
-  :returns "string"
-  :async true
-  :doc "Shared select/hover CSS class string."
-  :context :request)
-
-(define-io-primitive "account-nav-ctx"
-  :params ()
-  :returns "any"
-  :async true
-  :doc "Account nav fragments, or nil."
-  :context :request)
-
-(define-io-primitive "app-rights"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "User rights dict from g.rights."
-  :context :request)
-
-;; Blog service layout
-
-(define-io-primitive "post-header-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with post-level header values."
-  :context :request)
-
-;; Cart service layout
-
-(define-io-primitive "cart-page-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with cart page header values."
-  :context :request)
-
-;; Events service layouts
-
-(define-io-primitive "events-calendar-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with events calendar header values."
-  :context :request)
-
-(define-io-primitive "events-day-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with events day header values."
-  :context :request)
-
-(define-io-primitive "events-entry-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with events entry header values."
-  :context :request)
-
-(define-io-primitive "events-slot-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with events slot header values."
-  :context :request)
-
-(define-io-primitive "events-ticket-type-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with ticket type header values."
-  :context :request)
-
-;; Market service layout
-
-(define-io-primitive "market-header-ctx"
-  :params ()
-  :returns "dict"
-  :async true
-  :doc "Dict with market header data."
-  :context :request)
-
-;; Federation service layout
-
-(define-io-primitive "federation-actor-ctx"
-  :params ()
-  :returns "dict?"
-  :async true
-  :doc "Serialized ActivityPub actor dict or nil."
-  :context :request)

shared/sx/ref/continuations.sx

@@ -1,248 +0,0 @@
-;; ==========================================================================
-;; continuations.sx — Delimited continuations (shift/reset)
-;;
-;; OPTIONAL EXTENSION — not required by the core evaluator.
-;; Bootstrappers include this only when the target requests it.
-;;
-;; Delimited continuations capture "the rest of the computation up to
-;; a delimiter." They are strictly less powerful than full call/cc but
-;; cover the practical use cases: suspendable rendering, cooperative
-;; scheduling, linear async flows, wizard forms, and undo.
-;;
-;; Two new special forms:
-;;   (reset body)       — establish a delimiter
-;;   (shift k body)     — capture the continuation to the nearest reset
-;;
-;; One new type:
-;;   continuation       — a captured delimited continuation, callable
-;;
-;; The captured continuation is a function of one argument. Invoking it
-;; provides the value that the shift expression "returns" within the
-;; delimited context, then completes the rest of the reset body.
-;;
-;; Continuations are composable — invoking a continuation returns a
-;; value (the result of the reset body), which can be used normally.
-;; This is the key difference from undelimited call/cc, where invoking
-;; a continuation never returns.
-;;
-;; Platform requirements:
-;;   (make-continuation fn)   — wrap a function as a continuation value
-;;   (continuation? x)        — type predicate
-;;   (type-of continuation)   → "continuation"
-;;   Continuations are callable (same dispatch as lambda).
-;; ==========================================================================
-
-
-;; --------------------------------------------------------------------------
-;; 1. Type
-;; --------------------------------------------------------------------------
-;;
-;; A continuation is a callable value of one argument.
-;;
-;;   (continuation? k)  → true if k is a captured continuation
-;;   (type-of k)        → "continuation"
-;;   (k value)          → invoke: resume the captured computation with value
-;;
-;; Continuations are first-class: they can be stored in variables, passed
-;; as arguments, returned from functions, and put in data structures.
-;;
-;; Invoking a delimited continuation RETURNS a value — the result of the
-;; reset body. This makes them composable:
-;;
-;;   (+ 1 (reset (+ 10 (shift k (k 5)))))
-;;   ;; k is "add 10 to _ and return from reset"
-;;   ;; (k 5) → 15, which is returned from reset
-;;   ;; (+ 1 15) → 16
-;;
-;; --------------------------------------------------------------------------
-
-
-;; --------------------------------------------------------------------------
-;; 2. reset — establish a continuation delimiter
-;; --------------------------------------------------------------------------
-;;
-;; (reset body)
-;;
-;; Evaluates body in the current environment. If no shift occurs during
-;; evaluation of body, reset simply returns the value of body.
-;;
-;; If shift occurs, reset is the boundary — the continuation captured by
-;; shift extends from the shift point back to (and including) this reset.
-;;
-;; reset is the "prompt" — it marks where the continuation stops.
-;;
-;; Semantics:
-;;   (reset expr) where expr contains no shift
-;;     → (eval expr env)                   ;; just evaluates normally
-;;
-;;   (reset ... (shift k body) ...)
-;;     → captures continuation, evaluates shift's body
-;;     → the result of the shift body is the result of the reset
-;;
-;; --------------------------------------------------------------------------
-
-(define sf-reset
-  (fn ((args :as list) (env :as dict))
-    ;; Single argument: the body expression.
-    ;; Install a continuation delimiter, then evaluate body.
-    ;; The implementation is target-specific:
-    ;;   - In Scheme: native reset/shift
-    ;;   - In Haskell: Control.Monad.CC or delimited continuations library
-    ;;   - In Python: coroutine/generator-based (see implementation notes)
-    ;;   - In JavaScript: generator-based or CPS transform
-    ;;   - In Rust: CPS transform at compile time
-    (let ((body (first args)))
-      (eval-with-delimiter body env))))
-
-
-;; --------------------------------------------------------------------------
-;; 3. shift — capture the continuation to the nearest reset
-;; --------------------------------------------------------------------------
-;;
-;; (shift k body)
-;;
-;; Captures the continuation from this point back to the nearest enclosing
-;; reset and binds it to k. Then evaluates body in the current environment
-;; extended with k. The result of body becomes the result of the enclosing
-;; reset.
-;;
-;; k is a function of one argument. Calling (k value) resumes the captured
-;; computation with value standing in for the shift expression.
-;;
-;; The continuation k is composable: (k value) returns a value (the result
-;; of the reset body when resumed with value). This means k can be called
-;; multiple times, and its result can be used in further computation.
-;;
-;; Examples:
-;;
-;;   ;; Basic: shift provides a value to the surrounding computation
-;;   (reset (+ 1 (shift k (k 41))))
-;;   ;; k = "add 1 to _", (k 41) → 42, reset returns 42
-;;
-;;   ;; Abort: shift can discard the continuation entirely
-;;   (reset (+ 1 (shift k "aborted")))
-;;   ;; k is never called, reset returns "aborted"
-;;
-;;   ;; Multiple invocations: k can be called more than once
-;;   (reset (+ 1 (shift k (list (k 10) (k 20)))))
-;;   ;; (k 10) → 11, (k 20) → 21, reset returns (11 21)
-;;
-;;   ;; Stored for later: k can be saved and invoked outside reset
-;;   (define saved nil)
-;;   (reset (+ 1 (shift k (set! saved k) 0)))
-;;   ;; reset returns 0, saved holds the continuation
-;;   (saved 99)  ;; → 100
-;;
-;; --------------------------------------------------------------------------
-
-(define sf-shift
-  (fn ((args :as list) (env :as dict))
-    ;; Two arguments: the continuation variable name, and the body.
-    (let ((k-name (symbol-name (first args)))
-          (body   (second args)))
-      ;; Capture the current continuation up to the nearest reset.
-      ;; Bind it to k-name in the environment, then evaluate body.
-      ;; The result of body is returned to the reset.
-      (capture-continuation k-name body env))))
-
-
-;; --------------------------------------------------------------------------
-;; 4. Interaction with other features
-;; --------------------------------------------------------------------------
-;;
-;; TCO (trampoline):
-;;   Continuations interact naturally with the trampoline. A shift inside
-;;   a tail-call position captures the continuation including the pending
-;;   return. The trampoline resolves thunks before the continuation is
-;;   delimited.
-;;
-;; Macros:
-;;   shift/reset are special forms, not macros. Macros expand before
-;;   evaluation, so shift inside a macro-expanded form works correctly —
-;;   it captures the continuation of the expanded code.
-;;
-;; Components:
-;;   shift inside a component body captures the continuation of that
-;;   component's render. The enclosing reset determines the delimiter.
-;;   This is the foundation for suspendable rendering — a component can
-;;   shift to suspend, and the server resumes it when data arrives.
-;;
-;; I/O primitives:
-;;   I/O primitives execute at invocation time, in whatever context
-;;   exists then. A continuation that captures a computation containing
-;;   I/O will re-execute that I/O when invoked. If the I/O requires
-;;   request context (e.g. current-user), invoking the continuation
-;;   outside a request will fail — same as calling the I/O directly.
-;;   This is consistent, not a restriction.
-;;
-;;   In typed targets (Haskell, Rust), the type system can enforce that
-;;   continuations containing I/O are only invoked in appropriate contexts.
-;;   In dynamic targets (Python, JS), it fails at runtime.
-;;
-;; Lexical scope:
-;;   Continuations capture the dynamic extent (what happens next) but
-;;   close over the lexical environment at the point of capture. Variable
-;;   bindings in the continuation refer to the same environment — mutations
-;;   via set! are visible.
-;;
-;; --------------------------------------------------------------------------
-
-
-;; --------------------------------------------------------------------------
-;; 5. Implementation notes per target
-;; --------------------------------------------------------------------------
-;;
-;; The bootstrapper emits target-specific continuation machinery.
-;; The spec defines semantics; each target chooses representation.
-;;
-;; Scheme / Racket:
-;;   Native shift/reset. No transformation needed. The bootstrapper
-;;   emits (require racket/control) or equivalent.
-;;
-;; Haskell:
-;;   Control.Monad.CC provides delimited continuations in the CC monad.
-;;   Alternatively, the evaluator can be CPS-transformed at compile time.
-;;   Continuations become first-class functions naturally.
-;;
-;; Python:
-;;   Generator-based: reset creates a generator, shift yields from it.
-;;   The trampoline loop drives the generator. Each yield is a shift
-;;   point, and send() provides the resume value.
-;;   Alternative: greenlet-based (stackful coroutines).
-;;
-;; JavaScript:
-;;   Generator-based (function* / yield). Similar to Python.
-;;   Alternative: CPS transform at bootstrap time — the bootstrapper
-;;   rewrites the evaluator into continuation-passing style, making
-;;   shift/reset explicit function arguments.
-;;
-;; Rust:
-;;   CPS transform at compile time. Continuations become enum variants
-;;   or boxed closures. The type system ensures continuations are used
-;;   linearly if desired (affine types via ownership).
-;;
-;; --------------------------------------------------------------------------
-
-
-;; --------------------------------------------------------------------------
-;; 6. Platform interface — what each target must provide
-;; --------------------------------------------------------------------------
-;;
-;;   (eval-with-delimiter expr env)
-;;     Install a reset delimiter, evaluate expr, return result.
-;;     If expr calls shift, the continuation is captured up to here.
-;;
-;;   (capture-continuation k-name body env)
-;;     Capture the current continuation up to the nearest delimiter.
-;;     Bind it to k-name in env, evaluate body, return result to delimiter.
-;;
-;;   (make-continuation fn)
-;;     Wrap a native function as a continuation value.
-;;
-;;   (continuation? x)
-;;     Type predicate.
-;;
-;;   Continuations must be callable via the standard function-call
-;;   dispatch in eval-list (same path as lambda calls).
-;;
-;; --------------------------------------------------------------------------

shared/sx/ref/test-parser.sx

@@ -1,259 +0,0 @@
-;; ==========================================================================
-;; test-parser.sx — Tests for the SX parser and serializer
-;;
-;; Requires: test-framework.sx loaded first.
-;; Modules tested: parser.sx
-;;
-;; Platform functions required (beyond test framework):
-;;   sx-parse       (source)  -> list of AST expressions
-;;   sx-serialize   (expr)    -> SX source string
-;;   make-symbol    (name)    -> Symbol value
-;;   make-keyword   (name)    -> Keyword value
-;;   symbol-name    (sym)     -> string
-;;   keyword-name   (kw)      -> string
-;; ==========================================================================
-
-
-;; --------------------------------------------------------------------------
-;; Literal parsing
-;; --------------------------------------------------------------------------
-
-(defsuite "parser-literals"
-  (deftest "parse integers"
-    (assert-equal (list 42) (sx-parse "42"))
-    (assert-equal (list 0) (sx-parse "0"))
-    (assert-equal (list -7) (sx-parse "-7")))
-
-  (deftest "parse floats"
-    (assert-equal (list 3.14) (sx-parse "3.14"))
-    (assert-equal (list -0.5) (sx-parse "-0.5")))
-
-  (deftest "parse strings"
-    (assert-equal (list "hello") (sx-parse "\"hello\""))
-    (assert-equal (list "") (sx-parse "\"\"")))
-
-  (deftest "parse escape: newline"
-    (assert-equal (list "a\nb") (sx-parse "\"a\\nb\"")))
-
-  (deftest "parse escape: tab"
-    (assert-equal (list "a\tb") (sx-parse "\"a\\tb\"")))
-
-  (deftest "parse escape: quote"
-    (assert-equal (list "a\"b") (sx-parse "\"a\\\"b\"")))
-
-  (deftest "parse booleans"
-    (assert-equal (list true) (sx-parse "true"))
-    (assert-equal (list false) (sx-parse "false")))
-
-  (deftest "parse nil"
-    (assert-equal (list nil) (sx-parse "nil")))
-
-  (deftest "parse keywords"
-    (let ((result (sx-parse ":hello")))
-      (assert-length 1 result)
-      (assert-equal "hello" (keyword-name (first result)))))
-
-  (deftest "parse symbols"
-    (let ((result (sx-parse "foo")))
-      (assert-length 1 result)
-      (assert-equal "foo" (symbol-name (first result))))))
-
-
-;; --------------------------------------------------------------------------
-;; Composite parsing
-;; --------------------------------------------------------------------------
-
-(defsuite "parser-lists"
-  (deftest "parse empty list"
-    (let ((result (sx-parse "()")))
-      (assert-length 1 result)
-      (assert-equal (list) (first result))))
-
-  (deftest "parse list of numbers"
-    (let ((result (sx-parse "(1 2 3)")))
-      (assert-length 1 result)
-      (assert-equal (list 1 2 3) (first result))))
-
-  (deftest "parse nested lists"
-    (let ((result (sx-parse "(1 (2 3) 4)")))
-      (assert-length 1 result)
-      (assert-equal (list 1 (list 2 3) 4) (first result))))
-
-  (deftest "parse square brackets as list"
-    (let ((result (sx-parse "[1 2 3]")))
-      (assert-length 1 result)
-      (assert-equal (list 1 2 3) (first result))))
-
-  (deftest "parse mixed types"
-    (let ((result (sx-parse "(42 \"hello\" true nil)")))
-      (assert-length 1 result)
-      (let ((lst (first result)))
-        (assert-equal 42 (nth lst 0))
-        (assert-equal "hello" (nth lst 1))
-        (assert-equal true (nth lst 2))
-        (assert-nil (nth lst 3))))))
-
-
-;; --------------------------------------------------------------------------
-;; Dict parsing
-;; --------------------------------------------------------------------------
-
-(defsuite "parser-dicts"
-  (deftest "parse empty dict"
-    (let ((result (sx-parse "{}")))
-      (assert-length 1 result)
-      (assert-type "dict" (first result))))
-
-  (deftest "parse dict with keyword keys"
-    (let ((result (sx-parse "{:a 1 :b 2}")))
-      (assert-length 1 result)
-      (let ((d (first result)))
-        (assert-type "dict" d)
-        (assert-equal 1 (get d "a"))
-        (assert-equal 2 (get d "b")))))
-
-  (deftest "parse dict with string values"
-    (let ((result (sx-parse "{:name \"alice\"}")))
-      (assert-length 1 result)
-      (assert-equal "alice" (get (first result) "name")))))
-
-
-;; --------------------------------------------------------------------------
-;; Comments and whitespace
-;; --------------------------------------------------------------------------
-
-(defsuite "parser-whitespace"
-  (deftest "skip line comments"
-    (assert-equal (list 42) (sx-parse ";; comment\n42"))
-    (assert-equal (list 1 2) (sx-parse "1 ;; middle\n2")))
-
-  (deftest "skip whitespace"
-    (assert-equal (list 42) (sx-parse "  42  "))
-    (assert-equal (list 1 2) (sx-parse " 1 \n\t 2 ")))
-
-  (deftest "parse multiple top-level expressions"
-    (assert-length 3 (sx-parse "1 2 3"))
-    (assert-equal (list 1 2 3) (sx-parse "1 2 3")))
-
-  (deftest "empty input"
-    (assert-equal (list) (sx-parse "")))
-
-  (deftest "only comments"
-    (assert-equal (list) (sx-parse ";; just a comment\n;; another"))))
-
-
-;; --------------------------------------------------------------------------
-;; Quote sugar
-;; --------------------------------------------------------------------------
-
-(defsuite "parser-quote-sugar"
-  (deftest "quasiquote"
-    (let ((result (sx-parse "`foo")))
-      (assert-length 1 result)
-      (let ((expr (first result)))
-        (assert-type "list" expr)
-        (assert-equal "quasiquote" (symbol-name (first expr))))))
-
-  (deftest "unquote"
-    (let ((result (sx-parse ",foo")))
-      (assert-length 1 result)
-      (let ((expr (first result)))
-        (assert-type "list" expr)
-        (assert-equal "unquote" (symbol-name (first expr))))))
-
-  (deftest "splice-unquote"
-    (let ((result (sx-parse ",@foo")))
-      (assert-length 1 result)
-      (let ((expr (first result)))
-        (assert-type "list" expr)
-        (assert-equal "splice-unquote" (symbol-name (first expr)))))))
-
-
-;; --------------------------------------------------------------------------
-;; Serializer
-;; --------------------------------------------------------------------------
-
-(defsuite "serializer"
-  (deftest "serialize number"
-    (assert-equal "42" (sx-serialize 42)))
-
-  (deftest "serialize string"
-    (assert-equal "\"hello\"" (sx-serialize "hello")))
-
-  (deftest "serialize boolean"
-    (assert-equal "true" (sx-serialize true))
-    (assert-equal "false" (sx-serialize false)))
-
-  (deftest "serialize nil"
-    (assert-equal "nil" (sx-serialize nil)))
-
-  (deftest "serialize keyword"
-    (assert-equal ":foo" (sx-serialize (make-keyword "foo"))))
-
-  (deftest "serialize symbol"
-    (assert-equal "bar" (sx-serialize (make-symbol "bar"))))
-
-  (deftest "serialize list"
-    (assert-equal "(1 2 3)" (sx-serialize (list 1 2 3))))
-
-  (deftest "serialize empty list"
-    (assert-equal "()" (sx-serialize (list))))
-
-  (deftest "serialize nested"
-    (assert-equal "(1 (2 3) 4)" (sx-serialize (list 1 (list 2 3) 4)))))
-
-
-;; --------------------------------------------------------------------------
-;; Round-trip: parse then serialize
-;; --------------------------------------------------------------------------
-
-(defsuite "parser-roundtrip"
-  (deftest "roundtrip number"
-    (assert-equal "42" (sx-serialize (first (sx-parse "42")))))
-
-  (deftest "roundtrip string"
-    (assert-equal "\"hello\"" (sx-serialize (first (sx-parse "\"hello\"")))))
-
-  (deftest "roundtrip list"
-    (assert-equal "(1 2 3)" (sx-serialize (first (sx-parse "(1 2 3)")))))
-
-  (deftest "roundtrip nested"
-    (assert-equal "(a (b c))"
-      (sx-serialize (first (sx-parse "(a (b c))"))))))
-
-
-;; --------------------------------------------------------------------------
-;; Reader macros
-;; --------------------------------------------------------------------------
-
-(defsuite "reader-macros"
-  (deftest "datum comment discards expr"
-    (assert-equal (list 42) (sx-parse "#;(ignored) 42")))
-
-  (deftest "datum comment in list"
-    (assert-equal (list (list 1 3)) (sx-parse "(1 #;2 3)")))
-
-  (deftest "datum comment discards nested"
-    (assert-equal (list 99) (sx-parse "#;(a (b c) d) 99")))
-
-  (deftest "raw string basic"
-    (assert-equal (list "hello") (sx-parse "#|hello|")))
-
-  (deftest "raw string with quotes"
-    (assert-equal (list "say \"hi\"") (sx-parse "#|say \"hi\"|")))
-
-  (deftest "raw string with backslashes"
-    (assert-equal (list "a\\nb") (sx-parse "#|a\\nb|")))
-
-  (deftest "raw string empty"
-    (assert-equal (list "") (sx-parse "#||")))
-
-  (deftest "quote shorthand symbol"
-    (let ((result (first (sx-parse "#'foo"))))
-      (assert-equal "quote" (symbol-name (first result)))
-      (assert-equal "foo" (symbol-name (nth result 1)))))
-
-  (deftest "quote shorthand list"
-    (let ((result (first (sx-parse "#'(1 2 3)"))))
-      (assert-equal "quote" (symbol-name (first result)))
-      (assert-equal (list 1 2 3) (nth result 1)))))

shared/sx/templates/layout.sx

@@ -20,7 +20,7 @@
                  :class "hidden md:flex md:flex-col max-w-xs md:h-full md:min-h-0 mr-3"
             (when aside aside))
           (section :id "main-panel"
-                   :class "flex-1 md:h-full md:min-h-0 overflow-y-auto overscroll-contain js-grid-viewport"
+                   :class "flex-1 md:h-full md:min-h-0 md:overflow-y-auto md:overscroll-contain overflow-x-hidden js-grid-viewport"
             (when content content)
             (div :class "pb-8")))))))
 
@@ -35,7 +35,7 @@
     (div :id "root-menu" :sx-swap-oob "outerHTML" :class "md:hidden"
       (when menu menu))
     (section :id "main-panel"
-             :class "flex-1 md:h-full md:min-h-0 overflow-y-auto overscroll-contain js-grid-viewport"
+             :class "flex-1 md:h-full md:min-h-0 md:overflow-y-auto md:overscroll-contain overflow-x-hidden js-grid-viewport"
       (when content content))))
 
 (defcomp ~shared:layout/hamburger ()

shared/sx/templates/shell.sx

@@ -16,6 +16,7 @@
                                (component-hash :as string?) (component-defs :as string?)
                                (pages-sx :as string?) (page-sx :as string?)
                                (asset-url :as string) (sx-js-hash :as string) (body-js-hash :as string?)
+                               (sx-js-file :as string?)
                                (head-scripts :as list?) (inline-css :as string?) (inline-head-js :as string?)
                                (init-sx :as string?) (body-scripts :as list?))
   (<>
@@ -74,7 +75,7 @@ details.group{overflow:hidden}details.group>summary{list-style:none}details.grou
           (raw! (or pages-sx "")))
         (script :type "text/sx" :data-mount "body"
           (raw! (or page-sx "")))
-        (script :src (str asset-url "/scripts/sx-browser.js?v=" sx-js-hash))
+        (script :src (str asset-url "/scripts/" (or sx-js-file "sx-browser.js") "?v=" sx-js-hash))
         ;; Body scripts — configurable per app
         ;; Pass a list (even empty) to override defaults; nil = use defaults
         (if (not (nil? body-scripts))

shared/sx/tests/test_aser_errors.py

@@ -0,0 +1,245 @@
+"""Tests for aser (SX wire format) error propagation.
+
+Verifies that evaluation errors inside control flow forms (case, cond, if,
+when, let, begin) propagate correctly — they must throw, not silently
+produce wrong output or fall through to :else branches.
+
+This test file targets the production bug where a case body referencing an
+undefined symbol was silently swallowed, causing the case to appear to fall
+through to :else instead of raising an error.
+"""
+from __future__ import annotations
+
+import pytest
+
+from shared.sx.ref.sx_ref import (
+    aser,
+    sx_parse as parse_all,
+    make_env,
+    eval_expr,
+    trampoline,
+    serialize as sx_serialize,
+)
+from shared.sx.types import NIL, EvalError
+
+
+def _render_sx(source: str, env=None) -> str:
+    """Parse SX source and serialize via aser (sync)."""
+    if env is None:
+        env = make_env()
+    exprs = parse_all(source)
+    result = ""
+    for expr in exprs:
+        val = aser(expr, env)
+        if isinstance(val, str):
+            result += val
+        elif val is None or val is NIL:
+            pass
+        else:
+            result += sx_serialize(val)
+    return result
+
+
+# ---------------------------------------------------------------------------
+# Case — matched branch errors must throw, not fall through
+# ---------------------------------------------------------------------------
+
+class TestCaseErrorPropagation:
+    def test_matched_branch_undefined_symbol_throws(self):
+        """If the matched case body references an undefined symbol, the aser
+        must throw — NOT silently skip to :else."""
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(case "x" "x" undefined_sym :else "fallback")')
+
+    def test_else_branch_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(case "miss" "x" "ok" :else undefined_sym)')
+
+    def test_matched_branch_nested_error_throws(self):
+        """Error inside a tag within the matched body must propagate."""
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(case "a" "a" (div (p undefined_nested)) :else (p "index"))')
+
+    def test_unmatched_correctly_falls_through(self):
+        """Verify :else works when no clause matches (happy path)."""
+        result = _render_sx('(case "miss" "x" "found" :else "fallback")')
+        assert "fallback" in result
+
+    def test_matched_branch_succeeds(self):
+        """Verify the happy path: matched branch evaluates normally."""
+        result = _render_sx('(case "ok" "ok" (p "matched") :else "fallback")')
+        assert "matched" in result
+
+
+# ---------------------------------------------------------------------------
+# Cond — matched branch errors must throw
+# ---------------------------------------------------------------------------
+
+class TestCondErrorPropagation:
+    def test_matched_branch_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(cond true undefined_cond_sym :else "fallback")')
+
+    def test_else_branch_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(cond false "skip" :else undefined_cond_sym)')
+
+
+# ---------------------------------------------------------------------------
+# If / When — body errors must throw
+# ---------------------------------------------------------------------------
+
+class TestIfWhenErrorPropagation:
+    def test_if_true_branch_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(if true undefined_if_sym "fallback")')
+
+    def test_when_body_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(when true undefined_when_sym)')
+
+
+# ---------------------------------------------------------------------------
+# Let — binding or body errors must throw
+# ---------------------------------------------------------------------------
+
+class TestLetErrorPropagation:
+    def test_binding_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(let ((x undefined_let_sym)) (p x))')
+
+    def test_body_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(let ((x 1)) (p undefined_let_body_sym))')
+
+
+# ---------------------------------------------------------------------------
+# Begin/Do — body errors must throw
+# ---------------------------------------------------------------------------
+
+class TestBeginErrorPropagation:
+    def test_do_body_error_throws(self):
+        with pytest.raises(Exception, match="Undefined symbol"):
+            _render_sx('(do "ok" undefined_do_sym)')
+
+
+# ---------------------------------------------------------------------------
+# Sync aser: components serialize WITHOUT expansion (by design)
+# ---------------------------------------------------------------------------
+
+class TestSyncAserComponentSerialization:
+    """The sync aser serializes component calls as SX wire format without
+    expanding the body. This is correct — expansion only happens in the
+    async path with expand_components=True."""
+
+    def test_component_in_case_serializes_without_expanding(self):
+        """Sync aser should serialize the component call, not expand it."""
+        result = _render_sx(
+            '(do (defcomp ~broken (&key title) (div (p title) (p no_such_helper)))'
+            '    (case "slug" "slug" (~broken :title "test") '
+            '                :else "index"))'
+        )
+        # Component call is serialized as SX, not expanded — no error
+        assert "~broken" in result
+
+    def test_working_component_in_case_serializes(self):
+        result = _render_sx(
+            '(do (defcomp ~working (&key title) (div (p title)))'
+            '    (case "ok" "ok" (~working :title "hello") '
+            '               :else "index"))'
+        )
+        assert "~working" in result
+
+    def test_unmatched_case_falls_through_correctly(self):
+        result = _render_sx(
+            '(do (defcomp ~page (&key x) (div x))'
+            '    (case "miss" "hit" (~page :x "found") '
+            '                :else "index"))'
+        )
+        assert "index" in result
+
+
+# ---------------------------------------------------------------------------
+# Async aser with expand_components=True — the production path
+# ---------------------------------------------------------------------------
+
+class TestAsyncAserComponentExpansion:
+    """Tests the production code path: async aser with component expansion
+    enabled. Errors in expanded component bodies must propagate, not be
+    silently swallowed."""
+
+    def _async_render(self, source: str) -> str:
+        """Render via the async aser with component expansion enabled."""
+        import asyncio
+        from shared.sx.ref.sx_ref import async_aser, _expand_components_cv
+        exprs = parse_all(source)
+        env = make_env()
+
+        async def run():
+            token = _expand_components_cv.set(True)
+            try:
+                result = ""
+                for expr in exprs:
+                    val = await async_aser(expr, env, None)
+                    if isinstance(val, str):
+                        result += val
+                    elif val is None or val is NIL:
+                        pass
+                    else:
+                        result += sx_serialize(val)
+                return result
+            finally:
+                _expand_components_cv.reset(token)
+
+        return asyncio.run(run())
+
+    def test_expanded_component_with_undefined_symbol_throws(self):
+        """When expand_components is True and the component body references
+        an undefined symbol, the error must propagate — not be swallowed."""
+        with pytest.raises(Exception, match="Undefined symbol"):
+            self._async_render(
+                '(do (defcomp ~broken (&key title) '
+                '      (div (p title) (p no_such_helper)))'
+                '    (case "slug" "slug" (~broken :title "test") '
+                '                :else "index"))'
+            )
+
+    def test_expanded_working_component_succeeds(self):
+        result = self._async_render(
+            '(do (defcomp ~working (&key title) (div (p title)))'
+            '    (case "ok" "ok" (~working :title "hello") '
+            '               :else "index"))'
+        )
+        assert "hello" in result
+
+    def test_expanded_unmatched_falls_through(self):
+        result = self._async_render(
+            '(do (defcomp ~page (&key x) (div x))'
+            '    (case "miss" "hit" (~page :x "found") '
+            '                :else "index"))'
+        )
+        assert "index" in result
+
+    def test_hand_written_aser_also_propagates(self):
+        """Test the hand-written _aser in async_eval.py (the production
+        path used by page rendering)."""
+        import asyncio
+        from shared.sx.async_eval import (
+            async_eval_slot_to_sx, RequestContext,
+        )
+        from shared.sx.ref.sx_ref import aser
+
+        env = make_env()
+        # Define the component via sync aser
+        for expr in parse_all(
+            '(defcomp ~broken (&key title) (div (p title) (p no_such_helper)))'
+        ):
+            aser(expr, env)
+
+        case_expr = parse_all(
+            '(case "slug" "slug" (~broken :title "test") :else "index")'
+        )[0]
+        ctx = RequestContext()
+
+        with pytest.raises(Exception, match="Undefined symbol"):
+            asyncio.run(async_eval_slot_to_sx(case_expr, dict(env), ctx))

shared/sx/tests/test_ocaml_bridge.py

@@ -0,0 +1,220 @@
+"""Tests for the OCaml SX bridge."""
+
+import asyncio
+import os
+import sys
+import unittest
+
+# Add project root to path
+_project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../.."))
+if _project_root not in sys.path:
+    sys.path.insert(0, _project_root)
+
+from shared.sx.ocaml_bridge import OcamlBridge, OcamlBridgeError, _escape, _parse_response, _serialize_for_ocaml
+
+
+class TestHelpers(unittest.TestCase):
+    """Test helper functions (no subprocess needed)."""
+
+    def test_escape_basic(self):
+        self.assertEqual(_escape('hello'), 'hello')
+        self.assertEqual(_escape('say "hi"'), 'say \\"hi\\"')
+        self.assertEqual(_escape('a\\b'), 'a\\\\b')
+        self.assertEqual(_escape('line\nbreak'), 'line\\nbreak')
+
+    def test_parse_response_ok_empty(self):
+        self.assertEqual(_parse_response("(ok)"), ("ok", None))
+
+    def test_parse_response_ok_number(self):
+        self.assertEqual(_parse_response("(ok 3)"), ("ok", "3"))
+
+    def test_parse_response_ok_string(self):
+        kind, val = _parse_response('(ok "<div>hi</div>")')
+        self.assertEqual(kind, "ok")
+        self.assertEqual(val, "<div>hi</div>")
+
+    def test_parse_response_error(self):
+        kind, val = _parse_response('(error "something broke")')
+        self.assertEqual(kind, "error")
+        self.assertEqual(val, "something broke")
+
+    def test_serialize_none(self):
+        self.assertEqual(_serialize_for_ocaml(None), "nil")
+
+    def test_serialize_bool(self):
+        self.assertEqual(_serialize_for_ocaml(True), "true")
+        self.assertEqual(_serialize_for_ocaml(False), "false")
+
+    def test_serialize_number(self):
+        self.assertEqual(_serialize_for_ocaml(42), "42")
+        self.assertEqual(_serialize_for_ocaml(3.14), "3.14")
+
+    def test_serialize_string(self):
+        self.assertEqual(_serialize_for_ocaml("hello"), '"hello"')
+        self.assertEqual(_serialize_for_ocaml('say "hi"'), '"say \\"hi\\""')
+
+    def test_serialize_list(self):
+        self.assertEqual(_serialize_for_ocaml([1, 2, 3]), "(list 1 2 3)")
+
+    def test_serialize_dict(self):
+        result = _serialize_for_ocaml({"a": 1})
+        self.assertEqual(result, "{:a 1}")
+
+
+class TestBridge(unittest.IsolatedAsyncioTestCase):
+    """Integration tests — require the OCaml binary to be built."""
+
+    @classmethod
+    def setUpClass(cls):
+        # Check if binary exists
+        from shared.sx.ocaml_bridge import _DEFAULT_BIN
+        bin_path = os.path.abspath(_DEFAULT_BIN)
+        if not os.path.isfile(bin_path):
+            raise unittest.SkipTest(
+                f"OCaml binary not found at {bin_path}. "
+                f"Build with: cd hosts/ocaml && eval $(opam env) && dune build"
+            )
+
+    async def asyncSetUp(self):
+        self.bridge = OcamlBridge()
+        await self.bridge.start()
+
+    async def asyncTearDown(self):
+        await self.bridge.stop()
+
+    async def test_ping(self):
+        self.assertTrue(await self.bridge.ping())
+
+    async def test_eval_arithmetic(self):
+        result = await self.bridge.eval("(+ 1 2)")
+        self.assertEqual(result, "3")
+
+    async def test_eval_string(self):
+        result = await self.bridge.eval('(str "hello" " " "world")')
+        self.assertIn("hello world", result)
+
+    async def test_render_simple(self):
+        html = await self.bridge.render('(div (p "hello"))')
+        self.assertEqual(html, "<div><p>hello</p></div>")
+
+    async def test_render_attrs(self):
+        html = await self.bridge.render('(div :class "card" (p "hi"))')
+        self.assertIn('class="card"', html)
+        self.assertIn("<p>hi</p>", html)
+
+    async def test_render_void_element(self):
+        html = await self.bridge.render("(br)")
+        self.assertEqual(html, "<br />")
+
+    async def test_load_source_defcomp(self):
+        count = await self.bridge.load_source(
+            '(defcomp ~test-card (&key title) (div :class "card" (h2 title)))'
+        )
+        self.assertEqual(count, 1)
+        html = await self.bridge.render('(~test-card :title "Hello")')
+        self.assertIn("Hello", html)
+        self.assertIn("card", html)
+
+    async def test_reset(self):
+        await self.bridge.load_source("(define x 42)")
+        result = await self.bridge.eval("x")
+        self.assertEqual(result, "42")
+        await self.bridge.reset()
+        with self.assertRaises(OcamlBridgeError):
+            await self.bridge.eval("x")
+
+    async def test_render_conditional(self):
+        html = await self.bridge.render('(if true (p "yes") (p "no"))')
+        self.assertEqual(html, "<p>yes</p>")
+
+    async def test_render_let(self):
+        html = await self.bridge.render('(let (x "hi") (p x))')
+        self.assertEqual(html, "<p>hi</p>")
+
+    async def test_render_map(self):
+        html = await self.bridge.render(
+            "(map (lambda (x) (li x)) (list \"a\" \"b\" \"c\"))"
+        )
+        self.assertEqual(html, "<li>a</li><li>b</li><li>c</li>")
+
+    async def test_render_fragment(self):
+        html = await self.bridge.render('(<> (p "a") (p "b"))')
+        self.assertEqual(html, "<p>a</p><p>b</p>")
+
+    async def test_eval_error(self):
+        with self.assertRaises(OcamlBridgeError):
+            await self.bridge.eval("(undefined-symbol-xyz)")
+
+    async def test_render_component_with_children(self):
+        await self.bridge.load_source(
+            '(defcomp ~wrapper (&rest children) (div :class "wrap" children))'
+        )
+        html = await self.bridge.render('(~wrapper (p "inside"))')
+        self.assertIn("wrap", html)
+        self.assertIn("<p>inside</p>", html)
+
+    async def test_render_macro(self):
+        await self.bridge.load_source(
+            "(defmacro unless (cond &rest body) (list 'if (list 'not cond) (cons 'do body)))"
+        )
+        html = await self.bridge.render('(unless false (p "shown"))')
+        self.assertEqual(html, "<p>shown</p>")
+
+    # ------------------------------------------------------------------
+    # ListRef regression tests — the `list` primitive returns ListRef
+    # (mutable), not List (immutable). Macro expansions that construct
+    # AST via `list` produce ListRef nodes. The renderer must handle
+    # both List and ListRef at every structural match point.
+    # ------------------------------------------------------------------
+
+    async def test_render_macro_generates_cond(self):
+        """Macro that programmatically builds a (cond ...) with list."""
+        await self.bridge.load_source(
+            "(defmacro pick (x) "
+            "  (list 'cond "
+            "    (list (list '= x 1) '(p \"one\")) "
+            "    (list (list '= x 2) '(p \"two\")) "
+            "    (list ':else '(p \"other\"))))"
+        )
+        html = await self.bridge.render("(pick 2)")
+        self.assertEqual(html, "<p>two</p>")
+
+    async def test_render_macro_generates_let(self):
+        """Macro that programmatically builds a (let ...) with list."""
+        await self.bridge.load_source(
+            "(defmacro with-greeting (name &rest body) "
+            "  (list 'let (list (list 'greeting (list 'str \"Hello \" name))) "
+            "    (cons 'do body)))"
+        )
+        html = await self.bridge.render('(with-greeting "World" (p greeting))')
+        self.assertEqual(html, "<p>Hello World</p>")
+
+    async def test_render_macro_nested_html_tags(self):
+        """Macro expansion containing nested HTML tags via list."""
+        await self.bridge.load_source(
+            "(defmacro card (title &rest body) "
+            "  (list 'div ':class \"card\" "
+            "    (list 'h2 title) "
+            "    (cons 'do body)))"
+        )
+        html = await self.bridge.render('(card "Title" (p "content"))')
+        self.assertIn('<div class="card">', html)
+        self.assertIn("<h2>Title</h2>", html)
+        self.assertIn("<p>content</p>", html)
+
+    async def test_render_eval_returns_listref(self):
+        """Values created at runtime via (list ...) are ListRef."""
+        await self.bridge.load_source(
+            "(define make-items (lambda () (list "
+            '  (list "a") (list "b") (list "c"))))'
+        )
+        html = await self.bridge.render(
+            "(ul (map (lambda (x) (li (first x))) (make-items)))"
+        )
+        self.assertIn("<li>a</li>", html)
+        self.assertIn("<li>b</li>", html)
+        self.assertIn("<li>c</li>", html)
+
+
+if __name__ == "__main__":
+    unittest.main()

shared/sx/types.py

@@ -361,11 +361,15 @@ class Continuation:
 
     Callable with one argument — provides the value that the shift
     expression "returns" within the delimited context.
+
+    _cek_data: optional dict with CEK frame data (captured frames, rest-kont)
+    for continuations created by the explicit CEK machine.
     """
-    __slots__ = ("fn",)
+    __slots__ = ("fn", "_cek_data")
 
     def __init__(self, fn):
         self.fn = fn
+        self._cek_data = None
 
     def __call__(self, value=NIL):
         return self.fn(value)
@@ -397,6 +401,43 @@ class EvalError(Exception):
     pass
 
 
+# ---------------------------------------------------------------------------
+# SxExpr
+# ---------------------------------------------------------------------------
+
+class SxExpr(str):
+    """Pre-built sx source that serialize() outputs unquoted.
+
+    ``SxExpr`` is a ``str`` subclass, so it works everywhere a plain
+    string does (join, startswith, f-strings, isinstance checks).  The
+    only difference: ``serialize()`` emits it unquoted instead of
+    wrapping it in double-quotes.
+
+    Use this to nest sx call strings inside other sx_call() invocations
+    without them being quoted as strings::
+
+        sx_call("parent", child=sx_call("child", x=1))
+        # => (~parent :child (~child :x 1))
+    """
+
+    def __new__(cls, source: str = "") -> "SxExpr":
+        return str.__new__(cls, source)
+
+    @property
+    def source(self) -> str:
+        """The raw SX source string (backward compat)."""
+        return str.__str__(self)
+
+    def __repr__(self) -> str:
+        return f"SxExpr({str.__repr__(self)})"
+
+    def __add__(self, other: object) -> "SxExpr":
+        return SxExpr(str.__add__(self, str(other)))
+
+    def __radd__(self, other: object) -> "SxExpr":
+        return SxExpr(str.__add__(str(other), self))
+
+
 # ---------------------------------------------------------------------------
 # Type alias
 # ---------------------------------------------------------------------------

spec/parser.sx

@@ -25,6 +25,7 @@
 ;;   comment    → ';' to end of line (discarded)
 ;;
 ;; Quote sugar:
+;;   'expr      → (quote expr)
 ;;   `expr      → (quasiquote expr)
 ;;   ,expr      → (unquote expr)
 ;;   ,@expr     → (splice-unquote expr)
@@ -267,6 +268,11 @@
                 (= ch ":")
                   (read-keyword)
 
+                ;; Quote sugar
+                (= ch "'")
+                  (do (set! pos (inc pos))
+                      (list (make-symbol "quote") (read-expr)))
+
                 ;; Quasiquote sugar
                 (= ch "`")
                   (do (set! pos (inc pos))
@@ -395,7 +401,7 @@
 ;;     True for: a-z A-Z _ ~ * + - > < = / ! ? &
 ;;
 ;;   (ident-char? ch) → boolean
-;;     True for: ident-start chars plus: 0-9 . : / [ ] # ,
+;;     True for: ident-start chars plus: 0-9 . : / # ,
 ;;
 ;; Constructors (provided by the SX runtime):
 ;;   (make-symbol name)  → Symbol value

spec/render.sx

@@ -184,7 +184,7 @@
             (let ((name (if (= (type-of (first pair)) "symbol")
                           (symbol-name (first pair))
                           (str (first pair)))))
-              (env-set! local name (trampoline (eval-expr (nth pair 1) local))))))
+              (env-bind! local name (trampoline (eval-expr (nth pair 1) local))))))
         bindings)
       local)))
 
@@ -269,11 +269,13 @@
 ;;   (collected bucket)        → list
 ;;   (clear-collected! bucket) → void
 ;;
-;; Dynamic scope (provide/context/emit!):
-;;   (provide-push! name val)  → void
-;;   (provide-pop! name)       → void
-;;   (context name &rest def)  → value from nearest provider
-;;   (emit! name value)        → void (append to provider accumulator)
+;; Scoped effects (scope/provide/context/emit!):
+;;   (scope-push! name val)    → void (general form)
+;;   (scope-pop! name)         → void (general form)
+;;   (provide-push! name val)  → alias for scope-push!
+;;   (provide-pop! name)       → alias for scope-pop!
+;;   (context name &rest def)  → value from nearest scope
+;;   (emit! name value)        → void (append to scope accumulator)
 ;;   (emitted name)            → list of emitted values
 ;;
 ;; From parser.sx:

spec/tests/test-advanced.sx

@@ -0,0 +1,371 @@
+;; ==========================================================================
+;; test-advanced.sx — Tests for advanced evaluation patterns
+;;
+;; Requires: test-framework.sx loaded first.
+;; Modules tested: eval.sx (nested forms, higher-order patterns, define,
+;;                 quasiquote, thread-first, letrec, case/cond)
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; Nested special forms
+;; --------------------------------------------------------------------------
+
+(defsuite "nested-special-forms"
+  (deftest "let inside let"
+    (let ((x 1))
+      (let ((y (let ((z 10)) (+ x z))))
+        (assert-equal 11 y))))
+
+  (deftest "if inside let"
+    (let ((flag true)
+          (result (if true "yes" "no")))
+      (assert-equal "yes" result))
+    (let ((result (if false "yes" "no")))
+      (assert-equal "no" result)))
+
+  (deftest "let inside if"
+    (assert-equal 15
+      (if true
+        (let ((a 5) (b 10)) (+ a b))
+        0))
+    (assert-equal 0
+      (if false
+        99
+        (let ((x 0)) x))))
+
+  (deftest "cond inside let"
+    (let ((n 2)
+          (label (cond (= 2 1) "one"
+                       (= 2 2) "two"
+                       :else   "other")))
+      (assert-equal "two" label)))
+
+  (deftest "when inside when (nested conditional)"
+    ;; Inner when only runs when outer when runs
+    (let ((result "none"))
+      (when true
+        (when true
+          (set! result "both")))
+      (assert-equal "both" result))
+    (let ((result "none"))
+      (when true
+        (when false
+          (set! result "inner")))
+      (assert-equal "none" result))
+    (let ((result "none"))
+      (when false
+        (when true
+          (set! result "inner")))
+      (assert-equal "none" result)))
+
+  (deftest "do inside let body"
+    (let ((x 0))
+      (do
+        (set! x (+ x 1))
+        (set! x (+ x 1))
+        (set! x (+ x 1)))
+      (assert-equal 3 x)))
+
+  (deftest "let inside map callback"
+    ;; Each map iteration creates its own let scope
+    (let ((result (map (fn (x)
+                         (let ((doubled (* x 2))
+                               (label (str "item-" x)))
+                           (str label "=" doubled)))
+                       (list 1 2 3))))
+      (assert-equal "item-1=2" (nth result 0))
+      (assert-equal "item-2=4" (nth result 1))
+      (assert-equal "item-3=6" (nth result 2)))))
+
+
+;; --------------------------------------------------------------------------
+;; Higher-order patterns
+;; --------------------------------------------------------------------------
+
+(defsuite "higher-order-patterns"
+  (deftest "map then filter (pipeline)"
+    ;; Double each number, then keep only those > 4
+    (let ((result (filter (fn (x) (> x 4))
+                          (map (fn (x) (* x 2)) (list 1 2 3 4 5)))))
+      (assert-equal (list 6 8 10) result)))
+
+  (deftest "filter then map"
+    ;; Keep odd numbers, then square them
+    (let ((result (map (fn (x) (* x x))
+                       (filter (fn (x) (= (mod x 2) 1)) (list 1 2 3 4 5)))))
+      (assert-equal (list 1 9 25) result)))
+
+  (deftest "reduce to build a dict"
+    ;; Build a word-length dict from a list of strings
+    (let ((result (reduce
+                    (fn (acc s) (assoc acc s (string-length s)))
+                    {}
+                    (list "a" "bb" "ccc"))))
+      (assert-equal 1 (get result "a"))
+      (assert-equal 2 (get result "bb"))
+      (assert-equal 3 (get result "ccc"))))
+
+  (deftest "map returning lambdas, then calling them"
+    ;; Produce a list of adder functions; call each with 10
+    (let ((adders (map (fn (n) (fn (x) (+ n x))) (list 1 2 3)))
+          (results (list)))
+      (for-each
+        (fn (f) (append! results (f 10)))
+        adders)
+      (assert-equal (list 11 12 13) results)))
+
+  (deftest "nested map (map of map)"
+    (let ((matrix (list (list 1 2) (list 3 4) (list 5 6)))
+          (result (map (fn (row) (map (fn (x) (* x 10)) row)) matrix)))
+      (assert-equal (list 10 20) (nth result 0))
+      (assert-equal (list 30 40) (nth result 1))
+      (assert-equal (list 50 60) (nth result 2))))
+
+  (deftest "for-each with side effect (set! counter)"
+    (define fe-counter 0)
+    (for-each
+      (fn (x) (set! fe-counter (+ fe-counter x)))
+      (list 1 2 3 4 5))
+    ;; 1+2+3+4+5 = 15
+    (assert-equal 15 fe-counter)))
+
+
+;; --------------------------------------------------------------------------
+;; Define patterns
+;; --------------------------------------------------------------------------
+
+(defsuite "define-patterns"
+  (deftest "define inside let body"
+    ;; define inside a let body is visible in subsequent let body expressions
+    (let ((x 5))
+      (define y (* x 2))
+      (assert-equal 10 y)))
+
+  (deftest "define inside do block"
+    (do
+      (define do-val 42)
+      (assert-equal 42 do-val)))
+
+  (deftest "define function then call it"
+    (define square (fn (n) (* n n)))
+    (assert-equal 9  (square 3))
+    (assert-equal 25 (square 5))
+    (assert-equal 0  (square 0)))
+
+  (deftest "redefine a name (second define overwrites first)"
+    (define redef-x 1)
+    (assert-equal 1 redef-x)
+    (define redef-x 99)
+    (assert-equal 99 redef-x))
+
+  (deftest "define with computed value"
+    (define base 7)
+    (define derived (* base 6))
+    (assert-equal 42 derived)))
+
+
+;; --------------------------------------------------------------------------
+;; Quasiquote advanced
+;; --------------------------------------------------------------------------
+
+(defsuite "quasiquote-advanced"
+  (deftest "quasiquote with multiple unquotes"
+    (let ((a 1) (b 2) (c 3))
+      (assert-equal (list 1 2 3) `(,a ,b ,c))
+      (assert-equal (list 10 2 30) `(,(* a 10) ,b ,(* c 10)))))
+
+  (deftest "unquote-splicing at start of list"
+    (let ((prefix (list 1 2 3)))
+      (assert-equal (list 1 2 3 4 5) `(,@prefix 4 5))))
+
+  (deftest "unquote-splicing at end of list"
+    (let ((suffix (list 3 4 5)))
+      (assert-equal (list 1 2 3 4 5) `(1 2 ,@suffix))))
+
+  (deftest "unquote inside nested list"
+    (let ((x 42))
+      ;; The inner list contains an unquote — it should still be spliced
+      (let ((result `(a (b ,x) c)))
+        (assert-length 3 result)
+        (assert-equal 42 (nth (nth result 1) 1)))))
+
+  (deftest "quasiquote preserving structure"
+    ;; A quasiquoted form with no unquotes is identical to the quoted form
+    (let ((q `(fn (a b) (+ a b))))
+      (assert-type "list" q)
+      (assert-length 3 q)
+      ;; First element is the symbol fn
+      (assert-true (equal? (sx-parse-one "fn") (first q)))
+      ;; Body is (+ a b) — a 3-element list
+      (assert-length 3 (nth q 2)))))
+
+
+;; --------------------------------------------------------------------------
+;; Thread-first
+;; --------------------------------------------------------------------------
+
+(defsuite "thread-first"
+  (deftest "simple thread through arithmetic"
+    ;; (-> 5 (+ 1) (* 2)) = (5+1)*2 = 12
+    (assert-equal 12 (-> 5 (+ 1) (* 2))))
+
+  (deftest "thread with string ops"
+    (assert-equal "HELLO" (-> "hello" upcase))
+    (assert-equal "hello" (-> "HELLO" downcase)))
+
+  (deftest "thread with multiple steps"
+    ;; (-> 1 (+ 1) (+ 1) (+ 1) (+ 1)) = 5
+    (assert-equal 5 (-> 1 (+ 1) (+ 1) (+ 1) (+ 1)))
+    ;; (-> 100 (- 10) (/ 2) (+ 5)) = (100-10)/2+5 = 50
+    (assert-equal 50 (-> 100 (- 10) (/ 2) (+ 5))))
+
+  (deftest "thread through list ops"
+    ;; Build list, reverse, take first
+    (assert-equal 3 (-> (list 1 2 3) reverse first))
+    ;; Append then get length
+    (assert-equal 5 (-> (list 1 2 3) (append (list 4 5)) len))))
+
+
+;; --------------------------------------------------------------------------
+;; letrec
+;; --------------------------------------------------------------------------
+
+(defsuite "letrec"
+  (deftest "simple letrec with self-reference"
+    ;; A single binding that calls itself recursively
+    (letrec ((count-down (fn (n)
+                           (if (<= n 0)
+                             "done"
+                             (count-down (- n 1))))))
+      (assert-equal "done" (count-down 5))))
+
+  (deftest "mutual recursion in letrec"
+    (letrec ((my-even? (fn (n)
+                         (if (= n 0) true  (my-odd?  (- n 1)))))
+             (my-odd?  (fn (n)
+                         (if (= n 0) false (my-even? (- n 1))))))
+      (assert-true  (my-even? 4))
+      (assert-false (my-even? 3))
+      (assert-true  (my-odd?  3))
+      (assert-false (my-odd?  4))))
+
+  (deftest "letrec fibonacci"
+    (letrec ((fib (fn (n)
+                    (if (< n 2)
+                      n
+                      (+ (fib (- n 1)) (fib (- n 2)))))))
+      (assert-equal 0  (fib 0))
+      (assert-equal 1  (fib 1))
+      (assert-equal 1  (fib 2))
+      (assert-equal 8  (fib 6))
+      (assert-equal 55 (fib 10))))
+
+  (deftest "letrec with non-recursive values too"
+    ;; letrec can hold plain values alongside recursive fns
+    (letrec ((base   10)
+             (triple (fn (n) (* n 3)))
+             (result (fn () (triple base))))
+      (assert-equal 10 base)
+      (assert-equal 6  (triple 2))
+      (assert-equal 30 (result)))))
+
+
+;; --------------------------------------------------------------------------
+;; case and cond
+;; --------------------------------------------------------------------------
+
+(defsuite "case-cond"
+  (deftest "case with string matching"
+    (define color-label
+      (fn (c)
+        (case c
+          "red"   "warm"
+          "blue"  "cool"
+          "green" "natural"
+          :else   "unknown")))
+    (assert-equal "warm"    (color-label "red"))
+    (assert-equal "cool"    (color-label "blue"))
+    (assert-equal "natural" (color-label "green"))
+    (assert-equal "unknown" (color-label "purple")))
+
+  (deftest "case with number matching"
+    (define grade
+      (fn (n)
+        (case n
+          1 "one"
+          2 "two"
+          3 "three"
+          :else "many")))
+    (assert-equal "one"   (grade 1))
+    (assert-equal "two"   (grade 2))
+    (assert-equal "three" (grade 3))
+    (assert-equal "many"  (grade 99)))
+
+  (deftest "case :else fallthrough"
+    (assert-equal "fallback"
+      (case "unrecognised"
+        "a" "alpha"
+        "b" "beta"
+        :else "fallback")))
+
+  (deftest "case no match returns nil"
+    (assert-nil
+      (case "x"
+        "a" "alpha"
+        "b" "beta")))
+
+  (deftest "cond with multiple predicates"
+    (define classify
+      (fn (n)
+        (cond (< n 0)  "negative"
+              (= n 0)  "zero"
+              (< n 10) "small"
+              :else    "large")))
+    (assert-equal "negative" (classify -5))
+    (assert-equal "zero"     (classify 0))
+    (assert-equal "small"    (classify 7))
+    (assert-equal "large"    (classify 100)))
+
+  (deftest "cond with (= x val) predicate style"
+    (let ((x "b"))
+      (assert-equal "beta"
+        (cond (= x "a") "alpha"
+              (= x "b") "beta"
+              (= x "c") "gamma"
+              :else      "other"))))
+
+  (deftest "cond :else"
+    (assert-equal "default"
+      (cond false "nope"
+            false "also-nope"
+            :else "default")))
+
+  (deftest "cond all false returns nil"
+    (assert-nil
+      (cond false "a"
+            false "b"
+            false "c")))
+
+  (deftest "nested cond/case"
+    ;; cond selects a branch, that branch uses case
+    (define describe
+      (fn (kind val)
+        (cond (= kind "color")
+                (case val
+                  "r" "red"
+                  "g" "green"
+                  "b" "blue"
+                  :else "unknown-color")
+              (= kind "size")
+                (case val
+                  "s" "small"
+                  "l" "large"
+                  :else "unknown-size")
+              :else "unknown-kind")))
+    (assert-equal "red"          (describe "color" "r"))
+    (assert-equal "green"        (describe "color" "g"))
+    (assert-equal "unknown-color" (describe "color" "x"))
+    (assert-equal "small"        (describe "size"  "s"))
+    (assert-equal "large"        (describe "size"  "l"))
+    (assert-equal "unknown-kind" (describe "other" "?"))))

spec/tests/test-cek-advanced.sx

@@ -0,0 +1,697 @@
+;; ==========================================================================
+;; test-cek-advanced.sx — Advanced stress tests for the CEK machine evaluator
+;;
+;; Exercises complex evaluation patterns that stress the step/continue
+;; dispatch loop: deep nesting, higher-order forms, macro expansion in
+;; the CEK context, environment pressure, and subtle edge cases.
+;;
+;; Requires: test-framework.sx, frames.sx, cek.sx loaded.
+;; Helpers: cek-eval (source string → value via eval-expr-cek).
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; 1. Deep nesting
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-deep-nesting"
+  (deftest "deeply nested let — 5 levels"
+    ;; Each let layer adds a binding; innermost body sees all of them.
+    (assert-equal 15
+      (cek-eval
+        "(let ((a 1))
+           (let ((b 2))
+             (let ((c 3))
+               (let ((d 4))
+                 (let ((e 5))
+                   (+ a b c d e))))))")))
+
+  (deftest "deeply nested let — 7 levels with shadowing"
+    ;; x is rebound at each level; innermost sees 7.
+    (assert-equal 7
+      (cek-eval
+        "(let ((x 1))
+           (let ((x 2))
+             (let ((x 3))
+               (let ((x 4))
+                 (let ((x 5))
+                   (let ((x 6))
+                     (let ((x 7))
+                       x)))))))")))
+
+  (deftest "deeply nested if — 5 levels"
+    ;; All true branches taken; value propagates through every level.
+    (assert-equal 42
+      (cek-eval
+        "(if true
+           (if true
+             (if true
+               (if true
+                 (if true
+                   42
+                   0)
+                 0)
+               0)
+             0)
+           0)")))
+
+  (deftest "deeply nested if — alternating true/false reaching else"
+    ;; Outer true → inner false → its else → next true → final value.
+    (assert-equal "deep"
+      (cek-eval
+        "(if true
+           (if false
+             \"wrong\"
+             (if true
+               (if false
+                 \"also-wrong\"
+                 (if true \"deep\" \"no\"))
+               \"bad\"))
+           \"outer-else\")")))
+
+  (deftest "deeply nested function calls f(g(h(x)))"
+    ;; Three composed single-arg functions: inc, double, square.
+    ;; square(double(inc(3))) = square(double(4)) = square(8) = 64
+    (assert-equal 64
+      (cek-eval
+        "(do
+           (define inc-fn    (fn (x) (+ x 1)))
+           (define double-fn (fn (x) (* x 2)))
+           (define square-fn (fn (x) (* x x)))
+           (square-fn (double-fn (inc-fn 3))))")))
+
+  (deftest "5-level deeply nested function call chain"
+    ;; f1(f2(f3(f4(f5(0))))) with each adding 10.
+    (assert-equal 50
+      (cek-eval
+        "(do
+           (define f1 (fn (x) (+ x 10)))
+           (define f2 (fn (x) (+ x 10)))
+           (define f3 (fn (x) (+ x 10)))
+           (define f4 (fn (x) (+ x 10)))
+           (define f5 (fn (x) (+ x 10)))
+           (f1 (f2 (f3 (f4 (f5 0))))))")))
+
+  (deftest "deep begin/do chain — 6 sequential expressions"
+    ;; All expressions evaluated; last value returned.
+    (assert-equal 60
+      (cek-eval
+        "(do
+           (define acc 0)
+           (set! acc (+ acc 10))
+           (set! acc (+ acc 10))
+           (set! acc (+ acc 10))
+           (set! acc (+ acc 10))
+           (set! acc (+ acc 10))
+           (set! acc (+ acc 10))
+           acc)")))
+
+  (deftest "let inside if inside let inside cond"
+    ;; cond dispatches → outer let binds → if selects → inner let computes.
+    (assert-equal 30
+      (cek-eval
+        "(let ((mode \"go\"))
+           (cond
+             (= mode \"stop\") -1
+             (= mode \"go\")
+               (let ((base 10))
+                 (if (> base 5)
+                   (let ((factor 3))
+                     (* base factor))
+                   0))
+             :else 0))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 2. Complex call patterns
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-complex-calls"
+  (deftest "higher-order function returning higher-order function"
+    ;; make-adder-factory returns a factory that makes adders.
+    ;; Exercises three closure levels in the CEK call handler.
+    (assert-equal 115
+      (cek-eval
+        "(do
+           (define make-adder-factory
+             (fn (base)
+               (fn (offset)
+                 (fn (x) (+ base offset x)))))
+           (let ((factory (make-adder-factory 100)))
+             (let ((add-10 (factory 10)))
+               (add-10 5))))")))
+
+  (deftest "curried multiplication — 3 application levels"
+    ;; ((mul a) b) c — each level returns a lambda.
+    (assert-equal 60
+      (cek-eval
+        "(do
+           (define mul3
+             (fn (a) (fn (b) (fn (c) (* a b c)))))
+           (((mul3 3) 4) 5))")))
+
+  (deftest "function applied to itself — omega-like (non-diverging)"
+    ;; self-apply passes f to f; f ignores its argument and returns a value.
+    ;; Tests that call dispatch handles (f f) correctly.
+    (assert-equal "done"
+      (cek-eval
+        "(do
+           (define self-apply (fn (f) (f f)))
+           (define const-done (fn (anything) \"done\"))
+           (self-apply const-done))")))
+
+  (deftest "Y-combinator-like: recursive factorial without define"
+    ;; The Z combinator (strict Y) enables self-reference via argument.
+    ;; Tests that CEK handles the double-application (f f) correctly.
+    (assert-equal 120
+      (cek-eval
+        "(do
+           (define Z
+             (fn (f)
+               ((fn (x) (f (fn (v) ((x x) v))))
+                (fn (x) (f (fn (v) ((x x) v)))))))
+           (define fact
+             (Z (fn (self)
+                  (fn (n)
+                    (if (<= n 1) 1 (* n (self (- n 1))))))))
+           (fact 5))")))
+
+  (deftest "recursive tree traversal via nested lists"
+    ;; A tree is a (value left right) triple or nil leaf.
+    ;; Sum all leaf values: (3 (1 nil nil) (2 nil nil)) → 6.
+    (assert-equal 6
+      (cek-eval
+        "(do
+           (define tree-sum
+             (fn (node)
+               (if (nil? node)
+                 0
+                 (let ((val   (nth node 0))
+                       (left  (nth node 1))
+                       (right (nth node 2)))
+                   (+ val (tree-sum left) (tree-sum right))))))
+           (let ((tree
+                   (list 3
+                     (list 1 nil nil)
+                     (list 2 nil nil))))
+             (tree-sum tree)))")))
+
+  (deftest "mutual recursion through 3 functions"
+    ;; f → g → h → f cycle, counting down to 0.
+    ;; Tests that CEK handles cross-name call dispatch across 3 branches.
+    (assert-equal "zero"
+      (cek-eval
+        "(do
+           (define f (fn (n) (if (<= n 0) \"zero\" (g (- n 1)))))
+           (define g (fn (n) (if (<= n 0) \"zero\" (h (- n 1)))))
+           (define h (fn (n) (if (<= n 0) \"zero\" (f (- n 1)))))
+           (f 9))")))
+
+  (deftest "higher-order composition pipeline"
+    ;; A list of single-arg functions applied in sequence via reduce.
+    ;; Tests map + reduce + closure interaction in a single CEK run.
+    (assert-equal 30
+      (cek-eval
+        "(do
+           (define pipeline
+             (fn (fns init)
+               (reduce (fn (acc f) (f acc)) init fns)))
+           (let ((steps (list
+                          (fn (x) (* x 2))
+                          (fn (x) (+ x 5))
+                          (fn (x) (* x 2)))))
+             (pipeline steps 5)))")))
+
+  (deftest "variable-arity: function ignoring nil-padded extra args"
+    ;; Caller provides more args than the param list; excess are ignored.
+    ;; The CEK call frame must bind declared params and discard extras.
+    (assert-equal 3
+      (cek-eval
+        "(do
+           (define first-two (fn (a b) (+ a b)))
+           (first-two 1 2))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 3. Macro interaction
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-macro-interaction"
+  (deftest "macro that generates an if expression"
+    ;; my-unless wraps its condition in (not ...) and emits an if.
+    ;; CEK must expand the macro then step through the resulting if form.
+    (assert-equal "ran"
+      (cek-eval
+        "(do
+           (defmacro my-unless (cond-expr then-expr)
+             \`(if (not ,cond-expr) ,then-expr nil))
+           (my-unless false \"ran\"))")))
+
+  (deftest "macro that generates a cond expression"
+    ;; pick-label expands to a cond clause tree.
+    (assert-equal "medium"
+      (cek-eval
+        "(do
+           (defmacro classify-num (n)
+             \`(cond (< ,n 0)  \"negative\"
+                    (< ,n 10) \"small\"
+                    (< ,n 100) \"medium\"
+                    :else      \"large\"))
+           (classify-num 42))")))
+
+  (deftest "macro that generates let bindings"
+    ;; bind-pair expands to a two-binding let wrapping its body.
+    (assert-equal 7
+      (cek-eval
+        "(do
+           (defmacro bind-pair (a av b bv body)
+             \`(let ((,a ,av) (,b ,bv)) ,body))
+           (bind-pair x 3 y 4 (+ x y)))")))
+
+  (deftest "macro inside macro expansion (chained expansion)"
+    ;; outer-mac expands to a call of inner-mac, which is also a macro.
+    ;; CEK must re-enter step-eval after each expansion.
+    (assert-equal 20
+      (cek-eval
+        "(do
+           (defmacro double-it (x) \`(* ,x 2))
+           (defmacro quadruple-it (x) \`(double-it (double-it ,x)))
+           (quadruple-it 5))")))
+
+  (deftest "macro with quasiquote and splice in complex position"
+    ;; wrap-args splices its rest args into a list call.
+    (assert-equal (list 1 2 3 4)
+      (cek-eval
+        "(do
+           (defmacro wrap-args (&rest items)
+             \`(list ,@items))
+           (wrap-args 1 2 3 4))")))
+
+  (deftest "macro generating a define"
+    ;; defconst expands to a define, introducing a binding into env.
+    (assert-equal 99
+      (cek-eval
+        "(do
+           (defmacro defconst (name val)
+             \`(define ,name ,val))
+           (defconst answer 99)
+           answer)")))
+
+  (deftest "macro used inside lambda body"
+    ;; The macro is expanded each time the lambda is called.
+    (assert-equal (list 2 4 6)
+      (cek-eval
+        "(do
+           (defmacro double-it (x) \`(* 2 ,x))
+           (let ((double-fn (fn (n) (double-it n))))
+             (map double-fn (list 1 2 3))))")))
+
+  (deftest "nested macro call — macro output feeds another macro"
+    ;; negate-add: (negate-add a b) → (- (+ a b))
+    ;; Expands in two macro steps; CEK must loop through both.
+    (assert-equal -7
+      (cek-eval
+        "(do
+           (defmacro my-add (a b) \`(+ ,a ,b))
+           (defmacro negate-add (a b) \`(- (my-add ,a ,b)))
+           (negate-add 3 4))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 4. Environment stress
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-environment-stress"
+  (deftest "10 bindings in a single let — all accessible"
+    ;; One large let frame; CEK env-extend must handle all 10 at once.
+    (assert-equal 55
+      (cek-eval
+        "(let ((a 1) (b 2) (c 3) (d 4) (e 5)
+               (f 6) (g 7) (h 8) (i 9) (j 10))
+           (+ a b c d e f g h i j))")))
+
+  (deftest "10 bindings — correct value for each binding"
+    ;; Spot-check that the env frame stores each binding at the right slot.
+    (assert-equal "ok"
+      (cek-eval
+        "(let ((v1 \"a\") (v2 \"b\") (v3 \"c\") (v4 \"d\") (v5 \"e\")
+               (v6 \"f\") (v7 \"g\") (v8 \"h\") (v9 \"i\") (v10 \"j\"))
+           (if (and (= v1 \"a\") (= v5 \"e\") (= v10 \"j\"))
+             \"ok\"
+             \"fail\"))")))
+
+  (deftest "shadowing chain — x shadows x shadows x (3 levels)"
+    ;; After 3 let layers, x == 3; unwinding restores x at each level.
+    ;; Inner let must not mutate the outer env frames.
+    (assert-equal (list 3 2 1)
+      (cek-eval
+        "(let ((results (list)))
+           (let ((x 1))
+             (let ((x 2))
+               (let ((x 3))
+                 (append! results x))  ;; records 3
+               (append! results x))    ;; records 2 after inner unwinds
+             (append! results x))      ;; records 1 after middle unwinds
+           results)")))
+
+  (deftest "closure capturing 5 variables from enclosing let"
+    ;; All 5 captured vars remain accessible after the let exits.
+    (assert-equal 150
+      (cek-eval
+        "(do
+           (define make-closure
+             (fn ()
+               (let ((a 10) (b 20) (c 30) (d 40) (e 50))
+                 (fn () (+ a b c d e)))))
+           (let ((f (make-closure)))
+             (f)))")))
+
+  (deftest "set! visible through 3 closure levels"
+    ;; Top-level define → lambda → lambda → lambda modifies top binding.
+    ;; CEK set! must walk the env chain and find the outermost slot.
+    (assert-equal 999
+      (cek-eval
+        "(do
+           (define shared 0)
+           (define make-level1
+             (fn ()
+               (fn ()
+                 (fn ()
+                   (set! shared 999)))))
+           (let ((level2 (make-level1)))
+             (let ((level3 (level2)))
+               (level3)))
+           shared)")))
+
+  (deftest "define inside let inside define — scope chain"
+    ;; outer define → let body → inner define. The inner define mutates
+    ;; the env that the let body executes in; later exprs must see it.
+    (assert-equal 42
+      (cek-eval
+        "(do
+           (define outer-fn
+             (fn (base)
+               (let ((step 1))
+                 (define result (* base step))
+                 (set! result (+ result 1))
+                 result)))
+           (outer-fn 41))")))
+
+  (deftest "env not polluted across sibling lambda calls"
+    ;; Two separate calls to the same lambda must not share param state.
+    (assert-equal (list 10 20)
+      (cek-eval
+        "(do
+           (define f (fn (x) (* x 2)))
+           (list (f 5) (f 10)))")))
+
+  (deftest "large closure env — 8 closed-over variables"
+    ;; A lambda closing over 8 variables; all used in the body.
+    (assert-equal 36
+      (cek-eval
+        "(let ((a 1) (b 2) (c 3) (d 4) (e 5) (f 6) (g 7) (h 8))
+           (let ((sum-all (fn () (+ a b c d e f g h))))
+             (sum-all)))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 5. Edge cases
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-edge-cases"
+  (deftest "empty begin/do returns nil"
+    ;; The step-sf-begin handler with an empty arg list must yield nil.
+    (assert-nil (cek-eval "(do)")))
+
+  (deftest "single-expression begin/do returns value"
+    ;; A do with exactly one expression is equivalent to that expression.
+    (assert-equal 42 (cek-eval "(do 42)")))
+
+  (deftest "begin/do with side-effecting expressions returns last"
+    ;; All intermediate expressions run; only the last value is kept.
+    (assert-equal "last"
+      (cek-eval "(do \"first\" \"middle\" \"last\")")))
+
+  (deftest "if with only true branch — false path returns nil"
+    ;; No else clause: the make-if-frame must default else to nil.
+    (assert-nil (cek-eval "(if false 42)")))
+
+  (deftest "if with only true branch — true path returns value"
+    (assert-equal 7 (cek-eval "(if true 7)")))
+
+  (deftest "and with all truthy values returns last"
+    ;; SX and: short-circuit stops at first falsy; last truthy is returned.
+    (assert-equal "c"
+      (cek-eval "(and \"a\" \"b\" \"c\")")))
+
+  (deftest "and with leading falsy short-circuits — returns false"
+    (assert-false (cek-eval "(and 1 false 3)")))
+
+  (deftest "and with no args returns true"
+    (assert-true (cek-eval "(and)")))
+
+  (deftest "or with all falsy returns last falsy"
+    ;; SX or: if all falsy, the last falsy value is returned.
+    (assert-false (cek-eval "(or false false false)")))
+
+  (deftest "or returns first truthy value"
+    (assert-equal 1 (cek-eval "(or false nil 1 2 3)")))
+
+  (deftest "or with no args returns false"
+    (assert-false (cek-eval "(or)")))
+
+  (deftest "keyword evaluated as string in call position"
+    ;; A keyword in non-call position evaluates to its string name.
+    (assert-equal "color"
+      (cek-eval "(let ((k :color)) k)")))
+
+  (deftest "keyword as dict key in evaluation context"
+    ;; Dict literal with keyword key; the keyword must be converted to
+    ;; string so (get d \"color\") succeeds.
+    (assert-equal "red"
+      (cek-eval
+        "(let ((d {:color \"red\"}))
+           (get d \"color\"))")))
+
+  (deftest "quote preserves list structure — no evaluation inside"
+    ;; (quote (+ 1 2)) must return the list (+ 1 2), not 3.
+    (assert-equal 3
+      (cek-eval "(len (quote (+ 1 2)))")))
+
+  (deftest "quote preserves nested structure"
+    ;; Deeply nested quoted form is returned verbatim as a list tree.
+    (assert-equal 2
+      (cek-eval "(len (quote (a (b c))))")))
+
+  (deftest "quasiquote with nested unquote"
+    ;; `(a ,(+ 1 2) c) → the list (a 3 c).
+    (assert-equal 3
+      (cek-eval
+        "(let ((x (+ 1 2)))
+           (nth \`(a ,x c) 1))")))
+
+  (deftest "quasiquote with splice — list flattened into result"
+    ;; `(1 ,@(list 2 3) 4) → (1 2 3 4).
+    (assert-equal (list 1 2 3 4)
+      (cek-eval
+        "(let ((mid (list 2 3)))
+           \`(1 ,@mid 4))")))
+
+  (deftest "quasiquote with nested unquote-splice at multiple positions"
+    ;; Mixed literal and spliced elements across the template.
+    (assert-equal (list 0 1 2 3 10 11 12 99)
+      (cek-eval
+        "(let ((xs (list 1 2 3))
+               (ys (list 10 11 12)))
+           \`(0 ,@xs ,@ys 99))")))
+
+  (deftest "cond with no matching clause returns nil"
+    ;; No branch taken, no :else → nil.
+    (assert-nil
+      (cek-eval "(cond false \"a\" false \"b\")")))
+
+  (deftest "nested cond: outer selects branch, inner dispatches value"
+    ;; Two cond forms nested; CEK must handle the double-dispatch.
+    (assert-equal "cold"
+      (cek-eval
+        "(let ((season \"winter\") (temp -5))
+           (cond
+             (= season \"winter\")
+               (cond (< temp 0) \"cold\"
+                     :else      \"cool\")
+             (= season \"summer\") \"hot\"
+             :else \"mild\"))")))
+
+  (deftest "lambda with no params — nullary function"
+    ;; () → 42 via CEK call dispatch with empty arg list.
+    (assert-equal 42
+      (cek-eval "((fn () 42))")))
+
+  (deftest "immediately invoked lambda with multiple body forms"
+    ;; IIFE with a do-style body; last expression is the value.
+    (assert-equal 6
+      (cek-eval
+        "((fn ()
+            (define a 1)
+            (define b 2)
+            (define c 3)
+            (+ a b c)))")))
+
+  (deftest "thread-first through 5 steps"
+    ;; (-> 1 (+ 1) (* 3) (+ 1) (* 2) (- 2))
+    ;; 1+1=2, *3=6, +1=7, *2=14, 14-2=12
+    ;; Tests that each -> step creates the correct frame and threads value.
+    (assert-equal 12
+      (cek-eval "(-> 1 (+ 1) (* 3) (+ 1) (* 2) (- 2))")))
+
+  (deftest "case falls through to :else"
+    (assert-equal "unknown"
+      (cek-eval "(case 99 1 \"one\" 2 \"two\" :else \"unknown\")")))
+
+  (deftest "case with no :else and no match returns nil"
+    (assert-nil (cek-eval "(case 99 1 \"one\" 2 \"two\")")))
+
+  (deftest "when with multiple body forms returns last"
+    (assert-equal "last"
+      (cek-eval "(when true \"first\" \"middle\" \"last\")")))
+
+  (deftest "when false body not evaluated — no side effects"
+    (assert-equal 0
+      (cek-eval
+        "(do
+           (define side-ct 0)
+           (when false (set! side-ct 1))
+           side-ct)")))
+
+  (deftest "define followed by symbol lookup returns bound value"
+    ;; define evaluates its RHS and returns the value.
+    ;; The subsequent symbol reference must find the binding in env.
+    (assert-equal 7
+      (cek-eval "(do (define q 7) q)")))
+
+  (deftest "set! in deeply nested scope updates the correct frame"
+    ;; set! inside a 4-level let must find the binding defined at level 1.
+    (assert-equal 100
+      (cek-eval
+        "(let ((target 0))
+           (let ((a 1))
+             (let ((b 2))
+               (let ((c 3))
+                 (set! target 100))))
+           target)")))
+
+  (deftest "list literal (non-call) evaluated element-wise"
+    ;; A list whose head is a number — treated as data list, not a call.
+    ;; All elements are evaluated; numbers pass through unchanged.
+    (assert-equal 3
+      (cek-eval "(len (list 10 20 30))")))
+
+  (deftest "recursive fibonacci — tests non-tail call frame stacking"
+    ;; fib(7) = 13. Non-tail recursion stacks O(n) CEK frames; tests
+    ;; that the continuation frame list handles deep frame accumulation.
+    (assert-equal 13
+      (cek-eval
+        "(do
+           (define fib
+             (fn (n)
+               (if (< n 2)
+                 n
+                 (+ (fib (- n 1)) (fib (- n 2))))))
+           (fib 7))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 8. Data-first higher-order forms
+;; --------------------------------------------------------------------------
+
+(defsuite "data-first-ho"
+  (deftest "map — data-first arg order"
+    (assert-equal (list 2 4 6)
+      (map (list 1 2 3) (fn (x) (* x 2)))))
+
+  (deftest "filter — data-first arg order"
+    (assert-equal (list 3 4 5)
+      (filter (list 1 2 3 4 5) (fn (x) (> x 2)))))
+
+  (deftest "reduce — data-first arg order"
+    (assert-equal 10
+      (reduce (list 1 2 3 4) + 0)))
+
+  (deftest "some — data-first arg order"
+    (assert-true
+      (some (list 1 2 3) (fn (x) (> x 2))))
+    (assert-false
+      (some (list 1 2 3) (fn (x) (> x 5)))))
+
+  (deftest "every? — data-first arg order"
+    (assert-true
+      (every? (list 2 4 6) (fn (x) (> x 1))))
+    (assert-false
+      (every? (list 2 4 6) (fn (x) (> x 3)))))
+
+  (deftest "for-each — data-first arg order"
+    (let ((acc (list)))
+      (for-each (list 10 20 30)
+        (fn (x) (set! acc (append acc (list x)))))
+      (assert-equal (list 10 20 30) acc)))
+
+  (deftest "map-indexed — data-first arg order"
+    (assert-equal (list "0:a" "1:b" "2:c")
+      (map-indexed (list "a" "b" "c")
+        (fn (i v) (str i ":" v)))))
+
+  (deftest "fn-first still works — map"
+    (assert-equal (list 2 4 6)
+      (map (fn (x) (* x 2)) (list 1 2 3))))
+
+  (deftest "fn-first still works — reduce"
+    (assert-equal 10
+      (reduce + 0 (list 1 2 3 4)))))
+
+
+;; --------------------------------------------------------------------------
+;; 9. Threading with HO forms
+;; --------------------------------------------------------------------------
+
+(defsuite "thread-ho"
+  (deftest "-> map"
+    (assert-equal (list 2 4 6)
+      (-> (list 1 2 3) (map (fn (x) (* x 2))))))
+
+  (deftest "-> filter"
+    (assert-equal (list 3 4 5)
+      (-> (list 1 2 3 4 5) (filter (fn (x) (> x 2))))))
+
+  (deftest "-> filter then map pipeline"
+    (assert-equal (list 30 40 50)
+      (-> (list 1 2 3 4 5)
+          (filter (fn (x) (> x 2)))
+          (map (fn (x) (* x 10))))))
+
+  (deftest "-> reduce"
+    (assert-equal 15
+      (-> (list 1 2 3 4 5) (reduce + 0))))
+
+  (deftest "-> map then reduce"
+    (assert-equal 12
+      (-> (list 1 2 3)
+          (map (fn (x) (* x 2)))
+          (reduce + 0))))
+
+  (deftest "-> some"
+    (assert-true
+      (-> (list 1 2 3) (some (fn (x) (> x 2)))))
+    (assert-false
+      (-> (list 1 2 3) (some (fn (x) (> x 5))))))
+
+  (deftest "-> every?"
+    (assert-true
+      (-> (list 2 4 6) (every? (fn (x) (> x 1))))))
+
+  (deftest "-> full pipeline: map filter reduce"
+    ;; Double each, keep > 4, sum
+    (assert-equal 24
+      (-> (list 1 2 3 4 5)
+          (map (fn (x) (* x 2)))
+          (filter (fn (x) (> x 4)))
+          (reduce + 0)))))

spec/tests/test-cek.sx

@@ -0,0 +1,241 @@
+;; ==========================================================================
+;; test-cek.sx — Tests for the explicit CEK machine evaluator
+;;
+;; Tests that eval-expr-cek produces identical results to eval-expr.
+;; Requires: test-framework.sx, frames.sx, cek.sx loaded.
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; 1. Literals
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-literals"
+  (deftest "number"
+    (assert-equal 42 (eval-expr-cek 42 (test-env))))
+
+  (deftest "string"
+    (assert-equal "hello" (eval-expr-cek "hello" (test-env))))
+
+  (deftest "boolean true"
+    (assert-equal true (eval-expr-cek true (test-env))))
+
+  (deftest "boolean false"
+    (assert-equal false (eval-expr-cek false (test-env))))
+
+  (deftest "nil"
+    (assert-nil (eval-expr-cek nil (test-env)))))
+
+
+;; --------------------------------------------------------------------------
+;; 2. Symbol lookup
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-symbols"
+  (deftest "env lookup"
+    (assert-equal 42
+      (cek-eval "(do (define x 42) x)")))
+
+  (deftest "primitive call resolves"
+    (assert-equal "hello"
+      (cek-eval "(str \"hello\")"))))
+
+
+;; --------------------------------------------------------------------------
+;; 3. Special forms
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-if"
+  (deftest "if true branch"
+    (assert-equal 1
+      (cek-eval "(if true 1 2)")))
+
+  (deftest "if false branch"
+    (assert-equal 2
+      (cek-eval "(if false 1 2)")))
+
+  (deftest "if no else"
+    (assert-nil (cek-eval "(if false 1)"))))
+
+
+(defsuite "cek-when"
+  (deftest "when true"
+    (assert-equal 42
+      (cek-eval "(when true 42)")))
+
+  (deftest "when false"
+    (assert-nil (cek-eval "(when false 42)")))
+
+  (deftest "when multiple body"
+    (assert-equal 3
+      (cek-eval "(when true 1 2 3)"))))
+
+
+(defsuite "cek-begin"
+  (deftest "do returns last"
+    (assert-equal 3
+      (cek-eval "(do 1 2 3)")))
+
+  (deftest "empty do"
+    (assert-nil (cek-eval "(do)"))))
+
+
+(defsuite "cek-let"
+  (deftest "basic let"
+    (assert-equal 3
+      (cek-eval "(let ((x 1) (y 2)) (+ x y))")))
+
+  (deftest "let body sequence"
+    (assert-equal 10
+      (cek-eval "(let ((x 5)) 1 2 (+ x 5))")))
+
+  (deftest "nested let"
+    (assert-equal 5
+      (cek-eval "(let ((x 1)) (let ((y 2)) (+ x y (* x y))))"))))
+
+
+(defsuite "cek-and-or"
+  (deftest "and all true"
+    (assert-equal 3
+      (cek-eval "(and 1 2 3)")))
+
+  (deftest "and short circuit"
+    (assert-false (cek-eval "(and 1 false 3)")))
+
+  (deftest "or first true"
+    (assert-equal 1
+      (cek-eval "(or 1 2 3)")))
+
+  (deftest "or all false"
+    (assert-false (cek-eval "(or false false false)"))))
+
+
+(defsuite "cek-cond"
+  (deftest "cond first match"
+    (assert-equal "a"
+      (cek-eval "(cond true \"a\" true \"b\")")))
+
+  (deftest "cond second match"
+    (assert-equal "b"
+      (cek-eval "(cond false \"a\" true \"b\")")))
+
+  (deftest "cond else"
+    (assert-equal "c"
+      (cek-eval "(cond false \"a\" :else \"c\")"))))
+
+
+(defsuite "cek-case"
+  (deftest "case match"
+    (assert-equal "yes"
+      (cek-eval "(case 1 1 \"yes\" 2 \"no\")")))
+
+  (deftest "case no match"
+    (assert-nil
+      (cek-eval "(case 3 1 \"yes\" 2 \"no\")")))
+
+  (deftest "case else"
+    (assert-equal "default"
+      (cek-eval "(case 3 1 \"yes\" :else \"default\")"))))
+
+
+;; --------------------------------------------------------------------------
+;; 4. Function calls
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-calls"
+  (deftest "primitive call"
+    (assert-equal 3
+      (cek-eval "(+ 1 2)")))
+
+  (deftest "nested calls"
+    (assert-equal 6
+      (cek-eval "(+ 1 (+ 2 3))")))
+
+  (deftest "lambda call"
+    (assert-equal 10
+      (cek-eval "((fn (x) (* x 2)) 5)")))
+
+  (deftest "defined function"
+    (assert-equal 25
+      (cek-eval "(do (define square (fn (x) (* x x))) (square 5))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 5. Define and set!
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-define"
+  (deftest "define binds"
+    (assert-equal 42
+      (cek-eval "(do (define x 42) x)")))
+
+  (deftest "set! mutates"
+    (assert-equal 10
+      (cek-eval "(do (define x 1) (set! x 10) x)"))))
+
+
+;; --------------------------------------------------------------------------
+;; 6. Quote and quasiquote
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-quote"
+  (deftest "quote"
+    (let ((result (cek-eval "(quote (1 2 3))")))
+      (assert-equal 3 (len result))))
+
+  (deftest "quasiquote with unquote"
+    (assert-equal (list 1 42 3)
+      (cek-eval "(let ((x 42)) `(1 ,x 3))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 7. Thread-first
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-thread-first"
+  (deftest "simple thread"
+    (assert-equal 3
+      (cek-eval "(-> 1 (+ 2))")))
+
+  (deftest "multi-step thread"
+    (assert-equal 6
+      (cek-eval "(-> 1 (+ 2) (* 2))"))))
+
+
+;; --------------------------------------------------------------------------
+;; 8. CEK-specific: stepping
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-stepping"
+  (deftest "single step literal"
+    (let ((state (make-cek-state 42 (test-env) (list))))
+      (let ((stepped (cek-step state)))
+        (assert-equal "continue" (cek-phase stepped))
+        (assert-equal 42 (cek-value stepped))
+        (assert-true (cek-terminal? stepped)))))
+
+  (deftest "single step if pushes frame"
+    (let ((state (make-cek-state (sx-parse-one "(if true 1 2)") (test-env) (list))))
+      (let ((stepped (cek-step state)))
+        (assert-equal "eval" (cek-phase stepped))
+        ;; Should have pushed an IfFrame
+        (assert-true (> (len (cek-kont stepped)) 0))
+        (assert-equal "if" (frame-type (first (cek-kont stepped))))))))
+
+
+;; --------------------------------------------------------------------------
+;; 9. Native continuations (shift/reset in CEK)
+;; --------------------------------------------------------------------------
+
+(defsuite "cek-continuations"
+  (deftest "reset passthrough"
+    (assert-equal 42
+      (cek-eval "(reset 42)")))
+
+  (deftest "shift abort"
+    (assert-equal 42
+      (cek-eval "(reset (+ 1 (shift k 42)))")))
+
+  (deftest "shift with invoke"
+    (assert-equal 11
+      (cek-eval "(reset (+ 1 (shift k (k 10))))"))))

spec/tests/test-closures.sx

@@ -0,0 +1,212 @@
+;; ==========================================================================
+;; test-closures.sx — Comprehensive tests for closures and lexical scoping
+;;
+;; Requires: test-framework.sx loaded first.
+;; Modules tested: eval.sx (lambda, let, define, set!)
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; Closure basics
+;; --------------------------------------------------------------------------
+
+(defsuite "closure-basics"
+  (deftest "lambda captures variable from enclosing scope"
+    (let ((x 10))
+      (let ((f (fn () x)))
+        (assert-equal 10 (f)))))
+
+  (deftest "lambda captures multiple variables"
+    (let ((a 3) (b 4))
+      (let ((hyp (fn () (+ (* a a) (* b b)))))
+        (assert-equal 25 (hyp)))))
+
+  (deftest "returned lambda retains captured values"
+    (define make-greeter
+      (fn (greeting)
+        (fn (name) (str greeting ", " name "!"))))
+    (let ((hello (make-greeter "Hello")))
+      (assert-equal "Hello, Alice!" (hello "Alice"))
+      (assert-equal "Hello, Bob!" (hello "Bob"))))
+
+  (deftest "factory function returns independent closures"
+    (define make-adder
+      (fn (n) (fn (x) (+ n x))))
+    (let ((add5 (make-adder 5))
+          (add10 (make-adder 10)))
+      (assert-equal 8 (add5 3))
+      (assert-equal 13 (add10 3))
+      (assert-equal 15 (add5 10))))
+
+  (deftest "counter via closure"
+    (define make-counter
+      (fn ()
+        (let ((count 0))
+          (fn ()
+            (set! count (+ count 1))
+            count))))
+    (let ((counter (make-counter)))
+      (assert-equal 1 (counter))
+      (assert-equal 2 (counter))
+      (assert-equal 3 (counter))))
+
+  (deftest "closure captures value at time of creation"
+    ;; Create closure when x=1, then rebind x to 99.
+    ;; The closure should still see 1, not 99.
+    (let ((x 1))
+      (let ((f (fn () x)))
+        (let ((x 99))
+          (assert-equal 1 (f)))))))
+
+
+;; --------------------------------------------------------------------------
+;; Lexical scope
+;; --------------------------------------------------------------------------
+
+(defsuite "lexical-scope"
+  (deftest "inner binding shadows outer"
+    (let ((x 1))
+      (let ((x 2))
+        (assert-equal 2 x))))
+
+  (deftest "shadow does not affect outer scope"
+    (let ((x 1))
+      (let ((x 2))
+        (assert-equal 2 x))
+      (assert-equal 1 x)))
+
+  (deftest "nested let scoping"
+    (let ((x 1) (y 10))
+      (let ((x 2) (z 100))
+        (assert-equal 2 x)
+        (assert-equal 10 y)
+        (assert-equal 100 z))
+      (assert-equal 1 x)))
+
+  (deftest "lambda body sees its own let bindings"
+    (let ((f (fn (x)
+               (let ((y (* x 2)))
+                 (+ x y)))))
+      (assert-equal 9 (f 3))
+      (assert-equal 15 (f 5))))
+
+  (deftest "deeply nested scope chain"
+    (let ((a 1))
+      (let ((b 2))
+        (let ((c 3))
+          (let ((d 4))
+            (assert-equal 10 (+ a b c d)))))))
+
+  (deftest "lambda param shadows enclosing binding"
+    (let ((x 99))
+      (let ((f (fn (x) (* x 2))))
+        (assert-equal 10 (f 5))
+        ;; outer x still visible after call
+        (assert-equal 99 x))))
+
+  (deftest "sibling let bindings are independent"
+    ;; Bindings in the same let do not see each other.
+    (let ((a 1) (b 2))
+      (assert-equal 1 a)
+      (assert-equal 2 b))))
+
+
+;; --------------------------------------------------------------------------
+;; Closure mutation
+;; --------------------------------------------------------------------------
+
+(defsuite "closure-mutation"
+  (deftest "set! inside closure affects closed-over variable"
+    (let ((x 0))
+      (let ((inc-x (fn () (set! x (+ x 1)))))
+        (inc-x)
+        (inc-x)
+        (assert-equal 2 x))))
+
+  (deftest "multiple closures sharing same mutable variable"
+    (let ((count 0))
+      (let ((inc! (fn () (set! count (+ count 1))))
+            (dec! (fn () (set! count (- count 1))))
+            (get  (fn () count)))
+        (inc!)
+        (inc!)
+        (inc!)
+        (dec!)
+        (assert-equal 2 (get)))))
+
+  (deftest "set! in let binding visible to later expressions"
+    (let ((x 1))
+      (set! x 42)
+      (assert-equal 42 x)))
+
+  (deftest "set! visible across multiple later expressions"
+    (let ((result 0))
+      (set! result 5)
+      (set! result (* result 2))
+      (assert-equal 10 result)))
+
+  (deftest "map creates closures each seeing its own iteration value"
+    ;; Each fn passed to map closes over x for that invocation.
+    ;; The resulting list of thunks should each return the value they
+    ;; were called with at map time.
+    (let ((thunks (map (fn (x) (fn () x)) (list 1 2 3 4 5))))
+      (assert-equal 1 ((nth thunks 0)))
+      (assert-equal 2 ((nth thunks 1)))
+      (assert-equal 3 ((nth thunks 2)))
+      (assert-equal 4 ((nth thunks 3)))
+      (assert-equal 5 ((nth thunks 4))))))
+
+
+;; --------------------------------------------------------------------------
+;; Higher-order closures
+;; --------------------------------------------------------------------------
+
+(defsuite "higher-order-closures"
+  (deftest "compose two functions"
+    (define compose
+      (fn (f g) (fn (x) (f (g x)))))
+    (let ((double (fn (x) (* x 2)))
+          (inc    (fn (x) (+ x 1))))
+      (let ((double-then-inc (compose inc double))
+            (inc-then-double (compose double inc)))
+        (assert-equal 7  (double-then-inc 3))
+        (assert-equal 8  (inc-then-double 3)))))
+
+  (deftest "partial application via closure"
+    ;; Manual partial — captures first arg, returns fn taking second
+    (define partial2
+      (fn (f a)
+        (fn (b) (f a b))))
+    (let ((add (fn (a b) (+ a b)))
+          (mul (fn (a b) (* a b))))
+      (let ((add10 (partial2 add 10))
+            (triple (partial2 mul 3)))
+        (assert-equal 15 (add10 5))
+        (assert-equal 21 (triple 7)))))
+
+  (deftest "map with closure that captures outer variable"
+    (let ((offset 100))
+      (let ((result (map (fn (x) (+ x offset)) (list 1 2 3))))
+        (assert-equal (list 101 102 103) result))))
+
+  (deftest "reduce with closure"
+    (let ((multiplier 3))
+      (let ((result (reduce (fn (acc x) (+ acc (* x multiplier))) 0 (list 1 2 3 4))))
+        ;; (1*3 + 2*3 + 3*3 + 4*3) = 30
+        (assert-equal 30 result))))
+
+  (deftest "filter with closure over threshold"
+    (let ((threshold 5))
+      (let ((big (filter (fn (x) (> x threshold)) (list 3 5 7 9 1 6))))
+        (assert-equal (list 7 9 6) big))))
+
+  (deftest "closure returned from higher-order function composes correctly"
+    (define make-multiplier
+      (fn (factor) (fn (x) (* x factor))))
+    (define pipeline
+      (fn (fns x)
+        (reduce (fn (acc f) (f acc)) x fns)))
+    (let ((double (make-multiplier 2))
+          (triple (make-multiplier 3)))
+      ;; 5 -> *2 -> 10 -> *3 -> 30
+      (assert-equal 30 (pipeline (list double triple) 5)))))

spec/tests/test-collections.sx

@@ -0,0 +1,435 @@
+;; ==========================================================================
+;; test-collections.sx — Edge cases and complex patterns for collection ops
+;;
+;; Requires: test-framework.sx loaded first.
+;; Modules tested: core.collections, core.dict, higher-order forms,
+;;                 core.strings (string/collection bridge).
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; List operations — advanced edge cases
+;; --------------------------------------------------------------------------
+
+(defsuite "list-operations-advanced"
+  (deftest "first of nested list returns inner list"
+    (let ((nested (list (list 1 2) (list 3 4))))
+      (assert-equal (list 1 2) (first nested))))
+
+  (deftest "nested list is a list type"
+    (let ((nested (list (list 1 2) (list 3 4))))
+      (assert-type "list" (first nested))))
+
+  (deftest "nth on nested list returns inner list"
+    (let ((nested (list (list 1 2) (list 3 4))))
+      (assert-equal (list 3 4) (nth nested 1))))
+
+  (deftest "nth out of bounds returns nil"
+    (assert-nil (nth (list 1 2 3) 10)))
+
+  (deftest "nth negative index returns nil"
+    ;; Negative indices are out-of-bounds — no wrap-around
+    (let ((result (nth (list 1 2 3) -1)))
+      (assert-true (or (nil? result) (number? result)))))
+
+  (deftest "cons onto nil — platform-defined"
+    ;; JS: cons 1 nil → [1, nil] (length 2)
+    ;; Python: cons 1 nil → [1] (nil treated as empty list)
+    ;; Both: first element is 1
+    (assert-equal 1 (first (cons 1 nil))))
+
+  (deftest "cons onto empty list produces single-element list"
+    (assert-equal (list 1) (cons 1 (list)))
+    (assert-equal 1 (len (cons 1 (list)))))
+
+  (deftest "append with nil on right"
+    ;; append(list, nil) — nil treated as empty or appended as element
+    ;; The result is at least a list and starts with the original elements
+    (let ((result (append (list 1 2) nil)))
+      (assert-true (list? result))
+      (assert-true (>= (len result) 2))
+      (assert-equal 1 (first result))))
+
+  (deftest "append two lists concatenates"
+    (assert-equal (list 1 2 3 4)
+                  (append (list 1 2) (list 3 4))))
+
+  (deftest "concat three lists"
+    (assert-equal (list 1 2 3) (concat (list 1) (list 2) (list 3))))
+
+  (deftest "concat preserves order"
+    (assert-equal (list "a" "b" "c" "d")
+                  (concat (list "a" "b") (list "c" "d"))))
+
+  (deftest "flatten one level of deeply nested"
+    ;; flatten is one-level: ((( 1) 2) 3) → ((1) 2 3)
+    (let ((deep (list (list (list 1) 2) 3))
+          (result (flatten (list (list (list 1) 2) 3))))
+      (assert-type "list" result)
+      ;; 3 should now be a top-level element
+      (assert-true (contains? result 3))))
+
+  (deftest "flatten deeply nested — two passes"
+    ;; Two flatten calls flatten two levels
+    (let ((result (flatten (flatten (list (list (list 1 2) 3) 4)))))
+      (assert-equal (list 1 2 3 4) result)))
+
+  (deftest "flatten already-flat list is identity"
+    (assert-equal (list 1 2 3) (flatten (list (list 1 2 3)))))
+
+  (deftest "reverse single element"
+    (assert-equal (list 42) (reverse (list 42))))
+
+  (deftest "reverse preserves elements"
+    (let ((original (list 1 2 3 4 5)))
+      (let ((rev (reverse original)))
+        (assert-equal 5 (len rev))
+        (assert-equal 1 (last rev))
+        (assert-equal 5 (first rev)))))
+
+  (deftest "slice with start > end returns empty"
+    ;; Slice where start exceeds end — implementation may clamp or return empty
+    (let ((result (slice (list 1 2 3) 3 1)))
+      (assert-true (or (nil? result)
+                       (and (list? result) (empty? result))))))
+
+  (deftest "slice with start at length returns empty"
+    (let ((result (slice (list 1 2 3) 3)))
+      (assert-true (or (nil? result)
+                       (and (list? result) (empty? result))))))
+
+  (deftest "range with step larger than range"
+    ;; (range 0 3 10) — step exceeds range, should yield just (0)
+    (let ((result (range 0 3 10)))
+      (assert-equal (list 0) result)))
+
+  (deftest "range step=1 is same as no step"
+    (assert-equal (range 0 5) (range 0 5 1)))
+
+  (deftest "map preserves order"
+    (let ((result (map (fn (x) (* x 10)) (list 1 2 3 4 5))))
+      (assert-equal 10 (nth result 0))
+      (assert-equal 20 (nth result 1))
+      (assert-equal 30 (nth result 2))
+      (assert-equal 40 (nth result 3))
+      (assert-equal 50 (nth result 4))))
+
+  (deftest "filter preserves relative order"
+    (let ((result (filter (fn (x) (> x 2)) (list 5 1 4 2 3))))
+      (assert-equal 5 (nth result 0))
+      (assert-equal 4 (nth result 1))
+      (assert-equal 3 (nth result 2))))
+
+  (deftest "reduce string concat left-to-right order"
+    ;; (reduce f "" (list "a" "b" "c")) must be "abc" not "cba"
+    (assert-equal "abc"
+      (reduce (fn (acc x) (str acc x)) "" (list "a" "b" "c"))))
+
+  (deftest "reduce subtraction is left-associative"
+    ;; ((10 - 3) - 2) = 5, not (10 - (3 - 2)) = 9
+    (assert-equal 5
+      (reduce (fn (acc x) (- acc x)) 10 (list 3 2))))
+
+  (deftest "map on empty list returns empty list"
+    (assert-equal (list) (map (fn (x) (* x 2)) (list))))
+
+  (deftest "filter on empty list returns empty list"
+    (assert-equal (list) (filter (fn (x) true) (list)))))
+
+
+;; --------------------------------------------------------------------------
+;; Dict operations — advanced edge cases
+;; --------------------------------------------------------------------------
+
+(defsuite "dict-operations-advanced"
+  (deftest "nested dict access via chained get"
+    (let ((outer (dict "a" (dict "b" 42))))
+      (assert-equal 42 (get (get outer "a") "b"))))
+
+  (deftest "nested dict access — inner missing key returns nil"
+    (let ((outer (dict "a" (dict "b" 42))))
+      (assert-nil (get (get outer "a") "z"))))
+
+  (deftest "assoc creates a new dict — original unchanged"
+    (let ((original (dict "x" 1))
+          (updated  (assoc (dict "x" 1) "y" 2)))
+      (assert-false (has-key? original "y"))
+      (assert-true  (has-key? updated  "y"))))
+
+  (deftest "assoc preserves existing keys"
+    (let ((d (dict "a" 1 "b" 2))
+          (d2 (assoc (dict "a" 1 "b" 2) "c" 3)))
+      (assert-equal 1 (get d2 "a"))
+      (assert-equal 2 (get d2 "b"))
+      (assert-equal 3 (get d2 "c"))))
+
+  (deftest "assoc overwrites existing key"
+    (let ((d (assoc (dict "a" 1) "a" 99)))
+      (assert-equal 99 (get d "a"))))
+
+  (deftest "dissoc creates a new dict — original unchanged"
+    (let ((original (dict "a" 1 "b" 2))
+          (reduced  (dissoc (dict "a" 1 "b" 2) "a")))
+      (assert-true  (has-key? original "a"))
+      (assert-false (has-key? reduced  "a"))))
+
+  (deftest "dissoc missing key leaves dict unchanged"
+    (let ((d (dict "a" 1 "b" 2))
+          (d2 (dissoc (dict "a" 1 "b" 2) "z")))
+      (assert-equal 2 (len d2))
+      (assert-true (has-key? d2 "a"))
+      (assert-true (has-key? d2 "b"))))
+
+  (deftest "merge two dicts combines keys"
+    (let ((d1 (dict "a" 1 "b" 2))
+          (d2 (dict "c" 3 "d" 4))
+          (merged (merge (dict "a" 1 "b" 2) (dict "c" 3 "d" 4))))
+      (assert-equal 1 (get merged "a"))
+      (assert-equal 2 (get merged "b"))
+      (assert-equal 3 (get merged "c"))
+      (assert-equal 4 (get merged "d"))))
+
+  (deftest "merge — overlapping keys: second dict wins"
+    (let ((merged (merge (dict "a" 1 "b" 2) (dict "b" 99 "c" 3))))
+      (assert-equal 1  (get merged "a"))
+      (assert-equal 99 (get merged "b"))
+      (assert-equal 3  (get merged "c"))))
+
+  (deftest "merge three dicts — rightmost wins on conflict"
+    (let ((merged (merge (dict "k" 1) (dict "k" 2) (dict "k" 3))))
+      (assert-equal 3 (get merged "k"))))
+
+  (deftest "keys returns all keys"
+    (let ((d (dict "x" 10 "y" 20 "z" 30)))
+      (let ((ks (keys d)))
+        (assert-equal 3 (len ks))
+        (assert-true (contains? ks "x"))
+        (assert-true (contains? ks "y"))
+        (assert-true (contains? ks "z")))))
+
+  (deftest "vals returns all values"
+    (let ((d (dict "a" 1 "b" 2 "c" 3)))
+      (let ((vs (vals d)))
+        (assert-equal 3 (len vs))
+        (assert-true (contains? vs 1))
+        (assert-true (contains? vs 2))
+        (assert-true (contains? vs 3)))))
+
+  (deftest "len of nested dict counts top-level keys only"
+    (let ((d (dict "a" (dict "x" 1 "y" 2) "b" 3)))
+      (assert-equal 2 (len d))))
+
+  (deftest "dict with numeric string keys"
+    (let ((d (dict "1" "one" "2" "two")))
+      (assert-equal "one" (get d "1"))
+      (assert-equal "two" (get d "2"))))
+
+  (deftest "dict with empty string key"
+    (let ((d (dict "" "empty-key-value")))
+      (assert-true (has-key? d ""))
+      (assert-equal "empty-key-value" (get d ""))))
+
+  (deftest "get with default on missing key"
+    (let ((d (dict "a" 1)))
+      (assert-equal 42 (get d "missing" 42))))
+
+  (deftest "get on empty dict with default"
+    (assert-equal "default" (get (dict) "any" "default"))))
+
+
+;; --------------------------------------------------------------------------
+;; List and dict interop
+;; --------------------------------------------------------------------------
+
+(defsuite "list-dict-interop"
+  (deftest "map over list of dicts extracts field"
+    (let ((items (list (dict "name" "Alice" "age" 30)
+                       (dict "name" "Bob"   "age" 25)
+                       (dict "name" "Carol" "age" 35))))
+      (assert-equal (list "Alice" "Bob" "Carol")
+                    (map (fn (d) (get d "name")) items))))
+
+  (deftest "filter list of dicts by field value"
+    (let ((items (list (dict "name" "Alice" "score" 80)
+                       (dict "name" "Bob"   "score" 55)
+                       (dict "name" "Carol" "score" 90)))
+          (passing (filter (fn (d) (>= (get d "score") 70))
+                           (list (dict "name" "Alice" "score" 80)
+                                 (dict "name" "Bob"   "score" 55)
+                                 (dict "name" "Carol" "score" 90)))))
+      (assert-equal 2 (len passing))
+      (assert-equal "Alice" (get (first passing) "name"))))
+
+  (deftest "dict with list values"
+    (let ((d (dict "tags" (list "a" "b" "c"))))
+      (assert-true (list? (get d "tags")))
+      (assert-equal 3 (len (get d "tags")))
+      (assert-equal "b" (nth (get d "tags") 1))))
+
+  (deftest "nested: dict containing list containing dict"
+    (let ((data (dict "items" (list (dict "id" 1) (dict "id" 2)))))
+      (let ((items (get data "items")))
+        (assert-equal 2 (len items))
+        (assert-equal 1 (get (first items) "id"))
+        (assert-equal 2 (get (nth items 1) "id")))))
+
+  (deftest "building a dict from a list via reduce"
+    (let ((pairs (list (list "a" 1) (list "b" 2) (list "c" 3)))
+          (result (reduce
+                    (fn (acc pair)
+                      (assoc acc (first pair) (nth pair 1)))
+                    (dict)
+                    (list (list "a" 1) (list "b" 2) (list "c" 3)))))
+      (assert-equal 1 (get result "a"))
+      (assert-equal 2 (get result "b"))
+      (assert-equal 3 (get result "c"))))
+
+  (deftest "keys then map to produce transformed dict"
+    (let ((d (dict "a" 1 "b" 2 "c" 3))
+          (ks (keys (dict "a" 1 "b" 2 "c" 3))))
+      (let ((doubled (reduce
+                       (fn (acc k) (assoc acc k (* (get d k) 2)))
+                       (dict)
+                       ks)))
+        (assert-equal 2 (get doubled "a"))
+        (assert-equal 4 (get doubled "b"))
+        (assert-equal 6 (get doubled "c")))))
+
+  (deftest "list of dicts — reduce to sum a field"
+    (let ((records (list (dict "val" 10) (dict "val" 20) (dict "val" 30))))
+      (assert-equal 60
+        (reduce (fn (acc d) (+ acc (get d "val"))) 0 records))))
+
+  (deftest "map-indexed with list of dicts attaches index"
+    (let ((items (list (dict "name" "x") (dict "name" "y")))
+          (result (map-indexed
+                    (fn (i d) (assoc d "index" i))
+                    (list (dict "name" "x") (dict "name" "y")))))
+      (assert-equal 0 (get (first result) "index"))
+      (assert-equal 1 (get (nth result 1) "index")))))
+
+
+;; --------------------------------------------------------------------------
+;; Collection equality
+;; --------------------------------------------------------------------------
+
+(defsuite "collection-equality"
+  (deftest "two identical lists are equal"
+    (assert-true (equal? (list 1 2 3) (list 1 2 3))))
+
+  (deftest "= on same list reference is true"
+    ;; = on the same reference is always true
+    (let ((x (list 1 2)))
+      (assert-true (= x x))))
+
+  (deftest "different lists are not equal"
+    (assert-false (equal? (list 1 2 3) (list 1 2 4))))
+
+  (deftest "nested list equality"
+    (assert-true (equal? (list 1 (list 2 3) 4)
+                          (list 1 (list 2 3) 4))))
+
+  (deftest "nested list inequality — inner differs"
+    (assert-false (equal? (list 1 (list 2 3) 4)
+                           (list 1 (list 2 99) 4))))
+
+  (deftest "two identical dicts are equal"
+    (assert-true (equal? (dict "a" 1 "b" 2)
+                          (dict "a" 1 "b" 2))))
+
+  (deftest "dicts with same keys/values but different insertion order are equal"
+    ;; Dict equality is key/value structural, not insertion-order
+    (let ((d1 (dict "a" 1 "b" 2))
+          (d2 (assoc (dict "b" 2) "a" 1)))
+      (assert-true (equal? d1 d2))))
+
+  (deftest "empty list is not equal to nil"
+    (assert-false (equal? (list) nil)))
+
+  (deftest "empty list equals empty list"
+    (assert-true (equal? (list) (list))))
+
+  (deftest "order matters for list equality"
+    (assert-false (equal? (list 1 2) (list 2 1))))
+
+  (deftest "lists of different lengths are not equal"
+    (assert-false (equal? (list 1 2) (list 1 2 3))))
+
+  (deftest "empty dict equals empty dict"
+    (assert-true (equal? (dict) (dict))))
+
+  (deftest "dict with extra key is not equal"
+    (assert-false (equal? (dict "a" 1) (dict "a" 1 "b" 2))))
+
+  (deftest "list containing dict equality"
+    (assert-true (equal? (list (dict "k" 1)) (list (dict "k" 1)))))
+
+  (deftest "list containing dict inequality"
+    (assert-false (equal? (list (dict "k" 1)) (list (dict "k" 2))))))
+
+
+;; --------------------------------------------------------------------------
+;; String / collection bridge
+;; --------------------------------------------------------------------------
+
+(defsuite "string-collection-bridge"
+  (deftest "split then join round-trip"
+    ;; Splitting on a separator then joining with the same separator recovers original
+    (let ((original "a,b,c"))
+      (assert-equal original (join "," (split original ",")))))
+
+  (deftest "join then split round-trip"
+    (let ((original (list "x" "y" "z")))
+      (assert-equal original (split (join "-" original) "-"))))
+
+  (deftest "split produces correct length"
+    (assert-equal 3 (len (split "one:two:three" ":"))))
+
+  (deftest "split produces list of strings"
+    (let ((parts (split "a,b,c" ",")))
+      (assert-true (every? string? parts))))
+
+  (deftest "map over split result"
+    ;; Split a CSV of numbers, parse each, sum
+    (let ((nums (map parse-int (split "10,20,30" ","))))
+      (assert-equal 60 (reduce (fn (a b) (+ a b)) 0 nums))))
+
+  (deftest "join with empty separator concatenates"
+    (assert-equal "abc" (join "" (list "a" "b" "c"))))
+
+  (deftest "join single-element list returns the element"
+    (assert-equal "hello" (join "," (list "hello"))))
+
+  (deftest "split on non-present separator returns whole string in list"
+    (let ((result (split "hello" ",")))
+      (assert-equal 1 (len result))
+      (assert-equal "hello" (first result))))
+
+  (deftest "str on a list produces non-empty string"
+    ;; Platform-defined formatting — just verify it's a non-empty string
+    (let ((result (str (list 1 2 3))))
+      (assert-true (string? result))
+      (assert-true (not (empty? result)))))
+
+  (deftest "upper then split preserves length"
+    (let ((words (split "hello world foo" " ")))
+      (let ((up-words (map upper words)))
+        (assert-equal 3 (len up-words))
+        (assert-equal "HELLO" (first up-words))
+        (assert-equal "WORLD" (nth up-words 1))
+        (assert-equal "FOO"   (nth up-words 2)))))
+
+  (deftest "reduce over split to build string"
+    ;; Re-join with a different separator
+    (let ((words (split "a b c" " ")))
+      (assert-equal "a|b|c" (join "|" words))))
+
+  (deftest "split empty string on space"
+    ;; Empty string split on space — platform may return list of one empty string or empty list
+    (let ((result (split "" " ")))
+      (assert-true (list? result))))
+
+  (deftest "contains? works on joined string"
+    (let ((sentence (join " " (list "the" "quick" "brown" "fox"))))
+      (assert-true (contains? sentence "quick"))
+      (assert-false (contains? sentence "lazy")))))

spec/tests/test-continuations-advanced.sx

@@ -0,0 +1,368 @@
+;; ==========================================================================
+;; test-continuations-advanced.sx — Stress tests for multi-shot continuations
+;;                                  and frame-based dynamic scope
+;;
+;; Requires: test-framework.sx loaded, continuations + scope extensions enabled.
+;;
+;; Tests the CEK continuation + ProvideFrame/ScopeAccFrame system under:
+;;   - Multi-shot (k invoked 0, 1, 2, 3+ times)
+;;   - Continuation composition across nested resets
+;;   - provide/context: dynamic variable binding via kont walk
+;;   - provide values preserved across shift/resume
+;;   - scope/emit!/emitted: accumulator frames in kont
+;;   - Accumulator frames preserved across shift/resume
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; 1. Multi-shot continuations
+;; --------------------------------------------------------------------------
+
+(defsuite "multi-shot-continuations"
+  (deftest "k invoked 3 times returns list of results"
+    ;; Each (k N) resumes (+ 1 N) independently.
+    ;; Shift body collects all three results into a list.
+    (assert-equal (list 11 21 31)
+      (reset (+ 1 (shift k (list (k 10) (k 20) (k 30)))))))
+
+  (deftest "k invoked via map over input list"
+    ;; map applies k to each element; each resume computes (+ 1 elem).
+    (assert-equal (list 11 21 31)
+      (reset (+ 1 (shift k (map k (list 10 20 30)))))))
+
+  (deftest "k invoked zero times — abort with plain value"
+    ;; Shift body ignores k and returns 42 directly.
+    ;; The outer (+ 1 ...) hole is never filled.
+    (assert-equal 42
+      (reset (+ 1 (shift k 42)))))
+
+  (deftest "k invoked conditionally — true branch calls k"
+    ;; Only the true branch calls k; result is (+ 1 10) = 11.
+    (assert-equal 11
+      (reset (+ 1 (shift k (if true (k 10) 99))))))
+
+  (deftest "k invoked conditionally — false branch skips k"
+    ;; False branch returns 99 directly without invoking k.
+    (assert-equal 99
+      (reset (+ 1 (shift k (if false (k 10) 99))))))
+
+  (deftest "k invoked inside let binding"
+    ;; (k 5) = (+ 1 5) = 6; x is bound to 6; (* x 2) = 12.
+    (assert-equal 12
+      (reset (+ 1 (shift k (let ((x (k 5))) (* x 2)))))))
+
+  (deftest "nested shift — inner k2 called by outer k1"
+    ;; k1 = (fn (v) (+ 1 v)), k2 = (fn (v) (+ 2 v))
+    ;; (k2 3) = 5, (k1 5) = 6
+    ;; inner reset returns 6 to shift-k1 body; (+ 10 6) = 16
+    ;; outer reset returns 16
+    (assert-equal 16
+      (reset (+ 1 (shift k1 (+ 10 (reset (+ 2 (shift k2 (k1 (k2 3)))))))))))
+
+  (deftest "k called twice accumulates both results"
+    ;; Two invocations in a list: (k 1) = 2, (k 2) = 3.
+    (assert-equal (list 2 3)
+      (reset (+ 1 (shift k (list (k 1) (k 2)))))))
+
+  (deftest "multi-shot k is idempotent — same arg gives same result"
+    ;; Calling k with the same argument twice should yield equal values.
+    (let ((results (reset (+ 1 (shift k (list (k 5) (k 5)))))))
+      (assert-equal (nth results 0) (nth results 1)))))
+
+
+;; --------------------------------------------------------------------------
+;; 2. Continuation composition
+;; --------------------------------------------------------------------------
+
+(defsuite "continuation-composition"
+  (deftest "two independent resets have isolated continuations"
+    ;; Each reset is entirely separate — the two k values are unrelated.
+    (let ((r1 (reset (+ 1 (shift k1 (k1 10)))))
+          (r2 (reset (+ 100 (shift k2 (k2 5))))))
+      (assert-equal 11  r1)
+      (assert-equal 105 r2)))
+
+  (deftest "continuation passed to helper function and invoked there"
+    ;; apply-k is a plain lambda; it calls the continuation it receives.
+    (let ((apply-k (fn (k v) (k v))))
+      (assert-equal 15
+        (reset (+ 5 (shift k (apply-k k 10)))))))
+
+  (deftest "continuation stored in variable and invoked later"
+    ;; reset returns k itself; we then invoke it outside the reset form.
+    (let ((k (reset (shift k k))))
+      ;; k = identity continuation for (reset _), so (k v) = v
+      (assert-true (continuation? k))
+      (assert-equal 42 (k 42))
+      (assert-equal 7  (k 7))))
+
+  (deftest "continuation stored then called with multiple values"
+    ;; k from (+ 1 hole); invoking k with different args gives different results.
+    (let ((k (reset (+ 1 (shift k k)))))
+      (assert-equal 11 (k 10))
+      (assert-equal 21 (k 20))
+      (assert-equal 31 (k 30))))
+
+  (deftest "continuation as argument to map — applied to a list"
+    ;; k = (fn (v) (+ 10 v)); map applies it to each element.
+    (let ((k (reset (+ 10 (shift k k)))))
+      (assert-equal (list 11 12 13)
+        (map k (list 1 2 3)))))
+
+  (deftest "compose two continuations from nested resets"
+    ;; k1 = (fn (v) (+ 1 v)), k2 = (fn (v) (+ 10 v))
+    ;; (k2 0) = 10, (k1 10) = 11; outer reset returns 11.
+    (assert-equal 11
+      (reset (+ 1 (shift k1 (reset (+ 10 (shift k2 (k1 (k2 0))))))))))
+
+  (deftest "continuation predicate holds inside and after capture"
+    ;; k captured inside shift is a continuation; so is one returned by reset.
+    (assert-true
+      (reset (shift k (continuation? k))))
+    (assert-true
+      (continuation? (reset (shift k k))))))
+
+
+;; --------------------------------------------------------------------------
+;; 3. provide / context — basic dynamic scope
+;; --------------------------------------------------------------------------
+
+(defsuite "provide-context-basic"
+  (deftest "simple provide and context"
+    ;; (context \"x\") walks the kont and finds the ProvideFrame for \"x\".
+    (assert-equal 42
+      (provide "x" 42 (context "x"))))
+
+  (deftest "nested provide — inner shadows outer"
+    ;; The nearest ProvideFrame wins when searching kont.
+    (assert-equal 2
+      (provide "x" 1
+        (provide "x" 2
+          (context "x")))))
+
+  (deftest "outer provide visible after inner scope exits"
+    ;; After the inner provide's body finishes, its frame is gone.
+    ;; The next (context \"x\") walks past it to the outer frame.
+    (assert-equal 1
+      (provide "x" 1
+        (do
+          (provide "x" 2 (context "x"))
+          (context "x")))))
+
+  (deftest "multiple provide names are independent"
+    ;; Each name has its own ProvideFrame; they don't interfere.
+    (assert-equal 3
+      (provide "a" 1
+        (provide "b" 2
+          (+ (context "a") (context "b"))))))
+
+  (deftest "context with default — provider present returns provided value"
+    ;; Second arg to context is the default; present provider overrides it.
+    (assert-equal 42
+      (provide "x" 42 (context "x" 0))))
+
+  (deftest "context with default — no provider returns default"
+    ;; When no ProvideFrame exists for the name, the default is returned.
+    (assert-equal 0
+      (provide "y" 99 (context "x" 0))))
+
+  (deftest "provide with computed value"
+    ;; The value expression is evaluated before pushing the frame.
+    (assert-equal 6
+      (provide "n" (* 2 3) (context "n"))))
+
+  (deftest "provide value is the exact bound value (no double-eval)"
+    ;; Passing a list as the provided value should return that list.
+    (let ((result (provide "items" (list 1 2 3) (context "items"))))
+      (assert-equal (list 1 2 3) result))))
+
+
+;; --------------------------------------------------------------------------
+;; 4. provide across shift — scope survives continuation capture/resume
+;; --------------------------------------------------------------------------
+
+(defsuite "provide-across-shift"
+  (deftest "provide value preserved across shift and k invocation"
+    ;; The ProvideFrame lives in the kont beyond the ResetFrame.
+    ;; When k resumes, the frame is still there — context finds it.
+    (assert-equal "dark"
+      (reset
+        (provide "theme" "dark"
+          (+ 0 (shift k (k 0)))
+          (context "theme")))))
+
+  (deftest "two provides both preserved across shift"
+    ;; Both ProvideFrames must survive the shift/resume round-trip.
+    (assert-equal 3
+      (reset
+        (provide "a" 1
+          (provide "b" 2
+            (+ 0 (shift k (k 0)))
+            (+ (context "a") (context "b")))))))
+
+  (deftest "context visible inside provide but not in shift body"
+    ;; shift body runs OUTSIDE the reset boundary — provide is not in scope.
+    ;; But context with a default should return the default.
+    (assert-equal "fallback"
+      (reset
+        (provide "theme" "light"
+          (shift k (context "theme" "fallback"))))))
+
+  (deftest "context after k invocation restores scope frame"
+    ;; k was captured with the ProvideFrame in its saved kont.
+    ;; After (k v) resumes, context finds the frame again.
+    (let ((result
+            (reset
+              (provide "color" "red"
+                (+ 0 (shift k (k 0)))
+                (context "color")))))
+      (assert-equal "red" result)))
+
+  (deftest "multi-shot: each k invocation reinstates captured ProvideFrame"
+    ;; k captures the ProvideFrame for "n" (it's inside the reset delimiter).
+    ;; Invoking k twice: each time (context "n") in the resumed body is valid.
+    ;; The shift body collects (context "n") from each resumed branch.
+    (let ((readings
+            (reset
+              (provide "n" 10
+                (+ 0 (shift k
+                       (list
+                         (k 0)
+                         (k 0))))
+                (context "n")))))
+      ;; Each (k 0) resumes and returns (context "n") = 10.
+      (assert-equal (list 10 10) readings))))
+
+
+;; --------------------------------------------------------------------------
+;; 5. scope / emit! / emitted — accumulator frames
+;; --------------------------------------------------------------------------
+
+(defsuite "scope-emit-basic"
+  (deftest "simple scope: emit two items and read emitted list"
+    ;; emit! appends to the nearest ScopeAccFrame; emitted returns the list.
+    (assert-equal (list "a" "b")
+      (scope "css"
+        (emit! "css" "a")
+        (emit! "css" "b")
+        (emitted "css"))))
+
+  (deftest "empty scope returns empty list for emitted"
+    ;; No emit! calls means the accumulator stays empty.
+    (assert-equal (list)
+      (scope "css"
+        (emitted "css"))))
+
+  (deftest "emit! order is preserved"
+    ;; Items appear in emission order, not reverse.
+    (assert-equal (list 1 2 3 4 5)
+      (scope "nums"
+        (emit! "nums" 1)
+        (emit! "nums" 2)
+        (emit! "nums" 3)
+        (emit! "nums" 4)
+        (emit! "nums" 5)
+        (emitted "nums"))))
+
+  (deftest "nested scopes: inner does not see outer's emitted"
+    ;; The inner scope has its own ScopeAccFrame; kont-find-scope-acc
+    ;; stops at the first matching name, so inner is fully isolated.
+    (let ((inner-emitted
+            (scope "css"
+              (emit! "css" "outer")
+              (scope "css"
+                (emit! "css" "inner")
+                (emitted "css")))))
+      (assert-equal (list "inner") inner-emitted)))
+
+  (deftest "two differently-named scopes are independent"
+    ;; emit! to \"a\" must not appear in emitted \"b\" and vice versa.
+    (let ((result-a nil) (result-b nil))
+      (scope "a"
+        (scope "b"
+          (emit! "a" "for-a")
+          (emit! "b" "for-b")
+          (set! result-b (emitted "b")))
+        (set! result-a (emitted "a")))
+      (assert-equal (list "for-a") result-a)
+      (assert-equal (list "for-b") result-b)))
+
+  (deftest "scope body returns last expression value"
+    ;; scope itself returns the last body expression, not the emitted list.
+    (assert-equal 42
+      (scope "x"
+        (emit! "x" "ignored")
+        42)))
+
+  (deftest "scope with :value acts as provide for context"
+    ;; When :value is given, the ScopeAccFrame also carries the value.
+    ;; context should be able to read it (if the evaluator searches scope-acc
+    ;; frames the same way as provide frames).
+    ;; NOTE: this tests the :value keyword path in step-sf-scope.
+    ;; If context only walks ProvideFrames, use provide directly instead.
+    ;; We verify at minimum that :value does not crash.
+    (let ((r (try-call (fn ()
+                         (scope "x" :value 42
+                           (emitted "x"))))))
+      (assert-true (get r "ok")))))
+
+
+;; --------------------------------------------------------------------------
+;; 6. scope / emit! across shift — accumulator frames survive continuation
+;; --------------------------------------------------------------------------
+
+(defsuite "scope-emit-across-shift"
+  (deftest "emit before and after shift both appear in emitted"
+    ;; The ScopeAccFrame is in the kont beyond the ResetFrame.
+    ;; After k resumes, the frame is still present; the second emit!
+    ;; appends to it.
+    (assert-equal (list "a" "b")
+      (reset
+        (scope "acc"
+          (emit! "acc" "a")
+          (+ 0 (shift k (k 0)))
+          (emit! "acc" "b")
+          (emitted "acc")))))
+
+  (deftest "emit only before shift — one item in emitted"
+    ;; emit! before shift commits to the frame; shift/resume preserves it.
+    (assert-equal (list "only")
+      (reset
+        (scope "log"
+          (emit! "log" "only")
+          (+ 0 (shift k (k 0)))
+          (emitted "log")))))
+
+  (deftest "emit only after shift — one item in emitted"
+    ;; No emit! before shift; the frame starts empty; post-resume emit! adds one.
+    (assert-equal (list "after")
+      (reset
+        (scope "log"
+          (+ 0 (shift k (k 0)))
+          (emit! "log" "after")
+          (emitted "log")))))
+
+  (deftest "emits on both sides of single shift boundary"
+    ;; Single shift/resume; emits before and after are preserved.
+    (assert-equal (list "a" "b")
+      (reset
+        (scope "trace"
+          (emit! "trace" "a")
+          (+ 0 (shift k (k 0)))
+          (emit! "trace" "b")
+          (emitted "trace")))))
+
+  (deftest "emitted inside shift body reads current accumulator"
+    ;; kont in the shift body is rest-kont (outer kont beyond the reset).
+    ;; The ScopeAccFrame should be present if it was installed before reset.
+    ;; emit! and emitted inside shift body use that outer frame.
+    (let ((outer-acc nil))
+      (scope "outer"
+        (reset
+          (shift k
+            (do
+              (emit! "outer" "from-shift")
+              (set! outer-acc (emitted "outer")))))
+        nil)
+      (assert-equal (list "from-shift") outer-acc))))
+

spec/tests/test-continuations.sx

@@ -0,0 +1,140 @@
+;; ==========================================================================
+;; test-continuations.sx — Tests for delimited continuations (shift/reset)
+;;
+;; Requires: test-framework.sx loaded, continuations extension enabled.
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; 1. Basic shift/reset
+;; --------------------------------------------------------------------------
+
+(defsuite "basic-shift-reset"
+  (deftest "reset passthrough"
+    (assert-equal 42 (reset 42)))
+
+  (deftest "reset evaluates expression"
+    (assert-equal 3 (reset (+ 1 2))))
+
+  (deftest "shift aborts to reset"
+    (assert-equal 42 (reset (+ 1 (shift k 42)))))
+
+  (deftest "shift with single invoke"
+    (assert-equal 11 (reset (+ 1 (shift k (k 10))))))
+
+  (deftest "shift with multiple invokes"
+    (assert-equal (list 11 21)
+      (reset (+ 1 (shift k (list (k 10) (k 20)))))))
+
+  (deftest "shift returns string"
+    (assert-equal "aborted"
+      (reset (+ 1 (shift k "aborted")))))
+
+  (deftest "shift returns nil"
+    (assert-nil (reset (+ 1 (shift k nil)))))
+
+  (deftest "nested expression with shift"
+    (assert-equal 16
+      (+ 1 (reset (+ 10 (shift k (k 5))))))))
+
+
+;; --------------------------------------------------------------------------
+;; 2. Continuation predicates
+;; --------------------------------------------------------------------------
+
+(defsuite "continuation-predicates"
+  (deftest "k is a continuation inside shift"
+    (assert-true
+      (reset (shift k (continuation? k)))))
+
+  (deftest "number is not a continuation"
+    (assert-false (continuation? 42)))
+
+  (deftest "function is not a continuation"
+    (assert-false (continuation? (fn (x) x))))
+
+  (deftest "nil is not a continuation"
+    (assert-false (continuation? nil)))
+
+  (deftest "string is not a continuation"
+    (assert-false (continuation? "hello"))))
+
+
+;; --------------------------------------------------------------------------
+;; 3. Continuation as value
+;; --------------------------------------------------------------------------
+
+(defsuite "continuation-as-value"
+  (deftest "k returned from reset"
+    ;; shift body returns k itself — reset returns the continuation
+    (let ((k (reset (+ 1 (shift k k)))))
+      (assert-true (continuation? k))
+      (assert-equal 11 (k 10))))
+
+  (deftest "invoke returned k multiple times"
+    (let ((k (reset (+ 1 (shift k k)))))
+      (assert-equal 11 (k 10))
+      (assert-equal 21 (k 20))
+      (assert-equal 2 (k 1))))
+
+  (deftest "pass k to another function"
+    (let ((apply-k (fn (k v) (k v))))
+      (assert-equal 15
+        (reset (+ 5 (shift k (apply-k k 10)))))))
+
+  (deftest "k in data structure"
+    (let ((result (reset (+ 1 (shift k (list k 42))))))
+      (assert-equal 42 (nth result 1))
+      (assert-equal 100 ((first result) 99)))))
+
+
+;; --------------------------------------------------------------------------
+;; 4. Nested reset
+;; --------------------------------------------------------------------------
+
+(defsuite "nested-reset"
+  (deftest "inner reset captures independently"
+    (assert-equal 12
+      (reset (+ 1 (reset (+ 10 (shift k (k 1))))))))
+
+  (deftest "inner abort outer continues"
+    (assert-equal 43
+      (reset (+ 1 (reset (+ 10 (shift k 42)))))))
+
+  (deftest "outer shift captures outer reset"
+    (assert-equal 100
+      (reset (+ 1 (shift k (k 99)))))))
+
+
+;; --------------------------------------------------------------------------
+;; 5. Interaction with scoped effects
+;; --------------------------------------------------------------------------
+
+(defsuite "continuations-with-scopes"
+  (deftest "provide survives resume"
+    (assert-equal "dark"
+      (reset (provide "theme" "dark"
+        (+ 0 (shift k (k 0)))
+        (context "theme")))))
+
+  (deftest "scope and emit across shift"
+    (assert-equal (list "a")
+      (reset (scope "acc"
+        (emit! "acc" "a")
+        (+ 0 (shift k (k 0)))
+        (emitted "acc"))))))
+
+
+;; --------------------------------------------------------------------------
+;; 6. TCO interaction
+;; --------------------------------------------------------------------------
+
+(defsuite "tco-interaction"
+  (deftest "shift in tail position"
+    (assert-equal 42
+      (reset (if true (shift k (k 42)) 0))))
+
+  (deftest "shift in let body"
+    (assert-equal 10
+      (reset (let ((x 5))
+        (+ x (shift k (k 5))))))))

spec/tests/test-defcomp.sx

@@ -0,0 +1,198 @@
+;; ==========================================================================
+;; test-defcomp.sx — Tests for component (defcomp) calling conventions
+;;
+;; Requires: test-framework.sx loaded first.
+;; Modules tested: eval.sx (defcomp, component call), render.sx
+;;
+;; Component calling convention:
+;;   (defcomp ~name (&key k1 k2 &rest children) body...)
+;;   Keyword args:  (~name :k1 v1 :k2 v2)
+;;   Children:      (~name :k1 v1 child1 child2)   — positional after keywords
+;;   Defaults:      (or k1 "fallback")
+;;
+;; render-html takes an SX source string, evaluates + renders to HTML string.
+;; For multi-form programs use (do ...) or define forms before the call.
+;; ==========================================================================
+
+
+;; --------------------------------------------------------------------------
+;; Basic defcomp behaviour
+;; --------------------------------------------------------------------------
+
+(defsuite "defcomp-basics"
+  (deftest "defcomp binds the component name"
+    (defcomp ~no-params ()
+      (span "hello"))
+    (assert-true (not (nil? ~no-params))))
+
+  (deftest "defcomp with positional params"
+    ;; Components can accept plain positional params (not &key).
+    (defcomp ~greet (name)
+      (span name))
+    (assert-true (not (nil? ~greet))))
+
+  (deftest "defcomp body can reference defined names"
+    ;; Body is evaluated in the defining env — outer defines are visible.
+    (define greeting "hi")
+    (defcomp ~uses-outer ()
+      (span greeting))
+    (assert-true (not (nil? ~uses-outer))))
+
+  (deftest "defcomp is a component type"
+    (defcomp ~typed-comp (&key x)
+      (div x))
+    ;; component-affinity is available on all component values
+    (assert-equal "auto" (component-affinity ~typed-comp))))
+
+
+;; --------------------------------------------------------------------------
+;; Keyword argument (&key) convention
+;; --------------------------------------------------------------------------
+
+(defsuite "defcomp-keyword-args"
+  (deftest "single &key param receives keyword argument"
+    (assert-equal "<span>World</span>"
+      (render-html "(do (defcomp ~k-single (&key title) (span title)) (~k-single :title \"World\"))")))
+
+  (deftest "multiple &key params"
+    (assert-equal "<span>Ada Lovelace</span>"
+      (render-html "(do (defcomp ~k-multi (&key first last) (span (str first \" \" last)))
+                        (~k-multi :first \"Ada\" :last \"Lovelace\"))")))
+
+  (deftest "missing &key param is nil"
+    ;; When subtitle is nil, the span should be empty
+    (assert-equal "<span></span>"
+      (render-html "(do (defcomp ~k-missing (&key title subtitle) (span (or subtitle \"\")))
+                        (~k-missing :title \"Only title\"))")))
+
+  (deftest "&key param default via or"
+    (let ((custom (render-html "(do (defcomp ~k-def (&key label) (span (or label \"default-label\")))
+                                    (~k-def :label \"custom\"))"))
+          (default (render-html "(do (defcomp ~k-def2 (&key label) (span (or label \"default-label\")))
+                                     (~k-def2))")))
+      (assert-equal "<span>custom</span>" custom)
+      (assert-equal "<span>default-label</span>" default)))
+
+  (deftest "&key params can be numbers"
+    (assert-equal "<span>84</span>"
+      (render-html "(do (defcomp ~k-num (&key value) (span (* value 2)))
+                        (~k-num :value 42))")))
+
+  (deftest "&key params can be lists"
+    (assert-equal "<span>3</span>"
+      (render-html "(do (defcomp ~k-list (&key items) (span (len items)))
+                        (~k-list :items (list \"a\" \"b\" \"c\")))"))))
+
+
+;; --------------------------------------------------------------------------
+;; Rest / children convention
+;; --------------------------------------------------------------------------
+
+(defsuite "defcomp-rest-children"
+  (deftest "&rest captures positional args as content"
+    (let ((html (render-html "(do (defcomp ~r-basic (&rest children) (div children))
+                                  (~r-basic \"a\" \"b\" \"c\"))")))
+      (assert-true (string-contains? html "a"))
+      (assert-true (string-contains? html "b"))
+      (assert-true (string-contains? html "c"))))
+
+  (deftest "&rest with &key separates keywords from positional"
+    (let ((html (render-html "(do (defcomp ~r-mixed (&key title &rest children)
+                                    (div (h2 title) children))
+                                  (~r-mixed :title \"T\" (p \"c1\") (p \"c2\")))")))
+      (assert-true (string-contains? html "<h2>T</h2>"))
+      (assert-true (string-contains? html "<p>c1</p>"))
+      (assert-true (string-contains? html "<p>c2</p>"))))
+
+  (deftest "empty children when no positional args provided"
+    (assert-equal "<div></div>"
+      (render-html "(do (defcomp ~r-empty (&rest children) (div children)) (~r-empty))")))
+
+  (deftest "multiple children rendered in order"
+    (let ((html (render-html "(do (defcomp ~r-order (&rest children) (ul children))
+                                  (~r-order (li \"x\") (li \"y\") (li \"z\")))")))
+      (assert-true (string-contains? html "<li>x</li>"))
+      (assert-true (string-contains? html "<li>y</li>"))
+      (assert-true (string-contains? html "<li>z</li>")))))
+
+
+;; --------------------------------------------------------------------------
+;; Component rendering to HTML
+;; --------------------------------------------------------------------------
+
+(defsuite "defcomp-rendering"
+  (deftest "simplest component renders to HTML"
+    (assert-equal "<p>hello</p>"
+      (render-html "(do (defcomp ~r-simple () (p \"hello\")) (~r-simple))")))
+
+  (deftest "component with &key renders keyword arg value"
+    (assert-equal "<h1>Greetings</h1>"
+      (render-html "(do (defcomp ~r-title (&key text) (h1 text))
+                        (~r-title :text \"Greetings\"))")))
+
+  (deftest "component with multiple &key args"
+    (let ((html (render-html
+                  "(do (defcomp ~r-card (&key title subtitle)
+                         (div :class \"card\" (h2 title) (p subtitle)))
+                       (~r-card :title \"Hi\" :subtitle \"Sub\"))")))
+      (assert-true (string-contains? html "class=\"card\""))
+      (assert-true (string-contains? html "<h2>Hi</h2>"))
+      (assert-true (string-contains? html "<p>Sub</p>"))))
+
+  (deftest "nested component calls"
+    (let ((html (render-html
+                  "(do
+                     (defcomp ~r-inner (&key label) (span label))
+                     (defcomp ~r-outer (&key text)  (div (~r-inner :label text)))
+                     (~r-outer :text \"nested\"))")))
+      (assert-true (string-contains? html "<div>"))
+      (assert-true (string-contains? html "<span>nested</span>"))))
+
+  (deftest "component with children rendered inside wrapper"
+    (let ((html (render-html
+                  "(do (defcomp ~r-box (&key &rest children)
+                         (div :class \"box\" children))
+                       (~r-box (p \"inside\")))")))
+      (assert-true (string-contains? html "class=\"box\""))
+      (assert-true (string-contains? html "<p>inside</p>"))))
+
+  (deftest "component with conditional rendering via when"
+    (let ((html-with    (render-html
+                          "(do (defcomp ~r-cond (&key show)
+                                 (div (when show (span \"visible\"))))
+                               (~r-cond :show true))"))
+          (html-without (render-html
+                          "(do (defcomp ~r-cond (&key show)
+                                 (div (when show (span \"visible\"))))
+                               (~r-cond :show false))")))
+      (assert-true  (string-contains? html-with    "<span>visible</span>"))
+      (assert-false (string-contains? html-without "<span>"))))
+
+  (deftest "component with conditional rendering via if"
+    (assert-equal "<p>yes</p>"
+      (render-html "(do (defcomp ~r-if (&key flag)
+                           (if flag (p \"yes\") (p \"no\")))
+                         (~r-if :flag true))"))
+    (assert-equal "<p>no</p>"
+      (render-html "(do (defcomp ~r-if (&key flag)
+                           (if flag (p \"yes\") (p \"no\")))
+                         (~r-if :flag false))")))
+
+  (deftest "component default via or renders correctly"
+    (assert-equal "<span>fallback</span>"
+      (render-html "(do (defcomp ~r-default (&key label)
+                           (span (or label \"fallback\")))
+                         (~r-default))"))
+    (assert-equal "<span>given</span>"
+      (render-html "(do (defcomp ~r-default (&key label)
+                           (span (or label \"fallback\")))
+                         (~r-default :label \"given\"))")))
+
+  (deftest "component with multiple children rendered in order"
+    (let ((html (render-html
+                  "(do (defcomp ~r-multi (&rest children)
+                         (ul children))
+                       (~r-multi (li \"a\") (li \"b\") (li \"c\")))")))
+      (assert-true (string-contains? html "<li>a</li>"))
+      (assert-true (string-contains? html "<li>b</li>"))
+      (assert-true (string-contains? html "<li>c</li>")))))