@iann29/rastro 0.5.0 → 0.6.0

package/docs/upgrading.md

@@ -1,5 +1,42 @@
 # Upgrading Amage Rastro
 
+## People, attributes and identity continuity (0.6.0)
+
+Install `@iann29/rastro@0.6.0` and deploy the host through its normal workflow.
+
+- Additive `visitorProfiles` and `visitorAttributes` storage; no event/session
+  rewrite.
+- Attributes are optional project-defined strings, numbers and booleans. Name,
+  email and attribute searches use indexes with bounded pagination.
+- `identifyVisitor`, `identifyVisitorMutation` and authenticated
+  `identifyVisitorHttpAction` support any backend authentication. Existing
+  `linkVisitor` remains available.
+- Re-export `getVisitorProfile` and `listPeople` from federation and refresh the
+  connection to advertise `visitorProfiles` and `people`. The dashboard
+  tolerates older hosts. Its Pessoas view lists profiles, filters attributes and
+  opens history.
+- For profiles created before the directory, call the owner-authorized
+  `backfillVisitorProfiles({siteId})` until `isDone` is true (at most 64
+  profiles per call). This initializes search fields and attribute indexes;
+  timestamps and event history are preserved. Fresh installations need no
+  backfill.
+- Funnels continue across linked pre-login and account IDs, including queued
+  alias events. Historical aggregates are not recomputed; steps must still
+  arrive in order.
+- Map connections between routes in the same column bend around intermediate
+  nodes instead of drawing through them.
+- Tracker `identify`/`reset` rotate sessions on login/logout without a reload;
+  `context` now includes `identified`. `RastroScript` synchronizes identity
+  changes and forwards native load/error events.
+- The reference example's auth entrypoint is now
+  `analyticsIdentity:identifyVisitor`; configure its server-owned
+  `RASTRO_IDENTITY_SITE_ID`. Its optional HTTP route also requires
+  `RASTRO_IDENTITY_SERVER_KEY`.
+- The tracker budget is now below 1,700 bytes gzip including identity switching.
+
+See [the complete identity guide](identity.md) for integration and deployment
+order.
+
 Pin exact versions, read the changelog, and rehearse upgrades against a
 non-production snapshot before changing a maintained deployment. `0.1.0` is the
 first release without a prerelease tag; the alphas below it stay documented for
@@ -7,26 +44,27 @@ hosts still on them.
 
 ## Release matrix
 
-| Current state                                         | Required path                                                                                                                                                                                                                                                | Success condition                                                   |
-| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------- |
-| Fresh deployment                                      | Install the intended release directly                                                                                                                                                                                                                        | Component deploys and `/rastro/health` succeeds                     |
-| `0.1.0-alpha.0` with maintained data                  | Install `0.1.0-alpha.1` first and wait for staged visitor-index backfills                                                                                                                                                                                    | Every staged index reports complete before installing `alpha.2`     |
-| `0.1.0-alpha.1`                                       | Wait for staged visitor-index backfills, then install `alpha.2`                                                                                                                                                                                              | Backfills complete before active readers deploy                     |
-| `0.1.0-alpha.2` with legacy `events` rows             | Stay on `alpha.2` and run/resume migration                                                                                                                                                                                                                   | Durable success plus empty source                                   |
-| `0.1.0-alpha.3` fresh/canonical deployment            | Rehearse the next alpha normally                                                                                                                                                                                                                             | Schema, reports, tracker, and retention checks pass                 |
-| `0.1.0-alpha.3` through `alpha.5` with canonical data | Install `0.1.0-alpha.6` directly; Web Vitals tables are additive                                                                                                                                                                                             | Schema deploys and `/rastro/health` reports `webVitals: "optIn"`    |
-| `0.1.0-alpha.6`                                       | Install `0.1.0-alpha.7` directly; no schema change                                                                                                                                                                                                           | `GET /rastro/tracker.js` contains `sentAt`                          |
-| `0.1.0-alpha.7`                                       | Install `0.1.0-alpha.8` directly; site map tables are additive; re-export `siteMap`                                                                                                                                                                          | `/rastro/health` reports `siteMap: "dailyRollup"`                   |
-| `0.1.0-alpha.8`                                       | Install `0.1.0-alpha.10` directly; no schema change; the tracker changes                                                                                                                                                                                     | `/rastro/health` reports `liveDepartures: "leaveBeacon"`            |
-| `0.1.0-alpha.9`                                       | Install `0.1.0-alpha.10` directly; `alpha.9` is deprecated — it rejected its own leave beacons                                                                                                                                                               | The final page-close `POST /rastro/events` returns 200              |
-| `0.1.0-alpha.10`                                      | Install `0.1.0-alpha.12` directly; new tables and fields are additive; re-export the configure functions to opt in                                                                                                                                           | `/rastro/health` reports `tracker.version: "0.1.0-alpha.12"`        |
-| `0.1.0-alpha.11`                                      | Install `0.1.0-alpha.12` directly; same code, the package now ships `src/tracker/generated.ts`                                                                                                                                                               | A `convex/` test importing `@iann29/rastro/test` typechecks on push |
-| `0.1.0-alpha.12`                                      | Install `0.1.0` directly; every schema change is an optional field or a new table; add `analytics:public` to a grant only to allow public links                                                                                                              | `/rastro/health` reports `tracker.version: "0.1.0"`                 |
-| `0.1.0`                                               | Install `0.2.0` directly; add the optional host callback and grant version to enable transfers                                                                                                                                                               | Health reports `0.2.0`; opted-in connectors advertise `transfer`    |
-| `0.2.0`                                               | Install `0.3.0` directly; no new table; export `getSession` and `revenueSummary` from the federation module                                                                                                                                                  | Health reports `0.3.0`; the manifest lists `sessionDetails`         |
-| `0.3.0`                                               | Install `0.4.0` directly; no re-export; the deploy rebuilds the `reportRollupQueue` index and the tracker changes                                                                                                                                            | Health reports `0.4.0`; a hidden tab leaves **Ao vivo** in ~10 s    |
-| `0.4.0`                                               | Install `0.5.0` directly; every schema change is an optional field or a new table; export `listTrackedLinks`, `createTrackedLink`, `updateTrackedLink` and `deleteTrackedLink` from the federation module; reverify — the manifest advertises `trackedLinks` | Health reports `0.5.0`; the manifest lists `trackedLinks`           |
-| Any release whose packed declarations lack federation | Stop and request an eligible exact registry release                                                                                                                                                                                                          | Packed declarations contain the federation exports                  |
+| Current state                                         | Required path                                                                                                                                                                                                                                                | Success condition                                                         |
+| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------- |
+| Fresh deployment                                      | Install the intended release directly                                                                                                                                                                                                                        | Component deploys and `/rastro/health` succeeds                           |
+| `0.1.0-alpha.0` with maintained data                  | Install `0.1.0-alpha.1` first and wait for staged visitor-index backfills                                                                                                                                                                                    | Every staged index reports complete before installing `alpha.2`           |
+| `0.1.0-alpha.1`                                       | Wait for staged visitor-index backfills, then install `alpha.2`                                                                                                                                                                                              | Backfills complete before active readers deploy                           |
+| `0.1.0-alpha.2` with legacy `events` rows             | Stay on `alpha.2` and run/resume migration                                                                                                                                                                                                                   | Durable success plus empty source                                         |
+| `0.1.0-alpha.3` fresh/canonical deployment            | Rehearse the next alpha normally                                                                                                                                                                                                                             | Schema, reports, tracker, and retention checks pass                       |
+| `0.1.0-alpha.3` through `alpha.5` with canonical data | Install `0.1.0-alpha.6` directly; Web Vitals tables are additive                                                                                                                                                                                             | Schema deploys and `/rastro/health` reports `webVitals: "optIn"`          |
+| `0.1.0-alpha.6`                                       | Install `0.1.0-alpha.7` directly; no schema change                                                                                                                                                                                                           | `GET /rastro/tracker.js` contains `sentAt`                                |
+| `0.1.0-alpha.7`                                       | Install `0.1.0-alpha.8` directly; site map tables are additive; re-export `siteMap`                                                                                                                                                                          | `/rastro/health` reports `siteMap: "dailyRollup"`                         |
+| `0.1.0-alpha.8`                                       | Install `0.1.0-alpha.10` directly; no schema change; the tracker changes                                                                                                                                                                                     | `/rastro/health` reports `liveDepartures: "leaveBeacon"`                  |
+| `0.1.0-alpha.9`                                       | Install `0.1.0-alpha.10` directly; `alpha.9` is deprecated — it rejected its own leave beacons                                                                                                                                                               | The final page-close `POST /rastro/events` returns 200                    |
+| `0.1.0-alpha.10`                                      | Install `0.1.0-alpha.12` directly; new tables and fields are additive; re-export the configure functions to opt in                                                                                                                                           | `/rastro/health` reports `tracker.version: "0.1.0-alpha.12"`              |
+| `0.1.0-alpha.11`                                      | Install `0.1.0-alpha.12` directly; same code, the package now ships `src/tracker/generated.ts`                                                                                                                                                               | A `convex/` test importing `@iann29/rastro/test` typechecks on push       |
+| `0.1.0-alpha.12`                                      | Install `0.1.0` directly; every schema change is an optional field or a new table; add `analytics:public` to a grant only to allow public links                                                                                                              | `/rastro/health` reports `tracker.version: "0.1.0"`                       |
+| `0.1.0`                                               | Install `0.2.0` directly; add the optional host callback and grant version to enable transfers                                                                                                                                                               | Health reports `0.2.0`; opted-in connectors advertise `transfer`          |
+| `0.2.0`                                               | Install `0.3.0` directly; no new table; export `getSession` and `revenueSummary` from the federation module                                                                                                                                                  | Health reports `0.3.0`; the manifest lists `sessionDetails`               |
+| `0.3.0`                                               | Install `0.4.0` directly; no re-export; the deploy rebuilds the `reportRollupQueue` index and the tracker changes                                                                                                                                            | Health reports `0.4.0`; a hidden tab leaves **Ao vivo** in ~10 s          |
+| `0.4.0`                                               | Install `0.5.0` directly; every schema change is an optional field or a new table; export `listTrackedLinks`, `createTrackedLink`, `updateTrackedLink` and `deleteTrackedLink` from the federation module; reverify — the manifest advertises `trackedLinks` | Health reports `0.5.0`; the manifest lists `trackedLinks`                 |
+| `0.5.0`                                               | Install `0.6.0`; export `listPeople` and `getVisitorProfile`, deploy, and reverify. Use the host identity resolver to populate profiles.                                                                                                                     | Health reports `0.6.0`; the manifest lists `people` and `visitorProfiles` |
+| Any release whose packed declarations lack federation | Stop and request an eligible exact registry release                                                                                                                                                                                                          | Packed declarations contain the federation exports                        |
 
 Do not upgrade a populated legacy deployment directly to a release that removes
 the `events` table. Schema acceptance alone does not prove that telemetry was

package/llms.txt

@@ -1,6 +1,6 @@
 # Amage Rastro
 
-> Privacy-first, real-time web analytics for Convex. Telemetry stays in each product's Convex or Synapse deployment; the central dashboard reads only an explicitly granted report surface, and configures a site only when its host's grant opts into the configure scope.
+> Real-time product and web analytics: identified people, journeys, conversions and retention on Convex. Telemetry stays in each product's Convex or Synapse deployment; the central dashboard reads only an explicitly granted report surface, and configures a site only when its host's grant opts into the configure scope.
 
 Canonical documentation: https://www.amagerastro.com/docs/
 Machine manifest: https://www.amagerastro.com/agent/manifest.json
@@ -16,7 +16,7 @@ Do not infer federation availability from this website, a dist-tag, or a source
 ## Architecture
 
 - Tracker and telemetry: browser -> customer HTTP-actions URL -> customer Rastro component.
-- The tracker is 2,594 bytes raw and 1,395 gzip. It sends the click-ID key **names** of the landing URL in `clid` (`gclid`, `fbclid`, `ttclid`…), at most eight, never a value, and the referrer as scheme and host, so an `android-app://<package>` referrer keeps its package.
+- The tracker is 2,999 bytes raw and 1,565 gzip. It sends the click-ID key **names** of the landing URL in `clid` (`gclid`, `fbclid`, `ttclid`…), at most eight, never a value, and the referrer as scheme and host, so an `android-app://<package>` referrer keeps its package.
 - Tracked links (0.5.0+): browser -> customer HTTP-actions URL `/rastro/l/<slug>` -> `302` (`Cache-Control: no-store`) to a destination on one of the site's domains, with `utm_source` (platform), `utm_medium` (channel), `utm_campaign` (campaign, or the slug) and `utm_content` (slug) appended; the destination's own query and `utm_*` keys stay. Unknown or disabled slug: `404`. Clicks count in four-shard daily counters; self-declared bots are redirected and counted apart.
 - Optional field Web Vitals (alpha.6+): a second browser module at `/rastro/vitals.js` reports LCP, CLS, INP, FCP, and TTFB to the same events endpoint, into bounded daily histograms; it needs the base tracker on the page.
 - Reactive dashboard reads: amagerastro.com browser -> customer functions URL -> `rastroFederation:*`.
@@ -76,3 +76,7 @@ Do not infer federation availability from this website, a dist-tag, or a source
 - `dataCoverage` echoes the authorized site ID but returns no event, visitor, or session IDs.
 - `vitalsReport` returns p75, averages, and exact good/needs-improvement/poor counts per metric, page, and device — never individual measurements.
 - `siteMap` returns per-route totals (pageviews, estimated visitors, entries, derived exits and bounces, time on page) and route-to-route transition counts, with numeric, UUID, and long hexadecimal segments collapsed to `:id` — never sessions, visitor IDs, or query strings. `liveVisitors` adds `previousPath` and `movedAt` when a visitor moves between routes, and since 0.1.0 the intent facts of the session — `entryPath`, `returning`, `utmCampaign`, `affiliateSlug`, `conversionCount`, and the furthest `funnel` step — which `visitorHeat` from the package turns into the dashboard's hot/warm/cold score.
+
+## People and identity (0.6.0+)
+
+Use the [identity guide](https://www.amagerastro.com/docs/reference/identity.md) for Better Auth, custom Convex auth and authenticated HTTP from other backends. `Rastro.identifyVisitorMutation` resolves the current user on the host; `identifyVisitorHttpAction` authorizes external servers. `getVisitorProfile` requires reader access and is advertised as `visitorProfiles`. `listPeople` adds the optional `people` directory with indexed name/email/ID prefix search and exact filters on project-defined string, number or boolean attributes. Existing profiles need the bounded host-authorized search backfill described in the guide. The browser applies the returned ID with `identify` and calls `reset` on logout.

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@iann29/rastro",
-  "description": "Privacy-first, real-time web analytics for Convex: live visitor atlas, journeys, revenue, goals, funnels, affiliates, and a 1.4 KB tracker.",
+  "description": "Real-time product and web analytics for Convex: identified people, journeys, revenue, goals, funnels, affiliates, and a lightweight browser tracker.",
   "repository": "github:amageweb/amage-rastro",
   "homepage": "https://github.com/amageweb/amage-rastro#readme",
   "bugs": {
     "url": "https://github.com/amageweb/amage-rastro/issues"
   },
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -16,7 +16,7 @@
     "convex-component",
     "analytics",
     "realtime",
-    "privacy",
+    "product-analytics",
     "cookieless",
     "session-journey",
     "conversion-tracking",
@@ -46,6 +46,7 @@
     "typecheck": "tsc --noEmit && tsc -p control-plane && tsc -p control-plane/convex && tsc -p example/convex",
     "lint": "eslint .",
     "test": "vitest run --typecheck",
+    "test:layout": "playwright test -c control-plane/playwright.layout.config.ts",
     "test:watch": "vitest --typecheck --clearScreen false",
     "test:debug": "vitest --inspect-brk --no-file-parallelism",
     "test:coverage": "vitest run --coverage --coverage.reporter=text",
@@ -68,6 +69,7 @@
     "docs/federation.md",
     "docs/federation-setup.md",
     "docs/upgrading.md",
+    "docs/identity.md",
     "docs/benchmarks/*.md",
     "assets/rastro-live-atlas.png"
   ],

package/src/component/_generated/api.ts

@@ -25,6 +25,7 @@ import type * as ingest from "../ingest.js";
 import type * as live from "../live.js";
 import type * as localTime from "../localTime.js";
 import type * as origin from "../origin.js";
+import type * as people from "../people.js";
 import type * as platforms from "../platforms.js";
 import type * as reports from "../reports.js";
 import type * as retention from "../retention.js";
@@ -63,6 +64,7 @@ const fullApi: ApiFromModules<{
   live: typeof live;
   localTime: typeof localTime;
   origin: typeof origin;
+  people: typeof people;
   platforms: typeof platforms;
   reports: typeof reports;
   retention: typeof retention;

package/src/component/_generated/component.ts

@@ -241,6 +241,46 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         Name
       >;
     };
+    people: {
+      backfillSearch: FunctionReference<
+        "mutation",
+        "internal",
+        { siteId: string },
+        { isDone: boolean; updated: number },
+        Name
+      >;
+      list: FunctionReference<
+        "query",
+        "internal",
+        {
+          filter?:
+            | { field: "name" | "email" | "visitorId"; prefix: string }
+            | {
+                field: "attribute";
+                key: string;
+                value: string | number | boolean;
+              };
+          paginationOpts: { cursor: string | null; numItems: number };
+          siteId: string;
+        },
+        {
+          continueCursor: string;
+          isDone: boolean;
+          page: Array<{
+            _creationTime: number;
+            _id: string;
+            attributes?: Record<string, string | number | boolean>;
+            email?: string;
+            identifiedAt: number;
+            name?: string;
+            siteId: string;
+            updatedAt: number;
+            visitorId: string;
+          }>;
+        },
+        Name
+      >;
+    };
     reports: {
       affiliatesReport: FunctionReference<
         "query",
@@ -415,6 +455,14 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           os: string;
           pageviewCount: number;
           platform?: string;
+          profile?: {
+            attributes?: Record<string, string | number | boolean>;
+            email?: string;
+            identifiedAt: number;
+            name?: string;
+            updatedAt: number;
+            visitorId: string;
+          };
           referrer?: string;
           revenueCents: number;
           sessionId: string;
@@ -575,6 +623,14 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             os: string;
             pageviewCount: number;
             platform?: string;
+            profile?: {
+              attributes?: Record<string, string | number | boolean>;
+              email?: string;
+              identifiedAt: number;
+              name?: string;
+              updatedAt: number;
+              visitorId: string;
+            };
             referrer?: string;
             revenueCents: number;
             sessionId: string;
@@ -617,6 +673,14 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           pageviewCount: number;
           path: string;
           previousPath?: string;
+          profile?: {
+            attributes?: Record<string, string | number | boolean>;
+            email?: string;
+            identifiedAt: number;
+            name?: string;
+            updatedAt: number;
+            visitorId: string;
+          };
           returning?: boolean;
           sessionId: string;
           siteId: string;
@@ -1292,6 +1356,41 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
       >;
     };
     visitors: {
+      getProfile: FunctionReference<
+        "query",
+        "internal",
+        { siteId: string; visitorId: string },
+        {
+          attributes?: Record<string, string | number | boolean>;
+          email?: string;
+          identifiedAt: number;
+          name?: string;
+          updatedAt: number;
+          visitorId: string;
+        } | null,
+        Name
+      >;
+      identify: FunctionReference<
+        "mutation",
+        "internal",
+        {
+          attributes?: Record<string, string | number | boolean | null>;
+          email?: string | null;
+          name?: string | null;
+          previousVisitorId?: string;
+          siteId: string;
+          visitorId: string;
+        },
+        {
+          attributes?: Record<string, string | number | boolean>;
+          email?: string;
+          identifiedAt: number;
+          name?: string;
+          updatedAt: number;
+          visitorId: string;
+        },
+        Name
+      >;
       link: FunctionReference<
         "mutation",
         "internal",

package/src/component/ingest.ts

@@ -89,6 +89,7 @@ import {
 } from "./rollupStore.js";
 import { localDayStart, localDayTimezone } from "./localTime.js";
 import { classifyOrigin, platformDimensionValue } from "./origin.js";
+import { resolveVisitorIdentities } from "./visitors.js";
 
 type DimensionType =
   | "source"
@@ -217,6 +218,7 @@ type BatchState = {
     CachedRow<CachedDocument<"visitorAttributions">>
   >;
   funnelProgress: Map<string, CachedRow<CachedDocument<"funnelProgress">>>;
+  funnelIdentities: Map<string, string[]>;
   eventBatches: EventBatchBuffer;
   liveSweepSites: Set<string>;
 };
@@ -286,6 +288,7 @@ export const ingestBatch = mutation({
       liveSessions: new Map(),
       visitorAttributions: new Map(),
       funnelProgress: new Map(),
+      funnelIdentities: new Map(),
       eventBatches: new Map(),
       liveSweepSites: new Set(),
     };
@@ -1927,46 +1930,62 @@ async function advanceFunnel(
   reportRollupDeltas: ReportRollupDeltas,
   batchState?: BatchState,
 ): Promise<FunnelReach | undefined> {
-  const cacheKey = JSON.stringify([funnel._id, event.visitorId]);
+  let identities = batchState?.funnelIdentities.get(event.visitorId);
+  if (!identities) {
+    identities = await resolveVisitorIdentities(ctx, siteId, event.visitorId);
+    for (const id of identities)
+      batchState?.funnelIdentities.set(id, identities);
+  }
+  const cacheKey = JSON.stringify([funnel._id, identities[0]]);
   let progressState = batchState?.funnelProgress.get(cacheKey);
-  if (batchState && !progressState) {
-    const current = await ctx.db
-      .query("funnelProgress")
-      .withIndex("by_siteId_and_funnelId_and_visitorId", (range) =>
-        range
-          .eq("siteId", siteId)
-          .eq("funnelId", funnel._id)
-          .eq("visitorId", event.visitorId),
-      )
-      .unique();
+  if (!progressState) {
+    const candidates = await Promise.all(
+      identities.map((visitorId) =>
+        ctx.db
+          .query("funnelProgress")
+          .withIndex("by_siteId_and_funnelId_and_visitorId", (range) =>
+            range
+              .eq("siteId", siteId)
+              .eq("funnelId", funnel._id)
+              .eq("visitorId", visitorId),
+          )
+          .unique(),
+      ),
+    );
+    // Reuse the furthest attempt still inside its window. Already-counted
+    // attempts are not replayed or merged into historical aggregates.
+    const current =
+      candidates
+        .filter((row) => row !== null)
+        .sort((a, b) => {
+          const activeA =
+            event.timestamp - a.startedAt <= funnel.conversionWindowMs;
+          const activeB =
+            event.timestamp - b.startedAt <= funnel.conversionWindowMs;
+          return (
+            Number(activeB) - Number(activeA) ||
+            (activeA ? b.currentStep - a.currentStep : 0) ||
+            b.lastStepAt - a.lastStepAt
+          );
+        })[0] ?? null;
     progressState = { current, dirty: false };
-    batchState.funnelProgress.set(cacheKey, progressState);
+    batchState?.funnelProgress.set(cacheKey, progressState);
   }
-  const progress = progressState
-    ? progressState.current
-    : await ctx.db
-        .query("funnelProgress")
-        .withIndex("by_siteId_and_funnelId_and_visitorId", (range) =>
-          range
-            .eq("siteId", siteId)
-            .eq("funnelId", funnel._id)
-            .eq("visitorId", event.visitorId),
-        )
-        .unique();
+  const progress = progressState.current;
   const matchesFirst = stepMatches(funnel.steps[0], event);
   if (!progress) {
     if (!matchesFirst) return;
     const fields: Omit<Doc<"funnelProgress">, "_id" | "_creationTime"> = {
       siteId,
       funnelId: funnel._id,
-      visitorId: event.visitorId,
+      visitorId: identities[0],
       sessionId: event.sessionId,
       currentStep: 1,
       startedAt: event.timestamp,
       lastStepAt: event.timestamp,
     };
     const progressId = await ctx.db.insert("funnelProgress", fields);
-    if (progressState) {
+    if (batchState) {
       progressState.current = {
         ...fields,
         _id: progressId,
@@ -1997,7 +2016,7 @@ async function advanceFunnel(
       lastStepAt: event.timestamp,
     };
     delete updated.completedAt;
-    if (progressState) {
+    if (batchState) {
       progressState.current = updated;
       progressState.dirty = true;
     } else {
@@ -2031,7 +2050,7 @@ async function advanceFunnel(
     lastStepAt: event.timestamp,
     ...(completed ? { completedAt: event.timestamp } : {}),
   };
-  if (progressState) {
+  if (batchState) {
     progressState.current = { ...progress, ...updates };
     progressState.dirty = true;
   } else {