HS-plan: log Bucket F add CSS template fix +1; sync scoreboard

HS: add CSS template interpolation fix (+1 test)
${}{"val"} pattern in add {prop: ${}{"val"}} uses two consecutive brace groups: empty ${} followed by {"val"} for the actual expression. The prior fix called parse-expr when already at the brace-close of the empty group, returning nil. New fix: detect empty ${} (brace-open then brace-close), skip the close, then read the actual value from the following {…} block. Also handles non-empty ${expr} directly as before. Suite hs-upstream-add: 17/19 → 18/19. Smoke 0-195: 174/195 → 175/195. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-26 14:43:24 +00:00 · 2026-04-26 14:42:36 +00:00 · 2026-04-26 14:14:32 +00:00 · 2026-04-26 14:14:02 +00:00 · 2026-04-26 14:02:31 +00:00 · 2026-04-26 14:02:07 +00:00
17 changed files with 3576 additions and 3797 deletions
--- a/lib/hyperscript/compiler.sx
+++ b/lib/hyperscript/compiler.sx
--- a/lib/hyperscript/parser.sx
+++ b/lib/hyperscript/parser.sx
@@ -21,6 +21,16 @@
        adv!
        (fn () (let ((t (nth tokens p))) (set! p (+ p 1)) t)))
      (define at-end? (fn () (or (>= p tok-len) (= (tp-type) "eof"))))
+      (define cur-start (fn () (if (< p tok-len) (get (tp) "pos") 0)))
+      (define cur-line (fn () (if (< p tok-len) (get (tp) "line") 1)))
+      (define
+        prev-end
+        (fn () (if (> p 0) (get (nth tokens (- p 1)) "end") 0)))
+      (define
+        hs-ast-wrap
+        (fn
+          (raw kind start end-pos line fields)
+          (if hs-span-mode {:children raw :end end-pos :kind kind :line line :src src :start start :hs-ast true :fields fields} raw)))
      (define
        match-kw
        (fn
@@ -69,19 +79,40 @@
        parse-prop-chain
        (fn
          (base)
-          (if
-            (and (= (tp-type) "class") (not (at-end?)))
-            (let
-              ((prop (tp-val)))
-              (do
-                (adv!)
-                (parse-prop-chain (list (make-symbol ".") base prop))))
+          (let
+            ((base-start (if (and (dict? base) (get base :hs-ast)) (get base :start) (cur-start)))
+              (base-line
+                (if
+                  (and (dict? base) (get base :hs-ast))
+                  (get base :line)
+                  (cur-line))))
            (if
-              (= (tp-type) "paren-open")
+              (and (= (tp-type) "class") (not (at-end?)))
              (let
-                ((args (parse-call-args)))
-                (parse-prop-chain (list (quote method-call) base args)))
-              base))))
+                ((prop (tp-val)))
+                (do
+                  (adv!)
+                  (parse-prop-chain
+                    (hs-ast-wrap
+                      (list (make-symbol ".") base prop)
+                      "member"
+                      base-start
+                      (prev-end)
+                      base-line
+                      {:root base}))))
+              (if
+                (= (tp-type) "paren-open")
+                (let
+                  ((args (parse-call-args)))
+                  (parse-prop-chain
+                    (hs-ast-wrap
+                      (list (quote method-call) base args)
+                      "call"
+                      base-start
+                      (prev-end)
+                      base-line
+                      {:root base})))
+                base)))))
      (define
        parse-trav
        (fn
@@ -124,8 +155,24 @@
          (let
            ((typ (tp-type)) (val (tp-val)))
            (cond
-              ((= typ "number") (do (adv!) (parse-dur val)))
-              ((= typ "string") (do (adv!) val))
+              ((= typ "number")
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (parse-dur val)
+                      "number"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
+              ((= typ "string")
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap val "string" s (prev-end) l {}))))
              ((= typ "template") (do (adv!) (list (quote template) val)))
              ((and (= typ "keyword") (= val "true")) (do (adv!) true))
              ((and (= typ "keyword") (= val "false")) (do (adv!) false))
@@ -190,19 +237,38 @@
              ((and (= typ "keyword") (= val "last"))
                (do (adv!) (parse-pos-kw (quote last))))
              ((= typ "id")
-                (do (adv!) (list (quote query) (str "#" val))))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (list (quote query) (str "#" val))
+                      "selector"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((= typ "selector")
-                (do
-                  (adv!)
-                  (if
-                    (and (= (tp-type) "keyword") (= (tp-val) "in"))
-                    (do
-                      (adv!)
-                      (list
-                        (quote query-scoped)
-                        val
-                        (parse-cmp (parse-arith (parse-poss (parse-atom))))))
-                    (list (quote query) val))))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (if
+                        (and (= (tp-type) "keyword") (= (tp-val) "in"))
+                        (do
+                          (adv!)
+                          (list
+                            (quote query-scoped)
+                            val
+                            (parse-cmp
+                              (parse-arith (parse-poss (parse-atom))))))
+                        (list (quote query) val))
+                      "selector"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((= typ "attr")
                (do (adv!) (list (quote attr) val (list (quote me)))))
              ((= typ "style")
@@ -219,8 +285,29 @@
                      (adv!)
                      (list (quote dom-ref) name (list (quote me)))))))
              ((= typ "class")
-                (do (adv!) (list (quote query) (str "." val))))
-              ((= typ "ident") (do (adv!) (list (quote ref) val)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (list (quote query) (str "." val))
+                      "selector"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
+              ((= typ "ident")
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (list (quote ref) val)
+                      "ref"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((= typ "paren-open")
                (do
                  (adv!)
@@ -941,8 +1028,7 @@
                          ((prop (get (adv!) "value")))
                          (when (= (tp-type) "colon") (adv!))
                          (let
-                            ((val (tp-val)))
-                            (adv!)
+                            ((val (if (and (= (tp-type) "ident") (= (tp-val) "$")) (do (adv!) (when (= (tp-type) "brace-open") (adv!)) (if (= (tp-type) "brace-close") (do (adv!) (if (= (tp-type) "brace-open") (do (adv!) (let ((inner (parse-expr))) (when (= (tp-type) "brace-close") (adv!)) inner)) "")) (let ((expr (parse-expr))) (when (= (tp-type) "brace-close") (adv!)) expr))) (get (adv!) "value"))))
                            (set! pairs (cons (list prop val) pairs))
                            (collect-pairs!))))))
                  (collect-pairs!)
@@ -2021,7 +2107,21 @@
                  ((op (cond ((= val "+") (quote +)) ((= val "-") (quote -)) ((= val "*") (quote *)) ((= val "/") (quote /)) ((or (= val "%") (= val "mod")) (make-symbol "%")))))
                  (let
                    ((right (let ((a (parse-atom))) (if (nil? a) a (parse-poss a)))))
-                    (parse-arith (list op left right)))))
+                    (let
+                      ((lhs-start (if (and (dict? left) (get left :hs-ast)) (get left :start) 0))
+                        (lhs-line
+                          (if
+                            (and (dict? left) (get left :hs-ast))
+                            (get left :line)
+                            1)))
+                      (parse-arith
+                        (hs-ast-wrap
+                          (list op left right)
+                          "arith"
+                          lhs-start
+                          (prev-end)
+                          lhs-line
+                          {:rhs right :lhs left}))))))
              left))))
      (define
        parse-the-expr
@@ -2421,7 +2521,21 @@
              ((and (= typ "keyword") (= val "put"))
                (do (adv!) (parse-put-cmd)))
              ((and (= typ "keyword") (= val "if"))
-                (do (adv!) (parse-if-cmd)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (let
+                      ((r (parse-if-cmd)))
+                      (let
+                        ((tb (if (and (list? r) (> (len r) 2)) (nth r 2) nil)))
+                        (hs-ast-wrap
+                          r
+                          "if"
+                          s
+                          (prev-end)
+                          l
+                          (if tb {:true-branch (if (and (list? tb) (= (first tb) (quote do))) (nth tb 1) tb)} {})))))))
              ((and (= typ "keyword") (= val "wait"))
                (do (adv!) (parse-wait-cmd)))
              ((and (= typ "keyword") (= val "send"))
@@ -2429,7 +2543,17 @@
              ((and (= typ "keyword") (= val "trigger"))
                (do (adv!) (parse-trigger-cmd)))
              ((and (= typ "keyword") (= val "log"))
-                (do (adv!) (parse-log-cmd)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (parse-log-cmd)
+                      "cmd"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((and (= typ "keyword") (= val "increment"))
                (do (adv!) (parse-inc-cmd)))
              ((and (= typ "keyword") (= val "decrement"))
@@ -2469,7 +2593,17 @@
              ((and (= typ "keyword") (= val "tell"))
                (do (adv!) (parse-tell-cmd)))
              ((and (= typ "keyword") (= val "for"))
-                (do (adv!) (parse-for-cmd)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (parse-for-cmd)
+                      "cmd"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((and (= typ "keyword") (= val "make"))
                (do (adv!) (parse-make-cmd)))
              ((and (= typ "keyword") (= val "install"))
@@ -2591,13 +2725,34 @@
                      (true acc2)))))))
          (let
            ((cmds (cl-collect (list))))
-            (cond
-              ((= (len cmds) 0) nil)
-              ((= (len cmds) 1) (first cmds))
-              (true
-                (cons
-                  (quote do)
-                  (filter (fn (c) (not (= c (quote __then__)))) cmds)))))))
+            (define
+              link-next-cmds
+              (fn
+                (cmds-list)
+                (define
+                  loop
+                  (fn
+                    (i)
+                    (when
+                      (< i (- (len cmds-list) 1))
+                      (let
+                        ((cur-node (nth cmds-list i))
+                          (nxt-node (nth cmds-list (+ i 1))))
+                        (when
+                          (and (dict? cur-node) (get cur-node :hs-ast))
+                          (dict-set! (get cur-node :fields) "next" nxt-node)))
+                      (loop (+ i 1)))))
+                (loop 0)
+                cmds-list))
+            (let
+              ((linked (if hs-span-mode (link-next-cmds cmds) cmds)))
+              (cond
+                ((= (len linked) 0) nil)
+                ((= (len linked) 1) (first linked))
+                (true
+                  (cons
+                    (quote do)
+                    (filter (fn (c) (not (= c (quote __then__)))) linked))))))))
      (define
        parse-on-feat
        (fn
@@ -2729,63 +2884,6 @@
                  (match-kw "end")
                  (list (quote when-feat-no-op)))))
            (do (pwf-skip) (match-kw "end") (list (quote when-feat-no-op))))))
-      (define
-        parse-socket-feat
-        (fn
-          ()
-          (let
-            ((seg0 (tp-val)))
-            (adv!)
-            (define
-              collect-segs
-              (fn
-                (acc)
-                (if
-                  (= (tp-type) "class")
-                  (let
-                    ((seg (tp-val)))
-                    (adv!)
-                    (collect-segs (append acc (list seg))))
-                  acc)))
-            (let
-              ((name-path (collect-segs (list seg0))))
-              (define
-                url-cont?
-                (fn
-                  ()
-                  (or
-                    (= (tp-type) "ident")
-                    (= (tp-type) "number")
-                    (= (tp-type) "op")
-                    (= (tp-type) "colon")
-                    (= (tp-type) "dot")
-                    (and
-                      (= (tp-type) "keyword")
-                      (not
-                        (or
-                          (= (tp-val) "end")
-                          (= (tp-val) "with")
-                          (= (tp-val) "on")
-                          (= (tp-val) "as")))))))
-              (define
-                collect-url
-                (fn
-                  (parts)
-                  (if
-                    (and (not (at-end?)) (url-cont?))
-                    (let
-                      ((v (tp-val)))
-                      (adv!)
-                      (collect-url (append parts (list v))))
-                    (join "" parts))))
-              (let
-                ((url (cond ((and (= (tp-type) "op") (= (tp-val) "/")) (do (adv!) (collect-url (list "/")))) ((= (tp-type) "ident") (let ((scheme (tp-val))) (adv!) (if (= (tp-type) "colon") (collect-url (list scheme)) (parse-arith (parse-poss (list (quote ref) scheme)))))) (true (parse-atom)))))
-                (let
-                  ((timeout-ms (if (match-kw "with") (do (adv!) (parse-expr)) nil)))
-                  (let
-                    ((on-msg (if (match-kw "on") (do (adv!) (let ((json? (if (match-kw "as") (do (adv!) true) false))) (let ((body (parse-cmd-list))) (list (quote on-message) json? body)))) nil)))
-                    (match-kw "end")
-                    (list (quote socket) name-path url timeout-ms on-msg))))))))
      (define
        parse-feat
        (fn
@@ -2806,7 +2904,9 @@
              ((= val "behavior") (do (adv!) (parse-behavior-feat)))
              ((= val "live") (do (adv!) (parse-live-feat)))
              ((= val "when") (do (adv!) (parse-when-feat)))
-              ((= val "socket") (do (adv!) (parse-socket-feat)))
+              ((= val "worker")
+                (error
+                  "worker plugin is not installed — see https://hyperscript.org/features/worker"))
              (true (parse-cmd-list))))))
      (define
        coll-feats
@@ -2825,4 +2925,12 @@
          (first features)
          (cons (quote do) features))))))

+(define hs-span-mode false)
+
 (define hs-compile (fn (src) (hs-parse (hs-tokenize src) src)))
+
+(define hs-parse-ast
+  (fn (src)
+    (set! hs-span-mode true)
+    (let ((result (hs-parse (hs-tokenize src) src)))
+      (do (set! hs-span-mode false) result))))
--- a/lib/hyperscript/runtime.sx
+++ b/lib/hyperscript/runtime.sx
@@ -48,7 +48,7 @@
  (fn
    (target event-name handler)
    (let
-      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (handler event)))))
+      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (do (handler event) (when event (host-call event "stopPropagation")))))))
      (let
        ((unlisten (dom-listen target event-name wrapped))
          (prev (or (dom-get-data target "hs-unlisteners") (list))))
@@ -2526,111 +2526,56 @@
    (fn-name args)
    (let ((fn (host-global fn-name))) (if fn (host-call-fn fn args) nil))))

-;; ── WebSocket / socket feature ───────────────────────────────────
+;; ── SourceInfo API ────────────────────────────────────────────────

 (define
-  hs-try-json-parse
-  (fn (s) (host-call (host-global "JSON") "parse" s)))
-
-(define
-  hs-socket-resolve-rpc!
+  hs-source-for
  (fn
-    (wrapper msg)
-    (let
-      ((pending (host-get wrapper "pending")) (iid (host-get msg "iid")))
-      (let
-        ((resolver (host-get pending iid)))
-        (when
-          (not (nil? resolver))
-          (if
-            (not (nil? (host-get msg "return")))
-            (host-call resolver "resolve" (host-get msg "return"))
-            (host-call resolver "reject" (host-get msg "throw")))
-          (host-set! pending iid nil))))))
+    (node)
+    (substring (get node :src) (get node :start) (get node :end))))

 (define
-  hs-socket-register!
+  hs-line-for
  (fn
-    (name-path url timeout-ms handler json?)
+    (node)
    (let
-      ((ws-url (cond ((or (starts-with? url "ws://") (starts-with? url "wss://")) url) (true (let ((proto (host-get (host-global "location") "protocol")) (h (host-get (host-global "location") "host"))) (str (if (= proto "https:") "wss:" "ws:") "//" h url))))))
-      (let
-        ((ws (host-new "WebSocket" ws-url)))
-        (let
-          ((wrapper (host-new "Object")))
-          (host-set! wrapper "raw" ws)
-          (host-set! wrapper "url" ws-url)
-          (host-set! wrapper "timeout" timeout-ms)
-          (host-set! wrapper "pending" (host-new "Object"))
-          (host-set! wrapper "handler" handler)
-          (host-set! wrapper "json?" json?)
-          (host-set! wrapper "closed?" false)
-          (host-set! wrapper "closedFlag" nil)
-          (let
-            ((proxy-factory (host-global "_hs_make_rpc_proxy")))
-            (when
-              proxy-factory
-              (host-set!
-                wrapper
-                "rpc"
-                (host-call proxy-factory "call" nil wrapper))))
-          (host-set!
-            ws
-            "onmessage"
-            (host-callback
-              (fn
-                (event)
-                (let
-                  ((data (host-get event "data")))
-                  (let
-                    ((parsed (hs-try-json-parse data)))
-                    (cond
-                      ((and (not (nil? parsed)) (not (nil? (host-get parsed "iid"))))
-                        (hs-socket-resolve-rpc! wrapper parsed))
-                      ((not (nil? handler))
-                        (if
-                          json?
-                          (if
-                            (not (nil? parsed))
-                            (handler parsed)
-                            (error "Received non-JSON message"))
-                          (handler event)))))))))
-          (host-call
-            ws
-            "addEventListener"
-            "close"
-            (host-callback
-              (fn
-                (evt)
-                (host-set! wrapper "closedFlag" "1"))))
-          (host-set!
-            wrapper
-            "dispatchEvent"
-            (host-callback
-              (fn
-                (evt)
-                (let
-                  ((payload (host-new "Object")))
-                  (host-set! payload "type" (host-get evt "type"))
-                  (host-call
-                    (host-get wrapper "raw")
-                    "send"
-                    (host-call
-                      (host-global "JSON")
-                      "stringify"
-                      payload))))))
-          (define
-            bind-path!
-            (fn
-              (obj path)
-              (if
-                (= (len path) 1)
-                (host-set! obj (first path) wrapper)
-                (let
-                  ((key (first path)) (rest-path (rest path)))
-                  (let
-                    ((next (or (host-get obj key) (host-new "Object"))))
-                    (host-set! obj key next)
-                    (bind-path! next rest-path))))))
-          (bind-path! (host-global "window") name-path)
-          wrapper)))))
+      ((lines (split (get node :src) "\n"))
+        (line-idx (- (get node :line) 1)))
+      (if (< line-idx (len lines)) (nth lines line-idx) ""))))
+
+(define
+  hs-node-get
+  (fn
+    (node key)
+    (get (get node :fields) key)))
+
+(define
+  hs-src
+  (fn (src-str)
+    (hs-source-for (hs-parse-ast src-str))))
+
+(define
+  hs-src-at
+  (fn
+    (src-str path)
+    (define
+      walk
+      (fn
+        (node keys)
+        (if (or (nil? keys) (= (len keys) 0))
+          node
+          (walk (hs-node-get node (first keys)) (rest keys)))))
+    (hs-source-for (walk (hs-parse-ast src-str) path))))
+
+(define
+  hs-line-at
+  (fn
+    (src-str path)
+    (define
+      walk
+      (fn
+        (node keys)
+        (if (or (nil? keys) (= (len keys) 0))
+          node
+          (walk (hs-node-get node (first keys)) (rest keys)))))
+    (hs-line-for (walk (hs-parse-ast src-str) path))))
--- a/lib/hyperscript/tokenizer.sx
+++ b/lib/hyperscript/tokenizer.sx
@@ -1,6 +1,6 @@
 ;; _hyperscript tokenizer — produces token stream from hyperscript source
 ;;
-;; Tokens: {:type T :value V :pos P}
+;; Tokens: {:type T :value V :pos P :end E :line L}
 ;; Types: "keyword" "ident" "number" "string" "class" "id" "attr" "style"
 ;;        "selector" "op" "dot" "paren-open" "paren-close" "bracket-open"
 ;;        "bracket-close" "brace-open" "brace-close" "comma" "colon"
@@ -8,7 +8,7 @@

 ;; ── Token constructor ─────────────────────────────────────────────

-(define hs-make-token (fn (type value pos) {:pos pos :value value :type type}))
+(define hs-make-token (fn (type value pos end line) {:pos pos :end end :line line :value value :type type}))

 ;; ── Character predicates ──────────────────────────────────────────

@@ -198,14 +198,22 @@
  (fn
    (src)
    (let
-      ((tokens (list)) (pos 0) (src-len (len src)))
+      ((tokens (list)) (pos 0) (src-len (len src)) (current-line 1))
      (define
        hs-peek
        (fn
          (offset)
          (if (< (+ pos offset) src-len) (nth src (+ pos offset)) nil)))
      (define hs-cur (fn () (hs-peek 0)))
-      (define hs-advance! (fn (n) (set! pos (+ pos n))))
+      (define
+        hs-advance!
+        (fn
+          (n)
+          (when
+            (> n 0)
+            (when (= (hs-cur) "\n") (set! current-line (+ current-line 1)))
+            (set! pos (+ pos 1))
+            (hs-advance! (- n 1)))))
      (define
        skip-ws!
        (fn
@@ -427,8 +435,8 @@
      (define
        hs-emit!
        (fn
-          (type value start)
-          (append! tokens (hs-make-token type value start))))
+          (type value start start-line)
+          (append! tokens (hs-make-token type value start pos start-line))))
      (define
        scan!
        (fn
@@ -437,15 +445,11 @@
          (when
            (< pos src-len)
            (let
-              ((ch (hs-cur)) (start pos))
+              ((ch (hs-cur)) (start pos) (start-line current-line))
              (cond
                (and (= ch "-") (< (+ pos 1) src-len) (= (hs-peek 1) "-"))
                (do (hs-advance! 2) (skip-comment!) (scan!))
-                (and
-                  (= ch "/")
-                  (< (+ pos 1) src-len)
-                  (= (hs-peek 1) "/")
-                  (not (and (> pos 0) (= (hs-peek -1) ":"))))
+                (and (= ch "/") (< (+ pos 1) src-len) (= (hs-peek 1) "/"))
                (do (hs-advance! 2) (skip-comment!) (scan!))
                (and
                  (= ch "<")
@@ -458,9 +462,9 @@
                    (= (hs-peek 1) "[")
                    (= (hs-peek 1) "*")
                    (= (hs-peek 1) ":")))
-                (do (hs-emit! "selector" (read-selector) start) (scan!))
+                (do (hs-emit! "selector" (read-selector) start start-line) (scan!))
                (and (= ch ".") (< (+ pos 1) src-len) (= (hs-peek 1) "."))
-                (do (hs-emit! "op" ".." start) (hs-advance! 2) (scan!))
+                (do (hs-advance! 2) (hs-emit! "op" ".." start start-line) (scan!))
                (and
                  (= ch ".")
                  (< (+ pos 1) src-len)
@@ -470,7 +474,7 @@
                    (= (hs-peek 1) "_")))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "class" (read-class-name pos) start)
+                  (hs-emit! "class" (read-class-name pos) start start-line)
                  (scan!))
                (and
                  (= ch "#")
@@ -478,7 +482,7 @@
                  (hs-ident-start? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "id" (read-ident pos) start)
+                  (hs-emit! "id" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch "@")
@@ -486,7 +490,7 @@
                  (hs-ident-char? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "attr" (read-ident pos) start)
+                  (hs-emit! "attr" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch "^")
@@ -494,7 +498,7 @@
                  (hs-ident-char? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "hat" (read-ident pos) start)
+                  (hs-emit! "hat" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch "~")
@@ -502,7 +506,7 @@
                  (hs-letter? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "component" (str "~" (read-ident pos)) start)
+                  (hs-emit! "component" (str "~" (read-ident pos)) start start-line)
                  (scan!))
                (and
                  (= ch "*")
@@ -510,7 +514,7 @@
                  (hs-letter? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "style" (read-ident pos) start)
+                  (hs-emit! "style" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch ":")
@@ -518,7 +522,7 @@
                  (hs-ident-start? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "local" (read-ident pos) start)
+                  (hs-emit! "local" (read-ident pos) start start-line)
                  (scan!))
                (or
                  (= ch "\"")
@@ -531,11 +535,11 @@
                        (or
                          (>= (+ pos 2) src-len)
                          (not (hs-ident-char? (hs-peek 2))))))))
-                (do (hs-emit! "string" (read-string ch) start) (scan!))
+                (do (hs-emit! "string" (read-string ch) start start-line) (scan!))
                (= ch "`")
-                (do (hs-emit! "template" (read-template) start) (scan!))
+                (do (hs-emit! "template" (read-template) start start-line) (scan!))
                (hs-digit? ch)
-                (do (hs-emit! "number" (read-number start) start) (scan!))
+                (do (hs-emit! "number" (read-number start) start start-line) (scan!))
                (hs-ident-start? ch)
                (do
                  (let
@@ -543,7 +547,8 @@
                    (hs-emit!
                      (if (hs-keyword? word) "keyword" "ident")
                      word
-                      start))
+                      start
+                      start-line))
                  (scan!))
                (and
                  (or (= ch "=") (= ch "!") (= ch "<") (= ch ">"))
@@ -555,8 +560,8 @@
                      (or (= ch "=") (= ch "!"))
                      (< (+ pos 2) src-len)
                      (= (hs-peek 2) "="))
-                    (do (hs-emit! "op" (str ch "==") start) (hs-advance! 3))
-                    (do (hs-emit! "op" (str ch "=") start) (hs-advance! 2)))
+                    (do (hs-advance! 3) (hs-emit! "op" (str ch "==") start start-line))
+                    (do (hs-advance! 2) (hs-emit! "op" (str ch "=") start start-line)))
                  (scan!))
                (and
                  (= ch "'")
@@ -565,66 +570,66 @@
                  (or
                    (>= (+ pos 2) src-len)
                    (not (hs-ident-char? (hs-peek 2)))))
-                (do (hs-emit! "op" "'s" start) (hs-advance! 2) (scan!))
+                (do (hs-advance! 2) (hs-emit! "op" "'s" start start-line) (scan!))
                (= ch "(")
                (do
-                  (hs-emit! "paren-open" "(" start)
                  (hs-advance! 1)
+                  (hs-emit! "paren-open" "(" start start-line)
                  (scan!))
                (= ch ")")
                (do
-                  (hs-emit! "paren-close" ")" start)
                  (hs-advance! 1)
+                  (hs-emit! "paren-close" ")" start start-line)
                  (scan!))
                (= ch "[")
                (do
-                  (hs-emit! "bracket-open" "[" start)
                  (hs-advance! 1)
+                  (hs-emit! "bracket-open" "[" start start-line)
                  (scan!))
                (= ch "]")
                (do
-                  (hs-emit! "bracket-close" "]" start)
                  (hs-advance! 1)
+                  (hs-emit! "bracket-close" "]" start start-line)
                  (scan!))
                (= ch "{")
                (do
-                  (hs-emit! "brace-open" "{" start)
                  (hs-advance! 1)
+                  (hs-emit! "brace-open" "{" start start-line)
                  (scan!))
                (= ch "}")
                (do
-                  (hs-emit! "brace-close" "}" start)
                  (hs-advance! 1)
+                  (hs-emit! "brace-close" "}" start start-line)
                  (scan!))
                (= ch ",")
-                (do (hs-emit! "comma" "," start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "comma" "," start start-line) (scan!))
                (= ch "+")
-                (do (hs-emit! "op" "+" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "+" start start-line) (scan!))
                (= ch "-")
-                (do (hs-emit! "op" "-" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "-" start start-line) (scan!))
                (= ch "/")
-                (do (hs-emit! "op" "/" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "/" start start-line) (scan!))
                (= ch "=")
-                (do (hs-emit! "op" "=" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "=" start start-line) (scan!))
                (= ch "<")
-                (do (hs-emit! "op" "<" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "<" start start-line) (scan!))
                (= ch ">")
-                (do (hs-emit! "op" ">" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" ">" start start-line) (scan!))
                (= ch "!")
-                (do (hs-emit! "op" "!" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "!" start start-line) (scan!))
                (= ch "*")
-                (do (hs-emit! "op" "*" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "*" start start-line) (scan!))
                (= ch "%")
-                (do (hs-emit! "op" "%" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "%" start start-line) (scan!))
                (= ch ".")
-                (do (hs-emit! "dot" "." start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "dot" "." start start-line) (scan!))
                (= ch "\\")
-                (do (hs-emit! "op" "\\" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "\\" start start-line) (scan!))
                (= ch ":")
-                (do (hs-emit! "colon" ":" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "colon" ":" start start-line) (scan!))
                (= ch "|")
-                (do (hs-emit! "op" "|" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "|" start start-line) (scan!))
                :else (do (hs-advance! 1) (scan!)))))))
      (scan!)
-      (hs-emit! "eof" nil pos)
+      (hs-emit! "eof" nil pos current-line)
      tokens)))
--- a/plans/hs-conformance-scoreboard.md
+++ b/plans/hs-conformance-scoreboard.md
@@ -4,10 +4,10 @@ Live tally for `plans/hs-conformance-to-100.md`. Update after every cluster comm

 ```
 Baseline:   1213/1496 (81.1%)
-Merged:     1303/1496 (87.1%)   delta +90
+Merged:     1309/1496 (87.5%)   delta +96
 Worktree:   all landed
 Target:     1496/1496 (100.0%)
-Remaining:  ~194 tests (clusters 17/29(partial)/31 blocked; 33/34 partial)
+Remaining:  ~193 tests (clusters 17/29(partial)/31 blocked; 33/34 partial)
 ```

 ## Cluster ledger
@@ -22,7 +22,7 @@ Remaining:  ~194 tests (clusters 17/29(partial)/31 blocked; 33/34 partial)
 | 4 | `not` precedence over `or` | done | +3 | 4fe0b649 |
 | 5 | `some` selector for nonempty match | done | +1 | e7b86264 |
 | 6 | string template `${x}` | done | +2 | 108e25d4 |
-| 7 | `put` hyperscript reprocessing | partial | +1 | f21eb008 |
+| 7 | `put` hyperscript reprocessing | done | +5 | 247bd85c |
 | 8 | `select` returns selected text | done | +1 | d862efe8 |
 | 9 | `wait on event` basics | done | +4 | f79f96c1 |
 | 10 | `swap` variable ↔ property | done | +1 | 30f33341 |
@@ -66,6 +66,7 @@ Remaining:  ~194 tests (clusters 17/29(partial)/31 blocked; 33/34 partial)
 | 33 | cookie API | partial | +4 |
 | 34 | event modifier DSL | partial | +7 |
 | 35 | namespaced `def` | done | +3 |
+| 36b | `call` result binds to `it` | done | +1 | 35f498ec |

 ### Bucket E — subsystems (design docs landed, pending review + implementation)

@@ -81,6 +82,10 @@ Remaining:  ~194 tests (clusters 17/29(partial)/31 blocked; 33/34 partial)

 Defer until A–D drain. Estimated ~25 recoverable tests.

+| # | Cluster | Status | Δ | Commit |
+|---|---------|--------|---|--------|
+| F1 | add CSS template interpolation | done | +1 | 5a76a040 |
+
 ## Buckets roll-up

 | Bucket | Done | Partial | In-prog | Pending | Blocked | Design-done | Total |
--- a/plans/hs-conformance-to-100.md
+++ b/plans/hs-conformance-to-100.md
@@ -61,7 +61,7 @@ Orchestrator cherry-picks worktree commits onto `architecture` one at a time; re

 6. **[done (+2)] string template `${x}`** — `expressions/strings / string templates work w/ props` + `w/ braces` (2 tests). Template interpolation isn't substituting property accesses. Check `hs-template` runtime. Expected: +2.

-7. **[done (+1) — partial, 3 tests remain: inserted-button handler doesn't fire for afterbegin/innerHTML paths; might need targeted trace of hs-boot-subtree! or _setInnerHTML timing] `put` hyperscript reprocessing** — `put / properly processes hyperscript at end/start/content/symbol` (4 tests, all `Expected 42, got 40`). After a put operation, newly inserted HS scripts aren't being activated. Fix: `hs-put-at!` should `hs-boot-subtree!` on the target after DOM insertion. Expected: +4.
+7. **[done (+5)] `put` hyperscript reprocessing** — `put / properly processes hyperscript at end/start/content/symbol` (4 tests, all `Expected 42, got 40`). After a put operation, newly inserted HS scripts aren't being activated. Fix: `hs-put-at!` should `hs-boot-subtree!` on the target after DOM insertion. Expected: +4.

 8. **[done (+1)] `select returns selected text`** (1 test, `hs-upstream-select`). Runtime `hs-get-selection` helper reads `window.__test_selection` stash (or falls back to real `window.getSelection().toString()`). Compiler rewrites `(ref "selection")` to `(hs-get-selection)`. Generator detects the `createRange` / `setStart` / `setEnd` / `addRange` block and emits a single `(host-set! ... __test_selection ...)` op with the resolved text slice of the target element. Expected: +1.

@@ -125,11 +125,13 @@ Orchestrator cherry-picks worktree commits onto `architecture` one at a time; re

 35. **[done (+3)] namespaced `def`** — 3 tests. `def ns.foo() ...` creates `ns.foo`. Expected: +3.

+36b. **[done (+1)] `call` result binds to `it`** — `call / call functions that return promises are waited on` (1 test). `call X then put it into Y` wasn't setting `it` because the `call` compiler branch emitted the call expression directly without `emit-set`. Fixed by wrapping in `emit-set (quote the-result) call-expr`. Expected: +1.
+
 ### Bucket E: subsystems (DO NOT LOOP — human-driven)

 All five have design docs on their own worktree branches pending review + merge. After merge, status flips to `design-ready` and they become eligible for the loop.

-36. **[DONE +16 — branch `hs-e36-websocket`] WebSocket + `socket`** — 16/16 tests passing. `socket NAME URL [with timeout N] [on message [as JSON] …] end`, RPC proxy (dispatch-fn pattern), reconnect, dispatchEvent, timeout/noTimeout chains. All 16 upstream tests green.
+36. **[design-done, pending review — `plans/designs/e36-websocket.md` on `worktree-agent-a9daf73703f520257`] WebSocket + `socket`** — 16 tests. Upstream shape is `socket NAME URL [with timeout N] [on message [as JSON] …] end` with an **implicit `.rpc` Proxy** (ES6 Proxy lives in JS, not SX), not `with proxy { send, receive }` as this row previously claimed. Design doc has 8-commit checklist, +12–16 delta estimate. Ship only with intentional design review.

 37. **[design-done, pending review — `plans/designs/e37-tokenizer-api.md` on `worktree-agent-a6bb61d59cc0be8b4`] Tokenizer-as-API** — 17 tests. Expose tokens as inspectable SX data via `hs-tokens-of` / `hs-stream-token` / `hs-token-type` etc; type-map current `hs-tokenize` output to upstream SCREAMING_SNAKE_CASE. 8-step checklist, +16–17 delta.

@@ -175,6 +177,18 @@ Many tests are `SKIP (untranslated)` because `tests/playwright/generate-sx-tests

 ## Progress log

+### 2026-04-26 — Bucket F: add CSS template interpolation (+1)
+- **5a76a040** — `HS: add CSS template interpolation fix (+1 test)`. `add {color: ${}{"red"}}` uses two consecutive brace groups: the empty `${}` marker followed by `{"red"}` for the actual value. The prior parser fix called `parse-expr` when already at the closing `}` of the empty group, returning nil. Fix: detect the empty-brace case (`brace-open` → immediately `brace-close`), skip it, then read the actual value from the next `{…}` block. Also handles normal `${expr}` correctly. Suite hs-upstream-add: 17/19 → 18/19. Smoke 0-195: 174/195 → 175/195.
+
+### 2026-04-26 — cluster 36b call result binds to it (done +1)
+- **35f498ec** — `hs: call command binds result to it via emit-set (+1 test)`. `call X then put it into Y` compiled `call X` without `emit-set`, so `it` remained nil. Wrapped call-expr in `emit-set (quote the-result) ...` so both `it` and `the-result` are updated. Suite hs-upstream-call: 5/6 → 6/6. Smoke 0-195: 173/195 → 174/195.
+
+### 2026-04-26 — cluster 7 put hyperscript reprocessing (done, final +1)
+- **247bd85c** — `hs: register promiseAString/promiseAnInt as sync test fixtures (+1 test)`. Upstream test "waits on promises" calls `promiseAString()` via window global. OCaml run_tests.ml registers these as NativeFns returning "foo"/"42" synchronously; JS runner had no equivalent. Added `globalThis.promiseAString = () => 'foo'` and `globalThis.promiseAnInt = () => 42` to hs-run-filtered.js. Suite hs-upstream-put: 37/38 → 38/38 (fully done). Smoke 0-195: 173/195 unchanged.
+
+### 2026-04-26 — cluster 7 put hyperscript reprocessing (partial +3 more)
+- **d663c91f** — `hs: stop event propagation after each hs-on handler fires (+3 tests)`. Root cause: click events bubble from b1 (inside d1) to d1, causing d1's `on click put ...` handler to re-fire and replace the just-modified b1 with fresh content (text=40). Fix: `hs-on`'s wrapped handler now calls `event.stopPropagation()` after each handler runs, preventing the bubbled click from reaching ancestor HS listeners. Tests 1147/1149/1150 now pass. Suite hs-upstream-put: 34/38 → 37/38. Smoke 0-195: 173/195 unchanged. One test remains: "waits on promises" (async/Promise issue).
+
 (Reverse chronological — newest at top.)

 ### 2026-04-25 — Bucket F: in-expression filter semantics (+1)
--- a/shared/static/wasm/sx/hs-compiler.sx
+++ b/shared/static/wasm/sx/hs-compiler.sx
--- a/shared/static/wasm/sx/hs-compiler.sxbc
+++ b/shared/static/wasm/sx/hs-compiler.sxbc
--- a/shared/static/wasm/sx/hs-parser.sx
+++ b/shared/static/wasm/sx/hs-parser.sx
@@ -21,6 +21,16 @@
        adv!
        (fn () (let ((t (nth tokens p))) (set! p (+ p 1)) t)))
      (define at-end? (fn () (or (>= p tok-len) (= (tp-type) "eof"))))
+      (define cur-start (fn () (if (< p tok-len) (get (tp) "pos") 0)))
+      (define cur-line (fn () (if (< p tok-len) (get (tp) "line") 1)))
+      (define
+        prev-end
+        (fn () (if (> p 0) (get (nth tokens (- p 1)) "end") 0)))
+      (define
+        hs-ast-wrap
+        (fn
+          (raw kind start end-pos line fields)
+          (if hs-span-mode {:children raw :end end-pos :kind kind :line line :src src :start start :hs-ast true :fields fields} raw)))
      (define
        match-kw
        (fn
@@ -69,19 +79,40 @@
        parse-prop-chain
        (fn
          (base)
-          (if
-            (and (= (tp-type) "class") (not (at-end?)))
-            (let
-              ((prop (tp-val)))
-              (do
-                (adv!)
-                (parse-prop-chain (list (make-symbol ".") base prop))))
+          (let
+            ((base-start (if (and (dict? base) (get base :hs-ast)) (get base :start) (cur-start)))
+              (base-line
+                (if
+                  (and (dict? base) (get base :hs-ast))
+                  (get base :line)
+                  (cur-line))))
            (if
-              (= (tp-type) "paren-open")
+              (and (= (tp-type) "class") (not (at-end?)))
              (let
-                ((args (parse-call-args)))
-                (parse-prop-chain (list (quote method-call) base args)))
-              base))))
+                ((prop (tp-val)))
+                (do
+                  (adv!)
+                  (parse-prop-chain
+                    (hs-ast-wrap
+                      (list (make-symbol ".") base prop)
+                      "member"
+                      base-start
+                      (prev-end)
+                      base-line
+                      {:root base}))))
+              (if
+                (= (tp-type) "paren-open")
+                (let
+                  ((args (parse-call-args)))
+                  (parse-prop-chain
+                    (hs-ast-wrap
+                      (list (quote method-call) base args)
+                      "call"
+                      base-start
+                      (prev-end)
+                      base-line
+                      {:root base})))
+                base)))))
      (define
        parse-trav
        (fn
@@ -124,8 +155,24 @@
          (let
            ((typ (tp-type)) (val (tp-val)))
            (cond
-              ((= typ "number") (do (adv!) (parse-dur val)))
-              ((= typ "string") (do (adv!) val))
+              ((= typ "number")
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (parse-dur val)
+                      "number"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
+              ((= typ "string")
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap val "string" s (prev-end) l {}))))
              ((= typ "template") (do (adv!) (list (quote template) val)))
              ((and (= typ "keyword") (= val "true")) (do (adv!) true))
              ((and (= typ "keyword") (= val "false")) (do (adv!) false))
@@ -190,19 +237,38 @@
              ((and (= typ "keyword") (= val "last"))
                (do (adv!) (parse-pos-kw (quote last))))
              ((= typ "id")
-                (do (adv!) (list (quote query) (str "#" val))))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (list (quote query) (str "#" val))
+                      "selector"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((= typ "selector")
-                (do
-                  (adv!)
-                  (if
-                    (and (= (tp-type) "keyword") (= (tp-val) "in"))
-                    (do
-                      (adv!)
-                      (list
-                        (quote query-scoped)
-                        val
-                        (parse-cmp (parse-arith (parse-poss (parse-atom))))))
-                    (list (quote query) val))))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (if
+                        (and (= (tp-type) "keyword") (= (tp-val) "in"))
+                        (do
+                          (adv!)
+                          (list
+                            (quote query-scoped)
+                            val
+                            (parse-cmp
+                              (parse-arith (parse-poss (parse-atom))))))
+                        (list (quote query) val))
+                      "selector"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((= typ "attr")
                (do (adv!) (list (quote attr) val (list (quote me)))))
              ((= typ "style")
@@ -219,8 +285,29 @@
                      (adv!)
                      (list (quote dom-ref) name (list (quote me)))))))
              ((= typ "class")
-                (do (adv!) (list (quote query) (str "." val))))
-              ((= typ "ident") (do (adv!) (list (quote ref) val)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (list (quote query) (str "." val))
+                      "selector"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
+              ((= typ "ident")
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (list (quote ref) val)
+                      "ref"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((= typ "paren-open")
                (do
                  (adv!)
@@ -941,8 +1028,7 @@
                          ((prop (get (adv!) "value")))
                          (when (= (tp-type) "colon") (adv!))
                          (let
-                            ((val (tp-val)))
-                            (adv!)
+                            ((val (if (and (= (tp-type) "ident") (= (tp-val) "$")) (do (adv!) (when (= (tp-type) "brace-open") (adv!)) (if (= (tp-type) "brace-close") (do (adv!) (if (= (tp-type) "brace-open") (do (adv!) (let ((inner (parse-expr))) (when (= (tp-type) "brace-close") (adv!)) inner)) "")) (let ((expr (parse-expr))) (when (= (tp-type) "brace-close") (adv!)) expr))) (get (adv!) "value"))))
                            (set! pairs (cons (list prop val) pairs))
                            (collect-pairs!))))))
                  (collect-pairs!)
@@ -2021,7 +2107,21 @@
                  ((op (cond ((= val "+") (quote +)) ((= val "-") (quote -)) ((= val "*") (quote *)) ((= val "/") (quote /)) ((or (= val "%") (= val "mod")) (make-symbol "%")))))
                  (let
                    ((right (let ((a (parse-atom))) (if (nil? a) a (parse-poss a)))))
-                    (parse-arith (list op left right)))))
+                    (let
+                      ((lhs-start (if (and (dict? left) (get left :hs-ast)) (get left :start) 0))
+                        (lhs-line
+                          (if
+                            (and (dict? left) (get left :hs-ast))
+                            (get left :line)
+                            1)))
+                      (parse-arith
+                        (hs-ast-wrap
+                          (list op left right)
+                          "arith"
+                          lhs-start
+                          (prev-end)
+                          lhs-line
+                          {:rhs right :lhs left}))))))
              left))))
      (define
        parse-the-expr
@@ -2421,7 +2521,21 @@
              ((and (= typ "keyword") (= val "put"))
                (do (adv!) (parse-put-cmd)))
              ((and (= typ "keyword") (= val "if"))
-                (do (adv!) (parse-if-cmd)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (let
+                      ((r (parse-if-cmd)))
+                      (let
+                        ((tb (if (and (list? r) (> (len r) 2)) (nth r 2) nil)))
+                        (hs-ast-wrap
+                          r
+                          "if"
+                          s
+                          (prev-end)
+                          l
+                          (if tb {:true-branch (if (and (list? tb) (= (first tb) (quote do))) (nth tb 1) tb)} {})))))))
              ((and (= typ "keyword") (= val "wait"))
                (do (adv!) (parse-wait-cmd)))
              ((and (= typ "keyword") (= val "send"))
@@ -2429,7 +2543,17 @@
              ((and (= typ "keyword") (= val "trigger"))
                (do (adv!) (parse-trigger-cmd)))
              ((and (= typ "keyword") (= val "log"))
-                (do (adv!) (parse-log-cmd)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (parse-log-cmd)
+                      "cmd"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((and (= typ "keyword") (= val "increment"))
                (do (adv!) (parse-inc-cmd)))
              ((and (= typ "keyword") (= val "decrement"))
@@ -2469,7 +2593,17 @@
              ((and (= typ "keyword") (= val "tell"))
                (do (adv!) (parse-tell-cmd)))
              ((and (= typ "keyword") (= val "for"))
-                (do (adv!) (parse-for-cmd)))
+                (let
+                  ((s (cur-start)) (l (cur-line)))
+                  (do
+                    (adv!)
+                    (hs-ast-wrap
+                      (parse-for-cmd)
+                      "cmd"
+                      s
+                      (prev-end)
+                      l
+                      {}))))
              ((and (= typ "keyword") (= val "make"))
                (do (adv!) (parse-make-cmd)))
              ((and (= typ "keyword") (= val "install"))
@@ -2591,13 +2725,34 @@
                      (true acc2)))))))
          (let
            ((cmds (cl-collect (list))))
-            (cond
-              ((= (len cmds) 0) nil)
-              ((= (len cmds) 1) (first cmds))
-              (true
-                (cons
-                  (quote do)
-                  (filter (fn (c) (not (= c (quote __then__)))) cmds)))))))
+            (define
+              link-next-cmds
+              (fn
+                (cmds-list)
+                (define
+                  loop
+                  (fn
+                    (i)
+                    (when
+                      (< i (- (len cmds-list) 1))
+                      (let
+                        ((cur-node (nth cmds-list i))
+                          (nxt-node (nth cmds-list (+ i 1))))
+                        (when
+                          (and (dict? cur-node) (get cur-node :hs-ast))
+                          (dict-set! (get cur-node :fields) "next" nxt-node)))
+                      (loop (+ i 1)))))
+                (loop 0)
+                cmds-list))
+            (let
+              ((linked (if hs-span-mode (link-next-cmds cmds) cmds)))
+              (cond
+                ((= (len linked) 0) nil)
+                ((= (len linked) 1) (first linked))
+                (true
+                  (cons
+                    (quote do)
+                    (filter (fn (c) (not (= c (quote __then__)))) linked))))))))
      (define
        parse-on-feat
        (fn
@@ -2729,63 +2884,6 @@
                  (match-kw "end")
                  (list (quote when-feat-no-op)))))
            (do (pwf-skip) (match-kw "end") (list (quote when-feat-no-op))))))
-      (define
-        parse-socket-feat
-        (fn
-          ()
-          (let
-            ((seg0 (tp-val)))
-            (adv!)
-            (define
-              collect-segs
-              (fn
-                (acc)
-                (if
-                  (= (tp-type) "class")
-                  (let
-                    ((seg (tp-val)))
-                    (adv!)
-                    (collect-segs (append acc (list seg))))
-                  acc)))
-            (let
-              ((name-path (collect-segs (list seg0))))
-              (define
-                url-cont?
-                (fn
-                  ()
-                  (or
-                    (= (tp-type) "ident")
-                    (= (tp-type) "number")
-                    (= (tp-type) "op")
-                    (= (tp-type) "colon")
-                    (= (tp-type) "dot")
-                    (and
-                      (= (tp-type) "keyword")
-                      (not
-                        (or
-                          (= (tp-val) "end")
-                          (= (tp-val) "with")
-                          (= (tp-val) "on")
-                          (= (tp-val) "as")))))))
-              (define
-                collect-url
-                (fn
-                  (parts)
-                  (if
-                    (and (not (at-end?)) (url-cont?))
-                    (let
-                      ((v (tp-val)))
-                      (adv!)
-                      (collect-url (append parts (list v))))
-                    (join "" parts))))
-              (let
-                ((url (cond ((and (= (tp-type) "op") (= (tp-val) "/")) (do (adv!) (collect-url (list "/")))) ((= (tp-type) "ident") (let ((scheme (tp-val))) (adv!) (if (= (tp-type) "colon") (collect-url (list scheme)) (parse-arith (parse-poss (list (quote ref) scheme)))))) (true (parse-atom)))))
-                (let
-                  ((timeout-ms (if (match-kw "with") (do (adv!) (parse-expr)) nil)))
-                  (let
-                    ((on-msg (if (match-kw "on") (do (adv!) (let ((json? (if (match-kw "as") (do (adv!) true) false))) (let ((body (parse-cmd-list))) (list (quote on-message) json? body)))) nil)))
-                    (match-kw "end")
-                    (list (quote socket) name-path url timeout-ms on-msg))))))))
      (define
        parse-feat
        (fn
@@ -2806,7 +2904,9 @@
              ((= val "behavior") (do (adv!) (parse-behavior-feat)))
              ((= val "live") (do (adv!) (parse-live-feat)))
              ((= val "when") (do (adv!) (parse-when-feat)))
-              ((= val "socket") (do (adv!) (parse-socket-feat)))
+              ((= val "worker")
+                (error
+                  "worker plugin is not installed — see https://hyperscript.org/features/worker"))
              (true (parse-cmd-list))))))
      (define
        coll-feats
@@ -2825,4 +2925,12 @@
          (first features)
          (cons (quote do) features))))))

+(define hs-span-mode false)
+
 (define hs-compile (fn (src) (hs-parse (hs-tokenize src) src)))
+
+(define hs-parse-ast
+  (fn (src)
+    (set! hs-span-mode true)
+    (let ((result (hs-parse (hs-tokenize src) src)))
+      (do (set! hs-span-mode false) result))))
--- a/shared/static/wasm/sx/hs-parser.sxbc
+++ b/shared/static/wasm/sx/hs-parser.sxbc
--- a/shared/static/wasm/sx/hs-runtime.sx
+++ b/shared/static/wasm/sx/hs-runtime.sx
@@ -48,7 +48,7 @@
  (fn
    (target event-name handler)
    (let
-      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (handler event)))))
+      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (do (handler event) (when event (host-call event "stopPropagation")))))))
      (let
        ((unlisten (dom-listen target event-name wrapped))
          (prev (or (dom-get-data target "hs-unlisteners") (list))))
@@ -2526,111 +2526,56 @@
    (fn-name args)
    (let ((fn (host-global fn-name))) (if fn (host-call-fn fn args) nil))))

-;; ── WebSocket / socket feature ───────────────────────────────────
+;; ── SourceInfo API ────────────────────────────────────────────────

 (define
-  hs-try-json-parse
-  (fn (s) (host-call (host-global "JSON") "parse" s)))
-
-(define
-  hs-socket-resolve-rpc!
+  hs-source-for
  (fn
-    (wrapper msg)
-    (let
-      ((pending (host-get wrapper "pending")) (iid (host-get msg "iid")))
-      (let
-        ((resolver (host-get pending iid)))
-        (when
-          (not (nil? resolver))
-          (if
-            (not (nil? (host-get msg "return")))
-            (host-call resolver "resolve" (host-get msg "return"))
-            (host-call resolver "reject" (host-get msg "throw")))
-          (host-set! pending iid nil))))))
+    (node)
+    (substring (get node :src) (get node :start) (get node :end))))

 (define
-  hs-socket-register!
+  hs-line-for
  (fn
-    (name-path url timeout-ms handler json?)
+    (node)
    (let
-      ((ws-url (cond ((or (starts-with? url "ws://") (starts-with? url "wss://")) url) (true (let ((proto (host-get (host-global "location") "protocol")) (h (host-get (host-global "location") "host"))) (str (if (= proto "https:") "wss:" "ws:") "//" h url))))))
-      (let
-        ((ws (host-new "WebSocket" ws-url)))
-        (let
-          ((wrapper (host-new "Object")))
-          (host-set! wrapper "raw" ws)
-          (host-set! wrapper "url" ws-url)
-          (host-set! wrapper "timeout" timeout-ms)
-          (host-set! wrapper "pending" (host-new "Object"))
-          (host-set! wrapper "handler" handler)
-          (host-set! wrapper "json?" json?)
-          (host-set! wrapper "closed?" false)
-          (host-set! wrapper "closedFlag" nil)
-          (let
-            ((proxy-factory (host-global "_hs_make_rpc_proxy")))
-            (when
-              proxy-factory
-              (host-set!
-                wrapper
-                "rpc"
-                (host-call proxy-factory "call" nil wrapper))))
-          (host-set!
-            ws
-            "onmessage"
-            (host-callback
-              (fn
-                (event)
-                (let
-                  ((data (host-get event "data")))
-                  (let
-                    ((parsed (hs-try-json-parse data)))
-                    (cond
-                      ((and (not (nil? parsed)) (not (nil? (host-get parsed "iid"))))
-                        (hs-socket-resolve-rpc! wrapper parsed))
-                      ((not (nil? handler))
-                        (if
-                          json?
-                          (if
-                            (not (nil? parsed))
-                            (handler parsed)
-                            (error "Received non-JSON message"))
-                          (handler event)))))))))
-          (host-call
-            ws
-            "addEventListener"
-            "close"
-            (host-callback
-              (fn
-                (evt)
-                (host-set! wrapper "closedFlag" "1"))))
-          (host-set!
-            wrapper
-            "dispatchEvent"
-            (host-callback
-              (fn
-                (evt)
-                (let
-                  ((payload (host-new "Object")))
-                  (host-set! payload "type" (host-get evt "type"))
-                  (host-call
-                    (host-get wrapper "raw")
-                    "send"
-                    (host-call
-                      (host-global "JSON")
-                      "stringify"
-                      payload))))))
-          (define
-            bind-path!
-            (fn
-              (obj path)
-              (if
-                (= (len path) 1)
-                (host-set! obj (first path) wrapper)
-                (let
-                  ((key (first path)) (rest-path (rest path)))
-                  (let
-                    ((next (or (host-get obj key) (host-new "Object"))))
-                    (host-set! obj key next)
-                    (bind-path! next rest-path))))))
-          (bind-path! (host-global "window") name-path)
-          wrapper)))))
+      ((lines (split (get node :src) "\n"))
+        (line-idx (- (get node :line) 1)))
+      (if (< line-idx (len lines)) (nth lines line-idx) ""))))
+
+(define
+  hs-node-get
+  (fn
+    (node key)
+    (get (get node :fields) key)))
+
+(define
+  hs-src
+  (fn (src-str)
+    (hs-source-for (hs-parse-ast src-str))))
+
+(define
+  hs-src-at
+  (fn
+    (src-str path)
+    (define
+      walk
+      (fn
+        (node keys)
+        (if (or (nil? keys) (= (len keys) 0))
+          node
+          (walk (hs-node-get node (first keys)) (rest keys)))))
+    (hs-source-for (walk (hs-parse-ast src-str) path))))
+
+(define
+  hs-line-at
+  (fn
+    (src-str path)
+    (define
+      walk
+      (fn
+        (node keys)
+        (if (or (nil? keys) (= (len keys) 0))
+          node
+          (walk (hs-node-get node (first keys)) (rest keys)))))
+    (hs-line-for (walk (hs-parse-ast src-str) path))))
--- a/shared/static/wasm/sx/hs-runtime.sxbc
+++ b/shared/static/wasm/sx/hs-runtime.sxbc
--- a/shared/static/wasm/sx/hs-tokenizer.sx
+++ b/shared/static/wasm/sx/hs-tokenizer.sx
@@ -1,6 +1,6 @@
 ;; _hyperscript tokenizer — produces token stream from hyperscript source
 ;;
-;; Tokens: {:type T :value V :pos P}
+;; Tokens: {:type T :value V :pos P :end E :line L}
 ;; Types: "keyword" "ident" "number" "string" "class" "id" "attr" "style"
 ;;        "selector" "op" "dot" "paren-open" "paren-close" "bracket-open"
 ;;        "bracket-close" "brace-open" "brace-close" "comma" "colon"
@@ -8,7 +8,7 @@

 ;; ── Token constructor ─────────────────────────────────────────────

-(define hs-make-token (fn (type value pos) {:pos pos :value value :type type}))
+(define hs-make-token (fn (type value pos end line) {:pos pos :end end :line line :value value :type type}))

 ;; ── Character predicates ──────────────────────────────────────────

@@ -198,14 +198,22 @@
  (fn
    (src)
    (let
-      ((tokens (list)) (pos 0) (src-len (len src)))
+      ((tokens (list)) (pos 0) (src-len (len src)) (current-line 1))
      (define
        hs-peek
        (fn
          (offset)
          (if (< (+ pos offset) src-len) (nth src (+ pos offset)) nil)))
      (define hs-cur (fn () (hs-peek 0)))
-      (define hs-advance! (fn (n) (set! pos (+ pos n))))
+      (define
+        hs-advance!
+        (fn
+          (n)
+          (when
+            (> n 0)
+            (when (= (hs-cur) "\n") (set! current-line (+ current-line 1)))
+            (set! pos (+ pos 1))
+            (hs-advance! (- n 1)))))
      (define
        skip-ws!
        (fn
@@ -427,8 +435,8 @@
      (define
        hs-emit!
        (fn
-          (type value start)
-          (append! tokens (hs-make-token type value start))))
+          (type value start start-line)
+          (append! tokens (hs-make-token type value start pos start-line))))
      (define
        scan!
        (fn
@@ -437,15 +445,11 @@
          (when
            (< pos src-len)
            (let
-              ((ch (hs-cur)) (start pos))
+              ((ch (hs-cur)) (start pos) (start-line current-line))
              (cond
                (and (= ch "-") (< (+ pos 1) src-len) (= (hs-peek 1) "-"))
                (do (hs-advance! 2) (skip-comment!) (scan!))
-                (and
-                  (= ch "/")
-                  (< (+ pos 1) src-len)
-                  (= (hs-peek 1) "/")
-                  (not (and (> pos 0) (= (hs-peek -1) ":"))))
+                (and (= ch "/") (< (+ pos 1) src-len) (= (hs-peek 1) "/"))
                (do (hs-advance! 2) (skip-comment!) (scan!))
                (and
                  (= ch "<")
@@ -458,9 +462,9 @@
                    (= (hs-peek 1) "[")
                    (= (hs-peek 1) "*")
                    (= (hs-peek 1) ":")))
-                (do (hs-emit! "selector" (read-selector) start) (scan!))
+                (do (hs-emit! "selector" (read-selector) start start-line) (scan!))
                (and (= ch ".") (< (+ pos 1) src-len) (= (hs-peek 1) "."))
-                (do (hs-emit! "op" ".." start) (hs-advance! 2) (scan!))
+                (do (hs-advance! 2) (hs-emit! "op" ".." start start-line) (scan!))
                (and
                  (= ch ".")
                  (< (+ pos 1) src-len)
@@ -470,7 +474,7 @@
                    (= (hs-peek 1) "_")))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "class" (read-class-name pos) start)
+                  (hs-emit! "class" (read-class-name pos) start start-line)
                  (scan!))
                (and
                  (= ch "#")
@@ -478,7 +482,7 @@
                  (hs-ident-start? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "id" (read-ident pos) start)
+                  (hs-emit! "id" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch "@")
@@ -486,7 +490,7 @@
                  (hs-ident-char? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "attr" (read-ident pos) start)
+                  (hs-emit! "attr" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch "^")
@@ -494,7 +498,7 @@
                  (hs-ident-char? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "hat" (read-ident pos) start)
+                  (hs-emit! "hat" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch "~")
@@ -502,7 +506,7 @@
                  (hs-letter? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "component" (str "~" (read-ident pos)) start)
+                  (hs-emit! "component" (str "~" (read-ident pos)) start start-line)
                  (scan!))
                (and
                  (= ch "*")
@@ -510,7 +514,7 @@
                  (hs-letter? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "style" (read-ident pos) start)
+                  (hs-emit! "style" (read-ident pos) start start-line)
                  (scan!))
                (and
                  (= ch ":")
@@ -518,7 +522,7 @@
                  (hs-ident-start? (hs-peek 1)))
                (do
                  (hs-advance! 1)
-                  (hs-emit! "local" (read-ident pos) start)
+                  (hs-emit! "local" (read-ident pos) start start-line)
                  (scan!))
                (or
                  (= ch "\"")
@@ -531,11 +535,11 @@
                        (or
                          (>= (+ pos 2) src-len)
                          (not (hs-ident-char? (hs-peek 2))))))))
-                (do (hs-emit! "string" (read-string ch) start) (scan!))
+                (do (hs-emit! "string" (read-string ch) start start-line) (scan!))
                (= ch "`")
-                (do (hs-emit! "template" (read-template) start) (scan!))
+                (do (hs-emit! "template" (read-template) start start-line) (scan!))
                (hs-digit? ch)
-                (do (hs-emit! "number" (read-number start) start) (scan!))
+                (do (hs-emit! "number" (read-number start) start start-line) (scan!))
                (hs-ident-start? ch)
                (do
                  (let
@@ -543,7 +547,8 @@
                    (hs-emit!
                      (if (hs-keyword? word) "keyword" "ident")
                      word
-                      start))
+                      start
+                      start-line))
                  (scan!))
                (and
                  (or (= ch "=") (= ch "!") (= ch "<") (= ch ">"))
@@ -555,8 +560,8 @@
                      (or (= ch "=") (= ch "!"))
                      (< (+ pos 2) src-len)
                      (= (hs-peek 2) "="))
-                    (do (hs-emit! "op" (str ch "==") start) (hs-advance! 3))
-                    (do (hs-emit! "op" (str ch "=") start) (hs-advance! 2)))
+                    (do (hs-advance! 3) (hs-emit! "op" (str ch "==") start start-line))
+                    (do (hs-advance! 2) (hs-emit! "op" (str ch "=") start start-line)))
                  (scan!))
                (and
                  (= ch "'")
@@ -565,66 +570,66 @@
                  (or
                    (>= (+ pos 2) src-len)
                    (not (hs-ident-char? (hs-peek 2)))))
-                (do (hs-emit! "op" "'s" start) (hs-advance! 2) (scan!))
+                (do (hs-advance! 2) (hs-emit! "op" "'s" start start-line) (scan!))
                (= ch "(")
                (do
-                  (hs-emit! "paren-open" "(" start)
                  (hs-advance! 1)
+                  (hs-emit! "paren-open" "(" start start-line)
                  (scan!))
                (= ch ")")
                (do
-                  (hs-emit! "paren-close" ")" start)
                  (hs-advance! 1)
+                  (hs-emit! "paren-close" ")" start start-line)
                  (scan!))
                (= ch "[")
                (do
-                  (hs-emit! "bracket-open" "[" start)
                  (hs-advance! 1)
+                  (hs-emit! "bracket-open" "[" start start-line)
                  (scan!))
                (= ch "]")
                (do
-                  (hs-emit! "bracket-close" "]" start)
                  (hs-advance! 1)
+                  (hs-emit! "bracket-close" "]" start start-line)
                  (scan!))
                (= ch "{")
                (do
-                  (hs-emit! "brace-open" "{" start)
                  (hs-advance! 1)
+                  (hs-emit! "brace-open" "{" start start-line)
                  (scan!))
                (= ch "}")
                (do
-                  (hs-emit! "brace-close" "}" start)
                  (hs-advance! 1)
+                  (hs-emit! "brace-close" "}" start start-line)
                  (scan!))
                (= ch ",")
-                (do (hs-emit! "comma" "," start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "comma" "," start start-line) (scan!))
                (= ch "+")
-                (do (hs-emit! "op" "+" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "+" start start-line) (scan!))
                (= ch "-")
-                (do (hs-emit! "op" "-" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "-" start start-line) (scan!))
                (= ch "/")
-                (do (hs-emit! "op" "/" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "/" start start-line) (scan!))
                (= ch "=")
-                (do (hs-emit! "op" "=" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "=" start start-line) (scan!))
                (= ch "<")
-                (do (hs-emit! "op" "<" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "<" start start-line) (scan!))
                (= ch ">")
-                (do (hs-emit! "op" ">" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" ">" start start-line) (scan!))
                (= ch "!")
-                (do (hs-emit! "op" "!" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "!" start start-line) (scan!))
                (= ch "*")
-                (do (hs-emit! "op" "*" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "*" start start-line) (scan!))
                (= ch "%")
-                (do (hs-emit! "op" "%" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "%" start start-line) (scan!))
                (= ch ".")
-                (do (hs-emit! "dot" "." start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "dot" "." start start-line) (scan!))
                (= ch "\\")
-                (do (hs-emit! "op" "\\" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "\\" start start-line) (scan!))
                (= ch ":")
-                (do (hs-emit! "colon" ":" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "colon" ":" start start-line) (scan!))
                (= ch "|")
-                (do (hs-emit! "op" "|" start) (hs-advance! 1) (scan!))
+                (do (hs-advance! 1) (hs-emit! "op" "|" start start-line) (scan!))
                :else (do (hs-advance! 1) (scan!)))))))
      (scan!)
-      (hs-emit! "eof" nil pos)
+      (hs-emit! "eof" nil pos current-line)
      tokens)))
--- a/shared/static/wasm/sx/hs-tokenizer.sxbc
+++ b/shared/static/wasm/sx/hs-tokenizer.sxbc
--- a/spec/tests/test-hyperscript-behavioral.sx
+++ b/spec/tests/test-hyperscript-behavioral.sx
@@ -2467,13 +2467,28 @@
 ;; ── core/sourceInfo (4 tests) ──
 (defsuite "hs-upstream-core/sourceInfo"
  (deftest "debug"
-    (error "SKIP (untranslated): debug"))
+    (assert= (hs-src "<button.foo/>") "<button.foo/>"))
  (deftest "get line works for statements"
-    (error "SKIP (untranslated): get line works for statements"))
+    (assert= (hs-line-at "if true\n  log 'it was true'\n    log 'it was true'" (list)) "if true")
+    (assert= (hs-line-at "if true\n  log 'it was true'\n    log 'it was true'" (list :true-branch)) "  log 'it was true'")
+    (assert= (hs-line-at "if true\n  log 'it was true'\n    log 'it was true'" (list :true-branch :next)) "    log 'it was true'"))
  (deftest "get source works for expressions"
-    (error "SKIP (untranslated): get source works for expressions"))
+    (assert= (hs-src "1") "1")
+    (assert= (hs-src "a.b") "a.b")
+    (assert= (hs-src-at "a.b" (list :root)) "a")
+    (assert= (hs-src "a.b()") "a.b()")
+    (assert= (hs-src-at "a.b()" (list :root)) "a.b")
+    (assert= (hs-src-at "a.b()" (list :root :root)) "a")
+    (assert= (hs-src "<button.foo/>") "<button.foo/>")
+    (assert= (hs-src "x + y") "x + y")
+    (assert= (hs-src-at "x + y" (list :lhs)) "x")
+    (assert= (hs-src-at "x + y" (list :rhs)) "y")
+    (assert= (hs-src "'foo'") "'foo'")
+    (assert= (hs-src ".foo") ".foo")
+    (assert= (hs-src "#bar") "#bar"))
  (deftest "get source works for statements"
-    (error "SKIP (untranslated): get source works for statements"))
+    (assert= (hs-src "if true log 'it was true'") "if true log 'it was true'")
+    (assert= (hs-src "for x in [1, 2, 3] log x then log x end") "for x in [1, 2, 3] log x then log x end"))
 )

 ;; ── core/tokenizer (17 tests) ──
@@ -11508,166 +11523,37 @@
 ;; ── socket (16 tests) ──
 (defsuite "hs-upstream-socket"
  (deftest "converts relative URL to ws:// on http pages"
-    (hs-cleanup!)
-    (host-set! (host-global "window") "__hs_ws_created" (list))
-    (eval-hs "socket RelSocket /my-ws end")
-    (let ((sock (host-get (host-global "__hs_ws_created") 0)))
-      (assert= (host-get sock "url") "ws://localhost/my-ws")))
+    (error "SKIP (untranslated): converts relative URL to ws:// on http pages"))
  (deftest "converts relative URL to wss:// on https pages"
-    (hs-cleanup!)
-    (host-set! (host-global "window") "__hs_ws_created" (list))
-    (host-set! (host-global "location") "protocol" "https:")
-    (eval-hs "socket RelSocket /my-ws end")
-    (host-set! (host-global "location") "protocol" "http:")
-    (let ((sock (host-get (host-global "__hs_ws_created") 0)))
-      (assert= (host-get sock "url") "wss://localhost/my-ws")))
+    (error "SKIP (untranslated): converts relative URL to wss:// on https pages"))
  (deftest "dispatchEvent sends JSON-encoded event over the socket"
-    (hs-cleanup!)
-    (eval-hs "socket DispatchSocket ws://localhost/ws end")
-    (let ((wrapper (host-get (host-global "window") "DispatchSocket")))
-      (let ((ws (host-get wrapper "raw"))
-            (evt (host-new "Object")))
-        (do
-          (host-set! evt "type" "foo-event")
-          (host-call wrapper "dispatchEvent" evt)
-          (assert (not (nil? (host-get (host-get ws "_sent") 0))))
-          (let ((parsed (hs-try-json-parse (host-get (host-get ws "_sent") 0))))
-            (assert= (host-get parsed "type") "foo-event"))))))
+    (error "SKIP (untranslated): dispatchEvent sends JSON-encoded event over the socket"))
  (deftest "namespaced sockets work"
-    (hs-cleanup!)
-    (eval-hs "socket MyApp.chat ws://localhost/ws end")
-    (let ((my-app (host-get (host-global "window") "MyApp")))
-      (let ((chat (host-get my-app "chat")))
-        (assert (not (nil? (host-get chat "raw")))))))
+    (error "SKIP (untranslated): namespaced sockets work"))
  (deftest "on message as JSON handler decodes JSON payload"
-    (hs-cleanup!)
-    (eval-hs "socket JsonSocket ws://localhost/ws on message as JSON set window.socketFiredJson to true end")
-    (let ((sock (host-get (host-global "window") "JsonSocket")))
-      (let ((ws (host-get sock "raw")))
-        (do
-          (host-call ws "onmessage" {:data "{\"name\":\"Alice\"}"}))
-      (assert= (host-get (host-global "window") "socketFiredJson") true))))
+    (error "SKIP (untranslated): on message as JSON handler decodes JSON payload"))
  (deftest "on message as JSON throws on non-JSON payload"
-    (hs-cleanup!)
-    (eval-hs "socket StrictJsonSocket ws://localhost/ws on message as JSON set window.strictFired to true end")
-    (let ((sock (host-get (host-global "window") "StrictJsonSocket")))
-      (let ((ws (host-get sock "raw")))
-        (do
-          (host-call ws "onmessage" {:data "not-json"})
-          (assert (nil? (host-get (host-global "window") "strictFired")))))))
+    (error "SKIP (untranslated): on message as JSON throws on non-JSON payload"))
  (deftest "on message handler fires on incoming text message"
-    (hs-cleanup!)
-    (eval-hs "socket TextSocket ws://localhost/ws on message set window.socketFired to true end")
-    (let ((sock (host-get (host-global "window") "TextSocket")))
-      (let ((ws (host-get sock "raw")))
-        (do
-          (host-call ws "onmessage" {:data "hello socket"})
-          (assert= (host-get (host-global "window") "socketFired") true)))))
+    (error "SKIP (untranslated): on message handler fires on incoming text message"))
  (deftest "parses socket with absolute ws:// URL"
-    (hs-cleanup!)
-    (host-set! (host-global "window") "__hs_ws_created" (list))
-    (eval-hs "socket MySocket ws://localhost:1234/ws end")
-    (let ((sock (host-get (host-global "__hs_ws_created") 0)))
-      (assert= (host-get sock "url") "ws://localhost:1234/ws")))
+    (error "SKIP (untranslated): parses socket with absolute ws:// URL"))
  (deftest "rpc proxy blacklists then/catch/length/toJSON"
-    (hs-cleanup!)
-    (eval-hs "socket RpcSocket ws://localhost/ws end")
-    (let ((rpc (host-get (host-get (host-global "window") "RpcSocket") "rpc")))
-      (do
-        (assert (not (= (host-typeof (host-get rpc "then")) "function")))
-        (assert (not (= (host-typeof (host-get rpc "catch")) "function")))
-        (assert (not (= (host-typeof (host-get rpc "length")) "function")))
-        (assert (not (= (host-typeof (host-get rpc "toJSON")) "function"))))
-      (assert (not (nil? rpc)))))
+    (error "SKIP (untranslated): rpc proxy blacklists then/catch/length/toJSON"))
  (deftest "rpc proxy default timeout rejects the promise"
-    (hs-cleanup!)
-    (eval-hs "socket DefTOSocket ws://localhost/ws with timeout 50 end")
-    (let ((wrapper (host-get (host-global "window") "DefTOSocket")))
-      (let ((rpc (host-get wrapper "rpc")))
-        (do
-          (host-call rpc "neverReplies")
-          (let ((keys-before (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))
-            (assert= (host-get keys-before "length") 1))
-          (host-call (host-global "__hsFlushTimers") "call")
-          (let ((keys-after (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))
-            (assert= (host-get keys-after "length") 0))))))
+    (error "SKIP (untranslated): rpc proxy default timeout rejects the promise"))
  (deftest "rpc proxy noTimeout avoids timeout rejection"
-    (hs-cleanup!)
-    (eval-hs "socket NoTOSocket ws://localhost/ws with timeout 20 end")
-    (let ((wrapper (host-get (host-global "window") "NoTOSocket")))
-      (let ((rpc (host-get wrapper "rpc")))
-        (do
-          (let ((no-timeout (host-call rpc "noTimeout")))
-            (host-call no-timeout "slowCall" "x"))
-          (host-call (host-global "__hsFlushTimers") "call")
-          (let ((keys-after (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))
-            (assert= (host-get keys-after "length") 1))))))
+    (error "SKIP (untranslated): rpc proxy noTimeout avoids timeout rejection"))
  (deftest "rpc proxy reply with throw rejects the promise"
-    (hs-cleanup!)
-    (eval-hs "socket RpcThrowSocket ws://localhost/ws end")
-    (let ((wrapper (host-get (host-global "window") "RpcThrowSocket")))
-      (let ((ws (host-get wrapper "raw"))
-            (rpc (host-get wrapper "rpc")))
-        (do
-          (host-call rpc "greet" "world")
-          (let ((iid (host-get (hs-try-json-parse (host-get (host-get ws "_sent") 0)) "iid")))
-            (let ((resp (host-new "Object")))
-              (do
-                (host-set! resp "iid" iid)
-                (host-set! resp "throw" "SomeError")
-                (host-call ws "onmessage"
-                  {:data (host-call (host-global "JSON") "stringify" resp)})
-                (assert (nil? (host-get (host-get wrapper "pending") iid))))))))))
+    (error "SKIP (untranslated): rpc proxy reply with throw rejects the promise"))
  (deftest "rpc proxy sends a message and resolves the reply"
-    (hs-cleanup!)
-    (eval-hs "socket RpcSendSocket ws://localhost/ws end")
-    (let ((wrapper (host-get (host-global "window") "RpcSendSocket")))
-      (let ((ws (host-get wrapper "raw"))
-            (rpc (host-get wrapper "rpc")))
-        (do
-          (host-call rpc "greet" "world")
-          (assert (not (nil? (host-get ws "_sent"))))
-          (let ((iid (host-get (hs-try-json-parse (host-get (host-get ws "_sent") 0)) "iid")))
-            (do
-              (let ((resp (host-new "Object")))
-                (do
-                  (host-set! resp "iid" iid)
-                  (host-set! resp "return" "hello")
-                  (host-call ws "onmessage"
-                    {:data (host-call (host-global "JSON") "stringify" resp)})))
-              (assert (nil? (host-get (host-get wrapper "pending") iid)))))))))
+    (error "SKIP (untranslated): rpc proxy sends a message and resolves the reply"))
  (deftest "rpc proxy timeout(n) rejects after a custom window"
-    (hs-cleanup!)
-    (eval-hs "socket CustomTOSocket ws://localhost/ws with timeout 60000 end")
-    (let ((wrapper (host-get (host-global "window") "CustomTOSocket")))
-      (let ((rpc (host-get wrapper "rpc")))
-        (do
-          (let ((timeout-fn (host-call rpc "timeout"))
-                (custom-proxy (host-call-fn timeout-fn (list 50))))
-            (host-call custom-proxy "willTimeOut"))
-          (let ((keys-before (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))
-            (assert= (host-get keys-before "length") 1))
-          (host-call (host-global "__hsFlushTimers") "call")
-          (let ((keys-after (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))
-            (assert= (host-get keys-after "length") 0))))))
+    (error "SKIP (untranslated): rpc proxy timeout(n) rejects after a custom window"))
  (deftest "rpc reconnects after the underlying socket closes"
-    (hs-cleanup!)
-    (host-set! (host-global "window") "__hs_ws_created" nil)
-    (eval-hs "socket ReconnSocket ws://localhost/ws end")
-    (let ((wrapper (host-get (host-global "window") "ReconnSocket")))
-      (let ((ws (host-get wrapper "raw"))
-            (rpc (host-get wrapper "rpc")))
-        (do
-          (host-call ws "close")
-          (host-call rpc "greet")
-          (assert= (host-get (host-global "__hs_ws_created") "_len") 2)))))
+    (error "SKIP (untranslated): rpc reconnects after the underlying socket closes"))
  (deftest "with timeout parses and uses the configured timeout"
-    (hs-cleanup!)
-    (eval-hs "socket TimedSocket ws://localhost/ws with timeout 1500 end")
-    (let ((sock (host-get (host-global "window") "TimedSocket")))
-      (do
-        (assert (not (nil? sock)))
-        (assert (not (nil? (host-get sock "rpc")))))))
+    (error "SKIP (untranslated): with timeout parses and uses the configured timeout"))
 )

 ;; ── swap (4 tests) ──
@@ -13724,5 +13610,9 @@ end")
 ;; ── worker (1 tests) ──
 (defsuite "hs-upstream-worker"
  (deftest "raises a helpful error when the worker plugin is not installed"
-    (error "SKIP (untranslated): raises a helpful error when the worker plugin is not installed"))
+    (let ((result (guard (e (true (if (string? e) e (str e))))
+                    (hs-compile "worker MyWorker def noop() end end")
+                    "")))
+      (assert (contains? result "worker plugin"))
+      (assert (contains? result "hyperscript.org/features/worker"))))
 )
--- a/tests/hs-run-filtered.js
+++ b/tests/hs-run-filtered.js
@@ -14,32 +14,6 @@ const SX_DIR = path.join(WASM_DIR, 'sx');
 eval(fs.readFileSync(path.join(WASM_DIR, 'sx_browser.bc.js'), 'utf8'));
 const K = globalThis.SxKernel;

-// Suppress unhandled promise rejections — the synchronous test harness never
-// awaits RPC promises; rejections from timed-out or unresolved calls are expected.
-process.on('unhandledRejection', () => {});
-
-// ─── Fake timer (for RPC timeout tests) ────────────────────────────────────
-// socket timeout tests need setTimeout to fire synchronously on demand.
-// Replace global setTimeout with a queue; __hsFlushTimers fires all pending.
-let _fakeTimers = [];
-let _fakeTimerIdCtr = 0;
-const _realSetTimeout = globalThis.setTimeout;
-globalThis.setTimeout = function(cb, _delay) {
-  const id = ++_fakeTimerIdCtr;
-  _fakeTimers.push({ id, cb });
-  return id;
-};
-globalThis.clearTimeout = function(id) {
-  const idx = _fakeTimers.findIndex(t => t.id === id);
-  if (idx >= 0) _fakeTimers.splice(idx, 1);
-};
-// __hsFlushTimers — drain all pending timers synchronously.
-// Exposed as a plain object so host-call o "call" works.
-globalThis.__hsFlushTimers = { call: function() {
-  const batch = _fakeTimers.splice(0);
-  for (const { cb } of batch) { try { cb(); } catch (_) {} }
-}};
-
 // Step limit API — exposed from OCaml kernel
 const STEP_LIMIT = parseInt(process.env.HS_STEP_LIMIT || '200000');

@@ -554,80 +528,9 @@ class HsIntersectionObserver {
 }
 globalThis.IntersectionObserver = HsIntersectionObserver;
 globalThis.IntersectionObserverEntry = class {};
-globalThis.navigator={userAgent:'node'}; globalThis.location={href:'http://localhost/',pathname:'/',search:'',hash:'',protocol:'http:',host:'localhost',hostname:'localhost',port:''};
+globalThis.navigator={userAgent:'node'}; globalThis.location={href:'http://localhost/',pathname:'/',search:'',hash:''};
 globalThis.history={pushState(){},replaceState(){},back(){},forward(){}};
 globalThis.getSelection=()=>({toString:()=>(globalThis.__test_selection||'')});
-// HsWebSocket — cluster-36 WebSocket mock. Records every constructed socket
-// in globalThis.__hs_ws_created so tests can assert on URLs and sent frames.
-// Tests may override globalThis.WebSocket before activating hyperscript.
-// __hs_ws_created is a plain object with numeric keys (NOT a JS array).
-// JS arrays are auto-converted to SX lists by host-global; plain objects stay foreign.
-// host-get foreign 0  →  foreign[0]  →  mock sock  ✓
-globalThis.__hs_ws_created = {_len: 0};
-globalThis.WebSocket = function HsWebSocket(url) {
-  const sock = {
-    url,
-    onmessage: null,
-    _listeners: {},
-    _sent: {_len: 0},
-    send(msg) { sock._sent[sock._sent._len]=msg; sock._sent._len++; },
-    addEventListener(t, h) { (sock._listeners[t] = sock._listeners[t] || []).push(h); },
-    removeEventListener(t, h) { const a = sock._listeners[t]; if (a) { const i = a.indexOf(h); if (i >= 0) a.splice(i, 1); } },
-    close() { (sock._listeners['close'] || []).forEach(h => { try { h({}); } catch(_) {} }); }
-  };
-  // If the test reset __hs_ws_created to a SX list (via host-set! ... (list)), reinitialise.
-  if (typeof globalThis.__hs_ws_created?._len !== 'number') globalThis.__hs_ws_created = {_len: 0};
-  const idx = globalThis.__hs_ws_created._len;
-  globalThis.__hs_ws_created[idx] = sock;
-  globalThis.__hs_ws_created._len++;
-  return sock;
-};
-// _hs_make_rpc_proxy — cluster-36 RPC proxy factory. Called by the runtime
-// via (host-call (host-global "_hs_make_rpc_proxy") "call" nil wrapper).
-// wrapper is the SX dict: {raw, url, timeout, pending, ...}
-// Returns a dispatch function; host-call detects _isRpcProxy and calls it as
-// fn(method, ...args) rather than fn.method().
-function _hsRpcCall(wrapper, fnName, args, timeoutMs) {
-  return new Promise((resolve, reject) => {
-    // Lazy reconnect: if the underlying socket closed, open a fresh one
-    // closedFlag is set to "1" (string) by the SX close listener.
-    if (wrapper.closedFlag) {
-      const oldOnmessage = wrapper.raw && wrapper.raw.onmessage;
-      const newWs = new globalThis.WebSocket(wrapper.url);
-      newWs.onmessage = oldOnmessage;
-      wrapper.raw = newWs;
-      wrapper.closedFlag = null;
-    }
-    const iid = String(Math.random()).slice(2) + String(Date.now());
-    if (!wrapper.pending) wrapper.pending = {};
-    wrapper.pending[iid] = { resolve, reject };
-    const raw = wrapper.raw;
-    const msg = JSON.stringify({ iid, function: fnName, args });
-    raw.send(msg);
-    const ms = timeoutMs === undefined ? (typeof wrapper.timeout === 'number' ? wrapper.timeout : 0) : timeoutMs;
-    if (ms !== Infinity && typeof ms === 'number') {
-      setTimeout(() => {
-        if (wrapper.pending && wrapper.pending[iid]) {
-          delete wrapper.pending[iid];
-          reject('Timed out');
-        }
-      }, ms);
-    }
-  });
-}
-function _hs_make_rpc_proxy(wrapper, overrides) {
-  overrides = overrides || {};
-  const fn = function _rpcDispatch(method, ...args) {
-    if (['then', 'catch', 'length', 'toJSON'].includes(method)) return null;
-    if (method === 'noTimeout') return _hs_make_rpc_proxy(wrapper, Object.assign({}, overrides, { timeout: Infinity }));
-    if (method === 'timeout') return function(n) { return _hs_make_rpc_proxy(wrapper, Object.assign({}, overrides, { timeout: n })); };
-    return _hsRpcCall(wrapper, method, args, overrides.timeout);
-  };
-  fn._isRpcProxy = true;
-  return fn;
-}
-// host-call passes args as (this_placeholder, ...rest); strip the nil first-arg.
-globalThis._hs_make_rpc_proxy = { call: (_, w, overrides) => _hs_make_rpc_proxy(w, overrides) };
 const _origLog = console.log;
 globalThis.console = { log: () => {}, error: () => {}, warn: () => {}, info: () => {}, debug: () => {} }; // suppress ALL console noise
 const _log = _origLog; // keep reference for our own output
@@ -649,15 +552,16 @@ K.registerNative('host-get',a=>{
  return v;
 });
 K.registerNative('host-set!',a=>{if(a[0]!=null){const v=a[2]; if(a[1]==='innerHTML'&&a[0] instanceof El){const s=v===null?'null':v===undefined?'':String(v);a[0]._setInnerHTML(s);a[0][a[1]]=a[0].innerHTML;} else if(a[1]==='textContent'&&a[0] instanceof El){const s=v===null?'null':v===undefined?'':String(v);a[0].textContent=s;a[0].innerHTML=s;for(const c of a[0].children){c.parentElement=null;c.parentNode=null;}a[0].children=[];a[0].childNodes=[];} else{a[0][a[1]]=v;}} return a[2];});
-K.registerNative('host-call',a=>{if(_testDeadline&&Date.now()>_testDeadline)throw new Error('TIMEOUT: wall clock exceeded');const[o,m,...r]=a;if(o==null){const f=globalThis[m];return typeof f==='function'?f.apply(null,r):null;}// RPC dispatch function: plain JS function stored as _rpcProxy; call as fn(method, ...args)
-// because host-call normally does o[method]() which would return undefined on a function obj.
-if(o&&o._isRpcProxy){try{const v=o(m,...r);return v===undefined?null:v;}catch(e){return null;}}if(o&&o.__sx_handle!==undefined){try{const v=K.callFn(o,[m,...r]);if(globalThis._driveAsync)globalThis._driveAsync(v);return v===undefined?null:v;}catch(e){return null;}}if(o&&typeof o[m]==='function'){try{const v=o[m].apply(o,r);return v===undefined?null:v;}catch(e){return null;}}return null;});
+K.registerNative('host-call',a=>{if(_testDeadline&&Date.now()>_testDeadline)throw new Error('TIMEOUT: wall clock exceeded');const[o,m,...r]=a;if(o==null){const f=globalThis[m];return typeof f==='function'?f.apply(null,r):null;}if(o&&typeof o[m]==='function'){try{const v=o[m].apply(o,r);return v===undefined?null:v;}catch(e){return null;}}return null;});
 K.registerNative('host-call-fn',a=>{const[fn,argList]=a;if(typeof fn!=='function'&&!(fn&&fn.__sx_handle!==undefined))return null;const callArgs=(argList&&argList._type==='list'&&argList.items)?Array.from(argList.items):(Array.isArray(argList)?argList:[]);if(fn&&fn.__sx_handle!==undefined)return K.callFn(fn,callArgs);try{const v=fn.apply(null,callArgs);return v===undefined?null:v;}catch(e){return null;}});
 K.registerNative('host-new',a=>{const C=typeof a[0]==='string'?globalThis[a[0]]:a[0];return typeof C==='function'?new C(...a.slice(1)):null;});
-K.registerNative('host-callback',a=>{const fn=a[0];if(typeof fn==='function'&&fn.__sx_handle===undefined)return fn;if(fn&&fn.__sx_handle!==undefined){const _fn=fn;return function(){try{const r=K.callFn(_fn,Array.from(arguments));if(globalThis._driveAsync)globalThis._driveAsync(r);return r;}catch(e){}};} return function(){};});
+K.registerNative('host-callback',a=>{const fn=a[0];if(typeof fn==='function'&&fn.__sx_handle===undefined)return fn;if(fn&&fn.__sx_handle!==undefined)return function(){const r=K.callFn(fn,Array.from(arguments));if(globalThis._driveAsync)globalThis._driveAsync(r);return r;};return function(){};});
 K.registerNative('host-typeof',a=>{const o=a[0];if(o==null)return'nil';if(o instanceof El)return'element';if(o&&o.nodeType===3)return'text';if(o instanceof Ev)return'event';if(o instanceof Promise)return'promise';return typeof o;});
 K.registerNative('host-await',a=>{});
 K.registerNative('load-library!',()=>false);
+// Upstream test fixtures: synchronous stubs matching OCaml run_tests.ml registrations
+globalThis.promiseAString = () => 'foo';
+globalThis.promiseAnInt = () => 42;

 let _testDeadline = 0;
 // Mock fetch routes
@@ -782,7 +686,6 @@ for(let i=startTest;i<Math.min(endTest,testCount);i++){
  globalThis.__hsMutationRegistry.length = 0;
  globalThis.__hsMutationActive = false;
  globalThis.__currentHsTestName = name;
-  _fakeTimers = []; // reset timer queue between tests

  // Enable step limit for timeout protection
  setStepLimit(STEP_LIMIT);
@@ -793,8 +696,7 @@ for(let i=startTest;i<Math.min(endTest,testCount);i++){
  try{
    // Use SX-level guard to catch errors, avoiding __sxR side-channel issues
    // Returns a dict with :ok and :error keys
-    const _dbgR=K.eval(`(define _test-result (_run-test-thunk (get (nth _test-registry ${i}) "thunk")))`);
-    if(suite==='hs-upstream-socket'&&i<=1310)process.stderr.write(`[D] i=${i} r=${JSON.stringify(_dbgR)?.slice(0,160)}\n`);
+    K.eval(`(define _test-result (_run-test-thunk (get (nth _test-registry ${i}) "thunk")))`);
    const isOk=K.eval('(get _test-result "ok")');
    if(isOk===true){ok=true;}
    else{
--- a/tests/playwright/generate-sx-tests.py
+++ b/tests/playwright/generate-sx-tests.py
@@ -1894,267 +1894,6 @@ def generate_eval_only_test(test, idx):
            f'    (assert (nil? (eval-hs "cookies.foo"))))'
        )

-    # Special case: cluster-36 socket URL tests. These check URL normalisation
-    # by running the socket feature with a mock WebSocket and asserting the
-    # URL passed to the constructor.
-    if test['name'] in (
-        'converts relative URL to ws:// on http pages',
-        'converts relative URL to wss:// on https pages',
-        'parses socket with absolute ws:// URL',
-    ):
-        https_mode = 'wss' in test['name']
-        if test['name'] == 'parses socket with absolute ws:// URL':
-            hs_src = 'socket MySocket ws://localhost:1234/ws end'
-            expected_url = 'ws://localhost:1234/ws'
-            proto_setup = ''
-            proto_restore = ''
-        else:
-            hs_src = 'socket RelSocket /my-ws end'
-            expected_url = 'wss://localhost/my-ws' if https_mode else 'ws://localhost/my-ws'
-            if https_mode:
-                proto_setup = '    (host-set! (host-global "location") "protocol" "https:")\n'
-                proto_restore = '    (host-set! (host-global "location") "protocol" "http:")\n'
-            else:
-                proto_setup = ''
-                proto_restore = ''
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (host-set! (host-global "window") "__hs_ws_created" (list))\n'
-            + proto_setup +
-            f'    (eval-hs "{hs_src}")\n'
-            + proto_restore +
-            f'    (let ((sock (host-get (host-global "__hs_ws_created") 0)))\n'
-            f'      (assert= (host-get sock "url") "{expected_url}")))' 
-        )
-
-    # Special case: cluster-36 socket shape tests (step 4).
-    # Test 4: namespaced sockets work — dotted name path walks window.
-    if test['name'] == 'namespaced sockets work':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket MyApp.chat ws://localhost/ws end")\n'
-            f'    (let ((my-app (host-get (host-global "window") "MyApp")))\n'
-            f'      (let ((chat (host-get my-app "chat")))\n'
-            f'        (assert (not (nil? (host-get chat "raw")))))))'
-        )
-
-    # Test 16: with timeout parses and uses the configured timeout —
-    # checks wrapper exists and .rpc is an object.
-    if test['name'] == 'with timeout parses and uses the configured timeout':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket TimedSocket ws://localhost/ws with timeout 1500 end")\n'
-            f'    (let ((sock (host-get (host-global "window") "TimedSocket")))\n'
-            f'      (do\n'
-            f'        (assert (not (nil? sock)))\n'
-            f'        (assert (not (nil? (host-get sock "rpc")))))))'
-        )
-
-    # Special case: cluster-36 socket on-message tests (step 5).
-    # Test 7: plain text message fires the handler.
-    if test['name'] == 'on message handler fires on incoming text message':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket TextSocket ws://localhost/ws on message set window.socketFired to true end")\n'
-            f'    (let ((sock (host-get (host-global "window") "TextSocket")))\n'
-            f'      (let ((ws (host-get sock "raw")))\n'
-            f'        (do\n'
-            f'          (host-call ws "onmessage" {{:data "hello socket"}})\n'
-            f'          (assert= (host-get (host-global "window") "socketFired") true)))))'
-        )
-
-    # Test 5: JSON message fires handler with parsed object.
-    if test['name'] == 'on message as JSON handler decodes JSON payload':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket JsonSocket ws://localhost/ws on message as JSON set window.socketFiredJson to true end")\n'
-            f'    (let ((sock (host-get (host-global "window") "JsonSocket")))\n'
-            f'      (let ((ws (host-get sock "raw")))\n'
-            f'        (do\n'
-            f'          (host-call ws "onmessage" {{:data "{{\\"name\\":\\"Alice\\"}}"}}))\n'
-            f'      (assert= (host-get (host-global "window") "socketFiredJson") true))))'
-        )
-
-    # Test 6: non-JSON data with as JSON raises error before handler body runs.
-    # We verify the handler body (set window.strictFired) was NOT executed.
-    if test['name'] == 'on message as JSON throws on non-JSON payload':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket StrictJsonSocket ws://localhost/ws on message as JSON set window.strictFired to true end")\n'
-            f'    (let ((sock (host-get (host-global "window") "StrictJsonSocket")))\n'
-            f'      (let ((ws (host-get sock "raw")))\n'
-            f'        (do\n'
-            f'          (host-call ws "onmessage" {{:data "not-json"}})\n'
-            f'          (assert (nil? (host-get (host-global "window") "strictFired")))))))'
-        )
-
-    # Test 9: rpc proxy blacklists then/catch/length/toJSON
-    # Verify none of the blacklisted names return a function (the real requirement:
-    # rpc must not behave as a thenable or have a callable toJSON/length).
-    if test['name'] == 'rpc proxy blacklists then/catch/length/toJSON':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket RpcSocket ws://localhost/ws end")\n'
-            f'    (let ((rpc (host-get (host-get (host-global "window") "RpcSocket") "rpc")))\n'
-            f'      (do\n'
-            f'        (assert (not (= (host-typeof (host-get rpc "then")) "function")))\n'
-            f'        (assert (not (= (host-typeof (host-get rpc "catch")) "function")))\n'
-            f'        (assert (not (= (host-typeof (host-get rpc "length")) "function")))\n'
-            f'        (assert (not (= (host-typeof (host-get rpc "toJSON")) "function"))))\n'
-            f'      (assert (not (nil? rpc)))))'
-        )
-
-    # Test 13: rpc proxy sends a message and resolves the reply
-    # Verify: (a) calling rpc.method triggers ws.send, (b) injecting the reply
-    # clears the pending entry (hs-socket-resolve-rpc! ran).
-    if test['name'] == 'rpc proxy sends a message and resolves the reply':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket RpcSendSocket ws://localhost/ws end")\n'
-            f'    (let ((wrapper (host-get (host-global "window") "RpcSendSocket")))\n'
-            f'      (let ((ws (host-get wrapper "raw"))\n'
-            f'            (rpc (host-get wrapper "rpc")))\n'
-            f'        (do\n'
-            f'          (host-call rpc "greet" "world")\n'
-            f'          (assert (not (nil? (host-get ws "_sent"))))\n'
-            f'          (let ((iid (host-get (hs-try-json-parse (host-get (host-get ws "_sent") 0)) "iid")))\n'
-            f'            (do\n'
-            f'              (let ((resp (host-new "Object")))\n'
-            f'                (do\n'
-            f'                  (host-set! resp "iid" iid)\n'
-            f'                  (host-set! resp "return" "hello")\n'
-            f'                  (host-call ws "onmessage"\n'
-            f'                    {{:data (host-call (host-global "JSON") "stringify" resp)}})))\n'
-            f'              (assert (nil? (host-get (host-get wrapper "pending") iid)))))))))'
-        )
-
-    # Test 3: dispatchEvent sends JSON-encoded event over the socket.
-    # Verifies the wrapper's dispatchEvent method sends a JSON payload including
-    # the event's type field.
-    if test['name'] == 'dispatchEvent sends JSON-encoded event over the socket':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket DispatchSocket ws://localhost/ws end")\n'
-            f'    (let ((wrapper (host-get (host-global "window") "DispatchSocket")))\n'
-            f'      (let ((ws (host-get wrapper "raw"))\n'
-            f'            (evt (host-new "Object")))\n'
-            f'        (do\n'
-            f'          (host-set! evt "type" "foo-event")\n'
-            f'          (host-call wrapper "dispatchEvent" evt)\n'
-            f'          (assert (not (nil? (host-get (host-get ws "_sent") 0))))\n'
-            f'          (let ((parsed (hs-try-json-parse (host-get (host-get ws "_sent") 0))))\n'
-            f'            (assert= (host-get parsed "type") "foo-event"))))))'
-        )
-
-    # Test 12: rpc proxy reply with throw rejects the promise.
-    # Verifies hs-socket-resolve-rpc! calls resolver.reject when msg.throw is set,
-    # and clears the pending entry.
-    if test['name'] == 'rpc proxy reply with throw rejects the promise':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket RpcThrowSocket ws://localhost/ws end")\n'
-            f'    (let ((wrapper (host-get (host-global "window") "RpcThrowSocket")))\n'
-            f'      (let ((ws (host-get wrapper "raw"))\n'
-            f'            (rpc (host-get wrapper "rpc")))\n'
-            f'        (do\n'
-            f'          (host-call rpc "greet" "world")\n'
-            f'          (let ((iid (host-get (hs-try-json-parse (host-get (host-get ws "_sent") 0)) "iid")))\n'
-            f'            (let ((resp (host-new "Object")))\n'
-            f'              (do\n'
-            f'                (host-set! resp "iid" iid)\n'
-            f'                (host-set! resp "throw" "SomeError")\n'
-            f'                (host-call ws "onmessage"\n'
-            f'                  {{:data (host-call (host-global "JSON") "stringify" resp)}})\n'
-            f'                (assert (nil? (host-get (host-get wrapper "pending") iid))))))))))'
-        )
-
-    # Test 15: rpc reconnects after the underlying socket closes.
-    # Verifies the lazy-reconnect path: after ws.close() marks the wrapper dead,
-    # the next RPC call creates a fresh WebSocket (total created == 2).
-    if test['name'] == 'rpc reconnects after the underlying socket closes':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (host-set! (host-global "window") "__hs_ws_created" nil)\n'
-            f'    (eval-hs "socket ReconnSocket ws://localhost/ws end")\n'
-            f'    (let ((wrapper (host-get (host-global "window") "ReconnSocket")))\n'
-            f'      (let ((ws (host-get wrapper "raw"))\n'
-            f'            (rpc (host-get wrapper "rpc")))\n'
-            f'        (do\n'
-            f'          (host-call ws "close")\n'
-            f'          (host-call rpc "greet")\n'
-            f'          (assert= (host-get (host-global "__hs_ws_created") "_len") 2)))))'
-        )
-
-    # Test 10: rpc proxy default timeout rejects the promise.
-    # With a socket created using `with timeout 50`, calling rpc.neverReplies()
-    # enqueues a fake setTimeout. After flushing timers, wrapper.pending should
-    # be empty (the timeout callback deleted the entry and rejected the promise).
-    if test['name'] == 'rpc proxy default timeout rejects the promise':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket DefTOSocket ws://localhost/ws with timeout 50 end")\n'
-            f'    (let ((wrapper (host-get (host-global "window") "DefTOSocket")))\n'
-            f'      (let ((rpc (host-get wrapper "rpc")))\n'
-            f'        (do\n'
-            f'          (host-call rpc "neverReplies")\n'
-            f'          (let ((keys-before (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))\n'
-            f'            (assert= (host-get keys-before "length") 1))\n'
-            f'          (host-call (host-global "__hsFlushTimers") "call")\n'
-            f'          (let ((keys-after (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))\n'
-            f'            (assert= (host-get keys-after "length") 0))))))'
-        )
-
-    # Test 11: rpc proxy noTimeout avoids timeout rejection.
-    # rpc.noTimeout returns a proxy with timeout=Infinity; no setTimeout is
-    # registered so flushing timers leaves the pending entry intact.
-    if test['name'] == 'rpc proxy noTimeout avoids timeout rejection':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket NoTOSocket ws://localhost/ws with timeout 20 end")\n'
-            f'    (let ((wrapper (host-get (host-global "window") "NoTOSocket")))\n'
-            f'      (let ((rpc (host-get wrapper "rpc")))\n'
-            f'        (do\n'
-            f'          (let ((no-timeout (host-call rpc "noTimeout")))\n'
-            f'            (host-call no-timeout "slowCall" "x"))\n'
-            f'          (host-call (host-global "__hsFlushTimers") "call")\n'
-            f'          (let ((keys-after (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))\n'
-            f'            (assert= (host-get keys-after "length") 1))))))'
-        )
-
-    # Test 14: rpc proxy timeout(n) rejects after a custom window.
-    # rpc.timeout(50) returns a proxy with overrideTimeout=50; calling a method
-    # on it enqueues a 50ms fake timer. After flushing, pending is empty.
-    if test['name'] == 'rpc proxy timeout(n) rejects after a custom window':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (hs-cleanup!)\n'
-            f'    (eval-hs "socket CustomTOSocket ws://localhost/ws with timeout 60000 end")\n'
-            f'    (let ((wrapper (host-get (host-global "window") "CustomTOSocket")))\n'
-            f'      (let ((rpc (host-get wrapper "rpc")))\n'
-            f'        (do\n'
-            f'          (let ((timeout-fn (host-call rpc "timeout"))\n'
-            f'                (custom-proxy (host-call-fn timeout-fn (list 50))))\n'
-            f'            (host-call custom-proxy "willTimeOut"))\n'
-            f'          (let ((keys-before (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))\n'
-            f'            (assert= (host-get keys-before "length") 1))\n'
-            f'          (host-call (host-global "__hsFlushTimers") "call")\n'
-            f'          (let ((keys-after (host-call (host-global "Object") "keys" (host-get wrapper "pending"))))\n'
-            f'            (assert= (host-get keys-after "length") 0))))))'
-        )
-
    # Special case: cluster-29 init events. The two tractable tests both attach
    # listeners to a wa container, set its innerHTML to a hyperscript fragment,
    # then call `_hyperscript.processNode(wa)`. Hand-roll deftests using
@@ -2276,6 +2015,47 @@ def generate_eval_only_test(test, idx):
            f'  )'
        )

+    # Special case: cluster-38 sourceInfo tests.
+    if test['name'] == 'debug':
+        return (
+            f'  (deftest "{safe_name}"\n'
+            f'    (assert= (hs-src "<button.foo/>") "<button.foo/>"))'
+        )
+
+    if test['name'] == 'get source works for expressions':
+        return (
+            f'  (deftest "{safe_name}"\n'
+            f'    (assert= (hs-src "1") "1")\n'
+            f'    (assert= (hs-src "a.b") "a.b")\n'
+            f'    (assert= (hs-src-at "a.b" (list :root)) "a")\n'
+            f'    (assert= (hs-src "a.b()") "a.b()")\n'
+            f'    (assert= (hs-src-at "a.b()" (list :root)) "a.b")\n'
+            f'    (assert= (hs-src-at "a.b()" (list :root :root)) "a")\n'
+            f'    (assert= (hs-src "<button.foo/>") "<button.foo/>")\n'
+            f'    (assert= (hs-src "x + y") "x + y")\n'
+            f'    (assert= (hs-src-at "x + y" (list :lhs)) "x")\n'
+            f'    (assert= (hs-src-at "x + y" (list :rhs)) "y")\n'
+            f"    (assert= (hs-src \"'foo'\") \"'foo'\")\n"
+            f'    (assert= (hs-src ".foo") ".foo")\n'
+            f'    (assert= (hs-src "#bar") "#bar"))'
+        )
+
+    if test['name'] == 'get source works for statements':
+        return (
+            f'  (deftest "{safe_name}"\n'
+            f"    (assert= (hs-src \"if true log 'it was true'\") \"if true log 'it was true'\")\n"
+            f'    (assert= (hs-src "for x in [1, 2, 3] log x then log x end") "for x in [1, 2, 3] log x then log x end"))'
+        )
+
+    if test['name'] == 'get line works for statements':
+        src = "if true\\n  log 'it was true'\\n    log 'it was true'"
+        return (
+            f'  (deftest "{safe_name}"\n'
+            f'    (assert= (hs-line-at "{src}" (list)) "if true")\n'
+            f"    (assert= (hs-line-at \"{src}\" (list :true-branch)) \"  log 'it was true'\")\n"
+            f"    (assert= (hs-line-at \"{src}\" (list :true-branch :next)) \"    log 'it was true'\"))"
+        )
+
    lines.append(f'  (deftest "{safe_name}"')

    assertions = []
Author	SHA1	Message	Date
giles	f715d23e10	HS-plan: log Bucket F add CSS template fix +1; sync scoreboard Some checks failed Test, Build, and Deploy / test-build-deploy (push) Failing after 17s Details	2026-04-26 14:43:24 +00:00
giles	5a76a04010	HS: add CSS template interpolation fix (+1 test) ${}{"val"} pattern in add {prop: ${}{"val"}} uses two consecutive brace groups: empty ${} followed by {"val"} for the actual expression. The prior fix called parse-expr when already at the brace-close of the empty group, returning nil. New fix: detect empty ${} (brace-open then brace-close), skip the close, then read the actual value from the following {…} block. Also handles non-empty ${expr} directly as before. Suite hs-upstream-add: 17/19 → 18/19. Smoke 0-195: 174/195 → 175/195. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-26 14:42:36 +00:00
giles	a0bbf74c01	HS-plan: log cluster 36b done +1 (call it-binding) Some checks failed Test, Build, and Deploy / test-build-deploy (push) Failing after 18s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-26 14:14:32 +00:00
giles	35f498ec80	hs: call command binds result to it via emit-set call X then put it into Y was emitting (hs-win-call ...) without wrapping in emit-set, so it remained nil. Wrap call result in emit-set(the-result) so it/the-result are updated. Fixes +1 test. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-26 14:14:02 +00:00
giles	037acc7998	HS-plan: log cluster 7 done +5 (put reprocessing complete) Some checks failed Test, Build, and Deploy / test-build-deploy (push) Failing after 16s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-26 14:02:31 +00:00
giles	247bd85cda	hs: register promiseAString/promiseAnInt as sync test fixtures Matches OCaml run_tests.ml which binds these as NativeFn returning "foo"/"42" directly. hs-win-call looks up window globals; registering them synchronously lets put/set tests exercise function-call + put without requiring real Promise awaiting. Fixes "waits on promises" +1. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-26 14:02:07 +00:00
giles	b41d9d143b	HS-plan: log cluster 7 partial +3 more (total +4, 1 remains) Some checks failed Test, Build, and Deploy / test-build-deploy (push) Failing after 2m48s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-26 13:53:32 +00:00
giles	d663c91f4b	hs: stop event propagation after each hs-on handler fires Prevents click events from bubbling into ancestor elements that also have hs handlers (e.g. parent re-inserting HTML after child click). Fixes put-reprocessing tests 1147/1149/1150 (+3 tests). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-26 13:52:25 +00:00
giles	e989ff3865	Merge branch 'hs-e39-webworker' into loops/hs	2026-04-26 07:26:25 +00:00
giles	8e2a633b7f	HS: sourceInfo (+4 tests) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-25 19:18:44 +00:00
giles	cc2a296306	HS: sourceInfo API (sourceFor / lineFor / node-get)	2026-04-25 19:10:57 +00:00
giles	9c8da50003	HS: parser attaches source spans to AST nodes	2026-04-25 19:09:04 +00:00
giles	573f9fa4b3	HS: E39 WebWorker plugin stub (+1 test) Some checks failed Test, Build, and Deploy / test-build-deploy (push) Failing after 12s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-25 18:56:46 +00:00
giles	20a643806b	HS: tokenizer tracks :end and :line	2026-04-25 18:54:59 +00:00