Fix reactive islands client-side navigation and hydration

Three bugs prevented islands from working during SX wire navigation:

1. components_for_request() only bundled Component and Macro defs, not
   Island defs — client never received defisland definitions during
   navigation (components_for_page for initial HTML shell was correct).

2. hydrate-island used morph-children which can't transfer addEventListener
   event handlers from freshly rendered DOM to existing nodes. Changed to
   clear+append so reactive DOM with live signal subscriptions is inserted
   directly.

3. asyncRenderToDom (client-side async page eval) checked _component but
   not _island on ~-prefixed names — islands fell through to generic eval
   which failed. Now delegates to renderDomIsland.

4. setInterval_/setTimeout_ passed SX Lambda objects directly to native
   timers. JS coerced them to "[object Object]" and tried to eval as code,
   causing "missing ] after element list". Added _wrapSxFn to convert SX
   lambdas to JS functions before passing to timers.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

shared/static/scripts/sx-browser.js

@@ -14,7 +14,7 @@
   // =========================================================================
 
   var NIL = Object.freeze({ _nil: true, toString: function() { return "nil"; } });
-  var SX_VERSION = "2026-03-08T11:56:02Z";
+  var SX_VERSION = "2026-03-08T15:15:32Z";
 
   function isNil(x) { return x === NIL || x === null || x === undefined; }
   function isSxTruthy(x) { return x !== false && !isNil(x); }
@@ -191,6 +191,17 @@
   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;
+  }
+
   // JSON / dict helpers for island state serialization
   function jsonSerialize(obj) {
     try { return JSON.stringify(obj); } catch(e) { return "{}"; }
@@ -216,17 +227,8 @@
 
   // Render-expression detection — lets the evaluator delegate to the active adapter.
   // Matches HTML tags, SVG tags, <>, raw!, ~components, html: prefix, custom elements.
-  function isRenderExpr(expr) {
-    if (!Array.isArray(expr) || !expr.length) return false;
-    var h = expr[0];
-    if (!h || !h._sym) return false;
-    var n = h.name;
-    return !!(n === "<>" || n === "raw!" ||
-              n.charAt(0) === "~" || n.indexOf("html:") === 0 ||
-              (typeof HTML_TAGS !== "undefined" && HTML_TAGS.indexOf(n) >= 0) ||
-              (typeof SVG_TAGS !== "undefined" && SVG_TAGS.indexOf(n) >= 0) ||
-              (n.indexOf("-") > 0 && expr.length > 1 && expr[1] && expr[1]._kw));
-  }
+  // Placeholder — overridden by transpiled version from render.sx
+  function isRenderExpr(expr) { return false; }
 
   // Render dispatch — call the active adapter's render function.
   // Set by each adapter when loaded; defaults to identity (no rendering).
@@ -322,6 +324,8 @@
   PRIMITIVES["starts-with?"] = function(s, p) { return String(s).indexOf(p) === 0; };
   PRIMITIVES["ends-with?"] = function(s, p) { var str = String(s); return str.indexOf(p, str.length - p.length) !== -1; };
   PRIMITIVES["slice"] = function(c, a, b) { return b !== undefined ? c.slice(a, b) : c.slice(a); };
+  PRIMITIVES["substring"] = function(s, a, b) { return String(s).substring(a, b); };
+  PRIMITIVES["string-length"] = function(s) { return String(s).length; };
   PRIMITIVES["concat"] = function() {
     var out = [];
     for (var i = 0; i < arguments.length; i++) if (!isNil(arguments[i])) out = out.concat(arguments[i]);
@@ -465,7 +469,10 @@
   var range = PRIMITIVES["range"];
   function zip(a, b) { var r = []; for (var i = 0; i < Math.min(a.length, b.length); i++) r.push([a[i], b[i]]); return r; }
   function append_b(arr, x) { arr.push(x); return arr; }
-  var apply = function(f, args) { return f.apply(null, args); };
+  var apply = function(f, args) {
+    if (isLambda(f)) return trampoline(callLambda(f, args, lambdaClosure(f)));
+    return f.apply(null, args);
+  };
 
   // Additional primitive aliases used by adapter/engine transpiled code
   var split = PRIMITIVES["split"];
@@ -484,28 +491,12 @@
   function escapeAttr(s) { return escapeHtml(s); }
   function rawHtmlContent(r) { return r.html; }
   function makeRawHtml(s) { return { _raw: true, html: s }; }
+  function sxExprSource(x) { return x && x.source ? x.source : String(x); }
 
-  // Serializer
-  function serialize(val) {
-    if (isNil(val)) return "nil";
-    if (typeof val === "boolean") return val ? "true" : "false";
-    if (typeof val === "number") return String(val);
-    if (typeof val === "string") return '"' + val.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"';
-    if (isSym(val)) return val.name;
-    if (isKw(val)) return ":" + val.name;
-    if (Array.isArray(val)) return "(" + val.map(serialize).join(" ") + ")";
-    return String(val);
-  }
-
-  function isSpecialForm(n) { return n in {
-    "if":1,"when":1,"cond":1,"case":1,"and":1,"or":1,"let":1,"let*":1,
-    "lambda":1,"fn":1,"define":1,"defcomp":1,"defmacro":1,"defstyle":1,
-    "defhandler":1,"begin":1,"do":1,
-    "quote":1,"quasiquote":1,"->":1,"set!":1
-  }; }
-  function isHoForm(n) { return n in {
-    "map":1,"map-indexed":1,"filter":1,"reduce":1,"some":1,"every?":1,"for-each":1
-  }; }
+  // Placeholders — overridden by transpiled spec from parser.sx / adapter-sx.sx
+  function serialize(val) { return String(val); }
+  function isSpecialForm(n) { return false; }
+  function isHoForm(n) { return false; }
 
   // processBindings and evalCond — now specced in render.sx, bootstrapped above
 
@@ -1077,6 +1068,15 @@ return append_b(inits, nth(binding, 1)); }, bindings) : reduce(function(acc, pai
   return local;
 })(); };
 
+  // is-render-expr?
+  var isRenderExpr = function(expr) { return (isSxTruthy(sxOr(!isSxTruthy((typeOf(expr) == "list")), isEmpty(expr))) ? false : (function() {
+  var h = first(expr);
+  return (isSxTruthy(!isSxTruthy((typeOf(h) == "symbol"))) ? false : (function() {
+  var n = symbolName(h);
+  return sxOr((n == "<>"), (n == "raw!"), startsWith(n, "~"), startsWith(n, "html:"), contains(HTML_TAGS, n), (isSxTruthy((indexOf_(n, "-") > 0)) && isSxTruthy((len(expr) > 1)) && (typeOf(nth(expr, 1)) == "keyword")));
+})());
+})()); };
+
 
   // === Transpiled from parser ===
 
@@ -1188,6 +1188,269 @@ continue; } else { return NIL; } } };
   // sx-serialize-dict
   var sxSerializeDict = function(d) { return (String("{") + String(join(" ", reduce(function(acc, key) { return concat(acc, [(String(":") + String(key)), sxSerialize(dictGet(d, key))]); }, [], keys(d)))) + String("}")); };
 
+  // serialize
+  var serialize = sxSerialize;
+
+
+  // === Transpiled from adapter-html ===
+
+  // render-to-html
+  var renderToHtml = function(expr, env) { return (function() { var _m = typeOf(expr); if (_m == "nil") return ""; if (_m == "string") return escapeHtml(expr); if (_m == "number") return (String(expr)); if (_m == "boolean") return (isSxTruthy(expr) ? "true" : "false"); if (_m == "list") return (isSxTruthy(isEmpty(expr)) ? "" : renderListToHtml(expr, env)); if (_m == "symbol") return renderValueToHtml(trampoline(evalExpr(expr, env)), env); if (_m == "keyword") return escapeHtml(keywordName(expr)); if (_m == "raw-html") return rawHtmlContent(expr); return renderValueToHtml(trampoline(evalExpr(expr, env)), env); })(); };
+
+  // render-value-to-html
+  var renderValueToHtml = function(val, env) { return (function() { var _m = typeOf(val); if (_m == "nil") return ""; if (_m == "string") return escapeHtml(val); if (_m == "number") return (String(val)); if (_m == "boolean") return (isSxTruthy(val) ? "true" : "false"); if (_m == "list") return renderListToHtml(val, env); if (_m == "raw-html") return rawHtmlContent(val); return escapeHtml((String(val))); })(); };
+
+  // RENDER_HTML_FORMS
+  var RENDER_HTML_FORMS = ["if", "when", "cond", "case", "let", "let*", "begin", "do", "define", "defcomp", "defisland", "defmacro", "defstyle", "defhandler", "map", "map-indexed", "filter", "for-each"];
+
+  // render-html-form?
+  var isRenderHtmlForm = function(name) { return contains(RENDER_HTML_FORMS, name); };
+
+  // render-list-to-html
+  var renderListToHtml = function(expr, env) { return (isSxTruthy(isEmpty(expr)) ? "" : (function() {
+  var head = first(expr);
+  return (isSxTruthy(!isSxTruthy((typeOf(head) == "symbol"))) ? join("", map(function(x) { return renderValueToHtml(x, env); }, expr)) : (function() {
+  var name = symbolName(head);
+  var args = rest(expr);
+  return (isSxTruthy((name == "<>")) ? join("", map(function(x) { return renderToHtml(x, env); }, args)) : (isSxTruthy((name == "raw!")) ? join("", map(function(x) { return (String(trampoline(evalExpr(x, env)))); }, args)) : (isSxTruthy(contains(HTML_TAGS, name)) ? renderHtmlElement(name, args, env) : (isSxTruthy((isSxTruthy(startsWith(name, "~")) && isSxTruthy(envHas(env, name)) && isIsland(envGet(env, name)))) ? renderHtmlIsland(envGet(env, name), args, env) : (isSxTruthy(startsWith(name, "~")) ? (function() {
+  var val = envGet(env, name);
+  return (isSxTruthy(isComponent(val)) ? renderHtmlComponent(val, args, env) : (isSxTruthy(isMacro(val)) ? renderToHtml(expandMacro(val, args, env), env) : error((String("Unknown component: ") + String(name)))));
+})() : (isSxTruthy(isRenderHtmlForm(name)) ? dispatchHtmlForm(name, expr, env) : (isSxTruthy((isSxTruthy(envHas(env, name)) && isMacro(envGet(env, name)))) ? renderToHtml(expandMacro(envGet(env, name), args, env), env) : renderValueToHtml(trampoline(evalExpr(expr, env)), env))))))));
+})());
+})()); };
+
+  // dispatch-html-form
+  var dispatchHtmlForm = function(name, expr, env) { return (isSxTruthy((name == "if")) ? (function() {
+  var condVal = trampoline(evalExpr(nth(expr, 1), env));
+  return (isSxTruthy(condVal) ? renderToHtml(nth(expr, 2), env) : (isSxTruthy((len(expr) > 3)) ? renderToHtml(nth(expr, 3), env) : ""));
+})() : (isSxTruthy((name == "when")) ? (isSxTruthy(!isSxTruthy(trampoline(evalExpr(nth(expr, 1), env)))) ? "" : join("", map(function(i) { return renderToHtml(nth(expr, i), env); }, range(2, len(expr))))) : (isSxTruthy((name == "cond")) ? (function() {
+  var branch = evalCond(rest(expr), env);
+  return (isSxTruthy(branch) ? renderToHtml(branch, env) : "");
+})() : (isSxTruthy((name == "case")) ? renderToHtml(trampoline(evalExpr(expr, env)), env) : (isSxTruthy(sxOr((name == "let"), (name == "let*"))) ? (function() {
+  var local = processBindings(nth(expr, 1), env);
+  return join("", map(function(i) { return renderToHtml(nth(expr, i), local); }, range(2, len(expr))));
+})() : (isSxTruthy(sxOr((name == "begin"), (name == "do"))) ? join("", map(function(i) { return renderToHtml(nth(expr, i), env); }, range(1, len(expr)))) : (isSxTruthy(isDefinitionForm(name)) ? (trampoline(evalExpr(expr, env)), "") : (isSxTruthy((name == "map")) ? (function() {
+  var f = trampoline(evalExpr(nth(expr, 1), env));
+  var coll = trampoline(evalExpr(nth(expr, 2), env));
+  return join("", map(function(item) { return (isSxTruthy(isLambda(f)) ? renderLambdaHtml(f, [item], env) : renderToHtml(apply(f, [item]), env)); }, coll));
+})() : (isSxTruthy((name == "map-indexed")) ? (function() {
+  var f = trampoline(evalExpr(nth(expr, 1), env));
+  var coll = trampoline(evalExpr(nth(expr, 2), env));
+  return join("", mapIndexed(function(i, item) { return (isSxTruthy(isLambda(f)) ? renderLambdaHtml(f, [i, item], env) : renderToHtml(apply(f, [i, item]), env)); }, coll));
+})() : (isSxTruthy((name == "filter")) ? renderToHtml(trampoline(evalExpr(expr, env)), env) : (isSxTruthy((name == "for-each")) ? (function() {
+  var f = trampoline(evalExpr(nth(expr, 1), env));
+  var coll = trampoline(evalExpr(nth(expr, 2), env));
+  return join("", map(function(item) { return (isSxTruthy(isLambda(f)) ? renderLambdaHtml(f, [item], env) : renderToHtml(apply(f, [item]), env)); }, coll));
+})() : renderValueToHtml(trampoline(evalExpr(expr, env)), env)))))))))))); };
+
+  // render-lambda-html
+  var renderLambdaHtml = function(f, args, env) { return (function() {
+  var local = envMerge(lambdaClosure(f), env);
+  forEachIndexed(function(i, p) { return envSet(local, p, nth(args, i)); }, lambdaParams(f));
+  return renderToHtml(lambdaBody(f), local);
+})(); };
+
+  // render-html-component
+  var renderHtmlComponent = function(comp, args, env) { return (function() {
+  var kwargs = {};
+  var children = [];
+  reduce(function(state, arg) { return (function() {
+  var skip = get(state, "skip");
+  return (isSxTruthy(skip) ? assoc(state, "skip", false, "i", (get(state, "i") + 1)) : (isSxTruthy((isSxTruthy((typeOf(arg) == "keyword")) && ((get(state, "i") + 1) < len(args)))) ? (function() {
+  var val = trampoline(evalExpr(nth(args, (get(state, "i") + 1)), env));
+  kwargs[keywordName(arg)] = val;
+  return assoc(state, "skip", true, "i", (get(state, "i") + 1));
+})() : (append_b(children, arg), assoc(state, "i", (get(state, "i") + 1)))));
+})(); }, {["i"]: 0, ["skip"]: false}, args);
+  return (function() {
+  var local = envMerge(componentClosure(comp), env);
+  { var _c = componentParams(comp); for (var _i = 0; _i < _c.length; _i++) { var p = _c[_i]; local[p] = (isSxTruthy(dictHas(kwargs, p)) ? dictGet(kwargs, p) : NIL); } }
+  if (isSxTruthy(componentHasChildren(comp))) {
+  local["children"] = makeRawHtml(join("", map(function(c) { return renderToHtml(c, env); }, children)));
+}
+  return renderToHtml(componentBody(comp), local);
+})();
+})(); };
+
+  // render-html-element
+  var renderHtmlElement = function(tag, args, env) { return (function() {
+  var parsed = parseElementArgs(args, env);
+  var attrs = first(parsed);
+  var children = nth(parsed, 1);
+  var isVoid = contains(VOID_ELEMENTS, tag);
+  return (String("<") + String(tag) + String(renderAttrs(attrs)) + String((isSxTruthy(isVoid) ? " />" : (String(">") + String(join("", map(function(c) { return renderToHtml(c, env); }, children))) + String("</") + String(tag) + String(">")))));
+})(); };
+
+  // render-html-island
+  var renderHtmlIsland = function(island, args, env) { return (function() {
+  var kwargs = {};
+  var children = [];
+  reduce(function(state, arg) { return (function() {
+  var skip = get(state, "skip");
+  return (isSxTruthy(skip) ? assoc(state, "skip", false, "i", (get(state, "i") + 1)) : (isSxTruthy((isSxTruthy((typeOf(arg) == "keyword")) && ((get(state, "i") + 1) < len(args)))) ? (function() {
+  var val = trampoline(evalExpr(nth(args, (get(state, "i") + 1)), env));
+  kwargs[keywordName(arg)] = val;
+  return assoc(state, "skip", true, "i", (get(state, "i") + 1));
+})() : (append_b(children, arg), assoc(state, "i", (get(state, "i") + 1)))));
+})(); }, {["i"]: 0, ["skip"]: false}, args);
+  return (function() {
+  var local = envMerge(componentClosure(island), env);
+  var islandName = componentName(island);
+  { var _c = componentParams(island); for (var _i = 0; _i < _c.length; _i++) { var p = _c[_i]; local[p] = (isSxTruthy(dictHas(kwargs, p)) ? dictGet(kwargs, p) : NIL); } }
+  if (isSxTruthy(componentHasChildren(island))) {
+  local["children"] = makeRawHtml(join("", map(function(c) { return renderToHtml(c, env); }, children)));
+}
+  return (function() {
+  var bodyHtml = renderToHtml(componentBody(island), local);
+  var stateJson = serializeIslandState(kwargs);
+  return (String("<div data-sx-island=\"") + String(escapeAttr(islandName)) + String("\"") + String((isSxTruthy(stateJson) ? (String(" data-sx-state=\"") + String(escapeAttr(stateJson)) + String("\"")) : "")) + String(">") + String(bodyHtml) + String("</div>"));
+})();
+})();
+})(); };
+
+  // serialize-island-state
+  var serializeIslandState = function(kwargs) { return (isSxTruthy(isEmptyDict(kwargs)) ? NIL : jsonSerialize(kwargs)); };
+
+
+  // === Transpiled from adapter-sx ===
+
+  // render-to-sx
+  var renderToSx = function(expr, env) { return (function() {
+  var result = aser(expr, env);
+  return (isSxTruthy((typeOf(result) == "string")) ? result : serialize(result));
+})(); };
+
+  // aser
+  var aser = function(expr, env) { return (function() { var _m = typeOf(expr); if (_m == "number") return expr; if (_m == "string") return expr; if (_m == "boolean") return expr; if (_m == "nil") return NIL; if (_m == "symbol") return (function() {
+  var name = symbolName(expr);
+  return (isSxTruthy(envHas(env, name)) ? envGet(env, name) : (isSxTruthy(isPrimitive(name)) ? getPrimitive(name) : (isSxTruthy((name == "true")) ? true : (isSxTruthy((name == "false")) ? false : (isSxTruthy((name == "nil")) ? NIL : error((String("Undefined symbol: ") + String(name))))))));
+})(); if (_m == "keyword") return keywordName(expr); if (_m == "list") return (isSxTruthy(isEmpty(expr)) ? [] : aserList(expr, env)); return expr; })(); };
+
+  // aser-list
+  var aserList = function(expr, env) { return (function() {
+  var head = first(expr);
+  var args = rest(expr);
+  return (isSxTruthy(!isSxTruthy((typeOf(head) == "symbol"))) ? map(function(x) { return aser(x, env); }, expr) : (function() {
+  var name = symbolName(head);
+  return (isSxTruthy((name == "<>")) ? aserFragment(args, env) : (isSxTruthy(startsWith(name, "~")) ? aserCall(name, args, env) : (isSxTruthy(contains(HTML_TAGS, name)) ? aserCall(name, args, env) : (isSxTruthy(sxOr(isSpecialForm(name), isHoForm(name))) ? aserSpecial(name, expr, env) : (isSxTruthy((isSxTruthy(envHas(env, name)) && isMacro(envGet(env, name)))) ? aser(expandMacro(envGet(env, name), args, env), env) : (function() {
+  var f = trampoline(evalExpr(head, env));
+  var evaledArgs = map(function(a) { return trampoline(evalExpr(a, env)); }, args);
+  return (isSxTruthy((isSxTruthy(isCallable(f)) && isSxTruthy(!isSxTruthy(isLambda(f))) && isSxTruthy(!isSxTruthy(isComponent(f))) && !isSxTruthy(isIsland(f)))) ? apply(f, evaledArgs) : (isSxTruthy(isLambda(f)) ? trampoline(callLambda(f, evaledArgs, env)) : (isSxTruthy(isComponent(f)) ? aserCall((String("~") + String(componentName(f))), args, env) : (isSxTruthy(isIsland(f)) ? aserCall((String("~") + String(componentName(f))), args, env) : error((String("Not callable: ") + String(inspect(f))))))));
+})())))));
+})());
+})(); };
+
+  // aser-fragment
+  var aserFragment = function(children, env) { return (function() {
+  var parts = filter(function(x) { return !isSxTruthy(isNil(x)); }, map(function(c) { return aser(c, env); }, children));
+  return (isSxTruthy(isEmpty(parts)) ? "" : (String("(<> ") + String(join(" ", map(serialize, parts))) + String(")")));
+})(); };
+
+  // aser-call
+  var aserCall = function(name, args, env) { return (function() {
+  var parts = [name];
+  reduce(function(state, arg) { return (function() {
+  var skip = get(state, "skip");
+  return (isSxTruthy(skip) ? assoc(state, "skip", false, "i", (get(state, "i") + 1)) : (isSxTruthy((isSxTruthy((typeOf(arg) == "keyword")) && ((get(state, "i") + 1) < len(args)))) ? (function() {
+  var val = aser(nth(args, (get(state, "i") + 1)), env);
+  if (isSxTruthy(!isSxTruthy(isNil(val)))) {
+  parts.push((String(":") + String(keywordName(arg))));
+  parts.push(serialize(val));
+}
+  return assoc(state, "skip", true, "i", (get(state, "i") + 1));
+})() : (function() {
+  var val = aser(arg, env);
+  if (isSxTruthy(!isSxTruthy(isNil(val)))) {
+  parts.push(serialize(val));
+}
+  return assoc(state, "i", (get(state, "i") + 1));
+})()));
+})(); }, {["i"]: 0, ["skip"]: false}, args);
+  return (String("(") + String(join(" ", parts)) + String(")"));
+})(); };
+
+  // SPECIAL_FORM_NAMES
+  var SPECIAL_FORM_NAMES = ["if", "when", "cond", "case", "and", "or", "let", "let*", "lambda", "fn", "define", "defcomp", "defmacro", "defstyle", "defhandler", "defpage", "defquery", "defaction", "defrelation", "begin", "do", "quote", "quasiquote", "->", "set!", "letrec", "dynamic-wind", "defisland"];
+
+  // HO_FORM_NAMES
+  var HO_FORM_NAMES = ["map", "map-indexed", "filter", "reduce", "some", "every?", "for-each"];
+
+  // special-form?
+  var isSpecialForm = function(name) { return contains(SPECIAL_FORM_NAMES, name); };
+
+  // ho-form?
+  var isHoForm = function(name) { return contains(HO_FORM_NAMES, name); };
+
+  // aser-special
+  var aserSpecial = function(name, expr, env) { return (function() {
+  var args = rest(expr);
+  return (isSxTruthy((name == "if")) ? (isSxTruthy(trampoline(evalExpr(first(args), env))) ? aser(nth(args, 1), env) : (isSxTruthy((len(args) > 2)) ? aser(nth(args, 2), env) : NIL)) : (isSxTruthy((name == "when")) ? (isSxTruthy(!isSxTruthy(trampoline(evalExpr(first(args), env)))) ? NIL : (function() {
+  var result = NIL;
+  { var _c = rest(args); for (var _i = 0; _i < _c.length; _i++) { var body = _c[_i]; result = aser(body, env); } }
+  return result;
+})()) : (isSxTruthy((name == "cond")) ? (function() {
+  var branch = evalCond(args, env);
+  return (isSxTruthy(branch) ? aser(branch, env) : NIL);
+})() : (isSxTruthy((name == "case")) ? (function() {
+  var matchVal = trampoline(evalExpr(first(args), env));
+  var clauses = rest(args);
+  return evalCaseAser(matchVal, clauses, env);
+})() : (isSxTruthy(sxOr((name == "let"), (name == "let*"))) ? (function() {
+  var local = processBindings(first(args), env);
+  var result = NIL;
+  { var _c = rest(args); for (var _i = 0; _i < _c.length; _i++) { var body = _c[_i]; result = aser(body, local); } }
+  return result;
+})() : (isSxTruthy(sxOr((name == "begin"), (name == "do"))) ? (function() {
+  var result = NIL;
+  { var _c = args; for (var _i = 0; _i < _c.length; _i++) { var body = _c[_i]; result = aser(body, env); } }
+  return result;
+})() : (isSxTruthy((name == "and")) ? (function() {
+  var result = true;
+  some(function(arg) { result = trampoline(evalExpr(arg, env));
+return !isSxTruthy(result); }, args);
+  return result;
+})() : (isSxTruthy((name == "or")) ? (function() {
+  var result = false;
+  some(function(arg) { result = trampoline(evalExpr(arg, env));
+return result; }, args);
+  return result;
+})() : (isSxTruthy((name == "map")) ? (function() {
+  var f = trampoline(evalExpr(first(args), env));
+  var coll = trampoline(evalExpr(nth(args, 1), env));
+  return map(function(item) { return (isSxTruthy(isLambda(f)) ? (function() {
+  var local = envMerge(lambdaClosure(f), env);
+  local[first(lambdaParams(f))] = item;
+  return aser(lambdaBody(f), local);
+})() : invoke(f, item)); }, coll);
+})() : (isSxTruthy((name == "map-indexed")) ? (function() {
+  var f = trampoline(evalExpr(first(args), env));
+  var coll = trampoline(evalExpr(nth(args, 1), env));
+  return mapIndexed(function(i, item) { return (isSxTruthy(isLambda(f)) ? (function() {
+  var local = envMerge(lambdaClosure(f), env);
+  local[first(lambdaParams(f))] = i;
+  local[nth(lambdaParams(f), 1)] = item;
+  return aser(lambdaBody(f), local);
+})() : invoke(f, i, item)); }, coll);
+})() : (isSxTruthy((name == "for-each")) ? (function() {
+  var f = trampoline(evalExpr(first(args), env));
+  var coll = trampoline(evalExpr(nth(args, 1), env));
+  var results = [];
+  { var _c = coll; for (var _i = 0; _i < _c.length; _i++) { var item = _c[_i]; (isSxTruthy(isLambda(f)) ? (function() {
+  var local = envMerge(lambdaClosure(f), env);
+  local[first(lambdaParams(f))] = item;
+  return append_b(results, aser(lambdaBody(f), local));
+})() : invoke(f, item)); } }
+  return (isSxTruthy(isEmpty(results)) ? NIL : results);
+})() : (isSxTruthy((name == "defisland")) ? (trampoline(evalExpr(expr, env)), serialize(expr)) : (isSxTruthy(sxOr((name == "define"), (name == "defcomp"), (name == "defmacro"), (name == "defstyle"), (name == "defhandler"), (name == "defpage"), (name == "defquery"), (name == "defaction"), (name == "defrelation"))) ? (trampoline(evalExpr(expr, env)), NIL) : trampoline(evalExpr(expr, env)))))))))))))));
+})(); };
+
+  // eval-case-aser
+  var evalCaseAser = function(matchVal, clauses, env) { return (isSxTruthy((len(clauses) < 2)) ? NIL : (function() {
+  var test = first(clauses);
+  var body = nth(clauses, 1);
+  return (isSxTruthy(sxOr((isSxTruthy((typeOf(test) == "keyword")) && (keywordName(test) == "else")), (isSxTruthy((typeOf(test) == "symbol")) && sxOr((symbolName(test) == ":else"), (symbolName(test) == "else"))))) ? aser(body, env) : (isSxTruthy((matchVal == trampoline(evalExpr(test, env)))) ? aser(body, env) : evalCaseAser(matchVal, slice(clauses, 2), env)));
+})()); };
+
 
   // === Transpiled from adapter-dom ===
 
@@ -1229,10 +1492,7 @@ continue; } else { return NIL; } } };
   return (isSxTruthy(skip) ? assoc(state, "skip", false, "i", (get(state, "i") + 1)) : (isSxTruthy((isSxTruthy((typeOf(arg) == "keyword")) && ((get(state, "i") + 1) < len(args)))) ? (function() {
   var attrName = keywordName(arg);
   var attrVal = trampoline(evalExpr(nth(args, (get(state, "i") + 1)), env));
-  (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? (function() {
-  var eventName = substring(attrName, 3, stringLength(attrName));
-  return domListen(el, eventName, attrVal);
-})() : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal)))))));
+  (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? domListen(el, slice(attrName, 3), attrVal) : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal)))))));
   return assoc(state, "skip", true, "i", (get(state, "i") + 1));
 })() : ((isSxTruthy(!isSxTruthy(contains(VOID_ELEMENTS, tag))) ? domAppend(el, renderToDom(arg, env, newNs)) : NIL), assoc(state, "i", (get(state, "i") + 1)))));
 })(); }, {["i"]: 0, ["skip"]: false}, args);
@@ -2445,7 +2705,8 @@ callExpr.push(dictGet(kwargs, k)); } }
   { var _c = componentParams(comp); for (var _i = 0; _i < _c.length; _i++) { var p = _c[_i]; local[p] = (isSxTruthy(dictHas(kwargs, p)) ? dictGet(kwargs, p) : NIL); } }
   return (function() {
   var bodyDom = withIslandScope(function(disposable) { return append_b(disposers, disposable); }, function() { return renderToDom(componentBody(comp), local, NIL); });
-  morphChildren(el, bodyDom);
+  domSetTextContent(el, "");
+  domAppend(el, bodyDom);
   domSetData(el, "sx-disposers", disposers);
   processElements(el);
   return logInfo((String("hydrated island: ") + String(compName) + String(" (") + String(len(disposers)) + String(" disposers)")));
@@ -2577,7 +2838,7 @@ return (function() {
   var prev = getTrackingContext();
   setTrackingContext(ctx);
   return (function() {
-  var newVal = computeFn();
+  var newVal = invoke(computeFn);
   setTrackingContext(prev);
   signalSetDeps(s, trackingContextDeps(ctx));
   return (function() {
@@ -2599,13 +2860,13 @@ return (function() {
   var disposed = false;
   var cleanupFn = NIL;
   return (function() {
-  var runEffect = function() { return (isSxTruthy(!isSxTruthy(disposed)) ? ((isSxTruthy(cleanupFn) ? cleanupFn() : NIL), forEach(function(dep) { return signalRemoveSub(dep, runEffect); }, deps), (deps = []), (function() {
+  var runEffect = function() { return (isSxTruthy(!isSxTruthy(disposed)) ? ((isSxTruthy(cleanupFn) ? invoke(cleanupFn) : NIL), forEach(function(dep) { return signalRemoveSub(dep, runEffect); }, deps), (deps = []), (function() {
   var ctx = makeTrackingContext(runEffect);
   return (function() {
   var prev = getTrackingContext();
   setTrackingContext(ctx);
   return (function() {
-  var result = effectFn();
+  var result = invoke(effectFn);
   setTrackingContext(prev);
   deps = trackingContextDeps(ctx);
   return (isSxTruthy(isCallable(result)) ? (cleanupFn = result) : NIL);
@@ -2615,7 +2876,7 @@ return (function() {
   runEffect();
   return function() { disposed = true;
 if (isSxTruthy(cleanupFn)) {
-  cleanupFn();
+  invoke(cleanupFn);
 }
 { var _c = deps; for (var _i = 0; _i < _c.length; _i++) { var dep = _c[_i]; signalRemoveSub(dep, runEffect); } }
 return (deps = []); };
@@ -2630,7 +2891,7 @@ return (deps = []); };
 
   // batch
   var batch = function(thunk) { _batchDepth = (_batchDepth + 1);
-thunk();
+invoke(thunk);
 _batchDepth = (_batchDepth - 1);
 return (isSxTruthy((_batchDepth == 0)) ? (function() {
   var queue = _batchQueue;
@@ -2679,7 +2940,7 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   var defStore = function(name, initFn) { return (function() {
   var registry = _storeRegistry;
   if (isSxTruthy(!isSxTruthy(hasKey_p(registry, name)))) {
-  _storeRegistry = assoc(registry, name, initFn());
+  _storeRegistry = assoc(registry, name, invoke(initFn));
 }
   return get(_storeRegistry, name);
 })(); };
@@ -2700,7 +2961,7 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   var bridgeEvent = function(el, eventName, targetSignal, transformFn) { return effect(function() { return (function() {
   var remove = domListen(el, eventName, function(e) { return (function() {
   var detail = eventDetail(e);
-  var newVal = (isSxTruthy(transformFn) ? transformFn(detail) : detail);
+  var newVal = (isSxTruthy(transformFn) ? invoke(transformFn, detail) : detail);
   return reset_b(targetSignal, newVal);
 })(); });
   return remove;
@@ -2858,8 +3119,12 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
 
   function domListen(el, name, handler) {
     if (!_hasDom || !el) return function() {};
-    el.addEventListener(name, handler);
-    return function() { el.removeEventListener(name, handler); };
+    // Wrap SX lambdas from runtime-evaluated island code into native fns
+    var wrapped = isLambda(handler)
+      ? function(e) { invoke(handler, e); }
+      : handler;
+    el.addEventListener(name, wrapped);
+    return function() { el.removeEventListener(name, wrapped); };
   }
 
   function eventDetail(e) {
@@ -2900,79 +3165,8 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
     try { return JSON.parse(s); } catch(e) { return {}; }
   }
 
-  // =========================================================================
-  // Performance overrides — replace transpiled spec with imperative JS
-  // =========================================================================
-
-  // Override renderDomComponent: imperative kwarg parsing, no reduce/assoc
-  renderDomComponent = function(comp, args, env, ns) {
-    // Parse keyword args imperatively
-    var kwargs = {};
-    var children = [];
-    for (var i = 0; i < args.length; i++) {
-      var arg = args[i];
-      if (arg && arg._kw && (i + 1) < args.length) {
-        kwargs[arg.name] = trampoline(evalExpr(args[i + 1], env));
-        i++; // skip value
-      } else {
-        children.push(arg);
-      }
-    }
-    // Build local env via prototype chain
-    var local = Object.create(componentClosure(comp));
-    // Copy caller env own properties
-    for (var k in env) if (env.hasOwnProperty(k)) local[k] = env[k];
-    // Bind params
-    var params = componentParams(comp);
-    for (var j = 0; j < params.length; j++) {
-      var p = params[j];
-      local[p] = p in kwargs ? kwargs[p] : NIL;
-    }
-    // Bind children
-    if (componentHasChildren(comp)) {
-      var childFrag = document.createDocumentFragment();
-      for (var c = 0; c < children.length; c++) {
-        var rendered = renderToDom(children[c], env, ns);
-        if (rendered) childFrag.appendChild(rendered);
-      }
-      local["children"] = childFrag;
-    }
-    return renderToDom(componentBody(comp), local, ns);
-  };
-
-  // Override renderDomElement: imperative attr parsing, no reduce/assoc
-  renderDomElement = function(tag, args, env, ns) {
-    var newNs = tag === "svg" ? SVG_NS : tag === "math" ? MATH_NS : ns;
-    var el = domCreateElement(tag, newNs);
-    var extraClasses = [];
-    var isVoid = contains(VOID_ELEMENTS, tag);
-    for (var i = 0; i < args.length; i++) {
-      var arg = args[i];
-      if (arg && arg._kw && (i + 1) < args.length) {
-        var attrName = arg.name;
-        var attrVal = trampoline(evalExpr(args[i + 1], env));
-        i++; // skip value
-        if (isNil(attrVal) || attrVal === false) continue;
-        if (contains(BOOLEAN_ATTRS, attrName)) {
-          if (isSxTruthy(attrVal)) el.setAttribute(attrName, "");
-        } else if (attrVal === true) {
-          el.setAttribute(attrName, "");
-        } else {
-          el.setAttribute(attrName, String(attrVal));
-        }
-      } else {
-        if (!isVoid) {
-          var child = renderToDom(arg, env, newNs);
-          if (child) el.appendChild(child);
-        }
-      }
-    }
-    if (extraClasses.length) {
-      var existing = el.getAttribute("class") || "";
-      el.setAttribute("class", (existing ? existing + " " : "") + extraClasses.join(" "));
-    }
-    return el;
-  };
+  // renderDomComponent and renderDomElement are transpiled from
+  // adapter-dom.sx — no imperative overrides needed.
 
 
   // =========================================================================
@@ -3092,8 +3286,14 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
 
   // --- Timers ---
 
-  function setTimeout_(fn, ms) { return setTimeout(fn, ms || 0); }
-  function setInterval_(fn, ms) { return setInterval(fn, ms || 1000); }
+  function _wrapSxFn(fn) {
+    if (fn && fn._lambda) {
+      return function() { return trampoline(callLambda(fn, [], lambdaClosure(fn))); };
+    }
+    return fn;
+  }
+  function setTimeout_(fn, ms) { return setTimeout(_wrapSxFn(fn), ms || 0); }
+  function setInterval_(fn, ms) { return setInterval(_wrapSxFn(fn), ms || 1000); }
   function clearTimeout_(id) { clearTimeout(id); }
   function clearInterval_(id) { clearInterval(id); }
   function requestAnimationFrame_(fn) {
@@ -3619,6 +3819,8 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
         logInfo("sx:route server " + pathname);
         executeRequest(link, { method: "GET", url: liveHref }).then(function() {
           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));
         });
       }
     });
@@ -4004,11 +4206,14 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   };
 
   // Expose render functions as primitives so SX code can call them
+  if (typeof renderToHtml === "function") PRIMITIVES["render-to-html"] = renderToHtml;
+  if (typeof renderToSx === "function") PRIMITIVES["render-to-sx"] = renderToSx;
+  if (typeof aser === "function") PRIMITIVES["aser"] = aser;
   if (typeof renderToDom === "function") PRIMITIVES["render-to-dom"] = renderToDom;
 
   // Expose signal functions as primitives so runtime-evaluated SX code
   // (e.g. island bodies from .sx files) can call them
-  PRIMITIVES["signal"] = createSignal;
+  PRIMITIVES["signal"] = signal;
   PRIMITIVES["signal?"] = isSignal;
   PRIMITIVES["deref"] = deref;
   PRIMITIVES["reset!"] = reset_b;
@@ -4016,7 +4221,9 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   PRIMITIVES["computed"] = computed;
   PRIMITIVES["effect"] = effect;
   PRIMITIVES["batch"] = batch;
-  PRIMITIVES["dispose"] = dispose;
+  // Timer primitives for island code
+  PRIMITIVES["set-interval"] = setInterval_;
+  PRIMITIVES["clear-interval"] = clearInterval_;
   // Reactive DOM helpers for island code
   PRIMITIVES["reactive-text"] = reactiveText;
   PRIMITIVES["create-text-node"] = createTextNode;
@@ -4200,9 +4407,10 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
         return null;
       }
 
-      // Component
+      // Component or Island
       if (hname.charAt(0) === "~") {
         var comp = env[hname];
+        if (comp && comp._island) return renderDomIsland(comp, expr.slice(1), env, ns);
         if (comp && comp._component) return asyncRenderComponent(comp, expr.slice(1), env, ns);
         if (comp && comp._macro) {
           var expanded = trampoline(expandMacro(comp, expr.slice(1), env));
@@ -4691,12 +4899,25 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   }
 
   function render(source) {
+    if (!_hasDom) {
+      var exprs = parse(source);
+      var parts = [];
+      for (var i = 0; i < exprs.length; i++) parts.push(renderToHtml(exprs[i], merge(componentEnv)));
+      return parts.join("");
+    }
     var exprs = parse(source);
     var frag = document.createDocumentFragment();
     for (var i = 0; i < exprs.length; i++) frag.appendChild(renderToDom(exprs[i], merge(componentEnv), null));
     return frag;
   }
 
+  function renderToString(source) {
+    var exprs = parse(source);
+    var parts = [];
+    for (var i = 0; i < exprs.length; i++) parts.push(renderToHtml(exprs[i], merge(componentEnv)));
+    return parts.join("");
+  }
+
   var Sx = {
     VERSION: "ref-2.0",
     parse: parse,
@@ -4704,7 +4925,7 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
     eval: function(expr, env) { return trampoline(evalExpr(expr, env || merge(componentEnv))); },
     loadComponents: loadComponents,
     render: render,
-    
+    renderToString: renderToString,
     serialize: serialize,
     NIL: NIL,
     Symbol: Symbol,
@@ -4712,6 +4933,8 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
     isTruthy: isSxTruthy,
     isNil: isNil,
     componentEnv: componentEnv,
+    renderToHtml: function(expr, env) { return renderToHtml(expr, env || merge(componentEnv)); },
+    renderToSx: function(expr, env) { return renderToSx(expr, env || merge(componentEnv)); },
     renderToDom: _hasDom ? function(expr, env, ns) { return renderToDom(expr, env || merge(componentEnv), ns || null); } : null,
     parseTriggerSpec: typeof parseTriggerSpec === "function" ? parseTriggerSpec : null,
     parseTime: typeof parseTime === "function" ? parseTime : null,
@@ -4759,7 +4982,7 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
     emitEvent: emitEvent,
     onEvent: onEvent,
     bridgeEvent: bridgeEvent,
-    _version: "ref-2.0 (boot+dom+engine+orchestration+parser, bootstrap-compiled)"
+    _version: "ref-2.0 (boot+dom+engine+html+orchestration+parser+sx, bootstrap-compiled)"
   };
 
 

shared/static/scripts/sx-ref.js

@@ -14,7 +14,7 @@
   // =========================================================================
 
   var NIL = Object.freeze({ _nil: true, toString: function() { return "nil"; } });
-  var SX_VERSION = "2026-03-08T11:49:09Z";
+  var SX_VERSION = "2026-03-08T15:15:32Z";
 
   function isNil(x) { return x === NIL || x === null || x === undefined; }
   function isSxTruthy(x) { return x !== false && !isNil(x); }
@@ -191,6 +191,17 @@
   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;
+  }
+
   // JSON / dict helpers for island state serialization
   function jsonSerialize(obj) {
     try { return JSON.stringify(obj); } catch(e) { return "{}"; }
@@ -216,17 +227,8 @@
 
   // Render-expression detection — lets the evaluator delegate to the active adapter.
   // Matches HTML tags, SVG tags, <>, raw!, ~components, html: prefix, custom elements.
-  function isRenderExpr(expr) {
-    if (!Array.isArray(expr) || !expr.length) return false;
-    var h = expr[0];
-    if (!h || !h._sym) return false;
-    var n = h.name;
-    return !!(n === "<>" || n === "raw!" ||
-              n.charAt(0) === "~" || n.indexOf("html:") === 0 ||
-              (typeof HTML_TAGS !== "undefined" && HTML_TAGS.indexOf(n) >= 0) ||
-              (typeof SVG_TAGS !== "undefined" && SVG_TAGS.indexOf(n) >= 0) ||
-              (n.indexOf("-") > 0 && expr.length > 1 && expr[1] && expr[1]._kw));
-  }
+  // Placeholder — overridden by transpiled version from render.sx
+  function isRenderExpr(expr) { return false; }
 
   // Render dispatch — call the active adapter's render function.
   // Set by each adapter when loaded; defaults to identity (no rendering).
@@ -322,6 +324,8 @@
   PRIMITIVES["starts-with?"] = function(s, p) { return String(s).indexOf(p) === 0; };
   PRIMITIVES["ends-with?"] = function(s, p) { var str = String(s); return str.indexOf(p, str.length - p.length) !== -1; };
   PRIMITIVES["slice"] = function(c, a, b) { return b !== undefined ? c.slice(a, b) : c.slice(a); };
+  PRIMITIVES["substring"] = function(s, a, b) { return String(s).substring(a, b); };
+  PRIMITIVES["string-length"] = function(s) { return String(s).length; };
   PRIMITIVES["concat"] = function() {
     var out = [];
     for (var i = 0; i < arguments.length; i++) if (!isNil(arguments[i])) out = out.concat(arguments[i]);
@@ -465,7 +469,10 @@
   var range = PRIMITIVES["range"];
   function zip(a, b) { var r = []; for (var i = 0; i < Math.min(a.length, b.length); i++) r.push([a[i], b[i]]); return r; }
   function append_b(arr, x) { arr.push(x); return arr; }
-  var apply = function(f, args) { return f.apply(null, args); };
+  var apply = function(f, args) {
+    if (isLambda(f)) return trampoline(callLambda(f, args, lambdaClosure(f)));
+    return f.apply(null, args);
+  };
 
   // Additional primitive aliases used by adapter/engine transpiled code
   var split = PRIMITIVES["split"];
@@ -484,28 +491,12 @@
   function escapeAttr(s) { return escapeHtml(s); }
   function rawHtmlContent(r) { return r.html; }
   function makeRawHtml(s) { return { _raw: true, html: s }; }
+  function sxExprSource(x) { return x && x.source ? x.source : String(x); }
 
-  // Serializer
-  function serialize(val) {
-    if (isNil(val)) return "nil";
-    if (typeof val === "boolean") return val ? "true" : "false";
-    if (typeof val === "number") return String(val);
-    if (typeof val === "string") return '"' + val.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"';
-    if (isSym(val)) return val.name;
-    if (isKw(val)) return ":" + val.name;
-    if (Array.isArray(val)) return "(" + val.map(serialize).join(" ") + ")";
-    return String(val);
-  }
-
-  function isSpecialForm(n) { return n in {
-    "if":1,"when":1,"cond":1,"case":1,"and":1,"or":1,"let":1,"let*":1,
-    "lambda":1,"fn":1,"define":1,"defcomp":1,"defmacro":1,"defstyle":1,
-    "defhandler":1,"begin":1,"do":1,
-    "quote":1,"quasiquote":1,"->":1,"set!":1
-  }; }
-  function isHoForm(n) { return n in {
-    "map":1,"map-indexed":1,"filter":1,"reduce":1,"some":1,"every?":1,"for-each":1
-  }; }
+  // Placeholders — overridden by transpiled spec from parser.sx / adapter-sx.sx
+  function serialize(val) { return String(val); }
+  function isSpecialForm(n) { return false; }
+  function isHoForm(n) { return false; }
 
   // processBindings and evalCond — now specced in render.sx, bootstrapped above
 
@@ -572,92 +563,6 @@
     return makeThunk(componentBody(comp), local);
   };
 
-  // =========================================================================
-  // Platform: deps module — component dependency analysis
-  // =========================================================================
-
-  function componentDeps(c) {
-    return c.deps ? c.deps.slice() : [];
-  }
-
-  function componentSetDeps(c, deps) {
-    c.deps = deps;
-  }
-
-  function componentCssClasses(c) {
-    return c.cssClasses ? c.cssClasses.slice() : [];
-  }
-
-  function envComponents(env) {
-    var names = [];
-    for (var k in env) {
-      var v = env[k];
-      if (v && (v._component || v._macro)) names.push(k);
-    }
-    return names;
-  }
-
-  function regexFindAll(pattern, source) {
-    var re = new RegExp(pattern, "g");
-    var results = [];
-    var m;
-    while ((m = re.exec(source)) !== null) {
-      if (m[1] !== undefined) results.push(m[1]);
-      else results.push(m[0]);
-    }
-    return results;
-  }
-
-  function scanCssClasses(source) {
-    var classes = {};
-    var result = [];
-    var m;
-    var re1 = /:class\s+"([^"]*)"/g;
-    while ((m = re1.exec(source)) !== null) {
-      var parts = m[1].split(/\s+/);
-      for (var i = 0; i < parts.length; i++) {
-        if (parts[i] && !classes[parts[i]]) {
-          classes[parts[i]] = true;
-          result.push(parts[i]);
-        }
-      }
-    }
-    var re2 = /:class\s+\(str\s+((?:"[^"]*"\s*)+)\)/g;
-    while ((m = re2.exec(source)) !== null) {
-      var re3 = /"([^"]*)"/g;
-      var m2;
-      while ((m2 = re3.exec(m[1])) !== null) {
-        var parts2 = m2[1].split(/\s+/);
-        for (var j = 0; j < parts2.length; j++) {
-          if (parts2[j] && !classes[parts2[j]]) {
-            classes[parts2[j]] = true;
-            result.push(parts2[j]);
-          }
-        }
-      }
-    }
-    var re4 = /;;\s*@css\s+(.+)/g;
-    while ((m = re4.exec(source)) !== null) {
-      var parts3 = m[1].split(/\s+/);
-      for (var k = 0; k < parts3.length; k++) {
-        if (parts3[k] && !classes[parts3[k]]) {
-          classes[parts3[k]] = true;
-          result.push(parts3[k]);
-        }
-      }
-    }
-    return result;
-  }
-
-  function componentIoRefs(c) {
-    return c.ioRefs ? c.ioRefs.slice() : [];
-  }
-
-  function componentSetIoRefs(c, refs) {
-    c.ioRefs = refs;
-  }
-
-
   // =========================================================================
   // Platform interface — Parser
   // =========================================================================
@@ -1163,6 +1068,15 @@ return append_b(inits, nth(binding, 1)); }, bindings) : reduce(function(acc, pai
   return local;
 })(); };
 
+  // is-render-expr?
+  var isRenderExpr = function(expr) { return (isSxTruthy(sxOr(!isSxTruthy((typeOf(expr) == "list")), isEmpty(expr))) ? false : (function() {
+  var h = first(expr);
+  return (isSxTruthy(!isSxTruthy((typeOf(h) == "symbol"))) ? false : (function() {
+  var n = symbolName(h);
+  return sxOr((n == "<>"), (n == "raw!"), startsWith(n, "~"), startsWith(n, "html:"), contains(HTML_TAGS, n), (isSxTruthy((indexOf_(n, "-") > 0)) && isSxTruthy((len(expr) > 1)) && (typeOf(nth(expr, 1)) == "keyword")));
+})());
+})()); };
+
 
   // === Transpiled from parser ===
 
@@ -1274,6 +1188,9 @@ continue; } else { return NIL; } } };
   // sx-serialize-dict
   var sxSerializeDict = function(d) { return (String("{") + String(join(" ", reduce(function(acc, key) { return concat(acc, [(String(":") + String(key)), sxSerialize(dictGet(d, key))]); }, [], keys(d)))) + String("}")); };
 
+  // serialize
+  var serialize = sxSerialize;
+
 
   // === Transpiled from adapter-html ===
 
@@ -1452,6 +1369,88 @@ continue; } else { return NIL; } } };
   return (String("(") + String(join(" ", parts)) + String(")"));
 })(); };
 
+  // SPECIAL_FORM_NAMES
+  var SPECIAL_FORM_NAMES = ["if", "when", "cond", "case", "and", "or", "let", "let*", "lambda", "fn", "define", "defcomp", "defmacro", "defstyle", "defhandler", "defpage", "defquery", "defaction", "defrelation", "begin", "do", "quote", "quasiquote", "->", "set!", "letrec", "dynamic-wind", "defisland"];
+
+  // HO_FORM_NAMES
+  var HO_FORM_NAMES = ["map", "map-indexed", "filter", "reduce", "some", "every?", "for-each"];
+
+  // special-form?
+  var isSpecialForm = function(name) { return contains(SPECIAL_FORM_NAMES, name); };
+
+  // ho-form?
+  var isHoForm = function(name) { return contains(HO_FORM_NAMES, name); };
+
+  // aser-special
+  var aserSpecial = function(name, expr, env) { return (function() {
+  var args = rest(expr);
+  return (isSxTruthy((name == "if")) ? (isSxTruthy(trampoline(evalExpr(first(args), env))) ? aser(nth(args, 1), env) : (isSxTruthy((len(args) > 2)) ? aser(nth(args, 2), env) : NIL)) : (isSxTruthy((name == "when")) ? (isSxTruthy(!isSxTruthy(trampoline(evalExpr(first(args), env)))) ? NIL : (function() {
+  var result = NIL;
+  { var _c = rest(args); for (var _i = 0; _i < _c.length; _i++) { var body = _c[_i]; result = aser(body, env); } }
+  return result;
+})()) : (isSxTruthy((name == "cond")) ? (function() {
+  var branch = evalCond(args, env);
+  return (isSxTruthy(branch) ? aser(branch, env) : NIL);
+})() : (isSxTruthy((name == "case")) ? (function() {
+  var matchVal = trampoline(evalExpr(first(args), env));
+  var clauses = rest(args);
+  return evalCaseAser(matchVal, clauses, env);
+})() : (isSxTruthy(sxOr((name == "let"), (name == "let*"))) ? (function() {
+  var local = processBindings(first(args), env);
+  var result = NIL;
+  { var _c = rest(args); for (var _i = 0; _i < _c.length; _i++) { var body = _c[_i]; result = aser(body, local); } }
+  return result;
+})() : (isSxTruthy(sxOr((name == "begin"), (name == "do"))) ? (function() {
+  var result = NIL;
+  { var _c = args; for (var _i = 0; _i < _c.length; _i++) { var body = _c[_i]; result = aser(body, env); } }
+  return result;
+})() : (isSxTruthy((name == "and")) ? (function() {
+  var result = true;
+  some(function(arg) { result = trampoline(evalExpr(arg, env));
+return !isSxTruthy(result); }, args);
+  return result;
+})() : (isSxTruthy((name == "or")) ? (function() {
+  var result = false;
+  some(function(arg) { result = trampoline(evalExpr(arg, env));
+return result; }, args);
+  return result;
+})() : (isSxTruthy((name == "map")) ? (function() {
+  var f = trampoline(evalExpr(first(args), env));
+  var coll = trampoline(evalExpr(nth(args, 1), env));
+  return map(function(item) { return (isSxTruthy(isLambda(f)) ? (function() {
+  var local = envMerge(lambdaClosure(f), env);
+  local[first(lambdaParams(f))] = item;
+  return aser(lambdaBody(f), local);
+})() : invoke(f, item)); }, coll);
+})() : (isSxTruthy((name == "map-indexed")) ? (function() {
+  var f = trampoline(evalExpr(first(args), env));
+  var coll = trampoline(evalExpr(nth(args, 1), env));
+  return mapIndexed(function(i, item) { return (isSxTruthy(isLambda(f)) ? (function() {
+  var local = envMerge(lambdaClosure(f), env);
+  local[first(lambdaParams(f))] = i;
+  local[nth(lambdaParams(f), 1)] = item;
+  return aser(lambdaBody(f), local);
+})() : invoke(f, i, item)); }, coll);
+})() : (isSxTruthy((name == "for-each")) ? (function() {
+  var f = trampoline(evalExpr(first(args), env));
+  var coll = trampoline(evalExpr(nth(args, 1), env));
+  var results = [];
+  { var _c = coll; for (var _i = 0; _i < _c.length; _i++) { var item = _c[_i]; (isSxTruthy(isLambda(f)) ? (function() {
+  var local = envMerge(lambdaClosure(f), env);
+  local[first(lambdaParams(f))] = item;
+  return append_b(results, aser(lambdaBody(f), local));
+})() : invoke(f, item)); } }
+  return (isSxTruthy(isEmpty(results)) ? NIL : results);
+})() : (isSxTruthy((name == "defisland")) ? (trampoline(evalExpr(expr, env)), serialize(expr)) : (isSxTruthy(sxOr((name == "define"), (name == "defcomp"), (name == "defmacro"), (name == "defstyle"), (name == "defhandler"), (name == "defpage"), (name == "defquery"), (name == "defaction"), (name == "defrelation"))) ? (trampoline(evalExpr(expr, env)), NIL) : trampoline(evalExpr(expr, env)))))))))))))));
+})(); };
+
+  // eval-case-aser
+  var evalCaseAser = function(matchVal, clauses, env) { return (isSxTruthy((len(clauses) < 2)) ? NIL : (function() {
+  var test = first(clauses);
+  var body = nth(clauses, 1);
+  return (isSxTruthy(sxOr((isSxTruthy((typeOf(test) == "keyword")) && (keywordName(test) == "else")), (isSxTruthy((typeOf(test) == "symbol")) && sxOr((symbolName(test) == ":else"), (symbolName(test) == "else"))))) ? aser(body, env) : (isSxTruthy((matchVal == trampoline(evalExpr(test, env)))) ? aser(body, env) : evalCaseAser(matchVal, slice(clauses, 2), env)));
+})()); };
+
 
   // === Transpiled from adapter-dom ===
 
@@ -1493,10 +1492,7 @@ continue; } else { return NIL; } } };
   return (isSxTruthy(skip) ? assoc(state, "skip", false, "i", (get(state, "i") + 1)) : (isSxTruthy((isSxTruthy((typeOf(arg) == "keyword")) && ((get(state, "i") + 1) < len(args)))) ? (function() {
   var attrName = keywordName(arg);
   var attrVal = trampoline(evalExpr(nth(args, (get(state, "i") + 1)), env));
-  (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? (function() {
-  var eventName = substring(attrName, 3, stringLength(attrName));
-  return domListen(el, eventName, attrVal);
-})() : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal)))))));
+  (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? domListen(el, slice(attrName, 3), attrVal) : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal)))))));
   return assoc(state, "skip", true, "i", (get(state, "i") + 1));
 })() : ((isSxTruthy(!isSxTruthy(contains(VOID_ELEMENTS, tag))) ? domAppend(el, renderToDom(arg, env, newNs)) : NIL), assoc(state, "i", (get(state, "i") + 1)))));
 })(); }, {["i"]: 0, ["skip"]: false}, args);
@@ -2709,7 +2705,8 @@ callExpr.push(dictGet(kwargs, k)); } }
   { var _c = componentParams(comp); for (var _i = 0; _i < _c.length; _i++) { var p = _c[_i]; local[p] = (isSxTruthy(dictHas(kwargs, p)) ? dictGet(kwargs, p) : NIL); } }
   return (function() {
   var bodyDom = withIslandScope(function(disposable) { return append_b(disposers, disposable); }, function() { return renderToDom(componentBody(comp), local, NIL); });
-  morphChildren(el, bodyDom);
+  domSetTextContent(el, "");
+  domAppend(el, bodyDom);
   domSetData(el, "sx-disposers", disposers);
   processElements(el);
   return logInfo((String("hydrated island: ") + String(compName) + String(" (") + String(len(disposers)) + String(" disposers)")));
@@ -2729,146 +2726,6 @@ callExpr.push(dictGet(kwargs, k)); } }
   var bootInit = function() { return (logInfo((String("sx-browser ") + String(SX_VERSION))), initCssTracking(), processPageScripts(), processSxScripts(NIL), sxHydrateElements(NIL), sxHydrateIslands(NIL), processElements(NIL)); };
 
 
-  // === Transpiled from deps (component dependency analysis) ===
-
-  // scan-refs
-  var scanRefs = function(node) { return (function() {
-  var refs = [];
-  scanRefsWalk(node, refs);
-  return refs;
-})(); };
-
-  // scan-refs-walk
-  var scanRefsWalk = function(node, refs) { return (isSxTruthy((typeOf(node) == "symbol")) ? (function() {
-  var name = symbolName(node);
-  return (isSxTruthy(startsWith(name, "~")) ? (isSxTruthy(!isSxTruthy(contains(refs, name))) ? append_b(refs, name) : NIL) : NIL);
-})() : (isSxTruthy((typeOf(node) == "list")) ? forEach(function(item) { return scanRefsWalk(item, refs); }, node) : (isSxTruthy((typeOf(node) == "dict")) ? forEach(function(key) { return scanRefsWalk(dictGet(node, key), refs); }, keys(node)) : NIL))); };
-
-  // transitive-deps-walk
-  var transitiveDepsWalk = function(n, seen, env) { return (isSxTruthy(!isSxTruthy(contains(seen, n))) ? (append_b(seen, n), (function() {
-  var val = envGet(env, n);
-  return (isSxTruthy((typeOf(val) == "component")) ? forEach(function(ref) { return transitiveDepsWalk(ref, seen, env); }, scanRefs(componentBody(val))) : (isSxTruthy((typeOf(val) == "macro")) ? forEach(function(ref) { return transitiveDepsWalk(ref, seen, env); }, scanRefs(macroBody(val))) : NIL));
-})()) : NIL); };
-
-  // transitive-deps
-  var transitiveDeps = function(name, env) { return (function() {
-  var seen = [];
-  var key = (isSxTruthy(startsWith(name, "~")) ? name : (String("~") + String(name)));
-  transitiveDepsWalk(key, seen, env);
-  return filter(function(x) { return !isSxTruthy((x == key)); }, seen);
-})(); };
-
-  // compute-all-deps
-  var computeAllDeps = function(env) { return forEach(function(name) { return (function() {
-  var val = envGet(env, name);
-  return (isSxTruthy((typeOf(val) == "component")) ? componentSetDeps(val, transitiveDeps(name, env)) : NIL);
-})(); }, envComponents(env)); };
-
-  // scan-components-from-source
-  var scanComponentsFromSource = function(source) { return (function() {
-  var matches = regexFindAll("\\(~([a-zA-Z_][a-zA-Z0-9_\\-]*)", source);
-  return map(function(m) { return (String("~") + String(m)); }, matches);
-})(); };
-
-  // components-needed
-  var componentsNeeded = function(pageSource, env) { return (function() {
-  var direct = scanComponentsFromSource(pageSource);
-  var allNeeded = [];
-  { var _c = direct; for (var _i = 0; _i < _c.length; _i++) { var name = _c[_i]; if (isSxTruthy(!isSxTruthy(contains(allNeeded, name)))) {
-  allNeeded.push(name);
-}
-(function() {
-  var val = envGet(env, name);
-  return (function() {
-  var deps = (isSxTruthy((isSxTruthy((typeOf(val) == "component")) && !isSxTruthy(isEmpty(componentDeps(val))))) ? componentDeps(val) : transitiveDeps(name, env));
-  return forEach(function(dep) { return (isSxTruthy(!isSxTruthy(contains(allNeeded, dep))) ? append_b(allNeeded, dep) : NIL); }, deps);
-})();
-})(); } }
-  return allNeeded;
-})(); };
-
-  // page-component-bundle
-  var pageComponentBundle = function(pageSource, env) { return componentsNeeded(pageSource, env); };
-
-  // page-css-classes
-  var pageCssClasses = function(pageSource, env) { return (function() {
-  var needed = componentsNeeded(pageSource, env);
-  var classes = [];
-  { var _c = needed; for (var _i = 0; _i < _c.length; _i++) { var name = _c[_i]; (function() {
-  var val = envGet(env, name);
-  return (isSxTruthy((typeOf(val) == "component")) ? forEach(function(cls) { return (isSxTruthy(!isSxTruthy(contains(classes, cls))) ? append_b(classes, cls) : NIL); }, componentCssClasses(val)) : NIL);
-})(); } }
-  { var _c = scanCssClasses(pageSource); for (var _i = 0; _i < _c.length; _i++) { var cls = _c[_i]; if (isSxTruthy(!isSxTruthy(contains(classes, cls)))) {
-  classes.push(cls);
-} } }
-  return classes;
-})(); };
-
-  // scan-io-refs-walk
-  var scanIoRefsWalk = function(node, ioNames, refs) { return (isSxTruthy((typeOf(node) == "symbol")) ? (function() {
-  var name = symbolName(node);
-  return (isSxTruthy(contains(ioNames, name)) ? (isSxTruthy(!isSxTruthy(contains(refs, name))) ? append_b(refs, name) : NIL) : NIL);
-})() : (isSxTruthy((typeOf(node) == "list")) ? forEach(function(item) { return scanIoRefsWalk(item, ioNames, refs); }, node) : (isSxTruthy((typeOf(node) == "dict")) ? forEach(function(key) { return scanIoRefsWalk(dictGet(node, key), ioNames, refs); }, keys(node)) : NIL))); };
-
-  // scan-io-refs
-  var scanIoRefs = function(node, ioNames) { return (function() {
-  var refs = [];
-  scanIoRefsWalk(node, ioNames, refs);
-  return refs;
-})(); };
-
-  // transitive-io-refs-walk
-  var transitiveIoRefsWalk = function(n, seen, allRefs, env, ioNames) { return (isSxTruthy(!isSxTruthy(contains(seen, n))) ? (append_b(seen, n), (function() {
-  var val = envGet(env, n);
-  return (isSxTruthy((typeOf(val) == "component")) ? (forEach(function(ref) { return (isSxTruthy(!isSxTruthy(contains(allRefs, ref))) ? append_b(allRefs, ref) : NIL); }, scanIoRefs(componentBody(val), ioNames)), forEach(function(dep) { return transitiveIoRefsWalk(dep, seen, allRefs, env, ioNames); }, scanRefs(componentBody(val)))) : (isSxTruthy((typeOf(val) == "macro")) ? (forEach(function(ref) { return (isSxTruthy(!isSxTruthy(contains(allRefs, ref))) ? append_b(allRefs, ref) : NIL); }, scanIoRefs(macroBody(val), ioNames)), forEach(function(dep) { return transitiveIoRefsWalk(dep, seen, allRefs, env, ioNames); }, scanRefs(macroBody(val)))) : NIL));
-})()) : NIL); };
-
-  // transitive-io-refs
-  var transitiveIoRefs = function(name, env, ioNames) { return (function() {
-  var allRefs = [];
-  var seen = [];
-  var key = (isSxTruthy(startsWith(name, "~")) ? name : (String("~") + String(name)));
-  transitiveIoRefsWalk(key, seen, allRefs, env, ioNames);
-  return allRefs;
-})(); };
-
-  // compute-all-io-refs
-  var computeAllIoRefs = function(env, ioNames) { return forEach(function(name) { return (function() {
-  var val = envGet(env, name);
-  return (isSxTruthy((typeOf(val) == "component")) ? componentSetIoRefs(val, transitiveIoRefs(name, env, ioNames)) : NIL);
-})(); }, envComponents(env)); };
-
-  // component-pure?
-  var componentPure_p = function(name, env, ioNames) { return isEmpty(transitiveIoRefs(name, env, ioNames)); };
-
-  // render-target
-  var renderTarget = function(name, env, ioNames) { return (function() {
-  var key = (isSxTruthy(startsWith(name, "~")) ? name : (String("~") + String(name)));
-  return (function() {
-  var val = envGet(env, key);
-  return (isSxTruthy(!isSxTruthy((typeOf(val) == "component"))) ? "server" : (function() {
-  var affinity = componentAffinity(val);
-  return (isSxTruthy((affinity == "server")) ? "server" : (isSxTruthy((affinity == "client")) ? "client" : (isSxTruthy(!isSxTruthy(componentPure_p(name, env, ioNames))) ? "server" : "client")));
-})());
-})();
-})(); };
-
-  // page-render-plan
-  var pageRenderPlan = function(pageSource, env, ioNames) { return (function() {
-  var needed = componentsNeeded(pageSource, env);
-  var compTargets = {};
-  var serverList = [];
-  var clientList = [];
-  var ioDeps = [];
-  { var _c = needed; for (var _i = 0; _i < _c.length; _i++) { var name = _c[_i]; (function() {
-  var target = renderTarget(name, env, ioNames);
-  compTargets[name] = target;
-  return (isSxTruthy((target == "server")) ? (append_b(serverList, name), forEach(function(ioRef) { return (isSxTruthy(!isSxTruthy(contains(ioDeps, ioRef))) ? append_b(ioDeps, ioRef) : NIL); }, transitiveIoRefs(name, env, ioNames))) : append_b(clientList, name));
-})(); } }
-  return {"components": compTargets, "server": serverList, "client": clientList, "io-deps": ioDeps};
-})(); };
-
-
   // === Transpiled from router (client-side route matching) ===
 
   // split-path-segments
@@ -2981,7 +2838,7 @@ return (function() {
   var prev = getTrackingContext();
   setTrackingContext(ctx);
   return (function() {
-  var newVal = computeFn();
+  var newVal = invoke(computeFn);
   setTrackingContext(prev);
   signalSetDeps(s, trackingContextDeps(ctx));
   return (function() {
@@ -3003,13 +2860,13 @@ return (function() {
   var disposed = false;
   var cleanupFn = NIL;
   return (function() {
-  var runEffect = function() { return (isSxTruthy(!isSxTruthy(disposed)) ? ((isSxTruthy(cleanupFn) ? cleanupFn() : NIL), forEach(function(dep) { return signalRemoveSub(dep, runEffect); }, deps), (deps = []), (function() {
+  var runEffect = function() { return (isSxTruthy(!isSxTruthy(disposed)) ? ((isSxTruthy(cleanupFn) ? invoke(cleanupFn) : NIL), forEach(function(dep) { return signalRemoveSub(dep, runEffect); }, deps), (deps = []), (function() {
   var ctx = makeTrackingContext(runEffect);
   return (function() {
   var prev = getTrackingContext();
   setTrackingContext(ctx);
   return (function() {
-  var result = effectFn();
+  var result = invoke(effectFn);
   setTrackingContext(prev);
   deps = trackingContextDeps(ctx);
   return (isSxTruthy(isCallable(result)) ? (cleanupFn = result) : NIL);
@@ -3019,7 +2876,7 @@ return (function() {
   runEffect();
   return function() { disposed = true;
 if (isSxTruthy(cleanupFn)) {
-  cleanupFn();
+  invoke(cleanupFn);
 }
 { var _c = deps; for (var _i = 0; _i < _c.length; _i++) { var dep = _c[_i]; signalRemoveSub(dep, runEffect); } }
 return (deps = []); };
@@ -3034,7 +2891,7 @@ return (deps = []); };
 
   // batch
   var batch = function(thunk) { _batchDepth = (_batchDepth + 1);
-thunk();
+invoke(thunk);
 _batchDepth = (_batchDepth - 1);
 return (isSxTruthy((_batchDepth == 0)) ? (function() {
   var queue = _batchQueue;
@@ -3083,7 +2940,7 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   var defStore = function(name, initFn) { return (function() {
   var registry = _storeRegistry;
   if (isSxTruthy(!isSxTruthy(hasKey_p(registry, name)))) {
-  _storeRegistry = assoc(registry, name, initFn());
+  _storeRegistry = assoc(registry, name, invoke(initFn));
 }
   return get(_storeRegistry, name);
 })(); };
@@ -3104,7 +2961,7 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   var bridgeEvent = function(el, eventName, targetSignal, transformFn) { return effect(function() { return (function() {
   var remove = domListen(el, eventName, function(e) { return (function() {
   var detail = eventDetail(e);
-  var newVal = (isSxTruthy(transformFn) ? transformFn(detail) : detail);
+  var newVal = (isSxTruthy(transformFn) ? invoke(transformFn, detail) : detail);
   return reset_b(targetSignal, newVal);
 })(); });
   return remove;
@@ -3262,8 +3119,12 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
 
   function domListen(el, name, handler) {
     if (!_hasDom || !el) return function() {};
-    el.addEventListener(name, handler);
-    return function() { el.removeEventListener(name, handler); };
+    // Wrap SX lambdas from runtime-evaluated island code into native fns
+    var wrapped = isLambda(handler)
+      ? function(e) { invoke(handler, e); }
+      : handler;
+    el.addEventListener(name, wrapped);
+    return function() { el.removeEventListener(name, wrapped); };
   }
 
   function eventDetail(e) {
@@ -3304,79 +3165,8 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
     try { return JSON.parse(s); } catch(e) { return {}; }
   }
 
-  // =========================================================================
-  // Performance overrides — replace transpiled spec with imperative JS
-  // =========================================================================
-
-  // Override renderDomComponent: imperative kwarg parsing, no reduce/assoc
-  renderDomComponent = function(comp, args, env, ns) {
-    // Parse keyword args imperatively
-    var kwargs = {};
-    var children = [];
-    for (var i = 0; i < args.length; i++) {
-      var arg = args[i];
-      if (arg && arg._kw && (i + 1) < args.length) {
-        kwargs[arg.name] = trampoline(evalExpr(args[i + 1], env));
-        i++; // skip value
-      } else {
-        children.push(arg);
-      }
-    }
-    // Build local env via prototype chain
-    var local = Object.create(componentClosure(comp));
-    // Copy caller env own properties
-    for (var k in env) if (env.hasOwnProperty(k)) local[k] = env[k];
-    // Bind params
-    var params = componentParams(comp);
-    for (var j = 0; j < params.length; j++) {
-      var p = params[j];
-      local[p] = p in kwargs ? kwargs[p] : NIL;
-    }
-    // Bind children
-    if (componentHasChildren(comp)) {
-      var childFrag = document.createDocumentFragment();
-      for (var c = 0; c < children.length; c++) {
-        var rendered = renderToDom(children[c], env, ns);
-        if (rendered) childFrag.appendChild(rendered);
-      }
-      local["children"] = childFrag;
-    }
-    return renderToDom(componentBody(comp), local, ns);
-  };
-
-  // Override renderDomElement: imperative attr parsing, no reduce/assoc
-  renderDomElement = function(tag, args, env, ns) {
-    var newNs = tag === "svg" ? SVG_NS : tag === "math" ? MATH_NS : ns;
-    var el = domCreateElement(tag, newNs);
-    var extraClasses = [];
-    var isVoid = contains(VOID_ELEMENTS, tag);
-    for (var i = 0; i < args.length; i++) {
-      var arg = args[i];
-      if (arg && arg._kw && (i + 1) < args.length) {
-        var attrName = arg.name;
-        var attrVal = trampoline(evalExpr(args[i + 1], env));
-        i++; // skip value
-        if (isNil(attrVal) || attrVal === false) continue;
-        if (contains(BOOLEAN_ATTRS, attrName)) {
-          if (isSxTruthy(attrVal)) el.setAttribute(attrName, "");
-        } else if (attrVal === true) {
-          el.setAttribute(attrName, "");
-        } else {
-          el.setAttribute(attrName, String(attrVal));
-        }
-      } else {
-        if (!isVoid) {
-          var child = renderToDom(arg, env, newNs);
-          if (child) el.appendChild(child);
-        }
-      }
-    }
-    if (extraClasses.length) {
-      var existing = el.getAttribute("class") || "";
-      el.setAttribute("class", (existing ? existing + " " : "") + extraClasses.join(" "));
-    }
-    return el;
-  };
+  // renderDomComponent and renderDomElement are transpiled from
+  // adapter-dom.sx — no imperative overrides needed.
 
 
   // =========================================================================
@@ -3496,8 +3286,14 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
 
   // --- Timers ---
 
-  function setTimeout_(fn, ms) { return setTimeout(fn, ms || 0); }
-  function setInterval_(fn, ms) { return setInterval(fn, ms || 1000); }
+  function _wrapSxFn(fn) {
+    if (fn && fn._lambda) {
+      return function() { return trampoline(callLambda(fn, [], lambdaClosure(fn))); };
+    }
+    return fn;
+  }
+  function setTimeout_(fn, ms) { return setTimeout(_wrapSxFn(fn), ms || 0); }
+  function setInterval_(fn, ms) { return setInterval(_wrapSxFn(fn), ms || 1000); }
   function clearTimeout_(id) { clearTimeout(id); }
   function clearInterval_(id) { clearInterval(id); }
   function requestAnimationFrame_(fn) {
@@ -4023,6 +3819,8 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
         logInfo("sx:route server " + pathname);
         executeRequest(link, { method: "GET", url: liveHref }).then(function() {
           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));
         });
       }
     });
@@ -4415,7 +4213,7 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
 
   // Expose signal functions as primitives so runtime-evaluated SX code
   // (e.g. island bodies from .sx files) can call them
-  PRIMITIVES["signal"] = createSignal;
+  PRIMITIVES["signal"] = signal;
   PRIMITIVES["signal?"] = isSignal;
   PRIMITIVES["deref"] = deref;
   PRIMITIVES["reset!"] = reset_b;
@@ -4423,7 +4221,9 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
   PRIMITIVES["computed"] = computed;
   PRIMITIVES["effect"] = effect;
   PRIMITIVES["batch"] = batch;
-  PRIMITIVES["dispose"] = dispose;
+  // Timer primitives for island code
+  PRIMITIVES["set-interval"] = setInterval_;
+  PRIMITIVES["clear-interval"] = clearInterval_;
   // Reactive DOM helpers for island code
   PRIMITIVES["reactive-text"] = reactiveText;
   PRIMITIVES["create-text-node"] = createTextNode;
@@ -4607,9 +4407,10 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
         return null;
       }
 
-      // Component
+      // Component or Island
       if (hname.charAt(0) === "~") {
         var comp = env[hname];
+        if (comp && comp._island) return renderDomIsland(comp, expr.slice(1), env, ns);
         if (comp && comp._component) return asyncRenderComponent(comp, expr.slice(1), env, ns);
         if (comp && comp._macro) {
           var expanded = trampoline(expandMacro(comp, expr.slice(1), env));
@@ -5158,17 +4959,6 @@ return (isSxTruthy((_batchDepth == 0)) ? (function() {
     hydrateIslands: typeof sxHydrateIslands === "function" ? sxHydrateIslands : null,
     disposeIsland: typeof disposeIsland === "function" ? disposeIsland : null,
     init: typeof bootInit === "function" ? bootInit : null,
-    scanRefs: scanRefs,
-    scanComponentsFromSource: scanComponentsFromSource,
-    transitiveDeps: transitiveDeps,
-    computeAllDeps: computeAllDeps,
-    componentsNeeded: componentsNeeded,
-    pageComponentBundle: pageComponentBundle,
-    pageCssClasses: pageCssClasses,
-    scanIoRefs: scanIoRefs,
-    transitiveIoRefs: transitiveIoRefs,
-    computeAllIoRefs: computeAllIoRefs,
-    componentPure_p: componentPure_p,
     splitPathSegments: splitPathSegments,
     parseRoutePattern: parseRoutePattern,
     matchRoute: matchRoute,