@voidhash/mimic-effect 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/MimicClusterServerEngine.cjs

@@ -1,11 +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 = require("@voidhash/mimic");
-let _voidhash_mimic_server = require("@voidhash/mimic/server");
 let _effect_cluster = require("@effect/cluster");
 let _effect_rpc = require("@effect/rpc");
 
@@ -131,227 +130,44 @@ 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* coldStorage.load(documentId).pipe(effect.Effect.orDie);
-	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
+		presencePubSub
 	});
-	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
-			}));
-		}
-	});
-	yield* effect.Ref.update(stateRef, (s) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, s), {}, { document }));
-	const walEntries = yield* hotStorage.getEntries(documentId, initialVersion).pipe(effect.Effect.orDie);
-	if (walEntries.length > 0) {
-		const firstWalVersion = walEntries[0].version;
-		const expectedFirst = initialVersion + 1;
-		if (firstWalVersion !== expectedFirst) {
-			yield* effect.Effect.logWarning("WAL version gap detected", {
-				documentId,
-				snapshotVersion: initialVersion,
-				firstWalVersion,
-				expectedFirst
-			});
-			yield* effect.Metric.increment(require_Metrics.storageVersionGaps);
-		}
-		for (let i = 1; i < walEntries.length; i++) {
-			const prev = walEntries[i - 1].version;
-			const curr = walEntries[i].version;
-			if (curr !== prev + 1) yield* effect.Effect.logWarning("WAL internal gap detected", {
-				documentId,
-				previousVersion: prev,
-				currentVersion: curr
-			});
-		}
-	}
-	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 derived from WAL entries.
-	* This ensures snapshots are always based on durable WAL data.
-	* Idempotent: skips save if already snapshotted at target version.
-	* Truncate failures are non-fatal and will be retried on next snapshot.
-	*/
-	const saveSnapshot = (targetVersion) => effect.Effect.gen(function* () {
-		var _baseSnapshot$version;
-		if (targetVersion <= (yield* effect.Ref.get(stateRef)).lastSnapshotVersion) return;
-		const snapshotStartTime = Date.now();
-		const baseSnapshotResult = yield* effect.Effect.either(coldStorage.load(documentId));
-		if (baseSnapshotResult._tag === "Left") {
-			yield* effect.Effect.logError("Failed to load base snapshot for WAL replay", {
-				documentId,
-				error: baseSnapshotResult.left
-			});
-			return;
-		}
-		const baseSnapshot = baseSnapshotResult.right;
-		const baseVersion = (_baseSnapshot$version = baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.version) !== null && _baseSnapshot$version !== void 0 ? _baseSnapshot$version : 0;
-		const baseState = baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.state;
-		const walEntriesResult = yield* effect.Effect.either(hotStorage.getEntries(documentId, baseVersion));
-		if (walEntriesResult._tag === "Left") {
-			yield* effect.Effect.logError("Failed to load WAL entries for snapshot", {
-				documentId,
-				error: walEntriesResult.left
-			});
-			return;
-		}
-		const relevantEntries = walEntriesResult.right.filter((e) => e.version <= targetVersion);
-		if (relevantEntries.length === 0 && !baseSnapshot) return;
-		let snapshotState = baseState;
-		for (const entry of relevantEntries) {
-			const tempDoc = _voidhash_mimic.Document.make(config.schema, { initialState: snapshotState });
-			tempDoc.apply(entry.transaction.ops);
-			snapshotState = tempDoc.get();
-		}
-		if (snapshotState === void 0) return;
-		const snapshotVersion = relevantEntries.length > 0 ? relevantEntries[relevantEntries.length - 1].version : baseVersion;
-		if (snapshotVersion <= (yield* effect.Ref.get(stateRef)).lastSnapshotVersion) return;
-		const storedDocument = {
-			state: snapshotState,
-			version: snapshotVersion,
-			schemaVersion: SCHEMA_VERSION,
-			savedAt: 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.Ref.update(stateRef, (s) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, s), {}, {
-			lastSnapshotVersion: snapshotVersion,
-			lastSnapshotTime: Date.now(),
-			transactionsSinceSnapshot: 0
-		}));
-		yield* effect.Effect.catchAll(hotStorage.truncate(documentId, snapshotVersion), (e) => effect.Effect.logWarning("WAL truncate failed - will retry on next snapshot", {
+	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,
-			version: snapshotVersion,
 			error: e
 		}));
-	});
-	/**
-	* Check if snapshot should be triggered
-	*/
-	const checkSnapshotTriggers = effect.Effect.gen(function* () {
-		const state = yield* effect.Ref.get(stateRef);
-		const now = Date.now();
-		const currentVersion = state.document.getVersion();
-		const intervalMs = effect.Duration.toMillis(config.snapshot.interval);
-		const threshold = config.snapshot.transactionThreshold;
-		if (state.transactionsSinceSnapshot >= threshold) {
-			yield* saveSnapshot(currentVersion);
-			return;
-		}
-		if (now - state.lastSnapshotTime >= intervalMs) {
-			yield* saveSnapshot(currentVersion);
-			return;
-		}
-	});
-	yield* effect.Effect.addFinalizer(() => effect.Effect.gen(function* () {
-		yield* saveSnapshot((yield* effect.Ref.get(stateRef)).document.getVersion());
 		yield* effect.Metric.incrementBy(require_Metrics.documentsActive, -1);
 		yield* effect.Metric.increment(require_Metrics.documentsEvicted);
 		yield* effect.Effect.logDebug("Entity finalized", { documentId });
-	}));
+	})());
 	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 validation = state.document.validate(transaction);
-			if (!validation.valid) {
-				yield* effect.Metric.increment(require_Metrics.transactionsRejected);
-				const latency$1 = Date.now() - submitStartTime;
-				yield* effect.Metric.update(require_Metrics.transactionsLatency, latency$1);
-				return {
-					success: false,
-					reason: validation.reason
-				};
-			}
-			const walEntry = {
-				transaction,
-				version: validation.nextVersion,
-				timestamp: Date.now()
-			};
-			const appendResult = yield* effect.Effect.either(hotStorage.appendWithCheck(documentId, walEntry, validation.nextVersion));
-			if (appendResult._tag === "Left") {
-				yield* effect.Effect.logError("WAL append failed", {
-					documentId,
-					version: validation.nextVersion,
-					error: appendResult.left
-				});
-				yield* effect.Metric.increment(require_Metrics.walAppendFailures);
-				const latency$1 = Date.now() - submitStartTime;
-				yield* effect.Metric.update(require_Metrics.transactionsLatency, latency$1);
-				return {
-					success: false,
-					reason: "Storage unavailable. Please retry."
-				};
-			}
-			state.document.apply(transaction);
-			const latency = Date.now() - submitStartTime;
-			yield* effect.Metric.update(require_Metrics.transactionsLatency, latency);
-			yield* effect.Metric.increment(require_Metrics.transactionsProcessed);
-			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;
-			return {
-				success: true,
-				version: validation.nextVersion
-			};
+			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);
@@ -365,7 +181,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;
@@ -377,20 +193,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;
@@ -398,7 +214,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;
@@ -407,7 +223,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":";;;;;;;;;;;cA+6Ba;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":";;;;;;;;;;;cA8nBa;yBA3JwB,SAAA,CAAU,sBACrC,+BAA+B,aACtC,KAAA,CAAM,MACP,6BAEA,iBAAiB,gBAAgB,sBAAsB,QAAA,CAAS"}

package/dist/MimicClusterServerEngine.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MimicClusterServerEngine.d.mts","names":[],"sources":["../src/MimicClusterServerEngine.ts"],"sourcesContent":[],"mappings":";;;;;;;;;;;cA+6Ba;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":";;;;;;;;;;;cA8nBa;yBA3JwB,SAAA,CAAU,sBACrC,+BAA+B,aACtC,KAAA,CAAM,MACP,6BAEA,iBAAiB,gBAAgB,sBAAsB,QAAA,CAAS"}

package/dist/MimicClusterServerEngine.mjs

@@ -1,12 +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, storageVersionGaps, storageWalAppends, transactionsLatency, transactionsProcessed, transactionsRejected, walAppendFailures } from "./Metrics.mjs";
+import { documentsActive, documentsEvicted, presenceActive, presenceUpdates } 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 { Document } from "@voidhash/mimic";
-import { ServerDocument } from "@voidhash/mimic/server";
 import { Entity } from "@effect/cluster";
 import { Rpc } from "@effect/rpc";
 
@@ -119,240 +118,57 @@ const resolveClusterConfig = (config) => {
 * Decode an encoded transaction to a Transaction object
 */
 const decodeTransaction = (encoded) => {
-	const { Transaction: Transaction$1 } = __require("@voidhash/mimic");
-	return Transaction$1.decode(encoded);
+	const { Transaction } = __require("@voidhash/mimic");
+	return Transaction.decode(encoded);
 };
 /**
 * Encode a Transaction to wire format
 */
 const encodeTransaction = (tx) => {
-	const { Transaction: Transaction$1 } = __require("@voidhash/mimic");
-	return Transaction$1.encode(tx);
+	const { Transaction } = __require("@voidhash/mimic");
+	return Transaction.encode(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* coldStorage.load(documentId).pipe(Effect.orDie);
-	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
+		presencePubSub
 	});
-	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
-			}));
-		}
-	});
-	yield* Ref.update(stateRef, (s) => _objectSpread2(_objectSpread2({}, s), {}, { document }));
-	const walEntries = yield* hotStorage.getEntries(documentId, initialVersion).pipe(Effect.orDie);
-	if (walEntries.length > 0) {
-		const firstWalVersion = walEntries[0].version;
-		const expectedFirst = initialVersion + 1;
-		if (firstWalVersion !== expectedFirst) {
-			yield* Effect.logWarning("WAL version gap detected", {
-				documentId,
-				snapshotVersion: initialVersion,
-				firstWalVersion,
-				expectedFirst
-			});
-			yield* Metric.increment(storageVersionGaps);
-		}
-		for (let i = 1; i < walEntries.length; i++) {
-			const prev = walEntries[i - 1].version;
-			const curr = walEntries[i].version;
-			if (curr !== prev + 1) yield* Effect.logWarning("WAL internal gap detected", {
-				documentId,
-				previousVersion: prev,
-				currentVersion: curr
-			});
-		}
-	}
-	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 derived from WAL entries.
-	* This ensures snapshots are always based on durable WAL data.
-	* Idempotent: skips save if already snapshotted at target version.
-	* Truncate failures are non-fatal and will be retried on next snapshot.
-	*/
-	const saveSnapshot = (targetVersion) => Effect.gen(function* () {
-		var _baseSnapshot$version;
-		if (targetVersion <= (yield* Ref.get(stateRef)).lastSnapshotVersion) return;
-		const snapshotStartTime = Date.now();
-		const baseSnapshotResult = yield* Effect.either(coldStorage.load(documentId));
-		if (baseSnapshotResult._tag === "Left") {
-			yield* Effect.logError("Failed to load base snapshot for WAL replay", {
-				documentId,
-				error: baseSnapshotResult.left
-			});
-			return;
-		}
-		const baseSnapshot = baseSnapshotResult.right;
-		const baseVersion = (_baseSnapshot$version = baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.version) !== null && _baseSnapshot$version !== void 0 ? _baseSnapshot$version : 0;
-		const baseState = baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.state;
-		const walEntriesResult = yield* Effect.either(hotStorage.getEntries(documentId, baseVersion));
-		if (walEntriesResult._tag === "Left") {
-			yield* Effect.logError("Failed to load WAL entries for snapshot", {
-				documentId,
-				error: walEntriesResult.left
-			});
-			return;
-		}
-		const relevantEntries = walEntriesResult.right.filter((e) => e.version <= targetVersion);
-		if (relevantEntries.length === 0 && !baseSnapshot) return;
-		let snapshotState = baseState;
-		for (const entry of relevantEntries) {
-			const tempDoc = Document.make(config.schema, { initialState: snapshotState });
-			tempDoc.apply(entry.transaction.ops);
-			snapshotState = tempDoc.get();
-		}
-		if (snapshotState === void 0) return;
-		const snapshotVersion = relevantEntries.length > 0 ? relevantEntries[relevantEntries.length - 1].version : baseVersion;
-		if (snapshotVersion <= (yield* Ref.get(stateRef)).lastSnapshotVersion) return;
-		const storedDocument = {
-			state: snapshotState,
-			version: snapshotVersion,
-			schemaVersion: SCHEMA_VERSION,
-			savedAt: 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* Ref.update(stateRef, (s) => _objectSpread2(_objectSpread2({}, s), {}, {
-			lastSnapshotVersion: snapshotVersion,
-			lastSnapshotTime: Date.now(),
-			transactionsSinceSnapshot: 0
-		}));
-		yield* Effect.catchAll(hotStorage.truncate(documentId, snapshotVersion), (e) => Effect.logWarning("WAL truncate failed - will retry on next snapshot", {
+	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,
-			version: snapshotVersion,
 			error: e
 		}));
-	});
-	/**
-	* Check if snapshot should be triggered
-	*/
-	const checkSnapshotTriggers = Effect.gen(function* () {
-		const state = yield* Ref.get(stateRef);
-		const now = Date.now();
-		const currentVersion = state.document.getVersion();
-		const intervalMs = Duration.toMillis(config.snapshot.interval);
-		const threshold = config.snapshot.transactionThreshold;
-		if (state.transactionsSinceSnapshot >= threshold) {
-			yield* saveSnapshot(currentVersion);
-			return;
-		}
-		if (now - state.lastSnapshotTime >= intervalMs) {
-			yield* saveSnapshot(currentVersion);
-			return;
-		}
-	});
-	yield* Effect.addFinalizer(() => Effect.gen(function* () {
-		yield* saveSnapshot((yield* Ref.get(stateRef)).document.getVersion());
 		yield* Metric.incrementBy(documentsActive, -1);
 		yield* Metric.increment(documentsEvicted);
 		yield* Effect.logDebug("Entity finalized", { documentId });
-	}));
+	})());
 	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 validation = state.document.validate(transaction);
-			if (!validation.valid) {
-				yield* Metric.increment(transactionsRejected);
-				const latency$1 = Date.now() - submitStartTime;
-				yield* Metric.update(transactionsLatency, latency$1);
-				return {
-					success: false,
-					reason: validation.reason
-				};
-			}
-			const walEntry = {
-				transaction,
-				version: validation.nextVersion,
-				timestamp: Date.now()
-			};
-			const appendResult = yield* Effect.either(hotStorage.appendWithCheck(documentId, walEntry, validation.nextVersion));
-			if (appendResult._tag === "Left") {
-				yield* Effect.logError("WAL append failed", {
-					documentId,
-					version: validation.nextVersion,
-					error: appendResult.left
-				});
-				yield* Metric.increment(walAppendFailures);
-				const latency$1 = Date.now() - submitStartTime;
-				yield* Metric.update(transactionsLatency, latency$1);
-				return {
-					success: false,
-					reason: "Storage unavailable. Please retry."
-				};
-			}
-			state.document.apply(transaction);
-			const latency = Date.now() - submitStartTime;
-			yield* Metric.update(transactionsLatency, latency);
-			yield* Metric.increment(transactionsProcessed);
-			yield* Metric.increment(storageWalAppends);
-			yield* Ref.update(stateRef, (s) => _objectSpread2(_objectSpread2({}, s), {}, { transactionsSinceSnapshot: s.transactionsSinceSnapshot + 1 }));
-			yield* checkSnapshotTriggers;
-			return {
-				success: true,
-				version: validation.nextVersion
-			};
+			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);
@@ -366,7 +182,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;
@@ -378,20 +194,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;
@@ -399,7 +215,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;
@@ -408,7 +224,7 @@ const subscriptionStoreLayer = Layer.effect(SubscriptionStoreTag, Effect.gen(fun
 			return pubsub;
 		})
 	};
-}));
+})());
 /**
 * Create a MimicClusterServerEngine layer.
 *