From 64eeedce9fc39c5076348efd04b4aadcc9da6534 Mon Sep 17 00:00:00 2001
From: BilalG1 <bg2002@gmail.com>
Date: Thu, 11 Jun 2026 17:37:11 -0700
Subject: [PATCH] Fix dev CI: docker prune missing template + cross-domain test
 failures (#1582)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unbreaks the test workflows that have been red on every dev push since
June 4. All root causes trace to direct pushes whose own CI runs already
failed (`8b78587da`, `c60016226`, `59daf1321`).

> Note: this PR originally also fixed the "Docker Server Build and Push"
workflow (missing `@hexclave/template` in the Dockerfiles' `turbo prune`
scope), but dev picked up the identical fix via 59daf1321 while this was
open, so the Dockerfile changes dropped out after merging dev back in.

## 1. E2E cross-domain spies — broken since `c60016226` (June 4)

`c60016226` renamed `_getCurrentRefreshTokenIdIfSignedIn` →
`_fetchCurrentRefreshTokenIdIfSignedIn` in the SDK and template unit
tests, but missed the eight `vi.spyOn` calls in
`apps/e2e/tests/js/cross-domain-auth.test.ts`. `vi.spyOn` throws on
missing properties → all 8 tests failed with
`_getCurrentRefreshTokenIdIfSignedIn does not exist`.

**Fix:** rename the spies.

## 2. signOut test timeout in all 5 SDK packages — broken since
`c60016226` (June 4)

The refresh-cookie test added in the same commit writes to a cookie
token store, which queues a background trusted-parent-domain lookup.
That lookup fetches the unreachable test `baseUrl` with retries while
holding `storeLock`'s read lock (via `AsyncStore.setAsync`), so the
later signOut test deadlocks on `storeLock.withWriteLock` inside
`_signOut` and hits the 5s vitest timeout (passes in isolation, fails
when the file runs in order).

**Fix:** stub `_getTrustedParentDomain` in the cookie test so the queued
task settles immediately.

## 3. "does not await pending auth resolutions" — premise broken by
`8b78587da` (June 4), masked by the spy rename

`8b78587da` added `nonHostedHandlerNames`, making `afterSignIn` resolve
to a local URL instead of the hosted domain. The test redirected to
`afterSignIn` from a callback page expecting the nested cross-domain
auth params path to run — but the redirect became same-origin, so
`_fetchCurrentRefreshTokenIdIfSignedIn` is (correctly) never called.
This was invisible until fix 1 above unmasked it.

**Fix:** redirect to `accountSettings` (still hosted, so still
cross-origin), preserving the test's intent: the session lookup during
nested-param construction must not await pending auth resolutions.

## 4. internal-metrics e2e snapshots — broken on dev by `59daf1321`

The analytics overview filters PR reshaped the metrics endpoint response
(added `bounce_rate`, daily/hourly breakdown arrays,
`top_browsers`/`devices`/`operating_systems`/`regions`; slimmed the
zero-filled daily fallback arrays) and updated the backend unit-test
snapshots, but left the e2e snapshots stale — its own dev run fails
these two tests identically.

**Fix:** update `__snapshots__/internal-metrics.test.ts.snap`,
reconstructed from the CI diff with every context line verified against
the old snapshot, and the new fields cross-checked against the route
change in 59daf1321.

## Verification

- `client-app-impl.cross-domain.test.ts`: 7/7 in `packages/template` and
the regenerated `packages/js` copy (signOut: 5s timeout → 10ms).
- `tests/js/cross-domain-auth.test.ts`: 18/18 locally (fully mocked, no
backend needed).
- Lint + typecheck pass for the touched packages.
- The metrics snapshot can only be fully confirmed by CI (needs the live
backend).

## Out of scope

"Run setup tests with custom base port" also intermittently fails
unrelated test files at exactly 60s under runner load (last green May
5), and the local-emulator run had one `payments/switch-plans` flake —
pre-existing flakiness not addressed here.
---
 .../internal-metrics.test.ts.snap             | 1182 ++++++-----------
 apps/e2e/tests/js/cross-domain-auth.test.ts   |   26 +-
 .../client-app-impl.cross-domain.test.ts      |    6 +
 3 files changed, 440 insertions(+), 774 deletions(-)

diff --git a/apps/e2e/tests/backend/endpoints/api/v1/__snapshots__/internal-metrics.test.ts.snap b/apps/e2e/tests/backend/endpoints/api/v1/__snapshots__/internal-metrics.test.ts.snap
index 3e6e392ad..8bd520ef5 100644
--- a/apps/e2e/tests/backend/endpoints/api/v1/__snapshots__/internal-metrics.test.ts.snap
+++ b/apps/e2e/tests/backend/endpoints/api/v1/__snapshots__/internal-metrics.test.ts.snap
@@ -8,6 +8,7 @@ NiceResponse {
     "analytics_overview": {
       "anonymous_visitors_fallback": 0,
       "avg_session_seconds": 0,
+      "bounce_rate": 0,
       "daily_anonymous_visitors_fallback": [
         {
           "activity": 0,
@@ -134,258 +135,10 @@ NiceResponse {
           "date": <stripped field 'date'>,
         },
       ],
-      "daily_clicks": [
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-      ],
-      "daily_page_views": [
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-      ],
+      "daily_avg_session_seconds": [],
+      "daily_bounce_rate": [],
+      "daily_clicks": [],
+      "daily_page_views": [],
       "daily_revenue": [
         {
           "date": <stripped field 'date'>,
@@ -543,137 +296,19 @@ NiceResponse {
           "refund_cents": 0,
         },
       ],
-      "daily_visitors": [
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-      ],
+      "daily_visitors": [],
+      "hourly_active_users": [],
+      "hourly_page_views": [],
+      "hourly_visitors": [],
       "online_live": 0,
       "recent_replays": 0,
       "revenue_per_visitor": 0,
+      "top_browsers": [],
+      "top_devices": [],
+      "top_operating_systems": [],
       "top_referrers": [],
       "top_region": null,
+      "top_regions": [],
       "total_replays": 0,
       "total_revenue_cents": 0,
       "visitors": 0,
@@ -2279,6 +1914,202 @@ NiceResponse {
       "recent_emails": [],
       "total_emails": 0,
     },
+    "hourly_active_users": [
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+    ],
+    "hourly_users": [
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+    ],
     "live_users": <stripped field 'live_users'>,
     "login_methods": [],
     "payments_overview": {
@@ -2462,6 +2293,7 @@ NiceResponse {
     "analytics_overview": {
       "anonymous_visitors_fallback": 0,
       "avg_session_seconds": 0,
+      "bounce_rate": 0,
       "daily_anonymous_visitors_fallback": [
         {
           "activity": 0,
@@ -2588,258 +2420,10 @@ NiceResponse {
           "date": <stripped field 'date'>,
         },
       ],
-      "daily_clicks": [
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-      ],
-      "daily_page_views": [
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-      ],
+      "daily_avg_session_seconds": [],
+      "daily_bounce_rate": [],
+      "daily_clicks": [],
+      "daily_page_views": [],
       "daily_revenue": [
         {
           "date": <stripped field 'date'>,
@@ -2997,141 +2581,19 @@ NiceResponse {
           "refund_cents": 0,
         },
       ],
-      "daily_visitors": [
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-        {
-          "activity": 0,
-          "date": <stripped field 'date'>,
-        },
-      ],
-      "online_live": 10,
+      "daily_visitors": [],
+      "hourly_active_users": [],
+      "hourly_page_views": [],
+      "hourly_visitors": [],
+      "online_live": 0,
       "recent_replays": 0,
       "revenue_per_visitor": 0,
+      "top_browsers": [],
+      "top_devices": [],
+      "top_operating_systems": [],
       "top_referrers": [],
-      "top_region": {
-        "count": 10,
-        "country_code": null,
-        "region_code": null,
-      },
+      "top_region": null,
+      "top_regions": [],
       "total_replays": 0,
       "total_revenue_cents": 0,
       "visitors": 0,
@@ -4828,6 +4290,202 @@ NiceResponse {
       ],
       "total_emails": 15,
     },
+    "hourly_active_users": [
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 10,
+        "date": <stripped field 'date'>,
+      },
+    ],
+    "hourly_users": [
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 0,
+        "date": <stripped field 'date'>,
+      },
+      {
+        "activity": 9,
+        "date": <stripped field 'date'>,
+      },
+    ],
     "live_users": <stripped field 'live_users'>,
     "login_methods": [
       {
diff --git a/apps/e2e/tests/js/cross-domain-auth.test.ts b/apps/e2e/tests/js/cross-domain-auth.test.ts
index 599ba699a..ed970daf6 100644
--- a/apps/e2e/tests/js/cross-domain-auth.test.ts
+++ b/apps/e2e/tests/js/cross-domain-auth.test.ts
@@ -293,8 +293,8 @@ it("does not await pending auth resolutions when post-callback redirect adds nes
   await withHostedDomainSuffix(async () => {
     const projectId = "13131313-1313-4313-8313-131313131313";
     const clientApp = createClientApp(projectId);
-    const getCurrentRefreshTokenIdIfSignedInSpy = vi
-      .spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn")
+    const fetchCurrentRefreshTokenIdIfSignedInSpy = vi
+      .spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn")
       .mockResolvedValue(null);
 
     const previousWindow = globalThis.window;
@@ -310,8 +310,10 @@ it("does not await pending auth resolutions when post-callback redirect adds nes
     } as any;
 
     try {
+      // accountSettings (unlike afterSignIn & co, which resolve to local URLs) still lives on the
+      // hosted domain, so it exercises the nested cross-domain auth params path.
       await expect((clientApp as any)._redirectToHandler(
-        "afterSignIn",
+        "accountSettings",
         { replace: true },
         { awaitPendingAuthResolutions: false },
       )).rejects.toThrowError("INTENTIONAL_TEST_ABORT");
@@ -320,9 +322,9 @@ it("does not await pending auth resolutions when post-callback redirect adds nes
       globalThis.document = previousDocument;
     }
 
-    expect(getCurrentRefreshTokenIdIfSignedInSpy).toHaveBeenCalledWith({
+    expect(fetchCurrentRefreshTokenIdIfSignedInSpy).toHaveBeenCalledWith(expect.objectContaining({
       awaitPendingAuthResolutions: false,
-    });
+    }));
   });
 });
 
@@ -446,7 +448,7 @@ it("adds nested cross-domain auth params when redirecting signed-in users to hos
     const currentHref = `${localRedirectUrl}/dashboard?tab=settings`;
     const clientApp = createClientApp(projectId);
 
-    vi.spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(refreshTokenId);
+    vi.spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(refreshTokenId);
 
     const previousWindow = globalThis.window;
     const previousDocument = globalThis.document;
@@ -484,7 +486,7 @@ it("adds nested cross-domain auth params for other cross-domain handler redirect
     const currentHref = `${localRedirectUrl}/private-page`;
     const clientApp = createClientApp(projectId);
 
-    vi.spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(refreshTokenId);
+    vi.spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(refreshTokenId);
 
     const previousWindow = globalThis.window;
     const previousDocument = globalThis.document;
@@ -524,7 +526,7 @@ it("starts nested cross-domain auth from the target domain", async ({ expect })
     const previousDocument = globalThis.document;
     let redirectedUrl = "";
 
-    vi.spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(null);
+    vi.spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(null);
     vi.spyOn(clientApp as any, "_getCrossDomainHandoffParamsForRedirect").mockResolvedValue({
       state: "nested-state",
       codeChallenge: "nested-code-challenge",
@@ -588,7 +590,7 @@ it("carries hosted sign-in return state on the nested OAuth redirect URI", async
     const previousDocument = globalThis.document;
     let redirectedUrl = "";
 
-    vi.spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(null);
+    vi.spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(null);
     vi.spyOn(clientApp as any, "_getCrossDomainHandoffParamsForRedirect").mockResolvedValue({
       state: "nested-state",
       codeChallenge: "nested-code-challenge",
@@ -649,7 +651,7 @@ it("continues nested cross-domain auth on the source domain", async ({ expect })
     const createCrossDomainAuthRedirectUrlSpy = vi
       .spyOn(clientApp as any, "_createCrossDomainAuthRedirectUrl")
       .mockResolvedValue(crossDomainRedirect);
-    vi.spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(sourceRefreshTokenId);
+    vi.spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(sourceRefreshTokenId);
 
     globalThis.document = createMockDocument();
     globalThis.window = {
@@ -721,7 +723,7 @@ it("rejects nested cross-domain auth when the callback URL is untrusted", async
     const previousWindow = globalThis.window;
     const previousDocument = globalThis.document;
 
-    vi.spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(null);
+    vi.spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn").mockResolvedValue(null);
     vi.spyOn(clientApp as any, "_isTrusted").mockResolvedValue(false);
 
     globalThis.document = createMockDocument();
@@ -753,7 +755,7 @@ it("rejects nested cross-domain auth when the source session does not match", as
     const previousWindow = globalThis.window;
     const previousDocument = globalThis.document;
     const createCrossDomainAuthRedirectUrlSpy = vi.spyOn(clientApp as any, "_createCrossDomainAuthRedirectUrl");
-    vi.spyOn(clientApp as any, "_getCurrentRefreshTokenIdIfSignedIn").mockResolvedValue("different-source-session");
+    vi.spyOn(clientApp as any, "_fetchCurrentRefreshTokenIdIfSignedIn").mockResolvedValue("different-source-session");
 
     globalThis.document = createMockDocument();
     globalThis.window = {
diff --git a/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.cross-domain.test.ts b/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.cross-domain.test.ts
index 57fb05809..4d10a7a34 100644
--- a/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.cross-domain.test.ts
+++ b/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.cross-domain.test.ts
@@ -283,6 +283,12 @@ describe("StackClientApp cross-domain auth", () => {
     const originalFetchNewAccessToken = Reflect.get(clientInterface, "fetchNewAccessToken");
     const refreshedRawRefreshTokens: string[] = [];
 
+    // Cookie-store writes queue a background trusted-parent-domain lookup. Without this stub, that
+    // lookup fetches the (unreachable) baseUrl with retries while holding the global store lock,
+    // which starves any later test that needs the write lock (e.g. signOut). Not restored on
+    // purpose: queued tasks can still run after this test body finishes.
+    vi.spyOn(clientApp as any, "_getTrustedParentDomain").mockResolvedValue(null);
+
     try {
       const getBrowserCookieTokenStore = Reflect.get(clientApp, "_getBrowserCookieTokenStore");
       if (typeof getBrowserCookieTokenStore !== "function") {