@voidhash/mimic-effect 1.0.0-beta.1 → 1.0.0-beta.10

package/dist/Metrics.mjs

@@ -63,6 +63,10 @@ const transactionsLatency = Metric.histogram("mimic.transactions.latency_ms", Me
 */
 const storageSnapshots = Metric.counter("mimic.storage.snapshots");
 /**
+* Snapshots triggered by idle document detection
+*/
+const storageIdleSnapshots = Metric.counter("mimic.storage.idle_snapshots");
+/**
 * Snapshot save duration histogram (milliseconds)
 */
 const storageSnapshotLatency = Metric.histogram("mimic.storage.snapshot_latency_ms", MetricBoundaries.exponential({
@@ -75,6 +79,22 @@ const storageSnapshotLatency = Metric.histogram("mimic.storage.snapshot_latency_
 */
 const storageWalAppends = Metric.counter("mimic.storage.wal_appends");
 /**
+* Version gaps detected during WAL replay
+*/
+const storageVersionGaps = Metric.counter("mimic.storage.version_gaps");
+/**
+* Failed WAL appends causing transaction rollback
+*/
+const walAppendFailures = Metric.counter("mimic.storage.wal_append_failures");
+/**
+* ColdStorage load failures during document restore
+*/
+const coldStorageLoadFailures = Metric.counter("mimic.storage.cold_load_failures");
+/**
+* HotStorage getEntries failures during document restore
+*/
+const hotStorageLoadFailures = Metric.counter("mimic.storage.hot_load_failures");
+/**
 * Presence set operations
 */
 const presenceUpdates = Metric.counter("mimic.presence.updates");
@@ -95,12 +115,17 @@ const MimicMetrics = {
 	transactionsRejected,
 	transactionsLatency,
 	storageSnapshots,
+	storageIdleSnapshots,
 	storageSnapshotLatency,
 	storageWalAppends,
+	storageVersionGaps,
+	walAppendFailures,
+	coldStorageLoadFailures,
+	hotStorageLoadFailures,
 	presenceUpdates,
 	presenceActive
 };
 
 //#endregion
-export { MimicMetrics, connectionsActive, connectionsDuration, connectionsErrors, connectionsTotal, documentsActive, documentsCreated, documentsEvicted, documentsRestored, presenceActive, presenceUpdates, storageSnapshotLatency, storageSnapshots, storageWalAppends, transactionsLatency, transactionsProcessed, transactionsRejected };
+export { MimicMetrics, connectionsActive, connectionsDuration, connectionsErrors, connectionsTotal, documentsActive, documentsCreated, documentsEvicted, documentsRestored, presenceActive, presenceUpdates, storageIdleSnapshots, storageSnapshotLatency, storageSnapshots, storageVersionGaps, storageWalAppends, transactionsLatency, transactionsProcessed, transactionsRejected, walAppendFailures };
 //# sourceMappingURL=Metrics.mjs.map

package/dist/Metrics.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Metrics.mjs","names":[],"sources":["../src/Metrics.ts"],"sourcesContent":["/**\n * @voidhash/mimic-effect - Metrics\n *\n * Observability metrics using Effect's Metric API.\n */\nimport { Metric, MetricBoundaries } from \"effect\";\n\n// =============================================================================\n// Connection Metrics\n// =============================================================================\n\n/**\n * Current active WebSocket connections\n */\nexport const connectionsActive = Metric.gauge(\"mimic.connections.active\");\n\n/**\n * Total connections over lifetime\n */\nexport const connectionsTotal = Metric.counter(\"mimic.connections.total\");\n\n/**\n * Connection duration histogram (milliseconds)\n */\nexport const connectionsDuration = Metric.histogram(\n  \"mimic.connections.duration_ms\",\n  MetricBoundaries.exponential({\n    start: 100,\n    factor: 2,\n    count: 15, // Up to ~3.2 million ms (~53 minutes)\n  })\n);\n\n/**\n * Connection errors (auth failures, etc.)\n */\nexport const connectionsErrors = Metric.counter(\"mimic.connections.errors\");\n\n// =============================================================================\n// Document Metrics\n// =============================================================================\n\n/**\n * Documents currently in memory\n */\nexport const documentsActive = Metric.gauge(\"mimic.documents.active\");\n\n/**\n * New documents created\n */\nexport const documentsCreated = Metric.counter(\"mimic.documents.created\");\n\n/**\n * Documents restored from storage\n */\nexport const documentsRestored = Metric.counter(\"mimic.documents.restored\");\n\n/**\n * Documents garbage collected (evicted)\n */\nexport const documentsEvicted = Metric.counter(\"mimic.documents.evicted\");\n\n// =============================================================================\n// Transaction Metrics\n// =============================================================================\n\n/**\n * Successfully processed transactions\n */\nexport const transactionsProcessed = Metric.counter(\n  \"mimic.transactions.processed\"\n);\n\n/**\n * Rejected transactions\n */\nexport const transactionsRejected = Metric.counter(\n  \"mimic.transactions.rejected\"\n);\n\n/**\n * Transaction processing latency histogram (milliseconds)\n */\nexport const transactionsLatency = Metric.histogram(\n  \"mimic.transactions.latency_ms\",\n  MetricBoundaries.exponential({\n    start: 0.1,\n    factor: 2,\n    count: 15, // Up to ~1638 ms\n  })\n);\n\n// =============================================================================\n// Storage Metrics\n// =============================================================================\n\n/**\n * Snapshots saved to ColdStorage\n */\nexport const storageSnapshots = Metric.counter(\"mimic.storage.snapshots\");\n\n/**\n * Snapshot save duration histogram (milliseconds)\n */\nexport const storageSnapshotLatency = Metric.histogram(\n  \"mimic.storage.snapshot_latency_ms\",\n  MetricBoundaries.exponential({\n    start: 1,\n    factor: 2,\n    count: 12, // Up to ~4 seconds\n  })\n);\n\n/**\n * WAL entries written to HotStorage\n */\nexport const storageWalAppends = Metric.counter(\"mimic.storage.wal_appends\");\n\n// =============================================================================\n// Presence Metrics\n// =============================================================================\n\n/**\n * Presence set operations\n */\nexport const presenceUpdates = Metric.counter(\"mimic.presence.updates\");\n\n/**\n * Active presence entries\n */\nexport const presenceActive = Metric.gauge(\"mimic.presence.active\");\n\n// =============================================================================\n// Export namespace\n// =============================================================================\n\nexport const MimicMetrics = {\n  // Connection\n  connectionsActive,\n  connectionsTotal,\n  connectionsDuration,\n  connectionsErrors,\n\n  // Document\n  documentsActive,\n  documentsCreated,\n  documentsRestored,\n  documentsEvicted,\n\n  // Transaction\n  transactionsProcessed,\n  transactionsRejected,\n  transactionsLatency,\n\n  // Storage\n  storageSnapshots,\n  storageSnapshotLatency,\n  storageWalAppends,\n\n  // Presence\n  presenceUpdates,\n  presenceActive,\n};\n"],"mappings":";;;;;;;;;;;AAcA,MAAa,oBAAoB,OAAO,MAAM,2BAA2B;;;;AAKzE,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AAKzE,MAAa,sBAAsB,OAAO,UACxC,iCACA,iBAAiB,YAAY;CAC3B,OAAO;CACP,QAAQ;CACR,OAAO;CACR,CAAC,CACH;;;;AAKD,MAAa,oBAAoB,OAAO,QAAQ,2BAA2B;;;;AAS3E,MAAa,kBAAkB,OAAO,MAAM,yBAAyB;;;;AAKrE,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AAKzE,MAAa,oBAAoB,OAAO,QAAQ,2BAA2B;;;;AAK3E,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AASzE,MAAa,wBAAwB,OAAO,QAC1C,+BACD;;;;AAKD,MAAa,uBAAuB,OAAO,QACzC,8BACD;;;;AAKD,MAAa,sBAAsB,OAAO,UACxC,iCACA,iBAAiB,YAAY;CAC3B,OAAO;CACP,QAAQ;CACR,OAAO;CACR,CAAC,CACH;;;;AASD,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AAKzE,MAAa,yBAAyB,OAAO,UAC3C,qCACA,iBAAiB,YAAY;CAC3B,OAAO;CACP,QAAQ;CACR,OAAO;CACR,CAAC,CACH;;;;AAKD,MAAa,oBAAoB,OAAO,QAAQ,4BAA4B;;;;AAS5E,MAAa,kBAAkB,OAAO,QAAQ,yBAAyB;;;;AAKvE,MAAa,iBAAiB,OAAO,MAAM,wBAAwB;AAMnE,MAAa,eAAe;CAE1B;CACA;CACA;CACA;CAGA;CACA;CACA;CACA;CAGA;CACA;CACA;CAGA;CACA;CACA;CAGA;CACA;CACD"}
+{"version":3,"file":"Metrics.mjs","names":[],"sources":["../src/Metrics.ts"],"sourcesContent":["/**\n * @voidhash/mimic-effect - Metrics\n *\n * Observability metrics using Effect's Metric API.\n */\nimport { Metric, MetricBoundaries } from \"effect\";\n\n// =============================================================================\n// Connection Metrics\n// =============================================================================\n\n/**\n * Current active WebSocket connections\n */\nexport const connectionsActive = Metric.gauge(\"mimic.connections.active\");\n\n/**\n * Total connections over lifetime\n */\nexport const connectionsTotal = Metric.counter(\"mimic.connections.total\");\n\n/**\n * Connection duration histogram (milliseconds)\n */\nexport const connectionsDuration = Metric.histogram(\n  \"mimic.connections.duration_ms\",\n  MetricBoundaries.exponential({\n    start: 100,\n    factor: 2,\n    count: 15, // Up to ~3.2 million ms (~53 minutes)\n  })\n);\n\n/**\n * Connection errors (auth failures, etc.)\n */\nexport const connectionsErrors = Metric.counter(\"mimic.connections.errors\");\n\n// =============================================================================\n// Document Metrics\n// =============================================================================\n\n/**\n * Documents currently in memory\n */\nexport const documentsActive = Metric.gauge(\"mimic.documents.active\");\n\n/**\n * New documents created\n */\nexport const documentsCreated = Metric.counter(\"mimic.documents.created\");\n\n/**\n * Documents restored from storage\n */\nexport const documentsRestored = Metric.counter(\"mimic.documents.restored\");\n\n/**\n * Documents garbage collected (evicted)\n */\nexport const documentsEvicted = Metric.counter(\"mimic.documents.evicted\");\n\n// =============================================================================\n// Transaction Metrics\n// =============================================================================\n\n/**\n * Successfully processed transactions\n */\nexport const transactionsProcessed = Metric.counter(\n  \"mimic.transactions.processed\"\n);\n\n/**\n * Rejected transactions\n */\nexport const transactionsRejected = Metric.counter(\n  \"mimic.transactions.rejected\"\n);\n\n/**\n * Transaction processing latency histogram (milliseconds)\n */\nexport const transactionsLatency = Metric.histogram(\n  \"mimic.transactions.latency_ms\",\n  MetricBoundaries.exponential({\n    start: 0.1,\n    factor: 2,\n    count: 15, // Up to ~1638 ms\n  })\n);\n\n// =============================================================================\n// Storage Metrics\n// =============================================================================\n\n/**\n * Snapshots saved to ColdStorage\n */\nexport const storageSnapshots = Metric.counter(\"mimic.storage.snapshots\");\n\n/**\n * Snapshots triggered by idle document detection\n */\nexport const storageIdleSnapshots = Metric.counter(\"mimic.storage.idle_snapshots\");\n\n/**\n * Snapshot save duration histogram (milliseconds)\n */\nexport const storageSnapshotLatency = Metric.histogram(\n  \"mimic.storage.snapshot_latency_ms\",\n  MetricBoundaries.exponential({\n    start: 1,\n    factor: 2,\n    count: 12, // Up to ~4 seconds\n  })\n);\n\n/**\n * WAL entries written to HotStorage\n */\nexport const storageWalAppends = Metric.counter(\"mimic.storage.wal_appends\");\n\n/**\n * Version gaps detected during WAL replay\n */\nexport const storageVersionGaps = Metric.counter(\"mimic.storage.version_gaps\");\n\n/**\n * Failed WAL appends causing transaction rollback\n */\nexport const walAppendFailures = Metric.counter(\"mimic.storage.wal_append_failures\");\n\n/**\n * ColdStorage load failures during document restore\n */\nexport const coldStorageLoadFailures = Metric.counter(\"mimic.storage.cold_load_failures\");\n\n/**\n * HotStorage getEntries failures during document restore\n */\nexport const hotStorageLoadFailures = Metric.counter(\"mimic.storage.hot_load_failures\");\n\n// =============================================================================\n// Presence Metrics\n// =============================================================================\n\n/**\n * Presence set operations\n */\nexport const presenceUpdates = Metric.counter(\"mimic.presence.updates\");\n\n/**\n * Active presence entries\n */\nexport const presenceActive = Metric.gauge(\"mimic.presence.active\");\n\n// =============================================================================\n// Export namespace\n// =============================================================================\n\nexport const MimicMetrics = {\n  // Connection\n  connectionsActive,\n  connectionsTotal,\n  connectionsDuration,\n  connectionsErrors,\n\n  // Document\n  documentsActive,\n  documentsCreated,\n  documentsRestored,\n  documentsEvicted,\n\n  // Transaction\n  transactionsProcessed,\n  transactionsRejected,\n  transactionsLatency,\n\n  // Storage\n  storageSnapshots,\n  storageIdleSnapshots,\n  storageSnapshotLatency,\n  storageWalAppends,\n  storageVersionGaps,\n  walAppendFailures,\n  coldStorageLoadFailures,\n  hotStorageLoadFailures,\n\n  // Presence\n  presenceUpdates,\n  presenceActive,\n};\n"],"mappings":";;;;;;;;;;;AAcA,MAAa,oBAAoB,OAAO,MAAM,2BAA2B;;;;AAKzE,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AAKzE,MAAa,sBAAsB,OAAO,UACxC,iCACA,iBAAiB,YAAY;CAC3B,OAAO;CACP,QAAQ;CACR,OAAO;CACR,CAAC,CACH;;;;AAKD,MAAa,oBAAoB,OAAO,QAAQ,2BAA2B;;;;AAS3E,MAAa,kBAAkB,OAAO,MAAM,yBAAyB;;;;AAKrE,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AAKzE,MAAa,oBAAoB,OAAO,QAAQ,2BAA2B;;;;AAK3E,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AASzE,MAAa,wBAAwB,OAAO,QAC1C,+BACD;;;;AAKD,MAAa,uBAAuB,OAAO,QACzC,8BACD;;;;AAKD,MAAa,sBAAsB,OAAO,UACxC,iCACA,iBAAiB,YAAY;CAC3B,OAAO;CACP,QAAQ;CACR,OAAO;CACR,CAAC,CACH;;;;AASD,MAAa,mBAAmB,OAAO,QAAQ,0BAA0B;;;;AAKzE,MAAa,uBAAuB,OAAO,QAAQ,+BAA+B;;;;AAKlF,MAAa,yBAAyB,OAAO,UAC3C,qCACA,iBAAiB,YAAY;CAC3B,OAAO;CACP,QAAQ;CACR,OAAO;CACR,CAAC,CACH;;;;AAKD,MAAa,oBAAoB,OAAO,QAAQ,4BAA4B;;;;AAK5E,MAAa,qBAAqB,OAAO,QAAQ,6BAA6B;;;;AAK9E,MAAa,oBAAoB,OAAO,QAAQ,oCAAoC;;;;AAKpF,MAAa,0BAA0B,OAAO,QAAQ,mCAAmC;;;;AAKzF,MAAa,yBAAyB,OAAO,QAAQ,kCAAkC;;;;AASvF,MAAa,kBAAkB,OAAO,QAAQ,yBAAyB;;;;AAKvE,MAAa,iBAAiB,OAAO,MAAM,wBAAwB;AAMnE,MAAa,eAAe;CAE1B;CACA;CACA;CACA;CAGA;CACA;CACA;CACA;CAGA;CACA;CACA;CAGA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CAGA;CACA;CACD"}

package/dist/MimicClusterServerEngine.cjs

@@ -1,10 +1,10 @@
 const require_ColdStorage = require('./ColdStorage.cjs');
 const require_HotStorage = require('./HotStorage.cjs');
 const require_Metrics = require('./Metrics.cjs');
+const require_DocumentInstance = require('./DocumentInstance.cjs');
 const require_objectSpread2 = require('./_virtual/_@oxc-project_runtime@0.103.0/helpers/objectSpread2.cjs');
 const require_MimicServerEngine = require('./MimicServerEngine.cjs');
 let effect = require("effect");
-let _voidhash_mimic_server = require("@voidhash/mimic/server");
 let _effect_cluster = require("@effect/cluster");
 let _effect_rpc = require("@effect/rpc");
 
@@ -21,6 +21,7 @@ const DEFAULT_MAX_IDLE_TIME = effect.Duration.minutes(5);
 const DEFAULT_MAX_TRANSACTION_HISTORY = 1e3;
 const DEFAULT_SNAPSHOT_INTERVAL = effect.Duration.minutes(5);
 const DEFAULT_SNAPSHOT_THRESHOLD = 100;
+const DEFAULT_SNAPSHOT_IDLE_TIMEOUT = effect.Duration.seconds(30);
 const DEFAULT_SHARD_GROUP = "mimic-documents";
 /**
 * Schema for encoded transaction (wire format)
@@ -99,7 +100,7 @@ const MimicDocumentEntity = _effect_cluster.Entity.make("MimicDocument", [
 */
 var MimicClusterConfigTag = class extends effect.Context.Tag("@voidhash/mimic-effect/MimicClusterConfig")() {};
 const resolveClusterConfig = (config) => {
-	var _config$maxTransactio, _config$snapshot, _config$snapshot$tran, _config$snapshot2, _config$shardGroup;
+	var _config$maxTransactio, _config$snapshot, _config$snapshot$tran, _config$snapshot2, _config$snapshot3, _config$shardGroup;
 	return {
 		schema: config.schema,
 		initial: config.initial,
@@ -108,7 +109,8 @@ const resolveClusterConfig = (config) => {
 		maxTransactionHistory: (_config$maxTransactio = config.maxTransactionHistory) !== null && _config$maxTransactio !== void 0 ? _config$maxTransactio : DEFAULT_MAX_TRANSACTION_HISTORY,
 		snapshot: {
 			interval: ((_config$snapshot = config.snapshot) === null || _config$snapshot === void 0 ? void 0 : _config$snapshot.interval) ? effect.Duration.decode(config.snapshot.interval) : DEFAULT_SNAPSHOT_INTERVAL,
-			transactionThreshold: (_config$snapshot$tran = (_config$snapshot2 = config.snapshot) === null || _config$snapshot2 === void 0 ? void 0 : _config$snapshot2.transactionThreshold) !== null && _config$snapshot$tran !== void 0 ? _config$snapshot$tran : DEFAULT_SNAPSHOT_THRESHOLD
+			transactionThreshold: (_config$snapshot$tran = (_config$snapshot2 = config.snapshot) === null || _config$snapshot2 === void 0 ? void 0 : _config$snapshot2.transactionThreshold) !== null && _config$snapshot$tran !== void 0 ? _config$snapshot$tran : DEFAULT_SNAPSHOT_THRESHOLD,
+			idleTimeout: ((_config$snapshot3 = config.snapshot) === null || _config$snapshot3 === void 0 ? void 0 : _config$snapshot3.idleTimeout) ? effect.Duration.decode(config.snapshot.idleTimeout) : DEFAULT_SNAPSHOT_IDLE_TIMEOUT
 		},
 		shardGroup: (_config$shardGroup = config.shardGroup) !== null && _config$shardGroup !== void 0 ? _config$shardGroup : DEFAULT_SHARD_GROUP
 	};
@@ -130,150 +132,53 @@ const encodeTransaction = (tx) => {
 /**
 * Create the entity handler for MimicDocument
 */
-const createEntityHandler = (config, coldStorage, hotStorage) => effect.Effect.gen(function* () {
+const createEntityHandler = (config, coldStorage, hotStorage) => effect.Effect.fn("cluster.entity.handler.create")(function* () {
 	const documentId = (yield* _effect_cluster.Entity.CurrentAddress).entityId;
-	const SCHEMA_VERSION = 1;
-	const computeInitialState = () => {
-		if (config.initial === void 0) return effect.Effect.succeed(void 0);
-		if (typeof config.initial === "function") return config.initial({ documentId });
-		return effect.Effect.succeed(config.initial);
-	};
-	const storedDoc = yield* effect.Effect.catchAll(coldStorage.load(documentId), () => effect.Effect.succeed(void 0));
-	let initialState;
-	let initialVersion = 0;
-	if (storedDoc) {
-		initialState = storedDoc.state;
-		initialVersion = storedDoc.version;
-	} else initialState = yield* computeInitialState();
-	const broadcastPubSub = yield* effect.PubSub.unbounded();
+	const instance = yield* require_DocumentInstance.DocumentInstance.make(documentId, {
+		schema: config.schema,
+		initial: config.initial,
+		maxTransactionHistory: config.maxTransactionHistory,
+		snapshot: config.snapshot
+	}, coldStorage, hotStorage).pipe(effect.Effect.orDie);
 	const presencePubSub = yield* effect.PubSub.unbounded();
 	const stateRef = yield* effect.Ref.make({
-		document: void 0,
-		broadcastPubSub,
+		instance,
 		presences: effect.HashMap.empty(),
-		presencePubSub,
-		lastSnapshotVersion: initialVersion,
-		lastSnapshotTime: Date.now(),
-		transactionsSinceSnapshot: 0
-	});
-	const document = _voidhash_mimic_server.ServerDocument.make({
-		schema: config.schema,
-		initialState,
-		initialVersion,
-		maxTransactionHistory: config.maxTransactionHistory,
-		onBroadcast: (message) => {
-			effect.Effect.runSync(effect.PubSub.publish(broadcastPubSub, {
-				type: "transaction",
-				transaction: message.transaction,
-				version: message.version
-			}));
-		},
-		onRejection: (transactionId, reason) => {
-			effect.Effect.runSync(effect.PubSub.publish(broadcastPubSub, {
-				type: "error",
-				transactionId,
-				reason
-			}));
-		}
+		presencePubSub
 	});
-	yield* effect.Ref.update(stateRef, (s) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, s), {}, { document }));
-	const walEntries = yield* effect.Effect.catchAll(hotStorage.getEntries(documentId, initialVersion), () => effect.Effect.succeed([]));
-	for (const entry of walEntries) {
-		const result = document.submit(entry.transaction);
-		if (!result.success) yield* effect.Effect.logWarning("Skipping corrupted WAL entry", {
-			documentId,
-			version: entry.version,
-			reason: result.reason
-		});
-	}
-	if (storedDoc) yield* effect.Metric.increment(require_Metrics.documentsRestored);
-	else yield* effect.Metric.increment(require_Metrics.documentsCreated);
-	yield* effect.Metric.incrementBy(require_Metrics.documentsActive, 1);
-	/**
-	* Save snapshot to ColdStorage
-	*/
-	const saveSnapshot = effect.Effect.gen(function* () {
-		const state = yield* effect.Ref.get(stateRef);
-		const docState = state.document.get();
-		const version = state.document.getVersion();
-		if (docState === void 0) return;
-		const storedDocument = {
-			state: docState,
-			version,
-			schemaVersion: SCHEMA_VERSION,
-			savedAt: Date.now()
-		};
-		const snapshotStartTime = Date.now();
-		yield* effect.Effect.catchAll(coldStorage.save(documentId, storedDocument), (e) => effect.Effect.logError("Failed to save snapshot", {
-			documentId,
-			error: e
-		}));
-		const snapshotDuration = Date.now() - snapshotStartTime;
-		yield* effect.Metric.increment(require_Metrics.storageSnapshots);
-		yield* effect.Metric.update(require_Metrics.storageSnapshotLatency, snapshotDuration);
-		yield* effect.Effect.catchAll(hotStorage.truncate(documentId, version), (e) => effect.Effect.logError("Failed to truncate WAL", {
+	yield* effect.Effect.addFinalizer(() => effect.Effect.fn("cluster.entity.finalize")(function* () {
+		yield* effect.Effect.catchAll(instance.saveSnapshot(), (e) => effect.Effect.logError("Failed to save snapshot during entity finalization", {
 			documentId,
 			error: e
 		}));
-		yield* effect.Ref.update(stateRef, (s) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, s), {}, {
-			lastSnapshotVersion: version,
-			lastSnapshotTime: Date.now(),
-			transactionsSinceSnapshot: 0
-		}));
-	});
-	/**
-	* Check if snapshot should be triggered
-	*/
-	const checkSnapshotTriggers = effect.Effect.gen(function* () {
-		const state = yield* effect.Ref.get(stateRef);
-		const now = Date.now();
-		const intervalMs = effect.Duration.toMillis(config.snapshot.interval);
-		const threshold = config.snapshot.transactionThreshold;
-		if (state.transactionsSinceSnapshot >= threshold) {
-			yield* saveSnapshot;
-			return;
-		}
-		if (now - state.lastSnapshotTime >= intervalMs) {
-			yield* saveSnapshot;
-			return;
-		}
-	});
-	yield* effect.Effect.addFinalizer(() => effect.Effect.gen(function* () {
-		yield* saveSnapshot;
 		yield* effect.Metric.incrementBy(require_Metrics.documentsActive, -1);
 		yield* effect.Metric.increment(require_Metrics.documentsEvicted);
 		yield* effect.Effect.logDebug("Entity finalized", { documentId });
-	}));
+	})());
+	if (effect.Duration.toMillis(config.snapshot.idleTimeout) > 0) yield* effect.Effect.fn("cluster.entity.snapshot.loop")(function* () {
+		if (yield* instance.needsSnapshot()) {
+			yield* effect.Effect.catchAll(instance.saveSnapshot(), (e) => effect.Effect.logWarning("Periodic snapshot failed in cluster entity", {
+				documentId,
+				error: e
+			}));
+			yield* effect.Metric.increment(require_Metrics.storageIdleSnapshots);
+		}
+	})().pipe(effect.Effect.repeat(effect.Schedule.spaced(config.snapshot.idleTimeout)), effect.Effect.fork);
 	return {
-		Submit: effect.Effect.fnUntraced(function* ({ payload }) {
-			const submitStartTime = Date.now();
-			const state = yield* effect.Ref.get(stateRef);
+		Submit: effect.Effect.fn("cluster.document.transaction.submit")(function* ({ payload }) {
 			const transaction = decodeTransaction(payload.transaction);
-			const result = state.document.submit(transaction);
-			const latency = Date.now() - submitStartTime;
-			yield* effect.Metric.update(require_Metrics.transactionsLatency, latency);
-			if (result.success) {
-				yield* effect.Metric.increment(require_Metrics.transactionsProcessed);
-				const walEntry = {
-					transaction,
-					version: result.version,
-					timestamp: Date.now()
-				};
-				yield* effect.Effect.catchAll(hotStorage.append(documentId, walEntry), (e) => effect.Effect.logError("Failed to append to WAL", {
-					documentId,
-					error: e
-				}));
-				yield* effect.Metric.increment(require_Metrics.storageWalAppends);
-				yield* effect.Ref.update(stateRef, (s) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, s), {}, { transactionsSinceSnapshot: s.transactionsSinceSnapshot + 1 }));
-				yield* checkSnapshotTriggers;
-			} else yield* effect.Metric.increment(require_Metrics.transactionsRejected);
-			return result;
+			return yield* instance.submit(transaction).pipe(effect.Effect.catchAll((error) => effect.Effect.succeed({
+				success: false,
+				reason: `Storage error: ${String(error)}`
+			})));
 		}),
-		GetSnapshot: effect.Effect.fnUntraced(function* () {
-			return (yield* effect.Ref.get(stateRef)).document.getSnapshot();
+		GetSnapshot: effect.Effect.fn("cluster.document.snapshot.get")(function* () {
+			return instance.getSnapshot();
 		}),
-		Touch: effect.Effect.fnUntraced(function* () {}),
-		SetPresence: effect.Effect.fnUntraced(function* ({ payload }) {
+		Touch: effect.Effect.fn("cluster.document.touch")(function* () {
+			yield* instance.touch();
+		}),
+		SetPresence: effect.Effect.fn("cluster.presence.set")(function* ({ payload }) {
 			const { connectionId, entry } = payload;
 			yield* effect.Ref.update(stateRef, (s) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, s), {}, { presences: effect.HashMap.set(s.presences, connectionId, entry) }));
 			yield* effect.Metric.increment(require_Metrics.presenceUpdates);
@@ -287,7 +192,7 @@ const createEntityHandler = (config, coldStorage, hotStorage) => effect.Effect.g
 			};
 			yield* effect.PubSub.publish(state.presencePubSub, event);
 		}),
-		RemovePresence: effect.Effect.fnUntraced(function* ({ payload }) {
+		RemovePresence: effect.Effect.fn("cluster.presence.remove")(function* ({ payload }) {
 			const { connectionId } = payload;
 			const state = yield* effect.Ref.get(stateRef);
 			if (!effect.HashMap.has(state.presences, connectionId)) return;
@@ -299,20 +204,20 @@ const createEntityHandler = (config, coldStorage, hotStorage) => effect.Effect.g
 			};
 			yield* effect.PubSub.publish(state.presencePubSub, event);
 		}),
-		GetPresenceSnapshot: effect.Effect.fnUntraced(function* () {
+		GetPresenceSnapshot: effect.Effect.fn("cluster.presence.snapshot.get")(function* () {
 			const state = yield* effect.Ref.get(stateRef);
 			const presences = {};
 			for (const [id, entry] of state.presences) presences[id] = entry;
 			return { presences };
 		})
 	};
-});
+})();
 var SubscriptionStoreTag = class extends effect.Context.Tag("@voidhash/mimic-effect/SubscriptionStore")() {};
-const subscriptionStoreLayer = effect.Layer.effect(SubscriptionStoreTag, effect.Effect.gen(function* () {
+const subscriptionStoreLayer = effect.Layer.effect(SubscriptionStoreTag, effect.Effect.fn("cluster.subscriptions.layer.create")(function* () {
 	const documentPubSubs = yield* effect.Ref.make(effect.HashMap.empty());
 	const presencePubSubs = yield* effect.Ref.make(effect.HashMap.empty());
 	return {
-		getOrCreatePubSub: (documentId) => effect.Effect.gen(function* () {
+		getOrCreatePubSub: effect.Effect.fn("cluster.subscriptions.pubsub.get-or-create")(function* (documentId) {
 			const current = yield* effect.Ref.get(documentPubSubs);
 			const existing = effect.HashMap.get(current, documentId);
 			if (existing._tag === "Some") return existing.value;
@@ -320,7 +225,7 @@ const subscriptionStoreLayer = effect.Layer.effect(SubscriptionStoreTag, effect.
 			yield* effect.Ref.update(documentPubSubs, (map) => effect.HashMap.set(map, documentId, pubsub));
 			return pubsub;
 		}),
-		getOrCreatePresencePubSub: (documentId) => effect.Effect.gen(function* () {
+		getOrCreatePresencePubSub: effect.Effect.fn("cluster.subscriptions.presence-pubsub.get-or-create")(function* (documentId) {
 			const current = yield* effect.Ref.get(presencePubSubs);
 			const existing = effect.HashMap.get(current, documentId);
 			if (existing._tag === "Some") return existing.value;
@@ -329,7 +234,7 @@ const subscriptionStoreLayer = effect.Layer.effect(SubscriptionStoreTag, effect.
 			return pubsub;
 		})
 	};
-}));
+})());
 /**
 * Create a MimicClusterServerEngine layer.
 *

package/dist/MimicClusterServerEngine.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MimicClusterServerEngine.d.cts","names":[],"sources":["../src/MimicClusterServerEngine.ts"],"sourcesContent":[],"mappings":";;;;;;;;;;;cAqzBa;yBA3JwB,SAAA,CAAU,sBACrC,+BAA+B,aACtC,KAAA,CAAM,MACP,6BAEA,iBAAiB,gBAAgB,sBAAsB,QAAA,CAAS"}
+{"version":3,"file":"MimicClusterServerEngine.d.cts","names":[],"sources":["../src/MimicClusterServerEngine.ts"],"sourcesContent":[],"mappings":";;;;;;;;;;;cA0pBa;yBA3JwB,SAAA,CAAU,sBACrC,+BAA+B,aACtC,KAAA,CAAM,MACP,6BAEA,iBAAiB,gBAAgB,sBAAsB,QAAA,CAAS"}

package/dist/MimicClusterServerEngine.d.mts

@@ -4,8 +4,8 @@ import { HotStorageTag } from "./HotStorage.mjs";
 import { MimicAuthServiceTag } from "./MimicAuthService.mjs";
 import { MimicServerEngineTag } from "./MimicServerEngine.mjs";
 import { Layer } from "effect";
-import { Sharding } from "@effect/cluster";
 import { Primitive } from "@voidhash/mimic";
+import { Sharding } from "@effect/cluster";
 
 //#region src/MimicClusterServerEngine.d.ts
 

package/dist/MimicClusterServerEngine.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MimicClusterServerEngine.d.mts","names":[],"sources":["../src/MimicClusterServerEngine.ts"],"sourcesContent":[],"mappings":";;;;;;;;;;;cAqzBa;yBA3JwB,SAAA,CAAU,sBACrC,+BAA+B,aACtC,KAAA,CAAM,MACP,6BAEA,iBAAiB,gBAAgB,sBAAsB,QAAA,CAAS"}
+{"version":3,"file":"MimicClusterServerEngine.d.mts","names":[],"sources":["../src/MimicClusterServerEngine.ts"],"sourcesContent":[],"mappings":";;;;;;;;;;;cA0pBa;yBA3JwB,SAAA,CAAU,sBACrC,+BAA+B,aACtC,KAAA,CAAM,MACP,6BAEA,iBAAiB,gBAAgB,sBAAsB,QAAA,CAAS"}

package/dist/MimicClusterServerEngine.mjs

@@ -1,11 +1,11 @@
 import { __require } from "./_virtual/rolldown_runtime.mjs";
 import { ColdStorageTag } from "./ColdStorage.mjs";
 import { HotStorageTag } from "./HotStorage.mjs";
-import { documentsActive, documentsCreated, documentsEvicted, documentsRestored, presenceActive, presenceUpdates, storageSnapshotLatency, storageSnapshots, storageWalAppends, transactionsLatency, transactionsProcessed, transactionsRejected } from "./Metrics.mjs";
+import { documentsActive, documentsEvicted, presenceActive, presenceUpdates, storageIdleSnapshots } from "./Metrics.mjs";
+import { DocumentInstance } from "./DocumentInstance.mjs";
 import { _objectSpread2 } from "./_virtual/_@oxc-project_runtime@0.103.0/helpers/objectSpread2.mjs";
 import { MimicServerEngineTag } from "./MimicServerEngine.mjs";
-import { Context, Duration, Effect, HashMap, Layer, Metric, PubSub, Ref, Schema, Stream } from "effect";
-import { ServerDocument } from "@voidhash/mimic/server";
+import { Context, Duration, Effect, HashMap, Layer, Metric, PubSub, Ref, Schedule, Schema, Stream } from "effect";
 import { Entity } from "@effect/cluster";
 import { Rpc } from "@effect/rpc";
 
@@ -22,6 +22,7 @@ const DEFAULT_MAX_IDLE_TIME = Duration.minutes(5);
 const DEFAULT_MAX_TRANSACTION_HISTORY = 1e3;
 const DEFAULT_SNAPSHOT_INTERVAL = Duration.minutes(5);
 const DEFAULT_SNAPSHOT_THRESHOLD = 100;
+const DEFAULT_SNAPSHOT_IDLE_TIMEOUT = Duration.seconds(30);
 const DEFAULT_SHARD_GROUP = "mimic-documents";
 /**
 * Schema for encoded transaction (wire format)
@@ -100,7 +101,7 @@ const MimicDocumentEntity = Entity.make("MimicDocument", [
 */
 var MimicClusterConfigTag = class extends Context.Tag("@voidhash/mimic-effect/MimicClusterConfig")() {};
 const resolveClusterConfig = (config) => {
-	var _config$maxTransactio, _config$snapshot, _config$snapshot$tran, _config$snapshot2, _config$shardGroup;
+	var _config$maxTransactio, _config$snapshot, _config$snapshot$tran, _config$snapshot2, _config$snapshot3, _config$shardGroup;
 	return {
 		schema: config.schema,
 		initial: config.initial,
@@ -109,7 +110,8 @@ const resolveClusterConfig = (config) => {
 		maxTransactionHistory: (_config$maxTransactio = config.maxTransactionHistory) !== null && _config$maxTransactio !== void 0 ? _config$maxTransactio : DEFAULT_MAX_TRANSACTION_HISTORY,
 		snapshot: {
 			interval: ((_config$snapshot = config.snapshot) === null || _config$snapshot === void 0 ? void 0 : _config$snapshot.interval) ? Duration.decode(config.snapshot.interval) : DEFAULT_SNAPSHOT_INTERVAL,
-			transactionThreshold: (_config$snapshot$tran = (_config$snapshot2 = config.snapshot) === null || _config$snapshot2 === void 0 ? void 0 : _config$snapshot2.transactionThreshold) !== null && _config$snapshot$tran !== void 0 ? _config$snapshot$tran : DEFAULT_SNAPSHOT_THRESHOLD
+			transactionThreshold: (_config$snapshot$tran = (_config$snapshot2 = config.snapshot) === null || _config$snapshot2 === void 0 ? void 0 : _config$snapshot2.transactionThreshold) !== null && _config$snapshot$tran !== void 0 ? _config$snapshot$tran : DEFAULT_SNAPSHOT_THRESHOLD,
+			idleTimeout: ((_config$snapshot3 = config.snapshot) === null || _config$snapshot3 === void 0 ? void 0 : _config$snapshot3.idleTimeout) ? Duration.decode(config.snapshot.idleTimeout) : DEFAULT_SNAPSHOT_IDLE_TIMEOUT
 		},
 		shardGroup: (_config$shardGroup = config.shardGroup) !== null && _config$shardGroup !== void 0 ? _config$shardGroup : DEFAULT_SHARD_GROUP
 	};
@@ -131,150 +133,53 @@ const encodeTransaction = (tx) => {
 /**
 * Create the entity handler for MimicDocument
 */
-const createEntityHandler = (config, coldStorage, hotStorage) => Effect.gen(function* () {
+const createEntityHandler = (config, coldStorage, hotStorage) => Effect.fn("cluster.entity.handler.create")(function* () {
 	const documentId = (yield* Entity.CurrentAddress).entityId;
-	const SCHEMA_VERSION = 1;
-	const computeInitialState = () => {
-		if (config.initial === void 0) return Effect.succeed(void 0);
-		if (typeof config.initial === "function") return config.initial({ documentId });
-		return Effect.succeed(config.initial);
-	};
-	const storedDoc = yield* Effect.catchAll(coldStorage.load(documentId), () => Effect.succeed(void 0));
-	let initialState;
-	let initialVersion = 0;
-	if (storedDoc) {
-		initialState = storedDoc.state;
-		initialVersion = storedDoc.version;
-	} else initialState = yield* computeInitialState();
-	const broadcastPubSub = yield* PubSub.unbounded();
+	const instance = yield* DocumentInstance.make(documentId, {
+		schema: config.schema,
+		initial: config.initial,
+		maxTransactionHistory: config.maxTransactionHistory,
+		snapshot: config.snapshot
+	}, coldStorage, hotStorage).pipe(Effect.orDie);
 	const presencePubSub = yield* PubSub.unbounded();
 	const stateRef = yield* Ref.make({
-		document: void 0,
-		broadcastPubSub,
+		instance,
 		presences: HashMap.empty(),
-		presencePubSub,
-		lastSnapshotVersion: initialVersion,
-		lastSnapshotTime: Date.now(),
-		transactionsSinceSnapshot: 0
-	});
-	const document = ServerDocument.make({
-		schema: config.schema,
-		initialState,
-		initialVersion,
-		maxTransactionHistory: config.maxTransactionHistory,
-		onBroadcast: (message) => {
-			Effect.runSync(PubSub.publish(broadcastPubSub, {
-				type: "transaction",
-				transaction: message.transaction,
-				version: message.version
-			}));
-		},
-		onRejection: (transactionId, reason) => {
-			Effect.runSync(PubSub.publish(broadcastPubSub, {
-				type: "error",
-				transactionId,
-				reason
-			}));
-		}
+		presencePubSub
 	});
-	yield* Ref.update(stateRef, (s) => _objectSpread2(_objectSpread2({}, s), {}, { document }));
-	const walEntries = yield* Effect.catchAll(hotStorage.getEntries(documentId, initialVersion), () => Effect.succeed([]));
-	for (const entry of walEntries) {
-		const result = document.submit(entry.transaction);
-		if (!result.success) yield* Effect.logWarning("Skipping corrupted WAL entry", {
-			documentId,
-			version: entry.version,
-			reason: result.reason
-		});
-	}
-	if (storedDoc) yield* Metric.increment(documentsRestored);
-	else yield* Metric.increment(documentsCreated);
-	yield* Metric.incrementBy(documentsActive, 1);
-	/**
-	* Save snapshot to ColdStorage
-	*/
-	const saveSnapshot = Effect.gen(function* () {
-		const state = yield* Ref.get(stateRef);
-		const docState = state.document.get();
-		const version = state.document.getVersion();
-		if (docState === void 0) return;
-		const storedDocument = {
-			state: docState,
-			version,
-			schemaVersion: SCHEMA_VERSION,
-			savedAt: Date.now()
-		};
-		const snapshotStartTime = Date.now();
-		yield* Effect.catchAll(coldStorage.save(documentId, storedDocument), (e) => Effect.logError("Failed to save snapshot", {
-			documentId,
-			error: e
-		}));
-		const snapshotDuration = Date.now() - snapshotStartTime;
-		yield* Metric.increment(storageSnapshots);
-		yield* Metric.update(storageSnapshotLatency, snapshotDuration);
-		yield* Effect.catchAll(hotStorage.truncate(documentId, version), (e) => Effect.logError("Failed to truncate WAL", {
+	yield* Effect.addFinalizer(() => Effect.fn("cluster.entity.finalize")(function* () {
+		yield* Effect.catchAll(instance.saveSnapshot(), (e) => Effect.logError("Failed to save snapshot during entity finalization", {
 			documentId,
 			error: e
 		}));
-		yield* Ref.update(stateRef, (s) => _objectSpread2(_objectSpread2({}, s), {}, {
-			lastSnapshotVersion: version,
-			lastSnapshotTime: Date.now(),
-			transactionsSinceSnapshot: 0
-		}));
-	});
-	/**
-	* Check if snapshot should be triggered
-	*/
-	const checkSnapshotTriggers = Effect.gen(function* () {
-		const state = yield* Ref.get(stateRef);
-		const now = Date.now();
-		const intervalMs = Duration.toMillis(config.snapshot.interval);
-		const threshold = config.snapshot.transactionThreshold;
-		if (state.transactionsSinceSnapshot >= threshold) {
-			yield* saveSnapshot;
-			return;
-		}
-		if (now - state.lastSnapshotTime >= intervalMs) {
-			yield* saveSnapshot;
-			return;
-		}
-	});
-	yield* Effect.addFinalizer(() => Effect.gen(function* () {
-		yield* saveSnapshot;
 		yield* Metric.incrementBy(documentsActive, -1);
 		yield* Metric.increment(documentsEvicted);
 		yield* Effect.logDebug("Entity finalized", { documentId });
-	}));
+	})());
+	if (Duration.toMillis(config.snapshot.idleTimeout) > 0) yield* Effect.fn("cluster.entity.snapshot.loop")(function* () {
+		if (yield* instance.needsSnapshot()) {
+			yield* Effect.catchAll(instance.saveSnapshot(), (e) => Effect.logWarning("Periodic snapshot failed in cluster entity", {
+				documentId,
+				error: e
+			}));
+			yield* Metric.increment(storageIdleSnapshots);
+		}
+	})().pipe(Effect.repeat(Schedule.spaced(config.snapshot.idleTimeout)), Effect.fork);
 	return {
-		Submit: Effect.fnUntraced(function* ({ payload }) {
-			const submitStartTime = Date.now();
-			const state = yield* Ref.get(stateRef);
+		Submit: Effect.fn("cluster.document.transaction.submit")(function* ({ payload }) {
 			const transaction = decodeTransaction(payload.transaction);
-			const result = state.document.submit(transaction);
-			const latency = Date.now() - submitStartTime;
-			yield* Metric.update(transactionsLatency, latency);
-			if (result.success) {
-				yield* Metric.increment(transactionsProcessed);
-				const walEntry = {
-					transaction,
-					version: result.version,
-					timestamp: Date.now()
-				};
-				yield* Effect.catchAll(hotStorage.append(documentId, walEntry), (e) => Effect.logError("Failed to append to WAL", {
-					documentId,
-					error: e
-				}));
-				yield* Metric.increment(storageWalAppends);
-				yield* Ref.update(stateRef, (s) => _objectSpread2(_objectSpread2({}, s), {}, { transactionsSinceSnapshot: s.transactionsSinceSnapshot + 1 }));
-				yield* checkSnapshotTriggers;
-			} else yield* Metric.increment(transactionsRejected);
-			return result;
+			return yield* instance.submit(transaction).pipe(Effect.catchAll((error) => Effect.succeed({
+				success: false,
+				reason: `Storage error: ${String(error)}`
+			})));
 		}),
-		GetSnapshot: Effect.fnUntraced(function* () {
-			return (yield* Ref.get(stateRef)).document.getSnapshot();
+		GetSnapshot: Effect.fn("cluster.document.snapshot.get")(function* () {
+			return instance.getSnapshot();
 		}),
-		Touch: Effect.fnUntraced(function* () {}),
-		SetPresence: Effect.fnUntraced(function* ({ payload }) {
+		Touch: Effect.fn("cluster.document.touch")(function* () {
+			yield* instance.touch();
+		}),
+		SetPresence: Effect.fn("cluster.presence.set")(function* ({ payload }) {
 			const { connectionId, entry } = payload;
 			yield* Ref.update(stateRef, (s) => _objectSpread2(_objectSpread2({}, s), {}, { presences: HashMap.set(s.presences, connectionId, entry) }));
 			yield* Metric.increment(presenceUpdates);
@@ -288,7 +193,7 @@ const createEntityHandler = (config, coldStorage, hotStorage) => Effect.gen(func
 			};
 			yield* PubSub.publish(state.presencePubSub, event);
 		}),
-		RemovePresence: Effect.fnUntraced(function* ({ payload }) {
+		RemovePresence: Effect.fn("cluster.presence.remove")(function* ({ payload }) {
 			const { connectionId } = payload;
 			const state = yield* Ref.get(stateRef);
 			if (!HashMap.has(state.presences, connectionId)) return;
@@ -300,20 +205,20 @@ const createEntityHandler = (config, coldStorage, hotStorage) => Effect.gen(func
 			};
 			yield* PubSub.publish(state.presencePubSub, event);
 		}),
-		GetPresenceSnapshot: Effect.fnUntraced(function* () {
+		GetPresenceSnapshot: Effect.fn("cluster.presence.snapshot.get")(function* () {
 			const state = yield* Ref.get(stateRef);
 			const presences = {};
 			for (const [id, entry] of state.presences) presences[id] = entry;
 			return { presences };
 		})
 	};
-});
+})();
 var SubscriptionStoreTag = class extends Context.Tag("@voidhash/mimic-effect/SubscriptionStore")() {};
-const subscriptionStoreLayer = Layer.effect(SubscriptionStoreTag, Effect.gen(function* () {
+const subscriptionStoreLayer = Layer.effect(SubscriptionStoreTag, Effect.fn("cluster.subscriptions.layer.create")(function* () {
 	const documentPubSubs = yield* Ref.make(HashMap.empty());
 	const presencePubSubs = yield* Ref.make(HashMap.empty());
 	return {
-		getOrCreatePubSub: (documentId) => Effect.gen(function* () {
+		getOrCreatePubSub: Effect.fn("cluster.subscriptions.pubsub.get-or-create")(function* (documentId) {
 			const current = yield* Ref.get(documentPubSubs);
 			const existing = HashMap.get(current, documentId);
 			if (existing._tag === "Some") return existing.value;
@@ -321,7 +226,7 @@ const subscriptionStoreLayer = Layer.effect(SubscriptionStoreTag, Effect.gen(fun
 			yield* Ref.update(documentPubSubs, (map) => HashMap.set(map, documentId, pubsub));
 			return pubsub;
 		}),
-		getOrCreatePresencePubSub: (documentId) => Effect.gen(function* () {
+		getOrCreatePresencePubSub: Effect.fn("cluster.subscriptions.presence-pubsub.get-or-create")(function* (documentId) {
 			const current = yield* Ref.get(presencePubSubs);
 			const existing = HashMap.get(current, documentId);
 			if (existing._tag === "Some") return existing.value;
@@ -330,7 +235,7 @@ const subscriptionStoreLayer = Layer.effect(SubscriptionStoreTag, Effect.gen(fun
 			return pubsub;
 		})
 	};
-}));
+})());
 /**
 * Create a MimicClusterServerEngine layer.
 *