fed-prims: diagnose fed-sx-m2 Blockers #4 — not a mutex bug, hand back to m2

Investigated the http-listen "handler-mutex deadlock" per
plans/agent-briefings/fed-prims-mutex-fix.md. Reproduced deterministically
(single kernel-route request returns empty reply while a non-kernel route
returns 200; also reproduced with a 3-line minimal echo gen_server).

Root cause is in the Erlang substrate, not the OCaml mutex: native
http-listen runs each handler on a fresh Thread.create outside any Erlang
scheduler step, so gen_server:call -> receive (which raises er-suspend-marker
expecting an enclosing er-sched-step-alive! guard + er-sched-run-all! pump)
can never complete.

Pattern A is inapplicable: the failure reproduces on a single request with
zero contention, so it is not a mutex-contention deadlock; the mutex is in
fact required and must stay. Sx_runtime.sx_call is fully synchronous and no
OCaml symbol reaches the SX-level scheduler, so there is no OCaml-only fix.
The correct fix is Pattern B done entirely in er-bif-http-listen
(lib/erlang/runtime.sx) — spawn the handler as an er-process and
er-sched-run-all! to completion — which is m2 / loops/erlang scope.

Doc-only: full diagnosis + concrete patch sketch added to the Blockers and
Progress log of plans/fed-sx-host-primitives.md. No bin/sx_server.ml change.

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

.claude/scheduled_tasks.lock

@@ -1 +1 @@
-{"sessionId":"c4d97db1-361c-4a04-a99b-c838f9385469","pid":2426590,"procStart":"349789073","acquiredAt":1780789990975}
+{"sessionId":"31c80255-eb92-43e4-8997-84ad84e27326","pid":90960,"procStart":"564684","acquiredAt":1777049890282}

.mcp.json

@@ -2,7 +2,7 @@
   "mcpServers": {
     "sx-tree": {
       "type": "stdio",
-      "command": "/root/rose-ash/hosts/ocaml/_build/default/bin/mcp_tree.exe"
+      "command": "./hosts/ocaml/_build/default/bin/mcp_tree.exe"
     },
     "rose-ash-services": {
       "type": "stdio",

hosts/ocaml/bin/run_tests.ml

@@ -1820,213 +1820,6 @@ let run_foundation_tests () =
      Printf.printf "  FAIL: invocation_count: %s\n"
        (match other with Some n -> string_of_int n | None -> "None"));
 
-  Printf.printf "\nSuite: extensions/erlang_ext (Phase 9h)\n";
-  (* Register the Erlang opcode namespace. Disjoint id range (200-217)
-     from test_ext (220/221) so they coexist. *)
-  Erlang_ext.register ();
-
-  (match prim [String "erlang.OP_PATTERN_TUPLE"] with
-   | Integer 222 ->
-     incr pass_count;
-     Printf.printf "  PASS: extension-opcode-id erlang.OP_PATTERN_TUPLE = 222\n"
-   | other ->
-     incr fail_count;
-     Printf.printf "  FAIL: erlang.OP_PATTERN_TUPLE: got %s\n"
-       (Sx_types.inspect other));
-
-  (match prim [String "erlang.OP_BIF_IS_TUPLE"] with
-   | Integer 239 ->
-     incr pass_count;
-     Printf.printf "  PASS: extension-opcode-id erlang.OP_BIF_IS_TUPLE = 239\n"
-   | other ->
-     incr fail_count;
-     Printf.printf "  FAIL: erlang.OP_BIF_IS_TUPLE: got %s\n"
-       (Sx_types.inspect other));
-
-  (match prim [String "erlang.OP_NONEXISTENT"] with
-   | Nil ->
-     incr pass_count;
-     Printf.printf "  PASS: unknown erlang opcode -> nil\n"
-   | other ->
-     incr fail_count;
-     Printf.printf "  FAIL: unknown erlang opcode: got %s\n"
-       (Sx_types.inspect other));
-
-  (* Phase 10b vertical slice: erlang.OP_BIF_LENGTH (230) is a REAL
-     handler. Build [CONST 0; OP_BIF_LENGTH; RETURN] with an Erlang
-     list [1,2,3] in the constant pool; expect Integer 3. Proves the
-     full path: bytecode -> Sx_vm extension fallthrough -> erlang_ext
-     handler -> correct stack result. *)
-  (let mk_dict kvs =
-     let h = Hashtbl.create 4 in
-     List.iter (fun (k, v) -> Hashtbl.replace h k v) kvs;
-     Sx_types.Dict h in
-   let er_nil = mk_dict [("tag", Sx_types.String "nil")] in
-   let er_cons hd tl =
-     mk_dict [("tag", Sx_types.String "cons");
-              ("head", hd); ("tail", tl)] in
-   let lst = er_cons (Sx_types.Integer 1)
-               (er_cons (Sx_types.Integer 2)
-                  (er_cons (Sx_types.Integer 3) er_nil)) in
-   let code = ({
-     vc_arity = 0; vc_rest_arity = -1; vc_locals = 0;
-     vc_bytecode = [| 1; 0; 0; 230; 50 |];
-     vc_constants = [| lst |];
-     vc_bytecode_list = None; vc_constants_list = None;
-   } : Sx_types.vm_code) in
-   let globals = Hashtbl.create 1 in
-   try
-     match Sx_vm.execute_module code globals with
-     | Integer 3 ->
-       incr pass_count;
-       Printf.printf "  PASS: erlang.OP_BIF_LENGTH [1,2,3] -> 3 (real handler, end-to-end)\n"
-     | other ->
-       incr fail_count;
-       Printf.printf "  FAIL: OP_BIF_LENGTH result: got %s\n"
-         (Sx_types.inspect other)
-   with exn ->
-     incr fail_count;
-     Printf.printf "  FAIL: OP_BIF_LENGTH raised: %s\n"
-       (Printexc.to_string exn));
-
-  (* More real handlers (Phase 10b batch): build a list/tuple constant
-     and exercise HD/TL/TUPLE_SIZE/IS_* end-to-end through the VM. *)
-  (let mk_dict kvs =
-     let h = Hashtbl.create 4 in
-     List.iter (fun (k, v) -> Hashtbl.replace h k v) kvs;
-     Sx_types.Dict h in
-   let er_nil = mk_dict [("tag", Sx_types.String "nil")] in
-   let er_cons hd tl = mk_dict [("tag", Sx_types.String "cons");
-                                ("head", hd); ("tail", tl)] in
-   let er_tuple es = mk_dict [("tag", Sx_types.String "tuple");
-                              ("elements", Sx_types.List es)] in
-   let er_atom nm = mk_dict [("tag", Sx_types.String "atom");
-                             ("name", Sx_types.String nm)] in
-   let lst3 = er_cons (Sx_types.Integer 7)
-                (er_cons (Sx_types.Integer 8)
-                   (er_cons (Sx_types.Integer 9) er_nil)) in
-   let tup3 = er_tuple [Sx_types.Integer 1; Sx_types.Integer 2;
-                        Sx_types.Integer 3] in
-   let run consts bc =
-     let code = ({
-       vc_arity = 0; vc_rest_arity = -1; vc_locals = 0;
-       vc_bytecode = bc; vc_constants = consts;
-       vc_bytecode_list = None; vc_constants_list = None;
-     } : Sx_types.vm_code) in
-     Sx_vm.execute_module code (Hashtbl.create 1) in
-   let nm = function
-     | Sx_types.Dict d ->
-       (match Hashtbl.find_opt d "name" with
-        | Some (Sx_types.String s) -> s | _ -> "?")
-     | _ -> "?" in
-   let check label want got =
-     if got = want then begin
-       incr pass_count;
-       Printf.printf "  PASS: %s\n" label
-     end else begin
-       incr fail_count;
-       Printf.printf "  FAIL: %s: got %s\n" label (Sx_types.inspect got)
-     end in
-   (* HD [7,8,9] -> 7 *)
-   check "OP_BIF_HD [7,8,9] -> 7" (Sx_types.Integer 7)
-     (run [| lst3 |] [| 1;0;0; 231; 50 |]);
-   (* TL [7,8,9] -> [8,9], check its HD = 8 *)
-   check "OP_BIF_TL then HD -> 8" (Sx_types.Integer 8)
-     (run [| lst3 |] [| 1;0;0; 232; 231; 50 |]);
-   (* TUPLE_SIZE {1,2,3} -> 3 *)
-   check "OP_BIF_TUPLE_SIZE {1,2,3} -> 3" (Sx_types.Integer 3)
-     (run [| tup3 |] [| 1;0;0; 234; 50 |]);
-   (* IS_INTEGER 42 -> true ; IS_INTEGER [..] -> false *)
-   (match run [| Sx_types.Integer 42 |] [| 1;0;0; 236; 50 |] with
-    | v when nm v = "true" ->
-      incr pass_count; Printf.printf "  PASS: OP_BIF_IS_INTEGER 42 -> true\n"
-    | v -> incr fail_count;
-      Printf.printf "  FAIL: IS_INTEGER 42: got %s\n" (Sx_types.inspect v));
-   (match run [| lst3 |] [| 1;0;0; 236; 50 |] with
-    | v when nm v = "false" ->
-      incr pass_count; Printf.printf "  PASS: OP_BIF_IS_INTEGER list -> false\n"
-    | v -> incr fail_count;
-      Printf.printf "  FAIL: IS_INTEGER list: got %s\n" (Sx_types.inspect v));
-   (* IS_ATOM atom -> true ; IS_LIST nil -> true ; IS_TUPLE tuple -> true *)
-   (match run [| er_atom "ok" |] [| 1;0;0; 237; 50 |] with
-    | v when nm v = "true" ->
-      incr pass_count; Printf.printf "  PASS: OP_BIF_IS_ATOM ok -> true\n"
-    | v -> incr fail_count;
-      Printf.printf "  FAIL: IS_ATOM: got %s\n" (Sx_types.inspect v));
-   (match run [| er_nil |] [| 1;0;0; 238; 50 |] with
-    | v when nm v = "true" ->
-      incr pass_count; Printf.printf "  PASS: OP_BIF_IS_LIST nil -> true\n"
-    | v -> incr fail_count;
-      Printf.printf "  FAIL: IS_LIST nil: got %s\n" (Sx_types.inspect v));
-   (match run [| tup3 |] [| 1;0;0; 239; 50 |] with
-    | v when nm v = "true" ->
-      incr pass_count; Printf.printf "  PASS: OP_BIF_IS_TUPLE {..} -> true\n"
-    | v -> incr fail_count;
-      Printf.printf "  FAIL: IS_TUPLE: got %s\n" (Sx_types.inspect v));
-   (match run [| tup3 |] [| 1;0;0; 238; 50 |] with
-    | v when nm v = "false" ->
-      incr pass_count; Printf.printf "  PASS: OP_BIF_IS_LIST tuple -> false\n"
-    | v -> incr fail_count;
-      Printf.printf "  FAIL: IS_LIST tuple: got %s\n" (Sx_types.inspect v));
-   (* ELEMENT: element(2, {1,2,3}) -> 2. Calling convention: push
-      Index then Tuple; opcode pops Tuple (TOS) then Index. *)
-   check "OP_BIF_ELEMENT element(2,{1,2,3}) -> 2" (Sx_types.Integer 2)
-     (run [| Sx_types.Integer 2; tup3 |] [| 1;0;0; 1;1;0; 233; 50 |]);
-   check "OP_BIF_ELEMENT element(1,{1,2,3}) -> 1" (Sx_types.Integer 1)
-     (run [| Sx_types.Integer 1; tup3 |] [| 1;0;0; 1;1;0; 233; 50 |]);
-   (* ELEMENT out of range raises *)
-   (let raised =
-      (try ignore (run [| Sx_types.Integer 9; tup3 |]
-                     [| 1;0;0; 1;1;0; 233; 50 |]); false
-       with Sx_types.Eval_error _ -> true) in
-    if raised then begin
-      incr pass_count;
-      Printf.printf "  PASS: OP_BIF_ELEMENT out-of-range raises\n"
-    end else begin
-      incr fail_count;
-      Printf.printf "  FAIL: OP_BIF_ELEMENT out-of-range should raise\n"
-    end);
-   (* LISTS_REVERSE [7,8,9] -> [9,8,7]; verify HD = 9 then HD of TL = 8 *)
-   check "OP_BIF_LISTS_REVERSE then HD -> 9" (Sx_types.Integer 9)
-     (run [| lst3 |] [| 1;0;0; 235; 231; 50 |]);
-   check "OP_BIF_LISTS_REVERSE then TL,HD -> 8" (Sx_types.Integer 8)
-     (run [| lst3 |] [| 1;0;0; 235; 232; 231; 50 |]);
-   (* reverse preserves length *)
-   check "OP_BIF_LISTS_REVERSE then LENGTH -> 3" (Sx_types.Integer 3)
-     (run [| lst3 |] [| 1;0;0; 235; 230; 50 |]));
-
-  (* A still-stubbed opcode (222 = erlang.OP_PATTERN_TUPLE) raises the
-     not-wired Eval_error — confirms the honest-failure path remains
-     for opcodes whose real handlers haven't landed. *)
-  (let globals = Hashtbl.create 1 in
-   try
-     ignore (Sx_vm.execute_module (make_bc_seq [| 222; 50 |]) globals);
-     incr fail_count;
-     Printf.printf "  FAIL: erlang.OP_PATTERN_TUPLE dispatch should have raised\n"
-   with
-   | Sx_types.Eval_error msg
-     when (let needle = "not yet wired" in
-           let nl = String.length needle and ml = String.length msg in
-           let rec scan i =
-             if i + nl > ml then false
-             else if String.sub msg i nl = needle then true
-             else scan (i + 1)
-           in scan 0) ->
-     incr pass_count;
-     Printf.printf "  PASS: erlang opcode dispatch raises not-wired error\n"
-   | exn ->
-     incr fail_count;
-     Printf.printf "  FAIL: unexpected exn: %s\n" (Printexc.to_string exn));
-
-  (match Erlang_ext.dispatch_count () with
-   | Some n when n >= 1 ->
-     incr pass_count;
-     Printf.printf "  PASS: erlang_ext state recorded %d dispatch(es)\n" n
-   | other ->
-     incr fail_count;
-     Printf.printf "  FAIL: dispatch_count: %s\n"
-       (match other with Some n -> string_of_int n | None -> "None"));
-
   Printf.printf "\nSuite: jit extension-opcode awareness\n";
   let scan = Sx_vm.bytecode_uses_extension_opcodes in
   let no_consts = [||] in

hosts/ocaml/bin/sx_server.ml

@@ -18,20 +18,6 @@
 
 open Sx_types
 
-(* Force-link Sx_vm_extensions so its module-init runs: installs the
-   extension dispatch fallthrough and registers the `extension-opcode-id`
-   SX primitive. Without a reference here OCaml dead-code-eliminates the
-   module from sx_server.exe (it's only otherwise reached from run_tests),
-   leaving guest-language opcode extensions (Erlang Phase 9, etc.)
-   invisible to the runtime. The applied call is a harmless lookup. *)
-let () = ignore (Sx_vm_extensions.id_of_name "")
-
-(* Register the Erlang opcode extension (Phase 9h) so
-   `extension-opcode-id "erlang.OP_*"` resolves to the host ids the SX
-   stub dispatcher consults. Guarded: a double-register raises Failure,
-   which we swallow so a re-entered server process doesn't die. *)
-let () = try Erlang_ext.register () with Failure _ -> ()
-
 (* ====================================================================== *)
 (* Font measurement via otfm — reads OpenType/TrueType font tables         *)
 (* ====================================================================== *)
@@ -855,6 +841,164 @@ let setup_evaluator_bridge env =
       done;
       Nil
     | _ -> raise (Eval_error "http-listen: (port handler)"));
+
+  (* fed-sx Milestone 1 client direction (Phase J). NATIVE ONLY —
+     Unix sockets + DNS; absent from the WASM kernel. HTTP/1.1
+     request: TCP connect, write request line + headers + body,
+     read status + headers + body, return {:status :headers :body}.
+     URL must be http://...; HTTPS is a later phase (needs TLS).
+     Body read: Content-Length first, else read to EOF (we send
+     Connection: close). Transfer-Encoding: chunked is rejected —
+     fed-sx Phase 8 wires this for inter-server POSTs which will
+     all carry Content-Length. *)
+  Sx_primitives.register "http-request" (fun args ->
+    let strip_cr s =
+      let n = String.length s in
+      if n > 0 && s.[n - 1] = '\r' then String.sub s 0 (n - 1) else s
+    in
+    match args with
+    | [String meth; String url; headers_v; body_v] ->
+      let body = match body_v with
+        | String s -> s
+        | Nil -> ""
+        | v -> Sx_types.value_to_string v in
+      let prefix = "http://" in
+      let plen = String.length prefix in
+      let ulen = String.length url in
+      if ulen < plen || String.sub url 0 plen <> prefix
+      then raise (Eval_error "http-request: URL must start with http://");
+      let rest = String.sub url plen (ulen - plen) in
+      let host_port, path =
+        match String.index_opt rest '/' with
+        | Some i ->
+          String.sub rest 0 i,
+          String.sub rest i (String.length rest - i)
+        | None -> rest, "/" in
+      if host_port = "" then
+        raise (Eval_error "http-request: missing host");
+      let host, port =
+        match String.index_opt host_port ':' with
+        | Some i ->
+          let h = String.sub host_port 0 i in
+          let ps = String.sub host_port (i + 1)
+                     (String.length host_port - i - 1) in
+          (h,
+           (try int_of_string ps with _ ->
+              raise (Eval_error "http-request: bad port")))
+        | None -> host_port, 80 in
+      let addr =
+        (try (Unix.gethostbyname host).h_addr_list.(0)
+         with Not_found ->
+           raise (Eval_error ("http-request: dns: " ^ host))) in
+      let sock = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
+      let cleanup () = try Unix.close sock with _ -> () in
+      let result =
+        (try
+          (try Unix.connect sock (Unix.ADDR_INET (addr, port))
+           with Unix.Unix_error (e, _, _) ->
+             raise (Eval_error
+                      ("http-request: connect: " ^ Unix.error_message e)));
+          let oc = Unix.out_channel_of_descr sock in
+          let ic = Unix.in_channel_of_descr sock in
+          let buf = Buffer.create 256 in
+          Buffer.add_string buf
+            (Printf.sprintf "%s %s HTTP/1.1\r\n" meth path);
+          let host_hdr_sent = ref false in
+          let clen_sent = ref false in
+          let conn_sent = ref false in
+          (match headers_v with
+           | Dict h ->
+             Hashtbl.iter (fun k v ->
+               let kl = String.lowercase_ascii k in
+               if kl = "host" then host_hdr_sent := true;
+               if kl = "content-length" then clen_sent := true;
+               if kl = "connection" then conn_sent := true;
+               let vs = match v with
+                 | String s -> s
+                 | x -> Sx_types.value_to_string x in
+               Buffer.add_string buf
+                 (Printf.sprintf "%s: %s\r\n" k vs)) h
+           | Nil -> ()
+           | _ -> raise (Eval_error "http-request: headers must be dict"));
+          if not !host_hdr_sent then
+            Buffer.add_string buf
+              (Printf.sprintf "Host: %s\r\n" host_port);
+          if not !clen_sent then
+            Buffer.add_string buf
+              (Printf.sprintf "Content-Length: %d\r\n"
+                 (String.length body));
+          if not !conn_sent then
+            Buffer.add_string buf "Connection: close\r\n";
+          Buffer.add_string buf "\r\n";
+          Buffer.add_string buf body;
+          output_string oc (Buffer.contents buf);
+          flush oc;
+          let sl =
+            (try strip_cr (input_line ic)
+             with End_of_file ->
+               raise (Eval_error
+                        "http-request: connection closed before status")) in
+          let status =
+            match String.split_on_char ' ' sl with
+            | _ver :: code :: _ ->
+              (try int_of_string code with _ ->
+                 raise (Eval_error "http-request: bad status code"))
+            | _ -> raise (Eval_error "http-request: bad status line") in
+          let rhdrs = Sx_types.make_dict () in
+          let clen = ref (-1) in
+          let chunked = ref false in
+          let rec rdh () =
+            let h =
+              (try strip_cr (input_line ic)
+               with End_of_file -> "") in
+            if h = "" then ()
+            else begin
+              (match String.index_opt h ':' with
+               | Some i ->
+                 let name =
+                   String.lowercase_ascii
+                     (String.trim (String.sub h 0 i)) in
+                 let value =
+                   String.trim
+                     (String.sub h (i + 1)
+                        (String.length h - i - 1)) in
+                 Hashtbl.replace rhdrs name (String value);
+                 if name = "content-length" then
+                   (try clen := int_of_string value with _ -> ())
+                 else if name = "transfer-encoding" &&
+                         String.lowercase_ascii value = "chunked"
+                 then chunked := true
+               | None -> ());
+              rdh ()
+            end in
+          rdh ();
+          if !chunked then
+            raise (Eval_error
+                     "http-request: chunked transfer-encoding not supported");
+          let rbody =
+            if !clen >= 0 then begin
+              let b = Bytes.create !clen in
+              really_input ic b 0 !clen;
+              Bytes.unsafe_to_string b
+            end else begin
+              let b = Buffer.create 256 in
+              (try
+                 while true do
+                   Buffer.add_channel b ic 4096
+                 done; assert false
+               with End_of_file -> ());
+              Buffer.contents b
+            end in
+          let resp = Sx_types.make_dict () in
+          Hashtbl.replace resp "status" (Integer status);
+          Hashtbl.replace resp "headers" (Dict rhdrs);
+          Hashtbl.replace resp "body" (String rbody);
+          Dict resp
+        with e -> cleanup (); raise e) in
+      cleanup ();
+      result
+    | _ -> raise (Eval_error "http-request: (method url headers body)"));
+
   bind "trampoline" (fun args ->
     match args with
     | [v] ->

hosts/ocaml/bin/test_http_client.sh

@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Phase J test — native-only http-request client primitive.
+# Reuses Phase H's http-listen to spin up an echo server, then drives
+# a separate sx_server via the epoch protocol to issue http-request
+# calls and assert response shape + headers + body.
+set -u
+cd "$(dirname "$0")/.."
+
+SRV=_build/default/bin/sx_server.exe
+PORT=${HTTP_CLIENT_TEST_PORT:-8921}
+PASS=0
+FAIL=0
+ok()  { echo "  PASS: $1"; PASS=$((PASS+1)); }
+bad() { echo "  FAIL: $1 — $2"; FAIL=$((FAIL+1)); }
+
+if [ ! -x "$SRV" ]; then
+  echo "build sx_server.exe first (dune build bin/sx_server.exe)"; exit 1
+fi
+
+# /echo echoes method/path/query/body and reflects request X-Custom
+# back as response X-Got; /missing-test → 404.
+H='(begin (define (h req) (if (= (get req "path") "/echo") {:status 200 :headers {"X-Echo" (get req "method") "X-Got" (get (get req "headers") "x-custom")} :body (str "M=" (get req "method") " P=" (get req "path") " Q=" (get req "query") " B=" (get req "body"))} (if (= (get req "path") "/missing-test") {:status 404 :body "nope"} {:status 500 :body "err"}))) (http-listen '"$PORT"' h))'
+ESC=${H//\"/\\\"}
+
+{ printf '(epoch 1)\n(eval "%s")\n' "$ESC"; sleep 60; } | "$SRV" >/tmp/test_http_client_srv.out 2>&1 &
+SVPID=$!
+trap 'kill $SVPID 2>/dev/null; wait 2>/dev/null' EXIT
+
+up=0
+for _ in $(seq 1 50); do
+  curl -s -o /dev/null "http://127.0.0.1:$PORT/echo" 2>/dev/null && { up=1; break; }
+  sleep 0.2
+done
+[ "$up" = 1 ] || { echo "  FAIL: server did not start"; cat /tmp/test_http_client_srv.out; exit 1; }
+
+emit() {
+  # $1 = epoch num, $2 = raw SX form. Wraps in (eval "...") with quotes escaped.
+  local esc=${2//\"/\\\"}
+  printf '(epoch %s)\n(eval "%s")\n' "$1" "$esc"
+}
+
+DRV_OUT=/tmp/test_http_client_drv.out
+{
+  emit 1 '(let ((r (http-request "GET" "http://127.0.0.1:'"$PORT"'/echo?x=1" {} ""))) (str "S=" (get r "status") " E=" (get (get r "headers") "x-echo") " B=" (get r "body")))'
+  emit 2 '(let ((r (http-request "POST" "http://127.0.0.1:'"$PORT"'/echo" {} "hello"))) (str "S=" (get r "status") " B=" (get r "body")))'
+  emit 3 '(let ((r (http-request "GET" "http://127.0.0.1:'"$PORT"'/missing-test" {} ""))) (str "S=" (get r "status") " B=" (get r "body")))'
+  emit 4 '(let ((r (http-request "GET" "http://127.0.0.1:'"$PORT"'/echo" {"X-Custom" "myval"} ""))) (get (get r "headers") "x-got"))'
+  emit 5 '(http-request "GET" "ftp://nope" {} "")'
+  emit 6 '(let ((r (http-request "GET" "http://127.0.0.1:'"$PORT"'/echo" {} ""))) (get r "status"))'
+} | "$SRV" >"$DRV_OUT" 2>&1
+
+# eval results come back as (ok-len N L)\n<body>\n — grep the body content.
+grep -q '^"S=200 E=GET B=M=GET P=/echo Q=x=1 B="$' "$DRV_OUT" \
+  && ok "GET status + echo header + body" \
+  || bad "GET" "$(grep -A1 '^(ok-len 1 ' "$DRV_OUT" | tail -1)"
+
+grep -q '^"S=200 B=M=POST P=/echo Q= B=hello"$' "$DRV_OUT" \
+  && ok "POST body roundtrip" \
+  || bad "POST" "$(grep -A1 '^(ok-len 2 ' "$DRV_OUT" | tail -1)"
+
+grep -q '^"S=404 B=nope"$' "$DRV_OUT" \
+  && ok "404 status + body" \
+  || bad "404" "$(grep -A1 '^(ok-len 3 ' "$DRV_OUT" | tail -1)"
+
+grep -q '^"myval"$' "$DRV_OUT" \
+  && ok "custom request header reaches server" \
+  || bad "custom-header" "$(grep -A1 '^(ok-len 4 ' "$DRV_OUT" | tail -1)"
+
+R5=$(grep '^(error 5 ' "$DRV_OUT" | head -1)
+echo "$R5" | grep -q 'URL must start with http' \
+  && ok "non-http scheme rejected" \
+  || bad "bad-url" "$R5"
+
+# Status is an Integer (200), serialized bare without quotes.
+grep -q '^200$' "$DRV_OUT" \
+  && ok "response status is integer 200" \
+  || bad "status-integer" "$(grep -A1 '^(ok-len 6 ' "$DRV_OUT" | tail -1)"
+
+echo "Results: $PASS passed, $FAIL failed"
+[ "$FAIL" = 0 ]

hosts/ocaml/lib/extensions/erlang_ext.ml

@@ -1,278 +0,0 @@
-(** {1 [erlang_ext] — Erlang-on-SX VM opcode extension (Phase 9h)}
-
-    Registers the Erlang opcode namespace in [Sx_vm_extensions] so that
-    [extension-opcode-id "erlang.OP_*"] resolves to a stable id. The SX
-    stub dispatcher in [lib/erlang/vm/dispatcher.sx] consults these ids
-    (Phase 9i) and falls back to its own local ids when the host
-    extension is absent.
-
-    Opcode ids occupy 222-239 in the extension partition (200-247).
-    222+ is chosen to clear the test extensions' reserved ids
-    (test_reg 210/211, test_ext 220/221) so all three coexist in
-    run_tests; production sx_server only registers this one. Names
-    mirror the SX stub dispatcher exactly:
-
-    - 222 erlang.OP_PATTERN_TUPLE      - 231 erlang.OP_BIF_HD
-    - 223 erlang.OP_PATTERN_LIST       - 232 erlang.OP_BIF_TL
-    - 224 erlang.OP_PATTERN_BINARY     - 233 erlang.OP_BIF_ELEMENT
-    - 225 erlang.OP_PERFORM            - 234 erlang.OP_BIF_TUPLE_SIZE
-    - 226 erlang.OP_HANDLE             - 235 erlang.OP_BIF_LISTS_REVERSE
-    - 227 erlang.OP_RECEIVE_SCAN       - 236 erlang.OP_BIF_IS_INTEGER
-    - 228 erlang.OP_SPAWN              - 237 erlang.OP_BIF_IS_ATOM
-    - 229 erlang.OP_SEND               - 238 erlang.OP_BIF_IS_LIST
-    - 230 erlang.OP_BIF_LENGTH         - 239 erlang.OP_BIF_IS_TUPLE
-
-    {2 Handler status}
-
-    The bytecode compiler does not yet emit these opcodes — Erlang
-    programs run through the general CEK path and the working
-    specialization path is the SX stub dispatcher. So every handler
-    here raises a descriptive [Eval_error] rather than silently
-    corrupting the VM stack. This keeps the extension honest: the
-    namespace is registered and disassembles by name, [extension-opcode-id]
-    works, but actually dispatching an opcode (which only happens once a
-    future phase teaches the compiler to emit them) fails loudly with a
-    pointer to the phase that will wire it. Real stack-machine handlers
-    land alongside compiler emission in a later phase. *)
-
-open Sx_types
-
-(** Per-instance state: invocation counter, purely to exercise the
-    [extension_state] machinery (mirrors [test_ext]). *)
-type Sx_vm_extension.extension_state += ErlangExtState of {
-  mutable dispatched : int;
-}
-
-let not_wired name =
-  raise (Eval_error
-    (Printf.sprintf
-       "%s: bytecode emission not yet wired (Phase 9j) — \
-        Erlang runs via CEK; specialization path is the SX stub \
-        dispatcher in lib/erlang/vm/dispatcher.sx"
-       name))
-
-module M : Sx_vm_extension.EXTENSION = struct
-  let name = "erlang"
-  let init () = ErlangExtState { dispatched = 0 }
-
-  let opcodes st =
-    let bump () = match st with
-      | ErlangExtState s -> s.dispatched <- s.dispatched + 1
-      | _ -> ()
-    in
-    let op id nm =
-      (id, nm, (fun (_vm : Sx_vm.vm) (_frame : Sx_vm.frame) ->
-        bump (); not_wired nm))
-    in
-    (* Phase 10b vertical slice: one REAL register-machine handler.
-       erlang.OP_BIF_LENGTH (230) — pops an Erlang list off the VM
-       stack and pushes its length. Proves the full path works:
-       extension-opcode-id -> bytecode -> Sx_vm dispatch fallthrough
-       -> this handler -> correct stack result. The remaining 17
-       opcodes still raise not_wired until their handlers + compiler
-       emission land. Erlang lists are tagged dicts:
-         nil  = {"tag" -> String "nil"}
-         cons = {"tag" -> String "cons"; "head" -> v; "tail" -> v} *)
-    let er_tag d =
-      match Hashtbl.find_opt d "tag" with
-      | Some (String s) -> s | _ -> ""
-    in
-    let op_bif_length =
-      (230, "erlang.OP_BIF_LENGTH",
-       (fun (vm : Sx_vm.vm) (_frame : Sx_vm.frame) ->
-         bump ();
-         let v = Sx_vm.pop vm in
-         let rec walk acc node =
-           match node with
-           | Dict d ->
-             (match er_tag d with
-              | "nil" -> acc
-              | "cons" ->
-                (match Hashtbl.find_opt d "tail" with
-                 | Some t -> walk (acc + 1) t
-                 | None -> raise (Eval_error
-                     "erlang.OP_BIF_LENGTH: cons cell without :tail"))
-              | _ -> raise (Eval_error
-                  "erlang.OP_BIF_LENGTH: not a proper list"))
-           | _ -> raise (Eval_error
-               "erlang.OP_BIF_LENGTH: not a proper list")
-         in
-         Sx_vm.push vm (Integer (walk 0 v))))
-    in
-    (* Phase 10b — simple hot-BIF handlers. Erlang bool is the atom
-       {"tag"->"atom"; "name"->"true"|"false"}; mk_atom builds it. *)
-    let mk_atom nm =
-      let h = Hashtbl.create 2 in
-      Hashtbl.replace h "tag" (String "atom");
-      Hashtbl.replace h "name" (String nm);
-      Dict h
-    in
-    let er_bool b = mk_atom (if b then "true" else "false") in
-    let is_tag v t = match v with
-      | Dict d -> er_tag d = t
-      | _ -> false
-    in
-    let op_bif_hd =
-      (231, "erlang.OP_BIF_HD",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         match Sx_vm.pop vm with
-         | Dict d when er_tag d = "cons" ->
-           (match Hashtbl.find_opt d "head" with
-            | Some h -> Sx_vm.push vm h
-            | None -> raise (Eval_error "erlang.OP_BIF_HD: cons without :head"))
-         | _ -> raise (Eval_error "erlang.OP_BIF_HD: not a cons")))
-    in
-    let op_bif_tl =
-      (232, "erlang.OP_BIF_TL",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         match Sx_vm.pop vm with
-         | Dict d when er_tag d = "cons" ->
-           (match Hashtbl.find_opt d "tail" with
-            | Some t -> Sx_vm.push vm t
-            | None -> raise (Eval_error "erlang.OP_BIF_TL: cons without :tail"))
-         | _ -> raise (Eval_error "erlang.OP_BIF_TL: not a cons")))
-    in
-    let op_bif_tuple_size =
-      (234, "erlang.OP_BIF_TUPLE_SIZE",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         match Sx_vm.pop vm with
-         | Dict d when er_tag d = "tuple" ->
-           let n = match Hashtbl.find_opt d "elements" with
-             | Some (List es) -> List.length es
-             | Some (ListRef r) -> List.length !r
-             | _ -> raise (Eval_error
-                 "erlang.OP_BIF_TUPLE_SIZE: tuple without :elements")
-           in
-           Sx_vm.push vm (Integer n)
-         | _ -> raise (Eval_error "erlang.OP_BIF_TUPLE_SIZE: not a tuple")))
-    in
-    let op_bif_is_integer =
-      (236, "erlang.OP_BIF_IS_INTEGER",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         let v = Sx_vm.pop vm in
-         Sx_vm.push vm (er_bool (match v with Integer _ -> true | _ -> false))))
-    in
-    let op_bif_is_atom =
-      (237, "erlang.OP_BIF_IS_ATOM",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         let v = Sx_vm.pop vm in
-         Sx_vm.push vm (er_bool (is_tag v "atom"))))
-    in
-    let op_bif_is_list =
-      (238, "erlang.OP_BIF_IS_LIST",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         let v = Sx_vm.pop vm in
-         Sx_vm.push vm (er_bool (is_tag v "cons" || is_tag v "nil"))))
-    in
-    let op_bif_is_tuple =
-      (239, "erlang.OP_BIF_IS_TUPLE",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         let v = Sx_vm.pop vm in
-         Sx_vm.push vm (er_bool (is_tag v "tuple"))))
-    in
-    (* element/2 and lists:reverse/1 — pure stack transforms (no
-       bytecode operands). Calling convention: args pushed left→right,
-       so element/2 stack is [.. Index Tuple] (Tuple on top). Erlang
-       element/2 is 1-indexed. *)
-    let op_bif_element =
-      (233, "erlang.OP_BIF_ELEMENT",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         let tup = Sx_vm.pop vm in
-         let idx = Sx_vm.pop vm in
-         match tup, idx with
-         | Dict d, Integer i when er_tag d = "tuple" ->
-           let es = match Hashtbl.find_opt d "elements" with
-             | Some (List es) -> es
-             | Some (ListRef r) -> !r
-             | _ -> raise (Eval_error
-                 "erlang.OP_BIF_ELEMENT: tuple without :elements")
-           in
-           let n = List.length es in
-           if i < 1 || i > n then
-             raise (Eval_error
-               (Printf.sprintf
-                  "erlang.OP_BIF_ELEMENT: index %d out of range 1..%d" i n))
-           else
-             Sx_vm.push vm (List.nth es (i - 1))
-         | _, Integer _ ->
-           raise (Eval_error "erlang.OP_BIF_ELEMENT: 2nd arg not a tuple")
-         | _ ->
-           raise (Eval_error "erlang.OP_BIF_ELEMENT: 1st arg not an integer")))
-    in
-    let op_bif_lists_reverse =
-      (235, "erlang.OP_BIF_LISTS_REVERSE",
-       (fun (vm : Sx_vm.vm) _f ->
-         bump ();
-         let v = Sx_vm.pop vm in
-         let mk_nil () =
-           let h = Hashtbl.create 1 in
-           Hashtbl.replace h "tag" (String "nil"); Dict h in
-         let mk_cons hd tl =
-           let h = Hashtbl.create 3 in
-           Hashtbl.replace h "tag" (String "cons");
-           Hashtbl.replace h "head" hd;
-           Hashtbl.replace h "tail" tl;
-           Dict h in
-         let rec rev acc node =
-           match node with
-           | Dict d ->
-             (match er_tag d with
-              | "nil" -> acc
-              | "cons" ->
-                let hd = match Hashtbl.find_opt d "head" with
-                  | Some x -> x
-                  | None -> raise (Eval_error
-                      "erlang.OP_BIF_LISTS_REVERSE: cons without :head") in
-                let tl = match Hashtbl.find_opt d "tail" with
-                  | Some x -> x
-                  | None -> raise (Eval_error
-                      "erlang.OP_BIF_LISTS_REVERSE: cons without :tail") in
-                rev (mk_cons hd acc) tl
-              | _ -> raise (Eval_error
-                  "erlang.OP_BIF_LISTS_REVERSE: not a proper list"))
-           | _ -> raise (Eval_error
-               "erlang.OP_BIF_LISTS_REVERSE: not a proper list")
-         in
-         Sx_vm.push vm (rev (mk_nil ()) v)))
-    in
-    [
-      op 222 "erlang.OP_PATTERN_TUPLE";
-      op 223 "erlang.OP_PATTERN_LIST";
-      op 224 "erlang.OP_PATTERN_BINARY";
-      op 225 "erlang.OP_PERFORM";
-      op 226 "erlang.OP_HANDLE";
-      op 227 "erlang.OP_RECEIVE_SCAN";
-      op 228 "erlang.OP_SPAWN";
-      op 229 "erlang.OP_SEND";
-      op_bif_length;
-      op_bif_hd;
-      op_bif_tl;
-      op_bif_element;
-      op_bif_tuple_size;
-      op_bif_lists_reverse;
-      op_bif_is_integer;
-      op_bif_is_atom;
-      op_bif_is_list;
-      op_bif_is_tuple;
-    ]
-end
-
-(** Register [erlang] in [Sx_vm_extensions]. Idempotent only by failing
-    loudly — calling twice raises [Failure]. sx_server calls this once
-    at startup. *)
-let register () = Sx_vm_extensions.register (module M : Sx_vm_extension.EXTENSION)
-
-(** Read the dispatch counter from the live registry state. [None] if
-    [register] hasn't run. *)
-let dispatch_count () =
-  match Sx_vm_extensions.state_of_extension "erlang" with
-  | Some (ErlangExtState s) -> Some s.dispatched
-  | _ -> None

lib/acl/api.sx

@@ -1,45 +0,0 @@
-;; lib/acl/api.sx — public ACL surface over an implicit current db.
-;;
-;; Callers load a fact set once, then issue decisions without threading the db
-;; through every call. The current db is module state; (acl/load! facts) rebuilds
-;; it. This is the boundary the rest of rose-ash imports.
-
-(define acl-current-db nil)
-
-;; Replace the current fact base. Rebuilds the Datalog db under the active
-;; ruleset (see lib/acl/engine.sx).
-(define
-  acl/load!
-  (fn
-    (facts)
-    (do (set! acl-current-db (acl-build-db facts)) acl-current-db)))
-
-;; Ensure a db exists, building an empty one on first use.
-(define
-  acl-ensure-db!
-  (fn
-    ()
-    (do
-      (when
-        (= acl-current-db nil)
-        (set! acl-current-db (acl-build-db (list))))
-      acl-current-db)))
-
-;; Public decision against the current db (pure, no logging).
-(define
-  acl/permit?
-  (fn (subj act res) (acl-permit? (acl-ensure-db!) subj act res)))
-
-;; Decision-with-proof against the current db. See lib/acl/explain.sx.
-(define
-  acl/explain
-  (fn (subj act res) (acl-explain (acl-ensure-db!) subj act res)))
-
-;; Audited decision: logs the outcome to the append-only audit log and returns
-;; the boolean. See lib/acl/audit.sx.
-(define
-  acl/audit
-  (fn (subj act res) (acl-audit-decide! (acl-ensure-db!) subj act res)))
-
-;; Recent audited decisions (chronological).
-(define acl/audit-tail (fn (n) (acl-audit-tail n)))

lib/acl/audit.sx

@@ -1,110 +0,0 @@
-;; lib/acl/audit.sx — append-only decision log.
-;;
-;; Every decision routed through acl-audit-decide! is appended to an in-memory
-;; log with a monotonic sequence number (no wall-clock — deterministic and
-;; testable; a host can stamp time at the serializer boundary). The log is
-;; append-only: there is no mutate or delete, only append, tail, clear,
-;; snapshot/restore, and serialize-for-disk.
-
-(define acl-audit-log (list))
-(define acl-audit-seq 0)
-
-;; Copy a list into a fresh, append!-able list. `map`/`rest`-derived lists are
-;; NOT extensible by append! in this runtime (it silently no-ops), so the live
-;; log must always be a list built with `list` + `append!`.
-(define
-  acl-audit-copy
-  (fn
-    (xs)
-    (let
-      ((fresh (list)))
-      (do (for-each (fn (e) (append! fresh e)) xs) fresh))))
-
-(define
-  acl-audit-clear!
-  (fn
-    ()
-    (do (set! acl-audit-log (list)) (set! acl-audit-seq 0) nil)))
-
-;; Append a decision record. Returns the record.
-(define
-  acl-audit-record!
-  (fn
-    (subj act res allowed?)
-    (let
-      ((entry {:allowed? allowed? :act act :subj subj :res res :seq acl-audit-seq}))
-      (do
-        (set! acl-audit-seq (+ acl-audit-seq 1))
-        (append! acl-audit-log entry)
-        entry))))
-
-;; Decide against db, log the outcome, and return the boolean. This is the
-;; audited path; acl-permit? remains the pure, side-effect-free decision.
-(define
-  acl-audit-decide!
-  (fn
-    (db subj act res)
-    (let
-      ((allowed? (acl-permit? db subj act res)))
-      (do (acl-audit-record! subj act res allowed?) allowed?))))
-
-(define acl-audit-count (fn () (len acl-audit-log)))
-
-;; Most recent n entries (in chronological order). n >= log size returns all.
-(define
-  acl-audit-tail
-  (fn
-    (n)
-    (let
-      ((total (len acl-audit-log)))
-      (if
-        (<= total n)
-        acl-audit-log
-        (acl-audit-drop acl-audit-log (- total n))))))
-
-(define
-  acl-audit-drop
-  (fn
-    (xs k)
-    (if (<= k 0) xs (acl-audit-drop (rest xs) (- k 1)))))
-
-;; Structured snapshot for save/restore — a {:seq :entries} value carrying a
-;; copy of the log (so later appends don't mutate a held snapshot).
-(define acl-audit-snapshot (fn () {:seq acl-audit-seq :entries (acl-audit-copy acl-audit-log)}))
-
-;; Replace the live log from a snapshot. Restores both entries and the seq
-;; counter so subsequent records continue numbering correctly. The log is
-;; rebuilt as a fresh append!-able list (see acl-audit-copy).
-(define
-  acl-audit-restore!
-  (fn
-    (snap)
-    (do
-      (set! acl-audit-log (acl-audit-copy (get snap :entries)))
-      (set! acl-audit-seq (get snap :seq))
-      nil)))
-
-;; Serialize the whole log to a disk-ready string: one record per line,
-;; "seq\tsubj\tact\tres\tallowed?". A host writes this; structured reload is via
-;; snapshot/restore.
-(define
-  acl-audit-serialize
-  (fn
-    ()
-    (reduce
-      (fn
-        (acc e)
-        (str
-          acc
-          (get e :seq)
-          "\t"
-          (get e :subj)
-          "\t"
-          (get e :act)
-          "\t"
-          (get e :res)
-          "\t"
-          (get e :allowed?)
-          "\n"))
-      ""
-      acl-audit-log)))

lib/acl/conformance.conf

@@ -1,32 +0,0 @@
-# ACL conformance config — sourced by lib/guest/conformance.sh.
-
-LANG_NAME=acl
-MODE=dict
-
-PRELOADS=(
-  lib/datalog/tokenizer.sx
-  lib/datalog/parser.sx
-  lib/datalog/unify.sx
-  lib/datalog/db.sx
-  lib/datalog/builtins.sx
-  lib/datalog/aggregates.sx
-  lib/datalog/strata.sx
-  lib/datalog/eval.sx
-  lib/datalog/api.sx
-  lib/datalog/magic.sx
-  lib/acl/schema.sx
-  lib/acl/facts.sx
-  lib/acl/engine.sx
-  lib/acl/explain.sx
-  lib/acl/audit.sx
-  lib/acl/federation.sx
-  lib/acl/api.sx
-)
-
-SUITES=(
-  "direct:lib/acl/tests/direct.sx:(acl-direct-tests-run!)"
-  "inherit:lib/acl/tests/inherit.sx:(acl-inherit-tests-run!)"
-  "explain:lib/acl/tests/explain.sx:(acl-explain-tests-run!)"
-  "fed:lib/acl/tests/fed.sx:(acl-fed-tests-run!)"
-  "harden:lib/acl/tests/harden.sx:(acl-harden-tests-run!)"
-)

lib/acl/conformance.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Thin wrapper — see lib/guest/conformance.sh and lib/acl/conformance.conf.
-exec bash "$(dirname "$0")/../guest/conformance.sh" "$(dirname "$0")/conformance.conf" "$@"

lib/acl/engine.sx

@@ -1,72 +0,0 @@
-;; lib/acl/engine.sx — ACL ruleset + decision reducer over lib/datalog/.
-;;
-;; The engine is a thin layer: it owns the permit ruleset (SX data rules) and
-;; reduces a (subject, action, resource) decision to a Datalog query against a
-;; db built from EDB facts. The rule engine itself is Datalog's.
-;;
-;; Policy — inheritance + federation with deny-overrides:
-;;
-;;   eff_grant(S,A,R) :- grant(S,A,R).                         ; direct
-;;   eff_grant(S,A,R) :- member_of(S,G), eff_grant(G,A,R).     ; group/role chain
-;;   eff_grant(S,A,R) :- child_of(R,P), eff_grant(S,A,P).      ; resource tree
-;;   eff_grant(S,A,R) :- member_of(S,Role), role_grant(Role,A,R). ; role expansion
-;;   eff_grant(S,A,R) :- delegate(Peer,S,A,R),                 ; federated grant
-;;                       trust(Peer,L), level_covers(L,A).
-;;
-;;   eff_deny(S,A,R)  :- deny(S,A,R).                          ; direct
-;;   eff_deny(S,A,R)  :- member_of(S,G), eff_deny(G,A,R).      ; group chain
-;;   eff_deny(S,A,R)  :- child_of(R,P), eff_deny(S,A,P).       ; resource tree
-;;
-;;   permit(S,A,R)    :- eff_grant(S,A,R), not eff_deny(S,A,R).
-;;
-;; DENY-OVERRIDES: an effective deny anywhere in the inheritance closure of
-;; (S,A,R) defeats any effective grant — including federated grants. Deny
-;; inherits through the *same* group and resource chains as grant, so a
-;; group-level or ancestor-resource deny is authoritative for members/
-;; descendants. This is the principled, fail-safe reading of "deny wins".
-;;
-;; FEDERATION — non-transitive trust: a peer's `delegate` fact only grants if a
-;; *local* `trust(Peer, L)` exists AND that level `level_covers` the action.
-;; Trust is re-checked on every query (it is a body literal), never baked in at
-;; fact-ingestion time, so revoking trust or narrowing a level takes effect
-;; immediately on the next decision.
-;;
-;; Termination & stratification:
-;;   - eff_grant/eff_deny recurse only over member_of and child_of, which are
-;;     EDB relations with no function symbols, so the closure is finite (cyclic
-;;     membership/containment just reaches a fixpoint, never loops). The
-;;     federation rule is non-recursive.
-;;   - permit negates eff_deny; neither eff_grant nor eff_deny depends on
-;;     permit, so the program is stratifiable (permit sits in a higher stratum).
-
-(define
-  acl-rules
-  (quote
-    ((eff_grant S A R <- (grant S A R))
-      (eff_grant S A R <- (member_of S G) (eff_grant G A R))
-      (eff_grant S A R <- (child_of R P) (eff_grant S A P))
-      (eff_grant S A R <- (member_of S Role) (role_grant Role A R))
-      (eff_grant
-        S
-        A
-        R
-        <-
-        (delegate Peer S A R)
-        (trust Peer L)
-        (level_covers L A))
-      (eff_deny S A R <- (deny S A R))
-      (eff_deny S A R <- (member_of S G) (eff_deny G A R))
-      (eff_deny S A R <- (child_of R P) (eff_deny S A P))
-      (permit S A R <- (eff_grant S A R) {:neg (eff_deny S A R)}))))
-
-;; Build a Datalog db from a list of EDB facts under the ACL ruleset.
-(define acl-build-db (fn (facts) (dl-program-data facts acl-rules)))
-
-;; Core decision: does the db permit subject S to perform action A on
-;; resource R? Reduces to a ground Datalog query on the derived `permit`
-;; relation — non-empty result means permitted.
-(define
-  acl-permit?
-  (fn
-    (db subj act res)
-    (> (len (dl-query db (list (quote permit) subj act res))) 0)))

lib/acl/explain.sx

@@ -1,125 +0,0 @@
-;; lib/acl/explain.sx — proof-tree reconstruction over the saturated db.
-;;
-;; lib/datalog/ records derived facts but not their provenance, so the proof is
-;; reconstructed here by goal-directed search over the *saturated* db: for a
-;; ground goal we find the first ACL rule (in rule order) whose body holds, take
-;; the first solution binding its remaining variables, and recurse on each body
-;; literal. Negated literals are recorded as verified `:neg-ok` leaves.
-;;
-;; CANONICAL DERIVATION: the Datalog derivation graph is a DAG (a fact may hold
-;; many ways). We pick ONE canonical proof — first matching rule, first solution
-;; — matching the rule order in lib/acl/engine.sx (direct/EDB rules first). A
-;; depth cap guards against pathological cyclic data producing unbounded search.
-;;
-;; A proof node is one of:
-;;   {:fact <lit> :via "edb"}                       — base EDB fact
-;;   {:fact <lit> :rule <head> :body (<node|negleaf> ...)}  — derived
-;;   {:neg-ok <lit>}                                — negation verified to fail
-;;   {:fact <lit> :truncated true}                  — depth cap hit
-
-(define acl-proof-max-depth 64)
-
-;; Substitute a body literal, descending into {:neg ...} dicts (dl-apply-subst
-;; does not recurse into dicts, which would leak the neg's free vars).
-(define
-  acl-subst-lit
-  (fn
-    (lit s)
-    (if
-      (and (dict? lit) (has-key? lit :neg))
-      {:neg (dl-apply-subst (get lit :neg) s)}
-      (dl-apply-subst lit s))))
-
-(define
-  acl-lit-edb?
-  (fn
-    (lit)
-    (and
-      (list? lit)
-      (> (len lit) 0)
-      (symbol? (first lit))
-      (has-key? acl-edb-arity (symbol->string (first lit))))))
-
-(define
-  acl-subst-zip!
-  (fn
-    (d ks vs)
-    (when
-      (> (len ks) 0)
-      (do
-        (dict-set! d (symbol->string (first ks)) (first vs))
-        (acl-subst-zip! d (rest ks) (rest vs))))))
-
-;; Bind a rule head's variables to a ground goal's arguments (positional).
-(define
-  acl-bind-head
-  (fn
-    (head goal)
-    (let
-      ((d {}))
-      (do (acl-subst-zip! d (rest head) (rest goal)) d))))
-
-(define
-  acl-subst-union
-  (fn
-    (a b)
-    (let
-      ((d {}))
-      (do
-        (for-each (fn (k) (dict-set! d k (get a k))) (keys a))
-        (for-each (fn (k) (dict-set! d k (get b k))) (keys b))
-        d))))
-
-(define acl-prove (fn (db goal) (acl-prove-d db goal 0)))
-
-(define
-  acl-prove-d
-  (fn
-    (db goal depth)
-    (cond
-      ((> depth acl-proof-max-depth) {:truncated true :fact goal})
-      ((acl-lit-edb? goal)
-        (if (> (len (dl-query db goal)) 0) {:via "edb" :fact goal} nil))
-      (else (acl-prove-rules db goal acl-rules depth)))))
-
-(define
-  acl-prove-rules
-  (fn
-    (db goal rules depth)
-    (if
-      (= (len rules) 0)
-      nil
-      (let
-        ((p (dl-rule-from-list (first rules))))
-        (if
-          (= (first (get p :head)) (first goal))
-          (let
-            ((hs (acl-bind-head (get p :head) goal)))
-            (let
-              ((qbody (map (fn (l) (acl-subst-lit l hs)) (get p :body))))
-              (let
-                ((sols (dl-query db qbody)))
-                (if
-                  (> (len sols) 0)
-                  (acl-prove-build db goal p hs (first sols) depth)
-                  (acl-prove-rules db goal (rest rules) depth)))))
-          (acl-prove-rules db goal (rest rules) depth))))))
-
-(define
-  acl-prove-build
-  (fn
-    (db goal p hs sol depth)
-    (let ((full (acl-subst-union hs sol))) {:body (map (fn (l) (let ((g (acl-subst-lit l full))) (if (and (dict? g) (has-key? g :neg)) {:neg-ok (get g :neg)} (acl-prove-d db g (+ depth 1))))) (get p :body)) :rule (get p :head) :fact goal})))
-
-;; Public decision-with-proof. Returns:
-;;   {:allowed? <bool> :proof <node|nil> :reason <eff_deny proof|nil>}
-;; When permitted, :proof is the permit derivation. When denied, :proof is nil
-;; and :reason carries the blocking eff_deny proof if one exists (an explicit or
-;; inherited deny), else nil (simply no grant).
-(define
-  acl-explain
-  (fn
-    (db subj act res)
-    (let
-      ((proof (acl-prove db (list (quote permit) subj act res))))
-      (if (= proof nil) {:allowed? false :proof nil :reason (acl-prove db (list (quote eff_deny) subj act res))} {:allowed? true :proof proof :reason nil}))))

lib/acl/facts.sx

@@ -1,47 +0,0 @@
-;; lib/acl/facts.sx — EDB fact constructors.
-;;
-;; Each constructor returns a Datalog fact tuple (a list whose head is the
-;; predicate symbol). These are the only shapes lib/acl/engine.sx feeds to
-;; lib/datalog/.
-;;   Phase 1: actor/resource/grant/deny.
-;;   Phase 2: member_of (subject -> group/role), child_of (resource -> parent),
-;;            role_grant (role -> action,resource capability).
-;;   Phase 4: peer/trust/delegate/level_covers (federation).
-
-(define acl-actor (fn (id kind) (list (quote actor) id kind)))
-
-(define acl-resource-fact (fn (id kind) (list (quote resource) id kind)))
-
-(define acl-grant (fn (subj act res) (list (quote grant) subj act res)))
-
-(define acl-deny (fn (subj act res) (list (quote deny) subj act res)))
-
-;; subject S is a member of group/role G (one hop; transitivity is derived).
-(define acl-member-of (fn (subj grp) (list (quote member_of) subj grp)))
-
-;; resource R is a child of parent P (one hop; transitivity is derived).
-(define acl-child-of (fn (res parent) (list (quote child_of) res parent)))
-
-;; role confers capability (act on res) to every member of the role.
-(define
-  acl-role-grant
-  (fn (role act res) (list (quote role_grant) role act res)))
-
-;; --- federation ---
-
-;; a known peer instance at addr, of some kind (e.g. peer).
-(define acl-peer (fn (addr kind) (list (quote peer) addr kind)))
-
-;; local trust in a peer at a named level. Gates delegated grants at query time.
-(define acl-trust (fn (peer level) (list (quote trust) peer level)))
-
-;; a peer asserts that subject S may A on R. Only takes effect if local trust in
-;; that peer covers action A (see level_covers).
-(define
-  acl-delegate
-  (fn (peer subj act res) (list (quote delegate) peer subj act res)))
-
-;; local policy: trust `level` authorises delegated grants for action `act`.
-(define
-  acl-level-covers
-  (fn (level act) (list (quote level_covers) level act)))

lib/acl/federation.sx

@@ -1,61 +0,0 @@
-;; lib/acl/federation.sx — cross-instance ACL facts + revocation.
-;;
-;; fed-sx replicates ACL facts between instances; this module models the local
-;; side. A peer's authority arrives as `delegate(Peer, S, A, R)` facts, which
-;; only take effect when a local `trust(Peer, L)` and `level_covers(L, A)`
-;; authorise them (enforced by the engine rule, re-checked every query). The
-;; actual network transport is fed-sx's job and is mocked in tests as a dict.
-;;
-;; Trust is NOT transitive: trusting peer α does not extend to peers α trusts.
-;; Only delegate facts that α itself asserts, and that local trust covers, flow.
-
-;; Mock fed-sx pull: `transport` is a dict mapping a peer address (its string
-;; name) to the list of delegate facts that peer asserts. Returns the facts for
-;; `addr`, or an empty list if the peer is unknown / unreachable.
-(define
-  acl-fed-fetch
-  (fn
-    (transport addr)
-    (let
-      ((k (if (symbol? addr) (symbol->string addr) addr)))
-      (if (has-key? transport k) (get transport k) (list)))))
-
-;; Gather delegate facts from every peer in `addrs` via the transport.
-(define
-  acl-fed-collect
-  (fn
-    (transport addrs)
-    (let
-      ((acc (list)))
-      (do
-        (for-each
-          (fn
-            (addr)
-            (for-each
-              (fn (f) (append! acc f))
-              (acl-fed-fetch transport addr)))
-          addrs)
-        acc))))
-
-;; Build a db from local facts plus delegate facts pulled from `peers`. Local
-;; facts must include the `trust`/`level_covers` policy; replicated delegate
-;; facts are gated against it by the engine rule at query time.
-(define
-  acl-fed-build-db
-  (fn
-    (local-facts transport peers)
-    (let
-      ((all (list)))
-      (do
-        (for-each (fn (f) (append! all f)) local-facts)
-        (for-each
-          (fn (f) (append! all f))
-          (acl-fed-collect transport peers))
-        (acl-build-db all)))))
-
-;; Propagated revocation: retract a replicated fact (e.g. a peer's delegate, or
-;; local trust) from a live db. The next decision re-saturates and reflects it.
-(define acl-revoke! (fn (db fact) (do (dl-retract! db fact) db)))
-
-;; Propagated assertion: ingest a newly replicated fact into a live db.
-(define acl-fed-assert! (fn (db fact) (do (dl-assert! db fact) db)))

lib/acl/schema.sx

@@ -1,71 +0,0 @@
-;; lib/acl/schema.sx — ACL sorts and EDB predicate vocabulary.
-;;
-;; Datalog is untyped; this module is the schema-as-data layer. It declares
-;; the subject/resource/action sorts and the arity of every EDB predicate the
-;; ACL engine recognises, plus light validators. Facts that pass these checks
-;; are well-formed inputs to lib/acl/engine.sx.
-
-(define acl-subject-kinds (quote (user group role service)))
-(define acl-resource-kinds (quote (page post thread peer)))
-
-;; Actions are open-ended (a grant may name any action symbol), but these are
-;; the platform's well-known verbs.
-(define acl-actions (quote (read edit comment moderate federate)))
-
-;; EDB predicate name -> arity.
-;;   Phase 1: actor/resource/grant/deny.
-;;   Phase 2: member_of (subject->group/role), child_of (resource->parent),
-;;            role_grant (role->action,resource).
-;;   Phase 4: peer (addr->kind), trust (peer->level),
-;;            delegate (peer->subj,action,resource), level_covers (level->action).
-(define acl-edb-arity {:role_grant 3 :child_of 2 :trust 2 :peer 2 :actor 2 :level_covers 2 :delegate 4 :member_of 2 :deny 3 :grant 3 :resource 2})
-
-(define
-  acl-member?
-  (fn
-    (x xs)
-    (cond
-      ((= (len xs) 0) false)
-      ((= (first xs) x) true)
-      (else (acl-member? x (rest xs))))))
-
-(define acl-subject-kind? (fn (k) (acl-member? k acl-subject-kinds)))
-
-(define acl-resource-kind? (fn (k) (acl-member? k acl-resource-kinds)))
-
-(define acl-known-action? (fn (a) (acl-member? a acl-actions)))
-
-;; A fact is a list whose head is a predicate symbol. Valid when the predicate
-;; is known and the argument count matches the declared arity.
-(define
-  acl-fact-valid?
-  (fn
-    (f)
-    (and
-      (list? f)
-      (> (len f) 0)
-      (symbol? (first f))
-      (let
-        ((pred (symbol->string (first f))))
-        (and
-          (has-key? acl-edb-arity pred)
-          (= (- (len f) 1) (get acl-edb-arity pred)))))))
-
-;; Return the sublist of facts that fail acl-fact-valid?. Empty list means the
-;; whole set is well-formed. acl-build-db stays lenient (Datalog accepts any
-;; tuple, and custom action symbols are allowed); callers opt in to checking.
-(define
-  acl-validate-facts
-  (fn
-    (facts)
-    (let
-      ((bad (list)))
-      (do
-        (for-each
-          (fn (f) (when (not (acl-fact-valid? f)) (append! bad f)))
-          facts)
-        bad))))
-
-(define
-  acl-facts-valid?
-  (fn (facts) (= (len (acl-validate-facts facts)) 0)))

lib/acl/scoreboard.json

@@ -1,14 +0,0 @@
-{
-  "lang": "acl",
-  "total_passed": 145,
-  "total_failed": 0,
-  "total": 145,
-  "suites": [
-    {"name":"direct","passed":24,"failed":0,"total":24},
-    {"name":"inherit","passed":30,"failed":0,"total":30},
-    {"name":"explain","passed":35,"failed":0,"total":35},
-    {"name":"fed","passed":31,"failed":0,"total":31},
-    {"name":"harden","passed":25,"failed":0,"total":25}
-  ],
-  "generated": "2026-06-06T22:43:27+00:00"
-}

lib/acl/scoreboard.md

@@ -1,11 +0,0 @@
-# acl scoreboard
-
-**145 / 145 passing** (0 failure(s)).
-
-| Suite | Passed | Total | Status |
-|-------|--------|-------|--------|
-| direct | 24 | 24 | ok |
-| inherit | 30 | 30 | ok |
-| explain | 35 | 35 | ok |
-| fed | 31 | 31 | ok |
-| harden | 25 | 25 | ok |

lib/acl/tests/direct.sx

@@ -1,170 +0,0 @@
-;; lib/acl/tests/direct.sx — Phase 1: direct grants + deny-overrides.
-
-(define acl-dt-pass 0)
-(define acl-dt-fail 0)
-(define acl-dt-failures (list))
-
-(define
-  acl-dt-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! acl-dt-pass (+ acl-dt-pass 1))
-      (do
-        (set! acl-dt-fail (+ acl-dt-fail 1))
-        (append!
-          acl-dt-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; A small fixture used by most cases: alice can read page1, is denied edit on
-;; page1, and a service may federate peer1.
-(define
-  acl-dt-fixture
-  (fn
-    ()
-    (acl-build-db
-      (list
-        (acl-actor (quote alice) (quote user))
-        (acl-actor (quote svc1) (quote service))
-        (acl-resource-fact (quote page1) (quote page))
-        (acl-resource-fact (quote peer1) (quote peer))
-        (acl-grant (quote alice) (quote read) (quote page1))
-        (acl-grant (quote alice) (quote edit) (quote page1))
-        (acl-deny (quote alice) (quote edit) (quote page1))
-        (acl-grant (quote svc1) (quote federate) (quote peer1))))))
-
-(define
-  acl-dt-run-all!
-  (fn
-    ()
-    (let
-      ((db (acl-dt-fixture)))
-      (do
-        (acl-dt-check!
-          "direct grant permits"
-          (acl-permit? db (quote alice) (quote read) (quote page1))
-          true)
-        (acl-dt-check!
-          "service grant permits federate"
-          (acl-permit? db (quote svc1) (quote federate) (quote peer1))
-          true)
-        (acl-dt-check!
-          "missing action denied"
-          (acl-permit? db (quote alice) (quote comment) (quote page1))
-          false)
-        (acl-dt-check!
-          "missing resource denied"
-          (acl-permit? db (quote alice) (quote read) (quote page2))
-          false)
-        (acl-dt-check!
-          "missing subject denied"
-          (acl-permit? db (quote bob) (quote read) (quote page1))
-          false)
-        (acl-dt-check!
-          "wrong subject for service grant denied"
-          (acl-permit? db (quote alice) (quote federate) (quote peer1))
-          false)
-        (acl-dt-check!
-          "grant plus deny -> deny wins"
-          (acl-permit? db (quote alice) (quote edit) (quote page1))
-          false)
-        (acl-dt-check!
-          "deny alone still denies"
-          (acl-permit?
-            (acl-build-db
-              (list (acl-deny (quote alice) (quote read) (quote page1))))
-            (quote alice)
-            (quote read)
-            (quote page1))
-          false)
-        (acl-dt-check!
-          "deny on edit does not block read"
-          (acl-permit? db (quote alice) (quote read) (quote page1))
-          true)
-        (acl-dt-check!
-          "empty db denies"
-          (acl-permit?
-            (acl-build-db (list))
-            (quote alice)
-            (quote read)
-            (quote page1))
-          false)
-        (let
-          ((db2 (acl-build-db (list (acl-grant (quote a) (quote read) (quote r)) (acl-grant (quote b) (quote read) (quote r)) (acl-deny (quote b) (quote read) (quote r))))))
-          (do
-            (acl-dt-check!
-              "subject a allowed"
-              (acl-permit? db2 (quote a) (quote read) (quote r))
-              true)
-            (acl-dt-check!
-              "subject b denied by override"
-              (acl-permit? db2 (quote b) (quote read) (quote r))
-              false)))
-        (let
-          ((db3 (acl-build-db (list (acl-actor (quote editors) (quote role)) (acl-grant (quote editors) (quote edit) (quote post1))))))
-          (acl-dt-check!
-            "role subject direct grant"
-            (acl-permit? db3 (quote editors) (quote edit) (quote post1))
-            true))
-        (do
-          (acl/load!
-            (list
-              (acl-grant (quote carol) (quote moderate) (quote thread1))))
-          (acl-dt-check!
-            "api permit via current db"
-            (acl/permit? (quote carol) (quote moderate) (quote thread1))
-            true)
-          (acl-dt-check!
-            "api deny via current db"
-            (acl/permit? (quote carol) (quote read) (quote thread1))
-            false))
-        (do
-          (acl/load! (list))
-          (acl-dt-check!
-            "api reload clears prior grants"
-            (acl/permit? (quote carol) (quote moderate) (quote thread1))
-            false))
-        (acl-dt-check!
-          "schema grant arity valid"
-          (acl-fact-valid? (acl-grant (quote x) (quote read) (quote y)))
-          true)
-        (acl-dt-check!
-          "schema bad arity invalid"
-          (acl-fact-valid? (list (quote grant) (quote x)))
-          false)
-        (acl-dt-check!
-          "schema unknown predicate invalid"
-          (acl-fact-valid? (list (quote frobnicate) (quote x)))
-          false)
-        (acl-dt-check!
-          "schema subject kind known"
-          (acl-subject-kind? (quote service))
-          true)
-        (acl-dt-check!
-          "schema resource kind unknown"
-          (acl-resource-kind? (quote galaxy))
-          false)
-        (acl-dt-check!
-          "schema known action"
-          (acl-known-action? (quote moderate))
-          true)
-        (acl-dt-check!
-          "grant constructor shape"
-          (acl-grant (quote u) (quote read) (quote p))
-          (list (quote grant) (quote u) (quote read) (quote p)))
-        (acl-dt-check!
-          "actor constructor shape"
-          (acl-actor (quote u) (quote user))
-          (list (quote actor) (quote u) (quote user)))))))
-
-(define
-  acl-direct-tests-run!
-  (fn
-    ()
-    (do
-      (set! acl-dt-pass 0)
-      (set! acl-dt-fail 0)
-      (set! acl-dt-failures (list))
-      (acl-dt-run-all!)
-      {:failures acl-dt-failures :total (+ acl-dt-pass acl-dt-fail) :passed acl-dt-pass :failed acl-dt-fail})))

lib/acl/tests/explain.sx

@@ -1,316 +0,0 @@
-;; lib/acl/tests/explain.sx — Phase 3: proof correctness + audit completeness.
-
-(define acl-et-pass 0)
-(define acl-et-fail 0)
-(define acl-et-failures (list))
-
-;; Name-based deep equality. The host `=` compares symbols by interned
-;; identity, which is unstable across substitution/saturation; comparing by
-;; name (as the datalog suite does) makes structural assertions deterministic.
-(define
-  acl-et-eq?
-  (fn
-    (a b)
-    (cond
-      ((and (list? a) (list? b))
-        (and (= (len a) (len b)) (acl-et-eq-l? a b 0)))
-      ((and (dict? a) (dict? b))
-        (let
-          ((ka (keys a)) (kb (keys b)))
-          (and (= (len ka) (len kb)) (acl-et-eq-d? a b ka 0))))
-      ((and (symbol? a) (symbol? b))
-        (= (symbol->string a) (symbol->string b)))
-      (else (= a b)))))
-
-(define
-  acl-et-eq-l?
-  (fn
-    (a b i)
-    (cond
-      ((>= i (len a)) true)
-      ((not (acl-et-eq? (nth a i) (nth b i))) false)
-      (else (acl-et-eq-l? a b (+ i 1))))))
-
-(define
-  acl-et-eq-d?
-  (fn
-    (a b ka i)
-    (cond
-      ((>= i (len ka)) true)
-      ((let ((k (nth ka i))) (not (acl-et-eq? (get a k) (get b k))))
-        false)
-      (else (acl-et-eq-d? a b ka (+ i 1))))))
-
-(define
-  acl-et-check!
-  (fn
-    (name got expected)
-    (if
-      (acl-et-eq? got expected)
-      (set! acl-et-pass (+ acl-et-pass 1))
-      (do
-        (set! acl-et-fail (+ acl-et-fail 1))
-        (append!
-          acl-et-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; --- proof-tree walkers ---
-
-;; True if EDB fact `target` appears as a base leaf anywhere in the proof.
-(define
-  acl-et-has-leaf?
-  (fn
-    (node target)
-    (cond
-      ((= node nil) false)
-      ((and (dict? node) (has-key? node :via))
-        (acl-et-eq? (get node :fact) target))
-      ((and (dict? node) (has-key? node :body))
-        (acl-et-any-leaf? (get node :body) target))
-      (else false))))
-
-(define
-  acl-et-any-leaf?
-  (fn
-    (nodes target)
-    (cond
-      ((= (len nodes) 0) false)
-      ((acl-et-has-leaf? (first nodes) target) true)
-      (else (acl-et-any-leaf? (rest nodes) target)))))
-
-;; True if the proof records a verified negation (deny did not fire).
-(define
-  acl-et-has-negok?
-  (fn
-    (node)
-    (cond
-      ((= node nil) false)
-      ((and (dict? node) (has-key? node :neg-ok)) true)
-      ((and (dict? node) (has-key? node :body))
-        (acl-et-any-negok? (get node :body)))
-      (else false))))
-
-(define
-  acl-et-any-negok?
-  (fn
-    (nodes)
-    (cond
-      ((= (len nodes) 0) false)
-      ((acl-et-has-negok? (first nodes)) true)
-      (else (acl-et-any-negok? (rest nodes))))))
-
-(define
-  acl-et-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((db (acl-build-db (list (acl-grant (quote u) (quote read) (quote p))))))
-        (let
-          ((e (acl-explain db (quote u) (quote read) (quote p))))
-          (do
-            (acl-et-check! "direct: allowed?" (get e :allowed?) true)
-            (acl-et-check!
-              "direct: proof root fact"
-              (get (get e :proof) :fact)
-              (list (quote permit) (quote u) (quote read) (quote p)))
-            (acl-et-check!
-              "direct: grant leaf present"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list (quote grant) (quote u) (quote read) (quote p)))
-              true)
-            (acl-et-check!
-              "direct: negation verified"
-              (acl-et-has-negok? (get e :proof))
-              true)
-            (acl-et-check!
-              "direct: reason nil when allowed"
-              (get e :reason)
-              nil))))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-member-of (quote team) (quote org)) (acl-grant (quote org) (quote read) (quote doc))))))
-        (let
-          ((e (acl-explain db (quote alice) (quote read) (quote doc))))
-          (do
-            (acl-et-check! "group: allowed?" (get e :allowed?) true)
-            (acl-et-check!
-              "group: member_of alice leaf"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list (quote member_of) (quote alice) (quote team)))
-              true)
-            (acl-et-check!
-              "group: member_of team leaf"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list (quote member_of) (quote team) (quote org)))
-              true)
-            (acl-et-check!
-              "group: grant org leaf at base"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list (quote grant) (quote org) (quote read) (quote doc)))
-              true))))
-      (let
-        ((db (acl-build-db (list (acl-child-of (quote sec) (quote book)) (acl-grant (quote u) (quote read) (quote book))))))
-        (let
-          ((e (acl-explain db (quote u) (quote read) (quote sec))))
-          (do
-            (acl-et-check! "resource: allowed?" (get e :allowed?) true)
-            (acl-et-check!
-              "resource: child_of leaf"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list (quote child_of) (quote sec) (quote book)))
-              true)
-            (acl-et-check!
-              "resource: grant on parent leaf"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list (quote grant) (quote u) (quote read) (quote book)))
-              true))))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote bob) (quote editor)) (acl-role-grant (quote editor) (quote edit) (quote page1))))))
-        (let
-          ((e (acl-explain db (quote bob) (quote edit) (quote page1))))
-          (do
-            (acl-et-check! "role: allowed?" (get e :allowed?) true)
-            (acl-et-check!
-              "role: member_of leaf"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list (quote member_of) (quote bob) (quote editor)))
-              true)
-            (acl-et-check!
-              "role: role_grant leaf"
-              (acl-et-has-leaf?
-                (get e :proof)
-                (list
-                  (quote role_grant)
-                  (quote editor)
-                  (quote edit)
-                  (quote page1)))
-              true))))
-      (let
-        ((db (acl-build-db (list (acl-grant (quote u) (quote edit) (quote p)) (acl-deny (quote u) (quote edit) (quote p))))))
-        (let
-          ((e (acl-explain db (quote u) (quote edit) (quote p))))
-          (do
-            (acl-et-check! "deny: not allowed" (get e :allowed?) false)
-            (acl-et-check! "deny: no proof" (get e :proof) nil)
-            (acl-et-check!
-              "deny: reason root is eff_deny"
-              (get (get e :reason) :fact)
-              (list (quote eff_deny) (quote u) (quote edit) (quote p)))
-            (acl-et-check!
-              "deny: reason has deny leaf"
-              (acl-et-has-leaf?
-                (get e :reason)
-                (list (quote deny) (quote u) (quote edit) (quote p)))
-              true))))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-grant (quote alice) (quote read) (quote doc)) (acl-deny (quote team) (quote read) (quote doc))))))
-        (let
-          ((e (acl-explain db (quote alice) (quote read) (quote doc))))
-          (do
-            (acl-et-check!
-              "inherited deny: not allowed"
-              (get e :allowed?)
-              false)
-            (acl-et-check!
-              "inherited deny: reason has member_of leaf"
-              (acl-et-has-leaf?
-                (get e :reason)
-                (list (quote member_of) (quote alice) (quote team)))
-              true)
-            (acl-et-check!
-              "inherited deny: reason has group deny leaf"
-              (acl-et-has-leaf?
-                (get e :reason)
-                (list (quote deny) (quote team) (quote read) (quote doc)))
-              true))))
-      (let
-        ((db (acl-build-db (list))))
-        (let
-          ((e (acl-explain db (quote u) (quote read) (quote p))))
-          (do
-            (acl-et-check! "no grant: not allowed" (get e :allowed?) false)
-            (acl-et-check! "no grant: proof nil" (get e :proof) nil)
-            (acl-et-check! "no grant: reason nil" (get e :reason) nil))))
-      (let
-        ((db (acl-build-db (list (acl-grant (quote u) (quote read) (quote p)) (acl-deny (quote u) (quote edit) (quote p))))))
-        (do
-          (acl-audit-clear!)
-          (acl-et-check! "audit: starts empty" (acl-audit-count) 0)
-          (acl-et-check!
-            "audit decide allowed returns true"
-            (acl-audit-decide! db (quote u) (quote read) (quote p))
-            true)
-          (acl-et-check!
-            "audit decide denied returns false"
-            (acl-audit-decide! db (quote u) (quote edit) (quote p))
-            false)
-          (acl-audit-decide! db (quote u) (quote comment) (quote p))
-          (acl-et-check!
-            "audit: count after three decisions"
-            (acl-audit-count)
-            3)
-          (acl-et-check!
-            "audit: tail size respects n"
-            (len (acl-audit-tail 2))
-            2)
-          (acl-et-check!
-            "audit: tail returns most recent"
-            (get (first (acl-audit-tail 1)) :act)
-            (quote comment))
-          (acl-et-check!
-            "audit: first record seq is 0"
-            (get (first (acl-audit-tail 3)) :seq)
-            0)
-          (acl-et-check!
-            "audit: allowed flag recorded"
-            (get (first (acl-audit-tail 3)) :allowed?)
-            true)
-          (acl-et-check!
-            "audit: serialize line count"
-            (len (acl-et-lines (acl-audit-serialize)))
-            3)
-          (acl-audit-clear!)
-          (acl-et-check!
-            "audit: clear resets count"
-            (acl-audit-count)
-            0))))))
-
-;; count newline-terminated lines in a serialized log
-(define acl-et-lines (fn (s) (acl-et-count-nl s 0 0)))
-(define
-  acl-et-count-nl
-  (fn
-    (s i n)
-    (if
-      (>= i (len s))
-      (if (= n 0) (list) (acl-et-rangelist n))
-      (acl-et-count-nl
-        s
-        (+ i 1)
-        (if (= (slice s i (+ i 1)) "\n") (+ n 1) n)))))
-(define
-  acl-et-rangelist
-  (fn
-    (n)
-    (if
-      (<= n 0)
-      (list)
-      (cons n (acl-et-rangelist (- n 1))))))
-
-(define
-  acl-explain-tests-run!
-  (fn
-    ()
-    (do
-      (set! acl-et-pass 0)
-      (set! acl-et-fail 0)
-      (set! acl-et-failures (list))
-      (acl-et-run-all!)
-      {:failures acl-et-failures :total (+ acl-et-pass acl-et-fail) :passed acl-et-pass :failed acl-et-fail})))

lib/acl/tests/fed.sx

@@ -1,273 +0,0 @@
-;; lib/acl/tests/fed.sx — Phase 4: federation (peer trust, delegation,
-;; cross-instance chains, revocation). fed-sx transport is mocked as a dict.
-
-(define acl-ft-pass 0)
-(define acl-ft-fail 0)
-(define acl-ft-failures (list))
-
-;; Name-based deep equality (host `=` compares symbols by unstable interned
-;; identity; see lib/acl/tests/explain.sx).
-(define
-  acl-ft-eq?
-  (fn
-    (a b)
-    (cond
-      ((and (list? a) (list? b))
-        (and (= (len a) (len b)) (acl-ft-eq-l? a b 0)))
-      ((and (symbol? a) (symbol? b))
-        (= (symbol->string a) (symbol->string b)))
-      (else (= a b)))))
-(define
-  acl-ft-eq-l?
-  (fn
-    (a b i)
-    (cond
-      ((>= i (len a)) true)
-      ((not (acl-ft-eq? (nth a i) (nth b i))) false)
-      (else (acl-ft-eq-l? a b (+ i 1))))))
-
-(define
-  acl-ft-check!
-  (fn
-    (name got expected)
-    (if
-      (acl-ft-eq? got expected)
-      (set! acl-ft-pass (+ acl-ft-pass 1))
-      (do
-        (set! acl-ft-fail (+ acl-ft-fail 1))
-        (append!
-          acl-ft-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; proof leaf walker (federated proofs reconstruct through the engine rule).
-(define
-  acl-ft-has-leaf?
-  (fn
-    (node target)
-    (cond
-      ((= node nil) false)
-      ((and (dict? node) (has-key? node :via))
-        (acl-ft-eq? (get node :fact) target))
-      ((and (dict? node) (has-key? node :body))
-        (acl-ft-any-leaf? (get node :body) target))
-      (else false))))
-(define
-  acl-ft-any-leaf?
-  (fn
-    (nodes target)
-    (cond
-      ((= (len nodes) 0) false)
-      ((acl-ft-has-leaf? (first nodes) target) true)
-      (else (acl-ft-any-leaf? (rest nodes) target)))))
-
-(define acl-ft-p? (fn (db s a r) (acl-permit? db s a r)))
-
-;; A standard federation fixture: local trusts peer alpha at "readonly", which
-;; covers read+comment. alpha delegates several capabilities to alice.
-(define
-  acl-ft-fixture
-  (fn
-    ()
-    (acl-build-db
-      (list
-        (acl-trust (quote alpha) (quote readonly))
-        (acl-level-covers (quote readonly) (quote read))
-        (acl-level-covers (quote readonly) (quote comment))
-        (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc))
-        (acl-delegate (quote alpha) (quote alice) (quote edit) (quote doc))))))
-
-(define
-  acl-ft-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((db (acl-ft-fixture)))
-        (do
-          (acl-ft-check!
-            "trusted delegate, level covers action -> permit"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            true)
-          (acl-ft-check!
-            "trusted delegate, level does NOT cover action -> deny"
-            (acl-ft-p? db (quote alice) (quote edit) (quote doc))
-            false)
-          (acl-ft-check!
-            "delegated but action class uncovered (comment has no delegate)"
-            (acl-ft-p? db (quote alice) (quote comment) (quote doc))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-level-covers (quote readonly) (quote read)) (acl-delegate (quote beta) (quote bob) (quote read) (quote doc))))))
-        (acl-ft-check!
-          "untrusted peer delegate -> deny"
-          (acl-ft-p? db (quote bob) (quote read) (quote doc))
-          false))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote readonly)) (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc))))))
-        (acl-ft-check!
-          "trust but no level_covers -> deny"
-          (acl-ft-p? db (quote alice) (quote read) (quote doc))
-          false))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc)) (acl-delegate (quote beta) (quote bob) (quote read) (quote doc))))))
-        (do
-          (acl-ft-check!
-            "trust is per-peer: alpha's delegate applies"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            true)
-          (acl-ft-check!
-            "trust not transitive: beta's delegate does not apply"
-            (acl-ft-p? db (quote bob) (quote read) (quote doc))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc)) (acl-deny (quote alice) (quote read) (quote doc))))))
-        (acl-ft-check!
-          "local deny overrides federated grant"
-          (acl-ft-p? db (quote alice) (quote read) (quote doc))
-          false))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-member-of (quote alice) (quote team)) (acl-delegate (quote alpha) (quote team) (quote read) (quote doc))))))
-        (acl-ft-check!
-          "federated grant to group reaches member"
-          (acl-ft-p? db (quote alice) (quote read) (quote doc))
-          true))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-child-of (quote sec) (quote book)) (acl-delegate (quote alpha) (quote u) (quote read) (quote book))))))
-        (acl-ft-check!
-          "federated grant on parent resource reaches child"
-          (acl-ft-p? db (quote u) (quote read) (quote sec))
-          true))
-      (let
-        ((transport {:gamma (list (acl-delegate (quote gamma) (quote carol) (quote read) (quote post))) :alpha (list (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc)))}))
-        (do
-          (acl-ft-check!
-            "fetch known peer returns its delegates"
-            (len (acl-fed-fetch transport (quote alpha)))
-            1)
-          (acl-ft-check!
-            "fetch unknown peer returns empty"
-            (len (acl-fed-fetch transport (quote delta)))
-            0)
-          (acl-ft-check!
-            "collect across peers"
-            (len
-              (acl-fed-collect transport (list (quote alpha) (quote gamma))))
-            2)
-          (let
-            ((db (acl-fed-build-db (list (acl-trust (quote alpha) (quote readonly)) (acl-trust (quote gamma) (quote readonly)) (acl-level-covers (quote readonly) (quote read))) transport (list (quote alpha) (quote gamma)))))
-            (do
-              (acl-ft-check!
-                "fed-build-db: alpha delegate permits"
-                (acl-ft-p? db (quote alice) (quote read) (quote doc))
-                true)
-              (acl-ft-check!
-                "fed-build-db: gamma delegate permits"
-                (acl-ft-p? db (quote carol) (quote read) (quote post))
-                true)
-              (acl-ft-check!
-                "fed-build-db: untrusted action still denied"
-                (acl-ft-p? db (quote alice) (quote edit) (quote doc))
-                false)))))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc))))))
-        (do
-          (acl-ft-check!
-            "before revoke: permitted"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            true)
-          (acl-revoke!
-            db
-            (acl-delegate
-              (quote alpha)
-              (quote alice)
-              (quote read)
-              (quote doc)))
-          (acl-ft-check!
-            "after delegate revoked: denied"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc))))))
-        (do
-          (acl-ft-check!
-            "before trust revoke: permitted"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            true)
-          (acl-revoke! db (acl-trust (quote alpha) (quote full)))
-          (acl-ft-check!
-            "after trust revoked: denied"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-level-covers (quote full) (quote read)) (acl-delegate (quote alpha) (quote alice) (quote read) (quote doc))))))
-        (do
-          (acl-ft-check!
-            "delegate without trust: denied"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            false)
-          (acl-fed-assert! db (acl-trust (quote alpha) (quote full)))
-          (acl-ft-check!
-            "trust ingested then re-checked: permitted"
-            (acl-ft-p? db (quote alice) (quote read) (quote doc))
-            true)))
-      (let
-        ((db (acl-ft-fixture)))
-        (let
-          ((e (acl-explain db (quote alice) (quote read) (quote doc))))
-          (do
-            (acl-ft-check! "federated proof allowed?" (get e :allowed?) true)
-            (acl-ft-check!
-              "federated proof has delegate leaf"
-              (acl-ft-has-leaf?
-                (get e :proof)
-                (list
-                  (quote delegate)
-                  (quote alpha)
-                  (quote alice)
-                  (quote read)
-                  (quote doc)))
-              true)
-            (acl-ft-check!
-              "federated proof has trust leaf"
-              (acl-ft-has-leaf?
-                (get e :proof)
-                (list (quote trust) (quote alpha) (quote readonly)))
-              true)
-            (acl-ft-check!
-              "federated proof has level_covers leaf"
-              (acl-ft-has-leaf?
-                (get e :proof)
-                (list (quote level_covers) (quote readonly) (quote read)))
-              true))))
-      (acl-ft-check!
-        "schema delegate arity valid"
-        (acl-fact-valid?
-          (acl-delegate (quote p) (quote s) (quote a) (quote r)))
-        true)
-      (acl-ft-check!
-        "schema trust arity valid"
-        (acl-fact-valid? (acl-trust (quote p) (quote l)))
-        true)
-      (acl-ft-check!
-        "schema peer arity valid"
-        (acl-fact-valid? (acl-peer (quote p) (quote peer)))
-        true)
-      (acl-ft-check!
-        "schema level_covers arity valid"
-        (acl-fact-valid? (acl-level-covers (quote l) (quote read)))
-        true)
-      (acl-ft-check!
-        "schema delegate bad arity invalid"
-        (acl-fact-valid? (list (quote delegate) (quote p) (quote s)))
-        false))))
-
-(define
-  acl-fed-tests-run!
-  (fn
-    ()
-    (do
-      (set! acl-ft-pass 0)
-      (set! acl-ft-fail 0)
-      (set! acl-ft-failures (list))
-      (acl-ft-run-all!)
-      {:failures acl-ft-failures :total (+ acl-ft-pass acl-ft-fail) :passed acl-ft-pass :failed acl-ft-fail})))

lib/acl/tests/harden.sx

@@ -1,228 +0,0 @@
-;; lib/acl/tests/harden.sx — adversarial / cross-phase hardening.
-;;
-;; Diamond hierarchies, conflict resolution where deny must win through every
-;; path, chain inheritance, cycle termination, multi-peer delegation, fact
-;; validation, and audit save/restore.
-;;
-;; PROVER-FREE BY DESIGN: this suite calls only acl-permit? (which runs in
-;; compiled Datalog, safe at any depth) plus pure data ops — never acl-explain /
-;; acl-prove-d. The SX-side proof reconstructor recurses, and once the kernel
-;; JIT-compiles it (after the explain/fed suites warm the process) it loops on
-;; chains deeper than ~3 (substrate JIT bug — see plan Blockers). Proof
-;; reconstruction is covered by tests/explain.sx (and federated proofs by
-;; tests/fed.sx), both of which stay under the warm-process depth threshold.
-
-(define acl-hd-pass 0)
-(define acl-hd-fail 0)
-(define acl-hd-failures (list))
-
-(define
-  acl-hd-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! acl-hd-pass (+ acl-hd-pass 1))
-      (do
-        (set! acl-hd-fail (+ acl-hd-fail 1))
-        (append!
-          acl-hd-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-(define acl-hd-p? (fn (db s a r) (acl-permit? db s a r)))
-
-(define
-  acl-hd-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((grant-deny (acl-build-db (list (acl-child-of (quote r) (quote p1)) (acl-child-of (quote r) (quote p2)) (acl-grant (quote u) (quote read) (quote p1)) (acl-deny (quote u) (quote read) (quote p2)))))
-          (both-grant
-            (acl-build-db
-              (list
-                (acl-child-of (quote r) (quote p1))
-                (acl-child-of (quote r) (quote p2))
-                (acl-grant (quote u) (quote read) (quote p1))
-                (acl-grant (quote u) (quote read) (quote p2))))))
-        (do
-          (acl-hd-check!
-            "diamond resource: grant+deny parents -> deny wins"
-            (acl-hd-p? grant-deny (quote u) (quote read) (quote r))
-            false)
-          (acl-hd-check!
-            "diamond resource: both grant -> permit"
-            (acl-hd-p? both-grant (quote u) (quote read) (quote r))
-            true)
-          (acl-hd-check!
-            "diamond resource: deny does not leak to other parent"
-            (acl-hd-p? grant-deny (quote u) (quote read) (quote p1))
-            true)))
-      (let
-        ((grant-deny (acl-build-db (list (acl-member-of (quote alice) (quote g1)) (acl-member-of (quote alice) (quote g2)) (acl-grant (quote g1) (quote read) (quote doc)) (acl-deny (quote g2) (quote read) (quote doc)))))
-          (both-grant
-            (acl-build-db
-              (list
-                (acl-member-of (quote alice) (quote g1))
-                (acl-member-of (quote alice) (quote g2))
-                (acl-grant (quote g1) (quote read) (quote doc))
-                (acl-grant (quote g2) (quote read) (quote doc))))))
-        (do
-          (acl-hd-check!
-            "diamond group: grant+deny groups -> deny wins"
-            (acl-hd-p? grant-deny (quote alice) (quote read) (quote doc))
-            false)
-          (acl-hd-check!
-            "diamond group: both grant -> permit"
-            (acl-hd-p? both-grant (quote alice) (quote read) (quote doc))
-            true)))
-      (let
-        ((chain (acl-build-db (list (acl-member-of (quote a0) (quote a1)) (acl-member-of (quote a1) (quote a2)) (acl-member-of (quote a2) (quote a3)) (acl-member-of (quote a3) (quote a4)) (acl-grant (quote a4) (quote read) (quote res)))))
-          (chain-deny
-            (acl-build-db
-              (list
-                (acl-member-of (quote a0) (quote a1))
-                (acl-member-of (quote a1) (quote a2))
-                (acl-member-of (quote a2) (quote a3))
-                (acl-member-of (quote a3) (quote a4))
-                (acl-grant (quote a4) (quote read) (quote res))
-                (acl-deny (quote a0) (quote read) (quote res))))))
-        (do
-          (acl-hd-check!
-            "chain: top-group grant reaches leaf member"
-            (acl-hd-p? chain (quote a0) (quote read) (quote res))
-            true)
-          (acl-hd-check!
-            "chain: intermediate also covered"
-            (acl-hd-p? chain (quote a2) (quote read) (quote res))
-            true)
-          (acl-hd-check!
-            "chain: leaf-member deny overrides top grant"
-            (acl-hd-p? chain-deny (quote a0) (quote read) (quote res))
-            false)
-          (acl-hd-check!
-            "chain: deny on leaf does not block sibling level"
-            (acl-hd-p? chain-deny (quote a1) (quote read) (quote res))
-            true)))
-      (let
-        ((self-member (acl-build-db (list (acl-member-of (quote a) (quote a)) (acl-grant (quote a) (quote read) (quote r)))))
-          (self-child
-            (acl-build-db
-              (list
-                (acl-child-of (quote r) (quote r))
-                (acl-grant (quote u) (quote read) (quote r)))))
-          (two-cycle
-            (acl-build-db
-              (list
-                (acl-member-of (quote x) (quote y))
-                (acl-member-of (quote y) (quote x))
-                (acl-grant (quote y) (quote read) (quote r))))))
-        (do
-          (acl-hd-check!
-            "self-membership cycle terminates and grants"
-            (acl-hd-p? self-member (quote a) (quote read) (quote r))
-            true)
-          (acl-hd-check!
-            "self-child cycle terminates and grants"
-            (acl-hd-p? self-child (quote u) (quote read) (quote r))
-            true)
-          (acl-hd-check!
-            "two-node membership cycle terminates"
-            (acl-hd-p? two-cycle (quote x) (quote read) (quote r))
-            true)))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-member-of (quote alice) (quote team)) (acl-delegate (quote alpha) (quote team) (quote read) (quote doc)) (acl-deny (quote alice) (quote read) (quote doc))))))
-        (acl-hd-check!
-          "federated group grant, local member deny -> deny wins"
-          (acl-hd-p? db (quote alice) (quote read) (quote doc))
-          false))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-delegate (quote alpha) (quote bob) (quote read) (quote doc)) (acl-delegate (quote beta) (quote bob) (quote read) (quote doc))))))
-        (acl-hd-check!
-          "two peers delegate, one trusted -> permit"
-          (acl-hd-p? db (quote bob) (quote read) (quote doc))
-          true))
-      (let
-        ((db (acl-build-db (list (acl-trust (quote alpha) (quote full)) (acl-trust (quote beta) (quote full)) (acl-level-covers (quote full) (quote read)) (acl-delegate (quote alpha) (quote bob) (quote read) (quote doc)) (acl-delegate (quote beta) (quote bob) (quote read) (quote doc))))))
-        (acl-hd-check!
-          "two peers both trusted -> permit"
-          (acl-hd-p? db (quote bob) (quote read) (quote doc))
-          true))
-      (let
-        ((empty (acl-build-db (list))))
-        (acl-hd-check!
-          "empty db: nothing permitted"
-          (acl-hd-p? empty (quote u) (quote read) (quote r))
-          false))
-      (do
-        (acl-hd-check!
-          "validate: clean set has no bad facts"
-          (len
-            (acl-validate-facts
-              (list
-                (acl-grant (quote u) (quote read) (quote p))
-                (acl-member-of (quote u) (quote g))
-                (acl-delegate (quote pe) (quote u) (quote read) (quote p)))))
-          0)
-        (acl-hd-check!
-          "validate: facts-valid? true on clean set"
-          (acl-facts-valid?
-            (list (acl-grant (quote u) (quote read) (quote p))))
-          true)
-        (acl-hd-check!
-          "validate: surfaces wrong-arity and unknown predicate"
-          (len
-            (acl-validate-facts
-              (list
-                (acl-grant (quote u) (quote read) (quote p))
-                (list (quote grant) (quote u))
-                (list (quote bogus) (quote x) (quote y)))))
-          2)
-        (acl-hd-check!
-          "validate: empty set is valid"
-          (acl-facts-valid? (list))
-          true))
-      (let
-        ((db (acl-build-db (list (acl-grant (quote u) (quote read) (quote p)) (acl-deny (quote u) (quote edit) (quote p))))))
-        (do
-          (acl-audit-clear!)
-          (acl-audit-decide! db (quote u) (quote read) (quote p))
-          (acl-audit-decide! db (quote u) (quote edit) (quote p))
-          (let
-            ((snap (acl-audit-snapshot)))
-            (do
-              (acl-audit-clear!)
-              (acl-hd-check!
-                "audit: cleared count is 0"
-                (acl-audit-count)
-                0)
-              (acl-audit-restore! snap)
-              (acl-hd-check!
-                "audit: restored count"
-                (acl-audit-count)
-                2)
-              (acl-hd-check!
-                "audit: restored last act"
-                (get (first (acl-audit-tail 1)) :act)
-                (quote edit))
-              (acl-audit-decide! db (quote u) (quote comment) (quote p))
-              (acl-hd-check!
-                "audit: seq continues after restore"
-                (get (first (acl-audit-tail 1)) :seq)
-                2)
-              (acl-hd-check!
-                "audit: snapshot is an immutable copy"
-                (len (get snap :entries))
-                2)
-              (acl-audit-clear!))))))))
-
-(define
-  acl-harden-tests-run!
-  (fn
-    ()
-    (do
-      (set! acl-hd-pass 0)
-      (set! acl-hd-fail 0)
-      (set! acl-hd-failures (list))
-      (acl-hd-run-all!)
-      {:failures acl-hd-failures :total (+ acl-hd-pass acl-hd-fail) :passed acl-hd-pass :failed acl-hd-fail})))

lib/acl/tests/inherit.sx

@@ -1,202 +0,0 @@
-;; lib/acl/tests/inherit.sx — Phase 2: inheritance (groups, resource trees,
-;; role expansion) with deny-overrides.
-
-(define acl-it-pass 0)
-(define acl-it-fail 0)
-(define acl-it-failures (list))
-
-(define
-  acl-it-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! acl-it-pass (+ acl-it-pass 1))
-      (do
-        (set! acl-it-fail (+ acl-it-fail 1))
-        (append!
-          acl-it-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-(define acl-it-p? (fn (db s a r) (acl-permit? db s a r)))
-
-(define
-  acl-it-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-grant (quote team) (quote read) (quote doc))))))
-        (do
-          (acl-it-check!
-            "group grant reaches member"
-            (acl-it-p? db (quote alice) (quote read) (quote doc))
-            true)
-          (acl-it-check!
-            "group grant: non-member excluded"
-            (acl-it-p? db (quote bob) (quote read) (quote doc))
-            false)
-          (acl-it-check!
-            "group grant: wrong action"
-            (acl-it-p? db (quote alice) (quote edit) (quote doc))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-member-of (quote team) (quote org)) (acl-member-of (quote org) (quote company)) (acl-grant (quote company) (quote read) (quote doc))))))
-        (do
-          (acl-it-check!
-            "deep nested group grant reaches leaf member"
-            (acl-it-p? db (quote alice) (quote read) (quote doc))
-            true)
-          (acl-it-check!
-            "intermediate group also covered"
-            (acl-it-p? db (quote team) (quote read) (quote doc))
-            true)
-          (acl-it-check!
-            "mid group org covered"
-            (acl-it-p? db (quote org) (quote read) (quote doc))
-            true)))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote a) (quote b)) (acl-member-of (quote b) (quote a)) (acl-grant (quote b) (quote read) (quote r))))))
-        (do
-          (acl-it-check!
-            "cyclic membership terminates and grants"
-            (acl-it-p? db (quote a) (quote read) (quote r))
-            true)
-          (acl-it-check!
-            "cyclic membership covers both"
-            (acl-it-p? db (quote b) (quote read) (quote r))
-            true)))
-      (let
-        ((db (acl-build-db (list (acl-child-of (quote sec) (quote chap)) (acl-child-of (quote chap) (quote book)) (acl-grant (quote u) (quote read) (quote book))))))
-        (do
-          (acl-it-check!
-            "parent grant reaches direct child"
-            (acl-it-p? db (quote u) (quote read) (quote chap))
-            true)
-          (acl-it-check!
-            "parent grant reaches deep descendant"
-            (acl-it-p? db (quote u) (quote read) (quote sec))
-            true)
-          (acl-it-check!
-            "parent grant covers parent itself"
-            (acl-it-p? db (quote u) (quote read) (quote book))
-            true)
-          (acl-it-check!
-            "child grant does not climb to parent"
-            (acl-it-p?
-              (acl-build-db
-                (list
-                  (acl-child-of (quote sec) (quote book))
-                  (acl-grant (quote u) (quote read) (quote sec))))
-              (quote u)
-              (quote read)
-              (quote book))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-child-of (quote post1) (quote board)) (acl-grant (quote team) (quote comment) (quote board))))))
-        (do
-          (acl-it-check!
-            "group + resource: member on child resource"
-            (acl-it-p? db (quote alice) (quote comment) (quote post1))
-            true)
-          (acl-it-check!
-            "group + resource: member on parent resource"
-            (acl-it-p? db (quote alice) (quote comment) (quote board))
-            true)))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote bob) (quote editor)) (acl-role-grant (quote editor) (quote edit) (quote page1)) (acl-role-grant (quote editor) (quote read) (quote page1))))))
-        (do
-          (acl-it-check!
-            "role confers edit to member"
-            (acl-it-p? db (quote bob) (quote edit) (quote page1))
-            true)
-          (acl-it-check!
-            "role confers read to member"
-            (acl-it-p? db (quote bob) (quote read) (quote page1))
-            true)
-          (acl-it-check!
-            "role: capability not in tuple denied"
-            (acl-it-p? db (quote bob) (quote moderate) (quote page1))
-            false)
-          (acl-it-check!
-            "role: non-member excluded"
-            (acl-it-p? db (quote eve) (quote edit) (quote page1))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote bob) (quote editor)) (acl-child-of (quote draft) (quote page1)) (acl-role-grant (quote editor) (quote edit) (quote page1))))))
-        (acl-it-check!
-          "role grant flows to child resource"
-          (acl-it-p? db (quote bob) (quote edit) (quote draft))
-          true))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-grant (quote team) (quote read) (quote doc)) (acl-deny (quote alice) (quote read) (quote doc))))))
-        (acl-it-check!
-          "explicit deny beats inherited group allow"
-          (acl-it-p? db (quote alice) (quote read) (quote doc))
-          false))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-grant (quote alice) (quote read) (quote doc)) (acl-deny (quote team) (quote read) (quote doc))))))
-        (do
-          (acl-it-check!
-            "group deny inherits and overrides direct grant"
-            (acl-it-p? db (quote alice) (quote read) (quote doc))
-            false)
-          (acl-it-check!
-            "group deny: another member also blocked"
-            (acl-it-p? db (quote team) (quote read) (quote doc))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-child-of (quote sec) (quote book)) (acl-grant (quote u) (quote read) (quote sec)) (acl-deny (quote u) (quote read) (quote book))))))
-        (acl-it-check!
-          "ancestor deny overrides descendant grant"
-          (acl-it-p? db (quote u) (quote read) (quote sec))
-          false))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-grant (quote team) (quote read) (quote doc)) (acl-grant (quote team) (quote edit) (quote doc)) (acl-deny (quote alice) (quote edit) (quote doc))))))
-        (do
-          (acl-it-check!
-            "deny on edit leaves inherited read intact"
-            (acl-it-p? db (quote alice) (quote read) (quote doc))
-            true)
-          (acl-it-check!
-            "deny on edit blocks edit"
-            (acl-it-p? db (quote alice) (quote edit) (quote doc))
-            false)))
-      (let
-        ((db (acl-build-db (list (acl-member-of (quote alice) (quote team)) (acl-deny (quote team) (quote read) (quote doc))))))
-        (acl-it-check!
-          "inherited deny, no grant: denied"
-          (acl-it-p? db (quote alice) (quote read) (quote doc))
-          false))
-      (let
-        ((db (acl-build-db (list (acl-child-of (quote a) (quote root)) (acl-child-of (quote b) (quote root)) (acl-grant (quote u) (quote read) (quote root)) (acl-deny (quote u) (quote read) (quote a))))))
-        (do
-          (acl-it-check!
-            "deny on sibling a blocks a"
-            (acl-it-p? db (quote u) (quote read) (quote a))
-            false)
-          (acl-it-check!
-            "deny on sibling a leaves b permitted"
-            (acl-it-p? db (quote u) (quote read) (quote b))
-            true)
-          (acl-it-check!
-            "root itself still permitted"
-            (acl-it-p? db (quote u) (quote read) (quote root))
-            true)))
-      (let
-        ((db (acl-build-db (list (acl-grant (quote x) (quote read) (quote y))))))
-        (acl-it-check!
-          "direct grant under inheritance ruleset"
-          (acl-it-p? db (quote x) (quote read) (quote y))
-          true)))))
-
-(define
-  acl-inherit-tests-run!
-  (fn
-    ()
-    (do
-      (set! acl-it-pass 0)
-      (set! acl-it-fail 0)
-      (set! acl-it-failures (list))
-      (acl-it-run-all!)
-      {:failures acl-it-failures :total (+ acl-it-pass acl-it-fail) :passed acl-it-pass :failed acl-it-fail})))

lib/apl/conformance.conf

@@ -1,63 +0,0 @@
-# APL conformance config — sourced by lib/guest/conformance.sh.
-
-LANG_NAME=apl
-MODE=counters
-COUNTERS_PASS=apl-test-pass
-COUNTERS_FAIL=apl-test-fail
-TIMEOUT_PER_SUITE=300
-
-PRELOADS=(
-  spec/stdlib.sx
-  lib/r7rs.sx
-  lib/apl/runtime.sx
-  lib/apl/tokenizer.sx
-  lib/apl/parser.sx
-  lib/apl/transpile.sx
-  lib/apl/test-harness.sx
-)
-
-SUITES=(
-  "structural:lib/apl/tests/structural.sx"
-  "operators:lib/apl/tests/operators.sx"
-  "dfn:lib/apl/tests/dfn.sx"
-  "tradfn:lib/apl/tests/tradfn.sx"
-  "valence:lib/apl/tests/valence.sx"
-  "programs:lib/apl/tests/programs.sx"
-  "system:lib/apl/tests/system.sx"
-  "idioms:lib/apl/tests/idioms.sx"
-  "eval-ops:lib/apl/tests/eval-ops.sx"
-  "pipeline:lib/apl/tests/pipeline.sx"
-)
-
-emit_scoreboard_json() {
-  local n=${#GC_NAMES[@]} i sep
-  printf '{\n'
-  printf '  "suites": {\n'
-  for ((i=0; i<n; i++)); do
-    sep=","; [ $i -eq $((n-1)) ] && sep=""
-    printf '    "%s": {"pass": %d, "fail": %d}%s\n' \
-      "${GC_NAMES[$i]}" "${GC_PASS[$i]}" "${GC_FAIL[$i]}" "$sep"
-  done
-  printf '  },\n'
-  printf '  "total_pass": %d,\n' "$GC_TOTAL_PASS"
-  printf '  "total_fail": %d,\n' "$GC_TOTAL_FAIL"
-  printf '  "total": %d\n' "$GC_TOTAL"
-  printf '}\n'
-}
-
-emit_scoreboard_md() {
-  local n=${#GC_NAMES[@]} i
-  printf '# APL Conformance Scoreboard\n\n'
-  printf '_Generated by `lib/apl/conformance.sh`_\n\n'
-  printf '| Suite | Pass | Fail | Total |\n'
-  printf '|-------|-----:|-----:|------:|\n'
-  for ((i=0; i<n; i++)); do
-    printf '| %s | %d | %d | %d |\n' \
-      "${GC_NAMES[$i]}" "${GC_PASS[$i]}" "${GC_FAIL[$i]}" "${GC_TOTAL_S[$i]}"
-  done
-  printf '| **Total** | **%d** | **%d** | **%d** |\n' "$GC_TOTAL_PASS" "$GC_TOTAL_FAIL" "$GC_TOTAL"
-  printf '\n'
-  printf '## Notes\n\n'
-  printf '%s\n' '- Suites use the standard `apl-test name got expected` framework loaded against `lib/apl/runtime.sx` + `lib/apl/transpile.sx`.'
-  printf '%s\n' '- `lib/apl/tests/parse.sx` and `lib/apl/tests/scalar.sx` use their own self-contained frameworks and are excluded from this scoreboard.'
-}

lib/apl/conformance.sh

@@ -1,5 +1,116 @@
 #!/usr/bin/env bash
-# lib/apl/conformance.sh — APL conformance via the shared guest driver.
-# Config lives in lib/apl/conformance.conf (MODE=counters). Override the binary
-# with SX_SERVER=path/to/sx_server.exe bash lib/apl/conformance.sh
-exec bash "$(dirname "$0")/../guest/conformance.sh" "$(dirname "$0")/conformance.conf" "$@"
+# lib/apl/conformance.sh — run APL test suites, emit scoreboard.json + scoreboard.md.
+
+set -uo pipefail
+cd "$(git rev-parse --show-toplevel)"
+
+SX_SERVER="${SX_SERVER:-/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe}"
+if [ ! -x "$SX_SERVER" ]; then
+  SX_SERVER="hosts/ocaml/_build/default/bin/sx_server.exe"
+fi
+if [ ! -x "$SX_SERVER" ]; then
+  echo "ERROR: sx_server.exe not found." >&2
+  exit 1
+fi
+
+SUITES=(structural operators dfn tradfn valence programs system idioms eval-ops pipeline)
+
+OUT_JSON="lib/apl/scoreboard.json"
+OUT_MD="lib/apl/scoreboard.md"
+
+run_suite() {
+  local suite=$1
+  local file="lib/apl/tests/${suite}.sx"
+  local TMP
+  TMP=$(mktemp)
+  cat > "$TMP" << EPOCHS
+(epoch 1)
+(load "spec/stdlib.sx")
+(load "lib/r7rs.sx")
+(load "lib/apl/runtime.sx")
+(load "lib/apl/tokenizer.sx")
+(load "lib/apl/parser.sx")
+(load "lib/apl/transpile.sx")
+(epoch 2)
+(eval "(define apl-test-pass 0)")
+(eval "(define apl-test-fail 0)")
+(eval "(define apl-test (fn (name got expected) (if (= got expected) (set! apl-test-pass (+ apl-test-pass 1)) (set! apl-test-fail (+ apl-test-fail 1)))))")
+(epoch 3)
+(load "${file}")
+(epoch 4)
+(eval "(list apl-test-pass apl-test-fail)")
+EPOCHS
+
+  local OUTPUT
+  OUTPUT=$(timeout 300 "$SX_SERVER" < "$TMP" 2>/dev/null)
+  rm -f "$TMP"
+
+  local LINE
+  LINE=$(echo "$OUTPUT" | awk '/^\(ok-len 4 / {getline; print; exit}')
+  if [ -z "$LINE" ]; then
+    LINE=$(echo "$OUTPUT" | grep -E '^\(ok 4 \([0-9]+ [0-9]+\)\)' | tail -1 \
+            | sed -E 's/^\(ok 4 //; s/\)$//')
+  fi
+
+  local P F
+  P=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\1/')
+  F=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\2/')
+  P=${P:-0}
+  F=${F:-0}
+  echo "${P} ${F}"
+}
+
+declare -A SUITE_PASS
+declare -A SUITE_FAIL
+TOTAL_PASS=0
+TOTAL_FAIL=0
+
+echo "Running APL conformance suite..." >&2
+for s in "${SUITES[@]}"; do
+  read -r p f < <(run_suite "$s")
+  SUITE_PASS[$s]=$p
+  SUITE_FAIL[$s]=$f
+  TOTAL_PASS=$((TOTAL_PASS + p))
+  TOTAL_FAIL=$((TOTAL_FAIL + f))
+  printf "  %-12s %d/%d\n" "$s" "$p" "$((p+f))" >&2
+done
+
+# scoreboard.json
+{
+  printf '{\n'
+  printf '  "suites": {\n'
+  first=1
+  for s in "${SUITES[@]}"; do
+    if [ $first -eq 0 ]; then printf ',\n'; fi
+    printf '    "%s": {"pass": %d, "fail": %d}' "$s" "${SUITE_PASS[$s]}" "${SUITE_FAIL[$s]}"
+    first=0
+  done
+  printf '\n  },\n'
+  printf '  "total_pass": %d,\n' "$TOTAL_PASS"
+  printf '  "total_fail": %d,\n' "$TOTAL_FAIL"
+  printf '  "total": %d\n' "$((TOTAL_PASS + TOTAL_FAIL))"
+  printf '}\n'
+} > "$OUT_JSON"
+
+# scoreboard.md
+{
+  printf '# APL Conformance Scoreboard\n\n'
+  printf '_Generated by `lib/apl/conformance.sh`_\n\n'
+  printf '| Suite | Pass | Fail | Total |\n'
+  printf '|-------|-----:|-----:|------:|\n'
+  for s in "${SUITES[@]}"; do
+    p=${SUITE_PASS[$s]}
+    f=${SUITE_FAIL[$s]}
+    printf '| %s | %d | %d | %d |\n' "$s" "$p" "$f" "$((p+f))"
+  done
+  printf '| **Total** | **%d** | **%d** | **%d** |\n' "$TOTAL_PASS" "$TOTAL_FAIL" "$((TOTAL_PASS + TOTAL_FAIL))"
+  printf '\n'
+  printf '## Notes\n\n'
+  printf '%s\n' '- Suites use the standard `apl-test name got expected` framework loaded against `lib/apl/runtime.sx` + `lib/apl/transpile.sx`.'
+  printf '%s\n' '- `lib/apl/tests/parse.sx` and `lib/apl/tests/scalar.sx` use their own self-contained frameworks and are excluded from this scoreboard.'
+} > "$OUT_MD"
+
+echo "Wrote $OUT_JSON and $OUT_MD" >&2
+echo "Total: $TOTAL_PASS pass, $TOTAL_FAIL fail" >&2
+
+[ "$TOTAL_FAIL" -eq 0 ]

lib/apl/scoreboard.json

@@ -9,9 +9,9 @@
     "system": {"pass": 13, "fail": 0},
     "idioms": {"pass": 64, "fail": 0},
     "eval-ops": {"pass": 14, "fail": 0},
-    "pipeline": {"pass": 152, "fail": 0}
+    "pipeline": {"pass": 40, "fail": 0}
   },
-  "total_pass": 562,
+  "total_pass": 450,
   "total_fail": 0,
-  "total": 562
+  "total": 450
 }

lib/apl/scoreboard.md

@@ -13,8 +13,8 @@ _Generated by `lib/apl/conformance.sh`_
 | system | 13 | 0 | 13 |
 | idioms | 64 | 0 | 64 |
 | eval-ops | 14 | 0 | 14 |
-| pipeline | 152 | 0 | 152 |
-| **Total** | **562** | **0** | **562** |
+| pipeline | 40 | 0 | 40 |
+| **Total** | **450** | **0** | **450** |
 
 ## Notes
 

lib/apl/test-harness.sx

@@ -1,15 +0,0 @@
-; lib/apl/test-harness.sx — counters + assertion fn for the shared conformance
-; driver (lib/guest/conformance.sh, MODE=counters). Loaded as a PRELOAD so each
-; suite starts from a fresh 0/0; suites call (apl-test name got expected).
-
-(define apl-test-pass 0)
-(define apl-test-fail 0)
-
-(define
-  apl-test
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! apl-test-pass (+ apl-test-pass 1))
-      (set! apl-test-fail (+ apl-test-fail 1)))))

lib/erlang/bench_ring_results.md

@@ -33,54 +33,3 @@ least: persistent (path-copying) envs, an inline scheduler that
 doesn't call/cc on the common path (msg-already-in-mailbox), and a
 linked-list mailbox. None of those are in scope for the Phase 3
 checkbox — captured here as the floor we're starting from.
-
-## Phase 9 status (2026-05-14)
-
-Specialized opcodes 9b–9f landed as **stub dispatchers** in
-`lib/erlang/vm/dispatcher.sx`: `OP_PATTERN_TUPLE/LIST/BINARY`,
-`OP_PERFORM/HANDLE`, `OP_RECEIVE_SCAN`, `OP_SPAWN/SEND`, and ten
-`OP_BIF_*` hot dispatch entries. Each opcode's handler is a thin
-wrapper over the existing `er-match-*` / `er-bif-*` / runtime impls,
-so **the perf numbers above are unchanged** — same per-hop cost, same
-scheduler. The stubs exist to nail down opcode IDs, operand contracts,
-and tests against `er-match!` parity *before* 9a (the OCaml
-opcode-extension mechanism in `hosts/ocaml/evaluator/`) lands.
-
-When 9a integrates and the bytecode compiler can emit these opcodes
-at hot call sites, the real speedup story (~3000× ring throughput,
-~1000× spawn) starts. Until then this file documents the
-pre-integration ceiling. 72 vm-suite tests guard the stub correctness;
-full conformance is **709/709** with the stub infrastructure loaded.
-
-## Phase 9g — post-integration bench (2026-05-15)
-
-9a (vm-ext mechanism), 9h (`erlang_ext.ml` registering `erlang.OP_*`
-ids 222-239), and 9i (SX dispatcher consulting `extension-opcode-id`)
-are now integrated and built into `hosts/ocaml/_build/default/bin/sx_server.exe`.
-Re-ran the ring ladder on that binary:
-
-| N (processes) | Hops | Wall-clock | Throughput |
-|---|---|---|---|
-| 10 | 10 | 938ms | 11 hops/s |
-| 100 | 100 | 2772ms | 36 hops/s |
-| 500 | 500 | 14190ms | 35 hops/s |
-| 1000 | 1000 | 31814ms | 31 hops/s |
-
-**Numbers are unchanged from the pre-integration baseline** — and that
-is the expected, correct result. The opcode handlers (both the SX stub
-dispatcher and the OCaml `erlang_ext` module) wrap the existing
-`er-match-*` / `er-bif-*` / scheduler implementations 1-to-1, and the
-**bytecode compiler does not yet emit `erlang.OP_*` opcodes**, so every
-hop still goes through the general CEK path exactly as before. The
-unchanged numbers therefore double as a no-regression check: the full
-extension wiring (cherry-picked vm-ext A-E + force-link + erlang_ext +
-SX bridge) added zero per-hop cost. Conformance **715/715** on this
-binary.
-
-The ~3000×/~1000× targets remain gated on a **future phase (Phase 10 —
-bytecode emission)**: teach `lib/compiler.sx` (or the Erlang
-transpiler) to emit `erlang.OP_PATTERN_TUPLE` etc. at hot call sites,
-then give `erlang_ext.ml` real register-machine handlers instead of the
-current honest not-wired raise. That is a substantial standalone phase,
-tracked in `plans/erlang-on-sx.md`. 9g's deliverable — *honest
-measurement + recorded numbers on the integrated binary* — is complete.

lib/erlang/conformance.sh

@@ -36,8 +36,6 @@ SUITES=(
   "bank|er-bank-test-pass|er-bank-test-count"
   "echo|er-echo-test-pass|er-echo-test-count"
   "fib|er-fib-test-pass|er-fib-test-count"
-  "ffi|er-ffi-test-pass|er-ffi-test-count"
-  "vm|er-vm-test-pass|er-vm-test-count"
 )
 
 cat > "$TMPFILE" << 'EPOCHS'
@@ -58,9 +56,6 @@ cat > "$TMPFILE" << 'EPOCHS'
 (load "lib/erlang/tests/programs/bank.sx")
 (load "lib/erlang/tests/programs/echo.sx")
 (load "lib/erlang/tests/programs/fib_server.sx")
-(load "lib/erlang/vm/dispatcher.sx")
-(load "lib/erlang/tests/ffi.sx")
-(load "lib/erlang/tests/vm.sx")
 (epoch 100)
 (eval "(list er-test-pass er-test-count)")
 (epoch 101)
@@ -79,10 +74,6 @@ cat > "$TMPFILE" << 'EPOCHS'
 (eval "(list er-echo-test-pass er-echo-test-count)")
 (epoch 108)
 (eval "(list er-fib-test-pass er-fib-test-count)")
-(epoch 109)
-(eval "(list er-ffi-test-pass er-ffi-test-count)")
-(epoch 110)
-(eval "(list er-vm-test-pass er-vm-test-count)")
 EPOCHS
 
 timeout 600 "$SX_SERVER" < "$TMPFILE" > "$OUTFILE" 2>&1

lib/erlang/runtime.sx

@@ -853,112 +853,6 @@
 (define er-modules-get (fn () (nth er-modules 0)))
 (define er-modules-reset! (fn () (set-nth! er-modules 0 {})))
 
-(define er-mk-module-slot
-  (fn (mod-env old-env version)
-    {:current mod-env :old old-env :version version :tag "module"}))
-
-(define er-module-current-env (fn (slot) (get slot :current)))
-(define er-module-old-env (fn (slot) (get slot :old)))
-(define er-module-version (fn (slot) (get slot :version)))
-
-;; ── FFI BIF registry (Phase 8) ───────────────────────────────────
-;; Global dict from "Module/Name/Arity" key to {:module :name :arity :fn :pure?}.
-;; Replaces the giant cond chain in transpile.sx#er-apply-remote-bif over time —
-;; Phase 8 BIFs (crypto / cid / file / httpc / sqlite) all register here.
-(define er-bif-registry (list {}))
-(define er-bif-registry-get (fn () (nth er-bif-registry 0)))
-(define er-bif-registry-reset! (fn () (set-nth! er-bif-registry 0 {})))
-
-(define er-bif-key
-  (fn (module name arity)
-    (str module "/" name "/" arity)))
-
-(define er-register-bif!
-  (fn (module name arity sx-fn)
-    (dict-set! (er-bif-registry-get) (er-bif-key module name arity)
-      {:module module :name name :arity arity :fn sx-fn :pure? false})
-    (er-mk-atom "ok")))
-
-(define er-register-pure-bif!
-  (fn (module name arity sx-fn)
-    (dict-set! (er-bif-registry-get) (er-bif-key module name arity)
-      {:module module :name name :arity arity :fn sx-fn :pure? true})
-    (er-mk-atom "ok")))
-
-(define er-lookup-bif
-  (fn (module name arity)
-    (let ((reg (er-bif-registry-get)) (k (er-bif-key module name arity)))
-      (if (dict-has? reg k) (get reg k) nil))))
-
-(define er-list-bifs
-  (fn () (keys (er-bif-registry-get))))
-
-;; ── term marshalling (Phase 8) ───────────────────────────────────
-;; Bridge Erlang term values (tagged dicts) and SX-native values for
-;; FFI BIFs to call out into platform primitives. Conversions:
-;;
-;;   Erlang                          SX-native
-;;   ─────────────────────────       ────────────────
-;;   atom  {:tag "atom" :name S}  ↔  symbol (make-symbol S)
-;;   nil   {:tag "nil"}           ↔  '()
-;;   cons  {:tag "cons" :head :tail} →  list of marshalled elements
-;;   tuple {:tag "tuple" :elements} →  list of marshalled elements
-;;   binary {:tag "binary" :bytes} ↔ SX string
-;;   integer / float / boolean   ↔ passthrough
-;;   SX string on the way back   →  binary
-;;
-;; Pids, refs, funs pass through unchanged — they have no SX-native
-;; equivalent and are opaque to FFI primitives.
-
-(define er-cons-to-sx-list
-  (fn (v)
-    (cond
-      (er-nil? v) (list)
-      (er-cons? v)
-        (let ((tail (er-cons-to-sx-list (get v :tail)))
-              (head (er-to-sx (get v :head))))
-          (let ((out (list head)))
-            (for-each
-              (fn (i) (append! out (nth tail i)))
-              (range 0 (len tail)))
-            out))
-      :else (list v))))
-
-(define er-to-sx
-  (fn (v)
-    (cond
-      (er-atom? v) (make-symbol (get v :name))
-      (er-nil? v) (list)
-      (er-cons? v) (er-cons-to-sx-list v)
-      (er-tuple? v)
-        (let ((out (list)) (es (get v :elements)))
-          (for-each
-            (fn (i) (append! out (er-to-sx (nth es i))))
-            (range 0 (len es)))
-          out)
-      (er-binary? v) (list->string (map integer->char (get v :bytes)))
-      :else v)))
-
-(define er-of-sx
-  (fn (v)
-    (let ((ty (type-of v)))
-      (cond
-        (= ty "symbol") (er-mk-atom (str v))
-        (= ty "string") (er-mk-binary (map char->integer (string->list v)))
-        (= ty "list")
-          (let ((out (er-mk-nil)))
-            (for-each
-              (fn (i)
-                (set! out
-                  (er-mk-cons (er-of-sx (nth v (- (- (len v) 1) i))) out)))
-              (range 0 (len v)))
-            out)
-        (= ty "nil") (er-mk-nil)
-        :else v))))
-
-
-
-
 ;; Load an Erlang module declaration. Source must start with
 ;; `-module(Name).` and contain function definitions. Functions
 ;; sharing a name (different arities) get their clauses concatenated
@@ -1003,15 +897,7 @@
               ((all-clauses (get by-name k)))
               (er-env-bind! mod-env k (er-mk-fun all-clauses mod-env))))
           (keys by-name))
-        (let ((registry (er-modules-get)))
-          (if (dict-has? registry mod-name)
-            (let ((existing-slot (get registry mod-name)))
-              (dict-set! registry mod-name
-                (er-mk-module-slot mod-env
-                  (er-module-current-env existing-slot)
-                  (+ (er-module-version existing-slot) 1))))
-            (dict-set! registry mod-name
-              (er-mk-module-slot mod-env nil 1))))
+        (dict-set! (er-modules-get) mod-name mod-env)
         (er-mk-atom mod-name)))))
 
 (define
@@ -1019,7 +905,7 @@
   (fn
     (mod name vs)
     (let
-      ((mod-env (er-module-current-env (get (er-modules-get) mod))))
+      ((mod-env (get (er-modules-get) mod)))
       (if
         (not (dict-has? mod-env name))
         (raise
@@ -1303,325 +1189,16 @@
           :else (er-mk-atom "undefined")))
       :else (error "Erlang: ets:info: arity"))))
 
-
-
-;; ── file module (Phase 8 FFI) ────────────────────────────────────
-;; Synchronous file IO. Filenames must be SX strings (or Erlang
-;; binaries/char-code lists coercible to strings via er-source-to-string).
-;; Returns `{ok, Binary}` / `ok` on success, `{error, Reason}` on failure
-;; where Reason is one of `enoent`, `eacces`, `enotdir`, `posix_error`.
-
-(define er-classify-file-error
-  (fn (msg)
-    (let ((s (str msg)))
-      (cond
-        (string-contains? s "No such") (er-mk-atom "enoent")
-        (string-contains? s "Permission denied") (er-mk-atom "eacces")
-        (string-contains? s "Not a directory") (er-mk-atom "enotdir")
-        (string-contains? s "Is a directory") (er-mk-atom "eisdir")
-        :else (er-mk-atom "posix_error")))))
-
-(define er-bif-file-read-file
-  (fn (vs)
-    (let ((path (er-source-to-string (nth vs 0))))
-      (cond
-        (= path nil)
-          (er-mk-tuple (list (er-mk-atom "error") (er-mk-atom "badarg")))
-        :else
-          (let ((res (list nil)) (err (list nil)))
-            (guard (c (:else (set-nth! err 0 c)))
-              (set-nth! res 0 (file-read path)))
-            (cond
-              (not (= (nth err 0) nil))
-                (er-mk-tuple (list (er-mk-atom "error")
-                  (er-classify-file-error (nth err 0))))
-              :else
-                (er-mk-tuple (list (er-mk-atom "ok")
-                  (er-mk-binary (map char->integer (string->list (nth res 0)))))))))))) 
-
-(define er-bif-file-write-file
-  (fn (vs)
-    (let ((path (er-source-to-string (nth vs 0)))
-          (data (er-source-to-string (nth vs 1))))
-      (cond
-        (or (= path nil) (= data nil))
-          (er-mk-tuple (list (er-mk-atom "error") (er-mk-atom "badarg")))
-        :else
-          (let ((err (list nil)))
-            (guard (c (:else (set-nth! err 0 c)))
-              (file-write path data))
-            (cond
-              (not (= (nth err 0) nil))
-                (er-mk-tuple (list (er-mk-atom "error")
-                  (er-classify-file-error (nth err 0))))
-              :else (er-mk-atom "ok")))))))
-
-(define er-bif-file-delete
-  (fn (vs)
-    (let ((path (er-source-to-string (nth vs 0))))
-      (cond
-        (= path nil)
-          (er-mk-tuple (list (er-mk-atom "error") (er-mk-atom "badarg")))
-        :else
-          (let ((err (list nil)))
-            (guard (c (:else (set-nth! err 0 c)))
-              (file-delete path))
-            (cond
-              (not (= (nth err 0) nil))
-                (er-mk-tuple (list (er-mk-atom "error")
-                  (er-classify-file-error (nth err 0))))
-              :else (er-mk-atom "ok")))))))
-
-
-;; ── crypto / cid / file:list_dir (Phase 8 FFI — host primitives) ──
-;; Wired against loops/fed-prims host primitives (see plans Blockers
-;; "RESOLVED 2026-05-18"). Term marshalling at the boundary:
-;; Erlang binary/string/charlist -> SX byte-string via er-source-to-string;
-;; results -> Erlang binary via er-mk-binary.
-
-(define er-hexval
-  (fn (c)
-    (let ((v (char->integer c)))
-      (cond
-        (and (>= v 48) (<= v 57)) (- v 48)        ;; 0-9
-        (and (>= v 97) (<= v 102)) (+ 10 (- v 97)) ;; a-f
-        (and (>= v 65) (<= v 70)) (+ 10 (- v 65))  ;; A-F
-        :else 0))))
-
-(define er-hex->bytes
-  (fn (hex)
-    (let ((cs (string->list hex)) (out (list)) (n (string-length hex)))
-      (for-each
-        (fn (i)
-          (append! out
-            (+ (* 16 (er-hexval (nth cs (* i 2))))
-               (er-hexval (nth cs (+ (* i 2) 1))))))
-        (range 0 (truncate (/ n 2))))
-      out)))
-
-;; crypto:hash(Type, Data) -> raw digest binary. Type is an Erlang
-;; atom (sha256 | sha512 | sha3_256). Bad type / non-binary -> badarg.
-(define er-bif-crypto-hash
-  (fn (vs)
-    (let ((ty (nth vs 0)) (data (er-source-to-string (nth vs 1))))
-      (cond
-        (or (not (er-atom? ty)) (= data nil))
-          (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        :else
-          (let ((name (get ty :name)))
-            (let ((hex (cond
-                         (= name "sha256") (crypto-sha256 data)
-                         (= name "sha512") (crypto-sha512 data)
-                         (= name "sha3_256") (crypto-sha3-256 data)
-                         :else nil)))
-              (cond
-                (= hex nil) (raise (er-mk-error-marker (er-mk-atom "badarg")))
-                :else (er-mk-binary (er-hex->bytes hex)))))))))
-
-;; cid:from_bytes(Bin) -> CIDv1 (raw codec 0x55, sha2-256 multihash)
-;; as an Erlang binary string.
-(define er-bif-cid-from-bytes
-  (fn (vs)
-    (let ((data (er-source-to-string (nth vs 0))))
-      (cond
-        (= data nil) (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        :else
-          (let ((digest (er-hex->bytes (crypto-sha256 data))))
-            (let ((mh (list->string
-                        (map integer->char (append (list 18 32) digest)))))
-              (er-mk-binary
-                (map char->integer
-                  (string->list (cid-from-bytes 85 mh))))))))))
-
-;; cid:to_string(Term) -> canonical CIDv1 (dag-cbor) of the term,
-;; as an Erlang binary string.
-(define er-bif-cid-to-string
-  (fn (vs)
-    ;; Canonical CID of the term's stable string form. (cbor-encode
-    ;; rejects symbols, so er-to-sx of compound terms is unencodable;
-    ;; er-format-value yields a canonical SX string per term value.)
-    (er-mk-binary
-      (map char->integer
-        (string->list (cid-from-sx (er-format-value (nth vs 0))))))))
-
-;; file:list_dir(Path) -> {ok, [Binary]} | {error, Reason}
-(define er-bif-file-list-dir
-  (fn (vs)
-    (let ((path (er-source-to-string (nth vs 0))))
-      (cond
-        (= path nil)
-          (er-mk-tuple (list (er-mk-atom "error") (er-mk-atom "badarg")))
-        :else
-          (let ((res (list nil)) (err (list nil)))
-            (guard (c (:else (set-nth! err 0 c)))
-              (set-nth! res 0 (file-list-dir path)))
-            (cond
-              (not (= (nth err 0) nil))
-                (er-mk-tuple (list (er-mk-atom "error")
-                  (er-classify-file-error (nth err 0))))
-              :else
-                (er-mk-tuple (list (er-mk-atom "ok")
-                  (er-of-sx (nth res 0))))))))))
-
-;; ── builtin BIF registrations (Phase 8 migration) ────────────────
-;; Populates `er-bif-registry` with every existing built-in BIF. Each
-;; entry is keyed by "Module/Name/Arity"; multi-arity BIFs register
-;; once per arity. Called eagerly at the end of runtime.sx so the
-;; registry is ready before any erlang-eval-ast call.
-(define er-register-builtin-bifs!
-  (fn ()
-    ;; erlang module — type predicates (all pure)
-    (er-register-pure-bif! "erlang" "is_integer" 1 er-bif-is-integer)
-    (er-register-pure-bif! "erlang" "is_atom" 1 er-bif-is-atom)
-    (er-register-pure-bif! "erlang" "is_list" 1 er-bif-is-list)
-    (er-register-pure-bif! "erlang" "is_tuple" 1 er-bif-is-tuple)
-    (er-register-pure-bif! "erlang" "is_number" 1 er-bif-is-number)
-    (er-register-pure-bif! "erlang" "is_float" 1 er-bif-is-float)
-    (er-register-pure-bif! "erlang" "is_boolean" 1 er-bif-is-boolean)
-    (er-register-pure-bif! "erlang" "is_pid" 1 er-bif-is-pid)
-    (er-register-pure-bif! "erlang" "is_reference" 1 er-bif-is-reference)
-    (er-register-pure-bif! "erlang" "is_binary" 1 er-bif-is-binary)
-    (er-register-pure-bif! "erlang" "is_function" 1 er-bif-is-function)
-    (er-register-pure-bif! "erlang" "is_function" 2 er-bif-is-function)
-    ;; erlang module — pure data ops
-    (er-register-pure-bif! "erlang" "length" 1 er-bif-length)
-    (er-register-pure-bif! "erlang" "hd" 1 er-bif-hd)
-    (er-register-pure-bif! "erlang" "tl" 1 er-bif-tl)
-    (er-register-pure-bif! "erlang" "element" 2 er-bif-element)
-    (er-register-pure-bif! "erlang" "tuple_size" 1 er-bif-tuple-size)
-    (er-register-pure-bif! "erlang" "byte_size" 1 er-bif-byte-size)
-    (er-register-pure-bif! "erlang" "atom_to_list" 1 er-bif-atom-to-list)
-    (er-register-pure-bif! "erlang" "list_to_atom" 1 er-bif-list-to-atom)
-    (er-register-pure-bif! "erlang" "abs" 1 er-bif-abs)
-    (er-register-pure-bif! "erlang" "min" 2 er-bif-min)
-    (er-register-pure-bif! "erlang" "max" 2 er-bif-max)
-    (er-register-pure-bif! "erlang" "tuple_to_list" 1 er-bif-tuple-to-list)
-    (er-register-pure-bif! "erlang" "list_to_tuple" 1 er-bif-list-to-tuple)
-    (er-register-pure-bif! "erlang" "integer_to_list" 1 er-bif-integer-to-list)
-    (er-register-pure-bif! "erlang" "list_to_integer" 1 er-bif-list-to-integer)
-    ;; erlang module — process / runtime (side-effecting)
-    (er-register-bif! "erlang" "self" 0 er-bif-self)
-    (er-register-bif! "erlang" "spawn" 1 er-bif-spawn)
-    (er-register-bif! "erlang" "spawn" 3 er-bif-spawn)
-    (er-register-bif! "erlang" "exit" 1 er-bif-exit)
-    (er-register-bif! "erlang" "exit" 2 er-bif-exit)
-    (er-register-bif! "erlang" "make_ref" 0 er-bif-make-ref)
-    (er-register-bif! "erlang" "link" 1 er-bif-link)
-    (er-register-bif! "erlang" "unlink" 1 er-bif-unlink)
-    (er-register-bif! "erlang" "monitor" 2 er-bif-monitor)
-    (er-register-bif! "erlang" "demonitor" 1 er-bif-demonitor)
-    (er-register-bif! "erlang" "process_flag" 2 er-bif-process-flag)
-    (er-register-bif! "erlang" "register" 2 er-bif-register)
-    (er-register-bif! "erlang" "unregister" 1 er-bif-unregister)
-    (er-register-bif! "erlang" "whereis" 1 er-bif-whereis)
-    (er-register-bif! "erlang" "registered" 0 er-bif-registered)
-    ;; erlang module — exception raising (modelled as side-effecting)
-    (er-register-bif! "erlang" "throw" 1
-      (fn (vs) (raise (er-mk-throw-marker (er-bif-arg1 vs "throw")))))
-    (er-register-bif! "erlang" "error" 1
-      (fn (vs) (raise (er-mk-error-marker (er-bif-arg1 vs "error")))))
-    ;; lists module — all pure
-    (er-register-pure-bif! "lists" "reverse" 1 er-bif-lists-reverse)
-    (er-register-pure-bif! "lists" "map" 2 er-bif-lists-map)
-    (er-register-pure-bif! "lists" "foldl" 3 er-bif-lists-foldl)
-    (er-register-pure-bif! "lists" "seq" 2 er-bif-lists-seq)
-    (er-register-pure-bif! "lists" "seq" 3 er-bif-lists-seq)
-    (er-register-pure-bif! "lists" "sum" 1 er-bif-lists-sum)
-    (er-register-pure-bif! "lists" "nth" 2 er-bif-lists-nth)
-    (er-register-pure-bif! "lists" "last" 1 er-bif-lists-last)
-    (er-register-pure-bif! "lists" "member" 2 er-bif-lists-member)
-    (er-register-pure-bif! "lists" "append" 2 er-bif-lists-append)
-    (er-register-pure-bif! "lists" "filter" 2 er-bif-lists-filter)
-    (er-register-pure-bif! "lists" "any" 2 er-bif-lists-any)
-    (er-register-pure-bif! "lists" "all" 2 er-bif-lists-all)
-    (er-register-pure-bif! "lists" "duplicate" 2 er-bif-lists-duplicate)
-    ;; io module — side-effecting (writes to io buffer)
-    (er-register-bif! "io" "format" 1 er-bif-io-format)
-    (er-register-bif! "io" "format" 2 er-bif-io-format)
-    ;; ets module — side-effecting (mutates table state)
-    (er-register-bif! "ets" "new" 2 er-bif-ets-new)
-    (er-register-bif! "ets" "insert" 2 er-bif-ets-insert)
-    (er-register-bif! "ets" "lookup" 2 er-bif-ets-lookup)
-    (er-register-bif! "ets" "delete" 1 er-bif-ets-delete)
-    (er-register-bif! "ets" "delete" 2 er-bif-ets-delete)
-    (er-register-bif! "ets" "tab2list" 1 er-bif-ets-tab2list)
-    (er-register-bif! "ets" "info" 2 er-bif-ets-info)
-    ;; code module — side-effecting (mutates module registry, kills procs)
-    (er-register-bif! "code" "load_binary" 3 er-bif-code-load-binary)
-    (er-register-bif! "code" "purge" 1 er-bif-code-purge)
-    (er-register-bif! "code" "soft_purge" 1 er-bif-code-soft-purge)
-    (er-register-bif! "code" "which" 1 er-bif-code-which)
-    (er-register-bif! "code" "is_loaded" 1 er-bif-code-is-loaded)
-    (er-register-bif! "code" "all_loaded" 0 er-bif-code-all-loaded)
-    ;; file module
-    (er-register-bif! "file" "read_file" 1 er-bif-file-read-file)
-    (er-register-bif! "file" "write_file" 2 er-bif-file-write-file)
-    (er-register-bif! "file" "delete" 1 er-bif-file-delete)
-    ;; Phase 8 FFI — host-primitive BIFs (loops/fed-prims)
-    (er-register-pure-bif! "crypto" "hash" 2 er-bif-crypto-hash)
-    (er-register-pure-bif! "cid" "from_bytes" 1 er-bif-cid-from-bytes)
-    (er-register-pure-bif! "cid" "to_string" 1 er-bif-cid-to-string)
-
-;; ── binary_to_list / list_to_binary (Step 3b — term codec) ──────
-;; Standard Erlang semantics:
-;;   binary_to_list(<<B1,B2,...>>) -> [B1, B2, ...]   (Erlang cons of ints)
-;;   list_to_binary(IoList)        -> <<...>>         (flattens nested
-;;     iolists; elements are byte ints 0-255 or binaries)
-;; Bad arg / out-of-range byte / non-iolist element -> error:badarg.
-
-(define er-bif-binary-to-list
-  (fn (vs)
-    (let ((v (nth vs 0)))
-      (cond
-        (not (er-binary? v))
-          (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        :else
-          (let ((bs (get v :bytes)) (out (er-mk-nil)))
-            (for-each
-              (fn (i)
-                (set! out (er-mk-cons (nth bs (- (- (len bs) 1) i)) out)))
-              (range 0 (len bs)))
-            out)))))
-
-;; Walk an Erlang iolist, appending bytes to `acc` (a mutable SX list).
-;; Accepts: nil, cons-of-X, binary, integer in 0..255. Anything else
-;; signals failure by setting (nth fail 0) to true.
-(define er-iolist-walk!
-  (fn (v acc fail)
+(define
+  er-apply-ets-bif
+  (fn
+    (name vs)
     (cond
-      (nth fail 0) nil
-      (er-nil? v) nil
-      (er-cons? v)
-        (do (er-iolist-walk! (get v :head) acc fail)
-            (er-iolist-walk! (get v :tail) acc fail))
-      (er-binary? v)
-        (for-each
-          (fn (i) (append! acc (nth (get v :bytes) i)))
-          (range 0 (len (get v :bytes))))
-      (= (type-of v) "number")
-        (cond
-          (and (>= v 0) (<= v 255)) (append! acc v)
-          :else (set-nth! fail 0 true))
-      :else (set-nth! fail 0 true))))
-
-(define er-bif-list-to-binary
-  (fn (vs)
-    (let ((v (nth vs 0)) (acc (list)) (fail (list false)))
-      (cond
-        (not (or (er-nil? v) (er-cons? v) (er-binary? v)))
-          (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        :else
-          (do
-            (er-iolist-walk! v acc fail)
-            (cond
-              (nth fail 0)
-                (raise (er-mk-error-marker (er-mk-atom "badarg")))
-              :else (er-mk-binary acc)))))))
-
-    (er-register-bif! "file" "list_dir" 1 er-bif-file-list-dir)
-    (er-register-pure-bif! "erlang" "binary_to_list" 1 er-bif-binary-to-list)
-    (er-register-pure-bif! "erlang" "list_to_binary"  1 er-bif-list-to-binary)
-    (er-mk-atom "ok")))
-
-;; Register everything at load time.
-(er-register-builtin-bifs!)
+      (= name "new") (er-bif-ets-new vs)
+      (= name "insert") (er-bif-ets-insert vs)
+      (= name "lookup") (er-bif-ets-lookup vs)
+      (= name "delete") (er-bif-ets-delete vs)
+      (= name "tab2list") (er-bif-ets-tab2list vs)
+      (= name "info") (er-bif-ets-info vs)
+      :else (error
+        (str "Erlang: undefined 'ets:" name "/" (len vs) "'")))))

lib/erlang/scoreboard.json

@@ -1,18 +1,16 @@
 {
   "language": "erlang",
-  "total_pass": 761,
-  "total": 761,
+  "total_pass": 530,
+  "total": 530,
   "suites": [
     {"name":"tokenize","pass":62,"total":62,"status":"ok"},
     {"name":"parse","pass":52,"total":52,"status":"ok"},
-    {"name":"eval","pass":408,"total":408,"status":"ok"},
-    {"name":"runtime","pass":93,"total":93,"status":"ok"},
+    {"name":"eval","pass":346,"total":346,"status":"ok"},
+    {"name":"runtime","pass":39,"total":39,"status":"ok"},
     {"name":"ring","pass":4,"total":4,"status":"ok"},
     {"name":"ping-pong","pass":4,"total":4,"status":"ok"},
     {"name":"bank","pass":8,"total":8,"status":"ok"},
     {"name":"echo","pass":7,"total":7,"status":"ok"},
-    {"name":"fib","pass":8,"total":8,"status":"ok"},
-    {"name":"ffi","pass":37,"total":37,"status":"ok"},
-    {"name":"vm","pass":78,"total":78,"status":"ok"}
+    {"name":"fib","pass":8,"total":8,"status":"ok"}
   ]
 }

lib/erlang/scoreboard.md

@@ -1,20 +1,18 @@
 # Erlang-on-SX Scoreboard
 
-**Total: 761 / 761 tests passing**
+**Total: 530 / 530 tests passing**
 
 |  | Suite | Pass | Total |
 |---|---|---|---|
 | ✅ | tokenize | 62 | 62 |
 | ✅ | parse | 52 | 52 |
-| ✅ | eval | 408 | 408 |
-| ✅ | runtime | 93 | 93 |
+| ✅ | eval | 346 | 346 |
+| ✅ | runtime | 39 | 39 |
 | ✅ | ring | 4 | 4 |
 | ✅ | ping-pong | 4 | 4 |
 | ✅ | bank | 8 | 8 |
 | ✅ | echo | 7 | 7 |
 | ✅ | fib | 8 | 8 |
-| ✅ | ffi | 37 | 37 |
-| ✅ | vm | 78 | 78 |
 
 
 Generated by `lib/erlang/conformance.sh`.

lib/erlang/tests/eval.sx

@@ -228,10 +228,9 @@
 (er-eval-test "tuple_size 0" (ev "tuple_size({})") 0)
 
 ;; ── BIFs: atom / list conversions ───────────────────────────────
-(er-eval-test "atom_to_list -> charlist length" (ev "length(atom_to_list(hello))") 5)
-(er-eval-test "atom_to_list -> head $h" (ev "hd(atom_to_list(hello))") 104)
+(er-eval-test "atom_to_list" (ev "atom_to_list(hello)") "hello")
 (er-eval-test "list_to_atom roundtrip"
-  (nm (ev "list_to_atom(atom_to_list(foo))")) "foo")  ;; round-trip via charlist
+  (nm (ev "list_to_atom(atom_to_list(foo))")) "foo")
 (er-eval-test "list_to_atom fresh"
   (nm (ev "list_to_atom(\"bar\")")) "bar")
 
@@ -1061,13 +1060,11 @@
 (er-eval-test "list_to_tuple roundtrip"
   (ev "tuple_size(list_to_tuple([10, 20, 30]))") 3)
 
-(er-eval-test "integer_to_list -> charlist length" (ev "length(integer_to_list(42))") 2)
-(er-eval-test "integer_to_list 42 head $4" (ev "hd(integer_to_list(42))") 52)
-(er-eval-test "integer_to_list neg -> charlist length" (ev "length(integer_to_list(-99))") 3)
-(er-eval-test "integer_to_list -99 head $-" (ev "hd(integer_to_list(-99))") 45)
+(er-eval-test "integer_to_list" (ev "integer_to_list(42)") "42")
+(er-eval-test "integer_to_list neg" (ev "integer_to_list(-99)") "-99")
 (er-eval-test "list_to_integer" (ev "list_to_integer(\"123\")") 123)
 (er-eval-test "list_to_integer roundtrip"
-  (ev "list_to_integer(integer_to_list(7))") 7)  ;; round-trip via charlist
+  (ev "list_to_integer(integer_to_list(7))") 7)
 
 (er-eval-test "is_function fun"
   (nm (ev "F = fun (X) -> X end, is_function(F)")) "true")
@@ -1128,258 +1125,6 @@
 (er-eval-test "lists:duplicate val"
   (nm (ev "hd(lists:duplicate(3, marker))")) "marker")
 
-
-;; ── Phase 7: code:load_binary/3 ───────────────────────────────
-(er-modules-reset!)
-
-(er-eval-test "code:load_binary ok tag"
-  (nm (ev "element(1, code:load_binary(cl1, \"cl1.erl\", \"-module(cl1). foo() -> 1.\"))"))
-  "module")
-(er-eval-test "code:load_binary ok name"
-  (nm (ev "element(2, code:load_binary(cl1, \"cl1.erl\", \"-module(cl1). foo() -> 1.\"))"))
-  "cl1")
-(er-eval-test "code:load_binary then call"
-  (ev "cl1:foo()") 1)
-
-(er-eval-test "code:load_binary reload v2"
-  (ev "code:load_binary(cl1, \"cl1.erl\", \"-module(cl1). foo() -> 99.\"), cl1:foo()")
-  99)
-
-(er-eval-test "code:load_binary name mismatch tag"
-  (nm (ev "element(1, code:load_binary(cl2, \"x.erl\", \"-module(other). f() -> 0.\"))"))
-  "error")
-(er-eval-test "code:load_binary name mismatch reason"
-  (nm (ev "element(2, code:load_binary(cl2, \"x.erl\", \"-module(other). f() -> 0.\"))"))
-  "module_name_mismatch")
-
-(er-eval-test "code:load_binary badfile on garbage"
-  (nm (ev "element(2, code:load_binary(cl3, \"x.erl\", \"this is not erlang\"))"))
-  "badfile")
-
-(er-eval-test "code:load_binary non-atom mod is badarg"
-  (nm (ev "element(2, code:load_binary(\"cl1\", \"x.erl\", \"-module(cl1). f() -> 0.\"))"))
-  "badarg")
-
-
-;; ── Phase 7: code:purge/1 + code:soft_purge/1 ───────────────────
-(er-modules-reset!)
-
-;; purge unknown module → false
-(er-eval-test "code:purge unknown"
-  (nm (ev "code:purge(nope)")) "false")
-
-;; load, then purge without old version → false (nothing to purge)
-(er-eval-test "code:purge no old"
-  (nm (ev "code:load_binary(pg1, \"pg1\", \"-module(pg1). v() -> 1.\"), code:purge(pg1)"))
-  "false")
-
-;; load v1, load v2 (creates :old), purge with no live procs → true
-(er-eval-test "code:purge after reload"
-  (nm (ev "code:load_binary(pg2, \"pg2\", \"-module(pg2). v() -> 1.\"), code:load_binary(pg2, \"pg2\", \"-module(pg2). v() -> 2.\"), code:purge(pg2)"))
-  "true")
-
-;; idempotent: purging again returns false (already purged)
-(er-eval-test "code:purge twice"
-  (nm (ev "code:load_binary(pg3, \"pg3\", \"-module(pg3). v() -> 1.\"), code:load_binary(pg3, \"pg3\", \"-module(pg3). v() -> 2.\"), code:purge(pg3), code:purge(pg3)"))
-  "false")
-
-;; purge returns true whenever an :old slot exists, regardless of process tracking
-;; (proper "kill lingering" semantics requires spawn/3 which is still stubbed)
-(er-eval-test "code:purge with old slot present"
-  (nm (ev "code:load_binary(pg4, \"pg4\", \"-module(pg4). loop() -> receive stop -> ok end.\"),
-           Pid = spawn(fun () -> pg4:loop() end),
-           code:load_binary(pg4, \"pg4\", \"-module(pg4). loop() -> receive stop -> done end.\"),
-           code:purge(pg4)"))
-  "true")
-
-;; soft_purge unknown → true (nothing to purge)
-(er-eval-test "code:soft_purge unknown"
-  (nm (ev "code:soft_purge(nope)")) "true")
-
-;; soft_purge with no old version → true
-(er-eval-test "code:soft_purge no old"
-  (nm (ev "code:load_binary(sp1, \"sp1\", \"-module(sp1). v() -> 1.\"), code:soft_purge(sp1)"))
-  "true")
-
-;; soft_purge with old + no lingering procs → true (clears :old)
-(er-eval-test "code:soft_purge clean"
-  (nm (ev "code:load_binary(sp2, \"sp2\", \"-module(sp2). v() -> 1.\"), code:load_binary(sp2, \"sp2\", \"-module(sp2). v() -> 2.\"), code:soft_purge(sp2)"))
-  "true")
-
-;; non-atom Mod is badarg (raise)
-(er-eval-test "code:purge badarg"
-  (nm (ev "try code:purge(\"str\") catch error:badarg -> ok end")) "ok")
-(er-eval-test "code:soft_purge badarg"
-  (nm (ev "try code:soft_purge(123) catch error:badarg -> ok end")) "ok")
-
-
-;; ── Phase 7: code:which/1 + code:is_loaded/1 + code:all_loaded/0 ──
-(er-modules-reset!)
-
-(er-eval-test "code:which non_existing"
-  (nm (ev "code:which(nope)")) "non_existing")
-
-(er-eval-test "code:which after load"
-  (nm (ev "code:load_binary(wh1, \"wh1\", \"-module(wh1). v() -> 1.\"), code:which(wh1)"))
-  "loaded")
-
-(er-eval-test "code:is_loaded missing"
-  (nm (ev "code:is_loaded(nope)")) "false")
-
-(er-eval-test "code:is_loaded tag"
-  (nm (ev "code:load_binary(il1, \"il1\", \"-module(il1). v() -> 1.\"), element(1, code:is_loaded(il1))"))
-  "file")
-
-(er-eval-test "code:is_loaded value"
-  (nm (ev "code:load_binary(il2, \"il2\", \"-module(il2). v() -> 1.\"), element(2, code:is_loaded(il2))"))
-  "loaded")
-
-(er-modules-reset!)
-(er-eval-test "code:all_loaded empty"
-  (ev "length(code:all_loaded())") 0)
-
-(er-modules-reset!)
-(er-eval-test "code:all_loaded count"
-  (ev "code:load_binary(al1, \"al1\", \"-module(al1). v() -> 1.\"),
-       code:load_binary(al2, \"al2\", \"-module(al2). v() -> 1.\"),
-       length(code:all_loaded())")
-  2)
-
-(er-eval-test "code:all_loaded first entry tag"
-  (nm (ev "code:load_binary(al3, \"al3\", \"-module(al3). v() -> 1.\"),
-           element(2, hd(code:all_loaded()))"))
-  "loaded")
-
-(er-eval-test "code:which badarg"
-  (nm (ev "try code:which(\"str\") catch error:badarg -> ok end")) "ok")
-(er-eval-test "code:is_loaded badarg"
-  (nm (ev "try code:is_loaded(123) catch error:badarg -> ok end")) "ok")
-
-
-;; ── Phase 7: hot-reload call dispatch semantics ──────────────────
-;; Cross-module M:F() calls always hit the CURRENT version;
-;; local F() calls inside a module body resolve through the env
-;; the function closed over (i.e. the version it was loaded with).
-
-(er-modules-reset!)
-
-;; M:F always hits current
-(er-eval-test "cross-mod after reload v2"
-  (ev "code:load_binary(hr1, \"hr1\", \"-module(hr1). f() -> 1.\"),
-       code:load_binary(hr1, \"hr1\", \"-module(hr1). f() -> 2.\"),
-       hr1:f()")
-  2)
-
-;; Local call inside reloaded module body resolves via fresh mod-env
-;; (a() does a local b(); b() got upgraded too)
-(er-eval-test "local call inside reloaded module body"
-  (ev "code:load_binary(hr2, \"hr2\", \"-module(hr2). a() -> b(). b() -> 1.\"),
-       code:load_binary(hr2, \"hr2\", \"-module(hr2). a() -> b(). b() -> 99.\"),
-       hr2:a()")
-  99)
-
-;; Fun captured BEFORE reload, with local-call body, keeps v1 semantics
-(er-eval-test "captured fun keeps closed-over env (local call)"
-  (ev "code:load_binary(hr3, \"hr3\", \"-module(hr3). get_fn() -> fun () -> b() end. b() -> 1.\"),
-       Fn = hr3:get_fn(),
-       code:load_binary(hr3, \"hr3\", \"-module(hr3). get_fn() -> fun () -> b() end. b() -> 99.\"),
-       Fn()")
-  1)
-
-;; Fun captured BEFORE reload, with CROSS-mod body, sees v2's current
-(er-eval-test "captured fun follows cross-mod to current"
-  (ev "code:load_binary(hr4, \"hr4\", \"-module(hr4). get_xref() -> fun () -> hr4:b() end. b() -> 1.\"),
-       Fn = hr4:get_xref(),
-       code:load_binary(hr4, \"hr4\", \"-module(hr4). get_xref() -> fun () -> hr4:b() end. b() -> 99.\"),
-       Fn()")
-  99)
-
-;; Two captured funs from two different vintages
-(er-eval-test "two funs from two vintages stay independent"
-  (ev "code:load_binary(hr5, \"hr5\", \"-module(hr5). gf() -> fun () -> v() end. v() -> 10.\"),
-       F1 = hr5:gf(),
-       code:load_binary(hr5, \"hr5\", \"-module(hr5). gf() -> fun () -> v() end. v() -> 20.\"),
-       F2 = hr5:gf(),
-       F1() + F2()")
-  30)
-
-;; Version slot bumps correctly when a captured fun stays alive
-(er-eval-test "version bumps despite captured funs"
-  (ev "code:load_binary(hr6, \"hr6\", \"-module(hr6). gf() -> fun () -> v() end. v() -> 1.\"),
-       _Pinned = hr6:gf(),
-       code:load_binary(hr6, \"hr6\", \"-module(hr6). gf() -> fun () -> v() end. v() -> 2.\"),
-       code:load_binary(hr6, \"hr6\", \"-module(hr6). gf() -> fun () -> v() end. v() -> 3.\"),
-       hr6:v()")
-  3)
-
-
-
-;; ── Phase 7 capstone: full hot-reload ladder ───────────────────
-;; Load v1 → spawn from inside module → load v2 → cross-mod hits v2 →
-;; local call inside v1 process still resolves v1 → soft_purge refuses
-;; while v1 procs alive → purge kills them.
-;;
-;; All stages must run in a single erlang-eval-ast call: each call resets
-;; the scheduler (er-sched-init!) so cross-call Pid handles would point at
-;; reaped processes.
-(er-modules-reset!)
-
-(define er-rt-cap-prog "code:load_binary(cap, \"cap.erl\", \"-module(cap). start() -> spawn(fun () -> loop() end). loop() -> receive {ping, From} -> From ! {pong, v1}, loop(); stop -> done end. tag() -> v1.\"), Tag1 = cap:tag(), Pid1 = cap:start(), code:load_binary(cap, \"cap.erl\", \"-module(cap). start() -> spawn(fun () -> loop() end). loop() -> receive {ping, From} -> From ! {pong, v2}, loop(); stop -> done end. tag() -> v2.\"), Tag2 = cap:tag(), _Pid2 = cap:start(), Soft1 = code:soft_purge(cap), Hard = code:purge(cap), Soft2 = code:soft_purge(cap), {Tag1, Tag2, Soft1, Hard, Soft2}")
-
-(define er-rt-cap-result (ev er-rt-cap-prog))
-
-(er-eval-test "capstone v1 tag direct"
-  (get (nth (get er-rt-cap-result :elements) 0) :name) "v1")
-
-(er-eval-test "capstone v2 tag"
-  (get (nth (get er-rt-cap-result :elements) 1) :name) "v2")
-
-(er-eval-test "capstone soft_purge while v1 alive = false"
-  (get (nth (get er-rt-cap-result :elements) 2) :name) "false")
-
-(er-eval-test "capstone hard purge = true"
-  (get (nth (get er-rt-cap-result :elements) 3) :name) "true")
-
-(er-eval-test "capstone soft_purge clean after hard = true"
-  (get (nth (get er-rt-cap-result :elements) 4) :name) "true")
-
-
-
-;; ── $X char literals (Step 3b substrate fix 2026-06-04) ──────────
-(er-eval-test "char $A" (ev "$A") 65)
-(er-eval-test "char $a" (ev "$a") 97)
-(er-eval-test "char $0 is digit, not escape-NUL" (ev "$0") 48)
-(er-eval-test "char $\\n is newline (10)" (ev "$\\n") 10)
-(er-eval-test "char $\\t is tab (9)" (ev "$\\t") 9)
-(er-eval-test "char $\\r is CR (13)" (ev "$\\r") 13)
-(er-eval-test "char $\\s is space (32)" (ev "$\\s") 32)
-(er-eval-test "char $\\0 is NUL (0)" (ev "$\\0") 0)
-(er-eval-test "char $\\\\ is backslash (92)" (ev "$\\\\") 92)
-(er-eval-test "[$h,$i] head is 104" (ev "hd([$h, $i])") 104)
-(er-eval-test "list_to_binary char-list -> bytes"
-  (ev "byte_size(list_to_binary([$f, $e, $d]))") 3)
-(er-eval-test "list_to_binary char-list round-trip"
-  (nm (ev "list_to_binary([$h, $i]) =:= <<104, 105>>")) "true")
-
-
-;; ── atom_to_list / integer_to_list charlist semantics (Step 3b substrate fix #3) ──
-(er-eval-test "atom_to_list hd is char code"
-  (ev "hd(atom_to_list(hi))") 104)
-(er-eval-test "atom_to_list maps to bytes via list_to_binary"
-  (ev "byte_size(list_to_binary(atom_to_list(hello)))") 5)
-(er-eval-test "atom_to_list -> list_to_binary -> bytes content"
-  (nm (ev "list_to_binary(atom_to_list(ok)) =:= <<111, 107>>")) "true")
-(er-eval-test "integer_to_list 12345 -> 5 chars"
-  (ev "length(integer_to_list(12345))") 5)
-(er-eval-test "integer_to_list -> bytes -> back"
-  (ev "list_to_integer(integer_to_list(99999))") 99999)
-(er-eval-test "list_to_atom from charlist"
-  (nm (ev "list_to_atom([$f, $o, $o])")) "foo")
-(er-eval-test "list_to_atom from SX-string back-compat"
-  (nm (ev "list_to_atom(\"bar\")")) "bar")
-(er-eval-test "list_to_integer from charlist"
-  (ev "list_to_integer([$1, $0, $0])") 100)
-
 (define
   er-eval-test-summary
   (str "eval " er-eval-test-pass "/" er-eval-test-count))

lib/erlang/tests/ffi.sx

@@ -1,223 +0,0 @@
-;; Phase 8 FFI BIF tests — one round-trip per BIF.
-;; Each BIF lives in lib/erlang/runtime.sx (registered with
-;; er-bif-registry) and wraps an SX-host primitive.
-
-(define er-ffi-test-count 0)
-(define er-ffi-test-pass 0)
-(define er-ffi-test-fails (list))
-
-(define
-  er-ffi-test
-  (fn
-    (name actual expected)
-    (set! er-ffi-test-count (+ er-ffi-test-count 1))
-    (if
-      (= actual expected)
-      (set! er-ffi-test-pass (+ er-ffi-test-pass 1))
-      (append! er-ffi-test-fails {:name name :expected expected :actual actual}))))
-
-(define ffi-ev erlang-eval-ast)
-(define ffi-nm (fn (v) (get v :name)))
-
-;; ── file:read_file/1 + file:write_file/2 ────────────────────────
-(er-ffi-test
-  "file:write_file ok"
-  (ffi-nm (ffi-ev "file:write_file(\"/tmp/er-ffi-1.txt\", \"hello\")"))
-  "ok")
-
-(er-ffi-test
-  "file:read_file ok tag"
-  (ffi-nm (ffi-ev "element(1, file:read_file(\"/tmp/er-ffi-1.txt\"))"))
-  "ok")
-
-(er-ffi-test
-  "file:read_file payload is binary"
-  (ffi-nm
-    (ffi-ev
-      "case file:read_file(\"/tmp/er-ffi-1.txt\") of {ok, B} -> is_binary(B) end"))
-  "true")
-
-(er-ffi-test
-  "file:read_file content byte_size"
-  (ffi-ev
-    "case file:read_file(\"/tmp/er-ffi-1.txt\") of {ok, B} -> byte_size(B) end")
-  5)
-
-(er-ffi-test
-  "file:read_file missing enoent"
-  (ffi-nm (ffi-ev "element(2, file:read_file(\"/tmp/er-ffi-no-such-xyz\"))"))
-  "enoent")
-
-(er-ffi-test
-  "file:write_file bad path enoent"
-  (ffi-nm
-    (ffi-ev "element(2, file:write_file(\"/tmp/er-ffi-no-dir-xyz/x\", \"y\"))"))
-  "enoent")
-
-(er-ffi-test
-  "file:write_file binary payload"
-  (ffi-ev
-    "file:write_file(\"/tmp/er-ffi-2.bin\", <<1, 2, 3, 4, 5>>), case file:read_file(\"/tmp/er-ffi-2.bin\") of {ok, B} -> byte_size(B) end")
-  5)
-
-;; ── file:delete/1 ────────────────────────────────────────────────
-(er-ffi-test
-  "file:delete ok"
-  (ffi-nm
-    (ffi-ev
-      "file:write_file(\"/tmp/er-ffi-del.txt\", \"x\"), file:delete(\"/tmp/er-ffi-del.txt\")"))
-  "ok")
-
-(er-ffi-test
-  "file:read_file after delete enoent"
-  (ffi-nm
-    (ffi-ev
-      "file:write_file(\"/tmp/er-ffi-del2.txt\", \"x\"), file:delete(\"/tmp/er-ffi-del2.txt\"), element(2, file:read_file(\"/tmp/er-ffi-del2.txt\"))"))
-  "enoent")
-
-(er-ffi-test
-  "crypto:hash sha256 -> 32-byte binary"
-  (ffi-ev "byte_size(crypto:hash(sha256, <<97,98,99>>))")
-  32)
-
-(er-ffi-test
-  "crypto:hash sha512 -> 64-byte binary"
-  (ffi-ev "byte_size(crypto:hash(sha512, <<97,98,99>>))")
-  64)
-
-(er-ffi-test
-  "crypto:hash sha3_256 is_binary"
-  (ffi-nm (ffi-ev "is_binary(crypto:hash(sha3_256, <<120>>))"))
-  "true")
-
-(er-ffi-test
-  "crypto:hash deterministic"
-  (ffi-nm (ffi-ev "crypto:hash(sha256, <<97>>) =:= crypto:hash(sha256, <<97>>)"))
-  "true")
-
-(er-ffi-test
-  "crypto:hash distinct inputs distinct digests"
-  (ffi-nm (ffi-ev "crypto:hash(sha256, <<97>>) =/= crypto:hash(sha256, <<98>>)"))
-  "true")
-
-(er-ffi-test
-  "crypto:hash bad type -> error:badarg"
-  (ffi-nm (ffi-ev "try crypto:hash(md5, <<120>>) catch error:badarg -> ok end"))
-  "ok")
-
-(er-ffi-test
-  "cid:from_bytes is_binary"
-  (ffi-nm (ffi-ev "is_binary(cid:from_bytes(<<97,98,99>>))"))
-  "true")
-
-(er-ffi-test
-  "cid:from_bytes deterministic"
-  (ffi-nm (ffi-ev "cid:from_bytes(<<97,98,99>>) =:= cid:from_bytes(<<97,98,99>>)"))
-  "true")
-
-(er-ffi-test
-  "cid:from_bytes distinct inputs distinct CIDs"
-  (ffi-nm (ffi-ev "cid:from_bytes(<<97,98,99>>) =/= cid:from_bytes(<<97,98,100>>)"))
-  "true")
-
-(er-ffi-test
-  "cid:from_bytes non-binary -> error:badarg"
-  (ffi-nm (ffi-ev "try cid:from_bytes(42) catch error:badarg -> ok end"))
-  "ok")
-
-(er-ffi-test
-  "cid:to_string is_binary"
-  (ffi-nm (ffi-ev "is_binary(cid:to_string({ok, 42}))"))
-  "true")
-
-(er-ffi-test
-  "cid:to_string deterministic"
-  (ffi-nm (ffi-ev "cid:to_string(foo) =:= cid:to_string(foo)"))
-  "true")
-
-(er-ffi-test
-  "cid:to_string distinct terms distinct CIDs"
-  (ffi-nm (ffi-ev "cid:to_string(foo) =/= cid:to_string(bar)"))
-  "true")
-
-(er-ffi-test
-  "file:list_dir ok tag"
-  (ffi-nm (ffi-ev "element(1, file:list_dir(\"lib/erlang\"))"))
-  "ok")
-
-(er-ffi-test
-  "file:list_dir non-empty"
-  (ffi-nm (ffi-ev "case file:list_dir(\"lib/erlang\") of {ok, L} -> length(L) > 3 end"))
-  "true")
-
-(er-ffi-test
-  "file:list_dir entries are binaries"
-  (ffi-nm (ffi-ev "case file:list_dir(\"lib/erlang\") of {ok, L} -> is_binary(hd(L)) end"))
-  "true")
-
-(er-ffi-test
-  "file:list_dir missing enoent"
-  (ffi-nm (ffi-ev "element(2, file:list_dir(\"/no/such/dir/xyz\"))"))
-  "enoent")
-
-(er-ffi-test
-  "binary_to_list <<1,2,3>> length"
-  (ffi-ev "length(binary_to_list(<<1,2,3,4,5>>))")
-  5)
-
-(er-ffi-test
-  "binary_to_list hd byte"
-  (ffi-ev "hd(binary_to_list(<<7,8,9>>))")
-  7)
-
-(er-ffi-test
-  "binary_to_list empty -> []"
-  (ffi-nm (ffi-ev "case binary_to_list(<<>>) of [] -> empty end"))
-  "empty")
-
-(er-ffi-test
-  "list_to_binary flat list bytes"
-  (ffi-ev "byte_size(list_to_binary([1,2,3]))")
-  3)
-
-(er-ffi-test
-  "list_to_binary nested iolist"
-  (ffi-ev "byte_size(list_to_binary([1, <<2,3>>, [4, [5]]]))")
-  5)
-
-(er-ffi-test
-  "list_to_binary round-trip via binary_to_list"
-  (ffi-nm (ffi-ev "list_to_binary(binary_to_list(<<10,20,30>>)) =:= <<10,20,30>>"))
-  "true")
-
-(er-ffi-test
-  "binary_to_list non-binary -> error:badarg"
-  (ffi-nm (ffi-ev "try binary_to_list(42) catch error:badarg -> ok end"))
-  "ok")
-
-(er-ffi-test
-  "list_to_binary out-of-range byte -> error:badarg"
-  (ffi-nm (ffi-ev "try list_to_binary([300]) catch error:badarg -> ok end"))
-  "ok")
-
-(er-ffi-test
-  "list_to_binary non-iolist -> error:badarg"
-  (ffi-nm (ffi-ev "try list_to_binary(42) catch error:badarg -> ok end"))
-  "ok")
-
-;; ── Still deferred (no host primitive): httpc (HTTP client, v2),
-;; sqlite-* (v2 indexes). Assert NOT registered so a future iteration
-;; that wires them without updating this suite fails fast.
-(er-ffi-test
-  "httpc:request unregistered"
-  (er-lookup-bif "httpc" "request" 4)
-  nil)
-
-(er-ffi-test
-  "sqlite:exec unregistered"
-  (er-lookup-bif "sqlite" "exec" 2)
-  nil)
-
-(define
-  er-ffi-test-summary
-  (str "ffi " er-ffi-test-pass "/" er-ffi-test-count))

lib/erlang/tests/runtime.sx

@@ -134,144 +134,6 @@
   (er-sched-current-pid)
   nil)
 
-
-
-;; ── Phase 7: module-version slots ───────────────────────────────
-(er-modules-reset!)
-
-(define er-rt-slot1 (er-mk-module-slot (er-env-new) nil 1))
-(er-rt-test "slot tag"     (get er-rt-slot1 :tag)              "module")
-(er-rt-test "slot version" (er-module-version er-rt-slot1)     1)
-(er-rt-test "slot old nil" (er-module-old-env er-rt-slot1)     nil)
-(er-rt-test "slot current not nil" (= (er-module-current-env er-rt-slot1) nil) false)
-
-(erlang-load-module "-module(hr1). a() -> 1.")
-(define er-rt-reg (er-modules-get))
-(er-rt-test "registry has hr1"     (dict-has? er-rt-reg "hr1")                       true)
-(er-rt-test "v1 on first load"     (er-module-version (get er-rt-reg "hr1"))         1)
-(er-rt-test "v1 old is nil"        (er-module-old-env (get er-rt-reg "hr1"))         nil)
-(er-rt-test "v1 current not nil"   (= (er-module-current-env (get er-rt-reg "hr1")) nil) false)
-
-(define er-rt-env-v1 (er-module-current-env (get er-rt-reg "hr1")))
-(erlang-load-module "-module(hr1). a() -> 2.")
-(er-rt-test "v2 on second load"    (er-module-version (get er-rt-reg "hr1"))         2)
-(er-rt-test "v2 old is v1 env"     (er-module-old-env (get er-rt-reg "hr1"))         er-rt-env-v1)
-(er-rt-test "v2 current is new"    (= (er-module-current-env (get er-rt-reg "hr1")) er-rt-env-v1) false)
-
-(erlang-load-module "-module(hr1). a() -> 3.")
-(er-rt-test "v3 on third load"     (er-module-version (get er-rt-reg "hr1"))         3)
-
-(er-modules-reset!)
-(er-rt-test "registry-reset clears" (dict-has? (er-modules-get) "hr1")              false)
-
-
-
-
-;; ── Phase 8: FFI BIF registry ──────────────────────────────────
-(er-bif-registry-reset!)
-
-(er-rt-test "empty registry" (len (er-list-bifs)) 0)
-(er-rt-test "lookup miss" (er-lookup-bif "crypto" "hash" 2) nil)
-
-(er-register-bif! "fake" "echo" 1 (fn (vs) (nth vs 0)))
-(er-rt-test "register grows registry" (len (er-list-bifs)) 1)
-
-(define er-rt-bif-hit (er-lookup-bif "fake" "echo" 1))
-(er-rt-test "lookup hit module" (get er-rt-bif-hit :module) "fake")
-(er-rt-test "lookup hit name"   (get er-rt-bif-hit :name)   "echo")
-(er-rt-test "lookup hit arity"  (get er-rt-bif-hit :arity)  1)
-(er-rt-test "lookup hit pure?"  (get er-rt-bif-hit :pure?)  false)
-
-(er-rt-test "fn invocable" ((get er-rt-bif-hit :fn) (list 42)) 42)
-
-;; Re-register replaces (same key)
-(er-register-bif! "fake" "echo" 1 (fn (vs) "replaced"))
-(er-rt-test "re-register same key, count unchanged" (len (er-list-bifs)) 1)
-(er-rt-test "re-register replaces fn"
-  ((get (er-lookup-bif "fake" "echo" 1) :fn) (list 99)) "replaced")
-
-;; Pure variant
-(er-register-pure-bif! "fake" "pure" 2 (fn (vs) (+ (nth vs 0) (nth vs 1))))
-(er-rt-test "pure registered separately, count 2" (len (er-list-bifs)) 2)
-(er-rt-test "pure flag true"
-  (get (er-lookup-bif "fake" "pure" 2) :pure?) true)
-(er-rt-test "pure fn invocable"
-  ((get (er-lookup-bif "fake" "pure" 2) :fn) (list 7 8)) 15)
-
-;; Arity disambiguation: same module+name, different arity = distinct entries
-(er-register-bif! "fake" "echo" 2 (fn (vs) (list (nth vs 0) (nth vs 1))))
-(er-rt-test "arity disambiguation count" (len (er-list-bifs)) 3)
-(er-rt-test "arity-1 lookup still works"
-  ((get (er-lookup-bif "fake" "echo" 1) :fn) (list 11)) "replaced")
-(er-rt-test "arity-2 lookup independent"
-  (len ((get (er-lookup-bif "fake" "echo" 2) :fn) (list 1 2))) 2)
-
-;; Reset clears the registry
-(er-bif-registry-reset!)
-(er-rt-test "reset clears" (len (er-list-bifs)) 0)
-(er-rt-test "reset lookup nil" (er-lookup-bif "fake" "echo" 1) nil)
-
-
-
-;; ── Phase 8: term marshalling (er-to-sx / er-of-sx) ─────────────
-
-;; er-to-sx: Erlang → SX
-(er-rt-test "to-sx atom"      (er-to-sx (er-mk-atom "foo"))         (make-symbol "foo"))
-(er-rt-test "to-sx atom is symbol" (type-of (er-to-sx (er-mk-atom "x"))) "symbol")
-(er-rt-test "to-sx nil"       (er-to-sx (er-mk-nil))                (list))
-(er-rt-test "to-sx integer passthrough" (er-to-sx 42)               42)
-(er-rt-test "to-sx float passthrough"   (er-to-sx 3.14)             3.14)
-(er-rt-test "to-sx boolean passthrough" (er-to-sx true)             true)
-(er-rt-test "to-sx binary → string"
-  (er-to-sx (er-mk-binary (list 104 105 33))) "hi!")
-(er-rt-test "to-sx cons → list"
-  (er-to-sx (er-mk-cons 1 (er-mk-cons 2 (er-mk-cons 3 (er-mk-nil))))) (list 1 2 3))
-(er-rt-test "to-sx tuple → list"
-  (er-to-sx (er-mk-tuple (list 1 2 3))) (list 1 2 3))
-(er-rt-test "to-sx nested cons"
-  (er-to-sx (er-mk-cons (er-mk-atom "a") (er-mk-cons 7 (er-mk-nil))))
-  (list (make-symbol "a") 7))
-
-;; er-of-sx: SX → Erlang
-(er-rt-test "of-sx symbol"
-  (get (er-of-sx (make-symbol "ok")) :name) "ok")
-(er-rt-test "of-sx symbol is atom"
-  (er-atom? (er-of-sx (make-symbol "x"))) true)
-(er-rt-test "of-sx string is binary"
-  (er-binary? (er-of-sx "hi")) true)
-(er-rt-test "of-sx string bytes"
-  (get (er-of-sx "hi") :bytes) (list 104 105))
-(er-rt-test "of-sx integer passthrough"
-  (er-of-sx 42) 42)
-(er-rt-test "of-sx empty list → nil"
-  (er-nil? (er-of-sx (list))) true)
-(er-rt-test "of-sx list → cons chain length"
-  (er-list-length (er-of-sx (list 1 2 3 4))) 4)
-(er-rt-test "of-sx list head/tail"
-  (get (er-of-sx (list 10 20)) :head) 10)
-
-;; Round-trips
-(er-rt-test "rtrip integer" (er-to-sx (er-of-sx 99)) 99)
-(er-rt-test "rtrip atom"
-  (get (er-of-sx (er-to-sx (er-mk-atom "abc"))) :name) "abc")
-(er-rt-test "rtrip binary bytes"
-  (get (er-of-sx (er-to-sx (er-mk-binary (list 1 2 3)))) :bytes) (list 1 2 3))
-(er-rt-test "rtrip cons-of-ints length"
-  (er-list-length (er-of-sx (er-to-sx
-    (er-mk-cons 1 (er-mk-cons 2 (er-mk-cons 3 (er-mk-nil))))))) 3)
-
-;; Tuples don't round-trip exactly (er-to-sx flattens tuples to lists);
-;; documented one-way conversion.
-(er-rt-test "to-sx of tuple loses tag"
-  (er-cons? (er-of-sx (er-to-sx (er-mk-tuple (list 1 2 3))))) true)
-
-
-;; Re-populate built-in BIFs so subsequent test files (ring, ping-pong, etc.)
-;; can call length/spawn/etc. The migration onto the registry means a reset
-;; here would otherwise break the rest of the conformance suite.
-(er-register-builtin-bifs!)
-
-
 (define
   er-rt-test-summary
   (str "runtime " er-rt-test-pass "/" er-rt-test-count))

lib/erlang/tests/vm.sx

@@ -1,403 +0,0 @@
-;; Phase 9 — stub VM opcode dispatcher tests.
-;; Verifies the dispatcher shape (mirrors plans/sx-vm-opcode-extension.md
-;; for when 9a integrates) and the three pattern-match opcodes (9b)
-;; route to the correct er-match-* impl.
-
-(define er-vm-test-count 0)
-(define er-vm-test-pass 0)
-(define er-vm-test-fails (list))
-
-(define
-  er-vm-test
-  (fn
-    (name actual expected)
-    (set! er-vm-test-count (+ er-vm-test-count 1))
-    (if
-      (= actual expected)
-      (set! er-vm-test-pass (+ er-vm-test-pass 1))
-      (append! er-vm-test-fails {:name name :expected expected :actual actual}))))
-
-;; ── dispatcher core ─────────────────────────────────────────────
-(er-vm-test
-  "tuple opcode registered"
-  (= (er-vm-lookup-opcode-by-id 128) nil)
-  false)
-
-(er-vm-test
-  "tuple opcode name"
-  (get (er-vm-lookup-opcode-by-id 128) :name)
-  "OP_PATTERN_TUPLE")
-
-(er-vm-test
-  "list opcode by name"
-  (get (er-vm-lookup-opcode-by-name "OP_PATTERN_LIST") :id)
-  129)
-
-(er-vm-test
-  "binary opcode by name"
-  (get (er-vm-lookup-opcode-by-name "OP_PATTERN_BINARY") :id)
-  130)
-
-(er-vm-test "lookup miss by id" (er-vm-lookup-opcode-by-id 999) nil)
-
-(er-vm-test "lookup miss by name" (er-vm-lookup-opcode-by-name "OP_NOPE") nil)
-
-(er-vm-test
-  "opcode list has 3+"
-  (>= (len (er-vm-list-opcodes)) 3)
-  true)
-
-;; ── OP_PATTERN_TUPLE ────────────────────────────────────────────
-;; Pattern: {ok, X} matches value {ok, 42} → X bound to 42
-(define er-vm-t1-env (er-env-new))
-(define er-vm-t1-pat {:type "tuple" :elements (list {:type "atom" :value "ok"} {:name "X" :type "var"})})
-(define er-vm-t1-val (er-mk-tuple (list (er-mk-atom "ok") 42)))
-(er-vm-test
-  "OP_PATTERN_TUPLE match"
-  (er-vm-dispatch 128 (list er-vm-t1-pat er-vm-t1-val er-vm-t1-env))
-  true)
-(er-vm-test "OP_PATTERN_TUPLE binds var" (get er-vm-t1-env "X") 42)
-
-;; Same pattern against {error, ...} → false
-(define er-vm-t2-env (er-env-new))
-(define er-vm-t2-val (er-mk-tuple (list (er-mk-atom "error") 7)))
-(er-vm-test
-  "OP_PATTERN_TUPLE no-match"
-  (er-vm-dispatch 128 (list er-vm-t1-pat er-vm-t2-val er-vm-t2-env))
-  false)
-
-;; Wrong arity tuple — pattern has 2 elements, value has 3
-(define er-vm-t3-env (er-env-new))
-(define
-  er-vm-t3-val
-  (er-mk-tuple (list (er-mk-atom "ok") 1 2)))
-(er-vm-test
-  "OP_PATTERN_TUPLE arity mismatch"
-  (er-vm-dispatch 128 (list er-vm-t1-pat er-vm-t3-val er-vm-t3-env))
-  false)
-
-;; ── OP_PATTERN_LIST (cons) ──────────────────────────────────────
-;; Pattern: [H | T] matches [1, 2, 3] → H=1, T=[2,3]
-(define er-vm-l1-env (er-env-new))
-(define er-vm-l1-pat {:type "cons" :tail {:name "T" :type "var"} :head {:name "H" :type "var"}})
-(define
-  er-vm-l1-val
-  (er-mk-cons
-    1
-    (er-mk-cons 2 (er-mk-cons 3 (er-mk-nil)))))
-(er-vm-test
-  "OP_PATTERN_LIST match"
-  (er-vm-dispatch 129 (list er-vm-l1-pat er-vm-l1-val er-vm-l1-env))
-  true)
-(er-vm-test "OP_PATTERN_LIST binds head" (get er-vm-l1-env "H") 1)
-(er-vm-test
-  "OP_PATTERN_LIST tail is cons"
-  (er-cons? (get er-vm-l1-env "T"))
-  true)
-
-;; [H|T] against empty list → false
-(define er-vm-l2-env (er-env-new))
-(er-vm-test
-  "OP_PATTERN_LIST no-match on nil"
-  (er-vm-dispatch 129 (list er-vm-l1-pat (er-mk-nil) er-vm-l2-env))
-  false)
-
-;; ── OP_PATTERN_BINARY ───────────────────────────────────────────
-;; Pattern <<A:8>> against <<42>> → A bound to 42
-(define er-vm-b1-env (er-env-new))
-(define er-vm-b1-pat {:type "binary" :segments (list {:value {:name "A" :type "var"} :size {:type "integer" :value "8"} :spec "integer"})})
-(define er-vm-b1-val (er-mk-binary (list 42)))
-(er-vm-test
-  "OP_PATTERN_BINARY match"
-  (er-vm-dispatch 130 (list er-vm-b1-pat er-vm-b1-val er-vm-b1-env))
-  true)
-(er-vm-test
-  "OP_PATTERN_BINARY binds segment"
-  (get er-vm-b1-env "A")
-  42)
-
-;; Same pattern against wrong-size binary (2 bytes) → false
-(define er-vm-b2-env (er-env-new))
-(define er-vm-b2-val (er-mk-binary (list 42 99)))
-(er-vm-test
-  "OP_PATTERN_BINARY size mismatch"
-  (er-vm-dispatch 130 (list er-vm-b1-pat er-vm-b2-val er-vm-b2-env))
-  false)
-
-;; ── dispatch error path ────────────────────────────────────────
-(define er-vm-err-caught (list nil))
-(guard
-  (c (:else (set-nth! er-vm-err-caught 0 (str c))))
-  (er-vm-dispatch 999 (list)))
-(er-vm-test
-  "unknown opcode raises"
-  (string-contains? (str (nth er-vm-err-caught 0)) "unknown opcode")
-  true)
-
-
-;; ── Phase 9c — OP_PERFORM / OP_HANDLE ───────────────────────────
-(er-vm-test "perform opcode by id"
-  (get (er-vm-lookup-opcode-by-id 131) :name) "OP_PERFORM")
-(er-vm-test "handle opcode by id"
-  (get (er-vm-lookup-opcode-by-id 132) :name) "OP_HANDLE")
-
-(define er-vm-pf-caught (list nil))
-(guard (c (:else (set-nth! er-vm-pf-caught 0 c)))
-  (er-vm-dispatch 131 (list "yield" (list 42))))
-(er-vm-test "perform raises tagged"
-  (get (nth er-vm-pf-caught 0) :tag) "vm-effect")
-(er-vm-test "perform effect name"
-  (get (nth er-vm-pf-caught 0) :effect) "yield")
-(er-vm-test "perform args carried"
-  (nth (get (nth er-vm-pf-caught 0) :args) 0) 42)
-
-(er-vm-test "handle catches matching effect"
-  (er-vm-dispatch 132
-    (list
-      (fn () (er-vm-dispatch 131 (list "yield" (list 7))))
-      "yield"
-      (fn (args) (+ (nth args 0) 100))))
-  107)
-
-(er-vm-test "handle no-effect returns thunk result"
-  (er-vm-dispatch 132
-    (list
-      (fn () 99)
-      "yield"
-      (fn (args) "handler ran")))
-  99)
-
-(define er-vm-rt-caught (list nil))
-(guard (c (:else (set-nth! er-vm-rt-caught 0 c)))
-  (er-vm-dispatch 132
-    (list
-      (fn () (er-vm-dispatch 131 (list "other" (list))))
-      "yield"
-      (fn (args) "wrong"))))
-(er-vm-test "handle rethrows non-matching"
-  (get (nth er-vm-rt-caught 0) :effect) "other")
-
-(er-vm-test "nested handles separate effect names"
-  (er-vm-dispatch 132
-    (list
-      (fn ()
-        (er-vm-dispatch 132
-          (list
-            (fn () (er-vm-dispatch 131 (list "b" (list 5))))
-            "a"
-            (fn (args) "inner-handled"))))
-      "b"
-      (fn (args) (+ (nth args 0) 1000))))
-  1005)
-
-
-;; ── Phase 9d — OP_RECEIVE_SCAN ──────────────────────────────────
-(er-vm-test "receive-scan opcode by id"
-  (get (er-vm-lookup-opcode-by-id 133) :name) "OP_RECEIVE_SCAN")
-
-;; Pattern: receive {ok, X} -> X end  against mailbox [{error, 1}, {ok, 42}, foo]
-(define er-vm-r1-env (er-env-new))
-(define er-vm-r1-clauses
-  (list
-    {:pattern {:type "tuple"
-               :elements (list
-                 {:type "atom" :value "ok"}
-                 {:type "var" :name "X"})}
-     :guards (list)
-     :body (list {:type "var" :name "X"})}))
-(define er-vm-r1-mbox
-  (list
-    (er-mk-tuple (list (er-mk-atom "error") 1))
-    (er-mk-tuple (list (er-mk-atom "ok") 42))
-    (er-mk-atom "foo")))
-
-(define er-vm-r1-result
-  (er-vm-dispatch 133 (list er-vm-r1-clauses er-vm-r1-mbox er-vm-r1-env)))
-(er-vm-test "scan finds match"
-  (get er-vm-r1-result :matched) true)
-(er-vm-test "scan reports correct index"
-  (get er-vm-r1-result :index) 1)
-(er-vm-test "scan binds var"
-  (get er-vm-r1-env "X") 42)
-(er-vm-test "scan leaves body unevaluated"
-  (= (get er-vm-r1-result :body) nil) false)
-
-;; No match case
-(define er-vm-r2-env (er-env-new))
-(define er-vm-r2-mbox (list (er-mk-atom "nope") 99))
-(define er-vm-r2-result
-  (er-vm-dispatch 133 (list er-vm-r1-clauses er-vm-r2-mbox er-vm-r2-env)))
-(er-vm-test "scan no-match"
-  (get er-vm-r2-result :matched) false)
-(er-vm-test "scan no-match leaves env clean"
-  (dict-has? er-vm-r2-env "X") false)
-
-;; Empty mailbox
-(define er-vm-r3-result
-  (er-vm-dispatch 133 (list er-vm-r1-clauses (list) (er-env-new))))
-(er-vm-test "scan empty mailbox"
-  (get er-vm-r3-result :matched) false)
-
-;; First-match wins (arrival order)
-(define er-vm-r4-env (er-env-new))
-(define er-vm-r4-mbox
-  (list
-    (er-mk-tuple (list (er-mk-atom "ok") 1))
-    (er-mk-tuple (list (er-mk-atom "ok") 2))))
-(define er-vm-r4-result
-  (er-vm-dispatch 133 (list er-vm-r1-clauses er-vm-r4-mbox er-vm-r4-env)))
-(er-vm-test "scan first-match wins (index 0)"
-  (get er-vm-r4-result :index) 0)
-(er-vm-test "scan binds first match's var"
-  (get er-vm-r4-env "X") 1)
-
-
-;; ── Phase 9e — OP_SPAWN / OP_SEND ───────────────────────────────
-(er-vm-procs-reset!)
-
-(er-vm-test "spawn opcode by id"
-  (get (er-vm-lookup-opcode-by-id 134) :name) "OP_SPAWN")
-(er-vm-test "send opcode by id"
-  (get (er-vm-lookup-opcode-by-id 135) :name) "OP_SEND")
-
-(define er-vm-fn (fn () "body"))
-(define er-vm-p1 (er-vm-dispatch 134 (list er-vm-fn (list))))
-(define er-vm-p2 (er-vm-dispatch 134 (list er-vm-fn (list "arg"))))
-(er-vm-test "spawn returns pid 0 first"
-  er-vm-p1 0)
-(er-vm-test "spawn returns pid 1 second"
-  er-vm-p2 1)
-(er-vm-test "proc count is 2"
-  (er-vm-proc-count) 2)
-(er-vm-test "spawned proc state runnable"
-  (er-vm-proc-state er-vm-p1) "runnable")
-(er-vm-test "spawned proc mailbox empty"
-  (len (er-vm-proc-mailbox er-vm-p1)) 0)
-(er-vm-test "spawned proc has 8 registers"
-  (len (get (er-vm-proc-get er-vm-p1) :registers)) 8)
-
-;; OP_SEND appends to target's mailbox, preserves arrival order.
-(er-vm-test "send returns true on valid pid"
-  (er-vm-dispatch 135 (list er-vm-p1 "msg1")) true)
-(er-vm-dispatch 135 (list er-vm-p1 "msg2")
-)
-(er-vm-dispatch 135 (list er-vm-p1 "msg3"))
-(er-vm-test "mailbox length after 3 sends"
-  (len (er-vm-proc-mailbox er-vm-p1)) 3)
-(er-vm-test "mailbox preserves order — first"
-  (nth (er-vm-proc-mailbox er-vm-p1) 0) "msg1")
-(er-vm-test "mailbox preserves order — last"
-  (nth (er-vm-proc-mailbox er-vm-p1) 2) "msg3")
-
-;; send to nonexistent pid returns false (doesn't crash)
-(er-vm-test "send to unknown pid is false"
-  (er-vm-dispatch 135 (list 99999 "x")) false)
-
-;; Isolation: msgs to p1 don't appear in p2's mailbox
-(er-vm-test "isolation — p2 mailbox empty"
-  (len (er-vm-proc-mailbox er-vm-p2)) 0)
-
-;; reset clears
-(er-vm-procs-reset!)
-(er-vm-test "reset clears procs"
-  (er-vm-proc-count) 0)
-(er-vm-test "reset resets pid counter"
-  (er-vm-dispatch 134 (list er-vm-fn (list))) 0)
-
-
-;; ── Phase 9f — hot-BIF dispatch table ───────────────────────────
-;; Each opcode skips the registry lookup and calls the underlying
-;; er-bif-* directly. Verify each returns the same result as going
-;; through er-apply-bif.
-
-(er-vm-test "BIF_LENGTH opcode by id"
-  (get (er-vm-lookup-opcode-by-id 136) :name) "OP_BIF_LENGTH")
-(er-vm-test "BIF_LENGTH on 3-cons"
-  (er-vm-dispatch 136
-    (list (er-mk-cons 1 (er-mk-cons 2 (er-mk-cons 3 (er-mk-nil))))))
-  3)
-
-(er-vm-test "BIF_HD on cons"
-  (er-vm-dispatch 137 (list (er-mk-cons 99 (er-mk-nil)))) 99)
-
-(er-vm-test "BIF_TL is cons"
-  (er-cons? (er-vm-dispatch 138
-    (list (er-mk-cons 1 (er-mk-cons 2 (er-mk-nil)))))) true)
-
-(er-vm-test "BIF_ELEMENT pulls index"
-  (er-vm-dispatch 139 (list 2 (er-mk-tuple (list "a" "b" "c")))) "b")
-
-(er-vm-test "BIF_TUPLE_SIZE on 4-tuple"
-  (er-vm-dispatch 140 (list (er-mk-tuple (list 1 2 3 4)))) 4)
-
-(er-vm-test "BIF_LISTS_REVERSE preserves elements"
-  (er-list-length (er-vm-dispatch 141
-    (list (er-mk-cons 1 (er-mk-cons 2 (er-mk-cons 3 (er-mk-nil))))))) 3)
-
-(er-vm-test "BIF_LISTS_REVERSE actually reverses"
-  (get (er-vm-dispatch 141
-    (list (er-mk-cons 1 (er-mk-cons 2 (er-mk-cons 3 (er-mk-nil)))))) :head) 3)
-
-(er-vm-test "BIF_IS_INTEGER true on int"
-  (get (er-vm-dispatch 142 (list 42)) :name) "true")
-(er-vm-test "BIF_IS_INTEGER false on float"
-  (get (er-vm-dispatch 142 (list 3.14)) :name) "false")
-
-(er-vm-test "BIF_IS_ATOM true"
-  (get (er-vm-dispatch 143 (list (er-mk-atom "ok"))) :name) "true")
-(er-vm-test "BIF_IS_ATOM false on int"
-  (get (er-vm-dispatch 143 (list 7)) :name) "false")
-
-(er-vm-test "BIF_IS_LIST true on cons"
-  (get (er-vm-dispatch 144
-    (list (er-mk-cons 1 (er-mk-nil)))) :name) "true")
-(er-vm-test "BIF_IS_LIST true on nil"
-  (get (er-vm-dispatch 144 (list (er-mk-nil))) :name) "true")
-(er-vm-test "BIF_IS_LIST false on tuple"
-  (get (er-vm-dispatch 144 (list (er-mk-tuple (list)))) :name) "false")
-
-(er-vm-test "BIF_IS_TUPLE true"
-  (get (er-vm-dispatch 145 (list (er-mk-tuple (list 1)))) :name) "true")
-(er-vm-test "BIF_IS_TUPLE false on int"
-  (get (er-vm-dispatch 145 (list 5)) :name) "false")
-
-;; Sanity: total opcode count grew (3 patterns + perform + handle +
-;; receive-scan + spawn + send + 10 hot-BIFs = 16+ registered).
-(er-vm-test "opcode list has 16+"
-  (>= (len (er-vm-list-opcodes)) 16) true)
-
-
-;; ── Phase 9i — host opcode-id resolution ────────────────────────
-;; Requires a binary with the erlang_ext extension registered (9h).
-;; The loop runs conformance against exactly that binary.
-(er-vm-test "host id: OP_PATTERN_TUPLE = 222"
-  (er-vm-host-opcode-id "erlang.OP_PATTERN_TUPLE") 222)
-(er-vm-test "host id: OP_BIF_IS_TUPLE = 239"
-  (er-vm-host-opcode-id "erlang.OP_BIF_IS_TUPLE") 239)
-(er-vm-test "host id: unknown name -> nil"
-  (er-vm-host-opcode-id "erlang.OP_NOPE") nil)
-(er-vm-test "effective id prefers host when present"
-  (er-vm-effective-opcode-id "erlang.OP_BIF_LENGTH" 136) 230)
-(er-vm-test "effective id falls back to stub on nil"
-  (er-vm-effective-opcode-id "erlang.OP_NOPE" 999) 999)
-;; The full erlang.OP_* namespace resolves to the contiguous 222-239 block.
-(er-vm-test "host ids contiguous 222..239"
-  (let ((names (list "erlang.OP_PATTERN_TUPLE" "erlang.OP_PATTERN_LIST"
-                     "erlang.OP_PATTERN_BINARY" "erlang.OP_PERFORM"
-                     "erlang.OP_HANDLE" "erlang.OP_RECEIVE_SCAN"
-                     "erlang.OP_SPAWN" "erlang.OP_SEND"
-                     "erlang.OP_BIF_LENGTH" "erlang.OP_BIF_HD"
-                     "erlang.OP_BIF_TL" "erlang.OP_BIF_ELEMENT"
-                     "erlang.OP_BIF_TUPLE_SIZE" "erlang.OP_BIF_LISTS_REVERSE"
-                     "erlang.OP_BIF_IS_INTEGER" "erlang.OP_BIF_IS_ATOM"
-                     "erlang.OP_BIF_IS_LIST" "erlang.OP_BIF_IS_TUPLE"))
-        (ok (list true)))
-    (for-each
-      (fn (i)
-        (when (not (= (er-vm-host-opcode-id (nth names i)) (+ 222 i)))
-          (set-nth! ok 0 false)))
-      (range 0 (len names)))
-    (nth ok 0))
-  true)
-
-(define er-vm-test-summary (str "vm " er-vm-test-pass "/" er-vm-test-count))

lib/erlang/tokenizer.sx

@@ -229,37 +229,13 @@
                 (= ch "$")
                 (do
                   (er-advance! 1)
-                  ;; Emit the char's decimal code as the integer token value
-                  ;; (was: raw "$X" text — parse-number then returned nil).
-                  (let
-                    ((code (cond
-                       (>= pos src-len) 0
-                       (= (er-cur) "\\")
-                         (do
-                           (er-advance! 1)
-                           (let ((esc (if (< pos src-len) (er-cur) "")))
-                             (when (< pos src-len) (er-advance! 1))
-                             (cond
-                               (= esc "n")  10
-                               (= esc "t")  9
-                               (= esc "r")  13
-                               (= esc "s")  32
-                               (= esc "b")  8
-                               (= esc "e")  27
-                               (= esc "f")  12
-                               (= esc "v")  11
-                               (= esc "d")  127
-                               (= esc "0")  0
-                               (= esc "\\")  92
-                               (= esc "\"") 34
-                               (= esc "'")  39
-                               (= esc "")   0
-                               :else (char->integer (nth (string->list esc) 0)))))
-                       :else
-                         (let ((c (er-cur)))
-                           (er-advance! 1)
-                           (char->integer (nth (string->list c) 0))))))
-                    (er-emit! "integer" (str code) start))
+                  (if
+                    (and (< pos src-len) (= (er-cur) "\\"))
+                    (do
+                      (er-advance! 1)
+                      (when (< pos src-len) (er-advance! 1)))
+                    (when (< pos src-len) (er-advance! 1)))
+                  (er-emit! "integer" (slice src start pos) start)
                   (scan!))
                 (er-lower? ch)
                 (do

lib/erlang/transpile.sx

@@ -107,12 +107,7 @@
     (let
       ((ty (get node :type)))
       (cond
-        (= ty "integer")
-          (let ((n (parse-number (get node :value))))
-            (cond
-              (= n nil) (error (str "Erlang: invalid integer literal: "
-                                     (get node :value)))
-              :else (truncate n)))
+        (= ty "integer") (parse-number (get node :value))
         (= ty "float") (parse-number (get node :value))
         (= ty "atom") (er-mk-atom (get node :value))
         (= ty "string") (get node :value)
@@ -674,23 +669,96 @@
 
 (define
   er-apply-bif
-  (fn (name vs)
-    (let ((entry (er-lookup-bif "erlang" name (len vs))))
-      (if (not (= entry nil))
-        ((get entry :fn) vs)
-        (error (str "Erlang: undefined function '" name "/" (len vs) "'"))))))
+  (fn
+    (name vs)
+    (cond
+      (= name "is_integer") (er-bif-is-integer vs)
+      (= name "is_atom") (er-bif-is-atom vs)
+      (= name "is_list") (er-bif-is-list vs)
+      (= name "is_tuple") (er-bif-is-tuple vs)
+      (= name "is_number") (er-bif-is-number vs)
+      (= name "is_float") (er-bif-is-float vs)
+      (= name "is_boolean") (er-bif-is-boolean vs)
+      (= name "length") (er-bif-length vs)
+      (= name "hd") (er-bif-hd vs)
+      (= name "tl") (er-bif-tl vs)
+      (= name "element") (er-bif-element vs)
+      (= name "tuple_size") (er-bif-tuple-size vs)
+      (= name "atom_to_list") (er-bif-atom-to-list vs)
+      (= name "list_to_atom") (er-bif-list-to-atom vs)
+      (= name "is_pid") (er-bif-is-pid vs)
+      (= name "is_reference") (er-bif-is-reference vs)
+      (= name "is_binary") (er-bif-is-binary vs)
+      (= name "byte_size") (er-bif-byte-size vs)
+      (= name "abs") (er-bif-abs vs)
+      (= name "min") (er-bif-min vs)
+      (= name "max") (er-bif-max vs)
+      (= name "tuple_to_list") (er-bif-tuple-to-list vs)
+      (= name "list_to_tuple") (er-bif-list-to-tuple vs)
+      (= name "integer_to_list") (er-bif-integer-to-list vs)
+      (= name "list_to_integer") (er-bif-list-to-integer vs)
+      (= name "is_function") (er-bif-is-function vs)
+      (= name "self") (er-bif-self vs)
+      (= name "spawn") (er-bif-spawn vs)
+      (= name "exit") (er-bif-exit vs)
+      (= name "make_ref") (er-bif-make-ref vs)
+      (= name "link") (er-bif-link vs)
+      (= name "unlink") (er-bif-unlink vs)
+      (= name "monitor") (er-bif-monitor vs)
+      (= name "demonitor") (er-bif-demonitor vs)
+      (= name "process_flag") (er-bif-process-flag vs)
+      (= name "register") (er-bif-register vs)
+      (= name "unregister") (er-bif-unregister vs)
+      (= name "whereis") (er-bif-whereis vs)
+      (= name "registered") (er-bif-registered vs)
+      (= name "throw") (raise (er-mk-throw-marker (er-bif-arg1 vs "throw")))
+      (= name "error") (raise (er-mk-error-marker (er-bif-arg1 vs "error")))
+      :else (error
+        (str "Erlang: undefined function '" name "/" (len vs) "'")))))
 
 (define
   er-apply-remote-bif
-  (fn (mod name vs)
+  (fn
+    (mod name vs)
     (cond
       (dict-has? (er-modules-get) mod)
-        (er-apply-user-module mod name vs)
-      :else
-        (let ((entry (er-lookup-bif mod name (len vs))))
-          (if (not (= entry nil))
-            ((get entry :fn) vs)
-            (error (str "Erlang: undefined remote function '" mod ":" name "/" (len vs) "'")))))))
+      (er-apply-user-module mod name vs)
+      (= mod "lists") (er-apply-lists-bif name vs)
+      (= mod "io") (er-apply-io-bif name vs)
+      (= mod "erlang") (er-apply-bif name vs)
+      (= mod "ets") (er-apply-ets-bif name vs)
+      :else (error
+        (str "Erlang: undefined module '" mod "'")))))
+
+(define
+  er-apply-lists-bif
+  (fn
+    (name vs)
+    (cond
+      (= name "reverse") (er-bif-lists-reverse vs)
+      (= name "map") (er-bif-lists-map vs)
+      (= name "foldl") (er-bif-lists-foldl vs)
+      (= name "seq") (er-bif-lists-seq vs)
+      (= name "sum") (er-bif-lists-sum vs)
+      (= name "nth") (er-bif-lists-nth vs)
+      (= name "last") (er-bif-lists-last vs)
+      (= name "member") (er-bif-lists-member vs)
+      (= name "append") (er-bif-lists-append vs)
+      (= name "filter") (er-bif-lists-filter vs)
+      (= name "any") (er-bif-lists-any vs)
+      (= name "all") (er-bif-lists-all vs)
+      (= name "duplicate") (er-bif-lists-duplicate vs)
+      :else (error
+        (str "Erlang: undefined 'lists:" name "/" (len vs) "'")))))
+
+(define
+  er-apply-io-bif
+  (fn
+    (name vs)
+    (cond
+      (= name "format") (er-bif-io-format vs)
+      :else (error
+        (str "Erlang: undefined 'io:" name "/" (len vs) "'")))))
 
 (define
   er-bif-arg1
@@ -826,30 +894,16 @@
         (len (get v :elements))
         (error "Erlang: tuple_size: not a tuple")))))
 
-(define er-string->charlist
-  (fn (s)
-    (let ((cs (string->list s)) (out (er-mk-nil)))
-      (for-each
-        (fn (i)
-          (set! out (er-mk-cons
-                      (char->integer (nth cs (- (- (len cs) 1) i)))
-                      out)))
-        (range 0 (len cs)))
-      out)))
-
 (define
   er-bif-atom-to-list
   (fn
     (vs)
     (let
       ((v (er-bif-arg1 vs "atom_to_list")))
-      ;; Standard Erlang: atom_to_list/1 returns an Erlang charlist
-      ;; (list of integer char codes). Was: SX string of :name —
-      ;; unusable from Erlang-land for [Char|T] / ++ / binary segments.
       (if
         (er-atom? v)
-        (er-string->charlist (get v :name))
-        (raise (er-mk-error-marker (er-mk-atom "badarg")))))))
+        (get v :name)
+        (error "Erlang: atom_to_list: not an atom")))))
 
 (define
   er-bif-list-to-atom
@@ -857,11 +911,10 @@
     (vs)
     (let
       ((v (er-bif-arg1 vs "list_to_atom")))
-      ;; Accept Erlang charlist (cons of ints) or SX string.
-      (let ((s (er-source-to-string v)))
-        (cond
-          (= s nil) (raise (er-mk-error-marker (er-mk-atom "badarg")))
-          :else (er-mk-atom s))))))
+      (if
+        (= (type-of v) "string")
+        (er-mk-atom v)
+        (error "Erlang: list_to_atom: not a string")))))
 
 ;; ── lists module ─────────────────────────────────────────────────
 (define
@@ -1617,12 +1670,10 @@
     (vs)
     (let
       ((v (er-bif-arg1 vs "integer_to_list")))
-      ;; Standard Erlang: integer_to_list/1 returns an Erlang charlist
-      ;; (e.g. integer_to_list(42) -> [$4, $2] -> [52, 50]).
       (cond
         (not (= (type-of v) "number"))
         (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        :else (er-string->charlist (str v))))))
+        :else (str v)))))
 
 (define
   er-bif-list-to-integer
@@ -1630,14 +1681,15 @@
     (vs)
     (let
       ((v (er-bif-arg1 vs "list_to_integer")))
-      ;; Accept Erlang charlist (cons of ints) or SX string.
-      (let ((s (er-source-to-string v)))
-        (cond
-          (= s nil) (raise (er-mk-error-marker (er-mk-atom "badarg")))
-          :else (let ((n (parse-number s)))
-            (cond
-              (= n nil) (raise (er-mk-error-marker (er-mk-atom "badarg")))
-              :else n)))))))
+      (cond
+        (not (= (type-of v) "string"))
+        (raise (er-mk-error-marker (er-mk-atom "badarg")))
+        :else (let
+          ((n (parse-number v)))
+          (cond
+            (= n nil)
+            (raise (er-mk-error-marker (er-mk-atom "badarg")))
+            :else n))))))
 
 (define
   er-bif-is-function
@@ -1859,180 +1911,3 @@
           (fn (_) (set! out (er-mk-cons v out)))
           (range 0 n))
         out))))
-
-
-;; ── code module (Phase 7 hot-reload) ─────────────────────────────
-(define er-source-walk-bytes!
-  (fn (n bytes-box)
-    (cond
-      (er-nil? n) true
-      (er-cons? n)
-        (let ((h (get n :head)))
-          (cond
-            (= (type-of h) "number")
-              (do (append! (nth bytes-box 0) h)
-                  (er-source-walk-bytes! (get n :tail) bytes-box))
-            :else (do (set-nth! bytes-box 0 nil) false)))
-      :else (do (set-nth! bytes-box 0 nil) false))))
-
-(define er-source-to-string
-  (fn (v)
-    (cond
-      (= (type-of v) "string") v
-      (er-binary? v) (list->string (map integer->char (get v :bytes)))
-      (or (er-nil? v) (er-cons? v))
-        (let ((box (list (list))))
-          (er-source-walk-bytes! v box)
-          (cond
-            (= (nth box 0) nil) nil
-            :else (list->string (map integer->char (nth box 0)))))
-      :else nil)))
-
-(define er-bif-code-load-binary
-  (fn (vs)
-    (let ((mod-arg (nth vs 0)) (src-arg (nth vs 2)))
-      (cond
-        (not (er-atom? mod-arg))
-          (er-mk-tuple (list (er-mk-atom "error") (er-mk-atom "badarg")))
-        :else
-          (let ((src-str (er-source-to-string src-arg)))
-            (cond
-              (= src-str nil)
-                (er-mk-tuple (list (er-mk-atom "error") (er-mk-atom "badarg")))
-              :else
-                (let ((result-box (list nil)) (failed-box (list false)))
-                  (guard
-                    (c (:else (set-nth! failed-box 0 true)))
-                    (set-nth! result-box 0 (erlang-load-module src-str)))
-                  (cond
-                    (nth failed-box 0)
-                      (er-mk-tuple
-                        (list (er-mk-atom "error") (er-mk-atom "badfile")))
-                    (not (= (get (nth result-box 0) :name) (get mod-arg :name)))
-                      (er-mk-tuple
-                        (list (er-mk-atom "error") (er-mk-atom "module_name_mismatch")))
-                    :else
-                      (er-mk-tuple (list (er-mk-atom "module") mod-arg))))))))))
-
-(define er-env-derived-from?
-  (fn (env target-env)
-    ;; Object-identity check, NOT value `=`. On evaluators where dict `=`
-    ;; is structural/deep, comparing closure envs (which are large and
-    ;; cyclic — a module fun's env references the fun) does not terminate.
-    ;; `identical?` is pointer identity on every host and is the actual
-    ;; intended semantics: "is this the same env object".
-    (cond
-      (identical? env target-env) true
-      :else
-        (let ((ks (keys env)) (found-ref (list false)))
-          (for-each
-            (fn (i)
-              (when (not (nth found-ref 0))
-                (let ((v (get env (nth ks i))))
-                  (when (and (er-fun? v) (identical? (get v :env) target-env))
-                    (set-nth! found-ref 0 true)))))
-            (range 0 (len ks)))
-          (nth found-ref 0)))))
-
-(define er-procs-on-env
-  (fn (target-env)
-    (let ((all-keys (keys (er-sched-processes)))
-          (matches (list)))
-      (for-each
-        (fn (i)
-          (let ((proc (get (er-sched-processes) (nth all-keys i))))
-            (let ((init-fun (get proc :initial-fun)))
-              (when (and (not (= init-fun nil))
-                         (er-fun? init-fun)
-                         (er-env-derived-from? (get init-fun :env) target-env)
-                         (not (= (get proc :state) "dead")))
-                (append! matches (get proc :pid))))))
-        (range 0 (len all-keys)))
-      matches)))
-
-(define er-bif-code-purge
-  (fn (vs)
-    (let ((mod-arg (nth vs 0)))
-      (cond
-        (not (er-atom? mod-arg))
-          (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        :else
-          (let ((registry (er-modules-get)) (mod-name (get mod-arg :name)))
-            (cond
-              (not (dict-has? registry mod-name)) (er-mk-atom "false")
-              :else
-                (let ((slot (get registry mod-name)))
-                  (cond
-                    (= (er-module-old-env slot) nil) (er-mk-atom "false")
-                    :else
-                      (let ((procs (er-procs-on-env (er-module-old-env slot))))
-                        (for-each
-                          (fn (i) (er-cascade-exit! (nth procs i) (er-mk-atom "killed")))
-                          (range 0 (len procs)))
-                        (dict-set! registry mod-name
-                          (er-mk-module-slot (er-module-current-env slot) nil
-                            (er-module-version slot)))
-                        (er-mk-atom "true"))))))))))
-
-(define er-bif-code-soft-purge
-  (fn (vs)
-    (let ((mod-arg (nth vs 0)))
-      (cond
-        (not (er-atom? mod-arg))
-          (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        :else
-          (let ((registry (er-modules-get)) (mod-name (get mod-arg :name)))
-            (cond
-              (not (dict-has? registry mod-name)) (er-mk-atom "true")
-              :else
-                (let ((slot (get registry mod-name)))
-                  (cond
-                    (= (er-module-old-env slot) nil) (er-mk-atom "true")
-                    :else
-                      (let ((procs (er-procs-on-env (er-module-old-env slot))))
-                        (cond
-                          (> (len procs) 0) (er-mk-atom "false")
-                          :else
-                            (do
-                              (dict-set! registry mod-name
-                                (er-mk-module-slot (er-module-current-env slot) nil
-                                  (er-module-version slot)))
-                              (er-mk-atom "true"))))))))))))
-
-(define er-bif-code-which
-  (fn (vs)
-    (let ((mod-arg (nth vs 0)))
-      (cond
-        (not (er-atom? mod-arg))
-          (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        (dict-has? (er-modules-get) (get mod-arg :name))
-          (er-mk-atom "loaded")
-        :else (er-mk-atom "non_existing")))))
-
-(define er-bif-code-is-loaded
-  (fn (vs)
-    (let ((mod-arg (nth vs 0)))
-      (cond
-        (not (er-atom? mod-arg))
-          (raise (er-mk-error-marker (er-mk-atom "badarg")))
-        (dict-has? (er-modules-get) (get mod-arg :name))
-          (er-mk-tuple (list (er-mk-atom "file") (er-mk-atom "loaded")))
-        :else (er-mk-atom "false")))))
-
-(define er-bif-code-all-loaded
-  (fn (vs)
-    (let ((registry (er-modules-get))
-          (ks (keys (er-modules-get)))
-          (out (er-mk-nil)))
-      (for-each
-        (fn (i)
-          (let ((k (nth ks (- (- (len ks) 1) i))))
-            (set! out
-              (er-mk-cons
-                (er-mk-tuple
-                  (list (er-mk-atom k) (er-mk-atom "loaded")))
-                out))))
-        (range 0 (len ks)))
-      out)))
-
-

lib/erlang/vm/dispatcher.sx

@@ -1,313 +0,0 @@
-;; Erlang VM — stub opcode dispatcher (Phase 9).
-;;
-;; Mimics the OCaml-side EXTENSION shape from
-;; plans/sx-vm-opcode-extension.md so opcodes 9b-9g can be designed
-;; and tested in SX before 9a (`hosts/ocaml/`) lands the real
-;; registration plumbing. When 9a is available, these stubs become
-;; the cross-host SX-side mirror of the C/OCaml handlers and the
-;; bytecode compiler emits them directly.
-;;
-;; Opcode IDs follow the plan's tier partition:
-;;   0-127     reserved for SX core
-;;   128-199   guest extensions (e.g. erlang, lua)
-;;   200-247   port-/platform-specific
-;;
-;; Erlang owns 128-159 for now.
-
-(define er-vm-opcodes (list {}))
-
-(define er-vm-opcodes-get (fn () (nth er-vm-opcodes 0)))
-
-(define
-  er-vm-opcodes-reset!
-  (fn () (set-nth! er-vm-opcodes 0 {})))
-
-(define
-  er-vm-register-opcode!
-  (fn
-    (id name handler)
-    (dict-set! (er-vm-opcodes-get) (str id) {:name name :id id :handler handler})
-    (er-mk-atom "ok")))
-
-(define
-  er-vm-lookup-opcode-by-id
-  (fn
-    (id)
-    (let
-      ((reg (er-vm-opcodes-get)) (k (str id)))
-      (if (dict-has? reg k) (get reg k) nil))))
-
-(define
-  er-vm-lookup-opcode-by-name
-  (fn
-    (name)
-    (let
-      ((reg (er-vm-opcodes-get))
-        (ks (keys (er-vm-opcodes-get)))
-        (found (list nil)))
-      (for-each
-        (fn
-          (i)
-          (let
-            ((entry (get reg (nth ks i))))
-            (when
-              (= (get entry :name) name)
-              (set-nth! found 0 entry))))
-        (range 0 (len ks)))
-      (nth found 0))))
-
-(define er-vm-list-opcodes (fn () (keys (er-vm-opcodes-get))))
-
-;; ── Phase 9i — host opcode-id resolution ────────────────────────
-;; When the OCaml `erlang_ext` extension is registered (Phase 9h), the
-;; runtime exposes `extension-opcode-id` which maps an "erlang.OP_*"
-;; name to the host-assigned id (222-239). We consult it so the SX
-;; side and the OCaml side agree on ids; when it returns nil (name not
-;; registered) we fall back to the stub-local id.
-;;
-;; NOTE: this requires a binary with the VM extension mechanism (the
-;; vm-ext phase-A..E cherry-pick + Sx_vm_extensions force-link). The
-;; loop builds and runs against exactly that binary
-;; (hosts/ocaml/_build/default/bin/sx_server.exe). `extension-opcode-id`
-;; resolves lazily at call time, so merely loading this file is safe;
-;; only invoking the resolver on a binary that lacks the primitive
-;; would raise.
-
-(define er-vm-host-opcode-id
-  (fn (ext-name)
-    (extension-opcode-id ext-name)))
-
-(define er-vm-effective-opcode-id
-  (fn (ext-name stub-id)
-    (let ((host (extension-opcode-id ext-name)))
-      (cond
-        (= host nil) stub-id
-        :else host))))
-
-(define
-  er-vm-dispatch
-  (fn
-    (id operands)
-    (let
-      ((entry (er-vm-lookup-opcode-by-id id)))
-      (if
-        (= entry nil)
-        (error (str "Erlang VM: unknown opcode id " id))
-        ((get entry :handler) operands)))))
-
-(define
-  er-vm-dispatch-by-name
-  (fn
-    (name operands)
-    (let
-      ((entry (er-vm-lookup-opcode-by-name name)))
-      (if
-        (= entry nil)
-        (error (str "Erlang VM: unknown opcode name '" name "'"))
-        ((get entry :handler) operands)))))
-
-;; ── Phase 9c — effect opcodes (perform / handle) ────────────────
-;; Stub algebraic-effects-style operators. OP_PERFORM raises a tagged
-;; exception; OP_HANDLE wraps a thunk in `guard` and catches matching
-;; effects, passing the args to the handler. The real specialization
-;; (constant-time effect dispatch, single-shot vs multi-shot continuations)
-;; lands when 9a integrates.
-
-(define er-vm-effect-marker?
-  (fn (c effect-name)
-    (and (= (type-of c) "dict")
-         (= (get c :tag) "vm-effect")
-         (= (get c :effect) effect-name))))
-
-(define er-vm-op-perform
-  (fn (operands)
-    (raise {:tag "vm-effect" :effect (nth operands 0) :args (nth operands 1)})))
-
-(define er-vm-op-handle
-  (fn (operands)
-    (let ((thunk (nth operands 0))
-          (effect-name (nth operands 1))
-          (handler (nth operands 2))
-          (result (list nil))
-          (caught (list false))
-          (rethrow (list nil)))
-      (guard
-        (c
-          (:else
-            (cond
-              (er-vm-effect-marker? c effect-name)
-                (do (set-nth! caught 0 true)
-                    (set-nth! result 0 (handler (get c :args))))
-              :else (set-nth! rethrow 0 c))))
-        (set-nth! result 0 (thunk)))
-      (cond
-        (not (= (nth rethrow 0) nil)) (raise (nth rethrow 0))
-        :else (nth result 0)))))
-
-;; ── Phase 9d — receive scan opcode ────────────────────────────
-;; Selective receive primitive. Scans a mailbox value-list in arrival
-;; order; for each value, tries each clause's pattern (binding into
-;; env on success); on match returns `{:matched true :index N :body B}`
-;; — the caller decides what to do with the index (queue-delete) and
-;; the body (eval in the now-mutated env). On miss returns
-;; `{:matched false}`, the caller arranges suspension (via OP_PERFORM).
-;;
-;; Operands: (clauses mbox-list env)
-;;   clauses    — list of {:pattern :guards :body} dicts
-;;   mbox-list  — SX list of message values
-;;   env        — env dict (mutated on match)
-
-(define er-vm-receive-try-clauses
-  (fn (clauses msg env i)
-    (cond
-      (>= i (len clauses)) {:matched false}
-      :else
-        (let ((c (nth clauses i)) (snap (er-env-copy env)))
-          (cond
-            (and
-              (er-match! (get c :pattern) msg env)
-              (er-eval-guards (get c :guards) env))
-              {:matched true :body (get c :body)}
-            :else
-              (do (er-env-restore! env snap)
-                  (er-vm-receive-try-clauses clauses msg env (+ i 1))))))))
-
-(define er-vm-receive-scan-loop
-  (fn (clauses mbox env i)
-    (cond
-      (>= i (len mbox)) {:matched false}
-      :else
-        (let ((msg (nth mbox i))
-              (cr (er-vm-receive-try-clauses clauses msg env 0)))
-          (cond
-            (get cr :matched) {:matched true :index i :body (get cr :body)}
-            :else (er-vm-receive-scan-loop clauses mbox env (+ i 1)))))))
-
-(define er-vm-op-receive-scan
-  (fn (operands)
-    (er-vm-receive-scan-loop (nth operands 0) (nth operands 1) (nth operands 2) 0)))
-
-;; ── Phase 9e — spawn / send + lightweight scheduler ─────────────
-;; Stub register-machine process layout for the eventual fast scheduler.
-;; A VM-process is `{:id :registers :mailbox :state :initial-fn :initial-args}`.
-;; Registers is a vector (SX list, mutated via set-nth!) — fixed slot count
-;; per process so cells don't grow during execution. Mailbox is an SX list.
-;; State is one of "runnable" / "waiting" / "dead". This sits PARALLEL to
-;; the existing `er-scheduler` (which is the language-level scheduler) —
-;; the VM scheduler will eventually take over once 9a integrates and
-;; bytecode-compiled Erlang runs against it.
-
-(define er-vm-procs (list {}))
-(define er-vm-procs-get (fn () (nth er-vm-procs 0)))
-(define er-vm-procs-reset!
-  (fn () (do (set-nth! er-vm-procs 0 {}) (set-nth! er-vm-next-pid 0 0))))
-
-(define er-vm-next-pid (list 0))
-
-(define er-vm-proc-new!
-  (fn (initial-fn initial-args)
-    (let ((pid (nth er-vm-next-pid 0)))
-      (set-nth! er-vm-next-pid 0 (+ pid 1))
-      (let ((proc
-              {:id pid
-               :registers (list nil nil nil nil nil nil nil nil)
-               :mailbox (list)
-               :state "runnable"
-               :initial-fn initial-fn
-               :initial-args initial-args}))
-        (dict-set! (er-vm-procs-get) (str pid) proc)
-        pid))))
-
-(define er-vm-proc-get (fn (pid) (get (er-vm-procs-get) (str pid))))
-
-(define er-vm-proc-send!
-  (fn (pid msg)
-    (let ((proc (er-vm-proc-get pid)))
-      (cond
-        (= proc nil) false
-        :else
-          (do
-            (dict-set! proc :mailbox (append (get proc :mailbox) (list msg)))
-            (when (= (get proc :state) "waiting")
-              (dict-set! proc :state "runnable"))
-            true)))))
-
-(define er-vm-proc-mailbox (fn (pid) (get (er-vm-proc-get pid) :mailbox)))
-(define er-vm-proc-state (fn (pid) (get (er-vm-proc-get pid) :state)))
-(define er-vm-proc-count (fn () (len (keys (er-vm-procs-get)))))
-
-(define er-vm-op-spawn
-  (fn (operands)
-    (er-vm-proc-new! (nth operands 0) (nth operands 1))))
-
-(define er-vm-op-send
-  (fn (operands)
-    (er-vm-proc-send! (nth operands 0) (nth operands 1))))
-
-;; ── Phase 9f — hot-BIF dispatch table ──────────────────────────
-;; Specialized opcodes for the BIFs that the bytecode compiler emits
-;; on hot call sites. The handler is the underlying `er-bif-*` impl
-;; directly — same `(vs)` signature as the dispatcher uses for
-;; operands, so the cost is the opcode-id → handler hop with no
-;; registry-key string lookup. Cold BIFs continue going through the
-;; general path (`er-apply-bif` / `er-lookup-bif`).
-;;
-;; Opcodes 136-159 reserved for hot BIFs.
-
-;; ── Phase 9b — pattern-match opcodes ────────────────────────────
-;; Each handler takes a list (pattern-ast value env) and returns
-;; true/false, mutating env on success (same contract as the
-;; existing er-match-tuple / er-match-cons / er-match-binary).
-;; Wire these as wrappers for now; the real opcodes will eventually
-;; have register-machine semantics and skip the AST-walk overhead.
-
-(define
-  er-vm-register-erlang-opcodes!
-  (fn
-    ()
-    (er-vm-register-opcode!
-      128
-      "OP_PATTERN_TUPLE"
-      (fn
-        (operands)
-        (er-match-tuple
-          (nth operands 0)
-          (nth operands 1)
-          (nth operands 2))))
-    (er-vm-register-opcode!
-      129
-      "OP_PATTERN_LIST"
-      (fn
-        (operands)
-        (er-match-cons
-          (nth operands 0)
-          (nth operands 1)
-          (nth operands 2))))
-    (er-vm-register-opcode!
-      130
-      "OP_PATTERN_BINARY"
-      (fn
-        (operands)
-        (er-match-binary
-          (nth operands 0)
-          (nth operands 1)
-          (nth operands 2))))
-    (er-vm-register-opcode! 131 "OP_PERFORM" er-vm-op-perform)
-    (er-vm-register-opcode! 132 "OP_HANDLE" er-vm-op-handle)
-    (er-vm-register-opcode! 133 "OP_RECEIVE_SCAN" er-vm-op-receive-scan)
-    (er-vm-register-opcode! 134 "OP_SPAWN" er-vm-op-spawn)
-    (er-vm-register-opcode! 135 "OP_SEND" er-vm-op-send)
-    ;; Phase 9f — hot BIFs
-    (er-vm-register-opcode! 136 "OP_BIF_LENGTH"        er-bif-length)
-    (er-vm-register-opcode! 137 "OP_BIF_HD"            er-bif-hd)
-    (er-vm-register-opcode! 138 "OP_BIF_TL"            er-bif-tl)
-    (er-vm-register-opcode! 139 "OP_BIF_ELEMENT"       er-bif-element)
-    (er-vm-register-opcode! 140 "OP_BIF_TUPLE_SIZE"    er-bif-tuple-size)
-    (er-vm-register-opcode! 141 "OP_BIF_LISTS_REVERSE" er-bif-lists-reverse)
-    (er-vm-register-opcode! 142 "OP_BIF_IS_INTEGER"    er-bif-is-integer)
-    (er-vm-register-opcode! 143 "OP_BIF_IS_ATOM"       er-bif-is-atom)
-    (er-vm-register-opcode! 144 "OP_BIF_IS_LIST"       er-bif-is-list)
-    (er-vm-register-opcode! 145 "OP_BIF_IS_TUPLE"      er-bif-is-tuple)
-    (er-mk-atom "ok")))
-
-(er-vm-register-erlang-opcodes!)

lib/events/api.sx

@@ -1,329 +0,0 @@
-;; lib/events/api.sx — public events surface over calendar + availability.
-;;
-;; A `store` is an immutable value holding scheduled events and (in-memory)
-;; bookings:
-;;
-;;   {:events (event ...) :bookings ((actor key) ...)}
-;;
-;; The in-memory `:bookings` list supports pure, value-level queries. The
-;; DURABLE booking path (ev/*-occ! and ev/*-p) keeps bookings in persist
-;; streams via booking.sx — capacity-safe, cancellable, replayable — and
-;; derives availability from those streams. Use the persist path for real
-;; bookings; the in-memory path for projections and tests.
-;;
-;; All queries are windowed: agenda/free/next-free expand recurring events into
-;; concrete occurrences within an explicit (or derived) window before running
-;; the Datalog availability rules.
-
-(define ev/store (fn (events bookings) {:bookings bookings :events events}))
-
-(define ev/empty (fn () (ev/store (list) (list))))
-
-(define ev/events (fn (store) (get store :events)))
-(define ev/bookings (fn (store) (get store :bookings)))
-
-;; Add a (constructed) event to the store.
-(define
-  ev/add-event
-  (fn
-    (store event)
-    (ev/store (cons event (ev/events store)) (ev/bookings store))))
-
-;; Schedule a fresh event from parts, returning the updated store. rrule may be
-;; nil for a one-off. (Booking is separate — see ev/book.)
-(define
-  ev/schedule
-  (fn
-    (store id dtstart duration rrule capacity)
-    (ev/add-event store (ev-event id dtstart duration rrule capacity))))
-
-;; Record that `actor` holds the occurrence with `key` (in-memory only — see
-;; ev/book-occ! for the durable, capacity-safe path).
-(define
-  ev/book
-  (fn
-    (store actor key)
-    (ev/store
-      (ev/events store)
-      (cons (list actor key) (ev/bookings store)))))
-
-;; The event with `id`, or nil.
-(define
-  ev/event-by-id
-  (fn
-    (store id)
-    (reduce
-      (fn
-        (found ev)
-        (if (nil? found) (if (= (get ev :id) id) ev found) found))
-      nil
-      (ev/events store))))
-
-;; Capacity of the event an occurrence belongs to (0 if unknown).
-(define
-  ev/capacity-of
-  (fn
-    (store occ)
-    (let
-      ((ev (ev/event-by-id store (get occ :id))))
-      (if (nil? ev) 0 (get ev :capacity)))))
-
-;; The maximum event duration in the store (0 when empty) — used to widen
-;; expansion windows so any occurrence overlapping a query is captured.
-(define
-  ev/store-max-duration
-  (fn
-    (store)
-    (reduce
-      (fn (m ev) (max m (get ev :duration)))
-      0
-      (ev/events store))))
-
-;; All occurrences across all events within [ws, we), ascending by start.
-(define
-  ev/agenda
-  (fn (store ws we) (ev-expand-all (ev/events store) ws we)))
-
-(define
-  ev-key-member?
-  (fn
-    (k keys)
-    (cond
-      ((empty? keys) false)
-      ((= k (first keys)) true)
-      (else (ev-key-member? k (rest keys))))))
-
-;; Occurrence keys `actor` has booked (in-memory store).
-(define
-  ev/actor-keys
-  (fn
-    (store actor)
-    (reduce
-      (fn
-        (acc b)
-        (if (= (first b) actor) (cons (first (rest b)) acc) acc))
-      (list)
-      (ev/bookings store))))
-
-;; The agenda restricted to occurrences `actor` is booked into (in-memory).
-(define
-  ev/agenda-for
-  (fn
-    (store actor ws we)
-    (let
-      ((keys (ev/actor-keys store actor)))
-      (filter
-        (fn (o) (ev-key-member? (ev-occ-key o) keys))
-        (ev/agenda store ws we)))))
-
-;; Build an availability db over occurrences expanded in [ws, we) using the
-;; in-memory bookings.
-(define
-  ev/avail-window-db
-  (fn
-    (store ws we)
-    (ev-avail-db (ev/agenda store ws we) (ev/bookings store))))
-
-;; Is `actor` free across [qs, qe)? Expands a window wide enough (back by the
-;; longest event) to capture any occurrence that could overlap.
-(define
-  ev/free?
-  (fn
-    (store actor qs qe)
-    (ev-free?
-      (ev/avail-window-db store (- qs (ev/store-max-duration store)) qe)
-      actor
-      qs
-      qe)))
-
-;; Earliest free slot of `duration` for `actor` in [after, horizon), or nil.
-(define
-  ev/next-free
-  (fn
-    (store actor after duration horizon)
-    (ev-next-free
-      (ev/avail-window-db
-        store
-        (- after (ev/store-max-duration store))
-        horizon)
-      actor
-      after
-      duration
-      horizon)))
-
-;; Overlapping double-bookings for `actor` among occurrences in [ws, we).
-(define
-  ev/conflicts
-  (fn
-    (store actor ws we)
-    (ev-conflicts (ev/avail-window-db store ws we) actor)))
-
-(define
-  ev/has-conflict?
-  (fn
-    (store actor ws we)
-    (> (len (ev/conflicts store actor ws we)) 0)))
-
-;; ---- durable, persist-backed booking path ----
-;; These take a persist backend `b` (persist/open) plus the schedule `store`.
-;; Bookings live in per-occurrence streams (booking.sx); availability is derived
-;; by replaying those streams for the occurrences in the query window.
-
-;; Durably book `actor` into occurrence `occ` (dict {:id :start :end}),
-;; capacity-safe. Returns the booking.sx result (:booked / :full / :already).
-(define
-  ev/book-occ!
-  (fn
-    (b store actor occ)
-    (ev/book! b (ev-occ-key occ) (ev/capacity-of store occ) actor)))
-
-;; Durably cancel `actor`'s seat on `occ`, freeing capacity.
-(define
-  ev/cancel-occ!
-  (fn (b store actor occ) (ev/cancel! b (ev-occ-key occ) actor)))
-
-;; Live roster / seats-left for a specific occurrence from persist.
-(define ev/roster-occ (fn (b occ) (ev/roster b (ev-occ-key occ))))
-
-(define
-  ev/seats-left-occ
-  (fn
-    (b store occ)
-    (ev/seats-left b (ev-occ-key occ) (ev/capacity-of store occ))))
-
-;; Derive (actor key) booking pairs from the persist rosters of `occs`.
-(define
-  ev/persist-bookings
-  (fn
-    (b occs)
-    (reduce
-      (fn
-        (acc occ)
-        (let
-          ((key (ev-occ-key occ)))
-          (append
-            acc
-            (map (fn (actor) (list actor key)) (ev/roster b key)))))
-      (list)
-      occs)))
-
-;; Availability db over [ws, we) with bookings sourced from persist streams.
-(define
-  ev/avail-db-p
-  (fn
-    (b store ws we)
-    (let
-      ((occs (ev/agenda store ws we)))
-      (ev-avail-db occs (ev/persist-bookings b occs)))))
-
-;; Persist-backed availability queries (mirror the in-memory ev/free? etc).
-(define
-  ev/free-p?
-  (fn
-    (b store actor qs qe)
-    (ev-free?
-      (ev/avail-db-p b store (- qs (ev/store-max-duration store)) qe)
-      actor
-      qs
-      qe)))
-
-(define
-  ev/next-free-p
-  (fn
-    (b store actor after duration horizon)
-    (ev-next-free
-      (ev/avail-db-p b store (- after (ev/store-max-duration store)) horizon)
-      actor
-      after
-      duration
-      horizon)))
-
-(define
-  ev/conflicts-p
-  (fn
-    (b store actor ws we)
-    (ev-conflicts (ev/avail-db-p b store ws we) actor)))
-
-(define
-  ev/has-conflict-p?
-  (fn
-    (b store actor ws we)
-    (> (len (ev/conflicts-p b store actor ws we)) 0)))
-
-;; ---- conflict-checked booking ----
-;; Capacity is per-event, but an attendee should not be double-booked against
-;; THEMSELVES across different events. Would booking `actor` into `occ` overlap
-;; an existing booking of theirs elsewhere? (Derived from persist availability;
-;; an existing booking into `occ` itself is excluded — that's idempotent.)
-(define
-  ev/would-time-conflict?
-  (fn
-    (b store actor occ)
-    (and
-      (not (ev-actor-booked? b (ev-occ-key occ) actor))
-      (not (ev/free-p? b store actor (get occ :start) (get occ :end))))))
-
-;; Book `actor` into `occ` only if it doesn't clash with their other bookings.
-;; Re-booking the same occurrence is idempotent (:already); a clash returns
-;; :time-conflict; otherwise the normal ev/book-occ! result (:booked / :full).
-(define
-  ev/book-checked!
-  (fn
-    (b store actor occ)
-    (cond
-      ((ev-actor-booked? b (ev-occ-key occ) actor) (ev/book-occ! b store actor occ))
-      ((ev/would-time-conflict? b store actor occ)
-        {:status :time-conflict :actor actor :occ-key (ev-occ-key occ)})
-      (else (ev/book-occ! b store actor occ)))))
-
-;; ---- whole-series operations ----
-;; Apply a booking action to every occurrence of one event in [ws, we) — e.g.
-;; "RSVP to the whole weekly class". Returns a list of (occ-key status) results,
-;; one per occurrence (empty if the event id is unknown).
-(define
-  ev/book-series!
-  (fn
-    (b store actor event-id ws we)
-    (let
-      ((ev (ev/event-by-id store event-id)))
-      (if
-        (nil? ev)
-        (list)
-        (map
-          (fn (occ) (list (ev-occ-key occ) (get (ev/book-occ! b store actor occ) :status)))
-          (ev-expand ev ws we))))))
-
-;; Cancel `actor` from every occurrence of one event in [ws, we).
-(define
-  ev/cancel-series!
-  (fn
-    (b store actor event-id ws we)
-    (let
-      ((ev (ev/event-by-id store event-id)))
-      (if
-        (nil? ev)
-        (list)
-        (map
-          (fn (occ) (list (ev-occ-key occ) (get (ev/cancel! b (ev-occ-key occ) actor) :status)))
-          (ev-expand ev ws we))))))
-
-;; How many statuses in a series-result list equal `status`.
-(define
-  ev/series-count
-  (fn
-    (results status)
-    (len (filter (fn (r) (= (first (rest r)) status)) results))))
-
-;; The occurrences of one event in [ws, we) that `actor` is booked into.
-(define
-  ev/series-booked
-  (fn
-    (b store actor event-id ws we)
-    (let
-      ((ev (ev/event-by-id store event-id)))
-      (if
-        (nil? ev)
-        (list)
-        (filter
-          (fn (occ) (ev-actor-booked? b (ev-occ-key occ) actor))
-          (ev-expand ev ws we))))))

lib/events/availability.sx

@@ -1,177 +0,0 @@
-;; lib/events/availability.sx — free/busy + conflict detection on Datalog.
-;;
-;; Availability is per-actor and is forward-chained Datalog over two EDB
-;; relations:
-;;
-;;   (occurrence Key EventId Start End)   ; an expanded calendar occurrence
-;;   (booking    Actor Key)               ; actor attends/holds that occurrence
-;;
-;; The derived relations are the whole policy:
-;;
-;;   busy(A,S,E)        — A is committed for [S,E) (a booked occurrence)
-;;   conflict(A,O1,O2)  — A double-booked into two overlapping occurrences
-;;   busy_in(A,QS,QE)   — A is busy somewhere inside query window [QS,QE)
-;;
-;; Intervals are half-open [Start,End) in epoch minutes (see calendar.sx), so
-;; adjacent slots (E == next start) do NOT conflict. Conflict pairs are
-;; canonical (O1 < O2 by key) so each overlap is reported once. The same `busy`
-;; rule answers "is A free in [QS,QE)?" (busy_in is empty) and feeds "when is A
-;; next free?" (ev-next-free probes candidate slots with the same rule).
-
-;; A stable key for an occurrence dict {:id :start :end}.
-(define ev-occ-key (fn (occ) (str (get occ :id) "@" (get occ :start))))
-
-(define
-  ev-occurrence-fact
-  (fn
-    (occ)
-    (list
-      (quote occurrence)
-      (ev-occ-key occ)
-      (get occ :id)
-      (get occ :start)
-      (get occ :end))))
-
-(define ev-occurrence-facts (fn (occs) (map ev-occurrence-fact occs)))
-
-(define ev-booking-fact (fn (actor key) (list (quote booking) actor key)))
-
-(define ev-qwindow-fact (fn (qs qe) (list (quote qwindow) qs qe)))
-
-;; Range restriction: each comparison's variables are bound by an earlier
-;; positive literal (qwindow / busy precede the < tests). Conflict uses
-;; (< O1 O2) on the keys so each overlapping pair is reported once.
-(define
-  ev-avail-rules
-  (quote
-    ((busy A S E <- (booking A O) (occurrence O _ S E))
-      (conflict
-        A
-        O1
-        O2
-        <-
-        (booking A O1)
-        (booking A O2)
-        (occurrence O1 _ S1 E1)
-        (occurrence O2 _ S2 E2)
-        (< O1 O2)
-        (< S1 E2)
-        (< S2 E1))
-      (busy_in A QS QE <- (qwindow QS QE) (busy A S E) (< S QE) (< QS E)))))
-
-;; Build a Datalog db from EDB facts under the availability ruleset.
-(define ev-build-avail (fn (facts) (dl-program-data facts ev-avail-rules)))
-
-;; Convenience: build a db from occurrence dicts + booking pairs.
-;; bookings is a list of (actor key) pairs.
-(define
-  ev-avail-db
-  (fn
-    (occs bookings)
-    (ev-build-avail
-      (append
-        (ev-occurrence-facts occs)
-        (map
-          (fn (b) (ev-booking-fact (first b) (first (rest b))))
-          bookings)))))
-
-;; Helper: insertion sort a list of (S E ...) lists ascending by S then E.
-(define
-  ev-list-before?
-  (fn
-    (a b)
-    (cond
-      ((< (first a) (first b)) true)
-      ((> (first a) (first b)) false)
-      (else (< (first (rest a)) (first (rest b)))))))
-
-(define
-  ev-list-insert
-  (fn
-    (x sorted)
-    (cond
-      ((empty? sorted) (list x))
-      ((ev-list-before? x (first sorted)) (cons x sorted))
-      (else (cons (first sorted) (ev-list-insert x (rest sorted)))))))
-
-(define
-  ev-sort-lists
-  (fn (xs) (reduce (fn (acc x) (ev-list-insert x acc)) (list) xs)))
-
-(define
-  ev-dedup-sorted
-  (fn
-    (xs)
-    (cond
-      ((empty? xs) xs)
-      ((empty? (rest xs)) xs)
-      ((= (first xs) (first (rest xs))) (ev-dedup-sorted (rest xs)))
-      (else (cons (first xs) (ev-dedup-sorted (rest xs)))))))
-
-;; All busy intervals (list S E) for an actor, ascending by start.
-(define
-  ev-busy
-  (fn
-    (db actor)
-    (let
-      ((rows (dl-query db (list (quote busy) actor (quote S) (quote E)))))
-      (ev-sort-lists (map (fn (b) (list (get b :S) (get b :E))) rows)))))
-
-;; Distinct conflicting occurrence-key pairs for an actor (each pair once).
-(define
-  ev-conflicts
-  (fn
-    (db actor)
-    (dl-query db (list (quote conflict) actor (quote O1) (quote O2)))))
-
-(define
-  ev-has-conflict?
-  (fn (db actor) (> (len (ev-conflicts db actor)) 0)))
-
-;; Is `actor` free across the whole window [qs,qe)? (no booked occurrence
-;; overlaps it). Asserts a transient qwindow fact, queries, retracts.
-(define
-  ev-free?
-  (fn
-    (db actor qs qe)
-    (do
-      (dl-assert! db (ev-qwindow-fact qs qe))
-      (let
-        ((rows (dl-query db (list (quote busy_in) actor (quote QS) (quote QE)))))
-        (begin (dl-retract! db (ev-qwindow-fact qs qe)) (empty? rows))))))
-
-;; ---- next-free slot search ----
-;; The earliest start s >= `after` such that [s, s+duration) is entirely free
-;; for `actor` and ends at or before `horizon`, or nil if none. The earliest
-;; such slot must begin either at `after` or immediately after some busy
-;; interval ends (classic interval packing), so those are the only candidates
-;; we probe — each probe reuses the busy_in rule via ev-free?.
-
-(define
-  ev-first-free
-  (fn
-    (db actor cands duration horizon)
-    (cond
-      ((empty? cands) nil)
-      (else
-        (let
-          ((s (first cands)))
-          (if
-            (and
-              (<= (+ s duration) horizon)
-              (ev-free? db actor s (+ s duration)))
-            s
-            (ev-first-free db actor (rest cands) duration horizon)))))))
-
-(define
-  ev-next-free
-  (fn
-    (db actor after duration horizon)
-    (let
-      ((ends (filter (fn (e) (>= e after)) (map (fn (iv) (first (rest iv))) (ev-busy db actor)))))
-      (ev-first-free
-        db
-        actor
-        (ev-dedup-sorted (sort (cons after ends)))
-        duration
-        horizon))))

lib/events/booking-notify.sx

@@ -1,102 +0,0 @@
-;; lib/events/booking-notify.sx — derive lifecycle notifications from the
-;; booking stream, for delivery via notify.sx.
-;;
-;; Walking the append-only booking stream yields one notification per state
-;; change, in order, classified by kind:
-;;
-;;   :booked      a confirmed booking
-;;   :promoted    a booking for an actor who was on the waitlist (auto-promote)
-;;   :held        a provisional hold (pending payment)
-;;   :confirmed   a held seat became confirmed (payment succeeded)
-;;   :released    a held seat was released (payment failed/expired)
-;;   :cancelled   a seat was given up
-;;   :waitlisted  an actor joined the waitlist
-;;
-;; Promotion is detected by folding the waitlist as we walk: a :booking for an
-;; actor currently on the waitlist is a promotion, not a fresh booking.
-;;
-;; Each notification's id is occ-key/seq (the stream seq is unique and stable),
-;; so re-deriving and re-delivering is idempotent — the notify transport dedups
-;; on this id and never double-pings.
-
-(define
-  ev-bn-kind
-  (fn
-    (typ promoted?)
-    (cond
-      ((= typ :hold) :held)
-      ((= typ :booking) (if promoted? :promoted :booked))
-      ((= typ :confirm) :confirmed)
-      ((= typ :cancel) :cancelled)
-      ((= typ :release) :released)
-      ((= typ :waitlist) :waitlisted)
-      (else nil))))
-
-(define
-  ev-bn-update-waiting
-  (fn
-    (typ actor waiting)
-    (cond
-      ((= typ :waitlist)
-        (if
-          (ev-bk-member? actor waiting)
-          waiting
-          (ev-bk-append waiting actor)))
-      ((= typ :unwaitlist) (ev-bk-remove waiting actor))
-      ((= typ :booking) (ev-bk-remove waiting actor))
-      ((= typ :hold) (ev-bk-remove waiting actor))
-      (else waiting))))
-
-(define ev-bn-mk (fn (occ-key label actor kind seq) {:id (str occ-key "/" seq) :event label :kind kind :recipient actor :seq seq}))
-
-(define
-  ev-bn-step
-  (fn
-    (occ-key label events waiting)
-    (if
-      (empty? events)
-      (list)
-      (let
-        ((e (first events)))
-        (let
-          ((typ (persist/event-type e))
-            (actor (get (persist/event-data e) :actor))
-            (seq (persist/event-seq e)))
-          (let
-            ((promoted? (and (= typ :booking) (ev-bk-member? actor waiting))))
-            (let
-              ((kind (ev-bn-kind typ promoted?))
-                (waiting2 (ev-bn-update-waiting typ actor waiting)))
-              (if
-                (nil? kind)
-                (ev-bn-step occ-key label (rest events) waiting2)
-                (cons
-                  (ev-bn-mk occ-key label actor kind seq)
-                  (ev-bn-step occ-key label (rest events) waiting2))))))))))
-
-;; The ordered lifecycle notifications for an occurrence's bookings. `label` is
-;; a human-facing event id carried on each notification.
-(define
-  ev/booking-notifications
-  (fn
-    (b occ-key label)
-    (ev-bn-step
-      occ-key
-      label
-      (persist/read b (ev-booking-stream occ-key))
-      (list))))
-
-;; Filter notifications to a single kind.
-(define
-  ev/notify-of-kind
-  (fn (notifs kind) (filter (fn (n) (= (get n :kind) kind)) notifs)))
-
-;; Project a notification to notify.sx's (id recipient body) wire shape.
-(define
-  ev/booking-notify->msg
-  (fn
-    (n)
-    (list
-      (get n :id)
-      (get n :recipient)
-      (list :booking-event (get n :kind) (get n :event)))))

lib/events/booking.sx

@@ -1,372 +0,0 @@
-;; lib/events/booking.sx — transactional, capacity-safe booking on persist.
-;;
-;; Each bookable occurrence has an append-only stream of booking events:
-;;
-;;   :booking  free booking — actor immediately holds a confirmed seat
-;;   :hold     provisional hold — seat reserved while payment is pending
-;;   :confirm  a held seat becomes confirmed (payment succeeded)
-;;   :release  a held seat is abandoned (payment failed/expired) — seat freed
-;;   :cancel   a held or confirmed seat is given up — seat freed
-;;
-;; The live state is the stream FOLDED in order into per-actor seat states
-;; (:held / :confirmed); an actor in ANY state occupies a seat, so both held and
-;; confirmed seats count toward capacity — a pending payment cannot be
-;; oversold. A freed seat (release/cancel) reopens capacity.
-;;
-;; Capacity safety is the contract: two writers racing for the last seat must
-;; NEVER both succeed. Seat-ACQUIRING writes (:booking, :hold) go through
-;; persist's optimistic concurrency — `persist/append-expect` appends only if
-;; the stream's last-seq still equals what the writer observed; else it returns
-;; a conflict the writer retries. Seat-FREEING writes (:cancel, :release) and
-;; the state transition (:confirm) never oversell, so they append directly.
-
-(define ev-booking-stream (fn (occ-key) (str "booking:" occ-key)))
-
-(define
-  ev-bk-member?
-  (fn
-    (x xs)
-    (cond
-      ((empty? xs) false)
-      ((= x (first xs)) true)
-      (else (ev-bk-member? x (rest xs))))))
-
-(define
-  ev-bk-index
-  (fn
-    (xs x i)
-    (cond
-      ((empty? xs) -1)
-      ((= (first xs) x) i)
-      (else (ev-bk-index (rest xs) x (+ i 1))))))
-
-(define ev-bk-append (fn (xs a) (append xs (list a))))
-(define ev-bk-remove (fn (xs a) (filter (fn (x) (not (= x a))) xs)))
-
-;; ---- per-actor state association list: ((actor state) ...) in join order ----
-
-(define
-  ev-state-has?
-  (fn
-    (states actor)
-    (cond
-      ((empty? states) false)
-      ((= (first (first states)) actor) true)
-      (else (ev-state-has? (rest states) actor)))))
-
-(define
-  ev-state-get
-  (fn
-    (states actor)
-    (cond
-      ((empty? states) :none)
-      ((= (first (first states)) actor) (first (rest (first states))))
-      (else (ev-state-get (rest states) actor)))))
-
-(define
-  ev-state-del
-  (fn (states actor) (filter (fn (p) (not (= (first p) actor))) states)))
-
-(define
-  ev-state-set
-  (fn
-    (states actor st)
-    (if
-      (ev-state-has? states actor)
-      (map (fn (p) (if (= (first p) actor) (list actor st) p)) states)
-      (append states (list (list actor st))))))
-
-;; Fold the booking stream into per-actor seat states (join order preserved).
-(define
-  ev-fold-states
-  (fn
-    (events)
-    (reduce
-      (fn
-        (acc e)
-        (let
-          ((typ (persist/event-type e))
-            (actor (get (persist/event-data e) :actor)))
-          (cond
-            ((= typ :booking) (ev-state-set acc actor :confirmed))
-            ((= typ :hold) (ev-state-set acc actor :held))
-            ((= typ :confirm)
-              (if
-                (ev-state-has? acc actor)
-                (ev-state-set acc actor :confirmed)
-                acc))
-            ((= typ :cancel) (ev-state-del acc actor))
-            ((= typ :release) (ev-state-del acc actor))
-            (else acc))))
-      (list)
-      events)))
-
-(define
-  ev-states-of
-  (fn
-    (b occ-key)
-    (ev-fold-states (persist/read b (ev-booking-stream occ-key)))))
-
-;; Live roster (actors holding a seat — held or confirmed), oldest active first.
-(define
-  ev-booked-actors
-  (fn (b occ-key) (map (fn (p) (first p)) (ev-states-of b occ-key))))
-
-(define
-  ev-actor-booked?
-  (fn (b occ-key actor) (ev-bk-member? actor (ev-booked-actors b occ-key))))
-
-;; Live seat count (folded roster size — both held and confirmed seats).
-(define
-  ev-booking-count
-  (fn (b occ-key) (len (ev-booked-actors b occ-key))))
-
-;; Seat state for an actor: :held / :confirmed / :none.
-(define
-  ev/seat-state
-  (fn (b occ-key actor) (ev-state-get (ev-states-of b occ-key) actor)))
-
-;; 1-based seat number for an actor on the roster (0 if not booked).
-(define
-  ev-seat-of
-  (fn
-    (actors actor)
-    (let
-      ((i (ev-bk-index actors actor 0)))
-      (if (< i 0) 0 (+ i 1)))))
-
-;; ---- seat-acquiring writes (capacity-guarded via append-expect) ----
-
-;; One seat-acquiring attempt of `kind` (:booking or :hold) against an OBSERVED
-;; snapshot (roster the writer saw + the last-seq). Returns :already / :full /
-;; :conflict, or a success dict tagged with `ok-status`. :conflict means a
-;; concurrent append landed since the snapshot — the caller must re-observe.
-(define
-  ev-acquire-with-observed
-  (fn
-    (b occ-key capacity actor observed-actors expected kind ok-status)
-    (cond
-      ((ev-bk-member? actor observed-actors) {:seat (ev-seat-of observed-actors actor) :actor actor :status :already})
-      ((>= (len observed-actors) capacity) {:actor actor :capacity capacity :status :full})
-      (else
-        (let
-          ((r (persist/append-expect b (ev-booking-stream occ-key) expected kind 0 {:actor actor})))
-          (if (persist/conflict? r) {:actual (persist/conflict-actual r) :actor actor :status :conflict} {:seat (+ (len observed-actors) 1) :actor actor :status ok-status}))))))
-
-(define
-  ev-acquire!
-  (fn
-    (b occ-key capacity actor kind ok-status)
-    (let
-      ((res (ev-acquire-with-observed b occ-key capacity actor (ev-booked-actors b occ-key) (persist/last-seq b (ev-booking-stream occ-key)) kind ok-status)))
-      (if
-        (= (get res :status) :conflict)
-        (ev-acquire! b occ-key capacity actor kind ok-status)
-        res))))
-
-;; Capacity-safe confirmed booking (retrying on conflict).
-(define
-  ev/book!
-  (fn
-    (b occ-key capacity actor)
-    (ev-acquire! b occ-key capacity actor :booking :booked)))
-
-;; Capacity-safe provisional hold (retrying on conflict). The seat is reserved
-;; (counts toward capacity) until confirmed or released.
-(define
-  ev/hold!
-  (fn
-    (b occ-key capacity actor)
-    (ev-acquire! b occ-key capacity actor :hold :held)))
-
-;; Test seam: one attempt against a caller-supplied snapshot (book or hold).
-(define
-  ev/book-with-observed
-  (fn
-    (b occ-key capacity actor observed-actors expected)
-    (ev-acquire-with-observed
-      b
-      occ-key
-      capacity
-      actor
-      observed-actors
-      expected
-      :booking :booked)))
-
-(define
-  ev/hold-with-observed
-  (fn
-    (b occ-key capacity actor observed-actors expected)
-    (ev-acquire-with-observed
-      b
-      occ-key
-      capacity
-      actor
-      observed-actors
-      expected
-      :hold :held)))
-
-;; ---- state transitions / seat-freeing writes (no oversell, append direct) ----
-
-;; Confirm a held seat (payment succeeded). :confirmed on success,
-;; :already-confirmed if it was confirmed, :not-held otherwise.
-(define
-  ev/confirm!
-  (fn
-    (b occ-key actor)
-    (let
-      ((st (ev/seat-state b occ-key actor)))
-      (cond
-        ((= st :held)
-          (begin
-            (persist/append
-              b
-              (ev-booking-stream occ-key)
-              :confirm 0
-              {:actor actor})
-            {:actor actor :status :confirmed}))
-        ((= st :confirmed) {:actor actor :status :already-confirmed})
-        (else {:actor actor :status :not-held})))))
-
-;; Release a held seat (payment failed/expired), freeing it. Only valid for a
-;; held seat — confirmed bookings are given up via ev/cancel!.
-(define
-  ev/release!
-  (fn
-    (b occ-key actor)
-    (let
-      ((st (ev/seat-state b occ-key actor)))
-      (if
-        (= st :held)
-        (begin
-          (persist/append
-            b
-            (ev-booking-stream occ-key)
-            :release 0
-            {:actor actor})
-          {:actor actor :status :released})
-        {:actor actor :status :not-held}))))
-
-;; Cancel a held or confirmed seat, freeing it. :cancelled or :not-booked.
-(define
-  ev/cancel!
-  (fn
-    (b occ-key actor)
-    (if
-      (ev-bk-member? actor (ev-booked-actors b occ-key))
-      (begin
-        (persist/append
-          b
-          (ev-booking-stream occ-key)
-          :cancel 0
-          {:actor actor})
-        {:actor actor :status :cancelled})
-      {:actor actor :status :not-booked})))
-
-;; The roster as a plain list of actors (oldest active first).
-(define ev/roster (fn (b occ-key) (ev-booked-actors b occ-key)))
-
-;; Seats remaining for an occurrence of the given capacity.
-(define
-  ev/seats-left
-  (fn
-    (b occ-key capacity)
-    (max 0 (- capacity (ev-booking-count b occ-key)))))
-
-;; ---- waitlist ----
-;; When an occurrence is full, actors join a FIFO waitlist (:waitlist /
-;; :unwaitlist events on the same stream). Taking a seat (:booking / :hold)
-;; removes an actor from the queue, so the waitlist fold is independent of the
-;; seat fold. Cancelling/releasing a seat can auto-promote the head of the
-;; queue (a :booking appended for them).
-
-(define
-  ev-fold-waiting
-  (fn
-    (events)
-    (reduce
-      (fn
-        (acc e)
-        (let
-          ((typ (persist/event-type e))
-            (actor (get (persist/event-data e) :actor)))
-          (cond
-            ((= typ :waitlist) (if (ev-bk-member? actor acc) acc (ev-bk-append acc actor)))
-            ((= typ :unwaitlist) (ev-bk-remove acc actor))
-            ((= typ :booking) (ev-bk-remove acc actor))
-            ((= typ :hold) (ev-bk-remove acc actor))
-            (else acc))))
-      (list)
-      events)))
-
-;; The current waitlist queue (FIFO, oldest first).
-(define
-  ev/waitlist
-  (fn (b occ-key) (ev-fold-waiting (persist/read b (ev-booking-stream occ-key)))))
-
-;; 1-based queue position for an actor (0 if not waiting).
-(define
-  ev/waitlist-position
-  (fn (b occ-key actor) (ev-seat-of (ev/waitlist b occ-key) actor)))
-
-;; Book if a seat is free, else join the waitlist. Idempotent: already seated →
-;; :already; already queued → :already-waiting.
-(define
-  ev/waitlist!
-  (fn
-    (b occ-key capacity actor)
-    (let
-      ((seats (ev-booked-actors b occ-key))
-        (waiting (ev/waitlist b occ-key)))
-      (cond
-        ((ev-bk-member? actor seats)
-          {:status :already :seat (ev-seat-of seats actor) :actor actor})
-        ((ev-bk-member? actor waiting)
-          {:status :already-waiting :position (ev-seat-of waiting actor) :actor actor})
-        (else
-          (let
-            ((r (ev/book! b occ-key capacity actor)))
-            (if
-              (= (get r :status) :booked)
-              r
-              (begin
-                (persist/append b (ev-booking-stream occ-key) :waitlist 0 {:actor actor})
-                {:status :waitlisted
-                  :position (+ (len waiting) 1)
-                  :actor actor}))))))))
-
-;; Leave the waitlist. :left or :not-waiting.
-(define
-  ev/leave-waitlist!
-  (fn
-    (b occ-key actor)
-    (if
-      (ev-bk-member? actor (ev/waitlist b occ-key))
-      (begin
-        (persist/append b (ev-booking-stream occ-key) :unwaitlist 0 {:actor actor})
-        {:status :left :actor actor})
-      {:status :not-waiting :actor actor})))
-
-;; Cancel a seat and, if that frees capacity, auto-promote the head of the
-;; waitlist (a confirmed booking). Returns the cancel result plus :promoted
-;; (the actor promoted, or nil).
-(define
-  ev/cancel-promote!
-  (fn
-    (b occ-key capacity actor)
-    (let
-      ((c (ev/cancel! b occ-key actor)))
-      (if
-        (= (get c :status) :cancelled)
-        (let
-          ((waiting (ev/waitlist b occ-key))
-            (seats (ev-booked-actors b occ-key)))
-          (if
-            (and (not (empty? waiting)) (< (len seats) capacity))
-            (let
-              ((promoted (first waiting)))
-              (begin
-                (persist/append b (ev-booking-stream occ-key) :booking 0 {:actor promoted})
-                {:status :cancelled :actor actor :promoted promoted}))
-            {:status :cancelled :actor actor :promoted nil}))
-        c))))

lib/events/calendar.sx

@@ -1,614 +0,0 @@
-;; lib/events/calendar.sx — civil date arithmetic + RRULE expansion in a window.
-;;
-;; Datetimes are integer "epoch minutes": days-since-1970-01-01 * 1440 plus
-;; minute-of-day. Ordering, window bounds, and durations are plain integer
-;; arithmetic. Civil <-> day-number conversion uses Howard Hinnant's algorithm
-;; (exact, branch-free, correct for the proleptic Gregorian calendar).
-;;
-;; RRULE expansion is the bridge to Datalog: a recurring event expands to a
-;; bounded list of occurrence dicts within an explicit (win-start, win-end)
-;; window. Expansion is ALWAYS windowed — an RRULE without a window is an
-;; infinite computation and is never permitted. Supported subset (RFC 5545):
-;; FREQ=DAILY|WEEKLY|MONTHLY, INTERVAL, COUNT, UNTIL, BYDAY (weekly: weekday
-;; numbers; monthly: {:ord N :wd W} ordinal weekdays), BYMONTHDAY (monthly,
-;; negative = from month end). YEARLY and the rest are deferred.
-
-;; ---- integer helpers ----
-
-;; Floored integer division (modulo is already floored, so the remainder
-;; subtraction makes the quotient exact and floor-correct for any sign).
-(define ev-floor-div (fn (a b) (quotient (- a (modulo a b)) b)))
-
-(define ev-or (fn (x d) (if (nil? x) d x)))
-
-(define ev-filter-nil (fn (xs) (filter (fn (x) (not (nil? x))) xs)))
-
-;; ---- civil date core (Hinnant) ----
-
-;; Days since 1970-01-01 for civil (y, m, d). m in [1,12], d in [1,31].
-(define
-  ev-days-from-civil
-  (fn
-    (y0 m d)
-    (let
-      ((y (if (<= m 2) (- y0 1) y0)))
-      (let
-        ((era (ev-floor-div (if (>= y 0) y (- y 399)) 400)))
-        (let
-          ((yoe (- y (* era 400)))
-            (doy
-              (+
-                (ev-floor-div
-                  (+
-                    (*
-                      153
-                      (+ m (if (> m 2) -3 9)))
-                    2)
-                  5)
-                (- d 1))))
-          (let
-            ((doe (+ (* yoe 365) (ev-floor-div yoe 4) (- (ev-floor-div yoe 100)) doy)))
-            (+ (* era 146097) doe -719468)))))))
-
-;; Civil (y m d) list from a day-number.
-(define
-  ev-civil-from-days
-  (fn
-    (z0)
-    (let
-      ((z (+ z0 719468)))
-      (let
-        ((era (ev-floor-div (if (>= z 0) z (- z 146096)) 146097)))
-        (let
-          ((doe (- z (* era 146097))))
-          (let
-            ((yoe (ev-floor-div (+ (- doe (ev-floor-div doe 1460)) (ev-floor-div doe 36524) (- (ev-floor-div doe 146096))) 365)))
-            (let
-              ((y (+ yoe (* era 400)))
-                (doy
-                  (-
-                    doe
-                    (+
-                      (* 365 yoe)
-                      (ev-floor-div yoe 4)
-                      (- (ev-floor-div yoe 100))))))
-              (let
-                ((mp (ev-floor-div (+ (* 5 doy) 2) 153)))
-                (let
-                  ((d (+ (- doy (ev-floor-div (+ (* 153 mp) 2) 5)) 1))
-                    (m
-                      (if
-                        (< mp 10)
-                        (+ mp 3)
-                        (- mp 9))))
-                  (list (if (<= m 2) (+ y 1) y) m d))))))))))
-
-;; Weekday of a day-number: 0=Mon .. 6=Sun (1970-01-01 is Thursday = 3).
-(define ev-weekday-of-days (fn (z) (modulo (+ z 3) 7)))
-
-(define
-  ev-days-in-month
-  (fn
-    (y m)
-    (-
-      (ev-days-from-civil
-        (if (= m 12) (+ y 1) y)
-        (if (= m 12) 1 (+ m 1))
-        1)
-      (ev-days-from-civil y m 1))))
-
-;; Add k months to (y,m), returning (list y2 m2).
-(define
-  ev-add-months
-  (fn
-    (y m k)
-    (let
-      ((total (+ (* y 12) (- m 1) k)))
-      (list
-        (ev-floor-div total 12)
-        (+ (modulo total 12) 1)))))
-
-;; ---- datetime (epoch minutes) ----
-
-(define
-  ev-dt
-  (fn
-    (y m d hh mm)
-    (+ (* (ev-days-from-civil y m d) 1440) (* hh 60) mm)))
-
-(define ev-date (fn (y m d) (ev-dt y m d 0 0)))
-
-(define ev-dt->days (fn (t) (ev-floor-div t 1440)))
-
-(define ev-dt->civil (fn (t) (ev-civil-from-days (ev-dt->days t))))
-
-(define ev-dt-weekday (fn (t) (ev-weekday-of-days (ev-dt->days t))))
-
-(define ev-dt-tod (fn (t) (modulo t 1440)))
-
-(define ev-civ-y (fn (c) (first c)))
-(define ev-civ-m (fn (c) (first (rest c))))
-(define ev-civ-d (fn (c) (first (rest (rest c)))))
-
-;; ---- event + occurrence constructors ----
-
-;; rrule is nil (single event) or a dict:
-;;   {:freq :daily|:weekly|:monthly :interval N :count N|nil :until DT|nil
-;;    :byday ...|nil :bymonthday (list 15 -1)|nil}
-;;   weekly  :byday -> (list 0 2 4)            weekday numbers, 0=Mon
-;;   monthly :byday -> (list {:ord 2 :wd 1})   nth weekday (ord<0 from end)
-;;   monthly :bymonthday -> (list 15 -1)       day of month (negative from end)
-(define ev-event (fn (id dtstart duration rrule capacity) {:duration duration :id id :dtstart dtstart :capacity capacity :rrule rrule}))
-
-;; Event with EXDATE/RDATE exceptions. exdate/rdate are lists of epoch-minute
-;; starts to exclude from / add to the expansion (RFC 5545 VEVENT properties).
-(define
-  ev-event-full
-  (fn
-    (id dtstart duration rrule capacity exdate rdate)
-    {:duration duration
-      :id id
-      :dtstart dtstart
-      :capacity capacity
-      :rrule rrule
-      :exdate exdate
-      :rdate rdate}))
-
-(define ev-occ (fn (id start dur) {:id id :start start :end (+ start dur)}))
-
-;; ---- DAILY expansion ----
-;; occ starts at dtstart; n counts every generated occurrence (window-
-;; independent, so COUNT/UNTIL bound the rule, not the view). Emits only
-;; occurrences inside [win-start, win-end].
-(define
-  ev-daily-loop
-  (fn
-    (id occ duration step count until dtstart win-start win-end acc n)
-    (cond
-      ((> occ win-end) acc)
-      ((and (not (nil? count)) (>= n count)) acc)
-      ((and (not (nil? until)) (> occ until)) acc)
-      (else
-        (begin
-          (when (>= occ win-start) (append! acc (ev-occ id occ duration)))
-          (ev-daily-loop
-            id
-            (+ occ step)
-            duration
-            step
-            count
-            until
-            dtstart
-            win-start
-            win-end
-            acc
-            (+ n 1)))))))
-
-;; ---- shared per-period emit ----
-;; Walk a start-ascending list of candidate occurrence datetimes for one
-;; period, generating (count toward COUNT) those >= dtstart within UNTIL, and
-;; emitting those also inside the window. Returns the updated running n.
-(define
-  ev-emit-occs
-  (fn
-    (id occs duration count until dtstart win-start win-end acc n)
-    (if
-      (empty? occs)
-      n
-      (let
-        ((occ (first occs)))
-        (let
-          ((generates? (and (>= occ dtstart) (or (nil? until) (<= occ until)) (or (nil? count) (< n count)))))
-          (begin
-            (when
-              (and generates? (>= occ win-start) (<= occ win-end))
-              (append! acc (ev-occ id occ duration)))
-            (ev-emit-occs
-              id
-              (rest occs)
-              duration
-              count
-              until
-              dtstart
-              win-start
-              win-end
-              acc
-              (if generates? (+ n 1) n))))))))
-
-;; ---- WEEKLY expansion ----
-;; Iterate week by week from the Monday of dtstart's week; within each active
-;; week emit each BYDAY (sorted). n counts every generated occurrence.
-
-(define
-  ev-week0-days
-  (fn (dtstart) (- (ev-dt->days dtstart) (ev-dt-weekday dtstart))))
-
-(define
-  ev-byday-default
-  (fn
-    (byday dtstart)
-    (if (nil? byday) (list (ev-dt-weekday dtstart)) (sort byday))))
-
-(define
-  ev-weekly-loop
-  (fn
-    (id
-      week-days
-      tod
-      duration
-      week-step
-      bd
-      count
-      until
-      dtstart
-      win-start
-      win-end
-      acc
-      n)
-    (let
-      ((week-start-dt (* week-days 1440)))
-      (cond
-        ((> week-start-dt win-end) acc)
-        ((and (not (nil? count)) (>= n count)) acc)
-        (else
-          (let
-            ((occs (map (fn (wd) (+ (* (+ week-days wd) 1440) tod)) bd)))
-            (let
-              ((n2 (ev-emit-occs id occs duration count until dtstart win-start win-end acc n)))
-              (ev-weekly-loop
-                id
-                (+ week-days week-step)
-                tod
-                duration
-                week-step
-                bd
-                count
-                until
-                dtstart
-                win-start
-                win-end
-                acc
-                n2))))))))
-
-;; ---- MONTHLY expansion ----
-;; Iterate month by month from dtstart's month, stepping by INTERVAL months.
-;; Candidate days per month come from BYMONTHDAY, then ordinal BYDAY, else the
-;; day-of-month of dtstart (skipped in months too short to contain it).
-
-;; Resolve a BYMONTHDAY value to a valid day-of-month, or nil.
-(define
-  ev-resolve-monthday
-  (fn
-    (y m bmd)
-    (let
-      ((dim (ev-days-in-month y m)))
-      (let
-        ((day (if (< bmd 0) (+ dim 1 bmd) bmd)))
-        (if (and (>= day 1) (<= day dim)) day nil)))))
-
-;; Resolve an ordinal weekday {:ord :wd} to a day-of-month, or nil.
-(define
-  ev-resolve-nth-weekday
-  (fn
-    (y m ord wd)
-    (let
-      ((dim (ev-days-in-month y m)))
-      (if
-        (> ord 0)
-        (let
-          ((first-wd (ev-weekday-of-days (ev-days-from-civil y m 1))))
-          (let
-            ((day (+ 1 (modulo (- wd first-wd) 7) (* (- ord 1) 7))))
-            (if (<= day dim) day nil)))
-        (let
-          ((last-wd (ev-weekday-of-days (ev-days-from-civil y m dim))))
-          (let
-            ((day (- dim (modulo (- last-wd wd) 7) (* (- (- ord) 1) 7))))
-            (if (>= day 1) day nil)))))))
-
-(define
-  ev-month-candidates
-  (fn
-    (y m rrule dtstart)
-    (let
-      ((bmd (get rrule :bymonthday)) (byday (get rrule :byday)))
-      (cond
-        ((not (nil? bmd))
-          (ev-filter-nil (map (fn (d) (ev-resolve-monthday y m d)) bmd)))
-        ((not (nil? byday))
-          (ev-filter-nil
-            (map
-              (fn
-                (e)
-                (ev-resolve-nth-weekday y m (get e :ord) (get e :wd)))
-              byday)))
-        (else
-          (ev-filter-nil
-            (list
-              (ev-resolve-monthday y m (ev-civ-d (ev-dt->civil dtstart))))))))))
-
-(define
-  ev-monthly-loop
-  (fn
-    (id
-      y
-      m
-      rrule
-      duration
-      tod
-      interval
-      count
-      until
-      dtstart
-      win-start
-      win-end
-      acc
-      n)
-    (let
-      ((month-start (ev-dt y m 1 0 0)))
-      (cond
-        ((> month-start win-end) acc)
-        ((and (not (nil? count)) (>= n count)) acc)
-        (else
-          (let
-            ((days (sort (ev-month-candidates y m rrule dtstart))))
-            (let
-              ((occs (map (fn (d) (+ (* (ev-days-from-civil y m d) 1440) tod)) days)))
-              (let
-                ((n2 (ev-emit-occs id occs duration count until dtstart win-start win-end acc n))
-                  (nm (ev-add-months y m interval)))
-                (ev-monthly-loop
-                  id
-                  (ev-civ-y nm)
-                  (ev-civ-m nm)
-                  rrule
-                  duration
-                  tod
-                  interval
-                  count
-                  until
-                  dtstart
-                  win-start
-                  win-end
-                  acc
-                  n2)))))))))
-
-;; ---- top-level expansion ----
-;; Raw expansion (RRULE / single event), before EXDATE/RDATE are applied.
-;; Returns a list of occurrence dicts {:id :start :end} within the window.
-(define
-  ev-expand-base
-  (fn
-    (event win-start win-end)
-    (let
-      ((id (get event :id))
-        (dtstart (get event :dtstart))
-        (duration (get event :duration))
-        (rrule (get event :rrule)))
-      (if
-        (nil? rrule)
-        (if
-          (and (>= dtstart win-start) (<= dtstart win-end))
-          (list (ev-occ id dtstart duration))
-          (list))
-        (let
-          ((freq (get rrule :freq))
-            (interval (ev-or (get rrule :interval) 1))
-            (count (get rrule :count))
-            (until (get rrule :until))
-            (byday (get rrule :byday))
-            (acc (list)))
-          (begin
-            (cond
-              ((= freq :daily)
-                (ev-daily-loop
-                  id
-                  dtstart
-                  duration
-                  (* interval 1440)
-                  count
-                  until
-                  dtstart
-                  win-start
-                  win-end
-                  acc
-                  0))
-              ((= freq :weekly)
-                (ev-weekly-loop
-                  id
-                  (ev-week0-days dtstart)
-                  (ev-dt-tod dtstart)
-                  duration
-                  (* interval 7)
-                  (ev-byday-default byday dtstart)
-                  count
-                  until
-                  dtstart
-                  win-start
-                  win-end
-                  acc
-                  0))
-              ((= freq :monthly)
-                (let
-                  ((civ (ev-dt->civil dtstart)))
-                  (ev-monthly-loop
-                    id
-                    (ev-civ-y civ)
-                    (ev-civ-m civ)
-                    rrule
-                    duration
-                    (ev-dt-tod dtstart)
-                    interval
-                    count
-                    until
-                    dtstart
-                    win-start
-                    win-end
-                    acc
-                    0)))
-              (else (error (str "ev-expand-base: unsupported freq: " freq))))
-            acc))))))
-
-;; ---- EXDATE / RDATE (RFC 5545 exceptions) ----
-;; Applied AFTER raw expansion: RDATE adds explicit occurrences within the
-;; window, EXDATE removes occurrences whose start matches (EXDATE wins over
-;; RDATE). Both are VEVENT-level: (get event :exdate) / (get event :rdate) are
-;; lists of epoch-minute starts; nil for plain events.
-
-(define
-  ev-num-member?
-  (fn
-    (n xs)
-    (cond
-      ((empty? xs) false)
-      ((= n (first xs)) true)
-      (else (ev-num-member? n (rest xs))))))
-
-;; Drop duplicate-start occurrences from a start-sorted list (keep one).
-(define
-  ev-dedupe-by-start
-  (fn
-    (occs)
-    (cond
-      ((empty? occs) occs)
-      ((empty? (rest occs)) occs)
-      ((= (get (first occs) :start) (get (first (rest occs)) :start))
-        (ev-dedupe-by-start (rest occs)))
-      (else (cons (first occs) (ev-dedupe-by-start (rest occs)))))))
-
-(define
-  ev-apply-exceptions
-  (fn
-    (event base win-start win-end)
-    (let
-      ((id (get event :id))
-        (duration (get event :duration))
-        (exdate (ev-or (get event :exdate) (list)))
-        (rdate (ev-or (get event :rdate) (list))))
-      (let
-        ((rdate-occs
-           (reduce
-             (fn
-               (acc d)
-               (if
-                 (and (>= d win-start) (<= d win-end))
-                 (cons (ev-occ id d duration) acc)
-                 acc))
-             (list)
-             rdate)))
-        (let
-          ((no-ex
-             (filter
-               (fn (o) (not (ev-num-member? (get o :start) exdate)))
-               (append base rdate-occs))))
-          (ev-dedupe-by-start (ev-sort-occs no-ex)))))))
-
-;; ---- per-occurrence overrides (RFC 5545 RECURRENCE-ID) ----
-;; A single instance of a recurring series can be detached and rescheduled. The
-;; event carries :overrides — a list of (orig-start {:start :duration}) — keyed
-;; by the occurrence's ORIGINAL start. Applied after EXDATE/RDATE. A moved
-;; instance whose new start leaves the window is dropped from this window (the
-;; original slot is vacated); an instance moved INTO the window from outside is
-;; out of scope for a windowed expansion (known stub limitation).
-
-(define
-  ev-assoc-lookup
-  (fn
-    (k pairs)
-    (cond
-      ((empty? pairs) nil)
-      ((= (first (first pairs)) k) (first (rest (first pairs))))
-      (else (ev-assoc-lookup k (rest pairs))))))
-
-(define
-  ev-apply-overrides
-  (fn
-    (id base overrides)
-    (map
-      (fn
-        (o)
-        (let
-          ((ov (ev-assoc-lookup (get o :start) overrides)))
-          (if (nil? ov) o (ev-occ id (get ov :start) (get ov :duration)))))
-      base)))
-
-;; Add an override that reschedules the occurrence originally at `orig-start`
-;; to `new-start` with `new-duration`.
-(define
-  ev-with-override
-  (fn
-    (event orig-start new-start new-duration)
-    (assoc
-      event
-      :overrides
-      (cons
-        (list orig-start {:start new-start :duration new-duration})
-        (ev-or (get event :overrides) (list))))))
-
-;; Naive (single time-domain) expansion: RRULE + EXDATE/RDATE + overrides.
-(define
-  ev-expand-naive
-  (fn
-    (event win-start win-end)
-    (let
-      ((excepted
-         (ev-apply-exceptions
-           event
-           (ev-expand-base event win-start win-end)
-           win-start
-           win-end))
-        (overrides (ev-or (get event :overrides) (list)))
-        (id (get event :id)))
-      (if
-        (empty? overrides)
-        excepted
-        (filter
-          (fn (o) (and (>= (get o :start) win-start) (<= (get o :start) win-end)))
-          (ev-sort-occs (ev-apply-overrides id excepted overrides)))))))
-
-;; Public entry point. A tz-aware event (`:tz` set) expands in local wall-clock
-;; time and converts each occurrence to UTC (ev-expand-tz, timezone.sx); a plain
-;; event expands naively in a single time domain. The window is UTC either way.
-(define
-  ev-expand
-  (fn
-    (event win-start win-end)
-    (let
-      ((tz (get event :tz)))
-      (if
-        (nil? tz)
-        (ev-expand-naive event win-start win-end)
-        (ev-expand-tz event tz win-start win-end)))))
-
-;; ---- multi-event expansion (sorted by start) ----
-
-;; Insertion of one occurrence into a start-ascending list.
-(define
-  ev-occ-insert
-  (fn
-    (o sorted)
-    (cond
-      ((empty? sorted) (list o))
-      ((<= (get o :start) (get (first sorted) :start)) (cons o sorted))
-      (else (cons (first sorted) (ev-occ-insert o (rest sorted)))))))
-
-(define
-  ev-sort-occs
-  (fn (occs) (reduce (fn (acc o) (ev-occ-insert o acc)) (list) occs)))
-
-;; Expand many events into one occurrence list, ascending by start.
-(define
-  ev-expand-all
-  (fn
-    (events win-start win-end)
-    (let
-      ((acc (list)))
-      (begin
-        (for-each
-          (fn
-            (ev)
-            (for-each
-              (fn (o) (append! acc o))
-              (ev-expand ev win-start win-end)))
-          events)
-        (ev-sort-occs acc)))))

lib/events/conformance.conf

@@ -1,63 +0,0 @@
-# events-on-sx conformance config — sourced by lib/guest/conformance.sh.
-
-LANG_NAME=events
-MODE=dict
-SCOREBOARD_DIR=lib/events
-
-PRELOADS=(
-  spec/stdlib.sx
-  lib/r7rs.sx
-  lib/datalog/tokenizer.sx
-  lib/datalog/parser.sx
-  lib/datalog/unify.sx
-  lib/datalog/db.sx
-  lib/datalog/builtins.sx
-  lib/datalog/aggregates.sx
-  lib/datalog/strata.sx
-  lib/datalog/eval.sx
-  lib/datalog/api.sx
-  lib/datalog/magic.sx
-  lib/events/calendar.sx
-  lib/events/timezone.sx
-  lib/events/ical.sx
-  lib/events/availability.sx
-  lib/persist/event.sx
-  lib/persist/backend.sx
-  lib/persist/log.sx
-  lib/persist/kv.sx
-  lib/persist/concurrency.sx
-  lib/persist/api.sx
-  lib/events/booking.sx
-  lib/events/booking-notify.sx
-  lib/events/ticket.sx
-  lib/guest/lex.sx
-  lib/guest/reflective/env.sx
-  lib/guest/reflective/quoting.sx
-  lib/scheme/parser.sx
-  lib/scheme/eval.sx
-  lib/scheme/runtime.sx
-  lib/flow/spec.sx
-  lib/flow/store.sx
-  lib/flow/remote.sx
-  lib/flow/host.sx
-  lib/flow/api.sx
-  lib/events/notify.sx
-  lib/events/api.sx
-  lib/events/reminders.sx
-  lib/events/federation.sx
-)
-
-SUITES=(
-  "calendar:lib/events/tests/calendar.sx:(ev-calendar-tests-run!)"
-  "timezone:lib/events/tests/timezone.sx:(ev-timezone-tests-run!)"
-  "ical:lib/events/tests/ical.sx:(ev-ical-tests-run!)"
-  "availability:lib/events/tests/availability.sx:(ev-availability-tests-run!)"
-  "api:lib/events/tests/api.sx:(ev-api-tests-run!)"
-  "booking:lib/events/tests/booking.sx:(ev-booking-tests-run!)"
-  "booking-notify:lib/events/tests/booking-notify.sx:(ev-booking-notify-tests-run!)"
-  "ticket:lib/events/tests/ticket.sx:(ev-ticket-tests-run!)"
-  "notify:lib/events/tests/notify.sx:(ev-notify-tests-run!)"
-  "reminders:lib/events/tests/reminders.sx:(ev-reminders-tests-run!)"
-  "federation:lib/events/tests/federation.sx:(ev-federation-tests-run!)"
-  "integration:lib/events/tests/integration.sx:(ev-integration-tests-run!)"
-)

lib/events/conformance.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Thin wrapper — see lib/guest/conformance.sh and lib/events/conformance.conf.
-exec bash "$(dirname "$0")/../guest/conformance.sh" "$(dirname "$0")/conformance.conf" "$@"

lib/events/federation.sx

@@ -1,232 +0,0 @@
-;; lib/events/federation.sx — cross-instance calendar federation (trust-gated).
-;;
-;; A peer is another events instance that publishes a schedule (an events
-;; store). We merge a peer's agenda into ours ONLY if we trust it — trust is a
-;; set of peer ids, re-checked on every merge, so revoking a peer takes effect
-;; immediately. Merged occurrences carry :origin provenance (:local for ours, or
-;; the peer id) so a consumer always knows where a slot came from.
-;;
-;; This is the trust-gated stub: peers publish plain schedules and we fold the
-;; trusted ones into a single sorted agenda. Real transport (fed-sx / signed
-;; fetch) slots in behind `ev/peer-agenda` without changing the merge.
-;;
-;; Federated FREE/BUSY follows the iCal model: a peer publishes BUSY intervals
-;; for an actor (not event details — privacy-preserving), and we union local +
-;; trusted-peer busy to answer "is this actor free?" across instances.
-
-(define ev/peer (fn (id store) {:id id :busy (list) :store store}))
-
-;; A peer that also publishes free/busy: `busy` is a list of
-;; (actor ((start end) ...)) pairs.
-(define ev/peer-with-busy (fn (id store busy) {:id id :busy busy :store store}))
-
-(define ev/peer-id (fn (p) (get p :id)))
-(define ev/peer-store (fn (p) (get p :store)))
-(define ev/peer-busy-table (fn (p) (get p :busy)))
-
-(define
-  ev-fed-member?
-  (fn
-    (x xs)
-    (cond
-      ((empty? xs) false)
-      ((= x (first xs)) true)
-      (else (ev-fed-member? x (rest xs))))))
-
-;; Do we trust this peer id? (trust is a list of trusted peer ids.)
-(define ev/trusts? (fn (trust peer-id) (ev-fed-member? peer-id trust)))
-
-;; The trusted subset of a peer list.
-(define
-  ev/trusted-peers
-  (fn
-    (peers trust)
-    (filter (fn (p) (ev/trusts? trust (ev/peer-id p))) peers)))
-
-;; Tag occurrences with provenance.
-(define ev-tag-origin (fn (occs origin) (map (fn (o) {:id (get o :id) :start (get o :start) :end (get o :end) :origin origin}) occs)))
-
-;; A peer's agenda over [ws, we), tagged with the peer's id as :origin.
-(define
-  ev/peer-agenda
-  (fn
-    (peer ws we)
-    (ev-tag-origin (ev/agenda (ev/peer-store peer) ws we) (ev/peer-id peer))))
-
-;; ---- merge (sorted by start, then origin for ties) ----
-
-(define
-  ev-fed-before?
-  (fn
-    (a c)
-    (cond
-      ((< (get a :start) (get c :start)) true)
-      ((> (get a :start) (get c :start)) false)
-      (else (< (str (get a :origin)) (str (get c :origin)))))))
-
-(define
-  ev-fed-insert
-  (fn
-    (x sorted)
-    (cond
-      ((empty? sorted) (list x))
-      ((ev-fed-before? x (first sorted)) (cons x sorted))
-      (else (cons (first sorted) (ev-fed-insert x (rest sorted)))))))
-
-(define
-  ev-fed-sort
-  (fn (xs) (reduce (fn (acc x) (ev-fed-insert x acc)) (list) xs)))
-
-;; Local agenda (origin :local) merged with every TRUSTED peer's agenda,
-;; sorted by start. Untrusted peers contribute nothing.
-(define
-  ev/federated-agenda
-  (fn
-    (local-store peers trust ws we)
-    (let
-      ((acc (list)))
-      (begin
-        (for-each
-          (fn (o) (append! acc o))
-          (ev-tag-origin (ev/agenda local-store ws we) :local))
-        (for-each
-          (fn
-            (peer)
-            (when
-              (ev/trusts? trust (ev/peer-id peer))
-              (for-each
-                (fn (o) (append! acc o))
-                (ev/peer-agenda peer ws we))))
-          peers)
-        (ev-fed-sort acc)))))
-
-;; Filter a federated agenda to occurrences from one origin.
-(define
-  ev/from-origin
-  (fn
-    (agenda origin)
-    (filter (fn (o) (= (get o :origin) origin)) agenda)))
-
-;; ---- federated free/busy ----
-
-;; A peer's published busy intervals for `actor` ((start end) ...), or empty.
-(define
-  ev/peer-busy
-  (fn
-    (peer actor)
-    (let
-      ((row (ev-fed-assoc actor (ev/peer-busy-table peer))))
-      (if (nil? row) (list) (first (rest row))))))
-
-(define
-  ev-fed-assoc
-  (fn
-    (k pairs)
-    (cond
-      ((empty? pairs) nil)
-      ((= (first (first pairs)) k) (first pairs))
-      (else (ev-fed-assoc k (rest pairs))))))
-
-;; All busy intervals for `actor` across the LOCAL availability db plus every
-;; TRUSTED peer's published free/busy, merged and sorted by start.
-;; `local-db` is an availability db (see availability.sx ev-build-avail).
-(define
-  ev/federated-busy
-  (fn
-    (local-db peers trust actor)
-    (let
-      ((acc (list)))
-      (begin
-        (for-each (fn (iv) (append! acc iv)) (ev-busy local-db actor))
-        (for-each
-          (fn
-            (peer)
-            (when
-              (ev/trusts? trust (ev/peer-id peer))
-              (for-each
-                (fn (iv) (append! acc iv))
-                (ev/peer-busy peer actor))))
-          peers)
-        (ev-sort-lists acc)))))
-
-;; Half-open overlap of interval (s e) with window [qs, qe).
-(define
-  ev-fed-overlaps?
-  (fn (iv qs qe) (and (< (first iv) qe) (< qs (first (rest iv))))))
-
-;; Is `actor` free across [qs, qe) considering local + trusted-peer busy?
-(define
-  ev/federated-free?
-  (fn
-    (local-db peers trust actor qs qe)
-    (not
-      (some
-        (fn (iv) (ev-fed-overlaps? iv qs qe))
-        (ev/federated-busy local-db peers trust actor)))))
-
-;; ---- injected transport (real fed-sx / signed fetch) ----
-;; The in-process merge above expands a peer's local :store directly. In
-;; production a peer's agenda arrives over a transport. `fetch` abstracts that:
-;;   (fetch peer-id ws we) -> {:status :ok :occurrences (...)} | {:status :error :reason ...}
-;; The same merge works for any transport; an unreachable peer (:error) is
-;; skipped (graceful degradation), never breaking the agenda.
-
-(define
-  ev-find-peer
-  (fn
-    (peers pid)
-    (cond
-      ((empty? peers) nil)
-      ((= (ev/peer-id (first peers)) pid) (first peers))
-      (else (ev-find-peer (rest peers) pid)))))
-
-;; In-process transport adapter: resolves a peer-id against a peer list and
-;; expands its :store. Lets the in-process model run through the same `fetch`
-;; interface a remote transport implements.
-(define
-  ev/peer-fetch
-  (fn
-    (peers)
-    (fn
-      (pid ws we)
-      (let
-        ((p (ev-find-peer peers pid)))
-        (if
-          (nil? p)
-          {:status :error :reason :unknown-peer}
-          {:status :ok :occurrences (ev/agenda (ev/peer-store p) ws we)})))))
-
-;; Local agenda (:local) merged with each trusted peer's agenda fetched via the
-;; injected `fetch` transport, sorted by start, tagged with :origin. Peers that
-;; fail to fetch contribute nothing.
-(define
-  ev/federated-agenda-via
-  (fn
-    (local-store trusted-ids ws we fetch)
-    (let
-      ((acc (list)))
-      (begin
-        (for-each
-          (fn (o) (append! acc o))
-          (ev-tag-origin (ev/agenda local-store ws we) :local))
-        (for-each
-          (fn
-            (pid)
-            (let
-              ((res (fetch pid ws we)))
-              (when
-                (= (get res :status) :ok)
-                (for-each
-                  (fn (o) (append! acc o))
-                  (ev-tag-origin (get res :occurrences) pid)))))
-          trusted-ids)
-        (ev-fed-sort acc)))))
-
-;; Reachability report: ((peer-id :ok|:error) ...) for the trusted peers.
-(define
-  ev/federation-status
-  (fn
-    (trusted-ids ws we fetch)
-    (map
-      (fn (pid) (list pid (get (fetch pid ws we) :status)))
-      trusted-ids)))

lib/events/ical.sx

@@ -1,482 +0,0 @@
-;; lib/events/ical.sx — iCalendar (RFC 5545) export.
-;;
-;; Serializes events to VEVENT / VCALENDAR text so a rose-ash calendar can be
-;; imported by any standard client (Google/Apple/Outlook). Datetimes are UTC
-;; epoch-minutes, emitted as basic-format UTC stamps (YYYYMMDDTHHMM00Z). The
-;; full RRULE / EXDATE / RDATE model maps directly to the standard properties.
-;;
-;; Export is line-oriented: `ev/event->ical-lines` returns the VEVENT as a list
-;; of content lines (no folding/CRLF — easy to assert on); `ev/ical-render`
-;; joins lines with CRLF, the on-the-wire format. Requires calendar.sx.
-
-;; ---- formatting helpers ----
-
-(define ev-ical-pad2 (fn (n) (if (< n 10) (str "0" n) (str n))))
-
-(define
-  ev-ical-pad4
-  (fn
-    (n)
-    (cond
-      ((< n 10) (str "000" n))
-      ((< n 100) (str "00" n))
-      ((< n 1000) (str "0" n))
-      (else (str n)))))
-
-(define
-  ev-ical-nth
-  (fn
-    (xs i)
-    (if
-      (= i 0)
-      (first xs)
-      (ev-ical-nth (rest xs) (- i 1)))))
-
-(define
-  ev-ical-join
-  (fn
-    (parts sep)
-    (if
-      (empty? parts)
-      ""
-      (reduce (fn (acc p) (str acc sep p)) (first parts) (rest parts)))))
-
-;; An epoch-minute as an iCal basic-format stamp (no zone suffix).
-(define
-  ev-ical-dt-stamp
-  (fn
-    (t)
-    (let
-      ((civ (ev-dt->civil t)) (tod (ev-dt-tod t)))
-      (str
-        (ev-ical-pad4 (ev-civ-y civ))
-        (ev-ical-pad2 (ev-civ-m civ))
-        (ev-ical-pad2 (ev-civ-d civ))
-        "T"
-        (ev-ical-pad2 (quotient tod 60))
-        (ev-ical-pad2 (modulo tod 60))
-        "00"))))
-
-;; A UTC epoch-minute as a UTC stamp (trailing Z).
-(define ev-ical-dt (fn (t) (str (ev-ical-dt-stamp t) "Z")))
-
-;; A local epoch-minute as a floating/local stamp (no Z) — used with TZID.
-(define ev-ical-dt-local ev-ical-dt-stamp)
-
-;; A UTC offset in minutes as "+HHMM" / "-HHMM".
-(define
-  ev-ical-offset
-  (fn
-    (mins)
-    (let
-      ((a (abs mins)))
-      (str
-        (if (< mins 0) "-" "+")
-        (ev-ical-pad2 (quotient a 60))
-        (ev-ical-pad2 (modulo a 60))))))
-
-;; A duration in minutes as an iCal DURATION value (PT#H#M).
-(define
-  ev-ical-duration
-  (fn
-    (mins)
-    (let
-      ((h (quotient mins 60)) (m (modulo mins 60)))
-      (cond
-        ((and (> h 0) (> m 0)) (str "PT" h "H" m "M"))
-        ((> h 0) (str "PT" h "H"))
-        (else (str "PT" m "M"))))))
-
-(define
-  ev-ical-wd
-  (fn (w) (ev-ical-nth (list "MO" "TU" "WE" "TH" "FR" "SA" "SU") w)))
-
-(define
-  ev-ical-freq
-  (fn
-    (f)
-    (cond
-      ((= f :daily) "DAILY")
-      ((= f :weekly) "WEEKLY")
-      ((= f :monthly) "MONTHLY")
-      (else "DAILY"))))
-
-;; One BYDAY token: a weekly weekday number -> "MO"; a monthly ordinal weekday
-;; {:ord :wd} -> "2TU" / "-1FR".
-(define
-  ev-ical-byday-token
-  (fn
-    (e)
-    (if
-      (dict? e)
-      (str (get e :ord) (ev-ical-wd (get e :wd)))
-      (ev-ical-wd e))))
-
-;; UNTIL converter: per RFC 5545, even a TZID DTSTART requires UNTIL in UTC, so
-;; a tz event converts its (local) UNTIL to UTC; a non-tz event passes through.
-(define
-  ev-ical-conv
-  (fn
-    (event)
-    (let
-      ((tz (get event :tz)))
-      (if (nil? tz) (fn (t) t) (fn (t) (ev-tz-local->utc tz t))))))
-
-;; ---- VTIMEZONE ----
-;; A tz event exports DTSTART;TZID=<name>:<local time> and the VCALENDAR carries
-;; a VTIMEZONE block defining the zone's DST rules, so a client recurs at a
-;; fixed WALL-CLOCK time (DST-correct) rather than fixed UTC.
-
-;; A DST transition rule -> "FREQ=YEARLY;BYMONTH=<m>;BYDAY=<ord><WD>".
-(define
-  ev-ical-vtz-rrule
-  (fn
-    (rule)
-    (str
-      "FREQ=YEARLY;BYMONTH="
-      (get rule :month)
-      ";BYDAY="
-      (get rule :ord)
-      (ev-ical-wd (get rule :wd)))))
-
-;; The transition's DTSTART (local time of the FROM offset) in a reference year.
-(define
-  ev-ical-vtz-dtstart
-  (fn
-    (rule from-offset)
-    (let
-      ((day (ev-resolve-nth-weekday 1970 (get rule :month) (get rule :ord) (get rule :wd))))
-      (ev-ical-dt-local
-        (+ (* (ev-days-from-civil 1970 (get rule :month) day) 1440)
-          (get rule :time)
-          from-offset)))))
-
-;; The VTIMEZONE content lines for a zone (DAYLIGHT + STANDARD for :dst; a
-;; single STANDARD for :fixed).
-(define
-  ev-ical-vtimezone
-  (fn
-    (tz)
-    (if
-      (= (get tz :kind) :dst)
-      (let
-        ((std (get tz :std-offset))
-          (dst (get tz :dst-offset))
-          (sr (get tz :dst-start))
-          (er (get tz :dst-end)))
-        (list
-          "BEGIN:VTIMEZONE"
-          (str "TZID:" (get tz :name))
-          "BEGIN:DAYLIGHT"
-          (str "DTSTART:" (ev-ical-vtz-dtstart sr std))
-          (str "TZOFFSETFROM:" (ev-ical-offset std))
-          (str "TZOFFSETTO:" (ev-ical-offset dst))
-          (str "RRULE:" (ev-ical-vtz-rrule sr))
-          "END:DAYLIGHT"
-          "BEGIN:STANDARD"
-          (str "DTSTART:" (ev-ical-vtz-dtstart er dst))
-          (str "TZOFFSETFROM:" (ev-ical-offset dst))
-          (str "TZOFFSETTO:" (ev-ical-offset std))
-          (str "RRULE:" (ev-ical-vtz-rrule er))
-          "END:STANDARD"
-          "END:VTIMEZONE"))
-      (list
-        "BEGIN:VTIMEZONE"
-        (str "TZID:" (get tz :name))
-        "BEGIN:STANDARD"
-        "DTSTART:19700101T000000"
-        (str "TZOFFSETFROM:" (ev-ical-offset (get tz :offset)))
-        (str "TZOFFSETTO:" (ev-ical-offset (get tz :offset)))
-        "END:STANDARD"
-        "END:VTIMEZONE"))))
-
-;; ---- RRULE ----
-(define
-  ev-ical-rrule
-  (fn
-    (rrule conv)
-    (let
-      ((parts (list (str "FREQ=" (ev-ical-freq (get rrule :freq))))))
-      (begin
-        (when
-          (and
-            (not (nil? (get rrule :interval)))
-            (> (get rrule :interval) 1))
-          (append! parts (str "INTERVAL=" (get rrule :interval))))
-        (when
-          (not (nil? (get rrule :count)))
-          (append! parts (str "COUNT=" (get rrule :count))))
-        (when
-          (not (nil? (get rrule :until)))
-          (append! parts (str "UNTIL=" (ev-ical-dt (conv (get rrule :until))))))
-        (when
-          (not (nil? (get rrule :byday)))
-          (append!
-            parts
-            (str
-              "BYDAY="
-              (ev-ical-join (map ev-ical-byday-token (get rrule :byday)) ","))))
-        (when
-          (not (nil? (get rrule :bymonthday)))
-          (append!
-            parts
-            (str
-              "BYMONTHDAY="
-              (ev-ical-join
-                (map (fn (d) (str d)) (get rrule :bymonthday))
-                ","))))
-        (str "RRULE:" (ev-ical-join parts ";"))))))
-
-;; ---- VEVENT / VCALENDAR ----
-
-;; The VEVENT content lines for an event (list of strings). A tz event uses
-;; DTSTART;TZID=<name>:<local> (matched by a VTIMEZONE at the VCALENDAR level)
-;; with EXDATE/RDATE in the same TZID-local form; UNTIL is always UTC. A non-tz
-;; event uses UTC `Z` stamps throughout.
-(define
-  ev/event->ical-lines
-  (fn
-    (event)
-    (let
-      ((lines (list "BEGIN:VEVENT"))
-        (conv (ev-ical-conv event))
-        (tz (get event :tz)))
-      (let
-        ((dtparam (if (nil? tz) "" (str ";TZID=" (get tz :name))))
-          (fmt (if (nil? tz) ev-ical-dt ev-ical-dt-local)))
-        (begin
-          (append! lines (str "UID:" (get event :id)))
-          (append! lines (str "SUMMARY:" (get event :id)))
-          (append! lines (str "DTSTART" dtparam ":" (fmt (get event :dtstart))))
-          (append!
-            lines
-            (str "DURATION:" (ev-ical-duration (get event :duration))))
-          (when
-            (not (nil? (get event :rrule)))
-            (append! lines (ev-ical-rrule (get event :rrule) conv)))
-          (when
-            (and
-              (not (nil? (get event :exdate)))
-              (> (len (get event :exdate)) 0))
-            (append!
-              lines
-              (str
-                "EXDATE"
-                dtparam
-                ":"
-                (ev-ical-join (map fmt (get event :exdate)) ","))))
-          (when
-            (and
-              (not (nil? (get event :rdate)))
-              (> (len (get event :rdate)) 0))
-            (append!
-              lines
-              (str
-                "RDATE"
-                dtparam
-                ":"
-                (ev-ical-join (map fmt (get event :rdate)) ","))))
-          (append! lines "END:VEVENT")
-          lines)))))
-
-;; Collect the distinct timezones used by a list of events (by :name).
-(define
-  ev-ical-distinct-tzs
-  (fn
-    (events)
-    (reduce
-      (fn
-        (acc ev)
-        (let
-          ((tz (get ev :tz)))
-          (if
-            (or (nil? tz) (ev-ical-tz-seen? acc (get tz :name)))
-            acc
-            (append acc (list tz)))))
-      (list)
-      events)))
-
-(define
-  ev-ical-tz-seen?
-  (fn
-    (tzs name)
-    (cond
-      ((empty? tzs) false)
-      ((= (get (first tzs) :name) name) true)
-      (else (ev-ical-tz-seen? (rest tzs) name)))))
-
-;; A full VCALENDAR (list of content lines): a VTIMEZONE block for each distinct
-;; zone the events reference, then every VEVENT.
-(define
-  ev/events->ical-lines
-  (fn
-    (events)
-    (let
-      ((lines (list "BEGIN:VCALENDAR" "VERSION:2.0" "PRODID:-//rose-ash//events-on-sx//EN")))
-      (begin
-        (for-each
-          (fn
-            (tz)
-            (for-each (fn (l) (append! lines l)) (ev-ical-vtimezone tz)))
-          (ev-ical-distinct-tzs events))
-        (for-each
-          (fn
-            (ev)
-            (for-each (fn (l) (append! lines l)) (ev/event->ical-lines ev)))
-          events)
-        (append! lines "END:VCALENDAR")
-        lines))))
-
-;; Render content lines to the on-the-wire iCalendar text (CRLF-separated).
-(define ev/ical-render (fn (lines) (ev-ical-join lines "\r\n")))
-
-;; ---- import (parse VEVENT/VCALENDAR back into events) ----
-;; Inverse of the export above: parse iCalendar content lines into event dicts
-;; (ev-event-full shape). Capacity is not an iCal property, so imported events
-;; default to capacity 0 — set it after import if needed.
-
-;; "20260601T180000Z" -> UTC epoch-minutes.
-(define
-  ev-ical-parse-dt
-  (fn
-    (s)
-    (ev-dt
-      (string->number (substring s 0 4))
-      (string->number (substring s 4 6))
-      (string->number (substring s 6 8))
-      (string->number (substring s 9 11))
-      (string->number (substring s 11 13)))))
-
-;; "30M" / "" -> minutes.
-(define
-  ev-ical-parse-min
-  (fn
-    (s)
-    (if (= (string-length s) 0) 0 (string->number (first (split s "M"))))))
-
-;; "PT1H30M" / "PT1H" / "PT30M" -> minutes.
-(define
-  ev-ical-parse-duration
-  (fn
-    (s)
-    (let
-      ((body (substring s 2 (string-length s))))
-      (let
-        ((hparts (split body "H")))
-        (if
-          (> (len hparts) 1)
-          (+ (* 60 (string->number (first hparts))) (ev-ical-parse-min (first (rest hparts))))
-          (ev-ical-parse-min body))))))
-
-(define
-  ev-ical-wd->num
-  (fn
-    (tok)
-    (cond
-      ((= tok "MO") 0)
-      ((= tok "TU") 1)
-      ((= tok "WE") 2)
-      ((= tok "TH") 3)
-      ((= tok "FR") 4)
-      ((= tok "SA") 5)
-      ((= tok "SU") 6)
-      (else 0))))
-
-;; "MO" -> 0 ; "2TU" -> {:ord 2 :wd 1} ; "-1FR" -> {:ord -1 :wd 4}
-(define
-  ev-ical-parse-byday-token
-  (fn
-    (tok)
-    (let
-      ((n (string-length tok)))
-      (if
-        (= n 2)
-        (ev-ical-wd->num tok)
-        {:ord (string->number (substring tok 0 (- n 2)))
-          :wd (ev-ical-wd->num (substring tok (- n 2) n))}))))
-
-(define
-  ev-ical-parse-freq
-  (fn
-    (v)
-    (cond
-      ((= v "DAILY") :daily)
-      ((= v "WEEKLY") :weekly)
-      ((= v "MONTHLY") :monthly)
-      (else :daily))))
-
-;; "FREQ=WEEKLY;INTERVAL=2;UNTIL=...;BYDAY=MO,WE" -> rrule dict.
-(define
-  ev-ical-parse-rrule
-  (fn
-    (val)
-    (let
-      ((rr {}))
-      (begin
-        (for-each
-          (fn
-            (p)
-            (let
-              ((kv (split p "=")))
-              (let
-                ((k (first kv)) (v (first (rest kv))))
-                (cond
-                  ((= k "FREQ") (dict-set! rr :freq (ev-ical-parse-freq v)))
-                  ((= k "INTERVAL") (dict-set! rr :interval (string->number v)))
-                  ((= k "COUNT") (dict-set! rr :count (string->number v)))
-                  ((= k "UNTIL") (dict-set! rr :until (ev-ical-parse-dt v)))
-                  ((= k "BYDAY") (dict-set! rr :byday (map ev-ical-parse-byday-token (split v ","))))
-                  ((= k "BYMONTHDAY") (dict-set! rr :bymonthday (map string->number (split v ","))))
-                  (else nil)))))
-          (split val ";"))
-        rr))))
-
-;; Parse a VEVENT's content lines into an event dict.
-(define
-  ev/ical-lines->event
-  (fn
-    (lines)
-    (let
-      ((ev {:capacity 0 :rrule nil}) (exd (list)) (rd (list)))
-      (begin
-        (for-each
-          (fn
-            (line)
-            (let
-              ((kv (split line ":")))
-              (when
-                (> (len kv) 1)
-                (let
-                  ;; strip any property parameters (e.g. ";TZID=...") from the key
-                  ((k (first (split (first kv) ";"))) (v (first (rest kv))))
-                  (cond
-                    ((= k "UID") (dict-set! ev :id (string->symbol v)))
-                    ((= k "DTSTART") (dict-set! ev :dtstart (ev-ical-parse-dt v)))
-                    ((= k "DURATION") (dict-set! ev :duration (ev-ical-parse-duration v)))
-                    ((= k "RRULE") (dict-set! ev :rrule (ev-ical-parse-rrule v)))
-                    ((= k "EXDATE") (set! exd (map ev-ical-parse-dt (split v ","))))
-                    ((= k "RDATE") (set! rd (map ev-ical-parse-dt (split v ","))))
-                    (else nil))))))
-          lines)
-        (dict-set! ev :exdate exd)
-        (dict-set! ev :rdate rd)
-        ev))))
-
-;; Split a VCALENDAR line list into per-VEVENT line groups.
-(define
-  ev-ical-group-vevents
-  (fn
-    (lines cur in acc)
-    (cond
-      ((empty? lines) acc)
-      ((= (first lines) "BEGIN:VEVENT") (ev-ical-group-vevents (rest lines) (list) true acc))
-      ((= (first lines) "END:VEVENT") (ev-ical-group-vevents (rest lines) (list) false (append acc (list cur))))
-      (in (ev-ical-group-vevents (rest lines) (append cur (list (first lines))) true acc))
-      (else (ev-ical-group-vevents (rest lines) cur false acc)))))
-
-;; Parse a VCALENDAR line list into a list of events.
-(define
-  ev/parse-vcalendar
-  (fn
-    (lines)
-    (map ev/ical-lines->event (ev-ical-group-vevents lines (list) false (list)))))

lib/events/notify.sx

@@ -1,97 +0,0 @@
-;; lib/events/notify.sx — durable notification delivery flows over an injected
-;; transport (lib/flow).
-;;
-;; Reminders and digests are durable `flow`s: a flow `request`s delivery (a
-;; suspend point), the HOST performs the actual send via an injected `dispatch`
-;; (the transport — email/push/etc.), and resumes the flow with the outcome.
-;; Because flow uses deterministic replay, a completed delivery is never re-run
-;; on recovery; the host owns IO and persistence.
-;;
-;; Delivery is AT-LEAST-ONCE with idempotency. Each message carries an id (the
-;; idempotency key). Two protections stop double-delivery:
-;;   1. The transport dedups by id — a re-send of a delivered id is a no-op
-;;      that still reports ok, so a retry never produces two pings.
-;;   2. flow's replay log records each resolved request, so recovery replays the
-;;      logged outcome instead of re-issuing the send.
-;;
-;; Retry/backoff rides flow suspend/resume: each attempt issues a request with a
-;; DISTINCT tag `(deliver <id> <n>)` — distinct tags keep deterministic replay
-;; correct across retries. The dispatch returns (ok info) to finish or
-;; (retry reason) to try again, bounded by `maxn` (then (failed id reason)).
-;;
-;; A message is a 3-element list (id recipient body). The transport is generic
-;; and injected — when feed/notify lands, both consumers share one transport,
-;; so this delivery core is a candidate for extraction to `delivery-on-sx`.
-;;
-;; The Scheme flow source below loads into a flow env (see lib/flow/api.sx).
-;; `ev/notify-run` prepends it to a caller program and evaluates in the shared
-;; flow env.
-
-(define
-  ev-notify-flows-src
-  "(define (ev-msg-id m) (car m))\n   (define (ev-msg-recipient m) (car (cdr m)))\n   (define (ev-msg-body m) (car (cdr (cdr m))))\n   (define (ev-mem x xs)\n     (if (null? xs) #f (if (equal? x (car xs)) #t (ev-mem x (cdr xs)))))\n   (define (ev-notify-attempt m n maxn)\n     (let ((r (request (list (quote deliver) (ev-msg-id m) n) m)))\n       (if (eq? (car r) (quote ok))\n           (list (quote delivered) (ev-msg-id m) n)\n           (if (>= n maxn)\n               (list (quote failed) (ev-msg-id m) (car (cdr r)))\n               (ev-notify-attempt m (+ n 1) maxn)))))\n   (define (ev-deliver-reminder maxn)\n     (flow-node (lambda (m) (ev-notify-attempt m 1 maxn))))\n   (define (ev-digest-step ms maxn)\n     (if (null? ms)\n         (list)\n         (cons (ev-notify-attempt (car ms) 1 maxn)\n               (ev-digest-step (cdr ms) maxn))))\n   (define (ev-deliver-digest maxn)\n     (flow-node (lambda (ms) (ev-digest-step ms maxn))))")
-
-;; Run a Scheme flow program with the notify flows preloaded, in the shared
-;; flow env. Returns the program's value (SX-native).
-(define
-  ev/notify-run
-  (fn (prog) (flow-run (str ev-notify-flows-src "\n" prog))))
-
-;; ---- end-to-end delivery: SX messages -> the notify flow ----
-;; Bridges the SX notification-derivation modules (reminders / booking-notify /
-;; reschedule) to the durable delivery flow. An SX message (id recipient body)
-;; is serialized to s-expression text and spliced into the Scheme program as
-;; quoted data, then the digest flow delivers the batch over an injected
-;; transport. Strings round-trip through the guest Scheme as {:scm-string ...}
-;; boxes; results are unboxed back to plain SX.
-
-;; A default transport (Scheme source): always reports delivered.
-(define ev-notify-ok-transport "(lambda (k p) (list (quote ok) (quote sent)))")
-
-(define
-  ev-notify-join
-  (fn
-    (parts sep)
-    (if
-      (empty? parts)
-      ""
-      (reduce (fn (acc p) (str acc sep p)) (first parts) (rest parts)))))
-
-(define ev-msg->quoted (fn (m) (str "(quote " (serialize m) ")")))
-
-(define
-  ev-msgs->scheme
-  (fn
-    (msgs)
-    (str "(list " (ev-notify-join (map ev-msg->quoted msgs) " ") ")")))
-
-(define
-  ev-unbox-str
-  (fn
-    (x)
-    (if (and (dict? x) (has-key? x :scm-string)) (get x :scm-string) x)))
-
-(define
-  ev-unbox-result
-  (fn (r) (map (fn (item) (map ev-unbox-str item)) r)))
-
-;; Deliver a list of SX messages through the digest flow over `transport-src`
-;; (a Scheme (kind payload) -> (ok ..)|(retry reason) lambda source). `maxn`
-;; bounds retries per message, `maxticks` bounds host service ticks. Returns the
-;; per-message outcomes unboxed: (("delivered"|"failed" <id> <n-or-reason>) ...)
-(define
-  ev/deliver-messages
-  (fn
-    (msgs transport-src maxn maxticks)
-    (ev-unbox-result
-      (ev/notify-run
-        (str
-          "(define msgs "
-          (ev-msgs->scheme msgs)
-          ") (if (null? msgs) (list) (let ((s (flow/start (ev-deliver-digest "
-          maxn
-          ") msgs))) (begin (flow-run-host "
-          transport-src
-          " "
-          maxticks
-          ") (flow/result (car (cdr s))))))")))))

lib/events/reminders.sx

@@ -1,147 +0,0 @@
-;; lib/events/reminders.sx — derive reminder + digest messages from the agenda.
-;;
-;; Bridges the schedule (calendar) and the durable roster (booking on persist)
-;; to the notification layer (notify.sx). For each booked attendee of each
-;; upcoming occurrence we derive a reminder message that fires `lead` minutes
-;; before the occurrence starts. Each message has a deterministic idempotency
-;; key — occ-key / recipient / lead — so re-deriving over an overlapping window
-;; never produces a duplicate ping (the notify transport dedups on this id).
-;;
-;; A reminder is a dict:
-;;   {:id :recipient :event :start :fire-at}
-;; `ev/reminder->msg` projects it to notify's (id recipient body) wire shape.
-
-;; Reminders for one occurrence: one per booked attendee (durable roster).
-(define
-  ev/occurrence-reminders
-  (fn
-    (b occ lead)
-    (let
-      ((occ-key (ev-occ-key occ))
-        (start (get occ :start))
-        (evid (get occ :id)))
-      (map (fn (actor) {:id (str occ-key "/" actor "/" lead) :event evid :start start :fire-at (- start lead) :recipient actor}) (ev/roster-occ b occ)))))
-
-;; Insertion sort of reminder dicts ascending by :fire-at (then :id for ties).
-(define
-  ev-rem-before?
-  (fn
-    (a c)
-    (cond
-      ((< (get a :fire-at) (get c :fire-at)) true)
-      ((> (get a :fire-at) (get c :fire-at)) false)
-      (else (< (get a :id) (get c :id))))))
-
-(define
-  ev-rem-insert
-  (fn
-    (r sorted)
-    (cond
-      ((empty? sorted) (list r))
-      ((ev-rem-before? r (first sorted)) (cons r sorted))
-      (else (cons (first sorted) (ev-rem-insert r (rest sorted)))))))
-
-(define
-  ev-rem-sort
-  (fn (rs) (reduce (fn (acc r) (ev-rem-insert r acc)) (list) rs)))
-
-;; All reminders across the agenda in [ws, we), ascending by fire-at.
-(define
-  ev/agenda-reminders
-  (fn
-    (b store ws we lead)
-    (let
-      ((acc (list)))
-      (begin
-        (for-each
-          (fn
-            (occ)
-            (for-each
-              (fn (r) (append! acc r))
-              (ev/occurrence-reminders b occ lead)))
-          (ev/agenda store ws we))
-        (ev-rem-sort acc)))))
-
-;; Reminders whose fire-at has arrived (fire-at <= now) — what a scheduler
-;; should hand to the notify transport at time `now`.
-(define
-  ev/due-reminders
-  (fn
-    (reminders now)
-    (filter (fn (r) (<= (get r :fire-at) now)) reminders)))
-
-;; Project a reminder to notify's (id recipient body) wire shape.
-(define
-  ev/reminder->msg
-  (fn
-    (r)
-    (list
-      (get r :id)
-      (get r :recipient)
-      (list :reminder (get r :event) (get r :start)))))
-
-;; ---- digests ----
-
-;; The occurrences `actor` is booked into (durable roster), within window.
-(define
-  ev/agenda-for-p
-  (fn
-    (b store actor ws we)
-    (filter
-      (fn (occ) (ev-bk-member? actor (ev/roster-occ b occ)))
-      (ev/agenda store ws we))))
-
-;; A single digest message summarising an actor's upcoming booked occurrences.
-;; :items is ({:event :start} ...); empty when the actor has nothing booked.
-(define ev/agenda-digest (fn (b store actor ws we) {:items (map (fn (occ) {:event (get occ :id) :start (get occ :start)}) (ev/agenda-for-p b store actor ws we)) :id (str actor "/digest/" ws "-" we) :recipient actor}))
-
-;; ---- reschedule notifications ----
-;; When an event carries per-occurrence overrides (ev-with-override), every
-;; attendee booked at the ORIGINAL start should be told the new time. Bookings
-;; were made against the original occ-key (id@orig-start), so we read that
-;; roster. Idempotency key encodes the original key and the new start, so
-;; re-deriving the same reschedule never double-notifies.
-(define
-  ev/reschedule-notifications
-  (fn
-    (b event)
-    (let
-      ((overrides (ev-or (get event :overrides) (list)))
-        (evid (get event :id))
-        (dur (get event :duration)))
-      (reduce
-        (fn
-          (acc entry)
-          (let
-            ((orig-start (first entry))
-              (ov (first (rest entry))))
-            (let
-              ((occ (ev-occ evid orig-start dur))
-                (new-start (get ov :start))
-                (new-duration (get ov :duration)))
-              (let
-                ((key (ev-occ-key occ)))
-                (append
-                  acc
-                  (map
-                    (fn
-                      (actor)
-                      {:id (str key "/reschedule/" new-start)
-                        :recipient actor
-                        :event evid
-                        :old-start orig-start
-                        :new-start new-start
-                        :new-duration new-duration})
-                    (ev/roster-occ b occ)))))))
-        (list)
-        overrides))))
-
-;; Project a reschedule notification to notify's (id recipient body) shape.
-(define
-  ev/reschedule-notify->msg
-  (fn
-    (r)
-    (list
-      (get r :id)
-      (get r :recipient)
-      (list :rescheduled (get r :event) (get r :old-start) (get r :new-start)))))

lib/events/scoreboard.json

@@ -1,21 +0,0 @@
-{
-  "lang": "events",
-  "total_passed": 391,
-  "total_failed": 0,
-  "total": 391,
-  "suites": [
-    {"name":"calendar","passed":51,"failed":0,"total":51},
-    {"name":"timezone","passed":25,"failed":0,"total":25},
-    {"name":"ical","passed":63,"failed":0,"total":63},
-    {"name":"availability","passed":22,"failed":0,"total":22},
-    {"name":"api","passed":41,"failed":0,"total":41},
-    {"name":"booking","passed":82,"failed":0,"total":82},
-    {"name":"booking-notify","passed":11,"failed":0,"total":11},
-    {"name":"ticket","passed":31,"failed":0,"total":31},
-    {"name":"notify","passed":7,"failed":0,"total":7},
-    {"name":"reminders","passed":21,"failed":0,"total":21},
-    {"name":"federation","passed":29,"failed":0,"total":29},
-    {"name":"integration","passed":8,"failed":0,"total":8}
-  ],
-  "generated": "2026-06-10T22:03:34+00:00"
-}

lib/events/scoreboard.md

@@ -1,18 +0,0 @@
-# events scoreboard
-
-**391 / 391 passing** (0 failure(s)).
-
-| Suite | Passed | Total | Status |
-|-------|--------|-------|--------|
-| calendar | 51 | 51 | ok |
-| timezone | 25 | 25 | ok |
-| ical | 63 | 63 | ok |
-| availability | 22 | 22 | ok |
-| api | 41 | 41 | ok |
-| booking | 82 | 82 | ok |
-| booking-notify | 11 | 11 | ok |
-| ticket | 31 | 31 | ok |
-| notify | 7 | 7 | ok |
-| reminders | 21 | 21 | ok |
-| federation | 29 | 29 | ok |
-| integration | 8 | 8 | ok |

lib/events/tests/api.sx

@@ -1,392 +0,0 @@
-;; lib/events/tests/api.sx — public events facade (schedule/agenda/free/book).
-
-(define ev-api-pass 0)
-(define ev-api-fail 0)
-(define ev-api-failures (list))
-
-(define
-  ev-api-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-api-pass (+ ev-api-pass 1))
-      (do
-        (set! ev-api-fail (+ ev-api-fail 1))
-        (append!
-          ev-api-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; A store with a weekly yoga class (Mon+Wed 18:00, 60m, 4 occurrences).
-(define
-  ev-api-store
-  (fn
-    ()
-    (ev/schedule
-      (ev/empty)
-      (quote yoga)
-      (ev-dt 2026 6 1 18 0)
-      60
-      {:freq :weekly :count 4 :byday (list 0 2)}
-      20)))
-
-(define
-  ev-api-run-all!
-  (fn
-    ()
-    (let
-      ((s0 (ev-api-store)))
-      (let
-        ((occs (ev/agenda s0 (ev-date 2026 6 1) (ev-date 2026 7 1))))
-        (let
-          ((s1 (ev/book (ev/book s0 (quote nia) (ev-occ-key (first occs))) (quote nia) (ev-occ-key (first (rest occs))))))
-          (do
-            (ev-api-check!
-              "agenda expands weekly class to four occurrences"
-              (map (fn (o) (ev-dt->civil (get o :start))) occs)
-              (list
-                (list 2026 6 1)
-                (list 2026 6 3)
-                (list 2026 6 8)
-                (list 2026 6 10)))
-            (ev-api-check!
-              "empty store has empty agenda"
-              (ev/agenda
-                (ev/empty)
-                (ev-date 2026 6 1)
-                (ev-date 2026 7 1))
-              (list))
-            (ev-api-check!
-              "max duration reflects scheduled events"
-              (ev/store-max-duration s0)
-              60)
-            (ev-api-check!
-              "max duration of empty store is zero"
-              (ev/store-max-duration (ev/empty))
-              0)
-            (ev-api-check!
-              "event-by-id finds the scheduled event"
-              (get (ev/event-by-id s0 (quote yoga)) :capacity)
-              20)
-            (ev-api-check!
-              "event-by-id is nil for unknown id"
-              (ev/event-by-id s0 (quote nope))
-              nil)
-            (ev-api-check!
-              "agenda-for lists only booked occurrences"
-              (map
-                (fn (o) (ev-dt->civil (get o :start)))
-                (ev/agenda-for
-                  s1
-                  (quote nia)
-                  (ev-date 2026 6 1)
-                  (ev-date 2026 7 1)))
-              (list
-                (list 2026 6 1)
-                (list 2026 6 3)))
-            (ev-api-check!
-              "agenda-for empty for unbooked actor"
-              (ev/agenda-for
-                s1
-                (quote zed)
-                (ev-date 2026 6 1)
-                (ev-date 2026 7 1))
-              (list))
-            (ev-api-check!
-              "free? false during a booked occurrence"
-              (ev/free?
-                s1
-                (quote nia)
-                (ev-dt 2026 6 1 18 30)
-                (ev-dt 2026 6 1 19 0))
-              false)
-            (ev-api-check!
-              "free? true in an open window"
-              (ev/free?
-                s1
-                (quote nia)
-                (ev-dt 2026 6 1 9 0)
-                (ev-dt 2026 6 1 10 0))
-              true)
-            (ev-api-check!
-              "free? half-open at occurrence end"
-              (ev/free?
-                s1
-                (quote nia)
-                (ev-dt 2026 6 1 19 0)
-                (ev-dt 2026 6 1 20 0))
-              true)
-            (ev-api-check!
-              "free? true for an actor who booked nothing"
-              (ev/free?
-                s1
-                (quote zed)
-                (ev-dt 2026 6 1 18 0)
-                (ev-dt 2026 6 1 19 0))
-              true)
-            (ev-api-check!
-              "next-free skips the booked slot to the hour after"
-              (ev-dt-tod
-                (ev/next-free
-                  s1
-                  (quote nia)
-                  (ev-dt
-                    2026
-                    6
-                    1
-                    18
-                    0)
-                  60
-                  (ev-dt
-                    2026
-                    6
-                    1
-                    23
-                    0)))
-              (* 19 60))
-            (ev-api-check!
-              "next-free returns `after` when already open"
-              (ev/next-free
-                s1
-                (quote nia)
-                (ev-dt 2026 6 1 9 0)
-                60
-                (ev-dt 2026 6 1 18 0))
-              (ev-dt 2026 6 1 9 0))
-            (ev-api-check!
-              "no conflict among disjoint bookings"
-              (ev/has-conflict?
-                s1
-                (quote nia)
-                (ev-date 2026 6 1)
-                (ev-date 2026 7 1))
-              false)
-            (let
-              ((sc (ev/book (ev/schedule s1 (quote talk) (ev-dt 2026 6 1 18 30) 60 nil 5) (quote nia) (ev-occ-key (ev-occ (quote talk) (ev-dt 2026 6 1 18 30) 60)))))
-              (ev-api-check!
-                "overlapping second booking creates a conflict"
-                (ev/has-conflict?
-                  sc
-                  (quote nia)
-                  (ev-date 2026 6 1)
-                  (ev-date 2026 7 1))
-                true))
-            (let
-              ((b (persist/open)) (occ1 (first occs)))
-              (do
-                (let
-                  ((sp (ev/schedule (ev/empty) (quote clinic) (ev-dt 2026 6 5 9 0) 30 nil 2)))
-                  (let
-                    ((occ (ev-occ (quote clinic) (ev-dt 2026 6 5 9 0) 30)))
-                    (do
-                      (ev-api-check!
-                        "durable book returns booked"
-                        (get (ev/book-occ! b sp (quote a) occ) :status)
-                        :booked)
-                      (ev/book-occ! b sp (quote c) occ)
-                      (ev-api-check!
-                        "durable book past capacity is full"
-                        (get (ev/book-occ! b sp (quote d) occ) :status)
-                        :full)
-                      (ev-api-check!
-                        "durable roster reflects persisted bookings"
-                        (ev/roster-occ b occ)
-                        (list (quote a) (quote c)))
-                      (ev-api-check!
-                        "durable seats-left honours capacity"
-                        (ev/seats-left-occ b sp occ)
-                        0)
-                      (ev-api-check!
-                        "persist free? false during a durable booking"
-                        (ev/free-p?
-                          b
-                          sp
-                          (quote a)
-                          (ev-dt
-                            2026
-                            6
-                            5
-                            9
-                            10)
-                          (ev-dt
-                            2026
-                            6
-                            5
-                            9
-                            20))
-                        false)
-                      (ev-api-check!
-                        "persist free? true in an open window"
-                        (ev/free-p?
-                          b
-                          sp
-                          (quote a)
-                          (ev-dt
-                            2026
-                            6
-                            5
-                            10
-                            0)
-                          (ev-dt
-                            2026
-                            6
-                            5
-                            10
-                            30))
-                        true)
-                      (ev/cancel-occ! b sp (quote a) occ)
-                      (ev-api-check!
-                        "durable cancel frees a seat"
-                        (ev/seats-left-occ b sp occ)
-                        1)
-                      (ev-api-check!
-                        "persist free? true after cancellation"
-                        (ev/free-p?
-                          b
-                          sp
-                          (quote a)
-                          (ev-dt
-                            2026
-                            6
-                            5
-                            9
-                            10)
-                          (ev-dt
-                            2026
-                            6
-                            5
-                            9
-                            20))
-                        true))))))))))))
-
-;; ---- conflict-checked booking ----
-(define
-  ev-api-cf-run-all!
-  (fn
-    ()
-    (let
-      ((b (persist/open))
-        (store
-          (ev/schedule
-            (ev/schedule
-              (ev/schedule (ev/empty) (quote a) (ev-dt 2026 6 1 9 0) 60 nil 10)
-              (quote bb)
-              (ev-dt 2026 6 1 9 30)
-              60
-              nil
-              10)
-            (quote c)
-            (ev-dt 2026 6 1 11 0)
-            60
-            nil
-            10)))
-      (let
-        ((oa (ev-occ (quote a) (ev-dt 2026 6 1 9 0) 60))
-          (ob (ev-occ (quote bb) (ev-dt 2026 6 1 9 30) 60))
-          (oc (ev-occ (quote c) (ev-dt 2026 6 1 11 0) 60)))
-        (do
-          (ev-api-check!
-            "first checked booking succeeds"
-            (get (ev/book-checked! b store (quote nia) oa) :status)
-            :booked)
-          (ev-api-check!
-            "overlapping different-event booking is a time conflict"
-            (get (ev/book-checked! b store (quote nia) ob) :status)
-            :time-conflict)
-          (ev-api-check!
-            "the clashing booking did not land on the roster"
-            (ev/roster-occ b ob)
-            (list))
-          (ev-api-check!
-            "a non-overlapping booking is allowed"
-            (get (ev/book-checked! b store (quote nia) oc) :status)
-            :booked)
-          (ev-api-check!
-            "re-booking the same occurrence is idempotent, not a conflict"
-            (get (ev/book-checked! b store (quote nia) oa) :status)
-            :already)
-          ;; a different actor is unaffected by nia's bookings
-          (ev-api-check!
-            "another actor may take the overlapping slot"
-            (get (ev/book-checked! b store (quote ola) ob) :status)
-            :booked)
-          (ev-api-check!
-            "would-time-conflict? predicate agrees"
-            (ev/would-time-conflict? b store (quote nia) ob)
-            true)
-          (ev-api-check!
-            "would-time-conflict? false for a free slot"
-            (ev/would-time-conflict? b store (quote zed) ob)
-            false))))))
-
-;; ---- whole-series booking ----
-(define
-  ev-api-sr-run-all!
-  (fn
-    ()
-    (let
-      ((b (persist/open))
-        (store
-          (ev/schedule
-            (ev/empty)
-            (quote yoga)
-            (ev-dt 2026 6 1 18 0)
-            60
-            {:freq :weekly :byday (list 0 2) :count 4}
-            20))
-        (ws (ev-date 2026 6 1))
-        (we (ev-date 2026 7 1)))
-      (do
-        (let
-          ((res (ev/book-series! b store (quote nia) (quote yoga) ws we)))
-          (do
-            (ev-api-check! "series booking covers all four occurrences" (len res) 4)
-            (ev-api-check! "all occurrences booked" (ev/series-count res :booked) 4)
-            (ev-api-check!
-              "actor is now booked into the whole series"
-              (len (ev/series-booked b store (quote nia) (quote yoga) ws we))
-              4)))
-        ;; re-booking the series is idempotent
-        (ev-api-check!
-          "re-booking the series is idempotent"
-          (ev/series-count (ev/book-series! b store (quote nia) (quote yoga) ws we) :already)
-          4)
-        ;; cancel the whole series
-        (let
-          ((res (ev/cancel-series! b store (quote nia) (quote yoga) ws we)))
-          (do
-            (ev-api-check! "series cancel reports four cancellations" (ev/series-count res :cancelled) 4)
-            (ev-api-check!
-              "actor booked into nothing after series cancel"
-              (len (ev/series-booked b store (quote nia) (quote yoga) ws we))
-              0)))
-        ;; capacity interacts per-occurrence: fill one occurrence first
-        (let
-          ((b2 (persist/open))
-            (s2
-              (ev/schedule (ev/empty) (quote clinic) (ev-dt 2026 6 1 9 0) 30 {:freq :daily :count 3} 1)))
-          (do
-            (ev/book-occ! b2 s2 (quote x) (ev-occ (quote clinic) (ev-dt 2026 6 2 9 0) 30))
-            (let
-              ((res (ev/book-series! b2 s2 (quote nia) (quote clinic) (ev-date 2026 6 1) (ev-date 2026 6 10))))
-              (do
-                (ev-api-check! "series booking succeeds on free occurrences" (ev/series-count res :booked) 2)
-                (ev-api-check! "series booking hits :full where capacity is taken" (ev/series-count res :full) 1)))))
-        ;; unknown event id
-        (ev-api-check!
-          "series booking an unknown event yields no results"
-          (ev/book-series! b store (quote nia) (quote nope) ws we)
-          (list))))))
-
-(define
-  ev-api-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-api-pass 0)
-      (set! ev-api-fail 0)
-      (set! ev-api-failures (list))
-      (ev-api-run-all!)
-      (ev-api-cf-run-all!)
-      (ev-api-sr-run-all!)
-      {:failures ev-api-failures :total (+ ev-api-pass ev-api-fail) :passed ev-api-pass :failed ev-api-fail})))

lib/events/tests/availability.sx

@@ -1,331 +0,0 @@
-;; lib/events/tests/availability.sx — free/busy + conflict rules on Datalog.
-
-(define ev-av-pass 0)
-(define ev-av-fail 0)
-(define ev-av-failures (list))
-
-(define
-  ev-av-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-av-pass (+ ev-av-pass 1))
-      (do
-        (set! ev-av-fail (+ ev-av-fail 1))
-        (append!
-          ev-av-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; Fixture: three occurrences on 2026-06-01.
-;;   standup  09:00–09:30   review 09:15–10:15 (overlaps standup)
-;;   lunch    12:00–13:00
-(define
-  ev-av-occs
-  (fn
-    ()
-    (list
-      (ev-occ
-        (quote standup)
-        (ev-dt 2026 6 1 9 0)
-        30)
-      (ev-occ
-        (quote review)
-        (ev-dt 2026 6 1 9 15)
-        60)
-      (ev-occ
-        (quote lunch)
-        (ev-dt 2026 6 1 12 0)
-        60))))
-
-(define ev-av-key (fn (id start) (str id "@" start)))
-
-;; alice: standup + review (overlap → conflict). bob: lunch only.
-(define
-  ev-av-db
-  (fn
-    ()
-    (ev-avail-db
-      (ev-av-occs)
-      (list
-        (list
-          (quote alice)
-          (ev-av-key
-            (quote standup)
-            (ev-dt 2026 6 1 9 0)))
-        (list
-          (quote alice)
-          (ev-av-key
-            (quote review)
-            (ev-dt 2026 6 1 9 15)))
-        (list
-          (quote bob)
-          (ev-av-key
-            (quote lunch)
-            (ev-dt 2026 6 1 12 0)))))))
-
-;; Disjoint fixture for slot search: 09:00–10:00 then 10:30–11:30 (a 30m gap).
-(define
-  ev-av-gap-db
-  (fn
-    ()
-    (ev-avail-db
-      (list
-        (ev-occ
-          (quote a)
-          (ev-dt 2026 6 1 9 0)
-          60)
-        (ev-occ
-          (quote b)
-          (ev-dt 2026 6 1 10 30)
-          60))
-      (list
-        (list
-          (quote sam)
-          (ev-av-key
-            (quote a)
-            (ev-dt 2026 6 1 9 0)))
-        (list
-          (quote sam)
-          (ev-av-key
-            (quote b)
-            (ev-dt 2026 6 1 10 30)))))))
-
-(define
-  ev-av-run-all!
-  (fn
-    ()
-    (let
-      ((db (ev-av-db)))
-      (do
-        (ev-av-check!
-          "busy lists alice committed intervals ascending"
-          (ev-busy db (quote alice))
-          (list
-            (list
-              (ev-dt 2026 6 1 9 0)
-              (ev-dt 2026 6 1 9 30))
-            (list
-              (ev-dt 2026 6 1 9 15)
-              (ev-dt 2026 6 1 10 15))))
-        (ev-av-check!
-          "busy lists bob single interval"
-          (ev-busy db (quote bob))
-          (list
-            (list
-              (ev-dt 2026 6 1 12 0)
-              (ev-dt 2026 6 1 13 0))))
-        (ev-av-check!
-          "busy empty for unknown actor"
-          (ev-busy db (quote carol))
-          (list))
-        (ev-av-check!
-          "alice has an overlap conflict"
-          (ev-has-conflict? db (quote alice))
-          true)
-        (ev-av-check!
-          "alice conflict reported once (canonical pair)"
-          (len (ev-conflicts db (quote alice)))
-          1)
-        (ev-av-check!
-          "bob has no conflict"
-          (ev-has-conflict? db (quote bob))
-          false)
-        (ev-av-check!
-          "non-overlapping bookings do not conflict"
-          (ev-has-conflict?
-            (ev-avail-db
-              (list
-                (ev-occ
-                  (quote a)
-                  (ev-dt
-                    2026
-                    6
-                    1
-                    9
-                    0)
-                  30)
-                (ev-occ
-                  (quote b)
-                  (ev-dt
-                    2026
-                    6
-                    1
-                    9
-                    30)
-                  30))
-              (list
-                (list
-                  (quote dave)
-                  (ev-av-key
-                    (quote a)
-                    (ev-dt
-                      2026
-                      6
-                      1
-                      9
-                      0)))
-                (list
-                  (quote dave)
-                  (ev-av-key
-                    (quote b)
-                    (ev-dt
-                      2026
-                      6
-                      1
-                      9
-                      30)))))
-            (quote dave))
-          false)
-        (ev-av-check!
-          "alice free in an empty window"
-          (ev-free?
-            db
-            (quote alice)
-            (ev-dt 2026 6 1 13 0)
-            (ev-dt 2026 6 1 14 0))
-          true)
-        (ev-av-check!
-          "alice not free overlapping a booking"
-          (ev-free?
-            db
-            (quote alice)
-            (ev-dt 2026 6 1 9 20)
-            (ev-dt 2026 6 1 9 40))
-          false)
-        (ev-av-check!
-          "free? is half-open at the trailing edge"
-          (ev-free?
-            db
-            (quote alice)
-            (ev-dt 2026 6 1 10 15)
-            (ev-dt 2026 6 1 11 0))
-          true)
-        (ev-av-check!
-          "free? is half-open at the leading edge"
-          (ev-free?
-            db
-            (quote bob)
-            (ev-dt 2026 6 1 11 0)
-            (ev-dt 2026 6 1 12 0))
-          true)
-        (ev-av-check!
-          "free? false when window straddles a booking edge"
-          (ev-free?
-            db
-            (quote bob)
-            (ev-dt 2026 6 1 11 0)
-            (ev-dt 2026 6 1 12 1))
-          false)
-        (ev-av-check!
-          "free? query leaves db reusable (no leaked qwindow)"
-          (do
-            (ev-free?
-              db
-              (quote alice)
-              (ev-dt 2026 6 1 9 0)
-              (ev-dt 2026 6 1 9 30))
-            (ev-busy db (quote bob)))
-          (list
-            (list
-              (ev-dt 2026 6 1 12 0)
-              (ev-dt 2026 6 1 13 0))))
-        (let
-          ((gdb (ev-av-gap-db)))
-          (do
-            (ev-av-check!
-              "next-free finds the gap between bookings"
-              (ev-next-free
-                gdb
-                (quote sam)
-                (ev-dt 2026 6 1 9 0)
-                30
-                (ev-dt 2026 6 1 18 0))
-              (ev-dt 2026 6 1 10 0))
-            (ev-av-check!
-              "next-free skips a gap too short for the duration"
-              (ev-next-free
-                gdb
-                (quote sam)
-                (ev-dt 2026 6 1 9 0)
-                60
-                (ev-dt 2026 6 1 18 0))
-              (ev-dt 2026 6 1 11 30))
-            (ev-av-check!
-              "next-free returns `after` when already free"
-              (ev-next-free
-                gdb
-                (quote sam)
-                (ev-dt 2026 6 1 14 0)
-                60
-                (ev-dt 2026 6 1 18 0))
-              (ev-dt 2026 6 1 14 0))
-            (ev-av-check!
-              "next-free returns nil when nothing fits before horizon"
-              (ev-next-free
-                gdb
-                (quote sam)
-                (ev-dt 2026 6 1 9 0)
-                120
-                (ev-dt 2026 6 1 11 0))
-              nil)
-            (ev-av-check!
-              "next-free for actor with no bookings is `after`"
-              (ev-next-free
-                gdb
-                (quote nobody)
-                (ev-dt 2026 6 1 9 0)
-                60
-                (ev-dt 2026 6 1 18 0))
-              (ev-dt 2026 6 1 9 0))
-            (ev-av-check!
-              "next-free at exact edge of a booking (half-open)"
-              (ev-next-free
-                gdb
-                (quote sam)
-                (ev-dt 2026 6 1 10 0)
-                30
-                (ev-dt 2026 6 1 18 0))
-              (ev-dt 2026 6 1 10 0))))
-        (let
-          ((daily (ev-expand (ev-event (quote class) (ev-dt 2026 6 1 9 0) 60 {:freq :daily :count 3} 1) (ev-date 2026 6 1) (ev-date 2026 7 1))))
-          (let
-            ((db2 (ev-avail-db daily (map (fn (o) (list (quote sam) (ev-occ-key o))) daily))))
-            (do
-              (ev-av-check!
-                "expanded daily occurrences become busy intervals"
-                (len (ev-busy db2 (quote sam)))
-                3)
-              (ev-av-check!
-                "no conflicts among disjoint daily occurrences"
-                (ev-has-conflict? db2 (quote sam))
-                false)
-              (ev-av-check!
-                "busy on day two of the series"
-                (ev-free?
-                  db2
-                  (quote sam)
-                  (ev-dt
-                    2026
-                    6
-                    2
-                    9
-                    30)
-                  (ev-dt
-                    2026
-                    6
-                    2
-                    9
-                    45))
-                false))))))))
-
-(define
-  ev-availability-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-av-pass 0)
-      (set! ev-av-fail 0)
-      (set! ev-av-failures (list))
-      (ev-av-run-all!)
-      {:failures ev-av-failures :total (+ ev-av-pass ev-av-fail) :passed ev-av-pass :failed ev-av-fail})))

lib/events/tests/booking-notify.sx

@@ -1,137 +0,0 @@
-;; lib/events/tests/booking-notify.sx — lifecycle notifications from the stream.
-
-(define ev-bn-pass 0)
-(define ev-bn-fail 0)
-(define ev-bn-failures (list))
-
-(define
-  ev-bn-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-bn-pass (+ ev-bn-pass 1))
-      (do
-        (set! ev-bn-fail (+ ev-bn-fail 1))
-        (append!
-          ev-bn-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-(define
-  ev-bn-kinds
-  (fn
-    (notifs)
-    (map (fn (n) (list (get n :recipient) (get n :kind))) notifs)))
-
-(define
-  ev-bn-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "o" 1 (quote a))
-          (ev/waitlist! b "o" 1 (quote x))
-          (ev/cancel-promote! b "o" 1 (quote a))
-          (let
-            ((ns (ev/booking-notifications b "o" (quote yoga))))
-            (do
-              (ev-bn-check!
-                "lifecycle notifications in order"
-                (ev-bn-kinds ns)
-                (list
-                  (list (quote a) :booked)
-                  (list (quote x) :waitlisted)
-                  (list (quote a) :cancelled)
-                  (list (quote x) :promoted)))
-              (ev-bn-check!
-                "promotion targets the waitlisted actor"
-                (map
-                  (fn (n) (get n :recipient))
-                  (ev/notify-of-kind ns :promoted))
-                (list (quote x)))
-              (ev-bn-check!
-                "a fresh booking is not flagged as a promotion"
-                (len (ev/notify-of-kind ns :booked))
-                1)
-              (ev-bn-check!
-                "every notification carries the event label"
-                (get (first ns) :event)
-                (quote yoga))))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/hold! b "p" 3 (quote q))
-          (ev/confirm! b "p" (quote q))
-          (ev-bn-check!
-            "hold then confirm notifications"
-            (ev-bn-kinds (ev/booking-notifications b "p" (quote gig)))
-            (list (list (quote q) :held) (list (quote q) :confirmed)))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/hold! b "r" 1 (quote q))
-          (ev/release! b "r" (quote q))
-          (ev-bn-check!
-            "hold then release notifications"
-            (ev-bn-kinds (ev/booking-notifications b "r" (quote gig)))
-            (list (list (quote q) :held) (list (quote q) :released)))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "k" 5 (quote a))
-          (ev/book! b "k" 5 (quote c))
-          (let
-            ((ns (ev/booking-notifications b "k" (quote talk))))
-            (do
-              (ev-bn-check!
-                "notification ids are occ-key/seq"
-                (map (fn (n) (get n :id)) ns)
-                (list "k/1" "k/2"))
-              (ev-bn-check!
-                "re-deriving yields identical ids (idempotent)"
-                (map
-                  (fn (n) (get n :id))
-                  (ev/booking-notifications b "k" (quote talk)))
-                (list "k/1" "k/2"))))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "w" 5 (quote a))
-          (ev-bn-check!
-            "notification projects to (id recipient body)"
-            (ev/booking-notify->msg
-              (first (ev/booking-notifications b "w" (quote talk))))
-            (list
-              "w/1"
-              (quote a)
-              (list :booking-event :booked (quote talk))))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "u" 1 (quote a))
-          (ev/waitlist! b "u" 1 (quote x))
-          (ev/leave-waitlist! b "u" (quote x))
-          (ev-bn-check!
-            "leaving the waitlist emits no notification"
-            (len
-              (ev/notify-of-kind
-                (ev/booking-notifications b "u" (quote e))
-                :left-waitlist))
-            0)
-          (ev-bn-check!
-            "unbooked occurrence has no notifications"
-            (ev/booking-notifications b "empty" (quote e))
-            (list)))))))
-
-(define
-  ev-booking-notify-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-bn-pass 0)
-      (set! ev-bn-fail 0)
-      (set! ev-bn-failures (list))
-      (ev-bn-run-all!)
-      {:failures ev-bn-failures :total (+ ev-bn-pass ev-bn-fail) :passed ev-bn-pass :failed ev-bn-fail})))

lib/events/tests/booking.sx

@@ -1,431 +0,0 @@
-;; lib/events/tests/booking.sx — capacity-safe booking, cancel, and holds.
-
-(define ev-bk-pass 0)
-(define ev-bk-fail 0)
-(define ev-bk-failures (list))
-
-(define
-  ev-bk-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-bk-pass (+ ev-bk-pass 1))
-      (do
-        (set! ev-bk-fail (+ ev-bk-fail 1))
-        (append!
-          ev-bk-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; Take a consistent (roster, last-seq) snapshot of an occurrence's stream.
-(define ev-bk-snap (fn (b k) (ev-booked-actors b k)))
-(define ev-bk-seq (fn (b k) (persist/last-seq b (ev-booking-stream k))))
-
-(define
-  ev-bk-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((b (persist/open)))
-        (do
-          (ev-bk-check!
-            "first booking takes seat 1"
-            (get (ev/book! b "o1" 3 (quote a)) :seat)
-            1)
-          (ev-bk-check!
-            "second booking takes seat 2"
-            (get (ev/book! b "o1" 3 (quote c)) :seat)
-            2)
-          (ev-bk-check!
-            "booked status reported"
-            (get (ev/book! b "o1" 3 (quote d)) :status)
-            :booked)
-          (ev-bk-check!
-            "roster is oldest-first"
-            (ev/roster b "o1")
-            (list (quote a) (quote c) (quote d)))
-          (ev-bk-check!
-            "seats-left is zero when full"
-            (ev/seats-left b "o1" 3)
-            0)
-          (ev-bk-check!
-            "free booking is confirmed state"
-            (ev/seat-state b "o1" (quote a))
-            :confirmed)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "o2" 1 (quote a))
-          (ev-bk-check!
-            "booking past capacity is refused"
-            (get (ev/book! b "o2" 1 (quote c)) :status)
-            :full)
-          (ev-bk-check!
-            "full does not grow the roster"
-            (ev/roster b "o2")
-            (list (quote a)))
-          (ev-bk-check!
-            "seats-left zero at capacity"
-            (ev/seats-left b "o2" 1)
-            0)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "o3" 5 (quote a))
-          (ev-bk-check!
-            "re-booking the same actor is idempotent"
-            (get (ev/book! b "o3" 5 (quote a)) :status)
-            :already)
-          (ev-bk-check!
-            "idempotent re-book reports existing seat"
-            (get (ev/book! b "o3" 5 (quote a)) :seat)
-            1)
-          (ev-bk-check!
-            "roster unchanged after re-book"
-            (ev/roster b "o3")
-            (list (quote a)))
-          (ev-bk-check!
-            "count unchanged after re-book"
-            (ev-booking-count b "o3")
-            1)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "last" 2 (quote x))
-          (let
-            ((snap (ev-bk-snap b "last")) (exp (ev-bk-seq b "last")))
-            (let
-              ((ra (ev/book-with-observed b "last" 2 (quote a) snap exp))
-                (rb
-                  (ev/book-with-observed
-                    b
-                    "last"
-                    2
-                    (quote bee)
-                    snap
-                    exp)))
-              (do
-                (ev-bk-check!
-                  "race winner is booked"
-                  (get ra :status)
-                  :booked)
-                (ev-bk-check!
-                  "race winner takes the last seat"
-                  (get ra :seat)
-                  2)
-                (ev-bk-check!
-                  "race loser is rejected with a conflict"
-                  (get rb :status)
-                  :conflict)
-                (ev-bk-check!
-                  "conflict reports the advanced seq"
-                  (get rb :actual)
-                  (+ exp 1))
-                (ev-bk-check!
-                  "no overbooking: exactly two on roster"
-                  (ev-booking-count b "last")
-                  2)
-                (ev-bk-check!
-                  "race loser is NOT on the roster"
-                  (ev-bk-member? (quote bee) (ev/roster b "last"))
-                  false)
-                (ev-bk-check!
-                  "race loser retrying gets full"
-                  (get (ev/book! b "last" 2 (quote bee)) :status)
-                  :full))))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "room" 3 (quote x))
-          (let
-            ((snap (ev-bk-snap b "room")) (exp (ev-bk-seq b "room")))
-            (let
-              ((ra (ev/book-with-observed b "room" 3 (quote a) snap exp))
-                (rb
-                  (ev/book-with-observed
-                    b
-                    "room"
-                    3
-                    (quote bee)
-                    snap
-                    exp)))
-              (do
-                (ev-bk-check!
-                  "room winner booked seat 2"
-                  (get ra :seat)
-                  2)
-                (ev-bk-check!
-                  "room loser first conflicts"
-                  (get rb :status)
-                  :conflict)
-                (ev-bk-check!
-                  "room loser retry books seat 3"
-                  (get (ev/book! b "room" 3 (quote bee)) :seat)
-                  3)
-                (ev-bk-check!
-                  "room roster is x,a,bee"
-                  (ev/roster b "room")
-                  (list (quote x) (quote a) (quote bee)))
-                (ev-bk-check!
-                  "room is now full"
-                  (ev/seats-left b "room" 3)
-                  0))))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "cx" 2 (quote a))
-          (ev/book! b "cx" 2 (quote c))
-          (ev-bk-check!
-            "occupied to capacity before cancel"
-            (ev/seats-left b "cx" 2)
-            0)
-          (ev-bk-check!
-            "booking when full (pre-cancel) is refused"
-            (get (ev/book! b "cx" 2 (quote d)) :status)
-            :full)
-          (ev-bk-check!
-            "cancel reports cancelled"
-            (get (ev/cancel! b "cx" (quote a)) :status)
-            :cancelled)
-          (ev-bk-check!
-            "cancel removes actor from roster"
-            (ev/roster b "cx")
-            (list (quote c)))
-          (ev-bk-check!
-            "cancel frees a seat"
-            (ev/seats-left b "cx" 2)
-            1)
-          (ev-bk-check!
-            "freed seat is bookable again"
-            (get (ev/book! b "cx" 2 (quote d)) :status)
-            :booked)
-          (ev-bk-check!
-            "roster after rebook is c,d"
-            (ev/roster b "cx")
-            (list (quote c) (quote d)))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "ce" 3 (quote a))
-          (ev-bk-check!
-            "cancelling an unbooked actor is a no-op"
-            (get (ev/cancel! b "ce" (quote z)) :status)
-            :not-booked)
-          (ev-bk-check!
-            "no-op cancel leaves roster intact"
-            (ev/roster b "ce")
-            (list (quote a)))
-          (ev/cancel! b "ce" (quote a))
-          (ev-bk-check!
-            "double cancel is not-booked the second time"
-            (get (ev/cancel! b "ce" (quote a)) :status)
-            :not-booked)
-          (ev-bk-check!
-            "empty roster after cancel"
-            (ev/roster b "ce")
-            (list))
-          (ev-bk-check!
-            "cancelled actor may re-book"
-            (get (ev/book! b "ce" 3 (quote a)) :status)
-            :booked)
-          (ev-bk-check!
-            "re-booked actor back on roster"
-            (ev/roster b "ce")
-            (list (quote a)))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "h" 2 (quote a))
-          (ev-bk-check!
-            "hold reports held"
-            (get (ev/hold! b "h" 2 (quote p)) :status)
-            :held)
-          (ev-bk-check!
-            "held seat is :held state"
-            (ev/seat-state b "h" (quote p))
-            :held)
-          (ev-bk-check!
-            "held actor is on the roster"
-            (ev/roster b "h")
-            (list (quote a) (quote p)))
-          (ev-bk-check!
-            "held seat blocks the last booking"
-            (get (ev/book! b "h" 2 (quote x)) :status)
-            :full)
-          (ev-bk-check!
-            "no seats left with one held"
-            (ev/seats-left b "h" 2)
-            0)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/hold! b "hc" 3 (quote p))
-          (ev-bk-check!
-            "confirm reports confirmed"
-            (get (ev/confirm! b "hc" (quote p)) :status)
-            :confirmed)
-          (ev-bk-check!
-            "confirmed seat is :confirmed state"
-            (ev/seat-state b "hc" (quote p))
-            :confirmed)
-          (ev-bk-check!
-            "re-confirm is already-confirmed"
-            (get (ev/confirm! b "hc" (quote p)) :status)
-            :already-confirmed)
-          (ev-bk-check!
-            "confirming a non-holder is not-held"
-            (get (ev/confirm! b "hc" (quote z)) :status)
-            :not-held)
-          (ev-bk-check!
-            "confirmed seat still occupies"
-            (ev/seats-left b "hc" 3)
-            2)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "hr" 2 (quote a))
-          (ev/hold! b "hr" 2 (quote p))
-          (ev-bk-check!
-            "full while hold pending"
-            (ev/seats-left b "hr" 2)
-            0)
-          (ev-bk-check!
-            "release reports released"
-            (get (ev/release! b "hr" (quote p)) :status)
-            :released)
-          (ev-bk-check!
-            "release frees the held seat"
-            (ev/seats-left b "hr" 2)
-            1)
-          (ev-bk-check!
-            "released actor off the roster"
-            (ev/roster b "hr")
-            (list (quote a)))
-          (ev-bk-check!
-            "freed seat bookable after release"
-            (get (ev/book! b "hr" 2 (quote x)) :status)
-            :booked)
-          (ev/hold! b "hr2" 1 (quote q))
-          (ev/confirm! b "hr2" (quote q))
-          (ev-bk-check!
-            "release on a confirmed seat is not-held"
-            (get (ev/release! b "hr2" (quote q)) :status)
-            :not-held)
-          (ev-bk-check!
-            "cancel frees a confirmed-from-hold seat"
-            (get (ev/cancel! b "hr2" (quote q)) :status)
-            :cancelled)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "hlast" 2 (quote x))
-          (let
-            ((snap (ev-bk-snap b "hlast")) (exp (ev-bk-seq b "hlast")))
-            (let
-              ((ra (ev/hold-with-observed b "hlast" 2 (quote p) snap exp))
-                (rb
-                  (ev/hold-with-observed
-                    b
-                    "hlast"
-                    2
-                    (quote q)
-                    snap
-                    exp)))
-              (do
-                (ev-bk-check! "hold race winner held" (get ra :status) :held)
-                (ev-bk-check!
-                  "hold race loser conflicts"
-                  (get rb :status)
-                  :conflict)
-                (ev-bk-check!
-                  "no oversell via concurrent holds"
-                  (ev-booking-count b "hlast")
-                  2)
-                (ev-bk-check!
-                  "hold loser retry gets full"
-                  (get (ev/hold! b "hlast" 2 (quote q)) :status)
-                  :full))))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/hold! b "hi" 4 (quote p))
-          (ev-bk-check!
-            "re-holding the same actor is idempotent"
-            (get (ev/hold! b "hi" 4 (quote p)) :status)
-            :already)
-          (ev-bk-check!
-            "hold idempotency keeps one seat"
-            (ev-booking-count b "hi")
-            1))))))
-
-;; ---- waitlist ----
-(define
-  ev-bk-wl-run-all!
-  (fn
-    ()
-    (do
-      ;; join the waitlist when full; book directly when a seat is free
-      (let
-        ((b (persist/open)))
-        (do
-          (ev-bk-check! "waitlist! books when a seat is free" (get (ev/waitlist! b "w" 2 (quote a)) :status) :booked)
-          (ev-bk-check! "second booking still fits" (get (ev/waitlist! b "w" 2 (quote c)) :status) :booked)
-          (ev-bk-check! "third joins the waitlist when full" (get (ev/waitlist! b "w" 2 (quote x)) :status) :waitlisted)
-          (ev-bk-check! "fourth is next in line" (get (ev/waitlist! b "w" 2 (quote y)) :position) 2)
-          (ev-bk-check! "waitlist is FIFO" (ev/waitlist b "w") (list (quote x) (quote y)))
-          (ev-bk-check! "seats unaffected by waitlisting" (ev/roster b "w") (list (quote a) (quote c)))
-          (ev-bk-check! "waitlist-position reports a queued actor" (ev/waitlist-position b "w" (quote y)) 2)
-          (ev-bk-check! "waitlist-position 0 for a seated actor" (ev/waitlist-position b "w" (quote a)) 0)))
-      ;; idempotency
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/waitlist! b "wi" 1 (quote a))
-          (ev/waitlist! b "wi" 1 (quote x))
-          (ev-bk-check! "re-joining as a seated actor is :already" (get (ev/waitlist! b "wi" 1 (quote a)) :status) :already)
-          (ev-bk-check! "re-joining the queue is :already-waiting" (get (ev/waitlist! b "wi" 1 (quote x)) :status) :already-waiting)
-          (ev-bk-check! "queue did not grow on re-join" (ev/waitlist b "wi") (list (quote x)))))
-      ;; leaving the waitlist
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/waitlist! b "wl" 1 (quote a))
-          (ev/waitlist! b "wl" 1 (quote x))
-          (ev/waitlist! b "wl" 1 (quote y))
-          (ev-bk-check! "leave-waitlist reports left" (get (ev/leave-waitlist! b "wl" (quote x)) :status) :left)
-          (ev-bk-check! "leaving removes from the queue" (ev/waitlist b "wl") (list (quote y)))
-          (ev-bk-check! "leaving when not queued is not-waiting" (get (ev/leave-waitlist! b "wl" (quote z)) :status) :not-waiting)))
-      ;; auto-promotion on cancel
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/waitlist! b "wp" 1 (quote a))
-          (ev/waitlist! b "wp" 1 (quote x))
-          (ev/waitlist! b "wp" 1 (quote y))
-          (let
-            ((r (ev/cancel-promote! b "wp" 1 (quote a))))
-            (do
-              (ev-bk-check! "cancel-promote cancels the seat holder" (get r :status) :cancelled)
-              (ev-bk-check! "cancel-promote promotes the head of the queue" (get r :promoted) (quote x))))
-          (ev-bk-check! "promoted actor now holds the seat" (ev/roster b "wp") (list (quote x)))
-          (ev-bk-check! "promoted actor left the queue" (ev/waitlist b "wp") (list (quote y)))
-          (ev-bk-check! "promoted seat is confirmed" (ev/seat-state b "wp" (quote x)) :confirmed)
-          ;; cancelling with an empty waitlist promotes nobody
-          (ev/leave-waitlist! b "wp" (quote y))
-          (let
-            ((r2 (ev/cancel-promote! b "wp" 1 (quote x))))
-            (ev-bk-check! "cancel with empty waitlist promotes nobody" (get r2 :promoted) nil))
-          (ev-bk-check! "seat is free after the last cancel" (ev/seats-left b "wp" 1) 1))))))
-
-(define
-  ev-booking-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-bk-pass 0)
-      (set! ev-bk-fail 0)
-      (set! ev-bk-failures (list))
-      (ev-bk-run-all!)
-      (ev-bk-wl-run-all!)
-      {:failures ev-bk-failures :total (+ ev-bk-pass ev-bk-fail) :passed ev-bk-pass :failed ev-bk-fail})))

lib/events/tests/calendar.sx

@@ -1,592 +0,0 @@
-;; lib/events/tests/calendar.sx — civil date core + RRULE window expansion.
-
-(define ev-cal-pass 0)
-(define ev-cal-fail 0)
-(define ev-cal-failures (list))
-
-(define
-  ev-cal-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-cal-pass (+ ev-cal-pass 1))
-      (do
-        (set! ev-cal-fail (+ ev-cal-fail 1))
-        (append!
-          ev-cal-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; Project occurrences to (civil weekday) pairs for legible assertions.
-(define
-  ev-cal-shape
-  (fn
-    (occs)
-    (map
-      (fn
-        (o)
-        (list (ev-dt->civil (get o :start)) (ev-dt-weekday (get o :start))))
-      occs)))
-
-(define
-  ev-cal-starts
-  (fn (occs) (map (fn (o) (ev-dt->civil (get o :start))) occs)))
-
-(define
-  ev-cal-run-all!
-  (fn
-    ()
-    (do
-      (ev-cal-check!
-        "epoch day zero"
-        (ev-days-from-civil 1970 1 1)
-        0)
-      (ev-cal-check!
-        "y2k day number"
-        (ev-days-from-civil 2000 1 1)
-        10957)
-      (ev-cal-check!
-        "leap day round trip"
-        (ev-civil-from-days
-          (ev-days-from-civil 2024 2 29))
-        (list 2024 2 29))
-      (ev-cal-check!
-        "pre-epoch round trip"
-        (ev-civil-from-days
-          (ev-days-from-civil 1969 12 31))
-        (list 1969 12 31))
-      (ev-cal-check!
-        "epoch is thursday"
-        (ev-weekday-of-days 0)
-        3)
-      (ev-cal-check!
-        "2026-06-06 is saturday"
-        (ev-dt-weekday (ev-date 2026 6 6))
-        5)
-      (ev-cal-check!
-        "dt carries time of day"
-        (ev-dt-tod
-          (ev-dt 2026 6 1 9 30))
-        570)
-      (ev-cal-check!
-        "civil from dt"
-        (ev-dt->civil
-          (ev-dt 2026 12 25 8 0))
-        (list 2026 12 25))
-      (ev-cal-check!
-        "days in feb 2024 (leap)"
-        (ev-days-in-month 2024 2)
-        29)
-      (ev-cal-check!
-        "days in feb 2026"
-        (ev-days-in-month 2026 2)
-        28)
-      (ev-cal-check!
-        "add months wraps year"
-        (ev-add-months 2026 11 3)
-        (list 2027 2))
-      (ev-cal-check!
-        "add months within year"
-        (ev-add-months 2026 1 5)
-        (list 2026 6))
-      (let
-        ((ev (ev-event (quote one) (ev-dt 2026 6 10 14 0) 60 nil 1)))
-        (do
-          (ev-cal-check!
-            "single inside window emits once"
-            (len
-              (ev-expand
-                ev
-                (ev-date 2026 6 1)
-                (ev-date 2026 7 1)))
-            1)
-          (ev-cal-check!
-            "single before window omitted"
-            (len
-              (ev-expand
-                ev
-                (ev-date 2026 7 1)
-                (ev-date 2026 8 1)))
-            0)
-          (ev-cal-check!
-            "single after window omitted"
-            (len
-              (ev-expand
-                ev
-                (ev-date 2026 1 1)
-                (ev-date 2026 2 1)))
-            0)
-          (ev-cal-check!
-            "occurrence end is start plus duration"
-            (get
-              (first
-                (ev-expand
-                  ev
-                  (ev-date 2026 6 1)
-                  (ev-date 2026 7 1)))
-              :end)
-            (+
-              (ev-dt 2026 6 10 14 0)
-              60))))
-      (let
-        ((daily (ev-event (quote d) (ev-dt 2026 6 1 9 0) 30 {:freq :daily :count 5} 1)))
-        (do
-          (ev-cal-check!
-            "daily count caps occurrences"
-            (ev-cal-starts
-              (ev-expand
-                daily
-                (ev-date 2026 6 1)
-                (ev-date 2026 7 1)))
-            (list
-              (list 2026 6 1)
-              (list 2026 6 2)
-              (list 2026 6 3)
-              (list 2026 6 4)
-              (list 2026 6 5)))
-          (ev-cal-check!
-            "daily preserves time of day"
-            (ev-dt-tod
-              (get
-                (first
-                  (ev-expand
-                    daily
-                    (ev-date 2026 6 1)
-                    (ev-date 2026 7 1)))
-                :start))
-            540)))
-      (let
-        ((di (ev-event (quote di) (ev-dt 2026 6 1 0 0) 30 {:interval 3 :freq :daily :until (ev-date 2026 6 30)} 1)))
-        (ev-cal-check!
-          "daily interval 3 steps by three days"
-          (ev-cal-starts
-            (ev-expand
-              di
-              (ev-date 2026 6 1)
-              (ev-date 2026 6 13)))
-          (list
-            (list 2026 6 1)
-            (list 2026 6 4)
-            (list 2026 6 7)
-            (list 2026 6 10)
-            (list 2026 6 13))))
-      (let
-        ((dc (ev-event (quote dc) (ev-dt 2026 6 1 0 0) 30 {:freq :daily :count 10} 1)))
-        (ev-cal-check!
-          "count is window-independent (clip middle)"
-          (ev-cal-starts
-            (ev-expand
-              dc
-              (ev-date 2026 6 5)
-              (ev-date 2026 6 8)))
-          (list
-            (list 2026 6 5)
-            (list 2026 6 6)
-            (list 2026 6 7)
-            (list 2026 6 8))))
-      (let
-        ((dc2 (ev-event (quote dc2) (ev-dt 2026 6 1 0 0) 30 {:freq :daily :count 3} 1)))
-        (ev-cal-check!
-          "count exhausted before window yields nothing"
-          (len
-            (ev-expand
-              dc2
-              (ev-date 2026 6 10)
-              (ev-date 2026 6 20)))
-          0))
-      (let
-        ((wk (ev-event (quote w) (ev-dt 2026 6 1 18 0) 90 {:freq :weekly :byday (list 0 2 4)} 1)))
-        (ev-cal-check!
-          "weekly byday mon/wed/fri first two weeks"
-          (ev-cal-shape
-            (ev-expand
-              wk
-              (ev-date 2026 6 1)
-              (ev-date 2026 6 13)))
-          (list
-            (list (list 2026 6 1) 0)
-            (list (list 2026 6 3) 2)
-            (list (list 2026 6 5) 4)
-            (list (list 2026 6 8) 0)
-            (list (list 2026 6 10) 2)
-            (list (list 2026 6 12) 4))))
-      (let
-        ((wu (ev-event (quote wu) (ev-dt 2026 6 1 18 0) 90 {:freq :weekly :until (ev-dt 2026 6 10 23 0) :byday (list 0 2)} 1)))
-        (ev-cal-check!
-          "weekly until clips trailing occurrences"
-          (ev-cal-starts
-            (ev-expand
-              wu
-              (ev-date 2026 6 1)
-              (ev-date 2026 7 1)))
-          (list
-            (list 2026 6 1)
-            (list 2026 6 3)
-            (list 2026 6 8)
-            (list 2026 6 10))))
-      (let
-        ((wi (ev-event (quote wi) (ev-dt 2026 6 1 18 0) 90 {:interval 2 :freq :weekly :byday (list 0)} 1)))
-        (ev-cal-check!
-          "weekly interval 2 skips alternate weeks"
-          (ev-cal-starts
-            (ev-expand
-              wi
-              (ev-date 2026 6 1)
-              (ev-date 2026 7 6)))
-          (list
-            (list 2026 6 1)
-            (list 2026 6 15)
-            (list 2026 6 29))))
-      (let
-        ((wd (ev-event (quote wd) (ev-dt 2026 6 3 12 0) 60 {:freq :weekly :count 3} 1)))
-        (ev-cal-check!
-          "weekly default byday is dtstart weekday"
-          (ev-cal-shape
-            (ev-expand
-              wd
-              (ev-date 2026 6 1)
-              (ev-date 2026 8 1)))
-          (list
-            (list (list 2026 6 3) 2)
-            (list (list 2026 6 10) 2)
-            (list (list 2026 6 17) 2))))
-      (let
-        ((wc (ev-event (quote wc) (ev-dt 2026 6 1 18 0) 90 {:freq :weekly :count 10 :byday (list 0 2)} 1)))
-        (ev-cal-check!
-          "weekly count window-independent (clip middle)"
-          (ev-cal-starts
-            (ev-expand
-              wc
-              (ev-date 2026 6 15)
-              (ev-date 2026 7 5)))
-          (list
-            (list 2026 6 15)
-            (list 2026 6 17)
-            (list 2026 6 22)
-            (list 2026 6 24)
-            (list 2026 6 29)
-            (list 2026 7 1))))
-      (let
-        ((wf (ev-event (quote wf) (ev-dt 2026 6 3 18 0) 90 {:freq :weekly :count 4 :byday (list 0 2 4)} 1)))
-        (ev-cal-check!
-          "first week skips byday earlier than dtstart"
-          (ev-cal-starts
-            (ev-expand
-              wf
-              (ev-date 2026 6 1)
-              (ev-date 2026 7 1)))
-          (list
-            (list 2026 6 3)
-            (list 2026 6 5)
-            (list 2026 6 8)
-            (list 2026 6 10))))
-      (let
-        ((md (ev-event (quote md) (ev-dt 2026 1 15 9 0) 60 {:bymonthday (list 15) :freq :monthly} 1)))
-        (do
-          (ev-cal-check!
-            "monthly bymonthday 15th"
-            (ev-cal-starts
-              (ev-expand
-                md
-                (ev-date 2026 1 1)
-                (ev-date 2026 4 1)))
-            (list
-              (list 2026 1 15)
-              (list 2026 2 15)
-              (list 2026 3 15)))
-          (ev-cal-check!
-            "monthly preserves time of day"
-            (ev-dt-tod
-              (get
-                (first
-                  (ev-expand
-                    md
-                    (ev-date 2026 1 1)
-                    (ev-date 2026 4 1)))
-                :start))
-            540)))
-      (let
-        ((mm (ev-event (quote mm) (ev-dt 2026 1 1 9 0) 60 {:bymonthday (list 1 15) :freq :monthly :count 4} 1)))
-        (ev-cal-check!
-          "monthly multiple bymonthday sorted within month"
-          (ev-cal-starts
-            (ev-expand
-              mm
-              (ev-date 2026 1 1)
-              (ev-date 2026 12 1)))
-          (list
-            (list 2026 1 1)
-            (list 2026 1 15)
-            (list 2026 2 1)
-            (list 2026 2 15))))
-      (let
-        ((ml (ev-event (quote ml) (ev-dt 2026 1 31 9 0) 60 {:bymonthday (list -1) :freq :monthly} 1)))
-        (ev-cal-check!
-          "monthly bymonthday -1 is last day"
-          (ev-cal-starts
-            (ev-expand
-              ml
-              (ev-date 2026 1 1)
-              (ev-date 2026 4 1)))
-          (list
-            (list 2026 1 31)
-            (list 2026 2 28)
-            (list 2026 3 31))))
-      (let
-        ((mn (ev-event (quote mn) (ev-dt 2026 1 1 9 0) 60 {:freq :monthly :byday (list {:ord 2 :wd 1})} 1)))
-        (ev-cal-check!
-          "monthly 2nd tuesday"
-          (ev-cal-shape
-            (ev-expand
-              mn
-              (ev-date 2026 1 1)
-              (ev-date 2026 4 1)))
-          (list
-            (list (list 2026 1 13) 1)
-            (list (list 2026 2 10) 1)
-            (list (list 2026 3 10) 1))))
-      (let
-        ((mz (ev-event (quote mz) (ev-dt 2026 1 1 9 0) 60 {:freq :monthly :byday (list {:ord -1 :wd 4})} 1)))
-        (ev-cal-check!
-          "monthly last friday"
-          (ev-cal-shape
-            (ev-expand
-              mz
-              (ev-date 2026 1 1)
-              (ev-date 2026 4 1)))
-          (list
-            (list (list 2026 1 30) 4)
-            (list (list 2026 2 27) 4)
-            (list (list 2026 3 27) 4))))
-      (let
-        ((m31 (ev-event (quote m31) (ev-dt 2026 1 31 9 0) 60 {:freq :monthly :count 4} 1)))
-        (ev-cal-check!
-          "monthly default day-of-month skips short months"
-          (ev-cal-starts
-            (ev-expand
-              m31
-              (ev-date 2026 1 1)
-              (ev-date 2026 12 1)))
-          (list
-            (list 2026 1 31)
-            (list 2026 3 31)
-            (list 2026 5 31)
-            (list 2026 7 31))))
-      (let
-        ((mi (ev-event (quote mi) (ev-dt 2026 1 10 9 0) 60 {:interval 3 :freq :monthly :count 3} 1)))
-        (ev-cal-check!
-          "monthly interval 3 steps by quarter"
-          (ev-cal-starts
-            (ev-expand
-              mi
-              (ev-date 2026 1 1)
-              (ev-date 2027 1 1)))
-          (list
-            (list 2026 1 10)
-            (list 2026 4 10)
-            (list 2026 7 10))))
-      (let
-        ((mc (ev-event (quote mc) (ev-dt 2026 1 5 9 0) 60 {:freq :monthly :count 12} 1)))
-        (ev-cal-check!
-          "monthly count window-independent (clip middle)"
-          (ev-cal-starts
-            (ev-expand
-              mc
-              (ev-date 2026 4 1)
-              (ev-date 2026 6 30)))
-          (list
-            (list 2026 4 5)
-            (list 2026 5 5)
-            (list 2026 6 5))))
-      (let
-        ((a (ev-event (quote a) (ev-dt 2026 6 2 10 0) 30 {:freq :daily :count 2} 1))
-          (b
-            (ev-event
-              (quote b)
-              (ev-dt 2026 6 1 9 0)
-              30
-              {:freq :daily :count 2}
-              1)))
-        (ev-cal-check!
-          "expand-all sorts merged occurrences by start"
-          (map
-            (fn (o) (list (get o :id) (ev-dt->civil (get o :start))))
-            (ev-expand-all
-              (list a b)
-              (ev-date 2026 6 1)
-              (ev-date 2026 7 1)))
-          (list
-            (list (quote b) (list 2026 6 1))
-            (list (quote b) (list 2026 6 2))
-            (list (quote a) (list 2026 6 2))
-            (list (quote a) (list 2026 6 3))))))))
-
-;; ---- EXDATE / RDATE exceptions ----
-(define
-  ev-cal-ex-run-all!
-  (fn
-    ()
-    (do
-      ;; EXDATE removes a matching occurrence from the recurrence
-      (let
-        ((ex
-           (ev-event-full
-             (quote standup)
-             (ev-dt 2026 6 1 9 0)
-             30
-             {:freq :daily :count 5}
-             1
-             (list (ev-dt 2026 6 3 9 0))
-             (list))))
-        (ev-cal-check!
-          "EXDATE excludes the matching occurrence"
-          (ev-cal-starts (ev-expand ex (ev-date 2026 6 1) (ev-date 2026 7 1)))
-          (list (list 2026 6 1) (list 2026 6 2) (list 2026 6 4) (list 2026 6 5))))
-      ;; EXDATE that matches nothing is a no-op
-      (let
-        ((ex2
-           (ev-event-full
-             (quote s)
-             (ev-dt 2026 6 1 9 0)
-             30
-             {:freq :daily :count 3}
-             1
-             (list (ev-dt 2026 6 9 9 0))
-             (list))))
-        (ev-cal-check!
-          "EXDATE not matching any occurrence is a no-op"
-          (len (ev-expand ex2 (ev-date 2026 6 1) (ev-date 2026 7 1)))
-          3))
-      ;; RDATE adds an explicit occurrence (within the window)
-      (let
-        ((rd
-           (ev-event-full
-             (quote s)
-             (ev-dt 2026 6 1 9 0)
-             30
-             {:freq :daily :count 3}
-             1
-             (list)
-             (list (ev-dt 2026 6 10 9 0)))))
-        (do
-          (ev-cal-check!
-            "RDATE adds an explicit occurrence, sorted in"
-            (ev-cal-starts (ev-expand rd (ev-date 2026 6 1) (ev-date 2026 7 1)))
-            (list (list 2026 6 1) (list 2026 6 2) (list 2026 6 3) (list 2026 6 10)))
-          (ev-cal-check!
-            "RDATE outside the window is dropped"
-            (len (ev-expand rd (ev-date 2026 6 1) (ev-date 2026 6 5)))
-            3)))
-      ;; RDATE coinciding with an rrule occurrence is de-duplicated
-      (let
-        ((rdup
-           (ev-event-full
-             (quote s)
-             (ev-dt 2026 6 1 9 0)
-             30
-             {:freq :daily :count 3}
-             1
-             (list)
-             (list (ev-dt 2026 6 2 9 0)))))
-        (ev-cal-check!
-          "RDATE duplicating an occurrence does not double it"
-          (len (ev-expand rdup (ev-date 2026 6 1) (ev-date 2026 7 1)))
-          3))
-      ;; EXDATE wins over RDATE for the same datetime
-      (let
-        ((both
-           (ev-event-full
-             (quote s)
-             (ev-dt 2026 6 1 9 0)
-             30
-             {:freq :daily :count 3}
-             1
-             (list (ev-dt 2026 6 2 9 0))
-             (list (ev-dt 2026 6 2 9 0)))))
-        (ev-cal-check!
-          "EXDATE wins over RDATE and the rrule for the same date"
-          (ev-cal-starts (ev-expand both (ev-date 2026 6 1) (ev-date 2026 7 1)))
-          (list (list 2026 6 1) (list 2026 6 3))))
-      ;; RDATE-only event (no rrule)
-      (let
-        ((ronly
-           (ev-event-full
-             (quote s)
-             (ev-dt 2026 6 1 9 0)
-             30
-             nil
-             1
-             (list)
-             (list (ev-dt 2026 6 5 9 0) (ev-dt 2026 6 3 9 0)))))
-        (ev-cal-check!
-          "RDATE-only event yields dtstart plus the extra dates, sorted"
-          (ev-cal-starts (ev-expand ronly (ev-date 2026 6 1) (ev-date 2026 7 1)))
-          (list (list 2026 6 1) (list 2026 6 3) (list 2026 6 5))))
-      ;; plain ev-event (no exception keys) is unaffected
-      (let
-        ((plain (ev-event (quote p) (ev-dt 2026 6 1 9 0) 30 {:freq :daily :count 3} 1)))
-        (ev-cal-check!
-          "plain event without exceptions expands unchanged"
-          (len (ev-expand plain (ev-date 2026 6 1) (ev-date 2026 7 1)))
-          3)))))
-
-;; ---- per-occurrence overrides (reschedule one instance) ----
-(define
-  ev-cal-ov-run-all!
-  (fn
-    ()
-    (let
-      ((base (ev-event (quote standup) (ev-dt 2026 6 1 9 0) 30 {:freq :daily :count 4} 1)))
-      (do
-        ;; reschedule one instance to a new time + duration
-        (let
-          ((moved (ev-with-override base (ev-dt 2026 6 2 9 0) (ev-dt 2026 6 2 14 0) 45)))
-          (let
-            ((occs (ev-expand moved (ev-date 2026 6 1) (ev-date 2026 6 5))))
-            (do
-              (ev-cal-check!
-                "override moves only the targeted instance"
-                (map (fn (o) (ev-dt-tod (get o :start))) occs)
-                (list 540 840 540 540))
-              (ev-cal-check!
-                "override applies the new duration"
-                (map (fn (o) (- (get o :end) (get o :start))) occs)
-                (list 30 45 30 30))
-              (ev-cal-check!
-                "override keeps the series length"
-                (len occs)
-                4))))
-        ;; an instance moved out of the window vacates its slot
-        (let
-          ((movedout (ev-with-override base (ev-dt 2026 6 2 9 0) (ev-dt 2026 6 20 9 0) 30)))
-          (ev-cal-check!
-            "instance moved out of window is dropped, slot vacated"
-            (ev-cal-starts (ev-expand movedout (ev-date 2026 6 1) (ev-date 2026 6 5)))
-            (list (list 2026 6 1) (list 2026 6 3) (list 2026 6 4))))
-        ;; override for a non-existent original start is a no-op
-        (let
-          ((noop (ev-with-override base (ev-dt 2026 6 9 9 0) (ev-dt 2026 6 9 14 0) 45)))
-          (ev-cal-check!
-            "override for a non-occurring start is a no-op"
-            (len (ev-expand noop (ev-date 2026 6 1) (ev-date 2026 6 5)))
-            4))
-        ;; overrides re-sort the agenda when an instance moves earlier
-        (let
-          ((early (ev-with-override base (ev-dt 2026 6 3 9 0) (ev-dt 2026 6 1 7 0) 30)))
-          (ev-cal-check!
-            "an instance moved earlier re-sorts into place"
-            (map (fn (o) (ev-dt-tod (get o :start))) (ev-expand early (ev-date 2026 6 1) (ev-date 2026 6 5)))
-            (list 420 540 540 540)))))))
-
-(define
-  ev-calendar-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-cal-pass 0)
-      (set! ev-cal-fail 0)
-      (set! ev-cal-failures (list))
-      (ev-cal-run-all!)
-      (ev-cal-ex-run-all!)
-      (ev-cal-ov-run-all!)
-      {:failures ev-cal-failures :total (+ ev-cal-pass ev-cal-fail) :passed ev-cal-pass :failed ev-cal-fail})))

lib/events/tests/federation.sx

@@ -1,289 +0,0 @@
-;; lib/events/tests/federation.sx — trust-gated cross-instance agenda merge.
-
-(define ev-fd-pass 0)
-(define ev-fd-fail 0)
-(define ev-fd-failures (list))
-
-(define
-  ev-fd-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-fd-pass (+ ev-fd-pass 1))
-      (do
-        (set! ev-fd-fail (+ ev-fd-fail 1))
-        (append!
-          ev-fd-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; Local schedule + two peers. Distinct start times make ordering legible.
-(define
-  ev-fd-local
-  (fn
-    ()
-    (ev/schedule
-      (ev/empty)
-      (quote yoga)
-      (ev-dt 2026 6 1 9 0)
-      60
-      nil
-      20)))
-
-(define
-  ev-fd-berlin
-  (fn
-    ()
-    (ev/peer
-      (quote berlin)
-      (ev/schedule
-        (ev/empty)
-        (quote meetup)
-        (ev-dt 2026 6 1 12 0)
-        90
-        nil
-        100)))) 
-
-(define
-  ev-fd-paris
-  (fn
-    ()
-    (ev/peer
-      (quote paris)
-      (ev/schedule
-        (ev/empty)
-        (quote salon)
-        (ev-dt 2026 6 1 15 0)
-        60
-        nil
-        30))))
-
-(define
-  ev-fd-run-all!
-  (fn
-    ()
-    (let
-      ((local (ev-fd-local))
-        (peers (list (ev-fd-berlin) (ev-fd-paris)))
-        (ws (ev-date 2026 6 1))
-        (we (ev-date 2026 6 2)))
-      (do
-        (ev-fd-check!
-          "trusts a peer in the trust set"
-          (ev/trusts? (list (quote berlin)) (quote berlin))
-          true)
-        (ev-fd-check!
-          "does not trust a peer outside the set"
-          (ev/trusts? (list (quote berlin)) (quote paris))
-          false)
-        (ev-fd-check!
-          "trusted-peers filters to the trust set"
-          (map ev/peer-id (ev/trusted-peers peers (list (quote berlin))))
-          (list (quote berlin)))
-        (let
-          ((fed (ev/federated-agenda local peers (list (quote berlin)) ws we)))
-          (do
-            (ev-fd-check!
-              "merge includes local + trusted peer only"
-              (map (fn (o) (list (get o :origin) (get o :id))) fed)
-              (list
-                (list :local (quote yoga))
-                (list (quote berlin) (quote meetup))))
-            (ev-fd-check!
-              "merge is sorted by start"
-              (map (fn (o) (get o :start)) fed)
-              (list
-                (ev-dt 2026 6 1 9 0)
-                (ev-dt 2026 6 1 12 0)))
-            (ev-fd-check!
-              "untrusted peer (paris) contributes nothing"
-              (len (ev/from-origin fed (quote paris)))
-              0)
-            (ev-fd-check!
-              "local occurrences tagged :local"
-              (map (fn (o) (get o :id)) (ev/from-origin fed :local))
-              (list (quote yoga)))
-            (ev-fd-check!
-              "peer occurrences tagged with the peer id"
-              (map
-                (fn (o) (get o :id))
-                (ev/from-origin fed (quote berlin)))
-              (list (quote meetup)))))
-        (let
-          ((fed2 (ev/federated-agenda local peers (list (quote berlin) (quote paris)) ws we)))
-          (ev-fd-check!
-            "trusting both peers merges all three, sorted"
-            (map (fn (o) (list (get o :origin) (get o :id))) fed2)
-            (list
-              (list :local (quote yoga))
-              (list (quote berlin) (quote meetup))
-              (list (quote paris) (quote salon)))))
-        (let
-          ((fed3 (ev/federated-agenda local peers (list) ws we)))
-          (do
-            (ev-fd-check!
-              "empty trust yields only local occurrences"
-              (map (fn (o) (get o :origin)) fed3)
-              (list :local))
-            (ev-fd-check!
-              "empty trust still includes local"
-              (len fed3)
-              1)))
-        (let
-          ((rpeer (ev/peer (quote tokyo) (ev/schedule (ev/empty) (quote standup) (ev-dt 2026 6 1 8 0) 15 {:freq :daily :count 3} 5))))
-          (let
-            ((pa (ev/peer-agenda rpeer ws (ev-date 2026 6 4))))
-            (do
-              (ev-fd-check!
-                "peer recurrence expands in the window"
-                (len pa)
-                3)
-              (ev-fd-check!
-                "every peer occurrence is tagged with the peer id"
-                (map (fn (o) (get o :origin)) pa)
-                (list (quote tokyo) (quote tokyo) (quote tokyo))))))))))
-
-;; ---- federated free/busy ----
-(define
-  ev-fd-fb-run-all!
-  (fn
-    ()
-    (let
-      ((local-db
-         (ev-avail-db
-           (list (ev-occ (quote yoga) (ev-dt 2026 6 1 9 0) 60))
-           (list (list (quote nia) (str (quote yoga) "@" (ev-dt 2026 6 1 9 0))))))
-        (berlin
-          (ev/peer-with-busy
-            (quote berlin)
-            (ev/empty)
-            (list
-              (list (quote nia)
-                (list (list (ev-dt 2026 6 1 14 0) (ev-dt 2026 6 1 15 0)))))))
-        (paris
-          (ev/peer-with-busy
-            (quote paris)
-            (ev/empty)
-            (list
-              (list (quote nia)
-                (list (list (ev-dt 2026 6 1 11 0) (ev-dt 2026 6 1 12 0))))))))
-      (let
-        ((peers (list berlin paris)))
-        (do
-          ;; peer-busy reads a peer's published intervals
-          (ev-fd-check!
-            "peer-busy returns published intervals for an actor"
-            (ev/peer-busy berlin (quote nia))
-            (list (list (ev-dt 2026 6 1 14 0) (ev-dt 2026 6 1 15 0))))
-          (ev-fd-check!
-            "peer-busy empty for an actor with nothing published"
-            (ev/peer-busy berlin (quote zed))
-            (list))
-          ;; federated-busy unions local + trusted-peer busy, sorted
-          (ev-fd-check!
-            "federated-busy unions local + trusted peer, sorted"
-            (ev/federated-busy local-db (list berlin) (list (quote berlin)) (quote nia))
-            (list
-              (list (ev-dt 2026 6 1 9 0) (ev-dt 2026 6 1 10 0))
-              (list (ev-dt 2026 6 1 14 0) (ev-dt 2026 6 1 15 0))))
-          (ev-fd-check!
-            "untrusted peer busy is excluded from federated-busy"
-            (ev/federated-busy local-db peers (list (quote berlin)) (quote nia))
-            (list
-              (list (ev-dt 2026 6 1 9 0) (ev-dt 2026 6 1 10 0))
-              (list (ev-dt 2026 6 1 14 0) (ev-dt 2026 6 1 15 0))))
-          ;; federated-free? considers both local and trusted-peer commitments
-          (ev-fd-check!
-            "free locally and on peers in an open window"
-            (ev/federated-free? local-db peers (list (quote berlin)) (quote nia) (ev-dt 2026 6 1 16 0) (ev-dt 2026 6 1 17 0))
-            true)
-          (ev-fd-check!
-            "not free during a LOCAL booking"
-            (ev/federated-free? local-db peers (list (quote berlin)) (quote nia) (ev-dt 2026 6 1 9 30) (ev-dt 2026 6 1 9 45))
-            false)
-          (ev-fd-check!
-            "not free during a TRUSTED PEER busy interval"
-            (ev/federated-free? local-db peers (list (quote berlin)) (quote nia) (ev-dt 2026 6 1 14 30) (ev-dt 2026 6 1 14 45))
-            false)
-          (ev-fd-check!
-            "free during an UNTRUSTED peer's busy interval (paris not trusted)"
-            (ev/federated-free? local-db peers (list (quote berlin)) (quote nia) (ev-dt 2026 6 1 11 15) (ev-dt 2026 6 1 11 45))
-            true)
-          (ev-fd-check!
-            "not free once paris is trusted too"
-            (ev/federated-free? local-db peers (list (quote berlin) (quote paris)) (quote nia) (ev-dt 2026 6 1 11 15) (ev-dt 2026 6 1 11 45))
-            false)
-          (ev-fd-check!
-            "federated-free? half-open at a busy edge"
-            (ev/federated-free? local-db peers (list (quote berlin)) (quote nia) (ev-dt 2026 6 1 15 0) (ev-dt 2026 6 1 16 0))
-            true))))))
-
-;; ---- injected transport (fed-sx) ----
-(define
-  ev-fd-tx-run-all!
-  (fn
-    ()
-    (let
-      ((local (ev/schedule (ev/empty) (quote yoga) (ev-dt 2026 6 1 9 0) 60 nil 20))
-        (berlin (ev/peer (quote berlin) (ev/schedule (ev/empty) (quote meetup) (ev-dt 2026 6 1 12 0) 90 nil 100)))
-        (ws (ev-date 2026 6 1))
-        (we (ev-date 2026 6 2)))
-      (let
-        ((fetch (ev/peer-fetch (list berlin))))
-        (do
-          ;; in-process adapter merges through the transport interface
-          (ev-fd-check!
-            "federated-agenda-via merges local + fetched peer"
-            (map (fn (o) (list (get o :origin) (get o :id)))
-              (ev/federated-agenda-via local (list (quote berlin)) ws we fetch))
-            (list (list :local (quote yoga)) (list (quote berlin) (quote meetup))))
-          ;; an unreachable / unknown peer degrades gracefully
-          (ev-fd-check!
-            "an unreachable peer is skipped, agenda still served"
-            (map (fn (o) (get o :origin))
-              (ev/federated-agenda-via local (list (quote berlin) (quote ghost)) ws we fetch))
-            (list :local (quote berlin)))
-          ;; reachability report
-          (ev-fd-check!
-            "federation-status reports per-peer reachability"
-            (ev/federation-status (list (quote berlin) (quote ghost)) ws we fetch)
-            (list (list (quote berlin) :ok) (list (quote ghost) :error)))
-          ;; an explicit remote transport (returns occurrences directly)
-          (let
-            ((remote-fetch
-               (fn
-                 (pid rws rwe)
-                 (if (= pid (quote tokyo))
-                   {:status :ok
-                     :occurrences (list (ev-occ (quote standup) (ev-dt 2026 6 1 8 0) 15))}
-                   {:status :error :reason :unreachable}))))
-            (do
-              (ev-fd-check!
-                "a remote transport's occurrences merge with origin tags"
-                (map (fn (o) (list (get o :origin) (get o :id)))
-                  (ev/federated-agenda-via local (list (quote tokyo)) ws we remote-fetch))
-                (list (list (quote tokyo) (quote standup)) (list :local (quote yoga))))
-              (ev-fd-check!
-                "remote transport error degrades to local only"
-                (map (fn (o) (get o :origin))
-                  (ev/federated-agenda-via local (list (quote osaka)) ws we remote-fetch))
-                (list :local))))
-          ;; no trusted peers -> only local
-          (ev-fd-check!
-            "no trusted peer ids yields only local"
-            (map (fn (o) (get o :origin))
-              (ev/federated-agenda-via local (list) ws we fetch))
-            (list :local)))))))
-
-(define
-  ev-federation-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-fd-pass 0)
-      (set! ev-fd-fail 0)
-      (set! ev-fd-failures (list))
-      (ev-fd-run-all!)
-      (ev-fd-fb-run-all!)
-      (ev-fd-tx-run-all!)
-      {:failures ev-fd-failures :total (+ ev-fd-pass ev-fd-fail) :passed ev-fd-pass :failed ev-fd-fail})))

lib/events/tests/ical.sx

@@ -1,404 +0,0 @@
-;; lib/events/tests/ical.sx — iCalendar (RFC 5545) export.
-
-(define ev-ic-pass 0)
-(define ev-ic-fail 0)
-(define ev-ic-failures (list))
-
-(define
-  ev-ic-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-ic-pass (+ ev-ic-pass 1))
-      (do
-        (set! ev-ic-fail (+ ev-ic-fail 1))
-        (append!
-          ev-ic-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; Find the value of a "KEY:value" line in a VEVENT line list (or nil).
-(define
-  ev-ic-line
-  (fn
-    (lines key)
-    (cond
-      ((empty? lines) nil)
-      ((ev-ic-prefix? (first lines) (str key ":")) (first lines))
-      (else (ev-ic-line (rest lines) key)))))
-
-(define
-  ev-ic-prefix?
-  (fn
-    (s p)
-    (and (>= (len s) (len p)) (= (substring s 0 (len p)) p))))
-
-(define
-  ev-ic-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((lines (ev/event->ical-lines (ev-event (quote one) (ev-dt 2026 6 10 14 0) 60 nil 1))))
-        (do
-          (ev-ic-check! "VEVENT opens" (first lines) "BEGIN:VEVENT")
-          (ev-ic-check! "VEVENT closes" (ev-ic-line lines "END") "END:VEVENT")
-          (ev-ic-check!
-            "UID is the event id"
-            (ev-ic-line lines "UID")
-            "UID:one")
-          (ev-ic-check!
-            "DTSTART is a UTC basic-format stamp"
-            (ev-ic-line lines "DTSTART")
-            "DTSTART:20260610T140000Z")
-          (ev-ic-check!
-            "DURATION of 60m is PT1H"
-            (ev-ic-line lines "DURATION")
-            "DURATION:PT1H")
-          (ev-ic-check!
-            "a one-off event has no RRULE"
-            (ev-ic-line lines "RRULE")
-            nil)))
-      (ev-ic-check!
-        "30m duration is PT30M"
-        (ev-ic-line
-          (ev/event->ical-lines
-            (ev-event
-              (quote e)
-              (ev-dt 2026 1 1 9 0)
-              30
-              nil
-              1))
-          "DURATION")
-        "DURATION:PT30M")
-      (ev-ic-check!
-        "90m duration is PT1H30M"
-        (ev-ic-line
-          (ev/event->ical-lines
-            (ev-event
-              (quote e)
-              (ev-dt 2026 1 1 9 0)
-              90
-              nil
-              1))
-          "DURATION")
-        "DURATION:PT1H30M")
-      (let
-        ((lines (ev/event->ical-lines (ev-event-full (quote yoga) (ev-dt 2026 6 1 18 0) 90 {:interval 2 :freq :weekly :until (ev-dt 2026 6 30 23 0) :byday (list 0 2)} 20 (list (ev-dt 2026 6 8 18 0)) (list (ev-dt 2026 6 20 18 0))))))
-        (do
-          (ev-ic-check!
-            "weekly RRULE serializes interval/until/byday in order"
-            (ev-ic-line lines "RRULE")
-            "RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20260630T230000Z;BYDAY=MO,WE")
-          (ev-ic-check!
-            "EXDATE line"
-            (ev-ic-line lines "EXDATE")
-            "EXDATE:20260608T180000Z")
-          (ev-ic-check!
-            "RDATE line"
-            (ev-ic-line lines "RDATE")
-            "RDATE:20260620T180000Z")))
-      (ev-ic-check!
-        "daily COUNT RRULE"
-        (ev-ic-line
-          (ev/event->ical-lines
-            (ev-event
-              (quote d)
-              (ev-dt 2026 6 1 9 0)
-              30
-              {:freq :daily :count 5}
-              1))
-          "RRULE")
-        "RRULE:FREQ=DAILY;COUNT=5")
-      (ev-ic-check!
-        "monthly nth-weekday BYDAY (2nd Tuesday)"
-        (ev-ic-line
-          (ev/event->ical-lines
-            (ev-event
-              (quote b)
-              (ev-dt 2026 1 13 9 0)
-              60
-              {:freq :monthly :byday (list {:ord 2 :wd 1})}
-              5))
-          "RRULE")
-        "RRULE:FREQ=MONTHLY;BYDAY=2TU")
-      (ev-ic-check!
-        "monthly last-Friday BYDAY"
-        (ev-ic-line
-          (ev/event->ical-lines
-            (ev-event
-              (quote b)
-              (ev-dt 2026 1 30 9 0)
-              60
-              {:freq :monthly :byday (list {:ord -1 :wd 4})}
-              5))
-          "RRULE")
-        "RRULE:FREQ=MONTHLY;BYDAY=-1FR")
-      (ev-ic-check!
-        "monthly BYMONTHDAY (incl. negative)"
-        (ev-ic-line
-          (ev/event->ical-lines
-            (ev-event
-              (quote b)
-              (ev-dt 2026 1 15 9 0)
-              60
-              {:bymonthday (list 15 -1) :freq :monthly}
-              5))
-          "RRULE")
-        "RRULE:FREQ=MONTHLY;BYMONTHDAY=15,-1")
-      (ev-ic-check!
-        "all seven weekday tokens map correctly"
-        (ev-ic-line
-          (ev/event->ical-lines
-            (ev-event
-              (quote w)
-              (ev-dt 2026 6 1 9 0)
-              30
-              {:freq :weekly :byday (list 0 1 2 3 4 5 6)}
-              1))
-          "RRULE")
-        "RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU")
-      (let
-        ((cal (ev/events->ical-lines (list (ev-event (quote a) (ev-dt 2026 6 1 9 0) 30 nil 1) (ev-event (quote b) (ev-dt 2026 6 2 9 0) 30 nil 1)))))
-        (do
-          (ev-ic-check! "VCALENDAR opens" (first cal) "BEGIN:VCALENDAR")
-          (ev-ic-check!
-            "VCALENDAR declares VERSION"
-            (ev-ic-line cal "VERSION")
-            "VERSION:2.0")
-          (ev-ic-check!
-            "two events -> two VEVENT blocks"
-            (len (filter (fn (l) (= l "BEGIN:VEVENT")) cal))
-            2)
-          (ev-ic-check!
-            "VCALENDAR has exactly one closing line"
-            (len (filter (fn (l) (= l "END:VCALENDAR")) cal))
-            1)))
-      (ev-ic-check!
-        "render joins lines with CRLF"
-        (ev/ical-render
-          (list "BEGIN:VCALENDAR" "VERSION:2.0" "END:VCALENDAR"))
-        "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nEND:VCALENDAR"))))
-
-;; ---- import + round-trip ----
-
-;; The occurrence starts an event expands to over a fixed window.
-(define
-  ev-ic-starts
-  (fn
-    (ev)
-    (map (fn (o) (get o :start)) (ev-expand ev (ev-date 2026 1 1) (ev-date 2027 1 1)))))
-
-;; Round-trip an event through export then import; true if both expand alike.
-(define
-  ev-ic-roundtrips?
-  (fn
-    (ev)
-    (= (ev-ic-starts ev) (ev-ic-starts (ev/ical-lines->event (ev/event->ical-lines ev))))))
-
-(define
-  ev-ic-rt-run-all!
-  (fn
-    ()
-    (do
-      ;; ---- field parsers ----
-      (ev-ic-check! "parse DTSTART" (ev-ical-parse-dt "20260601T180000Z") (ev-dt 2026 6 1 18 0))
-      (ev-ic-check! "parse DURATION PT1H30M" (ev-ical-parse-duration "PT1H30M") 90)
-      (ev-ic-check! "parse DURATION PT1H" (ev-ical-parse-duration "PT1H") 60)
-      (ev-ic-check! "parse DURATION PT30M" (ev-ical-parse-duration "PT30M") 30)
-      (ev-ic-check! "parse plain BYDAY token" (ev-ical-parse-byday-token "MO") 0)
-      (ev-ic-check! "parse ordinal BYDAY token" (ev-ical-parse-byday-token "2TU") {:ord 2 :wd 1})
-      (ev-ic-check! "parse last-weekday BYDAY token" (ev-ical-parse-byday-token "-1FR") {:ord -1 :wd 4})
-
-      ;; ---- imported event basic fields ----
-      (let
-        ((ev (ev/ical-lines->event (ev/event->ical-lines (ev-event (quote yoga) (ev-dt 2026 6 1 18 0) 90 nil 1)))))
-        (do
-          (ev-ic-check! "imported id is a symbol" (get ev :id) (quote yoga))
-          (ev-ic-check! "imported dtstart" (get ev :dtstart) (ev-dt 2026 6 1 18 0))
-          (ev-ic-check! "imported duration" (get ev :duration) 90)))
-
-      ;; ---- round-trips preserve the occurrence set ----
-      (ev-ic-check!
-        "round-trip: one-off event"
-        (ev-ic-roundtrips? (ev-event (quote a) (ev-dt 2026 6 10 14 0) 60 nil 1))
-        true)
-      (ev-ic-check!
-        "round-trip: daily COUNT"
-        (ev-ic-roundtrips? (ev-event (quote a) (ev-dt 2026 6 1 9 0) 30 {:freq :daily :count 5} 1))
-        true)
-      (ev-ic-check!
-        "round-trip: weekly interval/until/byday + exdate + rdate"
-        (ev-ic-roundtrips?
-          (ev-event-full
-            (quote a)
-            (ev-dt 2026 6 1 18 0)
-            90
-            {:freq :weekly :interval 2 :byday (list 0 2) :until (ev-dt 2026 6 30 23 0)}
-            20
-            (list (ev-dt 2026 6 8 18 0))
-            (list (ev-dt 2026 6 20 18 0))))
-        true)
-      (ev-ic-check!
-        "round-trip: monthly nth-weekday"
-        (ev-ic-roundtrips? (ev-event (quote a) (ev-dt 2026 1 13 9 0) 60 {:freq :monthly :byday (list {:ord 2 :wd 1})} 1))
-        true)
-      (ev-ic-check!
-        "round-trip: monthly bymonthday"
-        (ev-ic-roundtrips? (ev-event (quote a) (ev-dt 2026 1 15 9 0) 60 {:freq :monthly :bymonthday (list 15 -1)} 1))
-        true)
-
-      ;; ---- parse a VCALENDAR with several events ----
-      (let
-        ((cal
-           (ev/events->ical-lines
-             (list
-               (ev-event (quote a) (ev-dt 2026 6 1 9 0) 30 {:freq :daily :count 3} 1)
-               (ev-event (quote b) (ev-dt 2026 6 2 10 0) 60 nil 1)))))
-        (let
-          ((events (ev/parse-vcalendar cal)))
-          (do
-            (ev-ic-check! "VCALENDAR parses both events" (len events) 2)
-            (ev-ic-check! "first event id" (get (first events) :id) (quote a))
-            (ev-ic-check! "second event id" (get (first (rest events)) :id) (quote b))
-            (ev-ic-check!
-              "parsed events expand correctly"
-              (ev-ic-starts (first events))
-              (ev-ic-starts (ev-event (quote a) (ev-dt 2026 6 1 9 0) 30 {:freq :daily :count 3} 1)))))))))
-
-;; ---- timezone-aware export (TZID + VTIMEZONE) ----
-(define
-  ev-ic-find
-  (fn
-    (lines pfx)
-    (cond
-      ((empty? lines) nil)
-      ((ev-ic-prefix? (first lines) pfx) (first lines))
-      (else (ev-ic-find (rest lines) pfx)))))
-
-(define ev-ic-count (fn (lines x) (len (filter (fn (l) (= l x)) lines))))
-
-(define
-  ev-ic-index
-  (fn
-    (lines x)
-    (cond
-      ((empty? lines) -1)
-      ((= (first lines) x) 0)
-      (else
-        (let ((r (ev-ic-index (rest lines) x))) (if (< r 0) -1 (+ 1 r)))))))
-
-(define
-  ev-ic-tz-run-all!
-  (fn
-    ()
-    (do
-      ;; a tz event's DTSTART is local wall-clock with a TZID parameter
-      (ev-ic-check!
-        "tz event DTSTART uses TZID + local wall-clock (not UTC)"
-        (ev-ic-find (ev/event->ical-lines (ev-event-tz (quote w) (ev-dt 2026 7 15 18 0) 60 nil 1 ev-tz-london)) "DTSTART")
-        "DTSTART;TZID=Europe/London:20260715T180000")
-      (ev-ic-check!
-        "a non-tz event still uses a UTC Z stamp"
-        (ev-ic-find (ev/event->ical-lines (ev-event (quote n) (ev-dt 2026 7 15 18 0) 60 nil 1)) "DTSTART")
-        "DTSTART:20260715T180000Z")
-      ;; UNTIL stays UTC even for a TZID event (RFC 5545)
-      (ev-ic-check!
-        "tz event RRULE UNTIL is still UTC"
-        (ev-ic-find
-          (ev/event->ical-lines
-            (ev-event-tz (quote s) (ev-dt 2026 6 1 18 0) 60 {:freq :weekly :byday (list 0) :until (ev-dt 2026 6 30 23 0)} 1 ev-tz-london))
-          "RRULE")
-        "RRULE:FREQ=WEEKLY;UNTIL=20260630T220000Z;BYDAY=MO")
-      ;; EXDATE matches the DTSTART form (TZID + local)
-      (ev-ic-check!
-        "tz event EXDATE uses TZID + local"
-        (ev-ic-find
-          (ev/event->ical-lines
-            (assoc
-              (ev-event-tz (quote s) (ev-dt 2026 7 1 18 0) 60 {:freq :daily :count 3} 1 ev-tz-london)
-              :exdate
-              (list (ev-dt 2026 7 2 18 0))))
-          "EXDATE")
-        "EXDATE;TZID=Europe/London:20260702T180000")
-
-      ;; ---- VTIMEZONE block ----
-      (let
-        ((vtz (ev-ical-vtimezone ev-tz-london)))
-        (do
-          (ev-ic-check! "VTIMEZONE names the zone" (ev-ic-find vtz "TZID") "TZID:Europe/London")
-          (ev-ic-check! "DAYLIGHT transitions GMT->BST" (ev-ic-find vtz "TZOFFSETTO:+0100") "TZOFFSETTO:+0100")
-          (ev-ic-check! "DAYLIGHT rule is last Sunday of March" (ev-ic-find vtz "RRULE:FREQ=YEARLY;BYMONTH=3") "RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU")
-          (ev-ic-check! "STANDARD rule is last Sunday of October" (ev-ic-find vtz "RRULE:FREQ=YEARLY;BYMONTH=10") "RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU")))
-      (let
-        ((vtz (ev-ical-vtimezone ev-tz-paris)))
-        (do
-          (ev-ic-check! "Paris DAYLIGHT goes to +0200 (CEST)" (ev-ic-find vtz "TZOFFSETTO:+0200") "TZOFFSETTO:+0200")
-          (ev-ic-check! "Paris STANDARD goes to +0100 (CET)" (ev-ic-find vtz "TZOFFSETTO:+0100") "TZOFFSETTO:+0100")))
-      ;; southern hemisphere exports a valid VTIMEZONE too: reversed offsets,
-      ;; first-Sunday rules, and the -480 rule time folds back to local 02:00/03:00
-      (let
-        ((vtz (ev-ical-vtimezone ev-tz-sydney)))
-        (do
-          (ev-ic-check! "Sydney VTIMEZONE names the zone" (ev-ic-find vtz "TZID") "TZID:Australia/Sydney")
-          (ev-ic-check! "Sydney DAYLIGHT goes to +1100 (AEDT)" (ev-ic-find vtz "TZOFFSETTO:+1100") "TZOFFSETTO:+1100")
-          (ev-ic-check! "Sydney STANDARD goes to +1000 (AEST)" (ev-ic-find vtz "TZOFFSETTO:+1000") "TZOFFSETTO:+1000")
-          (ev-ic-check! "Sydney DAYLIGHT rule is first Sunday of October" (ev-ic-find vtz "RRULE:FREQ=YEARLY;BYMONTH=10") "RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU")
-          (ev-ic-check! "Sydney STANDARD rule is first Sunday of April" (ev-ic-find vtz "RRULE:FREQ=YEARLY;BYMONTH=4") "RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU")
-          (ev-ic-check! "Sydney DAYLIGHT begins 02:00 local (AEST std, -480 folded)" (ev-ic-find vtz "DTSTART") "DTSTART:19701004T020000")))
-
-      ;; ---- VCALENDAR carries one VTIMEZONE per distinct zone ----
-      (let
-        ((cal (ev/events->ical-lines (list (ev-event-tz (quote a) (ev-dt 2026 6 1 9 0) 60 nil 1 ev-tz-london)))))
-        (do
-          (ev-ic-check! "VCALENDAR includes the referenced VTIMEZONE" (ev-ic-count cal "BEGIN:VTIMEZONE") 1)
-          (ev-ic-check! "VTIMEZONE precedes the VEVENT" (< (ev-ic-index cal "BEGIN:VTIMEZONE") (ev-ic-index cal "BEGIN:VEVENT")) true)))
-      (ev-ic-check!
-        "two events in the same zone share one VTIMEZONE"
-        (ev-ic-count
-          (ev/events->ical-lines
-            (list
-              (ev-event-tz (quote a) (ev-dt 2026 6 1 9 0) 60 nil 1 ev-tz-london)
-              (ev-event-tz (quote b) (ev-dt 2026 6 2 9 0) 60 nil 1 ev-tz-london)))
-          "BEGIN:VTIMEZONE")
-        1)
-      (ev-ic-check!
-        "events in two zones get two VTIMEZONEs"
-        (ev-ic-count
-          (ev/events->ical-lines
-            (list
-              (ev-event-tz (quote a) (ev-dt 2026 6 1 9 0) 60 nil 1 ev-tz-london)
-              (ev-event-tz (quote b) (ev-dt 2026 6 2 9 0) 60 nil 1 ev-tz-paris)))
-          "BEGIN:VTIMEZONE")
-        2)
-      (ev-ic-check!
-        "a non-tz-only calendar has no VTIMEZONE"
-        (ev-ic-count (ev/events->ical-lines (list (ev-event (quote a) (ev-dt 2026 6 1 9 0) 60 nil 1))) "BEGIN:VTIMEZONE")
-        0)
-
-      ;; ---- import tolerates the TZID parameter ----
-      (ev-ic-check!
-        "import parses DTSTART;TZID local time"
-        (get
-          (ev/ical-lines->event (ev/event->ical-lines (ev-event-tz (quote a) (ev-dt 2026 7 15 18 0) 60 nil 1 ev-tz-london)))
-          :dtstart)
-        (ev-dt 2026 7 15 18 0))
-      (ev-ic-check!
-        "import parses a southern-zone DTSTART;TZID local time"
-        (get
-          (ev/ical-lines->event (ev/event->ical-lines (ev-event-tz (quote a) (ev-dt 2026 1 15 18 0) 60 nil 1 ev-tz-sydney)))
-          :dtstart)
-        (ev-dt 2026 1 15 18 0)))))
-
-(define
-  ev-ical-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-ic-pass 0)
-      (set! ev-ic-fail 0)
-      (set! ev-ic-failures (list))
-      (ev-ic-run-all!)
-      (ev-ic-rt-run-all!)
-      (ev-ic-tz-run-all!)
-      {:failures ev-ic-failures :total (+ ev-ic-pass ev-ic-fail) :passed ev-ic-pass :failed ev-ic-fail})))

lib/events/tests/integration.sx

@@ -1,144 +0,0 @@
-;; lib/events/tests/integration.sx — end-to-end pipeline: derive notification
-;; messages (SX) -> deliver them through the durable notify flow (Scheme).
-
-(define ev-it-pass 0)
-(define ev-it-fail 0)
-(define ev-it-failures (list))
-
-(define
-  ev-it-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-it-pass (+ ev-it-pass 1))
-      (do
-        (set! ev-it-fail (+ ev-it-fail 1))
-        (append!
-          ev-it-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-(define ev-it-status (fn (outcome) (first outcome)))
-(define ev-it-id (fn (outcome) (first (rest outcome))))
-
-;; A store with a weekly class; nia + ola booked into the first occurrence.
-(define
-  ev-it-setup
-  (fn
-    (b)
-    (let
-      ((store (ev/schedule (ev/empty) (quote yoga) (ev-dt 2026 6 1 18 0) 60 {:freq :weekly :count 4 :byday (list 0 2)} 20)))
-      (let
-        ((occ1 (ev-occ (quote yoga) (ev-dt 2026 6 1 18 0) 60)))
-        (do
-          (ev/book-occ! b store (quote nia) occ1)
-          (ev/book-occ! b store (quote ola) occ1)
-          store)))))
-
-(define
-  ev-it-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((b (persist/open)))
-        (let
-          ((store (ev-it-setup b)))
-          (let
-            ((reminders (ev/agenda-reminders b store (ev-date 2026 6 1) (ev-date 2026 7 1) 60)))
-            (let
-              ((msgs (map ev/reminder->msg reminders))
-                (outcomes
-                  (ev/deliver-messages
-                    (map ev/reminder->msg reminders)
-                    ev-notify-ok-transport
-                    3
-                    20)))
-              (do
-                (ev-it-check!
-                  "every booked attendee's reminder is delivered"
-                  (map ev-it-status outcomes)
-                  (list "delivered" "delivered"))
-                (ev-it-check!
-                  "one delivery per derived reminder"
-                  (len outcomes)
-                  (len msgs))
-                (ev-it-check!
-                  "delivered ids match the reminder idempotency keys"
-                  (map ev-it-id outcomes)
-                  (map (fn (r) (get r :id)) reminders)))))))
-      (let
-        ((b (persist/open)))
-        (let
-          ((store (ev-it-setup b)))
-          (let
-            ((msgs (map ev/reminder->msg (ev/agenda-reminders b store (ev-date 2026 6 1) (ev-date 2026 7 1) 60))))
-            (ev-it-check!
-              "a permanently-failing transport reports failed deliveries"
-              (map
-                ev-it-status
-                (ev/deliver-messages
-                  msgs
-                  "(lambda (k p) (list (quote retry) (quote down)))"
-                  2
-                  20))
-              (list "failed" "failed")))))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/book! b "occ" 1 (quote nia))
-          (ev/waitlist! b "occ" 1 (quote ola))
-          (ev/cancel-promote! b "occ" 1 (quote nia))
-          (let
-            ((promoted (ev/notify-of-kind (ev/booking-notifications b "occ" (quote yoga)) :promoted)))
-            (let
-              ((outcomes (ev/deliver-messages (map ev/booking-notify->msg promoted) ev-notify-ok-transport 3 12)))
-              (do
-                (ev-it-check!
-                  "the waitlist-promotion notification is delivered"
-                  (map ev-it-status outcomes)
-                  (list "delivered"))
-                (ev-it-check!
-                  "exactly one promotion was delivered"
-                  (len outcomes)
-                  1))))))
-      (let
-        ((b (persist/open)))
-        (let
-          ((ev (ev-event (quote yoga) (ev-dt 2026 6 1 18 0) 60 {:freq :daily :count 3} 20)))
-          (do
-            (ev/book-occ!
-              b
-              (ev/add-event (ev/empty) ev)
-              (quote nia)
-              (ev-occ
-                (quote yoga)
-                (ev-dt 2026 6 2 18 0)
-                60))
-            (let
-              ((moved (ev-with-override ev (ev-dt 2026 6 2 18 0) (ev-dt 2026 6 2 20 0) 60)))
-              (let
-                ((outcomes (ev/deliver-messages (map ev/reschedule-notify->msg (ev/reschedule-notifications b moved)) ev-notify-ok-transport 3 12)))
-                (ev-it-check!
-                  "the reschedule notice is delivered to the booked attendee"
-                  (map ev-it-status outcomes)
-                  (list "delivered")))))))
-      (ev-it-check!
-        "delivering no messages yields no outcomes"
-        (ev/deliver-messages
-          (list)
-          ev-notify-ok-transport
-          3
-          12)
-        (list)))))
-
-(define
-  ev-integration-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-it-pass 0)
-      (set! ev-it-fail 0)
-      (set! ev-it-failures (list))
-      (ev-it-run-all!)
-      {:failures ev-it-failures :total (+ ev-it-pass ev-it-fail) :passed ev-it-pass :failed ev-it-fail})))

lib/events/tests/notify.sx

@@ -1,77 +0,0 @@
-;; lib/events/tests/notify.sx — durable notification delivery flows.
-
-(define ev-nt-pass 0)
-(define ev-nt-fail 0)
-(define ev-nt-failures (list))
-
-(define
-  ev-nt-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-nt-pass (+ ev-nt-pass 1))
-      (do
-        (set! ev-nt-fail (+ ev-nt-fail 1))
-        (append!
-          ev-nt-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; Each case runs a Scheme flow program (notify flows preloaded) and asserts on
-;; the SX-native result. Scheme symbols come back as strings.
-(define
-  ev-nt-run-all!
-  (fn
-    ()
-    (do
-      (ev-nt-check!
-        "reminder delivers on the first attempt"
-        (ev/notify-run
-          "(define s (flow/start (ev-deliver-reminder 3) (list (quote m1) (quote alice) (quote hello))))\n           (flow-run-host (lambda (k p) (list (quote ok) (quote sent))) 5)\n           (list (flow/status (car (cdr s))) (flow/result (car (cdr s))))")
-        (list "done" (list "delivered" "m1" 1)))
-      (ev-nt-check!
-        "reminder retries a transient failure then delivers"
-        (ev/notify-run
-          "(define hits 0)\n           (define s (flow/start (ev-deliver-reminder 3) (list (quote m1) (quote bob) (quote hi))))\n           (flow-run-host (lambda (k p) (begin (set! hits (+ hits 1)) (if (< hits 2) (list (quote retry) (quote down)) (list (quote ok) (quote sent))))) 10)\n           (list (flow/result (car (cdr s))) hits)")
-        (list (list "delivered" "m1" 2) 2))
-      (ev-nt-check!
-        "reminder gives up after maxn attempts"
-        (ev/notify-run
-          "(define s (flow/start (ev-deliver-reminder 2) (list (quote m1) (quote x) (quote y))))\n           (flow-run-host (lambda (k p) (list (quote retry) (quote down))) 10)\n           (flow/result (car (cdr s)))")
-        (list "failed" "m1" "down"))
-      (ev-nt-check!
-        "redelivery of the same id sends only once (at-least-once, idempotent)"
-        (ev/notify-run
-          "(define sent (list)) (define deliveries 0)\n           (define (xport k p)\n             (let ((id (ev-msg-id p)))\n               (if (ev-mem id sent)\n                   (list (quote ok) (quote duplicate))\n                   (begin (set! sent (cons id sent)) (set! deliveries (+ deliveries 1)) (list (quote ok) (quote sent))))))\n           (define s1 (flow/start (ev-deliver-reminder 3) (list (quote m1) (quote a) (quote hi))))\n           (flow-run-host xport 5)\n           (define s2 (flow/start (ev-deliver-reminder 3) (list (quote m1) (quote a) (quote hi))))\n           (flow-run-host xport 5)\n           (list deliveries (flow/result (car (cdr s2))))")
-        (list 1 (list "delivered" "m1" 1)))
-      (ev-nt-check!
-        "digest delivers every message in the batch"
-        (ev/notify-run
-          "(define s (flow/start (ev-deliver-digest 3) (list (list (quote a) (quote u1) (quote hi)) (list (quote b) (quote u2) (quote yo)))))\n           (flow-run-host (lambda (k p) (list (quote ok) (quote sent))) 10)\n           (flow/result (car (cdr s)))")
-        (list
-          (list "delivered" "a" 1)
-          (list "delivered" "b" 1)))
-      (ev-nt-check!
-        "digest reports per-message outcomes independently"
-        (ev/notify-run
-          "(define (xport k p)\n             (let ((id (ev-msg-id p)))\n               (if (equal? id (quote b)) (list (quote retry) (quote flaky)) (list (quote ok) (quote sent)))))\n           (define s (flow/start (ev-deliver-digest 2) (list (list (quote a) (quote u1) (quote hi)) (list (quote b) (quote u2) (quote yo)) (list (quote c) (quote u3) (quote ya)))))\n           (flow-run-host xport 12)\n           (flow/result (car (cdr s)))")
-        (list
-          (list "delivered" "a" 1)
-          (list "failed" "b" "flaky")
-          (list "delivered" "c" 1)))
-      (ev-nt-check!
-        "delivery suspends until the transport responds"
-        (ev/notify-run
-          "(define s (flow/start (ev-deliver-reminder 3) (list (quote m1) (quote a) (quote hi))))\n           (flow/status (car (cdr s)))")
-        "suspended"))))
-
-(define
-  ev-notify-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-nt-pass 0)
-      (set! ev-nt-fail 0)
-      (set! ev-nt-failures (list))
-      (ev-nt-run-all!)
-      {:failures ev-nt-failures :total (+ ev-nt-pass ev-nt-fail) :passed ev-nt-pass :failed ev-nt-fail})))

lib/events/tests/reminders.sx

@@ -1,276 +0,0 @@
-;; lib/events/tests/reminders.sx — reminder + digest derivation from the agenda.
-
-(define ev-rm-pass 0)
-(define ev-rm-fail 0)
-(define ev-rm-failures (list))
-
-(define
-  ev-rm-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-rm-pass (+ ev-rm-pass 1))
-      (do
-        (set! ev-rm-fail (+ ev-rm-fail 1))
-        (append!
-          ev-rm-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; A store with a weekly class (Mon+Wed 18:00, 60m, 4 occurrences) and a one-off
-;; talk; durable bookings on a persist backend.
-(define
-  ev-rm-store
-  (fn
-    ()
-    (ev/schedule
-      (ev/schedule
-        (ev/empty)
-        (quote yoga)
-        (ev-dt 2026 6 1 18 0)
-        60
-        {:freq :weekly :count 4 :byday (list 0 2)}
-        20)
-      (quote talk)
-      (ev-dt 2026 6 2 12 0)
-      30
-      nil
-      50)))
-
-(define
-  ev-rm-run-all!
-  (fn
-    ()
-    (let
-      ((store (ev-rm-store)) (b (persist/open)))
-      (let
-        ((occs (ev/agenda store (ev-date 2026 6 1) (ev-date 2026 7 1))))
-        (do
-          (ev/book-occ! b store (quote nia) (first occs))
-          (ev/book-occ! b store (quote ola) (first occs))
-          (ev/book-occ!
-            b
-            store
-            (quote ola)
-            (ev-occ
-              (quote talk)
-              (ev-dt 2026 6 2 12 0)
-              30))
-          (do
-            (let
-              ((rs (ev/occurrence-reminders b (first occs) 60)))
-              (do
-                (ev-rm-check!
-                  "one reminder per booked attendee"
-                  (len rs)
-                  2)
-                (ev-rm-check!
-                  "reminder fires lead minutes before start"
-                  (get (first rs) :fire-at)
-                  (-
-                    (ev-dt
-                      2026
-                      6
-                      1
-                      18
-                      0)
-                    60))
-                (ev-rm-check!
-                  "reminder idempotency key encodes occ/recipient/lead"
-                  (get (first rs) :id)
-                  (str
-                    (ev-occ-key (first occs))
-                    "/"
-                    (quote nia)
-                    "/"
-                    60))
-                (ev-rm-check!
-                  "reminder names the event"
-                  (get (first rs) :event)
-                  (quote yoga))))
-            (ev-rm-check!
-              "unbooked occurrence has no reminders"
-              (len
-                (ev/occurrence-reminders b (ev-occ (quote yoga) (ev-dt 2026 6 3 18 0) 60) 60))
-              0)
-            (let
-              ((all (ev/agenda-reminders b store (ev-date 2026 6 1) (ev-date 2026 7 1) 60)))
-              (do
-                (ev-rm-check!
-                  "agenda reminders cover all bookings"
-                  (len all)
-                  3)
-                (ev-rm-check!
-                  "agenda reminders sorted by fire-at"
-                  (map (fn (r) (get r :fire-at)) all)
-                  (list
-                    (-
-                      (ev-dt
-                        2026
-                        6
-                        1
-                        18
-                        0)
-                      60)
-                    (-
-                      (ev-dt
-                        2026
-                        6
-                        1
-                        18
-                        0)
-                      60)
-                    (-
-                      (ev-dt
-                        2026
-                        6
-                        2
-                        12
-                        0)
-                      60)))))
-            (let
-              ((all (ev/agenda-reminders b store (ev-date 2026 6 1) (ev-date 2026 7 1) 60)))
-              (do
-                (ev-rm-check!
-                  "nothing due before the first fire-at"
-                  (len
-                    (ev/due-reminders
-                      all
-                      (-
-                        (ev-dt
-                          2026
-                          6
-                          1
-                          17
-                          0)
-                        1)))
-                  0)
-                (ev-rm-check!
-                  "the two yoga reminders are due at 17:00"
-                  (len
-                    (ev/due-reminders
-                      all
-                      (ev-dt
-                        2026
-                        6
-                        1
-                        17
-                        0)))
-                  2)
-                (ev-rm-check!
-                  "all reminders due once past the last fire-at"
-                  (len
-                    (ev/due-reminders
-                      all
-                      (ev-dt
-                        2026
-                        6
-                        2
-                        12
-                        0)))
-                  3)))
-            (let
-              ((r (first (ev/occurrence-reminders b (first occs) 60))))
-              (ev-rm-check!
-                "reminder projects to (id recipient body)"
-                (ev/reminder->msg r)
-                (list
-                  (str
-                    (ev-occ-key (first occs))
-                    "/"
-                    (quote nia)
-                    "/"
-                    60)
-                  (quote nia)
-                  (list
-                    :reminder (quote yoga)
-                    (ev-dt
-                      2026
-                      6
-                      1
-                      18
-                      0)))))
-            (let
-              ((dig (ev/agenda-digest b store (quote ola) (ev-date 2026 6 1) (ev-date 2026 7 1))))
-              (do
-                (ev-rm-check!
-                  "digest is addressed to the actor"
-                  (get dig :recipient)
-                  (quote ola))
-                (ev-rm-check!
-                  "digest lists the actor's booked occurrences"
-                  (map (fn (it) (get it :event)) (get dig :items))
-                  (list (quote yoga) (quote talk)))))
-            (let
-              ((empty-dig (ev/agenda-digest b store (quote nobody) (ev-date 2026 6 1) (ev-date 2026 7 1))))
-              (ev-rm-check!
-                "digest empty for an actor with no bookings"
-                (get empty-dig :items)
-                (list)))))))))
-
-;; ---- reschedule notifications ----
-(define
-  ev-rm-rs-run-all!
-  (fn
-    ()
-    (let
-      ((b (persist/open))
-        (ev (ev-event (quote yoga) (ev-dt 2026 6 1 9 0) 60 {:freq :daily :count 3} 20)))
-      (let
-        ((occ2 (ev-occ (quote yoga) (ev-dt 2026 6 2 9 0) 60)))
-        (do
-          (ev/book-occ! b (ev/add-event (ev/empty) ev) (quote nia) occ2)
-          (ev/book-occ! b (ev/add-event (ev/empty) ev) (quote ola) occ2)
-          ;; reschedule the Jun 2 occurrence to 14:00 / 90 min
-          (let
-            ((moved (ev-with-override ev (ev-dt 2026 6 2 9 0) (ev-dt 2026 6 2 14 0) 90)))
-            (let
-              ((ns (ev/reschedule-notifications b moved)))
-              (do
-                (ev-rm-check!
-                  "every booked attendee is notified of the reschedule"
-                  (map (fn (n) (get n :recipient)) ns)
-                  (list (quote nia) (quote ola)))
-                (ev-rm-check!
-                  "reschedule carries old and new start"
-                  (list (get (first ns) :old-start) (get (first ns) :new-start))
-                  (list (ev-dt 2026 6 2 9 0) (ev-dt 2026 6 2 14 0)))
-                (ev-rm-check!
-                  "reschedule carries the new duration"
-                  (get (first ns) :new-duration)
-                  90)
-                (ev-rm-check!
-                  "reschedule idempotency key encodes original key + new start"
-                  (get (first ns) :id)
-                  (str (ev-occ-key occ2) "/reschedule/" (ev-dt 2026 6 2 14 0)))
-                (ev-rm-check!
-                  "reschedule projects to notify wire shape"
-                  (ev/reschedule-notify->msg (first ns))
-                  (list
-                    (str (ev-occ-key occ2) "/reschedule/" (ev-dt 2026 6 2 14 0))
-                    (quote nia)
-                    (list :rescheduled (quote yoga) (ev-dt 2026 6 2 9 0) (ev-dt 2026 6 2 14 0)))))))
-          ;; an override on an occurrence nobody booked notifies no one
-          (let
-            ((moved2 (ev-with-override ev (ev-dt 2026 6 3 9 0) (ev-dt 2026 6 3 10 0) 60)))
-            (ev-rm-check!
-              "rescheduling an unbooked occurrence notifies no one"
-              (len (ev/reschedule-notifications b moved2))
-              0))
-          ;; an event with no overrides yields no reschedule notifications
-          (ev-rm-check!
-            "event without overrides has no reschedule notifications"
-            (len (ev/reschedule-notifications b ev))
-            0))))))
-
-(define
-  ev-reminders-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-rm-pass 0)
-      (set! ev-rm-fail 0)
-      (set! ev-rm-failures (list))
-      (ev-rm-run-all!)
-      (ev-rm-rs-run-all!)
-      {:failures ev-rm-failures :total (+ ev-rm-pass ev-rm-fail) :passed ev-rm-pass :failed ev-rm-fail})))

lib/events/tests/ticket.sx

@@ -1,252 +0,0 @@
-;; lib/events/tests/ticket.sx — paid-ticket contract + settlement orchestration.
-
-(define ev-tk-pass 0)
-(define ev-tk-fail 0)
-(define ev-tk-failures (list))
-
-(define
-  ev-tk-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-tk-pass (+ ev-tk-pass 1))
-      (do
-        (set! ev-tk-fail (+ ev-tk-fail 1))
-        (append!
-          ev-tk-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-(define
-  ev-tk-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((req (ev/checkout-request "occ1" (quote nia) 1500 "GBP" "ref-1")))
-        (do
-          (ev-tk-check!
-            "checkout-request is tagged"
-            (ev/checkout-request? req)
-            true)
-          (ev-tk-check!
-            "payment-result is not a checkout-request"
-            (ev/checkout-request? (ev/payment-paid "o" (quote a) "r"))
-            false)
-          (ev-tk-check!
-            "request occ-key accessor"
-            (ev/req-occ-key req)
-            "occ1")
-          (ev-tk-check!
-            "request actor accessor"
-            (ev/req-actor req)
-            (quote nia))
-          (ev-tk-check!
-            "request amount accessor"
-            (ev/req-amount req)
-            1500)
-          (ev-tk-check!
-            "request currency accessor"
-            (ev/req-currency req)
-            "GBP")
-          (ev-tk-check! "request ref accessor" (ev/req-ref req) "ref-1")))
-      (let
-        ((res (ev/payment-paid "occ1" (quote nia) "ref-1")))
-        (do
-          (ev-tk-check!
-            "payment-result is tagged"
-            (ev/payment-result? res)
-            true)
-          (ev-tk-check! "result status accessor" (ev/result-status res) :paid)
-          (ev-tk-check!
-            "failed constructor carries status"
-            (ev/result-status (ev/payment-failed "o" (quote a) "r"))
-            :failed)
-          (ev-tk-check!
-            "expired constructor carries status"
-            (ev/result-status (ev/payment-expired "o" (quote a) "r"))
-            :expired)))
-      (let
-        ((b (persist/open)))
-        (do
-          (let
-            ((r (ev/request-ticket! b "show" 1 (quote a) 2000 "GBP" "ref-a")))
-            (do
-              (ev-tk-check!
-                "request-ticket awaiting-payment"
-                (get r :status)
-                :awaiting-payment)
-              (ev-tk-check!
-                "request-ticket returns a checkout-request"
-                (ev/checkout-request? (get r :request))
-                true)
-              (ev-tk-check!
-                "checkout-request carries the amount"
-                (ev/req-amount (get r :request))
-                2000)))
-          (ev-tk-check!
-            "held seat reserves capacity"
-            (ev/seats-left b "show" 1)
-            0)
-          (ev-tk-check!
-            "second buyer is full while payment pends"
-            (get
-              (ev/request-ticket!
-                b
-                "show"
-                1
-                (quote c)
-                2000
-                "GBP"
-                "ref-c")
-              :status)
-            :full)
-          (ev-tk-check!
-            "held seat state pending"
-            (ev/seat-state b "show" (quote a))
-            :held)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/request-ticket!
-            b
-            "gig"
-            2
-            (quote a)
-            2000
-            "GBP"
-            "ref-a")
-          (let
-            ((s (ev/settle-payment! b (ev/payment-paid "gig" (quote a) "ref-a"))))
-            (ev-tk-check! "settle paid confirms" (get s :status) :confirmed))
-          (ev-tk-check!
-            "confirmed seat state"
-            (ev/seat-state b "gig" (quote a))
-            :confirmed)
-          (ev-tk-check!
-            "redelivered paid is still confirmed (idempotent)"
-            (get
-              (ev/settle-payment!
-                b
-                (ev/payment-paid "gig" (quote a) "ref-a"))
-              :status)
-            :confirmed)
-          (ev-tk-check!
-            "still exactly one seat taken"
-            (ev-booking-count b "gig")
-            1)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/request-ticket!
-            b
-            "fail"
-            1
-            (quote a)
-            2000
-            "GBP"
-            "ref-a")
-          (ev-tk-check!
-            "seat held before failure"
-            (ev/seats-left b "fail" 1)
-            0)
-          (let
-            ((s (ev/settle-payment! b (ev/payment-failed "fail" (quote a) "ref-a"))))
-            (ev-tk-check! "settle failed releases" (get s :status) :released))
-          (ev-tk-check!
-            "released seat frees capacity"
-            (ev/seats-left b "fail" 1)
-            1)
-          (ev-tk-check!
-            "redelivered failure is a noop"
-            (get
-              (ev/settle-payment!
-                b
-                (ev/payment-failed "fail" (quote a) "ref-a"))
-              :status)
-            :noop)
-          (ev-tk-check!
-            "freed seat available to next buyer"
-            (get
-              (ev/request-ticket!
-                b
-                "fail"
-                1
-                (quote c)
-                2000
-                "GBP"
-                "ref-c")
-              :status)
-            :awaiting-payment)
-          (ev/request-ticket!
-            b
-            "exp"
-            1
-            (quote a)
-            2000
-            "GBP"
-            "ref-a")
-          (ev-tk-check!
-            "settle expired releases"
-            (get
-              (ev/settle-payment!
-                b
-                (ev/payment-expired "exp" (quote a) "ref-a"))
-              :status)
-            :released)))
-      (let
-        ((b (persist/open)))
-        (do
-          (ev/request-ticket!
-            b
-            "race"
-            1
-            (quote a)
-            2000
-            "GBP"
-            "ref-a")
-          (ev/settle-payment!
-            b
-            (ev/payment-expired "race" (quote a) "ref-a"))
-          (ev-tk-check!
-            "late paid for a vanished hold needs a refund"
-            (get
-              (ev/settle-payment!
-                b
-                (ev/payment-paid "race" (quote a) "ref-a"))
-              :status)
-            :paid-but-no-hold)
-          (ev-tk-check!
-            "no phantom seat created"
-            (ev-booking-count b "race")
-            0)))
-      (let
-        ((b (persist/open)))
-        (do
-          (let
-            ((start (ev/request-ticket! b "e2e" 3 (quote nia) 2500 "GBP" "ref-nia")))
-            (ev/settle-payment!
-              b
-              (ev/payment-paid
-                (ev/req-occ-key (get start :request))
-                (ev/req-actor (get start :request))
-                (ev/req-ref (get start :request)))))
-          (ev-tk-check!
-            "e2e roster holds the buyer"
-            (ev/roster b "e2e")
-            (list (quote nia)))
-          (ev-tk-check!
-            "e2e seat confirmed"
-            (ev/seat-state b "e2e" (quote nia))
-            :confirmed))))))
-
-(define
-  ev-ticket-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-tk-pass 0)
-      (set! ev-tk-fail 0)
-      (set! ev-tk-failures (list))
-      (ev-tk-run-all!)
-      {:failures ev-tk-failures :total (+ ev-tk-pass ev-tk-fail) :passed ev-tk-pass :failed ev-tk-fail})))

lib/events/tests/timezone.sx

@@ -1,225 +0,0 @@
-;; lib/events/tests/timezone.sx — timezones + DST.
-
-(define ev-tz-pass 0)
-(define ev-tz-fail 0)
-(define ev-tz-failures (list))
-
-(define
-  ev-tz-check!
-  (fn
-    (name got expected)
-    (if
-      (= got expected)
-      (set! ev-tz-pass (+ ev-tz-pass 1))
-      (do
-        (set! ev-tz-fail (+ ev-tz-fail 1))
-        (append!
-          ev-tz-failures
-          (str name "\n    expected: " expected "\n    got:      " got))))))
-
-;; Wall-clock (civil + minute-of-day) an occurrence's UTC start maps to in a tz.
-(define
-  ev-tz-local-of
-  (fn
-    (tz utc-dt)
-    (let
-      ((l (ev-tz-utc->local tz utc-dt)))
-      (list (ev-dt->civil l) (ev-dt-tod l)))))
-
-(define
-  ev-tz-run-all!
-  (fn
-    ()
-    (do
-      (let
-        ((nyc (ev-tz-fixed "EST" -300)))
-        (do
-          (ev-tz-check!
-            "fixed zone: utc -> local subtracts 5h"
-            (ev-tz-utc->local
-              nyc
-              (ev-dt 2026 1 1 17 0))
-            (ev-dt 2026 1 1 12 0))
-          (ev-tz-check!
-            "fixed zone: local -> utc adds 5h back"
-            (ev-tz-local->utc
-              nyc
-              (ev-dt 2026 1 1 12 0))
-            (ev-dt 2026 1 1 17 0))
-          (ev-tz-check!
-            "UTC zone is identity"
-            (ev-tz-local->utc
-              ev-tz-utc
-              (ev-dt 2026 6 1 9 0))
-            (ev-dt 2026 6 1 9 0))))
-      (ev-tz-check!
-        "London winter offset is 0 (GMT)"
-        (ev-tz-offset
-          ev-tz-london
-          (ev-dt 2026 1 15 12 0))
-        0)
-      (ev-tz-check!
-        "London summer offset is 60 (BST)"
-        (ev-tz-offset
-          ev-tz-london
-          (ev-dt 2026 7 15 12 0))
-        60)
-      (ev-tz-check!
-        "Paris winter offset is 60 (CET)"
-        (ev-tz-offset
-          ev-tz-paris
-          (ev-dt 2026 1 15 12 0))
-        60)
-      (ev-tz-check!
-        "Paris summer offset is 120 (CEST)"
-        (ev-tz-offset
-          ev-tz-paris
-          (ev-dt 2026 7 15 12 0))
-        120)
-      ;; ---- southern hemisphere (reversed seasons) ----
-      (ev-tz-check!
-        "Sydney January offset is 660 (AEDT, summer DST)"
-        (ev-tz-offset
-          ev-tz-sydney
-          (ev-dt 2026 1 15 12 0))
-        660)
-      (ev-tz-check!
-        "Sydney July offset is 600 (AEST, winter std)"
-        (ev-tz-offset
-          ev-tz-sydney
-          (ev-dt 2026 7 15 12 0))
-        600)
-      (ev-tz-check!
-        "Sydney DST starts first Sunday of October"
-        (ev-dt->civil
-          (+ (ev-tz-transition 2026 (get ev-tz-sydney :dst-start)) 480))
-        (list 2026 10 4))
-      (ev-tz-check!
-        "Sydney DST ends first Sunday of April"
-        (ev-dt->civil
-          (+ (ev-tz-transition 2026 (get ev-tz-sydney :dst-end)) 480))
-        (list 2026 4 5))
-      (ev-tz-check!
-        "09:00 Sydney in summer (AEDT) is previous-day 22:00 UTC"
-        (ev-tz-local->utc
-          ev-tz-sydney
-          (ev-dt 2026 1 15 9 0))
-        (ev-dt 2026 1 14 22 0))
-      (ev-tz-check!
-        "09:00 Sydney in winter (AEST) is previous-day 23:00 UTC"
-        (ev-tz-local->utc
-          ev-tz-sydney
-          (ev-dt 2026 7 15 9 0))
-        (ev-dt 2026 7 14 23 0))
-      (let
-        ((au (ev-event-tz (quote au) (ev-dt 2026 4 3 9 0) 60 {:freq :daily :count 5} 8 ev-tz-sydney)))
-        (let
-          ((occs (ev-expand au (ev-date 2026 3 25) (ev-date 2026 4 12))))
-          (do
-            (ev-tz-check!
-              "Sydney daily occurrences shift in UTC across the autumn DST end"
-              (map (fn (o) (ev-dt-tod (get o :start))) occs)
-              (list 1320 1320 1380 1380 1380))
-            (ev-tz-check!
-              "but every Sydney occurrence stays 09:00 local wall-clock"
-              (map
-                (fn
-                  (o)
-                  (first (rest (ev-tz-local-of ev-tz-sydney (get o :start)))))
-                occs)
-              (list 540 540 540 540 540)))))
-      (ev-tz-check!
-        "DST starts last Sunday of March"
-        (ev-dt->civil
-          (ev-tz-transition
-            2026
-            (ev-tz-rule 3 -1 6 60)))
-        (list 2026 3 29))
-      (ev-tz-check!
-        "DST ends last Sunday of October"
-        (ev-dt->civil
-          (ev-tz-transition
-            2026
-            (ev-tz-rule 10 -1 6 60)))
-        (list 2026 10 25))
-      (ev-tz-check!
-        "09:00 London in winter is 09:00 UTC"
-        (ev-tz-local->utc
-          ev-tz-london
-          (ev-dt 2026 1 15 9 0))
-        (ev-dt 2026 1 15 9 0))
-      (ev-tz-check!
-        "09:00 London in summer is 08:00 UTC"
-        (ev-tz-local->utc
-          ev-tz-london
-          (ev-dt 2026 7 15 9 0))
-        (ev-dt 2026 7 15 8 0))
-      (ev-tz-check!
-        "round trip utc -> local -> utc"
-        (ev-tz-local->utc
-          ev-tz-london
-          (ev-tz-utc->local
-            ev-tz-london
-            (ev-dt 2026 7 15 8 0)))
-        (ev-dt 2026 7 15 8 0))
-      (let
-        ((ev (ev-event-tz (quote standup) (ev-dt 2026 3 27 9 0) 60 {:freq :daily :count 5} 10 ev-tz-london)))
-        (let
-          ((occs (ev-expand ev (ev-date 2026 3 1) (ev-date 2026 4 5))))
-          (do
-            (ev-tz-check!
-              "daily occurrences shift in UTC across the DST boundary"
-              (map (fn (o) (ev-dt-tod (get o :start))) occs)
-              (list 540 540 480 480 480))
-            (ev-tz-check!
-              "but every occurrence stays 09:00 local wall-clock"
-              (map
-                (fn
-                  (o)
-                  (first
-                    (rest (ev-tz-local-of ev-tz-london (get o :start)))))
-                occs)
-              (list 540 540 540 540 540))
-            (ev-tz-check!
-              "occurrence dates are stable in local time"
-              (map
-                (fn
-                  (o)
-                  (ev-civ-d
-                    (first (ev-tz-local-of ev-tz-london (get o :start)))))
-                occs)
-              (list 27 28 29 30 31)))))
-      (let
-        ((wk (ev-event-tz (quote class) (ev-dt 2026 3 23 18 0) 90 {:freq :weekly :byday (list 0)} 5 ev-tz-london)))
-        (let
-          ((occs (ev-expand wk (ev-date 2026 3 1) (ev-date 2026 4 20))))
-          (ev-tz-check!
-            "weekly Monday 18:00 London stays 18:00 local each week"
-            (map
-              (fn
-                (o)
-                (first (rest (ev-tz-local-of ev-tz-london (get o :start)))))
-              occs)
-            (list 1080 1080 1080 1080))))
-      (let
-        ((plain (ev-event (quote p) (ev-dt 2026 3 27 9 0) 60 {:freq :daily :count 3} 1)))
-        (ev-tz-check!
-          "plain event expands naively (no UTC shift)"
-          (map
-            (fn (o) (ev-dt-tod (get o :start)))
-            (ev-expand
-              plain
-              (ev-date 2026 3 1)
-              (ev-date 2026 4 5)))
-          (list 540 540 540))))))
-
-(define
-  ev-timezone-tests-run!
-  (fn
-    ()
-    (do
-      (set! ev-tz-pass 0)
-      (set! ev-tz-fail 0)
-      (set! ev-tz-failures (list))
-      (ev-tz-run-all!)
-      {:failures ev-tz-failures :total (+ ev-tz-pass ev-tz-fail) :passed ev-tz-pass :failed ev-tz-fail})))

lib/events/ticket.sx

@@ -1,101 +0,0 @@
-;; lib/events/ticket.sx — paid-ticket contract between events and commerce.
-;;
-;; A paid booking spans two subsystems. events does NOT import commerce; instead
-;; this module defines the CONTRACT — the two messages on the wire — and the
-;; events-side orchestration over provisional holds (booking.sx). commerce
-;; imports these shapes; the dependency only points one way.
-;;
-;;   checkout-request   events -> commerce   "take payment for this seat"
-;;     {:kind :events.checkout :occ-key :actor :amount :currency :ref}
-;;
-;;   payment-result     commerce -> events   "here's how payment went"
-;;     {:kind :events.payment  :occ-key :actor :ref :status}
-;;        :status ∈ :paid | :failed | :expired
-;;
-;; Flow: ev/request-ticket! places a capacity-safe HOLD (reserving the seat so
-;; it can't be oversold while payment pends) and returns a checkout-request to
-;; hand to commerce. When commerce reports back, ev/settle-payment! confirms the
-;; hold on :paid or releases it otherwise. Settlement is idempotent — an
-;; at-least-once redelivery of the same result is safe. `ref` is the opaque
-;; correlation/idempotency id; occ-key + actor locate the hold, so settlement
-;; needs no side table.
-
-;; ---- contract: checkout request (events -> commerce) ----
-
-(define
-  ev/checkout-request
-  (fn (occ-key actor amount currency ref) {:actor actor :amount amount :kind :events.checkout :ref ref :currency currency :occ-key occ-key}))
-
-(define
-  ev/checkout-request?
-  (fn (m) (and (dict? m) (= (get m :kind) :events.checkout))))
-
-(define ev/req-occ-key (fn (r) (get r :occ-key)))
-(define ev/req-actor (fn (r) (get r :actor)))
-(define ev/req-amount (fn (r) (get r :amount)))
-(define ev/req-currency (fn (r) (get r :currency)))
-(define ev/req-ref (fn (r) (get r :ref)))
-
-;; ---- contract: payment result (commerce -> events) ----
-
-(define ev/payment-result (fn (occ-key actor ref status) {:actor actor :kind :events.payment :status status :ref ref :occ-key occ-key}))
-
-(define
-  ev/payment-result?
-  (fn (m) (and (dict? m) (= (get m :kind) :events.payment))))
-
-(define ev/result-occ-key (fn (r) (get r :occ-key)))
-(define ev/result-actor (fn (r) (get r :actor)))
-(define ev/result-ref (fn (r) (get r :ref)))
-(define ev/result-status (fn (r) (get r :status)))
-
-(define
-  ev/payment-paid
-  (fn (occ-key actor ref) (ev/payment-result occ-key actor ref :paid)))
-(define
-  ev/payment-failed
-  (fn (occ-key actor ref) (ev/payment-result occ-key actor ref :failed)))
-(define
-  ev/payment-expired
-  (fn (occ-key actor ref) (ev/payment-result occ-key actor ref :expired)))
-
-;; ---- orchestration ----
-
-;; Begin a paid booking: place a capacity-safe hold and, if reserved, return a
-;; checkout-request for commerce. :full when no seat; :already when the actor
-;; already holds/booked this occurrence (no duplicate request).
-(define
-  ev/request-ticket!
-  (fn
-    (b occ-key capacity actor amount currency ref)
-    (let
-      ((h (ev/hold! b occ-key capacity actor)))
-      (cond
-        ((= (get h :status) :held) {:seat (get h :seat) :request (ev/checkout-request occ-key actor amount currency ref) :status :awaiting-payment})
-        ((= (get h :status) :already) {:seat (get h :seat) :status :already})
-        (else {:capacity capacity :status :full})))))
-
-;; Settle a payment result from commerce. :paid confirms the hold; :failed /
-;; :expired release it. Idempotent: a redelivered :paid stays :confirmed, a
-;; redelivered release is a :noop. If a :paid arrives for a hold that is already
-;; gone (released/expired first), returns :paid-but-no-hold so the caller can
-;; trigger a refund.
-(define
-  ev/settle-payment!
-  (fn
-    (b result)
-    (let
-      ((occ-key (ev/result-occ-key result))
-        (actor (ev/result-actor result))
-        (ref (ev/result-ref result)))
-      (if
-        (= (ev/result-status result) :paid)
-        (let
-          ((c (ev/confirm! b occ-key actor)))
-          (cond
-            ((= (get c :status) :confirmed) {:actor actor :status :confirmed :ref ref})
-            ((= (get c :status) :already-confirmed) {:actor actor :status :confirmed :ref ref})
-            (else {:actor actor :status :paid-but-no-hold :ref ref})))
-        (let
-          ((r (ev/release! b occ-key actor)))
-          (if (= (get r :status) :released) {:actor actor :status :released :ref ref} {:actor actor :status :noop :ref ref}))))))

lib/events/timezone.sx

@@ -1,157 +0,0 @@
-;; lib/events/timezone.sx — timezones + DST for the calendar.
-;;
-;; Datetimes in calendar.sx are naive epoch-minutes (wall clock). A timezone
-;; maps between wall-clock LOCAL time and absolute UTC. An event is authored in
-;; local time + a tz; recurrence is expanded in local time (so a "09:00 weekly"
-;; meeting stays 09:00 across a DST change), then each occurrence is converted
-;; to UTC for storage/comparison.
-;;
-;; Offset convention: offset = local - utc (minutes). London summer (BST) = +60.
-;; UTC = local - offset; local = utc + offset.
-;;
-;; Two kinds of zone, no IANA database:
-;;   :fixed  — a constant offset.
-;;   :dst    — std/dst offsets + two transition rules. Transitions are given in
-;;             UTC (EU zones all switch at 01:00 UTC), so the offset at any UTC
-;;             instant is a direct range check; no recursion. Both hemispheres
-;;             are supported: northern zones have dst-start < dst-end (DST is the
-;;             interval [start, end)); southern zones have dst-start > dst-end
-;;             (DST wraps the year boundary), detected by comparing the two
-;;             transitions — see ev-tz-offset.
-;;
-;; Requires calendar.sx (ev-dt, ev-days-from-civil, ev-civil-from-days,
-;; ev-civ-y, ev-floor-div, ev-resolve-nth-weekday).
-
-;; A DST transition rule: the ord-th weekday `wd` (0=Mon..6=Sun) of `month`, at
-;; `time` minutes-of-day UTC. EU: last Sunday (ord -1, wd 6) at 01:00 UTC.
-(define ev-tz-rule (fn (month ord wd time) {:ord ord :wd wd :month month :time time}))
-
-(define ev-tz-fixed (fn (name offset) {:name name :offset offset :kind :fixed}))
-
-(define ev-tz-dst (fn (name std dst start-rule end-rule) {:name name :kind :dst :dst-end end-rule :dst-start start-rule :std-offset std :dst-offset dst}))
-
-;; Standard (winter) offset — the initial guess when inverting local -> utc.
-(define
-  ev-tz-std-offset
-  (fn
-    (tz)
-    (if (= (get tz :kind) :fixed) (get tz :offset) (get tz :std-offset))))
-
-;; The UTC instant (epoch-minutes) of a transition rule in a given year.
-(define
-  ev-tz-transition
-  (fn
-    (year rule)
-    (let
-      ((day (ev-resolve-nth-weekday year (get rule :month) (get rule :ord) (get rule :wd))))
-      (+
-        (* (ev-days-from-civil year (get rule :month) day) 1440)
-        (get rule :time)))))
-
-;; The offset (minutes) in effect at a UTC instant.
-(define
-  ev-tz-offset
-  (fn
-    (tz utc-dt)
-    (cond
-      ((= (get tz :kind) :fixed) (get tz :offset))
-      ((= (get tz :kind) :dst)
-        (let
-          ((year (ev-civ-y (ev-civil-from-days (ev-floor-div utc-dt 1440)))))
-          (let
-            ((start (ev-tz-transition year (get tz :dst-start)))
-              (end (ev-tz-transition year (get tz :dst-end))))
-            ;; Northern hemisphere: dst-start < dst-end, DST is the closed-open
-            ;; interval [start, end). Southern hemisphere: dst-start > dst-end
-            ;; (DST begins in spring ~Oct and ends ~Apr), so within a calendar
-            ;; year DST wraps the boundary — active OUTSIDE [end, start).
-            (if
-              (< start end)
-              (if
-                (and (>= utc-dt start) (< utc-dt end))
-                (get tz :dst-offset)
-                (get tz :std-offset))
-              (if
-                (or (>= utc-dt start) (< utc-dt end))
-                (get tz :dst-offset)
-                (get tz :std-offset))))))
-      (else 0))))
-
-;; UTC instant -> local wall-clock.
-(define
-  ev-tz-utc->local
-  (fn (tz utc-dt) (+ utc-dt (ev-tz-offset tz utc-dt))))
-
-;; Local wall-clock -> UTC instant. The offset depends on the instant, so we
-;; guess with the standard offset and refine once (correct except within the
-;; one-hour DST gap/overlap, where it resolves to the pre-transition offset).
-(define
-  ev-tz-local->utc
-  (fn
-    (tz local-dt)
-    (let
-      ((utc1 (- local-dt (ev-tz-offset tz (- local-dt (ev-tz-std-offset tz))))))
-      (- local-dt (ev-tz-offset tz utc1)))))
-
-;; ---- predefined zones ----
-(define ev-tz-utc (ev-tz-fixed "UTC" 0))
-(define
-  ev-tz-london
-  (ev-tz-dst
-    "Europe/London"
-    0
-    60
-    (ev-tz-rule 3 -1 6 60)
-    (ev-tz-rule 10 -1 6 60)))
-(define
-  ev-tz-paris
-  (ev-tz-dst
-    "Europe/Paris"
-    60
-    120
-    (ev-tz-rule 3 -1 6 60)
-    (ev-tz-rule 10 -1 6 60)))
-;; Southern hemisphere: AEST +600 (std, winter), AEDT +660 (dst, summer). DST
-;; begins 02:00 AEST first Sunday October and ends 03:00 AEDT first Sunday April
-;; — both 16:00 UTC the preceding Saturday, i.e. -480 minutes from the Sunday in
-;; the rule (the model adds rule :time to the resolved weekday's UTC midnight).
-;; dst-start (Oct) > dst-end (Apr), so ev-tz-offset takes the wrap-the-year path.
-(define
-  ev-tz-sydney
-  (ev-tz-dst
-    "Australia/Sydney"
-    600
-    660
-    (ev-tz-rule 10 1 6 -480)
-    (ev-tz-rule 4 1 6 -480)))
-
-;; ---- tz-aware event expansion ----
-
-;; An event authored in local time + a tz. dtstart-local / rrule / exceptions
-;; are all wall-clock in `tz`; expansion converts each occurrence to UTC.
-(define
-  ev-event-tz
-  (fn (id dtstart-local duration rrule capacity tz) {:id id :duration duration :dtstart dtstart-local :rrule rrule :capacity capacity :tz tz}))
-
-;; Expand a tz-aware event over a UTC window. Local recurrence is expanded over
-;; a window widened by a day each side (to catch occurrences whose UTC lands in
-;; range), converted to UTC, then filtered to [win-start, win-end].
-(define
-  ev-expand-tz
-  (fn
-    (event tz win-start win-end)
-    (let
-      ((local-ws (- (ev-tz-utc->local tz win-start) 1440))
-        (local-we (+ (ev-tz-utc->local tz win-end) 1440)))
-      (let
-        ((local-occs (ev-expand-naive event local-ws local-we)))
-        (let
-          ((utc-occs (map (fn (o) (let ((u (ev-tz-local->utc tz (get o :start))) (dur (- (get o :end) (get o :start)))) {:id (get o :id) :start u :end (+ u dur)})) local-occs)))
-          (ev-sort-occs
-            (filter
-              (fn
-                (o)
-                (and
-                  (>= (get o :start) win-start)
-                  (<= (get o :start) win-end)))
-              utc-occs)))))))

lib/feed/acl.sx

@@ -1,38 +0,0 @@
-; feed/acl — per-viewer visibility filtering. The same candidate stream yields
-; different timelines for different viewers, so ACL is applied per request and
-; pre-ACL timelines are never cached.
-;
-; permit? is injected: (permit? viewer activity) -> bool. Wire a real acl-sx
-; predicate here; feed/permit-acl? is a self-contained default that reads an
-; optional :visible-to allowlist on the activity.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx, lib/feed/fanout.sx
-; (feed/-elem?), lib/feed/rank.sx (feed/top).
-
-; default permit: actor always sees own activity; absent/nil :visible-to is
-; public; otherwise viewer must be in the allowlist.
-(define
-  feed/permit-acl?
-  (fn
-    (viewer a)
-    (or
-      (equal? viewer (get a :actor))
-      (let
-        ((allowed (get a :visible-to nil)))
-        (if (= allowed nil) true (feed/-elem? viewer allowed))))))
-
-(define feed/permit-public? (fn (viewer a) true))
-
-; filter a stream to what viewer may read
-(define
-  feed/visible
-  (fn
-    (stream viewer permit?)
-    (feed/filter stream (fn (a) (permit? viewer a)))))
-
-; the capstone: candidate stream -> ACL for viewer -> rank -> top-N
-(define
-  feed/timeline
-  (fn
-    (stream viewer permit? score-fn n)
-    (feed/top (feed/visible stream viewer permit?) score-fn n)))

lib/feed/aggregate.sx

@@ -1,62 +0,0 @@
-; feed/aggregate — group-by / counting via key-reduce. Keys must be strings
-; (dict keys), so composite keys (actor, day) are joined into one string.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx.
-
-; group activities into a dict: key-string -> (list of activities), order-preserving
-(define
-  feed/group-by
-  (fn
-    (stream key-fn)
-    (reduce
-      (fn
-        (g a)
-        (let
-          ((k (key-fn a)))
-          (assoc g k (append (get g k (list)) (list a)))))
-      {}
-      (feed/items stream))))
-
-; key-string -> count
-(define
-  feed/group-count
-  (fn
-    (stream key-fn)
-    (reduce
-      (fn
-        (g a)
-        (let
-          ((k (key-fn a)))
-          (assoc g k (+ (get g k 0) 1))))
-      {}
-      (feed/items stream))))
-
-; --- composite keys ---------------------------------------------------------
-
-(define feed/day (fn (at window) (floor (/ at window))))
-
-; (actor, day-bucket) -> "actor#day"
-(define
-  feed/actor-day-key
-  (fn
-    (window)
-    (fn
-      (a)
-      (string-append
-        (get a :actor)
-        "#"
-        (number->string (feed/day (get a :at) window))))))
-
-(define
-  feed/by-actor-day
-  (fn (stream window) (feed/group-count stream (feed/actor-day-key window))))
-
-; per-actor activity counts
-(define
-  feed/actor-counts
-  (fn (stream) (feed/group-count stream feed/actor)))
-
-; per-object activity counts (engagement)
-(define
-  feed/object-counts
-  (fn (stream) (feed/group-count stream feed/object)))

lib/feed/api.sx

@@ -1,24 +0,0 @@
-; feed/api — ergonomic API over the stream layer for non-APL callers.
-; A single mutable activity log; post appends, all returns it as a stream.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx (loaded by harness).
-
-(define feed/-log (list))
-
-; post — normalize then append. Returns the stored activity.
-(define
-  feed/post
-  (fn
-    (raw)
-    (let
-      ((a (feed/normalize raw)))
-      (begin (set! feed/-log (append feed/-log (list a))) a))))
-
-; all — the whole log as a stream (insertion order)
-(define feed/all (fn () (feed/stream feed/-log)))
-
-; reset! — clear the log (test hygiene)
-(define feed/reset! (fn () (begin (set! feed/-log (list)) nil)))
-
-; size — number of posted activities
-(define feed/size (fn () (len feed/-log)))

lib/feed/conformance.sh

@@ -1,125 +0,0 @@
-#!/usr/bin/env bash
-# lib/feed/conformance.sh — run feed test suites, emit scoreboard.json + scoreboard.md.
-
-set -uo pipefail
-cd "$(git rev-parse --show-toplevel)"
-
-SX_SERVER="${SX_SERVER:-/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe}"
-if [ ! -x "$SX_SERVER" ]; then
-  SX_SERVER="hosts/ocaml/_build/default/bin/sx_server.exe"
-fi
-if [ ! -x "$SX_SERVER" ]; then
-  echo "ERROR: sx_server.exe not found." >&2
-  exit 1
-fi
-
-SUITES=(basic fanout rank integration content notify home dedupe trending mute page thread)
-
-OUT_JSON="lib/feed/scoreboard.json"
-OUT_MD="lib/feed/scoreboard.md"
-
-run_suite() {
-  local suite=$1
-  local file="lib/feed/tests/${suite}.sx"
-  local TMP
-  TMP=$(mktemp)
-  cat > "$TMP" << EPOCHS
-(epoch 1)
-(load "spec/stdlib.sx")
-(load "lib/r7rs.sx")
-(load "lib/apl/runtime.sx")
-(load "lib/feed/normalize.sx")
-(load "lib/feed/stream.sx")
-(load "lib/feed/api.sx")
-(load "lib/feed/fanout.sx")
-(load "lib/feed/dedupe.sx")
-(load "lib/feed/aggregate.sx")
-(load "lib/feed/rank.sx")
-(load "lib/feed/acl.sx")
-(load "lib/feed/fed.sx")
-(load "lib/feed/content.sx")
-(load "lib/feed/notify.sx")
-(load "lib/feed/home.sx")
-(load "lib/feed/trending.sx")
-(load "lib/feed/mute.sx")
-(load "lib/feed/page.sx")
-(load "lib/feed/thread.sx")
-(epoch 2)
-(eval "(define feed-test-pass 0)")
-(eval "(define feed-test-fail 0)")
-(eval "(define feed-test (fn (name got expected) (if (= got expected) (set! feed-test-pass (+ feed-test-pass 1)) (set! feed-test-fail (+ feed-test-fail 1)))))")
-(epoch 3)
-(load "${file}")
-(epoch 4)
-(eval "(list feed-test-pass feed-test-fail)")
-EPOCHS
-
-  local OUTPUT
-  OUTPUT=$(timeout 300 "$SX_SERVER" < "$TMP" 2>/dev/null)
-  rm -f "$TMP"
-
-  local LINE
-  LINE=$(echo "$OUTPUT" | awk '/^\(ok-len 4 / {getline; print; exit}')
-  if [ -z "$LINE" ]; then
-    LINE=$(echo "$OUTPUT" | grep -E '^\(ok 4 \([0-9]+ [0-9]+\)\)' | tail -1 \
-            | sed -E 's/^\(ok 4 //; s/\)$//')
-  fi
-
-  local P F
-  P=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\1/')
-  F=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\2/')
-  P=${P:-0}
-  F=${F:-0}
-  echo "${P} ${F}"
-}
-
-declare -A SUITE_PASS
-declare -A SUITE_FAIL
-TOTAL_PASS=0
-TOTAL_FAIL=0
-
-echo "Running feed conformance suite..." >&2
-for s in "${SUITES[@]}"; do
-  read -r p f < <(run_suite "$s")
-  SUITE_PASS[$s]=$p
-  SUITE_FAIL[$s]=$f
-  TOTAL_PASS=$((TOTAL_PASS + p))
-  TOTAL_FAIL=$((TOTAL_FAIL + f))
-  printf "  %-12s %d/%d\n" "$s" "$p" "$((p+f))" >&2
-done
-
-# scoreboard.json
-{
-  printf '{\n'
-  printf '  "suites": {\n'
-  first=1
-  for s in "${SUITES[@]}"; do
-    if [ $first -eq 0 ]; then printf ',\n'; fi
-    printf '    "%s": {"pass": %d, "fail": %d}' "$s" "${SUITE_PASS[$s]}" "${SUITE_FAIL[$s]}"
-    first=0
-  done
-  printf '\n  },\n'
-  printf '  "total_pass": %d,\n' "$TOTAL_PASS"
-  printf '  "total_fail": %d,\n' "$TOTAL_FAIL"
-  printf '  "total": %d\n' "$((TOTAL_PASS + TOTAL_FAIL))"
-  printf '}\n'
-} > "$OUT_JSON"
-
-# scoreboard.md
-{
-  printf '# feed Conformance Scoreboard\n\n'
-  printf '_Generated by `lib/feed/conformance.sh`_\n\n'
-  printf '| Suite | Pass | Fail | Total |\n'
-  printf '|-------|-----:|-----:|------:|\n'
-  for s in "${SUITES[@]}"; do
-    p=${SUITE_PASS[$s]}
-    f=${SUITE_FAIL[$s]}
-    printf '| %s | %d | %d | %d |\n' "$s" "$p" "$f" "$((p+f))"
-  done
-  printf '| **Total** | **%d** | **%d** | **%d** |\n' "$TOTAL_PASS" "$TOTAL_FAIL" "$((TOTAL_PASS + TOTAL_FAIL))"
-} > "$OUT_MD"
-
-echo "Wrote $OUT_JSON and $OUT_MD" >&2
-echo "Total: $TOTAL_PASS pass, $TOTAL_FAIL fail" >&2
-
-[ "$TOTAL_FAIL" -eq 0 ]

lib/feed/content.sx

@@ -1,68 +0,0 @@
-; feed/content — TF-IDF relevance over activity :tags. Rare tags carry more
-; signal, so an activity matching an uncommon tag ranks above one matching a
-; common tag. Composes with rank.sx: feed/tfidf-score is just another scorer.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx, lib/feed/fanout.sx
-; (feed/-distinct), lib/feed/rank.sx (feed/rank).
-
-; document frequency: tag -> number of activities whose :tags contain it
-; (a tag repeated within one activity counts once toward df)
-(define
-  feed/tag-df
-  (fn
-    (stream)
-    (reduce
-      (fn
-        (df a)
-        (reduce
-          (fn (d t) (assoc d t (+ (get d t 0) 1)))
-          df
-          (feed/-distinct (get a :tags))))
-      {}
-      (feed/items stream))))
-
-; inverse document frequency: tag -> log(N / df)
-(define
-  feed/tag-idf
-  (fn
-    (stream)
-    (let
-      ((n (feed/count stream)) (df (feed/tag-df stream)))
-      (reduce
-        (fn (idf t) (assoc idf t (log (/ n (get df t)))))
-        {}
-        (keys df)))))
-
-; term frequency within one activity: tag -> occurrence count
-(define
-  feed/-tf
-  (fn
-    (a)
-    (reduce
-      (fn (tf t) (assoc tf t (+ (get tf t 0) 1)))
-      {}
-      (get a :tags))))
-
-; relevance of an activity to a query (list of tags) given precomputed idf:
-; sum over query tags of tf(tag in activity) * idf(tag in corpus)
-(define
-  feed/tfidf-score
-  (fn
-    (idf query)
-    (fn
-      (a)
-      (let
-        ((tf (feed/-tf a)))
-        (reduce
-          (fn
-            (acc t)
-            (+ acc (* (get tf t 0) (get idf t 0))))
-          0
-          query)))))
-
-; rank a stream by relevance to query tags (idf computed over the stream itself)
-(define
-  feed/by-relevance
-  (fn
-    (stream query)
-    (feed/rank stream (feed/tfidf-score (feed/tag-idf stream) query))))

lib/feed/dedupe.sx

@@ -1,76 +0,0 @@
-; feed/dedupe — collapse duplicate items, keeping first occurrence per key.
-; Each verb may want its own key (see briefing): "alice posted X" keys on
-; (actor verb object) — distinct per actor; "alice liked X / bob liked X"
-; collapse on (verb object) so the cross-actor likes fold into one.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx, lib/feed/fanout.sx
-; (feed/-elem? lives in fanout.sx).
-
-; generic: dedupe a stream by key-fn, first occurrence wins (stable)
-(define
-  feed/-dedup-by
-  (fn
-    (items key-fn)
-    (get
-      (reduce
-        (fn
-          (st x)
-          (let
-            ((k (key-fn x)))
-            (if (feed/-elem? k (get st :seen)) st {:seen (append (get st :seen) (list k)) :out (append (get st :out) (list x))})))
-        {:seen (list) :out (list)}
-        items)
-      :out)))
-
-(define
-  feed/dedupe
-  (fn
-    (stream key-fn)
-    (feed/stream (feed/-dedup-by (feed/items stream) key-fn))))
-
-; --- keys -------------------------------------------------------------------
-
-(define
-  feed/activity-key
-  (fn (a) (list (get a :actor) (get a :verb) (get a :object))))
-
-; collapse cross-actor duplicates of the same verb+object (e.g. likes)
-(define feed/collapse-key (fn (a) (list (get a :verb) (get a :object))))
-
-; per-receiver inbox key — one inbox event per (receiver, actor, verb, object)
-(define
-  feed/event-key
-  (fn
-    (ev)
-    (let
-      ((a (get ev :activity)))
-      (list (get ev :to) (get a :actor) (get a :verb) (get a :object)))))
-
-; verbs whose duplicates collapse across actors (reactions, not authorship).
-; rebindable: callers can (set! feed/collapse-verbs ...) to tune the policy.
-(define
-  feed/collapse-verbs
-  (list "like" "favourite" "follow" "boost" "repost"))
-
-; per-verb key: collapse-verbs fold on (verb object); the rest key on
-; (actor verb object).
-(define
-  feed/smart-key
-  (fn
-    (a)
-    (if
-      (feed/-elem? (get a :verb) feed/collapse-verbs)
-      (feed/collapse-key a)
-      (feed/activity-key a))))
-
-; --- ready-made dedupers ----------------------------------------------------
-
-(define feed/dedupe-activities (fn (s) (feed/dedupe s feed/activity-key)))
-
-(define feed/dedupe-collapse (fn (s) (feed/dedupe s feed/collapse-key)))
-
-; verb-aware: reactions collapse cross-actor, posts stay distinct per actor
-(define feed/dedupe-smart (fn (s) (feed/dedupe s feed/smart-key)))
-
-; dedupe an inbox: at most one event per receiver per (actor verb object)
-(define feed/dedupe-inbox (fn (inbox) (feed/dedupe inbox feed/event-key)))

lib/feed/fanout.sx

@@ -1,114 +0,0 @@
-; feed/fanout — THE SHOWCASE. Fan activities out to followers via the APL outer
-; product (∘.×). activities ∘.× audience → an (activity × follower) matrix of
-; inbox events; flatten to a vector; guard-keep only real follow edges.
-;
-; Requires: lib/apl/runtime.sx, lib/feed/normalize.sx, lib/feed/stream.sx.
-;
-; NOTE: apl-outer's combiner result is run through (if (scalar? r) (disclose r) r).
-; A bare dict counts as a scalar (shape ()) and disclose nils it — so the combiner
-; must (enclose ...) its event dict; apl-outer then discloses it back intact.
-
-; --- graph: {followee -> (list of followers)} -------------------------------
-
-(define feed/followers (fn (graph user) (get graph user (list))))
-
-; build a graph from (follower followee) edges: "follower follows followee"
-(define
-  feed/follow-graph
-  (fn
-    (edges)
-    (reduce
-      (fn
-        (g e)
-        (let
-          ((follower (first e)) (followee (nth e 1)))
-          (assoc
-            g
-            followee
-            (append (feed/followers g followee) (list follower)))))
-      {}
-      edges)))
-
-; --- helpers ----------------------------------------------------------------
-
-; unwrap an apl-scalar (has :ravel) back to its value; pass activities through
-(define
-  feed/-val
-  (fn
-    (x)
-    (if (and (= (type-of x) "dict") (has-key? x :ravel)) (disclose x) x)))
-
-(define feed/-elem? (fn (x lst) (some (fn (y) (equal? x y)) lst)))
-
-(define
-  feed/-distinct
-  (fn
-    (lst)
-    (if
-      (= (len lst) 0)
-      (list)
-      (get (apl-unique (make-array (list (len lst)) lst)) :ravel))))
-
-; rank-2 matrix -> rank-1 stream of its ravel
-(define feed/-flatten (fn (arr) (feed/stream (get arr :ravel))))
-
-; distinct receivers across the whole graph, sorted for determinism
-; (dict key order is unspecified, so sort to pin audience/recipient ordering)
-(define
-  feed/audience
-  (fn
-    (graph)
-    (sort
-      (feed/-distinct
-        (reduce
-          (fn (acc k) (append acc (feed/followers graph k)))
-          (list)
-          (keys graph))))))
-
-; --- the outer product ------------------------------------------------------
-
-; one (activity, follower) inbox event, enclosed so apl-outer keeps the dict
-(define feed/-mk-event (fn (a f) (enclose {:activity (feed/-val a) :to (feed/-val f)})))
-
-; keep events where :to actually follows the activity's actor
-(define
-  feed/-edge?
-  (fn
-    (graph)
-    (fn
-      (ev)
-      (feed/-elem?
-        (get ev :to)
-        (feed/followers graph (get (get ev :activity) :actor))))))
-
-; fanout — activities ∘.× audience, flatten, guard-keep real edges
-(define
-  feed/fanout
-  (fn
-    (stream graph)
-    (let
-      ((matrix (apl-outer feed/-mk-event stream (feed/stream (feed/audience graph)))))
-      (feed/filter (feed/-flatten matrix) (feed/-edge? graph)))))
-
-; --- inbox queries ----------------------------------------------------------
-
-(define
-  feed/inbox-for
-  (fn
-    (inbox user)
-    (feed/filter inbox (fn (ev) (equal? (get ev :to) user)))))
-
-(define
-  feed/recipients
-  (fn
-    (inbox)
-    (feed/-distinct (map (fn (ev) (get ev :to)) (feed/items inbox)))))
-
-; the activities (unwrapped) destined for a user
-(define
-  feed/inbox-activities
-  (fn
-    (inbox user)
-    (map
-      (fn (ev) (get ev :activity))
-      (feed/items (feed/inbox-for inbox user)))))

lib/feed/fed.sx

@@ -1,60 +0,0 @@
-; feed/fed — federation. Outbound: a local post fans out, then splits into local
-; vs remote inboxes; remote events are handed to an injected send-fn. Inbound:
-; peer activities merge into the local stream, deduped. Backfill: pull peer
-; history via an injected fetch-fn and merge.
-;
-; remote? / send-fn / fetch-fn are injected so real fed-sx transport wires in here
-; without feed depending on it.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx, lib/feed/fanout.sx,
-; lib/feed/dedupe.sx.
-
-; --- merge / ingest ---------------------------------------------------------
-
-(define
-  feed/merge
-  (fn (s1 s2) (feed/stream (append (feed/items s1) (feed/items s2)))))
-
-; merge a peer stream into local, dropping (actor verb object) duplicates
-(define
-  feed/ingest
-  (fn (local peer) (feed/dedupe-activities (feed/merge local peer))))
-
-; --- inbound ----------------------------------------------------------------
-
-; peer pushes raw activities to the local inbox; normalize + ingest
-(define
-  feed/inbound
-  (fn
-    (local raw-activities)
-    (feed/ingest local (feed/stream (map feed/normalize raw-activities)))))
-
-; backfill on subscribe: pull peer history via fetch-fn, normalize, ingest
-(define
-  feed/backfill
-  (fn (local fetch-fn peer-id) (feed/inbound local (fetch-fn peer-id))))
-
-; --- outbound ---------------------------------------------------------------
-
-; split an inbox into local vs remote deliveries by viewer-id predicate
-(define feed/partition-inbox (fn (inbox remote?) {:local (feed/filter inbox (fn (ev) (not (remote? (get ev :to))))) :remote (feed/filter inbox (fn (ev) (remote? (get ev :to))))}))
-
-; fan a stream out over the graph, then partition by locality
-(define
-  feed/federate
-  (fn
-    (stream graph remote?)
-    (feed/partition-inbox (feed/fanout stream graph) remote?)))
-
-; deliver: hand each remote event to send-fn, return the local inbox to enqueue
-(define
-  feed/deliver
-  (fn
-    (stream graph remote? send-fn)
-    (let
-      ((parts (feed/federate stream graph remote?)))
-      (begin
-        (for-each
-          (fn (ev) (send-fn (get ev :to) (get ev :activity)))
-          (feed/items (get parts :remote)))
-        (get parts :local)))))

lib/feed/home.sx

@@ -1,23 +0,0 @@
-; feed/home — the capstone. A user's home timeline is the whole pipeline as one
-; line: fan all activities out over the follow graph, take the events landing in
-; the viewer's inbox, dedupe cross-posts, apply the viewer's ACL, rank, take N.
-;
-; Requires: fanout.sx, dedupe.sx, acl.sx (feed/timeline), rank.sx, stream.sx.
-
-; the activities in a user's inbox, as a stream
-(define
-  feed/inbox-stream
-  (fn (inbox user) (feed/stream (feed/inbox-activities inbox user))))
-
-; fanout ∘ inbox ∘ dedupe ∘ ACL ∘ rank ∘ take
-(define
-  feed/home
-  (fn
-    (stream graph viewer permit? score-fn n)
-    (feed/timeline
-      (feed/dedupe-activities
-        (feed/inbox-stream (feed/fanout stream graph) viewer))
-      viewer
-      permit?
-      score-fn
-      n)))

lib/feed/mute.sx

@@ -1,44 +0,0 @@
-; feed/mute — viewer-controlled filtering. ACL (acl.sx) is author-controlled
-; visibility; mute is the reader's own preference: hide muted actors or tags.
-; Like ACL it is per-viewer and applied per request, never cached.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx, lib/feed/fanout.sx
-; (feed/-elem?).
-
-; drop activities authored by a muted actor
-(define
-  feed/mute-actors
-  (fn
-    (stream actors)
-    (feed/filter
-      stream
-      (fn (a) (not (feed/-elem? (get a :actor) actors))))))
-
-; drop activities carrying any muted tag
-(define
-  feed/mute-tags
-  (fn
-    (stream tags)
-    (feed/filter
-      stream
-      (fn (a) (not (some (fn (t) (feed/-elem? t tags)) (get a :tags)))))))
-
-; drop activities about a muted object (thread mute)
-(define
-  feed/mute-objects
-  (fn
-    (stream objects)
-    (feed/filter
-      stream
-      (fn (a) (not (feed/-elem? (get a :object) objects))))))
-
-; apply a viewer preference bag: {:mute-actors (...) :mute-tags (...) :mute-objects (...)}
-(define
-  feed/apply-prefs
-  (fn
-    (stream prefs)
-    (feed/mute-objects
-      (feed/mute-tags
-        (feed/mute-actors stream (get prefs :mute-actors (list)))
-        (get prefs :mute-tags (list)))
-      (get prefs :mute-objects (list)))))

lib/feed/normalize.sx

@@ -1,31 +0,0 @@
-; feed/normalize — coerce arbitrary input into the canonical activity record.
-; An activity is a small dict {:actor :verb :object :at :tags}; a stream is an
-; APL vector of such dicts (see stream.sx). Extra keys on the raw input survive
-; (e.g. :visible-to for ACL, peer metadata for federation) — :tags is the
-; flexible bag but the record is not closed.
-
-(define feed/activity-keys (list :actor :verb :object :at :tags))
-
-(define
-  feed/normalize
-  (fn
-    (raw)
-    (let
-      ((d (if (= (type-of raw) "dict") raw {})))
-      (merge d {:actor (get d :actor "") :object (get d :object nil) :at (get d :at 0) :tags (let ((t (get d :tags (list)))) (if (list? t) t (list t))) :verb (get d :verb "post")}))))
-
-(define
-  feed/activity
-  (fn (actor verb object at tags) (feed/normalize {:actor actor :object object :at at :tags tags :verb verb})))
-
-(define feed/actor (fn (a) (get a :actor)))
-(define feed/verb (fn (a) (get a :verb)))
-(define feed/object (fn (a) (get a :object)))
-(define feed/at (fn (a) (get a :at)))
-(define feed/tags (fn (a) (get a :tags)))
-
-(define
-  feed/activity?
-  (fn
-    (a)
-    (and (= (type-of a) "dict") (has-key? a :actor) (has-key? a :verb))))

lib/feed/notify.sx

@@ -1,45 +0,0 @@
-; feed/notify — a notification feed is a thin layer over a recipient's inbox:
-; the events directed at a user, optionally verb-filtered, and a digest that
-; collapses "alice, bob and 1 other liked X" by (verb, object).
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx, lib/feed/fanout.sx
-; (feed/inbox-for, feed/-elem?).
-
-; all inbox events for a user (their raw notifications)
-(define feed/notifications (fn (inbox user) (feed/inbox-for inbox user)))
-
-; restrict to notification-worthy verbs (e.g. (list "like" "reply" "follow"))
-(define
-  feed/notify-verbs
-  (fn
-    (inbox user verbs)
-    (feed/filter
-      (feed/inbox-for inbox user)
-      (fn (ev) (feed/-elem? (get (get ev :activity) :verb) verbs)))))
-
-; group key "verb|object" — deterministic, sortable
-(define
-  feed/-notify-key
-  (fn
-    (ev)
-    (let
-      ((a (get ev :activity)))
-      (string-append (get a :verb) "|" (get a :object)))))
-
-; digest: one entry per (verb, object) with the distinct actors and a count,
-; ordered by key for determinism.
-(define
-  feed/notify-digest
-  (fn
-    (inbox user)
-    (let
-      ((events (feed/items (feed/inbox-for inbox user))))
-      (let
-        ((groups (reduce (fn (g ev) (let ((a (get ev :activity)) (k (feed/-notify-key ev))) (let ((cur (get g k {:object (get a :object) :actors (list) :verb (get a :verb)}))) (assoc g k (assoc cur :actors (append (get cur :actors) (list (get a :actor)))))))) {} events)))
-        (map
-          (fn
-            (k)
-            (let
-              ((grp (get groups k)))
-              (assoc grp :count (len (get grp :actors)))))
-          (sort (keys groups)))))))

lib/feed/page.sx

@@ -1,50 +0,0 @@
-; feed/page — pagination. Offset/limit for indexed access, and cursor-based
-; (by :at) for recency feeds, which is stable under inserts: a cursor is the
-; :at of the last item seen, and the next page is the newest items older than it.
-;
-; Requires: lib/feed/stream.sx (feed/recent, feed/take, feed/filter).
-
-; --- offset / limit ---------------------------------------------------------
-
-(define
-  feed/page
-  (fn
-    (stream offset limit)
-    (feed/stream (take (drop (feed/items stream) offset) limit))))
-
-(define
-  feed/page-count
-  (fn (stream limit) (ceil (/ (feed/count stream) limit))))
-
-; --- cursor (recency feeds) -------------------------------------------------
-
-; activities strictly older than cursor (scroll down / load older)
-(define
-  feed/before
-  (fn
-    (stream cursor)
-    (feed/filter stream (fn (a) (< (get a :at) cursor)))))
-
-; activities strictly newer than cursor (load newer / "N new posts")
-(define
-  feed/after
-  (fn
-    (stream cursor)
-    (feed/filter stream (fn (a) (> (get a :at) cursor)))))
-
-; one page: the `limit` newest activities older than cursor, newest first
-(define
-  feed/page-before
-  (fn
-    (stream cursor limit)
-    (feed/take (feed/recent (feed/before stream cursor)) limit)))
-
-; cursor to fetch the next (older) page: :at of the last item of a page,
-; or nil when the page is empty (end of feed)
-(define
-  feed/next-cursor
-  (fn
-    (page)
-    (let
-      ((items (feed/items page)))
-      (if (= (len items) 0) nil (get (last items) :at)))))

lib/feed/rank.sx

@@ -1,92 +0,0 @@
-; feed/rank — scoring + ranking. Scorers are (activity -> number). Ranking is a
-; stable two-pass grade-down: first by :at descending (the tiebreak), then by
-; score descending — so ties resolve by recency, then by input order. Fully
-; deterministic on ties.
-;
-; Requires: lib/apl/runtime.sx, lib/feed/normalize.sx, lib/feed/stream.sx.
-
-; --- scorers ----------------------------------------------------------------
-
-; recency: half-life decay. score = 0.5 ^ (age / half-life). at==now -> 1.0.
-(define
-  feed/recency
-  (fn
-    (now half-life)
-    (fn (a) (expt 0.5 (/ (- now (get a :at)) half-life)))))
-
-; velocity: how many of this actor's activities fall in (at-window, at] —
-; a burst of recent activity scores higher.
-(define
-  feed/velocity
-  (fn
-    (stream window)
-    (fn
-      (a)
-      (len
-        (filter
-          (fn
-            (b)
-            (and
-              (equal? (get b :actor) (get a :actor))
-              (<= (get b :at) (get a :at))
-              (> (get b :at) (- (get a :at) window))))
-          (feed/items stream))))))
-
-; engagement: how many activities in the stream touch this activity's :object
-(define
-  feed/engagement
-  (fn
-    (stream)
-    (fn
-      (a)
-      (len
-        (filter
-          (fn (b) (equal? (get b :object) (get a :object)))
-          (feed/items stream))))))
-
-; composite: weighted sum. parts = (list (list weight scorer) ...)
-(define
-  feed/composite
-  (fn
-    (parts)
-    (fn
-      (a)
-      (reduce
-        (fn (acc p) (+ acc (* (first p) ((nth p 1) a))))
-        0
-        parts))))
-
-; --- ranking ----------------------------------------------------------------
-
-; stable reorder of items by key-fn, descending (grade-down is stable)
-(define
-  feed/-desc-by
-  (fn
-    (items key-fn)
-    (let
-      ((keys (make-array (list (len items)) (map key-fn items))))
-      (let
-        ((order (get (apl-grade-down keys) :ravel)))
-        (map (fn (i) (nth items (- i 1))) order)))))
-
-; rank by score descending; ties -> :at descending -> input order
-(define
-  feed/rank
-  (fn
-    (stream score-fn)
-    (let
-      ((by-at (feed/-desc-by (feed/items stream) feed/at)))
-      (feed/stream (feed/-desc-by by-at score-fn)))))
-
-; attach a :score to each activity (for inspection / debugging)
-(define
-  feed/with-scores
-  (fn
-    (stream score-fn)
-    (feed/stream
-      (map (fn (a) (assoc a :score (score-fn a))) (feed/items stream)))))
-
-; top-N ranked timeline
-(define
-  feed/top
-  (fn (stream score-fn n) (feed/take (feed/rank stream score-fn) n)))

lib/feed/scoreboard.json

@@ -1,19 +0,0 @@
-{
-  "suites": {
-    "basic": {"pass": 30, "fail": 0},
-    "fanout": {"pass": 29, "fail": 0},
-    "rank": {"pass": 24, "fail": 0},
-    "integration": {"pass": 22, "fail": 0},
-    "content": {"pass": 15, "fail": 0},
-    "notify": {"pass": 8, "fail": 0},
-    "home": {"pass": 6, "fail": 0},
-    "dedupe": {"pass": 9, "fail": 0},
-    "trending": {"pass": 11, "fail": 0},
-    "mute": {"pass": 9, "fail": 0},
-    "page": {"pass": 14, "fail": 0},
-    "thread": {"pass": 12, "fail": 0}
-  },
-  "total_pass": 189,
-  "total_fail": 0,
-  "total": 189
-}

lib/feed/scoreboard.md

@@ -1,19 +0,0 @@
-# feed Conformance Scoreboard
-
-_Generated by `lib/feed/conformance.sh`_
-
-| Suite | Pass | Fail | Total |
-|-------|-----:|-----:|------:|
-| basic | 30 | 0 | 30 |
-| fanout | 29 | 0 | 29 |
-| rank | 24 | 0 | 24 |
-| integration | 22 | 0 | 22 |
-| content | 15 | 0 | 15 |
-| notify | 8 | 0 | 8 |
-| home | 6 | 0 | 6 |
-| dedupe | 9 | 0 | 9 |
-| trending | 11 | 0 | 11 |
-| mute | 9 | 0 | 9 |
-| page | 14 | 0 | 14 |
-| thread | 12 | 0 | 12 |
-| **Total** | **189** | **0** | **189** |

lib/feed/stream.sx

@@ -1,75 +0,0 @@
-; feed/stream — a stream is an APL vector (rank-1 array) whose ravel holds
-; activity dicts. Operations lift APL primitives onto this shape: filter via
-; compress (/), sort via grade (⍋), take via ↑, reverse via ⌽.
-;
-; Requires: lib/apl/runtime.sx, lib/feed/normalize.sx (loaded by harness).
-
-(define feed/stream (fn (acts) (make-array (list (len acts)) acts)))
-
-(define feed/items (fn (s) (get s :ravel)))
-
-(define feed/count (fn (s) (len (get s :ravel))))
-
-(define feed/empty (feed/stream (list)))
-
-(define feed/empty? (fn (s) (= (feed/count s) 0)))
-
-; filter — bool mask ∘ compress. pred : activity -> truthy
-(define
-  feed/filter
-  (fn
-    (s pred)
-    (let
-      ((items (get s :ravel)))
-      (let
-        ((mask (make-array (list (len items)) (map (fn (a) (if (pred a) 1 0)) items))))
-        (apl-compress mask s)))))
-
-; sort-by — ascending, stable on ties (grade-up is stable). key-fn : activity -> number
-(define
-  feed/sort-by
-  (fn
-    (s key-fn)
-    (let
-      ((items (get s :ravel)))
-      (let
-        ((keys (make-array (list (len items)) (map key-fn items))))
-        (let
-          ((order (get (apl-grade-up keys) :ravel)))
-          (feed/stream (map (fn (i) (nth items (- i 1))) order)))))))
-
-(define feed/sort-by-at (fn (s) (feed/sort-by s feed/at)))
-
-; newest-first: ascending sort then reverse (⌽)
-(define feed/recent (fn (s) (apl-reverse (feed/sort-by-at s))))
-
-; take N (↑), clamped to stream length so it never over-takes/pads
-(define
-  feed/take
-  (fn
-    (s n)
-    (let
-      ((c (feed/count s)))
-      (if (>= n c) s (apl-take (apl-scalar n) s)))))
-
-(define feed/reverse (fn (s) (apl-reverse s)))
-
-; common predicates
-(define
-  feed/by-actor
-  (fn (s actor) (feed/filter s (fn (a) (equal? (get a :actor) actor)))))
-
-(define
-  feed/by-verb
-  (fn (s verb) (feed/filter s (fn (a) (equal? (get a :verb) verb)))))
-
-(define
-  feed/by-object
-  (fn
-    (s object)
-    (feed/filter s (fn (a) (equal? (get a :object) object)))))
-
-; activities at or after timestamp t
-(define
-  feed/since
-  (fn (s t) (feed/filter s (fn (a) (>= (get a :at) t)))))

lib/feed/tests/basic.sx

@@ -1,118 +0,0 @@
-; Phase 1 — normalize, stream ops, api. Uses the feed-test harness
-; (feed-test name got expected) provided by conformance.sh.
-
-; ---------- normalize ----------
-
-(feed-test
-  "normalize default actor"
-  (feed/actor (feed/normalize {}))
-  "")
-(feed-test
-  "normalize default verb"
-  (feed/verb (feed/normalize {}))
-  "post")
-(feed-test
-  "normalize default at"
-  (feed/at (feed/normalize {}))
-  0)
-(feed-test
-  "normalize default object"
-  (feed/object (feed/normalize {}))
-  nil)
-(feed-test
-  "normalize default tags"
-  (feed/tags (feed/normalize {}))
-  (list))
-(feed-test
-  "normalize keeps actor"
-  (feed/actor (feed/normalize {:actor "alice"}))
-  "alice")
-(feed-test
-  "normalize keeps verb"
-  (feed/verb (feed/normalize {:verb "like"}))
-  "like")
-(feed-test
-  "normalize scalar tag -> list"
-  (feed/tags (feed/normalize {:tags "x"}))
-  (list "x"))
-(feed-test
-  "normalize list tags kept"
-  (feed/tags (feed/normalize {:tags (list "a" "b")}))
-  (list "a" "b"))
-(feed-test
-  "activity constructor at"
-  (feed/at (feed/activity "a" "post" "o" 5 (list)))
-  5)
-(feed-test
-  "activity? on activity"
-  (feed/activity? (feed/normalize {:actor "a"}))
-  true)
-(feed-test "activity? on number" (feed/activity? 5) false)
-(feed-test "activity? on bare dict" (feed/activity? {:foo 1}) false)
-
-; ---------- stream ----------
-
-(define
-  S
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p1" 30 (list))
-      (feed/activity "bob" "like" "p1" 10 (list))
-      (feed/activity "alice" "post" "p2" 20 (list)))))
-
-(feed-test "stream count" (feed/count S) 3)
-(feed-test "stream items len" (len (feed/items S)) 3)
-(feed-test
-  "sort-by-at actors asc"
-  (map feed/actor (feed/items (feed/sort-by-at S)))
-  (list "bob" "alice" "alice"))
-(feed-test
-  "recent newest first"
-  (map feed/at (feed/items (feed/recent S)))
-  (list 30 20 10))
-(feed-test
-  "take 2 of recent"
-  (feed/count (feed/take (feed/recent S) 2))
-  2)
-(feed-test
-  "take clamps past end"
-  (feed/count (feed/take S 10))
-  3)
-(feed-test
-  "by-actor alice count"
-  (feed/count (feed/by-actor S "alice"))
-  2)
-(feed-test
-  "by-verb like actor"
-  (map feed/actor (feed/items (feed/by-verb S "like")))
-  (list "bob"))
-(feed-test
-  "by-object p1 count"
-  (feed/count (feed/by-object S "p1"))
-  2)
-(feed-test
-  "since 20 count"
-  (feed/count (feed/since S 20))
-  2)
-(feed-test
-  "reverse ats"
-  (map feed/at (feed/items (feed/reverse S)))
-  (list 20 10 30))
-(feed-test "empty? on empty" (feed/empty? feed/empty) true)
-(feed-test
-  "empty? on filtered-out"
-  (feed/empty? (feed/by-actor S "zzz"))
-  true)
-
-; ---------- api ----------
-
-(feed/reset!)
-(feed/post {:actor "x" :at 1 :verb "post"})
-(feed/post {:actor "y" :at 2 :verb "like"})
-(feed-test "api size after posts" (feed/size) 2)
-(feed-test "api all count" (feed/count (feed/all)) 2)
-(feed-test
-  "post returns normalized verb"
-  (feed/verb (feed/post {:actor "z"}))
-  "post")
-(feed-test "api size after third post" (feed/size) 3)

lib/feed/tests/content.sx

@@ -1,85 +0,0 @@
-; Follow-up — TF-IDF content ranking over :tags. (feed-test name got expected)
-
-(define
-  corpus
-  (feed/stream
-    (list
-      (feed/normalize {:actor "u" :object "o1" :at 10 :tags (list "cats" "funny")})
-      (feed/normalize {:actor "u" :object "o2" :at 20 :tags (list "cats" "news")})
-      (feed/normalize {:actor "u" :object "o3" :at 30 :tags (list "politics" "news")})
-      (feed/normalize {:actor "u" :object "o4" :at 40 :tags (list "cats")}))))
-
-; ---------- document frequency ----------
-
-(feed-test "df cats" (get (feed/tag-df corpus) "cats") 3)
-(feed-test "df news" (get (feed/tag-df corpus) "news") 2)
-(feed-test "df funny" (get (feed/tag-df corpus) "funny") 1)
-(feed-test "df politics" (get (feed/tag-df corpus) "politics") 1)
-(feed-test "df full" (feed/tag-df corpus) {:news 2 :funny 1 :politics 1 :cats 3})
-
-; ---------- inverse document frequency ----------
-
-(feed-test
-  "idf news = log(4/2)"
-  (get (feed/tag-idf corpus) "news")
-  (log 2))
-(feed-test
-  "idf funny = log(4/1)"
-  (get (feed/tag-idf corpus) "funny")
-  (log 4))
-(feed-test
-  "rarer tag has higher idf"
-  (>
-    (get (feed/tag-idf corpus) "funny")
-    (get (feed/tag-idf corpus) "cats"))
-  true)
-
-; ---------- tf-idf scoring ----------
-
-(define idf (feed/tag-idf corpus))
-
-(feed-test
-  "score query funny on o1"
-  ((feed/tfidf-score idf (list "funny")) (feed/normalize {:actor "u" :object "x" :tags (list "cats" "funny")}))
-  (log 4))
-(feed-test
-  "score query funny on non-match"
-  ((feed/tfidf-score idf (list "funny")) (feed/normalize {:actor "u" :object "x" :tags (list "cats")}))
-  0)
-(feed-test
-  "unknown query tag scores 0"
-  ((feed/tfidf-score idf (list "zzz")) (feed/normalize {:actor "u" :object "x" :tags (list "cats")}))
-  0)
-
-; ---------- ranking by relevance ----------
-
-; query news: o2,o3 match (score log2), o1,o4 don't (0); ties break by :at desc
-(feed-test
-  "by-relevance news order"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/by-relevance corpus (list "news"))))
-  (list "o3" "o2" "o4" "o1"))
-
-; query funny: only o1 matches -> ranks first
-(feed-test
-  "by-relevance funny first"
-  (get
-    (nth (feed/items (feed/by-relevance corpus (list "funny"))) 0)
-    :object)
-  "o1")
-
-; query (cats news): o2 carries both tags -> highest combined tf-idf
-(feed-test
-  "by-relevance cats+news top"
-  (get
-    (nth
-      (feed/items (feed/by-relevance corpus (list "cats" "news")))
-      0)
-    :object)
-  "o2")
-
-(feed-test
-  "by-relevance preserves count"
-  (feed/count (feed/by-relevance corpus (list "cats")))
-  4)

lib/feed/tests/dedupe.sx

@@ -1,56 +0,0 @@
-; Follow-up — verb-aware (smart) dedupe. (feed-test name got expected)
-
-; reactions (like/follow) collapse cross-actor; posts stay distinct per actor
-(define
-  M
-  (feed/stream
-    (list
-      (feed/activity "alice" "like" "X" 1 (list))
-      (feed/activity "bob" "like" "X" 2 (list))
-      (feed/activity "alice" "post" "P" 3 (list))
-      (feed/activity "bob" "post" "P" 4 (list))
-      (feed/activity "alice" "follow" "C" 5 (list))
-      (feed/activity "bob" "follow" "C" 6 (list))))) ; collapses
-
-(feed-test
-  "smart dedupe total"
-  (feed/count (feed/dedupe-smart M))
-  4)
-(feed-test
-  "smart keeps both posts"
-  (feed/count (feed/by-verb (feed/dedupe-smart M) "post"))
-  2)
-(feed-test
-  "smart collapses likes to one"
-  (feed/count (feed/by-verb (feed/dedupe-smart M) "like"))
-  1)
-(feed-test
-  "smart collapses follows to one"
-  (feed/count (feed/by-verb (feed/dedupe-smart M) "follow"))
-  1)
-(feed-test
-  "collapsed like keeps first actor"
-  (map feed/actor (feed/items (feed/by-verb (feed/dedupe-smart M) "like")))
-  (list "alice"))
-
-; contrast: plain activity dedupe keeps cross-actor likes distinct
-(feed-test
-  "activity dedupe keeps both likes"
-  (feed/count (feed/by-verb (feed/dedupe-activities M) "like"))
-  2)
-
-; contrast: blanket collapse folds the two posts (same verb+object) too
-(feed-test
-  "collapse dedupe folds posts"
-  (feed/count (feed/by-verb (feed/dedupe-collapse M) "post"))
-  1)
-
-; smart-key dispatch
-(feed-test
-  "smart-key reaction -> (verb object)"
-  (feed/smart-key (feed/activity "alice" "like" "X" 0 (list)))
-  (list "like" "X"))
-(feed-test
-  "smart-key post -> (actor verb object)"
-  (feed/smart-key (feed/activity "alice" "post" "P" 0 (list)))
-  (list "alice" "post" "P"))

lib/feed/tests/fanout.sx

@@ -1,187 +0,0 @@
-; Phase 2 — fanout via outer product + dedupe. (feed-test name got expected)
-
-; ---------- graph ----------
-
-; edges: (follower followee). bob,carol follow alice; carol,dave follow bob.
-(define
-  G
-  (feed/follow-graph
-    (list
-      (list "bob" "alice")
-      (list "carol" "alice")
-      (list "carol" "bob")
-      (list "dave" "bob"))))
-
-(feed-test "followers alice" (feed/followers G "alice") (list "bob" "carol"))
-(feed-test "followers bob" (feed/followers G "bob") (list "carol" "dave"))
-(feed-test "followers unknown" (feed/followers G "zzz") (list))
-(feed-test "audience distinct" (feed/audience G) (list "bob" "carol" "dave"))
-
-; ---------- fanout ----------
-
-(define
-  S
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p1" 10 (list))
-      (feed/activity "alice" "post" "p2" 20 (list))
-      (feed/activity "bob" "like" "p1" 30 (list)))))
-
-(define IB (feed/fanout S G))
-
-(feed-test "fanout total edges" (feed/count IB) 6)
-(feed-test
-  "inbox bob count"
-  (feed/count (feed/inbox-for IB "bob"))
-  2)
-(feed-test
-  "inbox carol count"
-  (feed/count (feed/inbox-for IB "carol"))
-  3)
-(feed-test
-  "inbox dave count"
-  (feed/count (feed/inbox-for IB "dave"))
-  1)
-(feed-test
-  "inbox alice (follows none)"
-  (feed/count (feed/inbox-for IB "alice"))
-  0)
-(feed-test
-  "recipients order"
-  (feed/recipients IB)
-  (list "bob" "carol" "dave"))
-(feed-test
-  "bob inbox objects"
-  (map (fn (a) (get a :object)) (feed/inbox-activities IB "bob"))
-  (list "p1" "p2"))
-(feed-test
-  "dave inbox objects"
-  (map (fn (a) (get a :object)) (feed/inbox-activities IB "dave"))
-  (list "p1"))
-(feed-test
-  "dave inbox verb"
-  (map (fn (a) (get a :verb)) (feed/inbox-activities IB "dave"))
-  (list "like"))
-
-; empty graph → no audience → no edges
-(feed-test
-  "empty graph fanout"
-  (feed/count (feed/fanout S {}))
-  0)
-
-; actor nobody follows produces no edges
-(define
-  Sghost
-  (feed/stream (list (feed/activity "ghost" "post" "g1" 5 (list)))))
-(feed-test
-  "unfollowed actor fanout"
-  (feed/count (feed/fanout Sghost G))
-  0)
-
-; ---------- high fanout (popular actor) ----------
-
-(define
-  Gstar
-  (feed/follow-graph
-    (list
-      (list "u1" "star")
-      (list "u2" "star")
-      (list "u3" "star")
-      (list "u4" "star")
-      (list "u5" "star"))))
-(define
-  Sstar
-  (feed/stream (list (feed/activity "star" "post" "s1" 1 (list)))))
-(feed-test
-  "star fanout count"
-  (feed/count (feed/fanout Sstar Gstar))
-  5)
-(feed-test "star audience size" (len (feed/audience Gstar)) 5)
-
-; ---------- mutual follow ----------
-
-(define Gmut (feed/follow-graph (list (list "a" "b") (list "b" "a"))))
-(define
-  Smut
-  (feed/stream
-    (list
-      (feed/activity "a" "post" "pa" 1 (list))
-      (feed/activity "b" "post" "pb" 2 (list)))))
-(define IBmut (feed/fanout Smut Gmut))
-(feed-test "mutual total" (feed/count IBmut) 2)
-(feed-test
-  "mutual a gets pb"
-  (map (fn (x) (get x :object)) (feed/inbox-activities IBmut "a"))
-  (list "pb"))
-(feed-test
-  "mutual b gets pa"
-  (map (fn (x) (get x :object)) (feed/inbox-activities IBmut "b"))
-  (list "pa"))
-
-; ---------- dedupe ----------
-
-(define
-  Sdup2
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p1" 1 (list))
-      (feed/activity "alice" "post" "p1" 9 (list))
-      (feed/activity "alice" "post" "p2" 2 (list)))))
-(feed-test
-  "dedupe-activities collapses dup"
-  (feed/count (feed/dedupe-activities Sdup2))
-  2)
-(feed-test
-  "dedupe-activities keeps distinct"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/dedupe-activities Sdup2)))
-  (list "p1" "p2"))
-
-(define
-  Slikes
-  (feed/stream
-    (list
-      (feed/activity "alice" "like" "X" 1 (list))
-      (feed/activity "bob" "like" "X" 2 (list))
-      (feed/activity "carol" "like" "Y" 3 (list)))))
-(feed-test
-  "collapse cross-actor likes"
-  (feed/count (feed/dedupe-collapse Slikes))
-  2)
-(feed-test
-  "collapse keeps distinct objects"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/dedupe-collapse Slikes)))
-  (list "X" "Y"))
-
-(feed-test
-  "activity-key shape"
-  (feed/activity-key (feed/activity "a" "post" "o" 0 (list)))
-  (list "a" "post" "o"))
-(feed-test
-  "collapse-key shape"
-  (feed/collapse-key (feed/activity "a" "like" "o" 0 (list)))
-  (list "like" "o"))
-
-; cross-post: alice posts p1 twice → bob's inbox has it twice → dedupe-inbox → once
-(define
-  Scross
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p1" 1 (list))
-      (feed/activity "alice" "post" "p1" 5 (list)))))
-(define IBcross (feed/fanout Scross G))
-(feed-test
-  "cross-post raw bob count"
-  (feed/count (feed/inbox-for IBcross "bob"))
-  2)
-(feed-test
-  "cross-post deduped bob count"
-  (feed/count (feed/inbox-for (feed/dedupe-inbox IBcross) "bob"))
-  1)
-(feed-test
-  "dedupe-inbox keeps distinct receivers"
-  (feed/count (feed/dedupe-inbox IBcross))
-  2)

lib/feed/tests/home.sx

@@ -1,73 +0,0 @@
-; Follow-up — feed/home capstone pipeline. (feed-test name got expected)
-
-; alice follows star and bob (edges: follower followee)
-(define
-  G
-  (feed/follow-graph (list (list "alice" "star") (list "alice" "bob"))))
-
-; star posts s1 then s2; bob posts b1; star re-posts s1 (cross-post dup);
-; zoe posts z1 (alice does NOT follow zoe)
-(define
-  S
-  (feed/stream
-    (list
-      (feed/activity "star" "post" "s1" 10 (list))
-      (feed/activity "star" "post" "s2" 20 (list))
-      (feed/activity "bob" "post" "b1" 15 (list))
-      (feed/activity "star" "post" "s1" 5 (list))
-      (feed/activity "zoe" "post" "z1" 30 (list)))))
-
-(define rec (feed/recency 100 10))
-
-(feed-test
-  "home count (deduped, followed only)"
-  (feed/count (feed/home S G "alice" feed/permit-public? rec 10))
-  3)
-
-(feed-test
-  "home order by recency"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/home S G "alice" feed/permit-public? rec 10)))
-  (list "s2" "b1" "s1"))
-
-(feed-test
-  "home excludes unfollowed zoe"
-  (feed/-elem?
-    "z1"
-    (map
-      (fn (a) (get a :object))
-      (feed/items (feed/home S G "alice" feed/permit-public? rec 10))))
-  false)
-
-(feed-test
-  "home top-2"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/home S G "alice" feed/permit-public? rec 2)))
-  (list "s2" "b1"))
-
-(feed-test
-  "home dedupes cross-post (one s1)"
-  (len
-    (filter
-      (fn (o) (equal? o "s1"))
-      (map
-        (fn (a) (get a :object))
-        (feed/items
-          (feed/home S G "alice" feed/permit-public? rec 10)))))
-  1)
-
-; ACL applied per-viewer in the home pipeline
-(define
-  Sacl
-  (feed/stream
-    (list (feed/normalize {:actor "star" :object "pub" :at 20}) (feed/normalize {:actor "star" :object "sec" :visible-to (list "carol") :at 25}))))
-(define Gacl (feed/follow-graph (list (list "alice" "star"))))
-
-(feed-test
-  "home hides activity alice not permitted"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/home Sacl Gacl "alice" feed/permit-acl? rec 10)))
-  (list "pub"))

lib/feed/tests/integration.sx

@@ -1,155 +0,0 @@
-; Phase 4 — visibility (ACL) + federation, and the end-to-end timeline.
-; (feed-test name got expected)
-
-; ---------- ACL visibility ----------
-; pub: public. sec: bob, allows carol. dm: frank, allows dave.
-
-(define
-  C
-  (feed/stream
-    (list
-      (feed/normalize {:actor "alice" :object "pub" :at 10})
-      (feed/normalize {:actor "bob" :object "sec" :visible-to (list "carol") :at 20})
-      (feed/normalize {:actor "frank" :object "dm" :visible-to (list "dave") :at 30}))))
-
-(feed-test
-  "public visible to anyone"
-  (feed/count (feed/visible C "zoe" feed/permit-acl?))
-  1)
-(feed-test
-  "carol sees allowlisted + public"
-  (feed/count (feed/visible C "carol" feed/permit-acl?))
-  2)
-(feed-test
-  "dave sees dm + public"
-  (feed/count (feed/visible C "dave" feed/permit-acl?))
-  2)
-(feed-test
-  "author always sees own private"
-  (feed/count (feed/visible C "frank" feed/permit-acl?))
-  2)
-(feed-test
-  "permit-public? lets all through"
-  (feed/count (feed/visible C "zoe" feed/permit-public?))
-  3)
-(feed-test
-  "visible objects for dave"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/visible C "dave" feed/permit-acl?)))
-  (list "pub" "dm"))
-
-; per-viewer: same stream, different timelines
-(feed-test
-  "zoe timeline differs from carol"
-  (not
-    (=
-      (feed/count (feed/visible C "zoe" feed/permit-acl?))
-      (feed/count (feed/visible C "carol" feed/permit-acl?))))
-  true)
-
-; ---------- federation: merge / ingest ----------
-
-(define
-  L
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p1" 10 (list))
-      (feed/activity "alice" "post" "p2" 20 (list)))))
-(define
-  P
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p2" 20 (list))
-      (feed/activity "peer" "post" "p9" 25 (list)))))
-
-(feed-test "merge concatenates" (feed/count (feed/merge L P)) 4)
-(feed-test
-  "ingest dedupes overlap"
-  (feed/count (feed/ingest L P))
-  3)
-
-(feed-test
-  "inbound normalizes + ingests"
-  (feed/count (feed/inbound L (list {:actor "peer" :object "p9" :at 25} {:actor "alice" :object "p1" :at 10})))
-  3)
-
-; backfill via injected fetch-fn
-(define peer-history (fn (peer-id) (list {:actor peer-id :object "h1" :at 1} {:actor peer-id :object "h2" :at 2})))
-(feed-test
-  "backfill merges peer history"
-  (feed/count (feed/backfill L peer-history "remote"))
-  4)
-(feed-test
-  "backfill objects present"
-  (map
-    (fn (a) (get a :object))
-    (feed/items
-      (feed/by-actor (feed/backfill L peer-history "remote") "remote")))
-  (list "h1" "h2"))
-
-; ---------- federation: outbound partition ----------
-
-; bob (local), alice@remote + carol@remote (remote) follow star
-(define
-  Gf
-  (feed/follow-graph
-    (list
-      (list "bob" "star")
-      (list "alice@remote" "star")
-      (list "carol@remote" "star"))))
-(define
-  Sf
-  (feed/stream (list (feed/activity "star" "post" "s1" 1 (list)))))
-(define
-  remote?
-  (fn (id) (feed/-elem? id (list "alice@remote" "carol@remote"))))
-(define parts (feed/federate Sf Gf remote?))
-
-(feed-test "local deliveries" (feed/count (get parts :local)) 1)
-(feed-test "remote deliveries" (feed/count (get parts :remote)) 2)
-(feed-test
-  "local recipient is bob"
-  (feed/recipients (get parts :local))
-  (list "bob"))
-
-; deliver: send-fn receives each remote event, local inbox returned
-(define sent (list))
-(define send-fn (fn (to act) (set! sent (append sent (list to)))))
-(define local-inbox (feed/deliver Sf Gf remote? send-fn))
-(feed-test "deliver returns local inbox" (feed/count local-inbox) 1)
-(feed-test "deliver sent to both remotes" (len sent) 2)
-(feed-test "deliver remote targets" sent (list "alice@remote" "carol@remote"))
-
-; ---------- end-to-end: federated, ACL-filtered, ranked timeline ----------
-
-(define
-  base
-  (feed/stream
-    (list
-      (feed/normalize {:actor "alice" :object "a1" :at 100})
-      (feed/normalize {:actor "bob" :object "b1" :visible-to (list "carol") :at 90})
-      (feed/normalize {:actor "eve" :object "e1" :visible-to (list "dave") :at 80}))))
-(define federated (feed/inbound base (list {:actor "peer" :object "x1" :at 110})))
-(define rec (feed/recency 120 10))
-(define
-  carol-tl
-  (feed/timeline federated "carol" feed/permit-acl? rec 3))
-
-; eve's :visible-to excludes carol -> filtered out; peer/alice public, bob allows carol
-(feed-test "carol federated timeline count" (feed/count carol-tl) 3)
-(feed-test
-  "carol timeline order (recency)"
-  (map (fn (a) (get a :object)) (feed/items carol-tl))
-  (list "x1" "a1" "b1"))
-(feed-test
-  "eve dm excluded from carol"
-  (feed/-elem? "e1" (map (fn (a) (get a :object)) (feed/items carol-tl)))
-  false)
-(feed-test
-  "dave sees eve dm not bob"
-  (map
-    (fn (a) (get a :object))
-    (feed/items
-      (feed/timeline federated "dave" feed/permit-acl? rec 5)))
-  (list "x1" "a1" "e1"))

lib/feed/tests/mute.sx

@@ -1,68 +0,0 @@
-; Follow-up — viewer mute/block filtering. (feed-test name got expected)
-
-(define
-  S
-  (feed/stream
-    (list
-      (feed/normalize {:actor "alice" :object "P1" :at 1 :tags (list "news")})
-      (feed/normalize {:actor "bob" :object "P2" :at 2 :tags (list "spam")})
-      (feed/normalize {:actor "alice" :object "P3" :at 3 :tags (list "cats")})
-      (feed/normalize {:actor "carol" :object "P4" :at 4 :tags (list "news" "spam")}))))
-
-; ---------- mute actors ----------
-
-(feed-test
-  "mute bob drops his post"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/mute-actors S (list "bob"))))
-  (list "P1" "P3" "P4"))
-(feed-test
-  "mute alice drops two"
-  (feed/count (feed/mute-actors S (list "alice")))
-  2)
-(feed-test
-  "mute nobody keeps all"
-  (feed/count (feed/mute-actors S (list)))
-  4)
-
-; ---------- mute tags ----------
-
-(feed-test
-  "mute spam tag drops two"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/mute-tags S (list "spam"))))
-  (list "P1" "P3"))
-(feed-test
-  "mute news+cats leaves spam-only"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/mute-tags S (list "news" "cats"))))
-  (list "P2"))
-
-; ---------- mute objects ----------
-
-(feed-test
-  "mute object P3 (thread mute)"
-  (feed/count (feed/mute-objects S (list "P3")))
-  3)
-
-; ---------- combined prefs ----------
-
-(feed-test
-  "apply-prefs actors + tags"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/apply-prefs S {:mute-actors (list "bob") :mute-tags (list "cats")})))
-  (list "P1" "P4"))
-(feed-test
-  "apply-prefs empty keeps all"
-  (feed/count (feed/apply-prefs S {}))
-  4)
-(feed-test
-  "apply-prefs all three filters"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/apply-prefs S {:mute-objects (list "P3") :mute-actors (list "carol") :mute-tags (list "spam")})))
-  (list "P1"))

lib/feed/tests/notify.sx

@@ -1,69 +0,0 @@
-; Follow-up — notification feed over an inbox. (feed-test name got expected)
-
-; an inbox is a stream of {:to receiver :activity act} events
-(define mk-ev (fn (to act) {:activity act :to to}))
-
-(define
-  IB
-  (feed/stream
-    (list
-      (mk-ev "alice" (feed/activity "bob" "like" "P" 10 (list)))
-      (mk-ev "alice" (feed/activity "carol" "like" "P" 20 (list)))
-      (mk-ev "alice" (feed/activity "dave" "reply" "Q" 30 (list)))
-      (mk-ev "bob" (feed/activity "eve" "like" "R" 40 (list))))))
-
-; ---------- raw notifications ----------
-
-(feed-test
-  "alice notification count"
-  (feed/count (feed/notifications IB "alice"))
-  3)
-(feed-test
-  "bob notification count"
-  (feed/count (feed/notifications IB "bob"))
-  1)
-(feed-test
-  "zoe no notifications"
-  (feed/count (feed/notifications IB "zoe"))
-  0)
-
-; ---------- verb filtering ----------
-
-(feed-test
-  "alice likes only"
-  (feed/count (feed/notify-verbs IB "alice" (list "like")))
-  2)
-(feed-test
-  "alice replies only"
-  (feed/count (feed/notify-verbs IB "alice" (list "reply")))
-  1)
-(feed-test
-  "alice like+reply"
-  (feed/count (feed/notify-verbs IB "alice" (list "like" "reply")))
-  3)
-(feed-test
-  "alice follow (none)"
-  (feed/count (feed/notify-verbs IB "alice" (list "follow")))
-  0)
-
-; ---------- digest ----------
-
-(define dig (feed/notify-digest IB "alice"))
-
-(feed-test "digest group count" (len dig) 2)
-(feed-test
-  "digest sorted by key (like|P before reply|Q)"
-  (map (fn (g) (get g :object)) dig)
-  (list "P" "Q"))
-(feed-test
-  "like group actors"
-  (get (nth dig 0) :actors)
-  (list "bob" "carol"))
-(feed-test "like group count" (get (nth dig 0) :count) 2)
-(feed-test "like group verb" (get (nth dig 0) :verb) "like")
-(feed-test "reply group count" (get (nth dig 1) :count) 1)
-(feed-test
-  "reply group actors"
-  (get (nth dig 1) :actors)
-  (list "dave"))
-(feed-test "empty digest for zoe" (feed/notify-digest IB "zoe") (list))

lib/feed/tests/page.sx

@@ -1,86 +0,0 @@
-; Follow-up — pagination (offset + cursor). (feed-test name got expected)
-
-; ---------- offset / limit ----------
-
-(define
-  O
-  (feed/stream
-    (list
-      (feed/activity "u" "post" "o1" 1 (list))
-      (feed/activity "u" "post" "o2" 2 (list))
-      (feed/activity "u" "post" "o3" 3 (list))
-      (feed/activity "u" "post" "o4" 4 (list))
-      (feed/activity "u" "post" "o5" 5 (list)))))
-
-(feed-test
-  "page 1"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/page O 0 2)))
-  (list "o1" "o2"))
-(feed-test
-  "page 2"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/page O 2 2)))
-  (list "o3" "o4"))
-(feed-test
-  "page 3 (partial)"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/page O 4 2)))
-  (list "o5"))
-(feed-test
-  "page past end empty"
-  (feed/count (feed/page O 10 2))
-  0)
-(feed-test "page-count 5/2 = 3" (feed/page-count O 2) 3)
-(feed-test "page-count 5/5 = 1" (feed/page-count O 5) 1)
-
-; ---------- cursor (recency) ----------
-
-(define
-  R
-  (feed/stream
-    (list
-      (feed/activity "u" "post" "a" 50 (list))
-      (feed/activity "u" "post" "b" 40 (list))
-      (feed/activity "u" "post" "c" 30 (list))
-      (feed/activity "u" "post" "d" 20 (list))
-      (feed/activity "u" "post" "e" 10 (list)))))
-
-(define p1 (feed/page-before R 100 2))
-(feed-test
-  "cursor page 1 newest first"
-  (map (fn (a) (get a :object)) (feed/items p1))
-  (list "a" "b"))
-(feed-test "next cursor after page 1" (feed/next-cursor p1) 40)
-
-(define p2 (feed/page-before R (feed/next-cursor p1) 2))
-(feed-test
-  "cursor page 2"
-  (map (fn (a) (get a :object)) (feed/items p2))
-  (list "c" "d"))
-(feed-test "next cursor after page 2" (feed/next-cursor p2) 20)
-
-(define p3 (feed/page-before R (feed/next-cursor p2) 2))
-(feed-test
-  "cursor page 3 (partial)"
-  (map (fn (a) (get a :object)) (feed/items p3))
-  (list "e"))
-
-(feed-test
-  "empty page nil cursor"
-  (feed/next-cursor (feed/page-before R 5 2))
-  nil)
-
-(feed-test
-  "after cursor loads newer"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/recent (feed/after R 30))))
-  (list "a" "b"))
-(feed-test
-  "before cursor count"
-  (feed/count (feed/before R 30))
-  2)

lib/feed/tests/rank.sx

@@ -1,160 +0,0 @@
-; Phase 3 — aggregation + ranking. (feed-test name got expected)
-
-; ---------- aggregation ----------
-
-(define
-  A
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p1" 5 (list))
-      (feed/activity "alice" "post" "p2" 15 (list))
-      (feed/activity "bob" "post" "p3" 25 (list))
-      (feed/activity "alice" "like" "p1" 35 (list)))))
-
-(feed-test "actor-counts" (feed/actor-counts A) {:alice 3 :bob 1})
-(feed-test "object-counts" (feed/object-counts A) {:p2 1 :p3 1 :p1 2})
-(feed-test
-  "group-by actor alice len"
-  (len (get (feed/group-by A feed/actor) "alice"))
-  3)
-(feed-test
-  "group-count empty"
-  (feed/group-count feed/empty feed/actor)
-  {})
-
-; day bucketing
-(define
-  D
-  (feed/stream
-    (list
-      (feed/activity "alice" "post" "p1" 5 (list))
-      (feed/activity "alice" "post" "p2" 8 (list))
-      (feed/activity "alice" "post" "p3" 12 (list)))))
-
-(feed-test "feed/day floor" (feed/day 12 10) 1)
-(feed-test "feed/day same bucket" (feed/day 8 10) 0)
-(feed-test "by-actor-day" (feed/by-actor-day D 10) {:alice#0 2 :alice#1 1})
-
-; ---------- recency ----------
-
-(define rec (feed/recency 100 10))
-(feed-test
-  "recency at=now -> 1"
-  (rec (feed/activity "x" "post" "o" 100 (list)))
-  1)
-(feed-test
-  "recency age=hl -> .5"
-  (rec (feed/activity "x" "post" "o" 90 (list)))
-  0.5)
-(feed-test
-  "recency age=2hl -> .25"
-  (rec (feed/activity "x" "post" "o" 80 (list)))
-  0.25)
-
-; ---------- velocity ----------
-
-(define vel (feed/velocity D 10))
-(feed-test
-  "velocity burst (at=12)"
-  (vel (feed/activity "alice" "post" "z" 12 (list)))
-  3)
-(feed-test
-  "velocity mid (at=8)"
-  (vel (feed/activity "alice" "post" "z" 8 (list)))
-  2)
-(feed-test
-  "velocity first (at=5)"
-  (vel (feed/activity "alice" "post" "z" 5 (list)))
-  1)
-(feed-test
-  "velocity other actor"
-  (vel (feed/activity "bob" "post" "z" 12 (list)))
-  0)
-
-; ---------- engagement ----------
-
-(define eng (feed/engagement A))
-(feed-test
-  "engagement p1"
-  (eng (feed/activity "x" "post" "p1" 0 (list)))
-  2)
-(feed-test
-  "engagement p2"
-  (eng (feed/activity "x" "post" "p2" 0 (list)))
-  1)
-
-; ---------- composite ----------
-
-(define
-  cmp1
-  (feed/composite (list (list 2 (fn (a) (get a :at))))))
-(feed-test
-  "composite single part"
-  (cmp1 (feed/activity "x" "post" "o" 5 (list)))
-  10)
-(define
-  cmp2
-  (feed/composite
-    (list
-      (list 2 (fn (a) (get a :at)))
-      (list 3 (fn (a) 1)))))
-(feed-test
-  "composite two parts"
-  (cmp2 (feed/activity "x" "post" "o" 5 (list)))
-  13)
-
-; ---------- ranking ----------
-
-(define
-  R
-  (feed/stream
-    (list
-      (feed/activity "u" "post" "oC" 80 (list))
-      (feed/activity "u" "post" "oA" 100 (list))
-      (feed/activity "u" "post" "oB" 90 (list)))))
-
-(feed-test
-  "rank by recency objects"
-  (map (fn (a) (get a :object)) (feed/items (feed/rank R rec)))
-  (list "oA" "oB" "oC"))
-(feed-test
-  "top-2 by recency"
-  (map (fn (a) (get a :object)) (feed/items (feed/top R rec 2)))
-  (list "oA" "oB"))
-(feed-test "top-2 count" (feed/count (feed/top R rec 2)) 2)
-
-; constant score -> tiebreak by :at descending
-(define
-  T
-  (feed/stream
-    (list
-      (feed/activity "u" "post" "f" 10 (list))
-      (feed/activity "u" "post" "g" 30 (list))
-      (feed/activity "u" "post" "h" 20 (list)))))
-(feed-test
-  "tiebreak at-desc"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/rank T (fn (a) 0))))
-  (list "g" "h" "f"))
-
-; equal score AND equal :at -> stable input order
-(define
-  E
-  (feed/stream
-    (list
-      (feed/activity "u" "post" "first" 50 (list))
-      (feed/activity "u" "post" "second" 50 (list)))))
-(feed-test
-  "stable equal-key input order"
-  (map
-    (fn (a) (get a :object))
-    (feed/items (feed/rank E (fn (a) 0))))
-  (list "first" "second"))
-
-(feed-test
-  "with-scores attaches score"
-  (get (nth (feed/items (feed/with-scores R rec)) 1) :score)
-  1)
-
-(feed-test "rank preserves count" (feed/count (feed/rank A rec)) 4)

lib/feed/tests/thread.sx

@@ -1,49 +0,0 @@
-; Follow-up — conversation threading via :reply-to closure. (feed-test name got expected)
-
-(define
-  S
-  (feed/stream
-    (list
-      (feed/normalize {:actor "a" :object "root" :at 1})
-      (feed/normalize {:actor "b" :object "r1" :at 2 :verb "reply" :reply-to "root"})
-      (feed/normalize {:actor "c" :object "r2" :at 3 :verb "reply" :reply-to "root"})
-      (feed/normalize {:actor "d" :object "r3" :at 4 :verb "reply" :reply-to "r1"})
-      (feed/normalize {:actor "e" :object "x" :at 5}))))
-
-; ---------- direct replies ----------
-
-(feed-test "direct replies to root" (feed/reply-count S "root") 2)
-(feed-test "direct replies to r1" (feed/reply-count S "r1") 1)
-(feed-test "no replies to r3" (feed/reply-count S "r3") 0)
-(feed-test
-  "replies objects to root"
-  (map (fn (a) (get a :object)) (feed/items (feed/replies S "root")))
-  (list "r1" "r2"))
-
-; ---------- thread closure ----------
-
-(feed-test
-  "thread objects root (transitive)"
-  (feed/thread-objects S "root")
-  (list "root" "r1" "r2" "r3"))
-(feed-test
-  "thread root chronological"
-  (map (fn (a) (get a :object)) (feed/items (feed/thread S "root")))
-  (list "root" "r1" "r2" "r3"))
-(feed-test "thread size root" (feed/thread-size S "root") 4)
-(feed-test
-  "thread excludes unrelated x"
-  (feed/-elem?
-    "x"
-    (map (fn (a) (get a :object)) (feed/items (feed/thread S "root"))))
-  false)
-
-; ---------- sub-thread ----------
-
-(feed-test
-  "thread from r1 (sub-tree)"
-  (map (fn (a) (get a :object)) (feed/items (feed/thread S "r1")))
-  (list "r1" "r3"))
-(feed-test "thread size r1" (feed/thread-size S "r1") 2)
-(feed-test "leaf thread is itself" (feed/thread-size S "r3") 1)
-(feed-test "unrelated thread is itself" (feed/thread-size S "x") 1)

lib/feed/tests/trending.sx

@@ -1,82 +0,0 @@
-; Follow-up — trending objects/actors by recent activity. (feed-test name got expected)
-
-; window (50,100]: X@60,X@70 (a), Y@80 (b), Z@90 (c); W@40 is too old
-(define
-  S
-  (feed/stream
-    (list
-      (feed/activity "a" "post" "X" 60 (list))
-      (feed/activity "a" "post" "X" 70 (list))
-      (feed/activity "b" "post" "Y" 80 (list))
-      (feed/activity "c" "post" "Z" 90 (list))
-      (feed/activity "d" "post" "W" 40 (list)))))
-
-; ---------- trending objects ----------
-
-(feed-test
-  "trending count (3 in window)"
-  (len (feed/trending S 100 50 10))
-  3)
-(feed-test
-  "trending top object"
-  (get
-    (nth (feed/trending S 100 50 10) 0)
-    :object)
-  "X")
-(feed-test
-  "trending top count"
-  (get
-    (nth (feed/trending S 100 50 10) 0)
-    :count)
-  2)
-(feed-test
-  "trending order (count desc, key asc tiebreak)"
-  (map
-    (fn (e) (get e :object))
-    (feed/trending S 100 50 10))
-  (list "X" "Y" "Z"))
-(feed-test
-  "trending top-2"
-  (map
-    (fn (e) (get e :object))
-    (feed/trending S 100 50 2))
-  (list "X" "Y"))
-(feed-test
-  "old object W excluded"
-  (feed/-elem?
-    "W"
-    (map
-      (fn (e) (get e :object))
-      (feed/trending S 100 50 10)))
-  false)
-(feed-test
-  "narrow window keeps only newest"
-  (map
-    (fn (e) (get e :object))
-    (feed/trending S 100 15 10))
-  (list "Z"))
-(feed-test
-  "empty window -> nothing"
-  (feed/trending S 100 5 10)
-  (list))
-
-; ---------- trending actors ----------
-
-(feed-test
-  "trending actor top"
-  (get
-    (nth (feed/trending-actors S 100 50 10) 0)
-    :actor)
-  "a")
-(feed-test
-  "trending actor count"
-  (get
-    (nth (feed/trending-actors S 100 50 10) 0)
-    :count)
-  2)
-(feed-test
-  "trending actors order"
-  (map
-    (fn (e) (get e :actor))
-    (feed/trending-actors S 100 50 10))
-  (list "a" "b" "c"))

lib/feed/thread.sx

@@ -1,59 +0,0 @@
-; feed/thread — conversation threading. A reply carries :reply-to <parent-object>
-; (normalize preserves it). A thread is the transitive closure over :reply-to from
-; a root object: root + replies + replies-to-replies, gathered chronologically.
-;
-; Requires: lib/feed/normalize.sx, lib/feed/stream.sx, lib/feed/fanout.sx
-; (feed/-elem?, feed/-distinct).
-
-; direct replies to an object
-(define
-  feed/replies
-  (fn
-    (stream object)
-    (feed/filter stream (fn (a) (equal? (get a :reply-to) object)))))
-
-(define
-  feed/reply-count
-  (fn (stream object) (feed/count (feed/replies stream object))))
-
-; iterate f from x until the result stops growing (set-closure fixpoint)
-(define
-  feed/-fixpoint
-  (fn
-    (f x)
-    (let
-      ((nx (f x)))
-      (if (= (len nx) (len x)) x (feed/-fixpoint f nx)))))
-
-; the set of object-ids in the thread rooted at `root`
-(define
-  feed/thread-objects
-  (fn
-    (stream root)
-    (let
-      ((all (feed/items stream)))
-      (feed/-fixpoint
-        (fn
-          (acc)
-          (feed/-distinct
-            (append
-              acc
-              (map
-                (fn (a) (get a :object))
-                (filter (fn (a) (feed/-elem? (get a :reply-to) acc)) all)))))
-        (list root)))))
-
-; the full thread as a chronological stream (root + all descendants)
-(define
-  feed/thread
-  (fn
-    (stream root)
-    (let
-      ((objs (feed/thread-objects stream root)))
-      (feed/sort-by-at
-        (feed/filter stream (fn (a) (feed/-elem? (get a :object) objs)))))))
-
-; how many activities are in the thread (root counts as 1)
-(define
-  feed/thread-size
-  (fn (stream root) (feed/count (feed/thread stream root))))

lib/feed/trending.sx

@@ -1,42 +0,0 @@
-; feed/trending — what's hot right now: objects (or actors) ranked by activity
-; count within a recency window. Deterministic: count descending, ties broken by
-; key ascending (entries are pre-sorted by key, then stable grade-down by count).
-;
-; Requires: lib/feed/stream.sx, lib/feed/aggregate.sx (object/actor-counts),
-; lib/feed/rank.sx (feed/-desc-by).
-
-; activities within (now-window, now]
-(define
-  feed/-recent
-  (fn
-    (stream now window)
-    (feed/filter
-      stream
-      (fn (a) (and (<= (get a :at) now) (> (get a :at) (- now window)))))))
-
-; counts dict -> top-N entries {label key, :count n}, count desc, key asc
-(define
-  feed/-top-counts
-  (fn
-    (counts label n)
-    (let
-      ((entries (map (fn (k) (assoc {:count (get counts k)} label k)) (sort (keys counts)))))
-      (take (feed/-desc-by entries (fn (e) (get e :count))) n))))
-
-; top-N trending objects in the window
-(define
-  feed/trending
-  (fn
-    (stream now window n)
-    (feed/-top-counts
-      (feed/object-counts (feed/-recent stream now window))
-      :object n)))
-
-; top-N most active actors in the window
-(define
-  feed/trending-actors
-  (fn
-    (stream now window n)
-    (feed/-top-counts
-      (feed/actor-counts (feed/-recent stream now window))
-      :actor n)))

lib/flow/README.md

@@ -1,141 +0,0 @@
-# flow — durable DAG workflows on Scheme
-
-`flow` is a workflow engine for rose-ash: content pipelines (write → review →
-publish → federate), scheduled jobs, and multi-step user flows (signup, confirm,
-onboard) that **survive process restarts**. It is a thin Scheme prelude over the
-Scheme-on-SX guest (`lib/scheme/`); a flow runs *inside* the interpreter.
-
-Run the suite: `bash lib/flow/conformance.sh` → **151/151 across 10 suites**.
-
-## Model
-
-A **flow** is just a Scheme procedure of one argument — the upstream value:
-
-```
-node : input -> output
-```
-
-Combinators build composite nodes out of child nodes. A node that ignores its
-argument is effectively a thunk. There is no separate "graph" object: composition
-*is* function composition, so flows are values you can name, pass, and nest.
-
-```scheme
-(defflow publish
-  (sequence
-    (lambda (draft) (string-append draft "!"))
-    (branch (lambda (post) (>= (string-length post) 3))
-            (remote-node 'fed 'publish)
-            (flow-const 'rejected))))
-
-(flow/start publish "hello")   ; => federated, or a (flow-suspended id tag) state
-```
-
-## Building blocks (`spec.sx`)
-
-| Combinator | Meaning |
-|---|---|
-| `(flow-node f)` / `(flow-id x)` / `(flow-const v)` | leaf nodes |
-| `(sequence n ...)` | thread input left-to-right |
-| `(parallel n ...)` | fan input to every child, join results into a list (sequential eval) |
-| `(map-flow node)` | run `node` over each item of a list input, join results |
-| `(flow-while pred body max)` / `(flow-until ...)` | bounded iteration (cap `max` steps) |
-| `(defflow name body)` | bind + register a named flow (so it survives restart) |
-
-## Control flow + errors (`spec.sx`)
-
-| Combinator | Meaning |
-|---|---|
-| `(branch pred then else)` | `pred` on input selects `then`/`else` (`cond` is a Scheme special form) |
-| `(retry n node)` | re-run on a *raised exception*, up to `n` attempts |
-| `(timeout budget node)` | cooperative **step budget**: nodes call `(tick)`; the `(budget+1)`-th tick raises `flow-timeout` |
-| `(try-catch node handler)` | catch a raised exception → `(handler error)` |
-| `(fail reason)` / `(failed? x)` / `(fail-reason x)` | explicit failure *values* (flow downstream as data) |
-| `(recover node handler)` | the fail-VALUE counterpart of try-catch |
-| `(attempt n ...)` | railway sequence: stop at the first node returning a `(fail ...)` |
-| `(tap effect)` | run a side effect, return input unchanged |
-
-**Two error channels, on purpose.** Raised exceptions are for *bugs/transients*
-(caught by `retry`/`try-catch`). `(fail reason)` values are for *expected business
-outcomes* (validation rejected, declined) and compose via `attempt`/`recover`.
-
-## Suspend / resume — the durable core (`spec.sx`, `store.sx`)
-
-The guest Scheme's `call/cc` is **escape-only** — re-invoking a captured
-continuation after it returns *hangs* the runtime. So flow does **not** serialize
-continuations. Instead it uses **deterministic replay**:
-
-- `(suspend tag)` — if `tag` is already in the replay log, return its logged value;
-  otherwise escape to the driver as `(flow-suspended tag)`.
-- `resume` appends `(tag value)` to the log and **re-runs the flow from the start**.
-  Already-resolved suspends replay their values; the first unresolved one escapes
-  again (or the flow completes).
-
-The entire persisted state is the replay log — plain data. No live continuation is
-ever stored, so flows survive process restarts and even moves between instances.
-
-> **Author contract:** suspend `tag`s must be unique and deterministic across
-> replays, and **all** non-determinism / side effects must go through suspend
-> points (so their results are logged) — otherwise they re-run on every replay.
-
-### Lifecycle (`store.sx`)
-
-```scheme
-(flow/start flow input)   ; raw result if it completes, else (flow-suspended id tag)
-(flow/resume id value)    ; inject value at the waiting tag, continue
-(flow/cancel id)          ; terminate; a later resume is rejected
-```
-
-### Introspection & hygiene
-
-```scheme
-(flow/status id)   ; done | suspended | cancelled | unknown
-(flow/result id)   ; result if done, else (flow-error reason)
-(flow/list)        ; ((id status) ...)
-(flow/pending)     ; ((id waiting-tag) ...) — what each suspended flow awaits
-(flow/gc)          ; drop terminal records, keep live ones; returns count removed
-(flow/forget id)   ; drop one terminal record (refuses live flows)
-```
-
-### Crash recovery
-
-```scheme
-(flow-store-export)      ; the store as plain data (live procs nulled)
-(flow-store-import! d)   ; restore the store from exported data
-(flow-resumable-ids)     ; ids of suspended flows to wake on restart
-```
-
-On restart the flow definitions are reloaded (`defflow` re-registers names) and the
-exported store reimported; `resume` re-resolves each flow's procedure **by name**.
-
-## Distribution via fed-sx (`remote.sx`)
-
-```scheme
-(flow-peer-register! addr table)      ; mock a peer's exposed functions (fed-sx boundary)
-(remote-node addr fn)                 ; run a node on a peer
-(remote-failover addrs fn local)      ; try peers in order, fall through to a local node
-(flow-replicate-to addr)              ; copy this store to a peer's replica slot
-(flow-restore-from addr)              ; import a peer's replica (handoff)
-```
-
-**Handoff** is crash recovery across instances: replicate → local instance dies →
-peer restores the (plain-data) store and resumes. The replay log carries over, so
-all resolved suspends survive the move.
-
-## Files
-
-| File | Contents |
-|---|---|
-| `spec.sx` | combinators (flow-combinators-src / flow-control-src / flow-suspend-src) |
-| `store.sx` | durable store, lifecycle, crash recovery, introspection, hygiene |
-| `remote.sx` | fed-sx transport (mock peer registry), failover, replication |
-| `api.sx` | `flow-make-env` / `flow-run` SX helpers (one cached env, per-test reset) |
-| `tests/*.sx` | 10 suites, 151 cases |
-| `conformance.sh` | loads substrate + flow layer, runs every suite |
-
-## Notes on the substrate
-
-The guest Scheme (`lib/scheme/`, imported read-only) lacks dotted-rest params
-`(a . rest)` and named `let`; combinators use `(lambda args ...)` variadics + top-
-level recursion. `cons` is list-only (no dotted pairs), so log/assoc entries are
-2-element lists. Strings box as `{:scm-string "..."}`. Timeout is a step budget
-because there is no wall clock; `parallel` is sequential for the same reason.

lib/flow/api.sx

@@ -1,65 +0,0 @@
-;; lib/flow/api.sx — flow runtime entry points.
-;;
-;; Builds a Scheme env preloaded with the flow combinators (lib/flow/spec.sx),
-;; the durable store + lifecycle (lib/flow/store.sx), the fed-sx remote layer
-;; (lib/flow/remote.sx), and the host integration ABI (lib/flow/host.sx), and
-;; provides SX helpers to run flow programs.
-;;
-;; Scheme-level API (available inside flow programs):
-;;   (flow/start flow input) — run a flow; raw result if it completes, else
-;;                             (flow-suspended id tag). Defined in store.sx.
-;;   (flow/resume id value)  — resume a suspended flow (store.sx)
-;;   (flow/cancel id)        — cancel a flow (store.sx)
-;;   (suspend tag)           — suspension point (spec.sx)
-;;   (request kind payload)  — host request envelope over suspend (host.sx)
-;;   (remote-node addr fn)   — node executed on a federation peer (remote.sx)
-;;
-;; SX-level helpers (for hosts and tests):
-;;   (flow-make-env)        — fresh standard env + combinators + store + remote + host
-;;   (flow-run src)         — eval a Scheme program string in a reset shared env
-;;   (flow-run-in env src)  — eval a Scheme program string in a given env
-;;
-;; flow-run reuses ONE env (building the full standard env is expensive) and
-;; resets the mutable flow globals before each program, so tests stay isolated
-;; without paying for a fresh standard env each time. flow-registry persists (it
-;; models reloaded flow definitions surviving a restart).
-
-(define
-  flow-make-env
-  (fn
-    ()
-    (let
-      ((env (scheme-standard-env)))
-      (flow-load-combinators! env)
-      (flow-load-store! env)
-      (flow-load-remote! env)
-      (flow-load-host! env)
-      env)))
-
-(define
-  flow-run-in
-  (fn (env src) (scheme-eval-program (scheme-parse-all src) env)))
-
-(define
-  flow-reset-src
-  "(set! flow-store (list)) (set! flow-next-id 0) (set! flow-replay-log (list)) (set! flow-suspend-k #f) (set! flow-timeout-budget -1) (set! flow-peers (list)) (set! flow-replicas (list))")
-
-(define flow-env-cache false)
-
-(define
-  flow-shared-env
-  (fn
-    ()
-    (begin
-      (if flow-env-cache nil (set! flow-env-cache (flow-make-env)))
-      flow-env-cache)))
-
-(define
-  flow-run
-  (fn
-    (src)
-    (let
-      ((env (flow-shared-env)))
-      (begin
-        (scheme-eval-program (scheme-parse-all flow-reset-src) env)
-        (scheme-eval-program (scheme-parse-all src) env)))))

lib/flow/conformance.sh

@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-# flow-on-sx conformance runner — runs all flow test suites in one sx_server process.
-#
-# Usage:
-#   bash lib/flow/conformance.sh        # run all suites
-#   bash lib/flow/conformance.sh -v     # verbose (list each suite)
-
-set -uo pipefail
-cd "$(git rev-parse --show-toplevel)"
-
-SX_SERVER="${SX_SERVER:-hosts/ocaml/_build/default/bin/sx_server.exe}"
-if [ ! -x "$SX_SERVER" ]; then
-  SX_SERVER="/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe"
-fi
-if [ ! -x "$SX_SERVER" ]; then
-  echo "ERROR: sx_server.exe not found." >&2
-  exit 1
-fi
-
-VERBOSE="${1:-}"
-
-# Suites: NAME RUNNER-FN PATH
-SUITES=(
-  "basic       flow-basic-tests-run!     lib/flow/tests/basic.sx"
-  "control     flow-ctl-tests-run!       lib/flow/tests/control.sx"
-  "suspend     flow-sus-tests-run!       lib/flow/tests/suspend.sx"
-  "recovery    flow-rec-tests-run!       lib/flow/tests/recovery.sx"
-  "distributed flow-dist-tests-run!      lib/flow/tests/distributed.sx"
-  "api         flow-api-tests-run!       lib/flow/tests/api.sx"
-  "combinators flow-cmb-tests-run!       lib/flow/tests/combinators.sx"
-  "railway     flow-rail-tests-run!      lib/flow/tests/railway.sx"
-  "integration flow-int-tests-run!       lib/flow/tests/integration.sx"
-  "hygiene     flow-hyg-tests-run!       lib/flow/tests/hygiene.sx"
-  "host        flow-hst-tests-run!       lib/flow/tests/host.sx"
-)
-
-TMPFILE=$(mktemp); trap "rm -f $TMPFILE" EXIT
-EPOCH=1
-
-emit_load () { echo "(epoch $EPOCH)"; echo "(load \"$1\")"; EPOCH=$((EPOCH+1)); }
-emit_eval () { echo "(epoch $EPOCH)"; echo "(eval \"$1\")"; EPOCH=$((EPOCH+1)); }
-
-{
-  emit_load "lib/guest/lex.sx"
-  emit_load "lib/guest/reflective/env.sx"
-  emit_load "lib/guest/reflective/quoting.sx"
-  emit_load "lib/scheme/parser.sx"
-  emit_load "lib/scheme/eval.sx"
-  emit_load "lib/scheme/runtime.sx"
-  emit_load "lib/flow/spec.sx"
-  emit_load "lib/flow/store.sx"
-  emit_load "lib/flow/remote.sx"
-  emit_load "lib/flow/host.sx"
-  emit_load "lib/flow/api.sx"
-  for SUITE in "${SUITES[@]}"; do
-    read -r _NAME _RUNNER FILE <<< "$SUITE"
-    emit_load "$FILE"
-    emit_eval "($_RUNNER)"
-  done
-} > "$TMPFILE"
-
-OUTPUT=$(timeout 540 "$SX_SERVER" < "$TMPFILE" 2>&1 || true)
-
-TOTAL_PASS=0
-TOTAL_FAIL=0
-FAILED_SUITES=()
-
-LAST_DICT_LINES=$(echo "$OUTPUT" | grep -E '^\{:' || true)
-
-I=0
-while read -r LINE; do
-  [ -z "$LINE" ] && continue
-  P=$(echo "$LINE" | grep -oE ':passed [0-9]+' | awk '{print $2}')
-  F=$(echo "$LINE" | grep -oE ':failed [0-9]+' | awk '{print $2}')
-  [ -z "$P" ] && P=0
-  [ -z "$F" ] && F=0
-  SUITE_INFO="${SUITES[$I]}"
-  SUITE_NAME=$(echo "$SUITE_INFO" | awk '{print $1}')
-  TOTAL_PASS=$((TOTAL_PASS + P))
-  TOTAL_FAIL=$((TOTAL_FAIL + F))
-  if [ "$F" -gt 0 ]; then
-    FAILED_SUITES+=("$SUITE_NAME: $P/$((P+F))")
-    printf 'X %-12s %d/%d\n' "$SUITE_NAME" "$P" "$((P+F))"
-    echo "$LINE" | grep -oE ':name "[^"]*"' | sed 's/:name /    fail: /'
-  elif [ "$VERBOSE" = "-v" ]; then
-    printf 'ok %-12s %d passed\n' "$SUITE_NAME" "$P"
-  fi
-  I=$((I+1))
-done <<< "$LAST_DICT_LINES"
-
-TOTAL=$((TOTAL_PASS + TOTAL_FAIL))
-if [ "$TOTAL" -eq 0 ]; then
-  echo "ERROR: no suite results parsed. Raw output:" >&2
-  echo "$OUTPUT" >&2
-  exit 1
-fi
-if [ $TOTAL_FAIL -eq 0 ]; then
-  echo "ok $TOTAL_PASS/$TOTAL flow-on-sx tests passed (${#SUITES[@]} suites)"
-else
-  echo "FAIL $TOTAL_PASS/$TOTAL passed, $TOTAL_FAIL failed:"
-  for S in "${FAILED_SUITES[@]}"; do echo "  $S"; done
-  exit 1
-fi