@ak--47/dungeon-master 1.5.0 → 1.5.2

package/lib/templates/defaults.js

@@ -128,7 +128,7 @@ const iosDevices = [
 		screen_height: '2868',
 		screen_width: '1320',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible'],
 		radio: ['4G', 'LTE', '5G', '5G mmWave', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -136,7 +136,7 @@ const iosDevices = [
 		screen_height: '2868',
 		screen_width: '1320',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible'],
 		radio: ['4G', 'LTE', '5G', '5G mmWave', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -144,7 +144,7 @@ const iosDevices = [
 		screen_height: '2796',
 		screen_width: '1290',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -152,7 +152,7 @@ const iosDevices = [
 		screen_height: '2556',
 		screen_width: '1179',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	},
@@ -163,7 +163,7 @@ const iosDevices = [
 		screen_height: '2796',
 		screen_width: '1290',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E']
 	}, {
@@ -171,7 +171,7 @@ const iosDevices = [
 		screen_height: '2556',
 		screen_width: '1179',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E']
 	}, {
@@ -179,7 +179,7 @@ const iosDevices = [
 		screen_height: '2796',
 		screen_width: '1290',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6']
 	}, {
@@ -187,7 +187,7 @@ const iosDevices = [
 		screen_height: '2556',
 		screen_width: '1179',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6']
 	},
@@ -198,7 +198,7 @@ const iosDevices = [
 		screen_height: '2532',
 		screen_width: '1170',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6']
 	}, {
@@ -206,7 +206,7 @@ const iosDevices = [
 		screen_height: '1334',
 		screen_width: '750',
 		os: 'iOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6']
 	},
@@ -217,7 +217,7 @@ const iosDevices = [
 		screen_height: '2420',
 		screen_width: '1668',
 		os: 'iPadOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -225,7 +225,7 @@ const iosDevices = [
 		screen_height: '2752',
 		screen_width: '2064',
 		os: 'iPadOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	},
@@ -236,7 +236,7 @@ const iosDevices = [
 		screen_height: '2360',
 		screen_width: '1640',
 		os: 'iPadOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E']
 	}, {
@@ -244,7 +244,7 @@ const iosDevices = [
 		screen_height: '2752',
 		screen_width: '2064',
 		os: 'iPadOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E']
 	},
@@ -255,7 +255,7 @@ const iosDevices = [
 		screen_height: '2360',
 		screen_width: '1640',
 		os: 'iPadOS',
-		Platform: 'iOS',
+		// Platform: 'iOS', // Removed in 1.5.1 — see TODO #11 (collided with dungeon-defined Platform props)
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', 'Wifi', 'WiFi6']
 	}
@@ -268,7 +268,7 @@ const androidDevices = [
 		screen_height: '2992',
 		screen_width: '1344',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible', 'google fi'],
 		radio: ['4G', 'LTE', '5G', '5G mmWave', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -276,7 +276,7 @@ const androidDevices = [
 		screen_height: '2856',
 		screen_width: '1280',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible', 'google fi'],
 		radio: ['4G', 'LTE', '5G', '5G mmWave', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -284,7 +284,7 @@ const androidDevices = [
 		screen_height: '2424',
 		screen_width: '1080',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible', 'google fi'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -292,7 +292,7 @@ const androidDevices = [
 		screen_height: '2400',
 		screen_width: '1080',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'google fi'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E']
 	},
@@ -303,7 +303,7 @@ const androidDevices = [
 		screen_height: '3120',
 		screen_width: '1440',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible'],
 		radio: ['4G', 'LTE', '5G', '5G mmWave', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -311,7 +311,7 @@ const androidDevices = [
 		screen_height: '3120',
 		screen_width: '1440',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile', 'visible'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -319,7 +319,7 @@ const androidDevices = [
 		screen_height: '2340',
 		screen_width: '1080',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	},
@@ -330,7 +330,7 @@ const androidDevices = [
 		screen_height: '2160',
 		screen_width: '1856',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -338,7 +338,7 @@ const androidDevices = [
 		screen_height: '2640',
 		screen_width: '1080',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	},
@@ -349,7 +349,7 @@ const androidDevices = [
 		screen_height: '3168',
 		screen_width: '1440',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -357,7 +357,7 @@ const androidDevices = [
 		screen_height: '3168',
 		screen_width: '1440',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular', 'mint mobile'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E']
 	},
@@ -368,7 +368,7 @@ const androidDevices = [
 		screen_height: '2412',
 		screen_width: '1084',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6']
 	},
@@ -379,7 +379,7 @@ const androidDevices = [
 		screen_height: '3200',
 		screen_width: '1440',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E', 'WiFi7']
 	}, {
@@ -387,7 +387,7 @@ const androidDevices = [
 		screen_height: '2712',
 		screen_width: '1220',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6']
 	},
@@ -398,7 +398,7 @@ const androidDevices = [
 		screen_height: '3840',
 		screen_width: '1644',
 		os: 'Android',
-		Platform: 'Android',
+		// Platform: 'Android', // Removed in 1.5.1 — see TODO #11
 		carrier: ['verizon', 'at&t', 't-mobile', 'cricket', 'us cellular'],
 		radio: ['4G', 'LTE', '5G', 'Wifi', 'WiFi6', 'WiFi6E']
 	}
@@ -411,49 +411,49 @@ const desktopDevices = [
 		screen_height: '2520',
 		screen_width: '4480',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Mac Studio (M4 Ultra, 2024)',
 		screen_height: '2880',
 		screen_width: '5120',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Mac Pro (M3 Ultra, 2024)',
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Mac Mini (M4, 2024)',
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'MacBook Air 15-inch (M3, 2024)',
 		screen_height: '1964',
 		screen_width: '2880',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'MacBook Air 13-inch (M3, 2024)',
 		screen_height: '1664',
 		screen_width: '2560',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'MacBook Pro 14-inch (M4 Pro, 2024)',
 		screen_height: '1964',
 		screen_width: '3024',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'MacBook Pro 16-inch (M4 Max, 2024)',
 		screen_height: '2234',
 		screen_width: '3456',
 		os: 'macOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	},
 
 	// Windows Laptops (2024-2025)
@@ -462,67 +462,67 @@ const desktopDevices = [
 		screen_height: '2160',
 		screen_width: '2880',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Dell XPS 15 (Intel Core Ultra 9)',
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Dell XPS 17 (RTX 4080)',
 		screen_height: '2400',
 		screen_width: '3840',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Microsoft Surface Laptop Studio 2',
 		screen_height: '1504',
 		screen_width: '2256',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Microsoft Surface Pro 11',
 		screen_height: '1944',
 		screen_width: '2880',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'HP Spectre x360 16 (Intel Core Ultra)',
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'HP EliteBook 840 G11',
 		screen_height: '1200',
 		screen_width: '1920',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Lenovo ThinkPad X1 Carbon Gen 12',
 		screen_height: '1200',
 		screen_width: '1920',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Lenovo Yoga Pro 9i (RTX 4070)',
 		screen_height: '1600',
 		screen_width: '2560',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'ASUS ZenBook Pro 16X OLED',
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'ASUS ROG Zephyrus G16',
 		screen_height: '1200',
 		screen_width: '1920',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	},
 
 	// Gaming Desktops (2024-2025)
@@ -531,25 +531,25 @@ const desktopDevices = [
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'HP OMEN 45L (RTX 4080 Super)',
 		screen_height: '1440',
 		screen_width: '2560',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Corsair One i500 (RTX 4090)',
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'NZXT BLD H5 Elite',
 		screen_height: '1440',
 		screen_width: '2560',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	},
 
 	// Business/Office Desktops
@@ -558,19 +558,19 @@ const desktopDevices = [
 		screen_height: '1080',
 		screen_width: '1920',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'HP EliteDesk 805 G8',
 		screen_height: '1440',
 		screen_width: '2560',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Lenovo ThinkCentre M90a Pro',
 		screen_height: '1440',
 		screen_width: '2560',
 		os: 'Windows',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	},
 
 	// Linux/Alternative OS (growing presence)
@@ -579,19 +579,19 @@ const desktopDevices = [
 		screen_height: '2160',
 		screen_width: '3840',
 		os: 'Pop!_OS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Framework Laptop 16',
 		screen_height: '1600',
 		screen_width: '2560',
 		os: 'Linux',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}, {
 		model: 'Purism Librem 14',
 		screen_height: '1080',
 		screen_width: '1920',
 		os: 'PureOS',
-		Platform: 'Desktop'
+		// Platform: 'Desktop' // Removed in 1.5.1 — see TODO #11
 	}
 ];
 

package/lib/templates/macro-presets.js

@@ -38,7 +38,15 @@
  * achievable with the v1.5 engine fix's per-cluster trapezoidal shape.
  */
 
-/** @type {Record<string, {bornRecentBias: number, percentUsersBornInDataset: number, preExistingSpread: 'pinned'|'uniform'}>} */
+/**
+ * v1.5.1: macro presets carry an optional `avgActiveDaysPerUser` default. The
+ * validator merges this default only when the dungeon doesn't set the field
+ * explicitly. `flat` deliberately omits it (legacy behavior — every window-day
+ * potentially active). Other macros ship sensible-default concentrations so
+ * new dungeons get realistic user-activity patterns out of the box.
+ *
+ * @type {Record<string, {bornRecentBias: number, percentUsersBornInDataset: number, preExistingSpread: 'pinned'|'uniform', avgActiveDaysPerUser?: number}>}
+ */
 export const MACRO_PRESETS = {
 	/**
 	 * flat (DEFAULT) — Mature product, no growth narrative.
@@ -62,6 +70,7 @@ export const MACRO_PRESETS = {
 		bornRecentBias: 0.1,
 		percentUsersBornInDataset: 12,
 		preExistingSpread: 'uniform',
+		avgActiveDaysPerUser: 15,
 	},
 
 	/**
@@ -73,6 +82,7 @@ export const MACRO_PRESETS = {
 		bornRecentBias: 0.3,
 		percentUsersBornInDataset: 30,
 		preExistingSpread: 'pinned',
+		avgActiveDaysPerUser: 10,
 	},
 
 	/**
@@ -84,6 +94,7 @@ export const MACRO_PRESETS = {
 		bornRecentBias: 0.6,
 		percentUsersBornInDataset: 55,
 		preExistingSpread: 'pinned',
+		avgActiveDaysPerUser: 20,
 	},
 
 	/**
@@ -103,6 +114,7 @@ export const MACRO_PRESETS = {
 		bornRecentBias: -0.3,
 		percentUsersBornInDataset: 5,
 		preExistingSpread: 'uniform',
+		avgActiveDaysPerUser: 5,
 	},
 };
 
@@ -114,7 +126,7 @@ export const MACRO_PRESET_NAMES = Object.keys(MACRO_PRESETS);
  * Defaults to "flat" if nothing is provided.
  *
  * @param {string | object | undefined} macro - Macro config from dungeon
- * @returns {{bornRecentBias: number, percentUsersBornInDataset: number, preExistingSpread: 'pinned' | 'uniform'}}
+ * @returns {{bornRecentBias: number, percentUsersBornInDataset: number, preExistingSpread: 'pinned' | 'uniform', avgActiveDaysPerUser?: number}}
  */
 export function resolveMacro(macro) {
 	if (!macro) return { ...MACRO_PRESETS.flat };

package/lib/utils/dataset-context.js

@@ -0,0 +1,103 @@
+/**
+ * v1.5.1: AsyncLocalStorage-scoped dataset-window context.
+ *
+ * Replaces the legacy module-scoped `DATASET_NOW` / `DATASET_BEGIN` mutable
+ * state in `lib/utils/utils.js`. Each `generate()` call wraps the pipeline in
+ * `runWithDataset(begin, now, fn)`, and the factory thunks (`date`, `day`,
+ * `dateRange`, `TimeSoup`, `validTime`) read from the ALS store via
+ * `getDatasetNow()` / `getDatasetBegin()` instead of module globals.
+ *
+ * This makes concurrent in-process `generate()` calls safe with respect to
+ * the dataset-window dimension. RNG scoping is a SEPARATE concurrency hole
+ * — see TODOs.md "Considered but punted" for the follow-up plan.
+ *
+ * Trip-ups (see plans/archived/globals-killplan-1.5.1/kill-globals.md §7):
+ *   - ALS does NOT propagate across child_process.fork / worker_threads.
+ *   - Tests that import dungeon configs at top-level evaluate thunks at
+ *     import time — those thunks fall back to wall-clock if invoked outside
+ *     a `runWithDataset` scope.
+ *   - Callbacks scheduled via setImmediate / setTimeout / native event
+ *     emitters MAY lose context. Audit at the orchestrator level.
+ */
+
+import { AsyncLocalStorage } from 'node:async_hooks';
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc.js';
+dayjs.extend(utc);
+
+/** @type {AsyncLocalStorage<{ begin: number, now: number }>} */
+const datasetALS = new AsyncLocalStorage();
+
+/**
+ * Legacy fallback — written by the deprecated `setDatasetNow` / `setDatasetBegin`
+ * shims in `lib/utils/utils.js`. Used ONLY when no ALS scope is active. This
+ * keeps existing tests that call the setters directly (instead of wrapping in
+ * `runWithDataset`) functional through v1.5.1. v1.6 may remove the shims.
+ *
+ * @type {{ begin: number|null, now: number|null }}
+ */
+const legacyFallback = { begin: null, now: null };
+
+/** @internal — used by `setDatasetNow` / `setDatasetBegin` shims. */
+export function _setLegacyDatasetNow(unixSeconds) {
+	if (typeof unixSeconds === 'number' && Number.isFinite(unixSeconds)) {
+		legacyFallback.now = unixSeconds;
+	}
+}
+
+/** @internal — used by `setDatasetNow` / `setDatasetBegin` shims. */
+export function _setLegacyDatasetBegin(unixSeconds) {
+	if (typeof unixSeconds === 'number' && Number.isFinite(unixSeconds)) {
+		legacyFallback.begin = unixSeconds;
+	}
+}
+
+/**
+ * Run `fn` inside a dataset-window scope. Factory thunks invoked anywhere in
+ * the async call chain (sync or via `await`) will read the scoped window
+ * instead of the module fallback.
+ *
+ * @template T
+ * @param {number} datasetBeginUnix
+ * @param {number} datasetNowUnix
+ * @param {() => T} fn
+ * @returns {T}
+ */
+export function runWithDataset(datasetBeginUnix, datasetNowUnix, fn) {
+	return datasetALS.run({ begin: datasetBeginUnix, now: datasetNowUnix }, fn);
+}
+
+/**
+ * Read the scoped dataset-now value. Resolution order:
+ *   1. ALS store (active `runWithDataset` scope) — production pipeline path.
+ *   2. Legacy fallback (set via deprecated `setDatasetNow` shim) — for tests.
+ *   3. Wall-clock `dayjs.utc()` — last-resort default.
+ *
+ * @returns {dayjs.Dayjs}
+ */
+export function getDatasetNow() {
+	const store = datasetALS.getStore();
+	if (store) return dayjs.unix(store.now).utc();
+	if (legacyFallback.now !== null) return dayjs.unix(legacyFallback.now).utc();
+	return dayjs.utc();
+}
+
+/**
+ * Read the scoped dataset-begin value. Same resolution as `getDatasetNow`,
+ * falling back to wall-clock minus 30 days.
+ *
+ * @returns {dayjs.Dayjs}
+ */
+export function getDatasetBegin() {
+	const store = datasetALS.getStore();
+	if (store) return dayjs.unix(store.begin).utc();
+	if (legacyFallback.begin !== null) return dayjs.unix(legacyFallback.begin).utc();
+	return dayjs.utc().subtract(30, 'day');
+}
+
+/**
+ * @returns {boolean} true when called inside a runWithDataset scope.
+ */
+export function hasDatasetScope() {
+	return datasetALS.getStore() !== undefined;
+}