@ak--47/dungeon-master 1.3.0 → 1.3.1

package/lib/orchestrators/user-loop.js

@@ -108,7 +108,7 @@ export async function userLoop(context) {
 			}
 
 			const userId = chance.guid();
-			const user = u.generateUser(userId, { numDays, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds });
+			const user = u.generateUser(userId, { numDays, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds, datasetEndUnix: context.FIXED_NOW });
 			const { distinct_id, created } = user;
 			const userIsBornInDataset = chance.bool({ likelihood: percentUsersBornInDataset });
 
@@ -128,14 +128,13 @@ export async function userLoop(context) {
 
 			if (!userIsBornInDataset) delete user.created;
 
-			// Calculate time adjustments
-			const daysShift = context.getDaysShift();
-
-			// Apply recency bias to birth dates for users born in dataset
+			// Apply recency bias to birth dates for users born in dataset.
+			// `created` (from generateUser → person) is anchored to the dataset end,
+			// so it already lives inside [FIXED_BEGIN, FIXED_NOW]. No shift needed.
 			// bornRecentBias: 0 = uniform distribution, 1 = heavily biased toward recent
 			let adjustedCreated;
 			if (userIsBornInDataset) {
-				let biasedCreated = dayjs(created).subtract(daysShift, 'd');
+				let biasedCreated = dayjs(created);
 
 				if (bornRecentBias !== 0) {
 					// Calculate how far into the dataset this user was born (0 = start, 1 = end/recent)
@@ -282,7 +281,9 @@ export async function userLoop(context) {
 					user,
 					config,
 					userIsBornInDataset,
-					persona
+					persona,
+					datasetStart: context.DATASET_START_SECONDS,
+					datasetEnd: context.DATASET_END_SECONDS
 				});
 			}
 
@@ -304,7 +305,9 @@ export async function userLoop(context) {
 						type: 'user',
 						scd: { [key]: scdProps[key] },
 						config,
-						allSCDs: userSCD
+						allSCDs: userSCD,
+						datasetStart: context.DATASET_START_SECONDS,
+						datasetEnd: context.DATASET_END_SECONDS
 					});
 					if (Array.isArray(hookResult)) {
 						changes = hookResult;
@@ -373,8 +376,7 @@ export async function userLoop(context) {
 				const [data, converted] = await makeFunnel(context, firstFunnel, user, firstTime, profile, userSCD, persona, featureCtx);
 				userConverted = converted;
 
-				const timeShift = context.getTimeShift();
-				userFirstEventTime = dayjs(data[0].time).subtract(timeShift, 'seconds').unix();
+				userFirstEventTime = dayjs(data[0].time).unix();
 				numEventsPreformed += data.length;
 				usersEvents = usersEvents.concat(data);
 			} else {
@@ -423,10 +425,8 @@ export async function userLoop(context) {
 			// Subscription events (trial, upgrade, cancel) must not be randomly dropped by decay
 			const userDecay = persona?.engagementDecay || globalEngagementDecay;
 			if (userDecay && userDecay.model !== 'none' && usersEvents.length > 0) {
-				// adjustedCreated is in FIXED time space, but ev.time is in PRESENT time (shifted).
-				// Shift adjustedCreated to present so daysSinceBirth reflects within-dataset age.
-				const adjustedCreatedPresent = adjustedCreated.add(context.TIME_SHIFT_SECONDS, 'seconds');
-				usersEvents = applyEngagementDecay(usersEvents, userDecay, adjustedCreatedPresent, context, chance);
+				// adjustedCreated and event times now share the same dataset window — no shift.
+				usersEvents = applyEngagementDecay(usersEvents, userDecay, adjustedCreated, context, chance);
 			}
 
 			// Feature 5: Subscription lifecycle — inject after decay (exempt from decay filtering)
@@ -485,9 +485,7 @@ export async function userLoop(context) {
 					earliestTime: userFirstEventTime,
 					latestTime: context.FIXED_NOW,
 					peaks: soupPeaks, deviation: soupDev, mean: soupMean,
-					dayOfWeekWeights: soupDOW, hourOfDayWeights: soupHOD,
-					timeShiftSeconds: context.TIME_SHIFT_SECONDS,
-					maxTime: context.MAX_TIME
+					dayOfWeekWeights: soupDOW, hourOfDayWeights: soupHOD
 				});
 				u.assignSessionIds(usersEvents, sessionTimeout);
 			}
@@ -499,19 +497,20 @@ export async function userLoop(context) {
 					scd: userSCD,
 					config,
 					userIsBornInDataset,
-					persona
+					persona,
+					datasetStart: context.DATASET_START_SECONDS,
+					datasetEnd: context.DATASET_END_SECONDS
 				});
 				if (Array.isArray(newEvents)) usersEvents = newEvents;
 			}
 
-			// Defensive guard: drop any events whose timestamp landed past real "now".
-			// Mixpanel rejects future-dated events, and hooks that duplicate events with
-			// time offsets (weekend surges, viral spreads) can otherwise leak a few past
-			// the boundary even after the per-event _drop check in events.js.
+			// Defensive guard: drop any events whose timestamp landed past the
+			// configured dataset end. Hooks that duplicate events with time offsets
+			// (weekend surges, viral spreads) can leak a few past the boundary.
 			usersEvents = usersEvents.filter(e => {
 				if (!e || !e.time) return true;
 				const t = typeof e.time === 'string' ? Date.parse(e.time) / 1000 : Number(e.time);
-				return Number.isFinite(t) ? t <= context.MAX_TIME : true;
+				return Number.isFinite(t) ? t <= context.FIXED_NOW : true;
 			});
 
 			// Store all user data
@@ -628,8 +627,7 @@ function generateSubscriptionEvents(subscription, user, persona, userCreated, co
 	const paidPlans = plans.filter(p => p.price > 0);
 
 	const userStartUnix = dayjs(userCreated).unix();
-	const endUnix = context.MAX_TIME;
-	const timeShift = context.TIME_SHIFT_SECONDS;
+	const endUnix = context.FIXED_NOW;
 
 	// Persona modifiers for subscription behavior
 	const personaChurnMod = persona?.churnRate ? (1 + persona.churnRate) : 1.0;
@@ -642,14 +640,14 @@ function generateSubscriptionEvents(subscription, user, persona, userCreated, co
 	const firstPaidPlan = paidPlans[0];
 	if (firstPaidPlan && firstPaidPlan.trialDays) {
 		const trialStart = currentUnix + chance.integer({ min: 0, max: 86400 });
-		if (trialStart + timeShift < endUnix) {
-			subEvents.push(makeSubEvent(eventNames.trialStarted, trialStart + timeShift, user, firstPaidPlan.name, 'trial'));
+		if (trialStart < endUnix) {
+			subEvents.push(makeSubEvent(eventNames.trialStarted, trialStart, user, firstPaidPlan.name, 'trial'));
 			currentUnix = trialStart + (firstPaidPlan.trialDays * 86400);
 
 			// Trial to paid conversion
 			if (chance.bool({ likelihood: lc.trialToPayRate * personaUpgradeMod * 100 })) {
-				if (currentUnix + timeShift < endUnix) {
-					subEvents.push(makeSubEvent(eventNames.subscribed, currentUnix + timeShift, user, firstPaidPlan.name, 'active'));
+				if (currentUnix < endUnix) {
+					subEvents.push(makeSubEvent(eventNames.subscribed, currentUnix, user, firstPaidPlan.name, 'active'));
 					currentPlan = firstPaidPlan;
 					currentStatus = 'active';
 				}
@@ -661,15 +659,15 @@ function generateSubscriptionEvents(subscription, user, persona, userCreated, co
 	}
 
 	// Monthly lifecycle loop
-	while (currentUnix + timeShift < endUnix) {
+	while (currentUnix < endUnix) {
 		currentUnix += monthSeconds + chance.integer({ min: -86400, max: 86400 });
-		if (currentUnix + timeShift >= endUnix) break;
+		if (currentUnix >= endUnix) break;
 		if (currentStatus === 'cancelled') {
 			// Win-back check
 			if (chance.bool({ likelihood: lc.winBackRate * 100 })) {
 				currentUnix += lc.winBackDelay * 86400;
-				if (currentUnix + timeShift >= endUnix) break;
-				subEvents.push(makeSubEvent(eventNames.wonBack, currentUnix + timeShift, user, currentPlan.name, 'active'));
+				if (currentUnix >= endUnix) break;
+				subEvents.push(makeSubEvent(eventNames.wonBack, currentUnix, user, currentPlan.name, 'active'));
 				currentStatus = 'active';
 			}
 			break;
@@ -677,12 +675,12 @@ function generateSubscriptionEvents(subscription, user, persona, userCreated, co
 
 		// Payment failure
 		if (currentPlan.price > 0 && chance.bool({ likelihood: lc.paymentFailureRate * 100 })) {
-			subEvents.push(makeSubEvent(eventNames.paymentFailed, currentUnix + timeShift, user, currentPlan.name, 'payment_issue'));
+			subEvents.push(makeSubEvent(eventNames.paymentFailed, currentUnix, user, currentPlan.name, 'payment_issue'));
 		}
 
 		// Churn
 		if (chance.bool({ likelihood: lc.churnRate * personaChurnMod * 100 })) {
-			subEvents.push(makeSubEvent(eventNames.cancelled, currentUnix + timeShift, user, currentPlan.name, 'cancelled'));
+			subEvents.push(makeSubEvent(eventNames.cancelled, currentUnix, user, currentPlan.name, 'cancelled'));
 			currentStatus = 'cancelled';
 			continue;
 		}
@@ -691,7 +689,7 @@ function generateSubscriptionEvents(subscription, user, persona, userCreated, co
 		const currentPlanIndex = plans.indexOf(currentPlan);
 		if (currentPlanIndex < plans.length - 1 && chance.bool({ likelihood: lc.upgradeRate * personaUpgradeMod * 100 })) {
 			const newPlan = plans[currentPlanIndex + 1];
-			subEvents.push(makeSubEvent(eventNames.upgraded, currentUnix + timeShift, user, newPlan.name, 'active', currentPlan.name));
+			subEvents.push(makeSubEvent(eventNames.upgraded, currentUnix, user, newPlan.name, 'active', currentPlan.name));
 			currentPlan = newPlan;
 			continue;
 		}
@@ -699,14 +697,14 @@ function generateSubscriptionEvents(subscription, user, persona, userCreated, co
 		// Downgrade
 		if (currentPlanIndex > 0 && currentPlan.price > 0 && chance.bool({ likelihood: lc.downgradeRate * 100 })) {
 			const newPlan = plans[currentPlanIndex - 1];
-			subEvents.push(makeSubEvent(eventNames.downgraded, currentUnix + timeShift, user, newPlan.name, 'active', currentPlan.name));
+			subEvents.push(makeSubEvent(eventNames.downgraded, currentUnix, user, newPlan.name, 'active', currentPlan.name));
 			currentPlan = newPlan;
 			continue;
 		}
 
 		// Renewal
 		if (currentPlan.price > 0) {
-			subEvents.push(makeSubEvent(eventNames.renewed, currentUnix + timeShift, user, currentPlan.name, 'active'));
+			subEvents.push(makeSubEvent(eventNames.renewed, currentUnix, user, currentPlan.name, 'active'));
 		}
 	}
 
@@ -714,9 +712,12 @@ function generateSubscriptionEvents(subscription, user, persona, userCreated, co
 }
 
 function makeSubEvent(eventName, unixTime, user, planName, status, previousPlan) {
+	// Callers already guard `unixTime < endUnix` before invoking, so no clamp here.
+	// Previous code clamped against `dayjs()` (wall-clock now) — leaked wall-clock into
+	// timestamps and wasn't even the right upper bound.
 	const ev = {
 		event: eventName,
-		time: dayjs.unix(Math.min(unixTime, dayjs().unix())).toISOString(),
+		time: dayjs.unix(unixTime).toISOString(),
 		user_id: user.distinct_id,
 		insert_id: u.quickHash(`${eventName}-${unixTime}-${user.distinct_id}`),
 		subscription_plan: planName,
@@ -742,14 +743,14 @@ async function generateBotUsers(context, dataQuality, storage) {
 		const botId = `bot_${chance.guid().slice(0, 8)}`;
 		const botEvents = [];
 
-		// Bots generate events at machine-like intervals
-		let currentTime = context.FIXED_BEGIN + context.TIME_SHIFT_SECONDS;
-		const interval = Math.floor(((context.MAX_TIME - currentTime) / botEventsPerUser));
+		// Bots generate events at machine-like intervals across the dataset window
+		let currentTime = context.FIXED_BEGIN;
+		const interval = Math.floor(((context.FIXED_NOW - currentTime) / botEventsPerUser));
 
 		for (let e = 0; e < botEventsPerUser; e++) {
 			const chosenEvent = botEventTypes[e % botEventTypes.length];
 			currentTime += interval + chance.integer({ min: 0, max: 10 });
-			if (currentTime > context.MAX_TIME) break;
+			if (currentTime > context.FIXED_NOW) break;
 			botEvents.push({
 				event: chosenEvent.event,
 				time: dayjs.unix(currentTime).toISOString(),
@@ -777,20 +778,19 @@ async function generateBotUsers(context, dataQuality, storage) {
  */
 async function generateAnomalyBursts(context, anomalies, storage) {
 	const chance = u.getChance();
-	const timeShift = context.TIME_SHIFT_SECONDS;
 
 	for (const a of anomalies) {
 		if (a.type !== 'burst' && a.type !== 'coordinated') continue;
 		if (!a._startUnix || !a.count) continue;
 
 		const burstEvents = [];
-		const startUnix = a._startUnix + timeShift;
-		const endUnix = a._endUnix + timeShift;
+		const startUnix = a._startUnix;
+		const endUnix = a._endUnix;
 		const windowSeconds = endUnix - startUnix;
 
 		for (let i = 0; i < a.count; i++) {
 			const eventTime = startUnix + chance.integer({ min: 0, max: Math.max(1, windowSeconds) });
-			if (eventTime > context.MAX_TIME) continue;
+			if (eventTime > context.FIXED_NOW) continue;
 			const userId = a.type === 'coordinated'
 				? `anomaly_${chance.guid().slice(0, 8)}`
 				: `burst_${chance.integer({ min: 1, max: 100 })}`;

package/lib/utils/utils.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import Chance from 'chance';
 import readline from 'readline';
-import { comma, uid } from 'ak-tools';
+import { comma } from 'ak-tools';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc.js';
 import path from 'path';
@@ -24,7 +24,27 @@ const { NODE_ENV = "unknown" } = process.env;
 let globalChance;
 let chanceInitialized = false;
 
-const ACTUAL_NOW = dayjs.utc();
+// Module-scoped memoization cache for weighted-array resolvers in `choose()`.
+// Lives for the lifetime of the node process; key is the function source string.
+const weightedArrayCache = new Map();
+
+// Reference "now" used by date() and day() factories. Defaults to wall-clock at
+// import time; the orchestrator overrides this via setDatasetNow() once the dataset
+// window is resolved, so date helpers in dungeon configs produce deterministic
+// values relative to the dataset end (not the process start).
+let DATASET_NOW = dayjs.utc();
+
+/**
+ * Override the reference "now" used by date()/day() factories. Called by the
+ * orchestrator with the resolved dataset end so every date helper produces
+ * deterministic values relative to the dataset window.
+ * @param {number} unixSeconds
+ */
+function setDatasetNow(unixSeconds) {
+	if (typeof unixSeconds === 'number' && Number.isFinite(unixSeconds)) {
+		DATASET_NOW = dayjs.unix(unixSeconds).utc();
+	}
+}
 
 
 import { Storage as cloudStorage } from '@google-cloud/storage';
@@ -102,7 +122,7 @@ function pick(items) {
  */
 function date(inTheLast = 30, isPast = true, format = 'YYYY-MM-DD') {
 	const chance = getChance();
-	const now = ACTUAL_NOW;
+	const now = DATASET_NOW;
 	if (Math.abs(inTheLast) > 365 * 10) inTheLast = chance.integer({ min: 1, max: 180 });
 	return function () {
 		const when = chance.integer({ min: 0, max: Math.abs(inTheLast) });
@@ -159,8 +179,8 @@ function datesBetween(start, end) {
  */
 function day(start, end) {
 	// if (!end) end = global.FIXED_NOW ? global.FIXED_NOW : dayjs().unix();
-	if (!start) start = ACTUAL_NOW.subtract(30, 'd').toISOString();
-	if (!end) end = ACTUAL_NOW.toISOString();
+	if (!start) start = DATASET_NOW.subtract(30, 'd').toISOString();
+	if (!end) end = DATASET_NOW.toISOString();
 	const chance = getChance();
 	const format = 'YYYY-MM-DD';
 	return function (min, max) {
@@ -219,20 +239,15 @@ function choose(value) {
 		while (typeof value === 'function') {
 			const funcString = value.toString();
 
-			// Check cache for weighted array functions
-			if (typeof global.weightedArrayCache === 'undefined') {
-				global.weightedArrayCache = new Map();
-			}
-
-			if (global.weightedArrayCache.has(funcString)) {
-				value = global.weightedArrayCache.get(funcString);
+			if (weightedArrayCache.has(funcString)) {
+				value = weightedArrayCache.get(funcString);
 				break;
 			}
 
 			const result = value();
 			if (Array.isArray(result) && result.length > 10) {
 				// Cache large arrays (likely weighted arrays)
-				global.weightedArrayCache.set(funcString, result);
+				weightedArrayCache.set(funcString, result);
 			}
 			value = result;
 		}
@@ -1143,7 +1158,7 @@ CORE
 //the function which generates $distinct_id + $anonymous_ids, $session_ids, and created, skewing towards the present
 function generateUser(user_id, opts, amplitude = 1, frequency = 1, skew = 1) {
 	const chance = getChance();
-	const { numDays, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds } = opts;
+	const { numDays, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds, datasetEndUnix } = opts;
 	// Uniformly distributed `u`, then skew applied
 	let u = Math.pow(chance.random(), skew);
 
@@ -1155,7 +1170,7 @@ function generateUser(user_id, opts, amplitude = 1, frequency = 1, skew = 1) {
 
 	// Clamp values to ensure they are within the desired range
 	daysAgoBorn = Math.min(daysAgoBorn, numDays);
-	const props = person(user_id, daysAgoBorn, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds);
+	const props = person(user_id, daysAgoBorn, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds, datasetEndUnix);
 
 	const user = {
 		distinct_id: user_id,
@@ -1188,7 +1203,7 @@ const DEFAULT_HOD_WEIGHTS = [
 	0.584, 0.574, 0.554, 0.576, 0.604, 0.655, 0.722, 0.816
 ];
 
-function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0, dayOfWeekWeights = DEFAULT_DOW_WEIGHTS, hourOfDayWeights = DEFAULT_HOD_WEIGHTS, timeShiftSeconds = 0) {
+function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0, dayOfWeekWeights = DEFAULT_DOW_WEIGHTS, hourOfDayWeights = DEFAULT_HOD_WEIGHTS) {
 	if (!earliestTime) earliestTime = global.FIXED_BEGIN ? global.FIXED_BEGIN : dayjs().subtract(30, 'd').unix();
 	if (!latestTime) latestTime = global.FIXED_NOW ? global.FIXED_NOW : dayjs().unix();
 	const chance = getChance();
@@ -1215,7 +1230,7 @@ function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0,
 	// Phase 2: DOW accept/reject — retry if day-of-week doesn't pass weight check
 	if (dayOfWeekWeights) {
 		for (let attempt = 0; attempt < 50; attempt++) {
-			const dow = new Date((candidate + timeShiftSeconds) * 1000).getUTCDay();
+			const dow = new Date(candidate * 1000).getUTCDay();
 			if (chance.random() < dayOfWeekWeights[dow]) break;
 			// Rejected — resample from Gaussian chunks
 			const pi = integer(0, peaks - 1);
@@ -1231,8 +1246,7 @@ function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0,
 
 	// Phase 3: Redistribute hour-of-day (changes only hour within same day)
 	if (hourOfDayWeights) {
-		const shifted = candidate + timeShiftSeconds;
-		const d = new Date(shifted * 1000);
+		const d = new Date(candidate * 1000);
 		const currentMinute = d.getUTCMinutes();
 		const currentSecond = d.getUTCSeconds();
 
@@ -1244,9 +1258,8 @@ function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0,
 			if (roll <= 0) { newHour = h; break; }
 		}
 
-		const dayStartShifted = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()) / 1000;
-		const newShifted = dayStartShifted + newHour * 3600 + currentMinute * 60 + currentSecond;
-		candidate = newShifted - timeShiftSeconds;
+		const dayStart = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()) / 1000;
+		candidate = dayStart + newHour * 3600 + currentMinute * 60 + currentSecond;
 		candidate = Math.max(earliestTime, Math.min(latestTime, candidate));
 	}
 
@@ -1264,7 +1277,7 @@ function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0,
  * @param {boolean} hasSessionIds
  * @return {Person}
  */
-function person(userId, bornDaysAgo = 30, isAnonymous = false, hasAvatar = false, hasAnonIds = false, hasSessionIds = false) {
+function person(userId, bornDaysAgo = 30, isAnonymous = false, hasAvatar = false, hasAnonIds = false, hasSessionIds = false, datasetEndUnix) {
 	const chance = getChance();
 	//names and photos
 	const l = chance.letter.bind(chance);
@@ -1278,7 +1291,11 @@ function person(userId, bornDaysAgo = 30, isAnonymous = false, hasAvatar = false
 	let randomAvatarNumber = integer(1, 99);
 	let avPath = gender === 'male' ? `/men/${randomAvatarNumber}.jpg` : `/women/${randomAvatarNumber}.jpg`;
 	let avatar = avatarPrefix + avPath;
-	let created = dayjs().subtract(bornDaysAgo, 'day').format('YYYY-MM-DD');
+	// Birth date: anchor to dataset end (post-resolution) so user.created lives inside
+	// the configured window, not wall-clock time. Falls back to dayjs() only when
+	// person() is called outside the normal generation pipeline (e.g. direct unit tests).
+	const anchor = datasetEndUnix ? dayjs.unix(datasetEndUnix) : dayjs();
+	let created = anchor.subtract(bornDaysAgo, 'day').format('YYYY-MM-DD');
 
 
 	// const created = date(bornDaysAgo, true)();
@@ -1307,7 +1324,8 @@ function person(userId, bornDaysAgo = 30, isAnonymous = false, hasAvatar = false
 	if (hasAnonIds) {
 		const clusterSize = integer(2, 10);
 		for (let i = 0; i < clusterSize; i++) {
-			const anonId = uid(42);
+			// Use seeded chance, not ak-tools uid() (which uses Math.random).
+			const anonId = chance.string({ length: 42, pool: 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' });
 			user.anonymousIds.push(anonId);
 		}
 	}
@@ -1429,11 +1447,26 @@ function deepClone(thing, opts) {
 
 
 /**
- * Generates a session ID in the standard format
+ * Generates a session ID in the standard format. Derives it deterministically
+ * from a seed string (first event time + user_id, typically) via quickHash so
+ * we don't consume from the main seeded RNG stream — that consumption would
+ * cascade into all downstream events whenever the number of sessions changed
+ * (e.g. when sessionTimeout differs).
+ * @param {string} [seedStr] - Stable input string. If absent, falls back to a
+ *   chance.string() pull (only used by tests / direct callers without a seed).
  * @returns {string} Session ID like "xxxxx-xxxxx-xxxxx-xxxxx"
  */
-function generateSessionId() {
-	return [uid(5), uid(5), uid(5), uid(5)].join("-");
+function generateSessionId(seedStr) {
+	if (seedStr) {
+		// quickHash returns ~16 hex chars; expand to 4×5 segments via re-hashing.
+		const h1 = quickHash(seedStr);
+		const h2 = quickHash(h1);
+		const all = (h1 + h2).replace(/[^a-zA-Z0-9]/g, '').padEnd(20, '0');
+		return [all.slice(0, 5), all.slice(5, 10), all.slice(10, 15), all.slice(15, 20)].join('-');
+	}
+	const c = getChance();
+	const seg = () => c.string({ length: 5, pool: 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' });
+	return [seg(), seg(), seg(), seg()].join("-");
 }
 
 /**
@@ -1459,7 +1492,7 @@ function bunchIntoSessions(events, timeoutMinutes, soupParams) {
 
 	const chance = getChance();
 	const { earliestTime, latestTime, peaks, deviation, mean,
-		dayOfWeekWeights, hourOfDayWeights, timeShiftSeconds, maxTime } = soupParams;
+		dayOfWeekWeights, hourOfDayWeights } = soupParams;
 
 	// Sort by time first
 	events.sort((a, b) => a.time < b.time ? -1 : a.time > b.time ? 1 : 0);
@@ -1472,8 +1505,8 @@ function bunchIntoSessions(events, timeoutMinutes, soupParams) {
 	const anchors = [];
 	for (let i = 0; i < numSessions; i++) {
 		const soupTime = TimeSoup(earliestTime, latestTime, peaks, deviation, mean,
-			dayOfWeekWeights, hourOfDayWeights, timeShiftSeconds);
-		anchors.push(soupTime + timeShiftSeconds); // shifted to present time
+			dayOfWeekWeights, hourOfDayWeights);
+		anchors.push(soupTime);
 	}
 	anchors.sort((a, b) => a - b);
 
@@ -1485,7 +1518,6 @@ function bunchIntoSessions(events, timeoutMinutes, soupParams) {
 	}
 
 	// Retime events within each session
-	let writeIndex = 0;
 	for (let s = 0; s < numSessions; s++) {
 		const bucket = sessionBuckets[s];
 		if (bucket.length === 0) continue;
@@ -1493,17 +1525,13 @@ function bunchIntoSessions(events, timeoutMinutes, soupParams) {
 		let currentTime = anchors[s];
 		for (let e = 0; e < bucket.length; e++) {
 			const ev = bucket[e];
-			const clampedTime = Math.min(currentTime, maxTime);
+			const clampedTime = Math.min(currentTime, latestTime);
 
 			ev.time = dayjs.unix(clampedTime).toISOString();
 			// Regenerate insert_id to match new time
 			const distinctId = ev.user_id || ev.device_id || ev.distinct_id || '';
 			ev.insert_id = quickHash(`${ev.event}-${ev.time}-${distinctId}`);
 
-			if (currentTime > maxTime) {
-				ev._drop = true;
-			}
-
 			// Advance time within session: 5-300 seconds (5s to 5min)
 			currentTime += chance.integer({ min: 5, max: 300 });
 		}
@@ -1532,7 +1560,10 @@ function assignSessionIds(events, timeoutMinutes = 30) {
 	const timeoutMs = timeoutMinutes * 60 * 1000;
 	const maxSessionMs = 24 * 60 * 60 * 1000;
 
-	let currentSessionId = generateSessionId();
+	// Derive a stable seed from the first event so session IDs are deterministic
+	// across runs without consuming the main seeded RNG stream.
+	const userKey = events[0].user_id || events[0].device_id || events[0].distinct_id || '';
+	let currentSessionId = generateSessionId(`${userKey}-${events[0].time}`);
 	let sessionStartMs = new Date(events[0].time).getTime();
 	let lastEventMs = sessionStartMs;
 
@@ -1542,7 +1573,7 @@ function assignSessionIds(events, timeoutMinutes = 30) {
 		const sessionDuration = eventMs - sessionStartMs;
 
 		if (gapFromLast > timeoutMs || sessionDuration > maxSessionMs) {
-			currentSessionId = generateSessionId();
+			currentSessionId = generateSessionId(`${userKey}-${event.time}`);
 			sessionStartMs = eventMs;
 		}
 
@@ -1606,4 +1637,5 @@ export {
 	generateSessionId,
 	assignSessionIds,
 	bunchIntoSessions,
+	setDatasetNow,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ak--47/dungeon-master",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"description": "generate fancy datasets",
 	"type": "module",
 	"main": "index.js",