@ak--47/dungeon-master 1.5.3 → 1.6.0

package/lib/verify/funnel-engine.js

@@ -25,7 +25,6 @@
  *
  * NOT implemented:
  *   - Aggressive/optimized reentry (`enable_early_reentry`)
- *   - Any-order step blocks (`is_any_order_step`)
  *   - Selector expressions beyond eq/neq/gt/lt/gte/lte/contains/not_contains
  *
  * @typedef {Object} StepFilter
@@ -33,56 +32,163 @@
  * @property {'eq'|'neq'|'gt'|'lt'|'gte'|'lte'|'contains'|'not_contains'} op
  * @property {*} value
  *
- * @typedef {string | { event: string, where?: StepFilter }} FunnelStep
+ * @typedef {string | { event: string, where?: StepFilter } | AnyOrderBlock} FunnelStep
+ *
+ * @typedef {Object} AnyOrderBlock
+ * @property {Array<string | { event: string, where?: StepFilter }>} anyOrder -
+ *   v1.6.0 (P1.6.6): a contiguous block of steps the user may complete in ANY
+ *   internal order, mixed freely with ordered "anchor" steps. Mixpanel's
+ *   any-order is an anchor/chunk greedy pass, not a permutation search
+ *   (history.cpp:490-519 advance, :538-589 cascade, :926-963
+ *   can_record_any_order_step):
+ *     - Anchor steps sit at fixed positions; a chunk of N any-order steps
+ *       between two anchors fills its N positions in event-arrival order.
+ *     - Within the ACTIVE chunk, the FIRST eligible match per step wins — no
+ *       latest-match overwrite (history.cpp:951-957).
+ *     - Steps in chunks past a not-yet-seen anchor buffer the LATEST match
+ *       (:958-962), credited when the anchor is crossed — and only if the
+ *       buffered time comes after the anchor per the 2-second rule.
+ *     - The cascade advances through anchors and fully-satisfied chunks in
+ *       one pass; a partially-satisfied chunk claims its present members and
+ *       stops (:559-587).
+ *   Blocks cannot nest and must not be empty.
  *
  * @typedef {Object} ExclusionStep
- * @property {string} event - Event name that terminates the attempt.
- * @property {number} [afterStep] - Exclusion active when `reached >= afterStep`. Mixpanel
- *   `funnel_query.cpp` exclusion `i` fires when user has reached step `i` (between step
- *   `i` and step `i+1`). Default `-Infinity` — fires anywhere in the attempt (including
- *   before step 0), useful for the simple `[{event: 'X'}]` shape used by
- *   `Funnel.exclusionEvents` ("X anywhere kills").
- * @property {number} [beforeStep] - Exclusion active when `reached < beforeStep`.
- *   Default `steps.length` — fires until completion.
+ * @property {string} event - Event name that terminates the attempt when it
+ *   fires in a qualifying gap. ARB semantics (history.cpp
+ *   history_record_exclusion_step + funnel_query_is_step_terminated):
+ *   exclusions live in the GAPS between consecutive steps — one slot per gap
+ *   g = (step g, step g+1). They can never terminate an attempt before step 0
+ *   or more than 2s after completion, must fall within the conversion window
+ *   from step 0, and ties within the 2-second grace are resolved AGAINST the
+ *   user (anti-conversion bias). Termination keeps `reached` (clamping it
+ *   back to the killed gap when a buffered exclusion fires late) and freezes
+ *   the attempt — no restart from the exclusion event.
+ * @property {number} [afterStep] - First gap index this exclusion applies to.
+ *   Default 0. `{ afterStep: 1, beforeStep: 2 }` = "between step 1 and step 2" only.
+ * @property {number} [beforeStep] - Exclusive upper bound on applicable gap
+ *   indexes. Default `steps.length` (every gap).
+ *
+ * @typedef {Object} SessionConversionWindow
+ * @property {'sessions'} unit - Only 'sessions' is supported here; time-based
+ *   windows use `conversionWindowMs`.
+ * @property {number} n - Session count, 1–12. `n = 1` means "same session";
+ *   `n = 2` means "same or next session". Mixpanel's API caps session windows
+ *   at 12 (`_MAX_LENGTHS["session"]`, api/version_2_0/arb_funnels/validate.py).
  *
  * @typedef {Object} FunnelOptions
  * @property {number} [conversionWindowMs] - Max time from step 0 to last
  *   step (strict `<`). Omit for no window check.
+ * @property {SessionConversionWindow} [conversionWindow] - Session-count
+ *   conversion window (Mixpanel funnel "conversion window: N sessions").
+ *   Mutually exclusive with `conversionWindowMs`. Semantics
+ *   (conversion_window.cpp WINDOW_TYPE_SESSIONS + funnel_query.cpp session_id
+ *   plumbing): each event gets a per-user session ordinal (count of session
+ *   ENDS before it, seeded 0 — see `sessionOrdinals`); a step passes iff
+ *   `ordinal(step) < ordinal(step0) + n` — ordinal-ONLY, no wall-clock term
+ *   (conversion_window.cpp:50; ARB's n×1-day bound binds only against the
+ *   trend-interval end and the data-pull range — fix-round C6).
  * @property {boolean} [graceperiod=true] - Enable the 2-second grace window
  *   on ordering checks. Disable only for tests that need strict ordering.
  * @property {boolean} [reentry=false] - When true, after completing all steps,
  *   reset to step 0 and continue scanning. Increments `completions`.
+ *   Attempts ALSO restart when the conversion window expires (fix-round
+ *   B2+C5): an incoming event past the window from step 0 finalizes the
+ *   live attempt as a drop-off and processes against a fresh one — ARB
+ *   checks expiry before processing each event, then re-births a history
+ *   for that same event (funnel_query.cpp:1608-1617, :1663-1680;
+ *   history_is_past_conversion_window, history.cpp:785-793). This models
+ *   COUNT_TYPE_GENERAL, whose `allow_simultaneous_histories` and
+ *   `allow_record_multiple_history` are both true (funnel_query.cpp:592-610).
  * @property {ExclusionStep[]} [exclusionSteps] - Exclusion events that
  *   terminate the current attempt when fired between specified steps.
  * @property {boolean | string[]} [trackStepProperties=false] - When truthy,
  *   `result.stepProperties[i]` contains the matched event's properties at
  *   each step. Pass an array to filter to specific property names.
- * @property {'uniques'|'totals'} [countMode='uniques'] - `'totals'` returns an
+ * @property {'uniques'|'totals'|'sessions'} [countMode='uniques'] - `'totals'` returns an
  *   ARRAY of FunnelResult — one per attempt (Mixpanel funnel_query.cpp:2055-2100).
  *   Includes incomplete attempts (drop-offs contribute to per-step counts).
- *   Without `reentry: true`, the array has at most one entry (the single attempt).
- * @property {boolean} [sessionScoped=false] - **Verifier-only convenience** — partitions
- *   events by `session_id` and runs the matcher independently per session, returning the
- *   best result (or all results when `countMode: 'totals'`). Mixpanel does NOT have an
- *   exact equivalent; the closest production analog is `WINDOW_TYPE_SESSIONS` on the
- *   conversion window (`conversion_window.cpp:9-13`), which bounds the funnel by session
- *   COUNT, not by partitioning per session. Results from `sessionScoped: true` are NOT
- *   directly reproducible in the Mixpanel UI.
+ *   Without `reentry: true` or `woRepeat: true`, the array has at most one
+ *   entry (the single attempt).
+ *   `'sessions'` is Mixpanel's "count by Sessions" — a documented API-rewrite
+ *   preset, NOT an engine mode: expands to exactly `countMode: 'totals'` +
+ *   `woRepeat: true` (the `general_wo_repeat` rewrite) +
+ *   `conversionWindow: { unit: 'sessions', n: 1 }` (__validate_sessions in
+ *   api/version_2_0/arb_funnels/validate.py). Throws if combined with
+ *   `reentry: true` or any other conversion window.
+ * @property {boolean} [woRepeat=false] - COUNT_TYPE_GENERAL_WO_REPEAT
+ *   (fix-round B2): totals counting where window expiry is the ONLY restart —
+ *   at most one attempt per window span. A decided attempt (completed OR
+ *   excluded) stays open, absorbing events, until one arrives past the
+ *   conversion window from step 0; that event finalizes the attempt and a
+ *   fresh one processes the same event (funnel_query.cpp:1608-1613 — for
+ *   GENERAL_WO_REPEAT termination checks ONLY history_is_past_conversion_
+ *   window, not history_is_mutable; re-birth :1663-1680). Contrast
+ *   `reentry: true` (GENERAL), which also restarts right after each
+ *   completion/exclusion, permitting repeat conversions within one window.
+ *   Requires `countMode: 'totals'`; mutually exclusive with `reentry` and
+ *   `sessionScoped`.
+ * @property {boolean} [sessionScoped=false] - **@deprecated — verifier-only, NOT
+ *   Mixpanel-comparable.** Partitions events by generator-stamped `session_id` and runs
+ *   the matcher independently per session, returning the best result (or all results
+ *   when `countMode: 'totals'`). Mixpanel does NOT partition funnels per session — it
+ *   bounds them by session COUNT via `WINDOW_TYPE_SESSIONS` on the conversion window
+ *   (`conversion_window.cpp:9-13`). Use `conversionWindow: { unit: 'sessions', n }`
+ *   for Mixpanel-comparable results; results from `sessionScoped: true` are NOT
+ *   reproducible in the Mixpanel UI.
+ * @property {{fromMs?: number, toMs?: number}} [anchorRange] - v1.6.0 (P1.6.5):
+ *   step-0 anchor bounds for trend intervals. Mixpanel funnel trends evaluate
+ *   each interval as "step 0 in [start, stop); steps 1+ in
+ *   [start, stop + conversion window)" (funnel_query.cpp:1398-1401 — the
+ *   query scans the extended range but only anchors histories whose step-0
+ *   event falls inside the interval proper). Events outside
+ *   `[fromMs, toMs)` cannot record step 0 (a new attempt can never anchor
+ *   there, including under `reentry`); they remain eligible for steps 1+,
+ *   exclusion gaps, and session-ordinal derivation. Callers are expected to
+ *   pre-slice the stream to [fromMs, toMs + window) — the engine only
+ *   enforces the anchor bound.
  *
  * @typedef {Object} FunnelResult
  * @property {boolean} completed - Reached every step.
  * @property {number} reached - Highest step index reached (0-based). `-1` if no steps reached.
  * @property {Array<Object|null>} stepEvents - The event assigned to each reached step.
  * @property {Array<number|null>} stepTimes - Timestamp (ms) of each reached step.
- * @property {number|null} ttcMs - Time-to-convert: stepTimes[last] - stepTimes[0]. `null` if not completed.
+ * @property {number|null} ttcMs - Time-to-convert in ms: `$ttc` at ms
+ *   resolution — MAX over recorded slot times minus position-0 time
+ *   (history.cpp:914-918 uses history_get_last_time, :843-847 = max over the
+ *   slot array, NOT the last position — under any-order grace claims the last
+ *   position's time can precede an earlier position's). Always >= 0 on
+ *   completion. `null` if not completed.
+ * @property {number|null} ttcSeconds - ARB's `$ttc` computed property: floor
+ *   seconds of ttcMs, defined ONLY on full conversion (history.cpp:914-922 —
+ *   `$ttc` is value_create_undefined() otherwise). `null` if not completed.
+ * @property {number[]} gapSeconds - Per-gap deltas for positions 1..reached:
+ *   `t_p <= t_{p-1} ? 0 : floor((t_p - t_{p-1}) / 1000)` — integer seconds,
+ *   clamped to 0 per gap when timestamps are non-increasing
+ *   (funnel_query.cpp:3374, int arithmetic). Recorded for every attempt that
+ *   reached position 1+, converted or not (:3359 loops `i <= reached`).
+ *   Length = max(reached, 0).
+ * @property {number[]} gapSecondsFromStart - Running sum of the CLAMPED
+ *   per-gap deltas (`time_from_start += delta`, funnel_query.cpp:3375) — NOT
+ *   `t_p - t_0`; the two differ whenever a gap clamps. Same length as
+ *   gapSeconds.
  * @property {number} completions - Total completions (1 if no reentry; 0 if not completed).
  * @property {Array<Object>|undefined} stepProperties - Per-step property snapshots when `trackStepProperties` set.
  * @property {string|undefined} sessionId - Set when result came from a session-scoped slice.
+ * @property {boolean} terminatedByExclusion - Attempt was DISQUALIFIED by an
+ *   exclusion event. `reached` is kept (possibly clamped back to the killed
+ *   gap): the user still counts at steps 0..reached AND in the excluded
+ *   bucket at step reached+1 (funnel_query.cpp `fr->excluded[reached + 1]`).
+ * @property {number|null} excludedAtStep - `reached + 1` when terminated by
+ *   exclusion — the index ARB's `excluded[]` aggregation uses — else null.
  */
 
 import { toMs } from '../hook-helpers/_internal.js';
+import { sessionOrdinals } from './sessionize.js';
+import { matchesWhere } from './coerce.js';
 
 const OUT_OF_ORDER_MS = 2000;
+const DAY_MS = 86400 * 1000;
 
 /**
  * Returns true if `t1` is "after" `t2` by Mixpanel's funnel rules.
@@ -116,9 +222,10 @@ export function withinConversionWindow(eventTime, step0Time, windowMs) {
 
 /**
  * Normalize a funnel step (string OR `{ event, where? }`) into the canonical
- * `{ event, where }` shape.
+ * `{ event, where }` shape. AnyOrder blocks are NOT accepted here — flatten
+ * them with `normalizeFunnelSteps` first.
  *
- * @param {FunnelStep} step
+ * @param {string | { event: string, where?: StepFilter }} step
  * @returns {{ event: string, where?: StepFilter }}
  */
 export function normalizeStep(step) {
@@ -129,29 +236,79 @@ export function normalizeStep(step) {
 	throw new Error(`normalizeStep: invalid step ${JSON.stringify(step)}`);
 }
 
+/**
+ * v1.6.0 (P1.6.6): flatten a step list that may contain `{ anyOrder: [...] }`
+ * blocks into per-slot arrays plus the anchor topology ARB precomputes per
+ * history (history.cpp:214-228): `prevAnchor[i]` = nearest anchor slot ≤ i
+ * (−1 if none), `nextAnchor[i]` = nearest anchor slot > i (numSteps if none).
+ *
+ * @param {FunnelStep[]} steps
+ * @returns {{
+ *   flat: Array<{ event: string, where?: StepFilter }>,
+ *   isAnyOrder: boolean[],
+ *   prevAnchor: number[],
+ *   nextAnchor: number[],
+ *   hasAnyOrder: boolean,
+ * }}
+ */
+export function normalizeFunnelSteps(steps) {
+	const flat = [];
+	const isAnyOrder = [];
+	for (const s of steps) {
+		if (s && typeof s === 'object' && 'anyOrder' in s) {
+			const block = /** @type {AnyOrderBlock} */ (s).anyOrder;
+			if (!Array.isArray(block) || !block.length) {
+				throw new Error('normalizeFunnelSteps: anyOrder block must be a non-empty array');
+			}
+			for (const inner of block) {
+				if (inner && typeof inner === 'object' && 'anyOrder' in inner) {
+					throw new Error('normalizeFunnelSteps: anyOrder blocks cannot nest');
+				}
+				flat.push(normalizeStep(inner));
+				isAnyOrder.push(true);
+			}
+		} else {
+			flat.push(normalizeStep(/** @type {string | { event: string, where?: StepFilter }} */ (s)));
+			isAnyOrder.push(false);
+		}
+	}
+	const n = flat.length;
+	const prevAnchor = new Array(n);
+	const nextAnchor = new Array(n);
+	// Single loop walking both directions — history.cpp:214-228.
+	let prev = -1;
+	let next = n;
+	for (let i = 0; i < n; i++) {
+		if (!isAnyOrder[i]) prev = i;
+		prevAnchor[i] = prev;
+		const rev = n - 1 - i;
+		nextAnchor[rev] = next;
+		if (!isAnyOrder[rev]) next = rev;
+	}
+	return { flat, isAnyOrder, prevAnchor, nextAnchor, hasAnyOrder: isAnyOrder.includes(true) };
+}
+
 /**
  * Apply a step filter against a candidate event's flat property map.
  * Supports eq / neq / gt / lt / gte / lte / contains / not_contains.
  *
+ * Delegates to the shared WHERE-filter rulebook (fix-round B6 — coerce.js
+ * `matchesWhere`): funnel step selectors compile to the same eval_node
+ * machinery as every other WHERE filter, so string equality is
+ * case-insensitive (value.c:285 value_equal → arb_strcasecmp), `contains`
+ * uses arb_strcaseinstr (eval_node.c:2914), string relational ops go
+ * through arb_strcasecmp (eval_node.c:2931), relational ops on mixed types
+ * fail, and list-valued properties test per-item membership
+ * (eval_node.c:2949-2959). The pre-fix implementation used `===` and
+ * case-sensitive `.includes`, diverging from every other filter site.
+ *
  * @param {Object} ev
  * @param {StepFilter | undefined} where
  * @returns {boolean}
  */
 export function matchesStepFilter(ev, where) {
 	if (!where || !where.prop) return true;
-	const v = ev ? ev[where.prop] : undefined;
-	const target = where.value;
-	switch (where.op) {
-		case 'eq':           return v === target;
-		case 'neq':          return v !== target;
-		case 'gt':           return typeof v === 'number' && v > target;
-		case 'lt':           return typeof v === 'number' && v < target;
-		case 'gte':          return typeof v === 'number' && v >= target;
-		case 'lte':          return typeof v === 'number' && v <= target;
-		case 'contains':     return typeof v === 'string' && v.includes(String(target));
-		case 'not_contains': return !(typeof v === 'string' && v.includes(String(target)));
-		default: throw new Error(`matchesStepFilter: unsupported op "${where.op}"`);
-	}
+	return matchesWhere(ev || {}, { [where.prop]: { op: where.op, value: where.value } });
 }
 
 /**
@@ -193,7 +350,7 @@ function snapshotProperties(ev, mode) {
  * @returns {FunnelResult}
  */
 function emptyResult(trackStepProperties) {
-	const r = { completed: false, reached: -1, stepEvents: [], stepTimes: [], ttcMs: null, completions: 0, stepProperties: undefined, sessionId: undefined };
+	const r = { completed: false, reached: -1, stepEvents: [], stepTimes: [], ttcMs: null, ttcSeconds: null, gapSeconds: [], gapSecondsFromStart: [], completions: 0, stepProperties: undefined, sessionId: undefined, terminatedByExclusion: false, excludedAtStep: null };
 	if (trackStepProperties) r.stepProperties = [];
 	return r;
 }
@@ -206,107 +363,399 @@ function emptyResult(trackStepProperties) {
  * @param {number} startIdx - Index to begin scanning from.
  * @param {{ event: string, where?: StepFilter }[]} steps
  * @param {ExclusionStep[]} exclusionSteps
- * @param {Object} options
- * @returns {{ result: FunnelResult, nextIdx: number, terminatedByExclusion: boolean }}
+ * @param {Object} options - Engine internals plus two restart-machinery
+ *   flags: `expireOnWindow` finalizes the attempt when an event past the
+ *   conversion window from step 0 arrives (returning `expiredByWindow: true`
+ *   and `nextIdx` = that event's index, so the caller re-births AT it —
+ *   funnel_query.cpp:1663-1680); `woRepeat` additionally makes expiry the
+ *   ONLY termination — decided attempts idle until the window expires
+ *   (funnel_query.cpp:1608-1613).
+ * @returns {{ result: FunnelResult, nextIdx: number, terminatedByExclusion: boolean, expiredByWindow: boolean }}
  */
 function runOneAttempt(sorted, startIdx, steps, exclusionSteps, options) {
-	const { conversionWindowMs, graceperiod, trackStepProperties } = options;
-	const stepTimes = new Array(steps.length).fill(0);
-	const stepEvents = new Array(steps.length).fill(null);
-	const stepProps = trackStepProperties ? new Array(steps.length).fill(null) : null;
+	const { windowCheck, graceperiod, trackStepProperties, anchorOk, isAnyOrder, prevAnchor, nextAnchor, expireOnWindow = false, woRepeat = false } = options;
+	const numSteps = steps.length;
+	// Per-SLOT recorded candidates (history->steps): the latest match for
+	// anchors, the first eligible match for active any-order chunk members.
+	const slotTimes = new Array(numSteps).fill(0);
+	const slotEvents = new Array(numSteps).fill(null);
+	const slotProps = trackStepProperties ? new Array(numSteps).fill(null) : null;
+	// Per-POSITION path (history->step_loc_idx): which slot filled position p.
+	// Anchor slots always land at position === slot; an any-order chunk fills
+	// its slot range in event-arrival order (history.cpp:929-945). For
+	// anchor-only funnels positions and slots coincide throughout.
+	const stepLocIdx = new Array(numSteps).fill(-1);
+	// history_get_time_at_step (history.cpp:839-841) — 0 when unfilled.
+	const timeAtPos = (p) => stepLocIdx[p] === -1 ? 0 : slotTimes[stepLocIdx[p]];
+	const eventAtPos = (p) => stepLocIdx[p] === -1 ? null : slotEvents[stepLocIdx[p]];
+
+	// Exclusion state — one slot per GAP g between step g and step g+1
+	// (`history->exclusion_steps[]`). ARB: "Exclusion steps can only exist
+	// between first and last step (and not before or after the funnel)"
+	// (funnel_query_is_step_terminated, history.cpp) — so an exclusion can
+	// never terminate an attempt that hasn't reached step 0, and there are
+	// no gaps at all for a single-step funnel.
+	const hasExclusions = !!(exclusionSteps && exclusionSteps.length && numSteps > 1);
+	const excTimes = hasExclusions ? new Array(numSteps - 1).fill(0) : null;
+	const excEvents = hasExclusions ? new Array(numSteps - 1).fill(null) : null;
+
 	let reached = -1;
-	let i = startIdx;
 	let terminatedByExclusion = false;
+	let expiredByWindow = false;
+	let tailAnchorMs = 0; // terminating exclusion time, or last-step time on completion
+	let endIdx = -1;      // consumption boundary — frozen the moment the attempt is decided
+	let i = startIdx;
 
-	for (; i < sorted.length; i++) {
-		const ev = sorted[i];
-		const t = toMs(ev.time);
-		if (!Number.isFinite(t)) continue;
+	// Does exclusion `ex` apply to gap g? afterStep/beforeStep bound the
+	// applicable gap range [afterStep, beforeStep); default = every gap.
+	const gapApplies = (ex, g) => {
+		const after = typeof ex.afterStep === 'number' ? ex.afterStep : 0;
+		const before = typeof ex.beforeStep === 'number' ? ex.beforeStep : numSteps;
+		return g >= after && g < before;
+	};
+	const excludesAtGap = (ev, g) => {
+		for (const ex of exclusionSteps) {
+			if (ev.event === ex.event && gapApplies(ex, g)) return true;
+		}
+		return false;
+	};
+	// funnel_query_is_step_terminated (history.cpp): the exclusion recorded in
+	// gap g kills the attempt iff it is (a) within the conversion window from
+	// step 0, (b) at/after step g per the 2-second rule — the grace that
+	// forgives step ordering CONDEMNS exclusion ties ("we assume they were
+	// ordered in such a way as to prevent the conversion") — and (c) still in
+	// the open gap: the user sits exactly at step g, or reached is past it and
+	// step g+1 does not come more than 2s before the exclusion. Gaps sit
+	// between POSITIONS (history_get_time_at_step reads through step_loc_idx),
+	// so with any-order blocks the gap bounds are the claimed positions'
+	// times, not the slot-declaration order.
+	const gapTerminates = (g) => {
+		if (reached < 0 || g < 0 || g >= numSteps - 1) return false;
+		const et = excTimes[g];
+		if (!et) return false;
+		if (!windowCheck(et, timeAtPos(0), excEvents[g], eventAtPos(0))) return false;
+		if (!timestampComesAfter(et, timeAtPos(g), graceperiod)) return false;
+		return reached === g
+			|| (reached > g && timestampComesAfter(timeAtPos(g + 1), et, graceperiod));
+	};
+	// history_record_exclusion_step (history.cpp): record the event into gap
+	// g, unless reached is past the gap and the event falls more than 2s
+	// after position g+1 — the gap closed cleanly, and the event "may be
+	// useful for a future exclusion step". Returns true when the event was
+	// consumed. Callers interleave this per gap index with positive-step
+	// records (funnel_query.cpp:1307-1385 — positive step g before exclusion
+	// gap g; first use consumes the event).
+	const tryExclusionAtGap = (g, ev, t) => {
+		if (!excludesAtGap(ev, g)) return false;
+		if (reached > g && !timestampComesAfter(timeAtPos(g + 1), t, graceperiod)) return false;
+		excTimes[g] = t;
+		excEvents[g] = ev;
+		if (gapTerminates(g)) {
+			terminatedByExclusion = true;
+			reached = g; // DISQUALIFY-and-freeze: clamp back to the killed gap
+			tailAnchorMs = t;
+		}
+		return true;
+	};
+
+	// can_record_any_order_step (history.cpp:926-963). Assumes slot s is an
+	// any-order step.
+	const prevAnchorTimeMs = () => {
+		// previous_anchor_time_ms (history.cpp:967-970): time at the last
+		// anchor POSITION at/below reached; 0 when the active chunk has no
+		// anchor below it. Anchors always claim position === slot, and a
+		// chunk's position range equals its slot range, so indexing the
+		// slot-built topology by the position `reached` is exact.
+		const pa = prevAnchor[reached];
+		return pa >= 0 ? timeAtPos(pa) : 0;
+	};
+	const canRecordAnyOrderSlot = (s, t) => {
+		if (reached >= 0 && s < prevAnchor[reached]) {
+			// Chunk already sealed behind a crossed anchor.
+			return false;
+		}
+		if (reached >= 0 && s < nextAnchor[reached]) {
+			// Active chunk: FIRST eligible match wins — no latest overwrite
+			// (history.cpp:951-957).
+			const eligible = slotTimes[s] !== 0
+				&& timestampComesAfter(slotTimes[s], prevAnchorTimeMs(), graceperiod);
+			return !eligible && timestampComesAfter(t, prevAnchorTimeMs(), graceperiod);
+		}
+		// Chunk past a not-yet-seen anchor: always buffer the latest
+		// (history.cpp:958-962).
+		return true;
+	};
+
+	// history_record_step (history.cpp:413-628): record the slot, maybe
+	// advance the position pointer, then cascade. Returns true (consumed).
+	const recordSlot = (s, ev, t, i) => {
+		slotTimes[s] = t;
+		slotEvents[s] = ev;
+		if (slotProps) slotProps[s] = snapshotProperties(ev, trackStepProperties);
+
+		let canAdvanceStep = false;
+		if (isAnyOrder[s]) {
+			// Direct advance (history.cpp:490-519): an any-order record claims
+			// the next position when it lands in the OPEN chunk — the first
+			// chunk before anything anchored, or the active chunk within the
+			// conversion window from position 0.
+			if ((reached === -1 && isAnyOrder[0] && s < nextAnchor[0])
+				|| (reached >= 0 && s < nextAnchor[reached]
+					&& windowCheck(slotTimes[s], timeAtPos(0), slotEvents[s], eventAtPos(0)))
+			) {
+				reached++;
+				stepLocIdx[reached] = s;
+				// Cascade only once the chunk is closed: this record filled the
+				// funnel's last position, or the next position is an anchor
+				// (history.cpp:509-517 — earlier chunk members already advanced
+				// the funnel when they recorded).
+				canAdvanceStep = reached + 1 === numSteps || !isAnyOrder[reached + 1];
+			}
+		} else if (s > 0 && reached !== s - 1) {
+			// Future anchor: latest recorded, no advance (history.cpp:519-523).
+		} else {
+			canAdvanceStep = true;
+		}
+
+		// ARB captures original_reached AFTER the direct advance (:525) — the
+		// exclusion second pass starts at the just-claimed position's gap.
+		const originalReached = reached;
 
-		// Exclusion check FIRST — if this event matches any active exclusion,
-		// terminate the attempt. Mixpanel `funnel_query.cpp` exclusion `i`
-		// fires when the user has reached step `i` (between step `i` and step
-		// `i+1`). API: `afterStep` is the index of the step that must have
-		// been reached; `beforeStep` is the index of the step that must NOT
-		// have been reached yet. Range check: `reached >= after && reached < before`.
-		// Defaults (afterStep=-Infinity, beforeStep=steps.length) mean
-		// "fires anywhere in the attempt" — used by the simple
-		// `[{event: 'X'}]` shape that `Funnel.exclusionEvents` produces.
-		if (exclusionSteps && exclusionSteps.length) {
-			let excluded = false;
-			for (const ex of exclusionSteps) {
-				if (ev.event !== ex.event) continue;
-				const after = typeof ex.afterStep === 'number' ? ex.afterStep : -Infinity;
-				const before = typeof ex.beforeStep === 'number' ? ex.beforeStep : steps.length;
-				if (reached >= after && reached < before) {
-					excluded = true; break;
+		if (canAdvanceStep) {
+			// Cascade (history.cpp:534-589): claim anchors one at a time; claim
+			// an any-order chunk's present members in slot order against the
+			// PRE-CHUNK time (members need not order among themselves), and
+			// cross to the next anchor only when the chunk fully filled. A
+			// partially-filled chunk claims its present members and stops.
+			let reachedTimeMs = reached >= 0 ? timeAtPos(reached) : 0;
+			let ns = originalReached + 1;
+			while (ns < numSteps) {
+				if (!isAnyOrder[ns]) {
+					if (timestampComesAfter(slotTimes[ns], reachedTimeMs, graceperiod)
+						&& (ns === 0 || windowCheck(slotTimes[ns], timeAtPos(0), slotEvents[ns], eventAtPos(0)))
+					) {
+						reached++;
+						stepLocIdx[reached] = ns; // anchors: position === slot
+						reachedTimeMs = slotTimes[ns];
+						ns++;
+					} else {
+						break;
+					}
+				} else {
+					const na = nextAnchor[ns];
+					let missing = false;
+					let latestTimeMs = reachedTimeMs;
+					for (; ns < na; ns++) {
+						if (timestampComesAfter(slotTimes[ns], reachedTimeMs, graceperiod)
+							&& windowCheck(slotTimes[ns], timeAtPos(0), slotEvents[ns], eventAtPos(0))
+						) {
+							reached++;
+							stepLocIdx[reached] = ns;
+							if (timestampComesAfter(slotTimes[ns], latestTimeMs, graceperiod)) {
+								latestTimeMs = slotTimes[ns];
+							}
+						} else {
+							missing = true;
+						}
+					}
+					if (!missing) {
+						reachedTimeMs = latestTimeMs;
+					} else {
+						break;
+					}
 				}
 			}
-			if (excluded) { terminatedByExclusion = true; i++; break; }
 		}
 
-		// Greedy assignment: this event goes to the first not-yet-reached
-		// step whose name + filter matches.
-		let matchedStep = -1;
-		for (let s = reached + 1; s < steps.length; s++) {
-			if (eventMatchesStep(ev, steps[s])) { matchedStep = s; break; }
+		// Buffered-exclusion second pass over [originalReached, reached]
+		// (history.cpp:608-618 "Second pass: Check if early termination funnel
+		// based on -ve steps are possible"): an exclusion recorded BEFORE its
+		// gap opened can retroactively kill steps the cascade just claimed.
+		// `reached` is clamped back to the killed gap.
+		if (hasExclusions) {
+			for (let r = originalReached; r <= reached; r++) {
+				if (gapTerminates(r)) {
+					terminatedByExclusion = true;
+					reached = r;
+					tailAnchorMs = excTimes[r];
+					endIdx = i + 1;
+					break;
+				}
+			}
 		}
-		if (matchedStep < 0) continue;
 
-		// "Always record the latest matching event for this step" — history.cpp.
-		stepTimes[matchedStep] = t;
-		stepEvents[matchedStep] = ev;
-		if (stepProps) stepProps[matchedStep] = snapshotProperties(ev, trackStepProperties);
+		if (reached === numSteps - 1 && !terminatedByExclusion) {
+			tailAnchorMs = timeAtPos(numSteps - 1);
+			endIdx = i + 1;
+			// No break — the 2s tail may still kill the completion.
+		}
+		return true;
+	};
 
-		if (matchedStep !== reached + 1) continue;
+	for (; i < sorted.length; i++) {
+		const ev = sorted[i];
+		const t = toMs(ev.time);
+		if (!Number.isFinite(t)) continue;
+
+		// Window expiry (fix-round B2+C5): ARB checks a born history against
+		// the conversion window BEFORE processing each event
+		// (history_is_past_conversion_window — window measured from step 0,
+		// history.cpp:785-793); an expired history finalizes via
+		// funnel_query_handle_funnel_expiry and a fresh unbirthed history
+		// processes THIS event (funnel_query.cpp:1608-1617, :1663-1680), so
+		// nextIdx = i, not i + 1. For GENERAL_WO_REPEAT (woRepeat) expiry is
+		// the ONLY termination — it fires even on completed/excluded attempts
+		// (:1611-1613). For GENERAL (the reentry loop) completion/exclusion
+		// keep their own restart below, so expiry only finalizes LIVE
+		// attempts (C5: failed-attempt windows).
+		if (expireOnWindow && reached >= 0
+			&& (woRepeat || (!terminatedByExclusion && reached !== numSteps - 1))
+			&& !windowCheck(t, timeAtPos(0), ev, eventAtPos(0))
+		) {
+			expiredByWindow = true;
+			endIdx = i;
+			break;
+		}
 
-		if (matchedStep > 0 && !withinConversionWindow(t, stepTimes[0], conversionWindowMs)) {
-			stepTimes[matchedStep] = 0;
-			stepEvents[matchedStep] = null;
-			if (stepProps) stepProps[matchedStep] = null;
+		if (terminatedByExclusion || reached === numSteps - 1) {
+			if (woRepeat) {
+				// GENERAL_WO_REPEAT: the decided attempt is NOT finalized — it
+				// idles, absorbing events, until the window expires (checked
+				// above). The 2-second out-of-order exclusion tail still
+				// applies to completions (the processing gate is count-type-
+				// independent — funnel_query.cpp: "If terminated (for any
+				// reason) or reached the last step AND current event_time is
+				// further than 2 seconds ... do not do this processing").
+				if (!terminatedByExclusion && hasExclusions && graceperiod && t <= tailAnchorMs + OUT_OF_ORDER_MS) {
+					for (let g = 0; g < numSteps - 1; g++) {
+						if (tryExclusionAtGap(g, ev, t)) break;
+					}
+				}
+				continue;
+			}
+			// Attempt decided. A history terminated BY EXCLUSION is immediately
+			// immutable — history_is_mutable short-circuits on
+			// terminated_by_exclusion_step (history.cpp:771-773) BEFORE the
+			// 2s out-of-order wait, which covers only COMPLETED histories
+			// (reached == num_steps-1 && timestamp_comes_after && should_wait
+			// _for_out_of_order_exclusion). So the tail scan below runs only
+			// for completions; there is no earlier-termination revision after
+			// an exclusion has landed (fix-round nit 2 — the old scan-after-
+			// termination path was also unreachable: later tail events sit
+			// monotonically farther from every step time, and the clamped
+			// `reached` can never equal an earlier gap's prev-step).
+			if (endIdx < 0) endIdx = i;
+			if (terminatedByExclusion) break;
+			// Completed: keep scanning ONLY the 2-second out-of-order tail,
+			// and only for exclusions — funnel_query.cpp: "If terminated (for
+			// any reason) or reached the last step AND current event_time is
+			// further than 2 seconds from the termination step time or last
+			// step time, do not do this processing." (Positive slots refuse
+			// the event on their own: anchors need reached < slot; claimed
+			// any-order chunk members are first-match-sealed — so
+			// exclusions-only here matches ARB.)
+			if (!hasExclusions || !graceperiod || t > tailAnchorMs + OUT_OF_ORDER_MS) break;
+			for (let g = 0; g < numSteps - 1; g++) {
+				if (tryExclusionAtGap(g, ev, t)) break;
+			}
 			continue;
 		}
 
-		reached = matchedStep;
-
-		// Cascade through pre-recorded later steps.
-		const step0Time = stepTimes[0];
-		let lastReachedTime = t;
-		let ns = reached + 1;
-		while (ns < steps.length) {
-			const recorded = stepTimes[ns];
-			if (recorded > 0
-				&& timestampComesAfter(recorded, lastReachedTime, graceperiod)
-				&& withinConversionWindow(recorded, step0Time, conversionWindowMs)
-			) {
-				reached = ns;
-				lastReachedTime = recorded;
-				ns++;
-			} else {
+		// v1.6.0 (P1.6.5): trend-interval anchor — an event outside
+		// [fromMs, toMs) can never record step 0. ARB drops ALL positive
+		// records for out-of-range events while the funnel is unstarted
+		// (history.cpp:436-440 `is_outside_first_event_range && reached < 0`);
+		// exclusion gaps still see the event (funnel_query.cpp:1360-1362 runs
+		// whenever the positive step didn't consume it). Once reached >= 0,
+		// no record can move position 0 (anchors need reached < slot; the
+		// position-0 chunk member is first-match-sealed), so no gate is
+		// needed there.
+		const positiveBlocked = reached === -1 && anchorOk && !anchorOk(t);
+
+		// Interleaved per-index scan (funnel_query.cpp:1307-1385): positive
+		// slot g is checked before exclusion gap g, which is checked before
+		// slot g+1; the first use consumes the event. Anchors record the
+		// latest match while unclaimed (reached < slot — positions and slots
+		// coincide for anchors); any-order slots go through
+		// can_record_any_order_step. A slot BELOW the current position can
+		// still record when it's an unfilled active-chunk member, so the scan
+		// starts at 0 (for anchor-only funnels this degenerates to the old
+		// reached+1 start).
+		for (let s = 0; s < numSteps; s++) {
+			if (!positiveBlocked && eventMatchesStep(ev, steps[s])) {
+				const recordable = isAnyOrder[s]
+					? canRecordAnyOrderSlot(s, t)
+					: reached < s;
+				if (recordable && recordSlot(s, ev, t, i)) break;
+			}
+			if (hasExclusions && s < numSteps - 1 && tryExclusionAtGap(s, ev, t)) {
+				if (terminatedByExclusion) endIdx = i + 1; // no restart FROM the exclusion event
 				break;
 			}
 		}
+	}
 
-		if (reached === steps.length - 1) { i++; break; }
+	// Result surfaces the PATH (positions), not the slot table: position p was
+	// filled by slot stepLocIdx[p] (history_get_time_at_step reads through the
+	// same indirection). Anchor-only funnels: identity mapping.
+	const reachedStepEvents = [];
+	const reachedStepTimes = [];
+	for (let p = 0; p <= reached; p++) {
+		reachedStepEvents.push(eventAtPos(p));
+		reachedStepTimes.push(timeAtPos(p));
 	}
+	const completed = reached === numSteps - 1;
 
-	const reachedStepEvents = stepEvents.slice(0, reached + 1);
-	const reachedStepTimes = stepTimes.slice(0, reached + 1);
-	const completed = reached === steps.length - 1;
-	const ttcMs = completed && reachedStepTimes.length > 1
-		? reachedStepTimes[reachedStepTimes.length - 1] - reachedStepTimes[0]
-		: null;
+	// Per-gap TTC deltas (funnel_query.cpp:3355-3380): for every attempt —
+	// converted or not — positions 1..reached each record
+	// `delta = t_p <= t_{p-1} ? 0 : (t_p - t_{p-1}) / 1000` (int arithmetic →
+	// floor seconds, clamped to 0 per gap, :3374) and the running sum
+	// `time_from_start += delta` (:3375). The cumulative track sums CLAMPED
+	// deltas, so it can exceed t_p - t_0 when any-order grace claims produce
+	// non-monotonic position times.
+	const gapSeconds = [];
+	const gapSecondsFromStart = [];
+	let ttcFromStart = 0;
+	for (let p = 1; p <= reached; p++) {
+		const prev = reachedStepTimes[p - 1], cur = reachedStepTimes[p];
+		const delta = cur <= prev ? 0 : Math.floor((cur - prev) / 1000);
+		ttcFromStart += delta;
+		gapSeconds.push(delta);
+		gapSecondsFromStart.push(ttcFromStart);
+	}
+
+	// `$ttc` (history.cpp:914-922): defined ONLY on full conversion. End time
+	// is history_get_last_time (:843-847) — MAX over the slot array, not the
+	// last position: with grace-claimed chunks the last position can hold an
+	// EARLIER time than a mid-chunk slot. On completion every slot is filled,
+	// so the max ranges over real times and ttcMs is always >= 0 (the :918
+	// clamp is defensive). ttcMs surfaces the same quantity at ms resolution.
+	let ttcMs = null, ttcSeconds = null;
+	if (completed && numSteps > 0) {
+		let lastTimeMs = 0;
+		for (let s = 0; s < numSteps; s++) if (slotTimes[s] > lastTimeMs) lastTimeMs = slotTimes[s];
+		const t0 = timeAtPos(0);
+		ttcMs = t0 > lastTimeMs ? 0 : lastTimeMs - t0;
+		ttcSeconds = Math.floor(ttcMs / 1000);
+	}
 	const result = {
 		completed,
 		reached,
 		stepEvents: reachedStepEvents,
 		stepTimes: reachedStepTimes,
 		ttcMs,
+		ttcSeconds,
+		gapSeconds,
+		gapSecondsFromStart,
 		completions: completed ? 1 : 0,
-		stepProperties: stepProps ? stepProps.slice(0, reached + 1).map(p => p || {}) : undefined,
+		stepProperties: slotProps
+			? reachedStepTimes.map((_, p) => (stepLocIdx[p] === -1 ? {} : slotProps[stepLocIdx[p]]) || {})
+			: undefined,
 		sessionId: undefined,
+		terminatedByExclusion,
+		excludedAtStep: terminatedByExclusion ? reached + 1 : null,
 	};
-	return { result, nextIdx: i, terminatedByExclusion };
+	return { result, nextIdx: endIdx >= 0 ? endIdx : i, terminatedByExclusion, expiredByWindow };
 }
 
 /**
@@ -323,26 +772,116 @@ function runOneAttempt(sorted, startIdx, steps, exclusionSteps, options) {
  * @returns {FunnelResult | FunnelResult[]}
  */
 export function evaluateFunnel(events, steps, options = {}) {
+	if (options.countMode === 'sessions') {
+		// Mixpanel's funnel "count by Sessions" is an API rewrite, not an
+		// engine mode: count_type session REQUIRES window (session, 1) and
+		// rewrites to general_wo_repeat (__validate_sessions,
+		// api/version_2_0/arb_funnels/validate.py "Cannot use count_type
+		// session without length = 1 session"; get_default_conversion_window,
+		// arb_funnels/util.py; no COUNT_TYPE_SESSIONS branch exists in
+		// funnel_query.cpp — grep-confirmed). general_wo_repeat = totals
+		// counting where window expiry is the only restart (fix-round B2 —
+		// the old "no restart after a completed pass" reading missed the
+		// re-birth at expiry, capping every user at one conversion).
+		if (options.reentry) {
+			throw new Error("evaluateFunnel: countMode 'sessions' disables re-entry (general_wo_repeat rewrite)");
+		}
+		const cw = options.conversionWindow;
+		if (typeof options.conversionWindowMs === 'number' || (cw != null && !(cw.unit === 'sessions' && cw.n === 1))) {
+			throw new Error("evaluateFunnel: cannot use countMode 'sessions' without conversion window = 1 session");
+		}
+		return evaluateFunnel(events, steps, {
+			...options,
+			countMode: 'totals',
+			reentry: false,
+			woRepeat: true,
+			conversionWindowMs: undefined,
+			conversionWindow: { unit: 'sessions', n: 1 },
+		});
+	}
 	if (!Array.isArray(steps) || steps.length === 0) {
 		const empty = emptyResult(options.trackStepProperties);
 		return options.countMode === 'totals' ? [] : empty;
 	}
-	const normSteps = steps.map(normalizeStep);
+	// v1.6.0 (P1.6.6): flatten { anyOrder: [...] } blocks and build the anchor
+	// topology (history.cpp:214-228). Anchor-only funnels get an all-false
+	// isAnyOrder mask and behave exactly as before.
+	const { flat: normSteps, isAnyOrder, prevAnchor, nextAnchor } = normalizeFunnelSteps(steps);
 	const {
 		conversionWindowMs,
+		conversionWindow,
 		graceperiod = true,
 		reentry = false,
+		woRepeat = false,
 		exclusionSteps,
 		trackStepProperties = false,
 		countMode = 'uniques',
 		sessionScoped = false,
+		anchorRange,
 	} = options;
 
+	if (woRepeat) {
+		// GENERAL_WO_REPEAT is a totals count type; reentry is GENERAL's own
+		// restart machinery and sessionScoped predates both.
+		if (countMode !== 'totals') {
+			throw new Error("evaluateFunnel: woRepeat requires countMode 'totals' (general_wo_repeat is a totals count type)");
+		}
+		if (reentry) {
+			throw new Error('evaluateFunnel: woRepeat and reentry are mutually exclusive — woRepeat restarts ONLY at window expiry');
+		}
+		if (sessionScoped) {
+			throw new Error('evaluateFunnel: woRepeat cannot combine with sessionScoped');
+		}
+	}
+
 	const sorted = (events || [])
 		.filter(e => e && typeof e.event === 'string')
 		.slice()
 		.sort((a, b) => toMs(a.time) - toMs(b.time));
 
+	// Window predicate: (t, step0Time, event, step0Event) → boolean.
+	let windowCheck;
+	if (conversionWindow != null) {
+		if (typeof conversionWindowMs === 'number') {
+			throw new Error('evaluateFunnel: conversionWindow and conversionWindowMs are mutually exclusive');
+		}
+		if (typeof conversionWindow !== 'object' || conversionWindow.unit !== 'sessions') {
+			throw new Error(`evaluateFunnel: unsupported conversionWindow unit "${conversionWindow && conversionWindow.unit}" — only { unit: 'sessions', n } (use conversionWindowMs for time windows)`);
+		}
+		const n = conversionWindow.n;
+		if (!Number.isInteger(n) || n < 1) {
+			throw new Error('evaluateFunnel: conversionWindow.n must be a positive integer');
+		}
+		if (n > 12) {
+			// _MAX_LENGTHS["session"] = 12, api/version_2_0/arb_funnels/validate.py
+			throw new Error(`evaluateFunnel: conversionWindow.n = ${n} exceeds Mixpanel's 12-session API cap`);
+		}
+		// Session ordinals over this user's stream (count of session ENDS
+		// before each event — funnel_query.cpp's per-user session_id counter).
+		// Step check per conversion_window.cpp:50 WINDOW_TYPE_SESSIONS is
+		// ordinal-ONLY: `session_id1 < session_id2 + length_sessions`. No
+		// wall-clock term — is_within_conversion_window's t1_ms/t2_ms args are
+		// unused in the SESSIONS branch, and every per-step call site
+		// (history.cpp:502,543,568,788,1004) goes through that switch.
+		// The n×1-day wall-clock bound (conversion_window_max_length_seconds =
+		// n × seconds_per_unit[QUERY_UNIT_SESSION] = n × SECONDS_PER_DAY,
+		// libquery/time/unit.c:14) exists in ARB but binds elsewhere: history
+		// termination against the INTERVAL END (funnel_query.cpp:1620,
+		// is_within_max_conversion_window_seconds vs multi_intervals_end) and
+		// the data-pull range (:402, :1408-1412) — the timeBucket wrapper's
+		// [start, stop + n×day) spill slice mirrors exactly that. Spec P1.6.1's
+		// dual per-step condition was a misreading; dropped per fix-round C6.
+		const ordinals = sessionOrdinals(sorted);
+		windowCheck = (t, t0, ev, step0Ev) => {
+			const o = ordinals.get(ev);
+			const o0 = ordinals.get(step0Ev);
+			if (o === undefined || o0 === undefined) return false;
+			return o < o0 + n;
+		};
+	} else {
+		windowCheck = (t, t0) => withinConversionWindow(t, t0, conversionWindowMs);
+	}
+
 	if (sessionScoped) {
 		const bySession = new Map();
 		for (const ev of sorted) {
@@ -366,7 +905,37 @@ export function evaluateFunnel(events, steps, options = {}) {
 		return allResults[0];
 	}
 
-	const opts = { conversionWindowMs, graceperiod, trackStepProperties };
+	// v1.6.0 (P1.6.5): trend-interval anchor bound — step 0 only in
+	// [fromMs, toMs) (funnel_query.cpp:1398-1401). Later steps / exclusions
+	// are unaffected: the window check from step 0 already bounds them.
+	const anchorOk = anchorRange
+		? (t) => (anchorRange.fromMs == null || t >= anchorRange.fromMs)
+			&& (anchorRange.toMs == null || t < anchorRange.toMs)
+		: null;
+
+	const opts = { windowCheck, graceperiod, trackStepProperties, anchorOk, isAnyOrder, prevAnchor, nextAnchor };
+
+	if (woRepeat) {
+		// GENERAL_WO_REPEAT (fix-round B2): one attempt per window span.
+		// Each attempt runs until an event past the conversion window from
+		// its step 0 arrives; that finalizes it (complete or drop-off — ARB
+		// aggregates both, funnel_query_handle_funnel_expiry) and the NEXT
+		// attempt starts AT the expiring event (funnel_query.cpp:1663-1680).
+		// Stream exhaustion finalizes the outstanding attempt with no restart
+		// (funnel_query_record_outstanding_funnels).
+		const attempts = [];
+		let idx = 0;
+		while (idx < sorted.length) {
+			const { result, nextIdx, expiredByWindow } = runOneAttempt(
+				sorted, idx, normSteps, exclusionSteps, { ...opts, expireOnWindow: true, woRepeat: true });
+			if (result.reached >= 0) attempts.push(result);
+			if (!expiredByWindow) break;
+			// Progress guaranteed: the expiring event sits strictly after the
+			// attempt's birth event, so nextIdx >= idx + 1.
+			idx = nextIdx;
+		}
+		return attempts;
+	}
 
 	if (!reentry) {
 		const { result } = runOneAttempt(sorted, 0, normSteps, exclusionSteps, opts);
@@ -376,13 +945,16 @@ export function evaluateFunnel(events, steps, options = {}) {
 		return countMode === 'totals' ? [result] : result;
 	}
 
-	// Reentry: keep running attempts after each completion or exclusion.
+	// Reentry (GENERAL): keep running attempts after each completion or
+	// exclusion — and after window expiry of a live attempt (fix-round C5),
+	// which finalizes it as a drop-off and restarts AT the expiring event.
 	const allAttempts = [];
 	const completedAttempts = [];
 	let idx = 0;
 	let lastResult = emptyResult(trackStepProperties);
+	const reentryOpts = { ...opts, expireOnWindow: true };
 	while (idx < sorted.length) {
-		const { result, nextIdx, terminatedByExclusion } = runOneAttempt(sorted, idx, normSteps, exclusionSteps, opts);
+		const { result, nextIdx, terminatedByExclusion } = runOneAttempt(sorted, idx, normSteps, exclusionSteps, reentryOpts);
 		// Always advance — runOneAttempt returns nextIdx > idx when it processed an event.
 		const advanced = nextIdx > idx ? nextIdx : idx + 1;
 		idx = advanced;
@@ -437,8 +1009,14 @@ export function evaluateFunnel(events, steps, options = {}) {
 export function evaluateFunnelHPC(events, steps, holdProperty, options = {}) {
 	if (!holdProperty) throw new Error('evaluateFunnelHPC: holdProperty is required');
 	if (!Array.isArray(steps) || !steps.length) return new Map();
-	const normSteps = steps.map(normalizeStep);
-	const step0Name = normSteps[0].event;
+	const { flat, isAnyOrder } = normalizeFunnelSteps(steps);
+	if (isAnyOrder[0]) {
+		// HPC keys off the step-0 event's property value; with an any-order
+		// first chunk any member can claim position 0, so there is no single
+		// seeding event name to bucket by.
+		throw new Error('evaluateFunnelHPC: an anyOrder block cannot be the first funnel step');
+	}
+	const step0Name = flat[0].event;
 
 	// Bucket events by HPC value. The step-0 events define the universe of
 	// HPC values for this user; later events only populate buckets whose
@@ -491,9 +1069,15 @@ export function resolveFunnelSegment(result, mode) {
 /**
  * Set-membership funnel completion check for non-sequential funnel modes.
  *
+ * @deprecated v1.6.0 (P1.6.6) — NOT Mixpanel semantics. Mixpanel's any-order
+ * is an anchor/chunk greedy pass, not a set-membership check: use
+ * `evaluateFunnel(events, [{ anyOrder: [...] }], options)` for
+ * Mixpanel-comparable results (conversion window, 2s rule, exclusions, and
+ * reentry all apply). This helper ignores all of those. Kept for callers that
+ * want a cheap "did the user ever fire all of these" signal.
+ *
  * Returns true when the user fired all `steps` event names at least once,
- * regardless of order. Used for funnels generated with order modes other than
- * `sequential` / `interrupt` where Mixpanel's greedy single-pass doesn't apply.
+ * regardless of order.
  *
  * `completionTimeMs` = `lastSeenTime - firstSeenTime` (proxy for "how long to
  * hit all steps in any order"). Mixpanel's funnel TTC analog doesn't exist for