@uptimizr/db 0.8.2 → 1.0.1

package/dist/query/aggregations.js

@@ -43,7 +43,7 @@ export function buildListSessions(projectId, opts, d) {
       SELECT
         session_id,
         ${d.anyValue("visitor_id")} AS visitor_id,
-        count() AS events,
+        count(*) AS events,
         min(ts) AS started_at,
         max(ts) AS ended_at
       FROM events
@@ -73,11 +73,11 @@ export function buildPointerHeatmap(projectId, opts, d) {
       SELECT
         floor(screen[1] * ${bins}) AS gx,
         floor(screen[2] * ${bins}) AS gy,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type IN ('pointer_move', 'pointer_click')
-        AND length(screen) = 2${range}${scene}${source}${session}${cameraMode}
+        AND ${d.arrayLength("screen")} = 2${range}${scene}${source}${session}${cameraMode}
       GROUP BY gx, gy
       ORDER BY count DESC
     `,
@@ -109,7 +109,7 @@ export function buildMeshUvHeatmap(projectId, opts, d) {
     const v = d.jsonFloat("payload", "uv", "1");
     return {
         query: `
-      SELECT gx, gy, count() AS count
+      SELECT gx, gy, count(*) AS count
       FROM (
         SELECT
           floor(${u} * ${bins}) AS gx,
@@ -147,11 +147,11 @@ export function buildWorldHeatmap(projectId, opts, d) {
         floor(hit_point[1] / ${cellSize}) AS vx,
         floor(hit_point[2] / ${cellSize}) AS vy,
         floor(hit_point[3] / ${cellSize}) AS vz,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type IN ('pointer_move', 'pointer_click')
-        AND length(hit_point) = 3${range}${scene}${source}${cameraMode}${region}
+        AND ${d.arrayLength("hit_point")} = 3${range}${scene}${source}${cameraMode}${region}
       GROUP BY vx, vy, vz
       ORDER BY count DESC
       LIMIT ${limit}
@@ -177,17 +177,17 @@ export function buildWorldHeatmapStats(projectId, opts, d) {
     const region = regionClause(bag, opts, HIT_POINT_COLS);
     return {
         query: `
-      SELECT count() AS cells, coalesce(sum(c), 0) AS hits
+      SELECT count(*) AS cells, coalesce(sum(c), 0) AS hits
       FROM (
         SELECT
           floor(hit_point[1] / ${cellSize}) AS vx,
           floor(hit_point[2] / ${cellSize}) AS vy,
           floor(hit_point[3] / ${cellSize}) AS vz,
-          count() AS c
+          count(*) AS c
         FROM events
         WHERE project_id = ${pid}
           AND event_type IN ('pointer_move', 'pointer_click')
-          AND length(hit_point) = 3${range}${scene}${source}${cameraMode}${region}
+          AND ${d.arrayLength("hit_point")} = 3${range}${scene}${source}${cameraMode}${region}
         GROUP BY vx, vy, vz
       ) t
     `,
@@ -220,11 +220,11 @@ export function buildGazeHeatmap(projectId, opts, d) {
         floor(hit_point[1] / ${cellSize}) AS vx,
         floor(hit_point[2] / ${cellSize}) AS vy,
         floor(hit_point[3] / ${cellSize}) AS vz,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'camera_sample'
-        AND length(hit_point) = 3${range}${scene}${session}${cameraMode}${region}
+        AND ${d.arrayLength("hit_point")} = 3${range}${scene}${session}${cameraMode}${region}
       GROUP BY vx, vy, vz
       ORDER BY count DESC
       LIMIT ${limit}
@@ -248,17 +248,17 @@ export function buildGazeHeatmapStats(projectId, opts, d) {
     const region = regionClause(bag, opts, HIT_POINT_COLS);
     return {
         query: `
-      SELECT count() AS cells, coalesce(sum(c), 0) AS hits
+      SELECT count(*) AS cells, coalesce(sum(c), 0) AS hits
       FROM (
         SELECT
           floor(hit_point[1] / ${cellSize}) AS vx,
           floor(hit_point[2] / ${cellSize}) AS vy,
           floor(hit_point[3] / ${cellSize}) AS vz,
-          count() AS c
+          count(*) AS c
         FROM events
         WHERE project_id = ${pid}
           AND event_type = 'camera_sample'
-          AND length(hit_point) = 3${range}${scene}${session}${cameraMode}${region}
+          AND ${d.arrayLength("hit_point")} = 3${range}${scene}${session}${cameraMode}${region}
         GROUP BY vx, vy, vz
       ) t
     `,
@@ -282,11 +282,11 @@ export function buildCameraDirectionHeatmap(projectId, opts, d) {
       SELECT
         floor((atan2(direction[3], direction[1]) + pi()) / (2 * pi()) * ${bins}) AS azimuth_bin,
         floor((asin(direction[2] / greatest(${d.vectorNorm("direction")}, 1e-6)) + pi() / 2) / pi() * ${bins}) AS elevation_bin,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'camera_sample'
-        AND length(direction) = 3${range}${scene}${session}${cameraMode}
+        AND ${d.arrayLength("direction")} = 3${range}${scene}${session}${cameraMode}
       GROUP BY azimuth_bin, elevation_bin
       ORDER BY count DESC
     `,
@@ -319,7 +319,7 @@ export function buildViewCoverageHistogram(projectId, opts, d) {
         query: `
       SELECT
         least(floor(coverage_pct / 25), 3) * 25 AS bucket,
-        count() AS sessions
+        count(*) AS sessions
       FROM (
         SELECT
           session_id,
@@ -332,7 +332,7 @@ export function buildViewCoverageHistogram(projectId, opts, d) {
           FROM events
           WHERE project_id = ${pid}
             AND event_type = 'camera_sample'
-            AND length(direction) = 3${range}${scene}${session}${cameraMode}
+            AND ${d.arrayLength("direction")} = 3${range}${scene}${session}${cameraMode}
         ) binned
         GROUP BY session_id
       ) per_session
@@ -364,11 +364,11 @@ export function buildCameraPositionHeatmap(projectId, opts, d) {
         floor(position[1] / ${cellSize}) AS gx,
         floor(position[3] / ${cellSize}) AS gz,
         avg(position[2]) AS avg_y,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'camera_sample'
-        AND length(position) = 3${range}${scene}${session}${cameraMode}${region}
+        AND ${d.arrayLength("position")} = 3${range}${scene}${session}${cameraMode}${region}
       GROUP BY gx, gz
       ORDER BY count DESC
       LIMIT ${limit}
@@ -399,7 +399,7 @@ export function buildSessionTrajectory(projectId, opts, d) {
       WHERE project_id = ${pid}
         AND session_id = ${session}
         AND event_type = 'camera_sample'
-        AND length(position) = 3${range}${scene}
+        AND ${d.arrayLength("position")} = 3${range}${scene}
       ORDER BY ts ASC
       LIMIT ${limit}
     `,
@@ -436,7 +436,7 @@ export function buildAggregateTrajectories(projectId, opts, d) {
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'camera_sample'
-        AND length(position) = 3${range}${scene}${cameraMode}
+        AND ${d.arrayLength("position")} = 3${range}${scene}${cameraMode}
       ORDER BY session_id ASC, ts ASC
       LIMIT ${limit}
     `,
@@ -489,26 +489,26 @@ export function buildClickGazeRay(projectId, opts, d) {
         avg(j.hy) AS hit_y,
         avg(j.hz) AS hit_z,
         j.mesh AS mesh,
-        count() AS count
+        count(*) AS count
       FROM (
         SELECT
           ja.hx AS hx, ja.hy AS hy, ja.hz AS hz, ja.mesh AS mesh,
           CASE
-            WHEN ja.has_ray THEN ja.rox
-            WHEN ja.recon THEN ja.px + ja.dx * ja.near / ja.dlen
+            WHEN ja.has_ray = 1 THEN ja.rox
+            WHEN ja.recon = 1 THEN ja.px + ja.dx * ja.near / ja.dlen
               + (ja.dz / ja.hlen) * ja.off_r
               + (-(ja.dx * ja.dy) / (ja.dlen * ja.hlen)) * ja.off_u
             WHEN ja.cam_present = 1 THEN ja.px
           END AS ox,
           CASE
-            WHEN ja.has_ray THEN ja.roy
-            WHEN ja.recon THEN ja.py + ja.dy * ja.near / ja.dlen
+            WHEN ja.has_ray = 1 THEN ja.roy
+            WHEN ja.recon = 1 THEN ja.py + ja.dy * ja.near / ja.dlen
               + (ja.hlen / ja.dlen) * ja.off_u
             WHEN ja.cam_present = 1 THEN ja.py
           END AS oy,
           CASE
-            WHEN ja.has_ray THEN ja.roz
-            WHEN ja.recon THEN ja.pz + ja.dz * ja.near / ja.dlen
+            WHEN ja.has_ray = 1 THEN ja.roz
+            WHEN ja.recon = 1 THEN ja.pz + ja.dz * ja.near / ja.dlen
               + (-(ja.dx) / ja.hlen) * ja.off_r
               + (-(ja.dy * ja.dz) / (ja.dlen * ja.hlen)) * ja.off_u
             WHEN ja.cam_present = 1 THEN ja.pz
@@ -524,23 +524,26 @@ export function buildClickGazeRay(projectId, opts, d) {
             sqrt(m.dx * m.dx + m.dz * m.dz) AS hlen,
             (2 * c.sx - 1) * m.cam_near * tan(m.cam_fov / 2) * m.cam_aspect AS off_r,
             (1 - 2 * c.sy) * m.cam_near * tan(m.cam_fov / 2) AS off_u,
-            (NOT c.has_ray) AND c.has_screen
+            CASE WHEN c.has_ray = 0 AND c.has_screen = 1
               AND m.cam_fov > 0 AND m.cam_aspect > 0 AND m.cam_near > 0
               AND sqrt(m.dx * m.dx + m.dz * m.dz)
-                  > 1e-6 * sqrt(m.dx * m.dx + m.dy * m.dy + m.dz * m.dz) AS recon
+                  > 1e-6 * sqrt(m.dx * m.dx + m.dy * m.dy + m.dz * m.dz)
+              THEN 1 ELSE 0 END AS recon
           FROM (
             SELECT session_id, ts,
               hit_point[1] AS hx, hit_point[2] AS hy, hit_point[3] AS hz, mesh,
-              length(ray_origin) = 3 AS has_ray,
+              CASE WHEN ${d.arrayLength("ray_origin")} = 3 THEN 1 ELSE 0 END AS has_ray,
               ray_origin[1] AS rox, ray_origin[2] AS roy, ray_origin[3] AS roz,
-              length(screen) = 2 AS has_screen,
+              CASE WHEN ${d.arrayLength("screen")} = 2 THEN 1 ELSE 0 END AS has_screen,
               screen[1] AS sx, screen[2] AS sy
             FROM events
             WHERE project_id = ${pid}
               AND event_type = 'pointer_click'
-              AND length(hit_point) = 3${range}${scene}${source}${session}
+              AND ${d.arrayLength("hit_point")} = 3${range}${scene}${source}${session}
           ) AS c
-          ${d.asofLeftJoin} (
+          ${d.asofJoin({
+            kind: "left",
+            right: `(
             SELECT session_id, ts, 1 AS cam_present,
               position[1] AS px, position[2] AS py, position[3] AS pz,
               direction[1] AS dx, direction[2] AS dy, direction[3] AS dz,
@@ -548,9 +551,14 @@ export function buildClickGazeRay(projectId, opts, d) {
             FROM events
             WHERE project_id = ${pid}
               AND event_type = 'camera_sample'
-              AND length(position) = 3${range}${scene}${session}
-          ) AS m
-          ON c.session_id = m.session_id AND c.ts >= m.ts
+              AND ${d.arrayLength("position")} = 3${range}${scene}${session}
+          )`,
+            alias: "m",
+            keys: [["c.session_id", "session_id"]],
+            leftTs: "c.ts",
+            op: ">=",
+            rightTs: "ts",
+        })}
         ) AS ja
       ) AS j
       WHERE j.ox IS NOT NULL
@@ -594,7 +602,7 @@ export function buildFlowHeatmap(projectId, opts, d) {
         floor((atan2(m.dz, m.dx) + pi()) / (2 * pi()) * ${bins}) AS azimuth_bin,
         floor((asin(m.dy / greatest(sqrt(m.dx * m.dx + m.dy * m.dy + m.dz * m.dz), 1e-6)) + pi() / 2) / pi() * ${bins}) AS elevation_bin,
         c.mesh AS mesh,
-        count() AS count
+        count(*) AS count
       FROM (
         SELECT session_id, ts, mesh
         FROM events
@@ -602,14 +610,21 @@ export function buildFlowHeatmap(projectId, opts, d) {
           AND event_type = 'pointer_click'
           AND mesh != ''${range}${scene}${session}${cameraMode}
       ) AS c
-      ${d.asofInnerJoin} (
+      ${d.asofJoin({
+                kind: "inner",
+                right: `(
         SELECT session_id, ts, direction[1] AS dx, direction[2] AS dy, direction[3] AS dz
         FROM events
         WHERE project_id = ${pid}
           AND event_type = 'camera_sample'
-          AND length(direction) = 3${range}${scene}${session}${cameraMode}
-      ) AS m
-      ON c.session_id = m.session_id AND c.ts >= m.ts
+          AND ${d.arrayLength("direction")} = 3${range}${scene}${session}${cameraMode}
+      )`,
+                alias: "m",
+                keys: [["c.session_id", "session_id"]],
+                leftTs: "c.ts",
+                op: ">=",
+                rightTs: "ts",
+            })}
       GROUP BY azimuth_bin, elevation_bin, mesh
       ORDER BY count DESC
       LIMIT ${limit}
@@ -640,34 +655,41 @@ export function buildFlowHeatmap(projectId, opts, d) {
         avg(j.oy) AS origin_y,
         avg(j.oz) AS origin_z,
         j.mesh AS mesh,
-        count() AS count
+        count(*) AS count
       FROM (
         SELECT
           c.mesh AS mesh,
           m.dx AS dx, m.dy AS dy, m.dz AS dz,
-          CASE WHEN c.has_ray THEN c.rox ELSE m.px END AS ox,
-          CASE WHEN c.has_ray THEN c.roy ELSE m.py END AS oy,
-          CASE WHEN c.has_ray THEN c.roz ELSE m.pz END AS oz
+          CASE WHEN c.has_ray = 1 THEN c.rox ELSE m.px END AS ox,
+          CASE WHEN c.has_ray = 1 THEN c.roy ELSE m.py END AS oy,
+          CASE WHEN c.has_ray = 1 THEN c.roz ELSE m.pz END AS oz
         FROM (
           SELECT session_id, ts, mesh,
-            length(ray_origin) = 3 AS has_ray,
+            CASE WHEN ${d.arrayLength("ray_origin")} = 3 THEN 1 ELSE 0 END AS has_ray,
             ray_origin[1] AS rox, ray_origin[2] AS roy, ray_origin[3] AS roz
           FROM events
           WHERE project_id = ${pid}
             AND event_type = 'pointer_click'
             AND mesh != ''${range}${scene}${session}${cameraMode}
         ) AS c
-        ${d.asofInnerJoin} (
+        ${d.asofJoin({
+            kind: "inner",
+            right: `(
           SELECT session_id, ts,
             position[1] AS px, position[2] AS py, position[3] AS pz,
             direction[1] AS dx, direction[2] AS dy, direction[3] AS dz
           FROM events
           WHERE project_id = ${pid}
             AND event_type = 'camera_sample'
-            AND length(direction) = 3
-            AND length(position) = 3${range}${scene}${session}${cameraMode}
-        ) AS m
-        ON c.session_id = m.session_id AND c.ts >= m.ts
+            AND ${d.arrayLength("direction")} = 3
+            AND ${d.arrayLength("position")} = 3${range}${scene}${session}${cameraMode}
+        )`,
+            alias: "m",
+            keys: [["c.session_id", "session_id"]],
+            leftTs: "c.ts",
+            op: ">=",
+            rightTs: "ts",
+        })}
       ) AS j${originFilter}
       GROUP BY azimuth_bin, elevation_bin, origin_vx, origin_vy, origin_vz, mesh
       ORDER BY count DESC
@@ -685,7 +707,7 @@ export function buildTopMeshes(projectId, opts, d) {
     const limit = bag.add("limit", "u32", opts.limit ?? 25);
     return {
         query: `
-      SELECT mesh, count() AS count
+      SELECT mesh, count(*) AS count
       FROM events
       WHERE project_id = ${pid} AND mesh != ''${range}${session}
       GROUP BY mesh
@@ -714,7 +736,7 @@ export function buildTopMeshesBySource(projectId, opts, d) {
     const limit = bag.add("limit", "u32", opts.limit ?? 200);
     return {
         query: `
-      SELECT mesh, source, count() AS count
+      SELECT mesh, source, count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type IN ('mesh_interaction', 'pointer_click')
@@ -749,7 +771,7 @@ export function buildTopMeshesTrend(projectId, opts, d) {
       SELECT
         mesh,
         ${d.timeBucketMs("ts", interval)} AS bucket,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type IN ('mesh_interaction', 'pointer_click')
@@ -780,7 +802,7 @@ export function buildMeshDwell(projectId, opts, d) {
         sum(visible_ms) AS visible_ms,
         sum(centered_ms) AS centered_ms,
         max(screen_fraction) AS max_screen_fraction,
-        count() AS samples
+        count(*) AS samples
       FROM events
       WHERE project_id = ${pid} AND event_type = 'mesh_visibility' AND mesh != ''${range}${scene}${session}
       GROUP BY mesh
@@ -865,7 +887,7 @@ export function buildMeshInteractionKinds(projectId, opts, d) {
       SELECT
         mesh,
         name AS kind,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid} AND event_type = 'mesh_interaction' AND mesh != ''${range}${scene}${source}${session}
       GROUP BY mesh, name
@@ -906,7 +928,7 @@ export function buildReachability(projectId, opts, d) {
       SELECT
         seg.mesh AS mesh,
         floor(seg.dist / ${bucketSize}) AS bucket,
-        count() AS count,
+        count(*) AS count,
         avg(seg.dist) AS avg_distance
       FROM (
         SELECT
@@ -923,17 +945,24 @@ export function buildReachability(projectId, opts, d) {
           WHERE project_id = ${pid}
             AND event_type = 'mesh_interaction'
             AND mesh != ''
-            AND length(hit_point) = 3${range}${scene}${source}${session}
+            AND ${d.arrayLength("hit_point")} = 3${range}${scene}${source}${session}
         ) AS i
-        ${d.asofInnerJoin} (
+        ${d.asofJoin({
+            kind: "inner",
+            right: `(
           SELECT session_id, ts,
             position[1] AS px, position[2] AS py, position[3] AS pz
           FROM events
           WHERE project_id = ${pid}
             AND event_type = 'camera_sample'
-            AND length(position) = 3${range}${scene}${session}
-        ) AS m
-        ON i.session_id = m.session_id AND i.ts >= m.ts
+            AND ${d.arrayLength("position")} = 3${range}${scene}${session}
+        )`,
+            alias: "m",
+            keys: [["i.session_id", "session_id"]],
+            leftTs: "i.ts",
+            op: ">=",
+            rightTs: "ts",
+        })}
       ) AS seg
       GROUP BY mesh, bucket
       ORDER BY count DESC
@@ -958,7 +987,7 @@ export function buildDeadClicks(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS total_clicks,
+        count(*) AS total_clicks,
         sum(CASE WHEN mesh = '' THEN 1 ELSE 0 END) AS dead_clicks
       FROM events
       WHERE project_id = ${pid} AND event_type = 'pointer_click'${range}${scene}${source}${session}
@@ -991,11 +1020,11 @@ export function buildRageClicks(projectId, opts, d) {
         session_id,
         mesh,
         ${d.timeBucketMs("ts", interval)} AS bucket,
-        count() AS clicks
+        count(*) AS clicks
       FROM events
       WHERE project_id = ${pid} AND event_type = 'pointer_click' AND mesh != ''${range}${scene}${source}${session}
       GROUP BY session_id, mesh, bucket
-      HAVING count() >= ${minRepeats}
+      HAVING count(*) >= ${minRepeats}
       ORDER BY clicks DESC
       LIMIT ${limit}
     `,
@@ -1024,7 +1053,7 @@ export function buildHoverDwell(projectId, opts, d) {
         mesh,
         sum(visible_ms) AS dwell_ms,
         max(visible_ms) AS max_dwell_ms,
-        count() AS episodes
+        count(*) AS episodes
       FROM events
       WHERE project_id = ${pid} AND event_type = 'hover_dwell' AND mesh != ''${range}${scene}${source}${session}
       GROUP BY mesh
@@ -1053,7 +1082,7 @@ export function buildCompileStalls(projectId, opts, d) {
         query: `
       SELECT
         name AS phase,
-        count() AS stalls,
+        count(*) AS stalls,
         sum(visible_ms) AS total_ms,
         avg(visible_ms) AS avg_ms,
         max(visible_ms) AS max_ms
@@ -1081,7 +1110,7 @@ export function buildResourceSummary(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS samples,
+        count(*) AS samples,
         avg(NULLIF(js_heap_bytes, 0)) AS avg_js_heap_bytes,
         max(js_heap_bytes) AS max_js_heap_bytes,
         avg(NULLIF(triangles, 0)) AS avg_triangles,
@@ -1116,7 +1145,7 @@ export function buildResourcePercentiles(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS sessions,
+        count(*) AS sessions,
         sum(s_samples) AS samples,
         ${d.quantile("s_heap_p50", 0.5)} AS p50_js_heap_bytes,
         ${d.quantile("s_heap_p95", 0.5)} AS p95_js_heap_bytes,
@@ -1127,7 +1156,7 @@ export function buildResourcePercentiles(projectId, opts, d) {
       FROM (
         SELECT
           session_id,
-          count() AS s_samples,
+          count(*) AS s_samples,
           ${d.quantile("nullIf(js_heap_bytes, 0)", 0.5)} AS s_heap_p50,
           ${d.quantile("nullIf(js_heap_bytes, 0)", 0.95)} AS s_heap_p95,
           ${d.quantile("nullIf(texture_bytes, 0)", 0.5)} AS s_tex_p50,
@@ -1160,7 +1189,7 @@ export function buildStabilityCounts(projectId, opts, d) {
       SELECT
         coalesce(sum(CASE WHEN event_type = 'context_lost' THEN 1 ELSE 0 END), 0) AS context_losses,
         coalesce(sum(CASE WHEN event_type = 'compile_stall' THEN 1 ELSE 0 END), 0) AS compile_stalls,
-        count() AS incidents
+        count(*) AS incidents
       FROM events
       WHERE project_id = ${pid} AND event_type IN ('context_lost', 'compile_stall')${range}${scene}${session}
     `,
@@ -1218,7 +1247,7 @@ export function buildGraphicsDiagnosticCounts(projectId, opts, d) {
  *
  * `position` is best-effort connector-side (the camera pose at the moment the
  * error/diagnostic fired), so only rows that carry a full 3-vector participate
- * (`length(position) = 3`); errors from pages with no 3D connector are naturally
+ * (`arrayLength(position) = 3`); errors from pages with no 3D connector are naturally
  * excluded. Reuses the already-promoted `position` column — no migration.
  *
  * Optional {@link ErrorHeatmapOptions} filters (severity/category/errorKind) read
@@ -1253,11 +1282,11 @@ export function buildErrorHeatmap(projectId, opts, d) {
         floor(position[1] / ${cellSize}) AS vx,
         floor(position[2] / ${cellSize}) AS vy,
         floor(position[3] / ${cellSize}) AS vz,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type IN ('runtime_error', 'graphics_diagnostic')
-        AND length(position) = 3${range}${scene}${session}${region}${filter}
+        AND ${d.arrayLength("position")} = 3${range}${scene}${session}${region}${filter}
       GROUP BY vx, vy, vz
       ORDER BY count DESC
       LIMIT ${limit}
@@ -1277,7 +1306,7 @@ export function buildErrorHeatmap(projectId, opts, d) {
  * in the already-promoted `position` column (no migration), and the WebXR
  * bounds-check that produced it ran entirely on-device — the boundary polygon and
  * room geometry are never captured or stored (ADR 0003 / ADR 0048). Only rows
- * with a full 3-vector participate (`length(position) = 3`). `region` drill-down
+ * with a full 3-vector participate (`arrayLength(position) = 3`). `region` drill-down
  * and `scene`/`session` scoping compose like the other spatial heatmaps.
  */
 export function buildBoundaryHeatmap(projectId, opts, d) {
@@ -1295,11 +1324,11 @@ export function buildBoundaryHeatmap(projectId, opts, d) {
         floor(position[1] / ${cellSize}) AS vx,
         floor(position[2] / ${cellSize}) AS vy,
         floor(position[3] / ${cellSize}) AS vz,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'xr_boundary_proximity'
-        AND length(position) = 3${range}${scene}${session}${region}
+        AND ${d.arrayLength("position")} = 3${range}${scene}${session}${region}
       GROUP BY vx, vy, vz
       ORDER BY count DESC
       LIMIT ${limit}
@@ -1324,17 +1353,17 @@ export function buildBoundaryHeatmapStats(projectId, opts, d) {
     const region = regionClause(bag, opts, POSITION_COLS);
     return {
         query: `
-      SELECT count() AS cells, coalesce(sum(c), 0) AS hits
+      SELECT count(*) AS cells, coalesce(sum(c), 0) AS hits
       FROM (
         SELECT
           floor(position[1] / ${cellSize}) AS vx,
           floor(position[2] / ${cellSize}) AS vy,
           floor(position[3] / ${cellSize}) AS vz,
-          count() AS c
+          count(*) AS c
         FROM events
         WHERE project_id = ${pid}
           AND event_type = 'xr_boundary_proximity'
-          AND length(position) = 3${range}${scene}${session}${region}
+          AND ${d.arrayLength("position")} = 3${range}${scene}${session}${region}
         GROUP BY vx, vy, vz
       ) t
     `,
@@ -1349,7 +1378,7 @@ export function buildBoundaryHeatmapStats(projectId, opts, d) {
  * space didn't fit the experience.
  *
  * Each `xr_boundary_proximity` event is one approach (ADR 0048), so `contacts` is
- * a plain `count()` and `near_ms` sums the per-approach `durationMs` (stored in
+ * a plain `count(*)` and `near_ms` sums the per-approach `durationMs` (stored in
  * the shared `visible_ms` column, reused by `mesh_visibility`/`hover_dwell`/
  * `compile_stall`). No boundary geometry participates — only the promoted position
  * + duration each event already carries.
@@ -1365,7 +1394,7 @@ export function buildBoundaryContacts(projectId, opts, d) {
         query: `
       SELECT
         session_id,
-        count() AS contacts,
+        count(*) AS contacts,
         coalesce(sum(visible_ms), 0) AS near_ms
       FROM events
       WHERE project_id = ${pid}
@@ -1406,7 +1435,7 @@ export function buildRenderingTechnology(projectId, opts, d) {
         coalesce(${backend}, '') AS backend,
         coalesce(${apiVersion}, '') AS api_version,
         coalesce(${shadingLanguage}, '') AS shading_language,
-        count() AS sessions
+        count(*) AS sessions
       FROM events
       WHERE project_id = ${pid} AND event_type = 'session_start'${range}${scene}${session}
       GROUP BY api, backend, api_version, shading_language
@@ -1435,7 +1464,7 @@ export function buildCapabilityChanges(projectId, opts, d) {
         name AS kind,
         cap_from AS "from",
         cap_to AS "to",
-        count() AS changes
+        count(*) AS changes
       FROM events
       WHERE project_id = ${pid} AND event_type = 'capability_change'${range}${scene}${session}
       GROUP BY name, cap_from, cap_to
@@ -1466,7 +1495,7 @@ export function buildCameraGestures(projectId, opts, d) {
         query: `
       SELECT
         name AS kind,
-        count() AS gestures,
+        count(*) AS gestures,
         sum(visible_ms) AS total_ms,
         avg(visible_ms) AS avg_ms,
         max(visible_ms) AS max_ms
@@ -1488,7 +1517,7 @@ export function buildPerfSummary(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS samples,
+        count(*) AS samples,
         avg(fps) AS avg_fps,
         min(fps) AS min_fps,
         ${d.quantile("fps", 0.5)} AS p50_fps
@@ -1519,7 +1548,7 @@ export function buildRenderScaleTruth(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS samples,
+        count(*) AS samples,
         avg(fps) AS avg_fps,
         ${d.quantile("fps", 0.5)} AS p50_fps,
         avg(NULLIF(render_scale, 0)) AS avg_render_scale,
@@ -1549,7 +1578,7 @@ export function buildPerfDistribution(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS sessions,
+        count(*) AS sessions,
         sum(s_samples) AS samples,
         ${d.quantile("s_p05", 0.5)} AS p05_fps,
         ${d.quantile("s_p50", 0.5)} AS p50_fps,
@@ -1557,7 +1586,7 @@ export function buildPerfDistribution(projectId, opts, d) {
       FROM (
         SELECT
           session_id,
-          count() AS s_samples,
+          count(*) AS s_samples,
           ${d.quantile("fps", 0.05)} AS s_p05,
           ${d.quantile("fps", 0.5)} AS s_p50,
           ${d.quantile("fps", 0.95)} AS s_p95
@@ -1588,7 +1617,7 @@ export function buildFpsHistogram(projectId, opts, d) {
         query: `
       SELECT
         floor(s_p50 / ${bucket}) * ${bucket} AS bucket,
-        count() AS sessions
+        count(*) AS sessions
       FROM (
         SELECT
           session_id,
@@ -1621,14 +1650,14 @@ export function buildFrameTimePercentiles(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS sessions,
+        count(*) AS sessions,
         sum(s_samples) AS samples,
         ${d.quantile("s_p50", 0.5)} AS p50_ms,
         ${d.quantile("s_p95", 0.5)} AS p95_ms
       FROM (
         SELECT
           session_id,
-          count() AS s_samples,
+          count(*) AS s_samples,
           ${d.quantile("nullIf(frame_time_ms, 0)", 0.5)} AS s_p50,
           max(nullIf(frame_time_p95_ms, 0)) AS s_p95
         FROM events
@@ -1656,7 +1685,7 @@ export function buildJankRate(projectId, opts, d) {
     return {
         query: `
       SELECT
-        count() AS sessions,
+        count(*) AS sessions,
         sum(s_long) AS total_long_frames,
         ${d.quantile("s_rate", 0.5)} AS median_rate,
         ${d.quantile("s_rate", 0.9)} AS worst_decile_rate
@@ -1664,7 +1693,7 @@ export function buildJankRate(projectId, opts, d) {
         SELECT
           session_id,
           sum(long_frames) AS s_long,
-          sum(long_frames) * 1.0 / count() AS s_rate
+          sum(long_frames) * 1.0 / count(*) AS s_rate
         FROM events
         WHERE project_id = ${pid} AND event_type = 'frame_perf'${range}${scene}${session}
         GROUP BY session_id
@@ -1740,8 +1769,8 @@ export function buildPerfChurn(projectId, opts, d) {
         GROUP BY ends.session_id
       )
       SELECT
-        (SELECT count() FROM ends) AS sessions,
-        count() AS churn_sessions,
+        (SELECT count(*) FROM ends) AS sessions,
+        count(*) AS churn_sessions,
         sum(had_fps) AS fps_churn_sessions,
         sum(had_stall) AS stall_churn_sessions
       FROM correlated
@@ -1787,7 +1816,7 @@ export function buildPerfByDevice(projectId, opts, d) {
       session_perf AS (
         SELECT
           session_id,
-          count() AS s_samples,
+          count(*) AS s_samples,
           ${d.quantile("fps", 0.5)} AS s_p50
         FROM events
         WHERE project_id = ${pid} AND event_type = 'frame_perf'${range}${scene}${session}
@@ -1799,7 +1828,7 @@ export function buildPerfByDevice(projectId, opts, d) {
         coalesce(dev.renderer, '') AS renderer,
         coalesce(dev.browser, '') AS browser,
         coalesce(dev.os, '') AS os,
-        count() AS sessions,
+        count(*) AS sessions,
         sum(perf.s_samples) AS samples,
         ${d.quantile("perf.s_p50", 0.5)} AS p50_fps
       FROM session_perf perf
@@ -1827,14 +1856,14 @@ export function buildPerfByScene(projectId, opts, d) {
         query: `
       SELECT
         scene_id,
-        count() AS sessions,
+        count(*) AS sessions,
         sum(s_samples) AS samples,
         ${d.quantile("s_p50", 0.5)} AS p50_fps
       FROM (
         SELECT
           session_id,
           ${d.anyValue("scene_id")} AS scene_id,
-          count() AS s_samples,
+          count(*) AS s_samples,
           ${d.quantile("fps", 0.5)} AS s_p50
         FROM events
         WHERE project_id = ${pid} AND event_type = 'frame_perf'${range}${scene}${session}
@@ -1909,7 +1938,7 @@ export function buildDistinctScenes(projectId, opts, d) {
         query: `
       SELECT
         scene_id,
-        count() AS events,
+        count(*) AS events,
         max(ts) AS last_seen
       FROM events
       WHERE project_id = ${pid}${range}
@@ -1938,7 +1967,7 @@ export function buildTimeseries(projectId, opts, d) {
         query: `
       SELECT
         ${d.timeBucketMs("ts", interval)} AS bucket,
-        count() AS events,
+        count(*) AS events,
         ${d.avgIf("fps", "event_type = 'frame_perf'")} AS avg_fps
       FROM events
       WHERE project_id = ${pid}${range}${scene}${type}
@@ -1959,7 +1988,7 @@ export function buildEventTypeCounts(projectId, opts, d) {
     const scene = sceneClause(bag, opts);
     return {
         query: `
-      SELECT event_type, count() AS count
+      SELECT event_type, count(*) AS count
       FROM events
       WHERE project_id = ${pid}${range}${scene}
       GROUP BY event_type
@@ -1990,11 +2019,11 @@ export function buildSceneCoverage(projectId, opts, d) {
         floor(position[1] / ${cellSize}) AS vx,
         floor(position[2] / ${cellSize}) AS vy,
         floor(position[3] / ${cellSize}) AS vz,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'camera_sample'
-        AND length(position) = 3${range}${scene}${session}
+        AND ${d.arrayLength("position")} = 3${range}${scene}${session}
       GROUP BY vx, vy, vz
       ORDER BY count DESC
       LIMIT ${limit}
@@ -2029,13 +2058,13 @@ export function buildPerfHeatmap(projectId, opts, d) {
         floor(position[1] / ${cellSize}) AS vx,
         floor(position[2] / ${cellSize}) AS vy,
         floor(position[3] / ${cellSize}) AS vz,
-        count() AS samples,
+        count(*) AS samples,
         avg(fps) AS avg_fps,
         min(fps) AS min_fps
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'frame_perf'
-        AND length(position) = 3${range}${scene}${session}
+        AND ${d.arrayLength("position")} = 3${range}${scene}${session}
       GROUP BY vx, vy, vz
       ORDER BY avg_fps ASC
       LIMIT ${limit}
@@ -2070,11 +2099,11 @@ export function buildCameraDistance(projectId, opts, d) {
           (position[2] - ${cy}) * (position[2] - ${cy}) +
           (position[3] - ${cz}) * (position[3] - ${cz})
         ) / ${bucketSize}) AS bucket,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid}
         AND event_type = 'camera_sample'
-        AND length(position) = 3${range}${scene}${session}
+        AND ${d.arrayLength("position")} = 3${range}${scene}${session}
       GROUP BY bucket
       ORDER BY bucket ASC
       LIMIT ${limit}
@@ -2103,12 +2132,12 @@ export function buildNavigationStats(projectId, opts, d) {
         FROM events
         WHERE project_id = ${pid}
           AND event_type = 'camera_sample'
-          AND length(position) = 3${range}${scene}${session}`;
+          AND ${d.arrayLength("position")} = 3${range}${scene}${session}`;
     return {
         query: `
       SELECT
         session_id,
-        count() AS segments,
+        count(*) AS segments,
         sum(dist) AS total_distance,
         sum(CASE WHEN dist >= ${moveThreshold} THEN 1 ELSE 0 END) AS active_segments,
         sum(CASE WHEN dist >= ${moveThreshold} THEN dist ELSE 0 END) AS active_distance
@@ -2122,9 +2151,16 @@ export function buildNavigationStats(projectId, opts, d) {
           ) AS dist
         FROM (${sampleSelect}
         ) AS c
-        ${d.asofInnerJoin} (${sampleSelect}
-        ) AS m
-        ON c.session_id = m.session_id AND c.ts > m.ts
+        ${d.asofJoin({
+            kind: "inner",
+            right: `(${sampleSelect}
+        )`,
+            alias: "m",
+            keys: [["c.session_id", "session_id"]],
+            leftTs: "c.ts",
+            op: ">",
+            rightTs: "ts",
+        })}
       ) AS seg
       GROUP BY session_id
       ORDER BY total_distance DESC
@@ -2153,7 +2189,7 @@ export function buildNavigationStats(projectId, opts, d) {
  * Per (session, scene): `revisits = entries − distinct_cells` — every entry into
  * a cell beyond its first is a re-entry. Pooled per scene, the leaderboard
  * reports `backtrack_ratio = Σ revisits / Σ entries` alongside the raw counts.
- * Only plain `count()` and a dedup subquery are used (no multi-column
+ * Only plain `count(*)` and a dedup subquery are used (no multi-column
  * `COUNT(DISTINCT …)`), so DuckDB and ClickHouse agree.
  */
 export function buildBacktrackRatio(projectId, opts, d) {
@@ -2171,24 +2207,31 @@ export function buildBacktrackRatio(projectId, opts, d) {
         FROM events
         WHERE project_id = ${pid}
           AND event_type = 'camera_sample'
-          AND length(position) = 3${range}${scene}${session}`;
+          AND ${d.arrayLength("position")} = 3${range}${scene}${session}`;
     // Ordered cell entries (consecutive same-cell samples collapsed): a sample is
     // an entry when it has no predecessor or its cell changed vs. the predecessor.
     const entries = `
       SELECT c.session_id AS session_id, c.scene AS scene, c.gx AS gx, c.gz AS gz
       FROM (${sampleSelect}
       ) AS c
-      ${d.asofLeftJoin} (
+      ${d.asofJoin({
+        kind: "left",
+        right: `(
         SELECT session_id, ts, 1 AS present, gx, gz FROM (${sampleSelect}
         ) AS s
-      ) AS m
-      ON c.session_id = m.session_id AND c.ts > m.ts
+      )`,
+        alias: "m",
+        keys: [["c.session_id", "session_id"]],
+        leftTs: "c.ts",
+        op: ">",
+        rightTs: "ts",
+    })}
       WHERE m.present IS NULL OR m.present = 0 OR c.gx <> m.gx OR c.gz <> m.gz`;
     return {
         query: `
       SELECT
         scene,
-        count() AS sessions,
+        count(*) AS sessions,
         sum(total_entries) AS entries,
         sum(revisits) AS revisits,
         CASE WHEN sum(total_entries) > 0
@@ -2197,12 +2240,12 @@ export function buildBacktrackRatio(projectId, opts, d) {
         SELECT
           e.session_id AS session_id,
           e.scene AS scene,
-          count() AS total_entries,
-          count() - dc.distinct_cells AS revisits
+          count(*) AS total_entries,
+          count(*) - dc.distinct_cells AS revisits
         FROM (${entries}
         ) AS e
         JOIN (
-          SELECT session_id, scene, count() AS distinct_cells
+          SELECT session_id, scene, count(*) AS distinct_cells
           FROM (
             SELECT DISTINCT session_id, scene, gx, gz FROM (${entries}
             ) AS de
@@ -2249,7 +2292,7 @@ export function buildInteractionsBySource(projectId, opts, d) {
       SELECT
         event_type,
         source,
-        count() AS count,
+        count(*) AS count,
         count(DISTINCT session_id) AS sessions
       FROM events
       WHERE project_id = ${pid}
@@ -2283,7 +2326,7 @@ export function buildTopInputActions(projectId, opts, d) {
       SELECT
         name AS action,
         source,
-        count() AS count
+        count(*) AS count
       FROM events
       WHERE project_id = ${pid} AND event_type = 'input_action' AND name != ''${range}${scene}${source}${session}
       GROUP BY name, source
@@ -2316,12 +2359,12 @@ export function buildXrRotationRate(projectId, opts, d) {
         FROM events
         WHERE project_id = ${pid}
           AND event_type = 'camera_sample'
-          AND length(direction) = 3${range}${scene}${session}`;
+          AND ${d.arrayLength("direction")} = 3${range}${scene}${session}`;
     return {
         query: `
       SELECT
         session_id,
-        count() AS samples,
+        count(*) AS samples,
         avg(turn) AS avg_turn_rad,
         max(turn) AS max_turn_rad,
         sum(turn) AS total_turn_rad,
@@ -2336,9 +2379,16 @@ export function buildXrRotationRate(projectId, opts, d) {
           ))) AS turn
         FROM (${sampleSelect}
         ) AS c
-        ${d.asofInnerJoin} (${sampleSelect}
-        ) AS m
-        ON c.session_id = m.session_id AND c.ts > m.ts
+        ${d.asofJoin({
+            kind: "inner",
+            right: `(${sampleSelect}
+        )`,
+            alias: "m",
+            keys: [["c.session_id", "session_id"]],
+            leftTs: "c.ts",
+            op: ">",
+            rightTs: "ts",
+        })}
       ) AS seg
       GROUP BY session_id
       ORDER BY total_turn_rad DESC
@@ -2365,7 +2415,7 @@ export function buildXrSourceUsage(projectId, opts, d) {
         query: `
       SELECT
         source,
-        count() AS interactions,
+        count(*) AS interactions,
         count(DISTINCT session_id) AS sessions
       FROM events
       WHERE project_id = ${pid}
@@ -2396,7 +2446,7 @@ export function buildXrAbandonment(projectId, opts, d) {
         query: `
       SELECT
         session_id,
-        count() AS events,
+        count(*) AS events,
         sum(CASE WHEN source IN ${XR_SOURCES} THEN 1 ELSE 0 END) AS xr_interactions,
         min(ts) AS started_at,
         max(ts) AS ended_at
@@ -2580,7 +2630,7 @@ export function buildArPlacementTimeToPlace(projectId, opts, d) {
         query: `
       SELECT
         floor(coalesce(${timeToPlace}, 0) / ${bucket}) * ${bucket} AS bucket,
-        count() AS placements
+        count(*) AS placements
       FROM events
       WHERE project_id = ${pid} AND event_type = 'ar_placement'${range}${scene}${session}
       GROUP BY bucket
@@ -2610,7 +2660,7 @@ export function buildArPlacementAttempts(projectId, opts, d) {
         query: `
       SELECT
         coalesce(${attempts}, 1) AS attempts,
-        count() AS placements
+        count(*) AS placements
       FROM events
       WHERE project_id = ${pid} AND event_type = 'ar_placement'${range}${scene}${session}
       GROUP BY attempts
@@ -2642,7 +2692,7 @@ export function buildArPlacementSurfaces(projectId, opts, d) {
         query: `
       SELECT
         coalesce(${surface}, 'unknown') AS surface,
-        count() AS placements,
+        count(*) AS placements,
         avg(${scale}) AS avg_scale
       FROM events
       WHERE project_id = ${pid} AND event_type = 'ar_placement'${range}${scene}${session}
@@ -2683,7 +2733,7 @@ export function buildFunnel(projectId, opts, d) {
       )`;
     });
     const counts = steps
-        .map((_step, i) => `SELECT ${i} AS step, count() AS sessions FROM s${i}`)
+        .map((_step, i) => `SELECT ${i} AS step, count(*) AS sessions FROM s${i}`)
         .join("\n      UNION ALL ");
     return {
         query: `
@@ -2735,8 +2785,15 @@ export function buildSceneRetention(projectId, opts, d) {
       SELECT a.scene_id AS from_scene, b.scene_id AS to_scene,
              count(DISTINCT a.session_id) AS sessions
       FROM sc AS a
-      ${d.asofInnerJoin} sc AS b
-        ON a.session_id = b.session_id AND a.ts < b.ts
+      ${d.asofJoin({
+            kind: "inner",
+            right: "sc",
+            alias: "b",
+            keys: [["a.session_id", "session_id"]],
+            leftTs: "a.ts",
+            op: "<",
+            rightTs: "ts",
+        })}
       GROUP BY from_scene, to_scene
       ORDER BY sessions DESC, from_scene ASC, to_scene ASC
       LIMIT ${limit}
@@ -2801,7 +2858,7 @@ export function buildLoadBounceFunnel(projectId, opts, d) {
         GROUP BY fl.session_id, fl.load_ts
       ),
       engaged AS (
-        SELECT lm.session_id AS session_id, count() AS interactions
+        SELECT lm.session_id AS session_id, count(*) AS interactions
         FROM events AS e JOIN load_ms AS lm
           ON e.session_id = lm.session_id
         WHERE e.project_id = ${pid}
@@ -2811,7 +2868,7 @@ export function buildLoadBounceFunnel(projectId, opts, d) {
       )
       SELECT
         ${bandCase} AS band,
-        count() AS sessions,
+        count(*) AS sessions,
         sum(CASE WHEN coalesce(eng.interactions, 0) = 0 THEN 1 ELSE 0 END) AS bounced
       FROM load_ms AS lm LEFT JOIN engaged AS eng ON lm.session_id = eng.session_id
       WHERE lm.load_ms IS NOT NULL
@@ -2894,7 +2951,7 @@ export function buildVariantLeaderboard(projectId, opts, d) {
     }
     // Per-view aggregates: total views and distinct sessions per variant.
     ctes.push(`view_counts AS (
-        SELECT variant, count() AS views, count(DISTINCT session_id) AS sessions
+        SELECT variant, count(*) AS views, count(DISTINCT session_id) AS sessions
         FROM variant_views
         GROUP BY variant
       )`);