@ak--47/dungeon-master 1.0.0 → 1.2.0

package/lib/generators/funnels.js

@@ -18,9 +18,10 @@ import { dataLogger as logger } from "../utils/logger.js";
  * @param {number} firstEventTime - Unix timestamp for first event
  * @param {Object} profile - User profile object
  * @param {Object} scd - Slowly changing dimensions object
+ * @param {Object} [persona] - User's assigned persona
  * @returns {Promise<[Array, boolean]>} Tuple of [events, didConvert]
  */
-export async function makeFunnel(context, funnel, user, firstEventTime, profile = {}, scd = {}) {
+export async function makeFunnel(context, funnel, user, firstEventTime, profile = {}, scd = {}, persona = null, featureCtx = {}) {
 	if (!funnel) throw new Error("no funnel");
 	if (!user) throw new Error("no user");
 
@@ -99,22 +100,65 @@ export async function makeFunnel(context, funnel, user, firstEventTime, profile
 	const funnelPossibleEvents = buildFunnelEvents(context, sequence, chosenFunnelProps, bindPropsIndex, expName, expVariant);
 
 	// Handle repeat logic and conversion rate adjustment
-	const { processedEvents, adjustedConversionRate } = processEventRepeats(
+	let { processedEvents, adjustedConversionRate } = processEventRepeats(
 		funnelPossibleEvents,
 		requireRepeats,
 		conversionRate,
 		chance
 	);
 
+	// Apply persona conversion modifier (before hook, so hook can override via funnel-pre)
+	if (persona && persona.conversionModifier) {
+		adjustedConversionRate = Math.min(100, Math.max(0, Math.round(adjustedConversionRate * persona.conversionModifier)));
+	}
+
+	// Apply world event conversion modifier if active at firstEventTime
+	const resolvedWorldEvents = /** @type {import('../../types').ResolvedWorldEvent[]} */ (config.worldEvents);
+	if (resolvedWorldEvents && firstEventTime) {
+		for (const we of resolvedWorldEvents) {
+			if (firstEventTime >= we.startUnix && firstEventTime < we.endUnix && we.conversionModifier !== 1.0) {
+				const affects = we.affectsEvents;
+				if (affects === "*" || (Array.isArray(affects) && sequence.some(s => affects.includes(s)))) {
+					adjustedConversionRate = Math.min(100, Math.max(0, Math.round(adjustedConversionRate * we.conversionModifier)));
+				}
+			}
+		}
+	}
+
+	// Apply feature conversion lifts
+	const resolvedFeatures = config.features;
+	if (resolvedFeatures && firstEventTime) {
+		const daysSinceBegin = (firstEventTime - context.FIXED_BEGIN) / 86400;
+		for (const feat of resolvedFeatures) {
+			if (feat.conversionLift && daysSinceBegin >= feat.launchDay) {
+				const daysSinceLaunch = daysSinceBegin - feat.launchDay;
+				const { k, midpoint } = feat._resolvedCurve || { k: 0.08, midpoint: 30 };
+				const adoptionProb = 1 / (1 + Math.exp(-k * (daysSinceLaunch - midpoint)));
+				if (chance.bool({ likelihood: Math.min(100, adoptionProb * 100) })) {
+					adjustedConversionRate = Math.min(100, Math.max(0, Math.round(adjustedConversionRate * feat.conversionLift)));
+				}
+			}
+		}
+	}
+
 	// Determine if user converts and how many steps they'll take
+	// When experiment mode is active, $experiment_started is prepended to sequence
+	// but should not count as a funnel step for conversion purposes
+	const conversionStepCount = expName ? sequence.length - 1 : sequence.length;
 	const { doesUserConvert, numStepsUserWillTake } = determineConversion(
 		adjustedConversionRate,
-		sequence.length,
+		conversionStepCount,
 		chance
 	);
 
 	// Get steps user will actually take
-	const funnelStepsUserWillTake = processedEvents.slice(0, numStepsUserWillTake);
+	let funnelStepsUserWillTake;
+	if (expName) {
+		// $experiment_started always fires; conversion only applies to actual funnel steps
+		funnelStepsUserWillTake = [processedEvents[0], ...processedEvents.slice(1, 1 + numStepsUserWillTake)];
+	} else {
+		funnelStepsUserWillTake = processedEvents.slice(0, numStepsUserWillTake);
+	}
 
 	// Apply ordering strategy
 	const funnelActualOrder = applyOrderingStrategy(
@@ -137,6 +181,18 @@ export async function makeFunnel(context, funnel, user, firstEventTime, profile
 		funnelEventsWithTiming.push(sessionStartEvent);
 	}
 
+	// Build complete feature context: merge passed-in featureCtx with config fallbacks
+	const funnelFeatureCtx = {
+		persona: featureCtx.persona || persona || null,
+		userCampaign: featureCtx.userCampaign || null,
+		userLocation: featureCtx.userLocation || null,
+		worldEventsTimeline: featureCtx.worldEventsTimeline || context.config.worldEvents || null,
+		resolvedFeatures: featureCtx.resolvedFeatures || context.config.features || null,
+		resolvedAnomalies: featureCtx.resolvedAnomalies || context.config.anomalies || null,
+		dataQuality: featureCtx.dataQuality || context.config.dataQuality || null,
+		geo: featureCtx.geo || context.config.geo || null,
+	};
+
 	// Generate actual events with timing
 	const finalEvents = await generateFunnelEvents(
 		context,
@@ -145,7 +201,8 @@ export async function makeFunnel(context, funnel, user, firstEventTime, profile
 		firstEventTime || dayjs(created).unix(),
 		anonymousIds,
 		sessionIds,
-		groupKeys
+		groupKeys,
+		funnelFeatureCtx
 	);
 
 	// Call post-funnel hook
@@ -353,7 +410,8 @@ async function generateFunnelEvents(
 	earliestTime,
 	anonymousIds,
 	sessionIds,
-	groupKeys
+	groupKeys,
+	featureCtx = {}
 ) {
 	let funnelStartTime;
 
@@ -367,7 +425,9 @@ async function generateFunnelEvents(
 			sessionIds,
 			{},
 			groupKeys,
-			false  // Let all funnel events use TimeSoup for proper time distribution
+			false,  // Let all funnel events use TimeSoup for proper time distribution
+			false,
+			featureCtx
 		);
 
 		if (index === 0) {

package/lib/generators/text.js

@@ -542,9 +542,9 @@ class OrganicTextGenerator {
             ...config
         };
         
-        // Initialize seed if provided
+        // Initialize seed if provided (use local RNG, not global, to avoid poisoning Math.random)
         if (this.config.seed) {
-            seedrandom(this.config.seed, { global: true });
+            this._rng = seedrandom(this.config.seed);
         }
         
         // Initialize subsystems