@powerhousedao/reactor 6.2.3-dev.24 → 6.2.3-dev.26

package/dist/{drive-container-types-Be5-EY9W.js → forwarding-logger-CnuVDVze.js}

@@ -1,4 +1,3 @@
-import { n as ReactorEventTypes, t as EventBusAggregateError } from "./types-DxDCmtId.js";
 import { AUTH_ACTION_TYPES, AUTH_DENIED_BY_GRANT_REASON, AUTH_NO_GRANT_REASON, AUTH_VERSION_UNSUPPORTED_REASON, DOCUMENT_DELETED_REASON, DOCUMENT_SCOPE_ACTION_TYPES, DowngradeNotSupportedError as DowngradeNotSupportedError$1, actionSignerIdentity, actionSigningTarget, appendWithoutApplying, applyAuthAction, applyDeleteDocumentAction, applyDeleteDocumentAction as applyDeleteDocumentAction$1, applyUpgradeDocumentAction, applyUpgradeDocumentAction as applyUpgradeDocumentAction$1, base58Decode, baseReducerVersion, buildOperationSignatureMessage, buildOperationSignatureParams, canonicalJson, createPresignedHeader, decide, defaultBaseState, deriveDocumentId, deriveOperationId, evaluate, garbageCollect, groupDocumentType, groupMembershipActionTypes, hashActionV2, hashBrowser, hashDocumentStateForScope, isDenied, isDerivedDocumentId, isUndoRedo, isV2ActionHash, mentionedGroupIds, normalizeDocumentModelVersion, operationOutcome, referencedGroupIds, signaturePolicyOf, sortOperations, targetDocumentId, v2TupleProblem, withProtocolVersions } from "@powerhousedao/shared/document-model";
 import { v4 } from "uuid";
 import { Migrator, sql } from "kysely";
@@ -52,6 +51,37 @@ function parsePagingOptions(paging, defaultLimit) {
 	};
 }
 //#endregion
+//#region src/events/types.ts
+/**
+* Custom error class that aggregates multiple errors from event subscribers.
+*/
+var EventBusAggregateError = class extends Error {
+	errors;
+	constructor(errors) {
+		const message = `EventBus emit failed with ${errors.length} error(s): ${errors.map((e) => {
+			if (e && typeof e === "object" && "message" in e) return e.message;
+			return String(e);
+		}).join("; ")}`;
+		super(message);
+		this.name = "EventBusAggregateError";
+		this.errors = errors;
+	}
+};
+/**
+* Event types for reactor lifecycle events.
+*/
+const ReactorEventTypes = {
+	JOB_PENDING: 10001,
+	JOB_RUNNING: 10002,
+	JOB_WRITE_READY: 10003,
+	JOB_READ_READY: 10004,
+	JOB_FAILED: 10005,
+	READMODEL_BATCH_COMPLETED: 10006,
+	READMODEL_INDEXED: 10007,
+	MODEL_LOADED: 10008,
+	SIGNATURE_REFUSED: 10009
+};
+//#endregion
 //#region src/shared/errors.ts
 /**
 * Error thrown when attempting to access a deleted document.
@@ -329,6 +359,7 @@ const APPEND_CONDITION_FAILED_PREFIX = "Append condition failed: ";
 * conflict, not a fault: the caller retries against the new stream heads.
 */
 var AppendConditionFailedError = class extends Error {
+	condition;
 	constructor(condition) {
 		const streams = condition.streams.map((s) => `${s.documentId}:${s.scope}:${s.branch}@${s.revision}`).join(", ");
 		super(`${APPEND_CONDITION_FAILED_PREFIX}a read-set stream advanced [${streams}]`);
@@ -1033,6 +1064,7 @@ const JobExecutorEventTypes = {
 //#endregion
 //#region src/cache/collection-membership-cache.ts
 var CollectionMembershipCache = class CollectionMembershipCache {
+	operationIndex;
 	cache = /* @__PURE__ */ new Map();
 	constructor(operationIndex) {
 		this.operationIndex = operationIndex;
@@ -1328,6 +1360,7 @@ var KyselyOperationIndexTxn = class {
 	}
 };
 var KyselyOperationIndex = class KyselyOperationIndex {
+	db;
 	trx;
 	constructor(db) {
 		this.db = db;
@@ -1667,21 +1700,6 @@ var RingBuffer = class {
 	}
 };
 //#endregion
-//#region src/cache/write-cache-types.ts
-/**
-* Where a snapshot sits in its stream.
-*
-* - `Head`: the newest revision of the stream when it was stored. Only these
-*   can answer a read that asks for the head.
-* - `Historical`: state at an earlier revision. Usable as a starting point to
-*   replay forward from, and as an answer to a read for that same revision.
-*/
-let SnapshotPosition = /* @__PURE__ */ function(SnapshotPosition) {
-	SnapshotPosition["Head"] = "head";
-	SnapshotPosition["Historical"] = "historical";
-	return SnapshotPosition;
-}({});
-//#endregion
 //#region src/cache/kysely-write-cache.ts
 /**
 * The last operation index a keyframe's document reflects for the scope. A
@@ -1820,13 +1838,13 @@ var KyselyWriteCache = class KyselyWriteCache {
 			const snapshots = stream.ringBuffer.getAll();
 			if (targetRevision === void 0) {
 				const newest = highestRevision(snapshots);
-				if (newest?.position === SnapshotPosition.Head) {
+				if (newest?.position === "head") {
 					this.lruTracker.touch(streamKey);
 					return copyDocument(newest.document);
 				}
 				if (newest) {
 					const document = await this.warmMissRebuild(newest.document, newest.revision, documentId, scope, branch, void 0, signal);
-					this.store(documentId, scope, branch, (document.header.revision[scope] ?? 0) - 1, document, SnapshotPosition.Head);
+					this.store(documentId, scope, branch, (document.header.revision[scope] ?? 0) - 1, document, "head");
 					this.lruTracker.touch(streamKey);
 					return document;
 				}
@@ -1839,7 +1857,7 @@ var KyselyWriteCache = class KyselyWriteCache {
 				const newestOlder = this.findNearestOlderSnapshot(snapshots, targetRevision);
 				if (newestOlder) {
 					const document = await this.warmMissRebuild(newestOlder.document, newestOlder.revision, documentId, scope, branch, targetRevision, signal);
-					this.store(documentId, scope, branch, targetRevision, document, SnapshotPosition.Historical);
+					this.store(documentId, scope, branch, targetRevision, document, "historical");
 					this.lruTracker.touch(streamKey);
 					return document;
 				}
@@ -1847,7 +1865,7 @@ var KyselyWriteCache = class KyselyWriteCache {
 		}
 		const document = await this.coldMissRebuild(documentId, scope, branch, targetRevision, signal);
 		const revision = targetRevision ?? (document.header.revision[scope] ?? 0) - 1;
-		this.store(documentId, scope, branch, revision, document, targetRevision === void 0 ? SnapshotPosition.Head : SnapshotPosition.Historical);
+		this.store(documentId, scope, branch, revision, document, targetRevision === void 0 ? "head" : "historical");
 		return document;
 	}
 	/**
@@ -1882,7 +1900,7 @@ var KyselyWriteCache = class KyselyWriteCache {
 		if (run.length === 0) return;
 		for (const entry of run.slice(0, -1)) this.persistKeyframe(documentId, scope, branch, entry.revision, entry.document);
 		const head = run[run.length - 1];
-		this.store(documentId, scope, branch, head.revision, head.document, SnapshotPosition.Head);
+		this.store(documentId, scope, branch, head.revision, head.document, "head");
 	}
 	store(documentId, scope, branch, revision, document, position) {
 		const streamKey = this.makeStreamKey(documentId, scope, branch);
@@ -2401,6 +2419,11 @@ function validateFeatureFlags(flags, prerequisites) {
 //#endregion
 //#region src/executor/execution-scope.ts
 var DefaultExecutionScope = class {
+	operationStore;
+	operationIndex;
+	writeCache;
+	documentMetaCache;
+	collectionMembershipCache;
 	constructor(operationStore, operationIndex, writeCache, documentMetaCache, collectionMembershipCache) {
 		this.operationStore = operationStore;
 		this.operationIndex = operationIndex;
@@ -2420,6 +2443,13 @@ var DefaultExecutionScope = class {
 	}
 };
 var KyselyExecutionScope = class {
+	db;
+	operationStore;
+	operationIndex;
+	keyframeStore;
+	writeCache;
+	documentMetaCache;
+	collectionMembershipCache;
 	constructor(db, operationStore, operationIndex, keyframeStore, writeCache, documentMetaCache, collectionMembershipCache) {
 		this.db = db;
 		this.operationStore = operationStore;
@@ -2447,7 +2477,7 @@ var KyselyExecutionScope = class {
 };
 //#endregion
 //#region src/utils/reshuffle.ts
-const STRICT_ORDER_ACTION_TYPES = new Set([
+const STRICT_ORDER_ACTION_TYPES = /* @__PURE__ */ new Set([
 	"CREATE_DOCUMENT",
 	"DELETE_DOCUMENT",
 	"UPGRADE_DOCUMENT",
@@ -2778,6 +2808,8 @@ const DRIVE_COLLECTION_PREFIX = "drive.";
 * rows and persisted remotes remain valid without migration.
 */
 var DriveCollectionId = class DriveCollectionId {
+	driveId;
+	branch;
 	constructor(driveId, branch) {
 		this.driveId = driveId;
 		this.branch = branch;
@@ -2810,6 +2842,11 @@ var DriveCollectionId = class DriveCollectionId {
 //#endregion
 //#region src/executor/document-action-handler.ts
 var DocumentActionHandler = class {
+	registry;
+	logger;
+	driveContainerTypes;
+	featureFlags;
+	decisionModel;
 	constructor(registry, logger, driveContainerTypes, featureFlags, decisionModel) {
 		this.registry = registry;
 		this.logger = logger;
@@ -2902,7 +2939,7 @@ var DocumentActionHandler = class {
 			[job.scope]: [...standing.operations[job.scope] ?? [], operation]
 		};
 		executing.touchedStreams.add(job.documentId, job.scope, job.branch);
-		stores.writeCache.putState(job.documentId, job.scope, job.branch, operation.index, standing, SnapshotPosition.Head);
+		stores.writeCache.putState(job.documentId, job.scope, job.branch, operation.index, standing, "head");
 		indexTxn.write([{
 			...operation,
 			documentId: job.documentId,
@@ -2956,7 +2993,7 @@ var DocumentActionHandler = class {
 			[job.scope]: [...document.operations[job.scope] ?? [], operation]
 		};
 		executing.touchedStreams.add(document.header.id, job.scope, job.branch);
-		stores.writeCache.putState(document.header.id, job.scope, job.branch, operation.index, document, SnapshotPosition.Head);
+		stores.writeCache.putState(document.header.id, job.scope, job.branch, operation.index, document, "head");
 		indexTxn.write([{
 			...operation,
 			documentId: document.header.id,
@@ -3017,7 +3054,7 @@ var DocumentActionHandler = class {
 			[job.scope]: [...document.operations[job.scope] ?? [], operation]
 		};
 		executing.touchedStreams.add(documentId, job.scope, job.branch);
-		stores.writeCache.putState(documentId, job.scope, job.branch, operation.index, document, SnapshotPosition.Head);
+		stores.writeCache.putState(documentId, job.scope, job.branch, operation.index, document, "head");
 		indexTxn.write([{
 			...operation,
 			documentId,
@@ -3068,7 +3105,7 @@ var DocumentActionHandler = class {
 				} catch (error) {
 					return buildErrorResult(job, /* @__PURE__ */ new Error(`Failed to fetch revisions for upgrade: ${error instanceof Error ? error.message : String(error)}`), startTime);
 				}
-				const revisionScopes = new Set([...Object.keys(input.revision), ...Object.keys(actualRevisions)]);
+				const revisionScopes = /* @__PURE__ */ new Set([...Object.keys(input.revision), ...Object.keys(actualRevisions)]);
 				for (const revisionScope of revisionScopes) {
 					const snapshot = input.revision[revisionScope] ?? 0;
 					const actual = actualRevisions[revisionScope] ?? 0;
@@ -3129,7 +3166,7 @@ var DocumentActionHandler = class {
 			[job.scope]: [...document.operations[job.scope] ?? [], operation]
 		};
 		executing.touchedStreams.add(documentId, job.scope, job.branch);
-		stores.writeCache.putState(documentId, job.scope, job.branch, operation.index, document, SnapshotPosition.Head);
+		stores.writeCache.putState(documentId, job.scope, job.branch, operation.index, document, "head");
 		for (const scope of otherScopes) executing.postCommitInvalidations.push({
 			documentId,
 			scope,
@@ -3216,7 +3253,7 @@ var DocumentActionHandler = class {
 		const resultingState = JSON.stringify(resultingStateObj);
 		executing.touchedStreams.add(input.sourceId, job.scope, job.branch);
 		executing.touchedStreams.add(input.targetId, job.scope, job.branch);
-		stores.writeCache.putState(input.sourceId, job.scope, job.branch, operation.index, sourceDoc, SnapshotPosition.Head);
+		stores.writeCache.putState(input.sourceId, job.scope, job.branch, operation.index, sourceDoc, "head");
 		indexTxn.write([{
 			...operation,
 			documentId: input.sourceId,
@@ -3272,7 +3309,7 @@ var DocumentActionHandler = class {
 var PassthroughSigner = class {
 	publicKey = {};
 	sign() {
-		return Promise.resolve(new Uint8Array(0));
+		return Promise.resolve(/* @__PURE__ */ new Uint8Array(0));
 	}
 	verify() {
 		return Promise.resolve();
@@ -3360,7 +3397,7 @@ function decompressP256(compressed, did) {
 	let y = modPow(ySquared, (P + BigInt(1)) / BigInt(4), P);
 	if (y * y % P !== ySquared) throw new MalformedDidKeyError(did, "x is not on the curve");
 	if (y % BigInt(2) === BigInt(0) !== (prefix === 2)) y = P - y;
-	const uncompressed = new Uint8Array(65);
+	const uncompressed = /* @__PURE__ */ new Uint8Array(65);
 	uncompressed[0] = 4;
 	uncompressed.set(bigIntToBytes(x), 1);
 	uncompressed.set(bigIntToBytes(y), 33);
@@ -3378,7 +3415,7 @@ function modPow(base, exp, mod) {
 	return result;
 }
 function bigIntToBytes(value) {
-	const bytes = new Uint8Array(32);
+	const bytes = /* @__PURE__ */ new Uint8Array(32);
 	let v = value;
 	for (let i = 31; i >= 0; i--) {
 		bytes[i] = Number(v & BigInt(255));
@@ -3582,7 +3619,7 @@ function bytesToBase64(bytes) {
 //#endregion
 //#region src/executor/synthesized-signing.ts
 /** Submitted types whose stored action the reducer writes in their place. */
-const SYNTHESIZING_TYPES = new Set(["UNDO", "REDO"]);
+const SYNTHESIZING_TYPES = /* @__PURE__ */ new Set(["UNDO", "REDO"]);
 /**
 * The id of the action synthesized from `submittedId`. Derived, so the stored
 * operation answers for the submitted id at the live-id check.
@@ -3638,6 +3675,10 @@ async function signSynthesized(operation, submitted, target, signer, signal) {
 const DEFAULT_TRUST_TIMEOUT_MS = 1e4;
 /** Runs once per write, when this reactor first stores it; never on re-appends. */
 var SignatureAdmission = class {
+	mode;
+	logger;
+	eventBus;
+	policySource;
 	trustPolicy;
 	trustTimeoutMs;
 	constructor(mode, logger, eventBus, policySource = "meta", trust = {
@@ -3688,23 +3729,24 @@ var SignatureAdmission = class {
 			operation
 		}));
 		const live = await this.liveOperationIds(candidates, operationStore, signal);
+		const redelivered = await this.redelivered(candidates, live, operationStore, signal);
 		await resolvePolicies(candidates, job.operations.map((operation) => operation.action), (documentId, branch) => storedPolicy(stores, this.policySource, documentId, branch, signal));
 		const dropped = /* @__PURE__ */ new Set();
 		for (let i = 0; i < candidates.length; i++) {
-			const verdict = await this.verdict(candidates[i], live, void 0, "load", signal);
+			const verdict = await this.verdict(candidates[i], live, void 0, "load", signal, redelivered.has(candidates[i]));
 			if (verdict.ok) continue;
 			if (this.record(job, candidates[i], verdict, "load")) dropped.add(operations[i]);
 		}
 		return dropped;
 	}
-	async verdict(entry, live, submitted, path, signal) {
+	async verdict(entry, live, submitted, path, signal, known = false) {
 		const verdict = await verifyActionSignature(entry.action, {
 			documentId: entry.stream.documentId,
 			branch: entry.stream.branch,
 			policy: entry.policy
 		}, path, entry.operation);
 		if (!verdict.ok) return verdict;
-		if (isLive(entry, live) || submitted?.has(entry.opId)) return {
+		if (!known && (isLive(entry, live) || submitted?.has(entry.opId))) return {
 			ok: false,
 			scheme: verdict.scheme,
 			code: "DUPLICATE_ACTION",
@@ -3719,6 +3761,7 @@ var SignatureAdmission = class {
 				reason: `action ${entry.action.id} is unsigned but claims to act as ${address}`
 			} : verdict;
 		}
+		if (known) return verdict;
 		const signer = entry.action.context.signer;
 		if (!await this.authorize(signer, entry.stream.documentId, signal)) return {
 			ok: false,
@@ -3750,7 +3793,9 @@ var SignatureAdmission = class {
 		}
 	}
 	/**
-	* The live candidates stored exactly as submitted. A synthesized operation
+	* The live candidates stored exactly as submitted and still standing: one
+	* an undo or a reshuffle has since superseded is refused, not re-emitted with
+	* the state it once produced. A synthesized operation
 	* holds another action, so it cannot be compared; only a retry, whose first
 	* attempt this job was, takes it as committed.
 	*/
@@ -3763,13 +3808,29 @@ var SignatureAdmission = class {
 		for (const [stream, entries] of byStream(toCompare)) {
 			const stored = await operationStore.getOperationsByIds(stream.documentId, stream.scope, stream.branch, entries.map((entry) => entry.opId), signal);
 			const byId = new Map(stored.map((operation) => [operation.id, operation]));
-			for (const entry of entries) {
+			const matching = entries.filter((entry) => {
 				const operation = byId.get(entry.opId);
-				if (operation && sameContent(operation.action, entry.action)) committed.set(entry, committedWrite(entry, entry.opId));
-			}
+				return operation && sameContent(operation.action, entry.action);
+			});
+			if (matching.length === 0) continue;
+			const later = await operationStore.getSince(stream.documentId, stream.scope, stream.branch, Math.min(...matching.map((entry) => byId.get(entry.opId).index)), void 0, void 0, signal);
+			for (const entry of matching) if (!isSuperseded(byId.get(entry.opId), later.results)) committed.set(entry, committedWrite(entry, entry.opId));
 		}
 		return committed;
 	}
+	/**
+	* The load candidates stored exactly as they arrive, timestamp included: a
+	* peer re-sending what this stream holds, not a replay of its action.
+	*/
+	async redelivered(candidates, live, operationStore, signal) {
+		const found = /* @__PURE__ */ new Set();
+		const toCompare = candidates.filter((entry) => live.has(entry.opId) && !(entry.synthesizedOpId && live.has(entry.synthesizedOpId)));
+		for (const [stream, entries] of byStream(toCompare)) {
+			const stored = await operationStore.getOperationsByIds(stream.documentId, stream.scope, stream.branch, entries.map((entry) => entry.opId), signal);
+			for (const entry of entries) if (stored.some((operation) => operation.id === entry.opId && Date.parse(operation.timestampUtcMs) === Date.parse(entry.operation?.timestampUtcMs ?? "") && sameContent(operation.action, entry.action))) found.add(entry);
+		}
+		return found;
+	}
 	async liveOperationIds(candidates, operationStore, signal) {
 		const live = /* @__PURE__ */ new Set();
 		for (const [stream, entries] of byStream(candidates)) {
@@ -3823,8 +3884,12 @@ async function resolvePolicies(candidates, jobActions, stored) {
 }
 async function storedPolicy(stores, source, documentId, branch, signal) {
 	try {
-		if (source === "write-cache") return signaturePolicyOf((await stores.writeCache.getState(documentId, "document", branch, void 0, signal)).header);
-		return signaturePolicyOf((await stores.documentMetaCache.getDocumentMeta(documentId, branch, signal)).protocolVersions);
+		if (source === "write-cache") {
+			const document = await stores.writeCache.getState(documentId, "document", branch, void 0, signal);
+			return signaturePolicyOf(document.header);
+		}
+		const meta = await stores.documentMetaCache.getDocumentMeta(documentId, branch, signal);
+		return signaturePolicyOf(meta.protocolVersions);
 	} catch (error) {
 		if (DocumentNotFoundError.isError(error)) return;
 		throw error;
@@ -3875,6 +3940,9 @@ function committedWrite(entry, opId) {
 		opId
 	};
 }
+function isSuperseded(operation, later) {
+	return later.some((next) => next.index > operation.index && next.skip > 0 && next.index - next.skip <= operation.index);
+}
 function sameContent(stored, submitted) {
 	try {
 		return canonicalJson(stored) === canonicalJson(submitted);
@@ -3899,6 +3967,7 @@ function isValidISOTimestamp(value) {
 * every test expect a failed job to look like.
 */
 var JobRollbackSignal = class extends Error {
+	result;
 	constructor(result) {
 		super("job rolled back");
 		this.result = result;
@@ -3906,6 +3975,15 @@ var JobRollbackSignal = class extends Error {
 	}
 };
 var SimpleJobExecutor = class {
+	logger;
+	registry;
+	operationStore;
+	eventBus;
+	writeCache;
+	operationIndex;
+	documentMetaCache;
+	collectionMembershipCache;
+	driveContainerTypes;
 	config;
 	featureFlags;
 	decisionModel;
@@ -4831,7 +4909,7 @@ var SimpleJobExecutor = class {
 			stores.writeCache.invalidate(job.documentId, scope, job.branch);
 			const result = await this.processActions(tail.map((operation, i) => ({
 				action: operation.action,
-				skip: i === 0 ? retractionSkip(nextIndex, tail[0].index) : 0,
+				skip: i === 0 ? retractionSkip(nextIndex, tail[0].index - tail[0].skip) : 0,
 				sourceRemote: "",
 				deniedReason: reevaluated[firstChange + i]
 			})), {
@@ -4993,7 +5071,8 @@ var SimpleJobExecutor = class {
 			...operation,
 			id: operation.id
 		})));
-		for (const operation of reshuffledOperations) if (operation.action.type === "NOOP" && operation.skip === 0) operation.skip = 1;
+		const incomingIds = new Set(incomingOpsToApply.map((operation) => operation.action.id));
+		for (const operation of reshuffledOperations) if (operation.action.type === "NOOP" && operation.skip === 0 && incomingIds.has(operation.action.id)) operation.skip = 1;
 		let deniedReasons;
 		if (this.featureFlags.documentDecisions) try {
 			deniedReasons = await evaluateByPosition(this.decisionModel, {
@@ -5071,17 +5150,35 @@ var SimpleJobExecutor = class {
 			}
 		}
 		const incomingActionIds = new Set(operations.map((op) => op.action.id));
+		const supersededBy = (op) => {
+			let nearest;
+			for (const laterOp of allOpsFromMinConflictingIndex) if (laterOp.index > op.index && laterOp.skip > 0 && laterOp.index - laterOp.skip <= op.index && (nearest === void 0 || laterOp.index < nearest.index)) nearest = laterOp;
+			return nearest;
+		};
+		const undoneActionIds = /* @__PURE__ */ new Set();
+		let predecessorBound = minIncomingIndex;
+		const rowsByActionId = /* @__PURE__ */ new Map();
+		for (const op of conflictingOps) if (incomingActionIds.has(op.action.id)) rowsByActionId.set(op.action.id, [...rowsByActionId.get(op.action.id) ?? [], op]);
+		const liveOps = /* @__PURE__ */ new Set();
+		for (const op of conflictingOps) if (supersededBy(op) === void 0) liveOps.add(op);
+		for (const [actionId, rows] of rowsByActionId) {
+			if (rows.some((row) => liveOps.has(row))) continue;
+			if (rows.some((row) => supersededBy(row)?.action.type === "NOOP")) undoneActionIds.add(actionId);
+			else predecessorBound = Math.min(predecessorBound, Math.max(...rows.map((row) => row.index)));
+		}
 		const nonSupersededOps = conflictingOps.filter((op) => {
-			if (op.index < minIncomingIndex && !incomingActionIds.has(op.action.id)) return false;
-			for (const laterOp of allOpsFromMinConflictingIndex) if (laterOp.index > op.index && laterOp.skip > 0) {
-				if (laterOp.index - laterOp.skip <= op.index) return false;
-			}
-			return true;
+			if (op.index < predecessorBound && !incomingActionIds.has(op.action.id)) return false;
+			return liveOps.has(op);
 		});
+		let rewoundFrom = Number.POSITIVE_INFINITY;
+		for (const op of nonSupersededOps) if (!isGenesisOperation(op)) rewoundFrom = Math.min(rewoundFrom, op.index - op.skip);
+		const reappended = new Set(nonSupersededOps.map((op) => op.index));
+		for (const op of allOpsFromMinConflictingIndex) if (op.index >= rewoundFrom && !reappended.has(op.index) && supersededBy(op) === void 0) nonSupersededOps.push(op);
 		const existingActionIds = new Set(nonSupersededOps.map((op) => op.action.id));
 		const seenIncomingActionIds = /* @__PURE__ */ new Set();
 		const incomingOpsToApply = operations.filter((op) => {
 			if (existingActionIds.has(op.action.id)) return false;
+			if (undoneActionIds.has(op.action.id)) return false;
 			if (seenIncomingActionIds.has(op.action.id)) return false;
 			seenIncomingActionIds.add(op.action.id);
 			return true;
@@ -5238,6 +5335,7 @@ var DocumentModelRegistry = class {
 //#endregion
 //#region src/storage/kysely/keyframe-store.ts
 var KyselyKeyframeStore = class KyselyKeyframeStore {
+	db;
 	trx;
 	constructor(db) {
 		this.db = db;
@@ -5322,6 +5420,11 @@ function paginateRows(rows, paging, cursorOf, toItem, refetch) {
 //#endregion
 //#region src/storage/txn.ts
 var AtomicTransaction = class {
+	documentId;
+	documentType;
+	scope;
+	branch;
+	baseRevision;
 	operations = [];
 	constructor(documentId, documentType, scope, branch, baseRevision) {
 		this.documentId = documentId;
@@ -5355,6 +5458,11 @@ var AtomicTransaction = class {
 //#endregion
 //#region src/storage/kysely/store.ts
 var _UniqueConstraintContext = class extends Error {
+	documentId;
+	scope;
+	branch;
+	revision;
+	stagedOps;
 	constructor(documentId, scope, branch, revision, stagedOps) {
 		super("unique constraint");
 		this.documentId = documentId;
@@ -5366,6 +5474,7 @@ var _UniqueConstraintContext = class extends Error {
 	}
 };
 var KyselyOperationStore = class KyselyOperationStore {
+	db;
 	trx;
 	constructor(db) {
 		this.db = db;
@@ -5465,12 +5574,13 @@ var KyselyOperationStore = class KyselyOperationStore {
 	* otherwise read a snapshot taken before the locks were held.
 	*/
 	async acquireStreamLocks(trx, documentId, scope, branch, condition) {
-		const keys = new Set([`${documentId}:${scope}:${branch}`]);
+		const keys = /* @__PURE__ */ new Set([`${documentId}:${scope}:${branch}`]);
 		for (const stream of condition.streams) keys.add(`${stream.documentId}:${stream.scope}:${stream.branch}`);
+		const sortedKeys = sql.join([...keys].sort());
 		await sql`
       with ordered as materialized (
         select key
-        from unnest(array[${sql.join([...keys].sort())}]::text[]) with ordinality as t(key, ord)
+        from unnest(array[${sortedKeys}]::text[]) with ordinality as t(key, ord)
         order by ord
       )
       select pg_advisory_xact_lock(hashtext(key)) from ordered
@@ -6109,8 +6219,148 @@ async function getMigrationStatus(db, schema = REACTOR_SCHEMA) {
 }
 //#endregion
 //#region src/core/drive-container-types.ts
-const DEFAULT_DRIVE_CONTAINER_TYPES = new Set(["powerhouse/document-drive", "powerhouse/reactor-drive"]);
+const DEFAULT_DRIVE_CONTAINER_TYPES = /* @__PURE__ */ new Set(["powerhouse/document-drive", "powerhouse/reactor-drive"]);
+//#endregion
+//#region src/executor/worker/error-info.ts
+const MAX_STACK_LENGTH = 8192;
+const MAX_CAUSE_DEPTH = 8;
+function toErrorInfo(err, depth = 0) {
+	if (depth > MAX_CAUSE_DEPTH) return {
+		name: "Error",
+		message: "cause chain truncated"
+	};
+	if (err instanceof Error) {
+		const info = {
+			name: err.name || "Error",
+			message: err.message
+		};
+		if (typeof err.stack === "string") info.stack = err.stack.length > MAX_STACK_LENGTH ? err.stack.slice(0, MAX_STACK_LENGTH) : err.stack;
+		if (err.cause !== void 0) info.cause = toErrorInfo(err.cause, depth + 1);
+		return info;
+	}
+	if (typeof err === "string") return {
+		name: "Error",
+		message: err
+	};
+	if (err && typeof err === "object") {
+		const record = err;
+		return {
+			name: typeof record.name === "string" ? record.name : "Error",
+			message: typeof record.message === "string" ? record.message : safeStringify(err)
+		};
+	}
+	return {
+		name: "Error",
+		message: safeStringify(err)
+	};
+}
+function safeStringify(value) {
+	if (value === null || value === void 0) return String(value);
+	if (typeof value === "string") return value;
+	if (typeof value === "number" || typeof value === "boolean") return String(value);
+	try {
+		return JSON.stringify(value);
+	} catch {
+		return "[unserializable]";
+	}
+}
+function fromErrorInfo(info) {
+	const err = new Error(info.message);
+	Object.defineProperty(err, "name", {
+		value: info.name,
+		configurable: true,
+		writable: true
+	});
+	if (info.stack !== void 0) err.stack = info.stack;
+	if (info.cause !== void 0) Object.defineProperty(err, "cause", {
+		value: fromErrorInfo(info.cause),
+		configurable: true,
+		writable: true
+	});
+	return err;
+}
+//#endregion
+//#region src/executor/worker/sanitize.ts
+const MAX_DEPTH = 8;
+function errorToInfo(err) {
+	return toErrorInfo(err);
+}
+function sanitizeArg(value, depth = 0, seen = /* @__PURE__ */ new WeakSet()) {
+	if (depth > MAX_DEPTH) return "[Truncated]";
+	if (value === null || value === void 0) return null;
+	if (typeof value === "boolean") return value;
+	if (typeof value === "number") return value;
+	if (typeof value === "string") return value;
+	if (typeof value === "bigint") return value.toString();
+	if (typeof value === "function" || typeof value === "symbol") return null;
+	if (value instanceof Error) return toErrorInfo(value);
+	if (value instanceof Date) return value.toISOString();
+	if (value instanceof Map) {
+		const obj = {};
+		for (const [k, v] of value.entries()) obj[String(k)] = sanitizeArg(v, depth + 1, seen);
+		return obj;
+	}
+	if (value instanceof Set) {
+		const arr = [];
+		for (const v of value.values()) arr.push(sanitizeArg(v, depth + 1, seen));
+		return arr;
+	}
+	if (Array.isArray(value)) {
+		if (seen.has(value)) return "[Circular]";
+		seen.add(value);
+		const result = value.map((v) => sanitizeArg(v, depth + 1, seen));
+		seen.delete(value);
+		return result;
+	}
+	if (typeof value === "object") {
+		const proto = Object.getPrototypeOf(value);
+		if (proto !== Object.prototype && proto !== null) return { __nonClonable: value.constructor?.name || "Unknown" };
+		if (seen.has(value)) return "[Circular]";
+		seen.add(value);
+		const result = {};
+		for (const [k, v] of Object.entries(value)) result[k] = sanitizeArg(v, depth + 1, seen);
+		seen.delete(value);
+		return result;
+	}
+	return null;
+}
+//#endregion
+//#region src/executor/worker/forwarding-logger.ts
+function createForwardingLogger(post, level = "info", tags = []) {
+	function safePost(msg) {
+		try {
+			post(msg);
+		} catch {
+			try {
+				process.stderr.write(`[forwarding-logger] postMessage failed: ${msg.level} ${msg.message}\n`);
+			} catch {}
+		}
+	}
+	function emit(wireLevel, message, args) {
+		const sanitizedArgs = args.map((a) => sanitizeArg(a));
+		safePost({
+			type: "log",
+			level: wireLevel,
+			message,
+			args: tags.length > 0 ? [sanitizeArg({ tags }), ...sanitizedArgs] : sanitizedArgs,
+			timestamp: Date.now()
+		});
+	}
+	return {
+		level,
+		verbose: (message, ...args) => emit("debug", message, args),
+		debug: (message, ...args) => emit("debug", message, args),
+		info: (message, ...args) => emit("info", message, args),
+		warn: (message, ...args) => emit("warn", message, args),
+		error: (message, ...args) => emit("error", message, args),
+		errorHandler: ((...data) => {
+			const first = data[0];
+			emit("error", typeof first === "string" ? first : "", data.slice(1));
+		}),
+		child: (childTags) => createForwardingLogger(post, level, [...tags, ...childTags])
+	};
+}
 //#endregion
-export { RelationshipNotFoundError as $, submittedActionIds as A, DocumentAlreadyExistsError as B, DuplicateManifestError as C, GATED_DOCUMENT_ACTIONS as D, ModuleNotFoundError as E, documentDecisionModel as F, AuthEnforcementDisabledError as G, DuplicateOperationError as H, authDecisionModel as I, DocumentDeletedError as J, AuthTimestampNotMonotonicError as K, buildDecisionModel as L, targetDocumentId as M, decideAtHead as N, createConsistencyToken as O, selectDecisionModel as P, InvalidSignatureError as Q, APPEND_CONDITION_FAILED_PREFIX as R, JobExecutorEventTypes as S, InvalidModuleError as T, OptimisticLockError as U, DocumentExistence as V, RevisionMismatchError as W, ExcessiveReshuffleError as X, DocumentNotFoundError as Y, InvalidOperationTimestampError as Z, KyselyWriteCache as _, createForwardingPoolInstrumentation as a, __exportAll as at, CollectionMembershipCache as b, KyselyKeyframeStore as c, verifyActionSignature as d, UpgradePreconditionFailedError as et, PassthroughSigner as f, EventBus as g, resolveFeatureFlags as h, runMigrations as i, yieldToMain as it, summarizeSubmittedActions as j, createEmptyConsistencyToken as k, DocumentModelRegistry as l, KyselyExecutionScope as m, REACTOR_SCHEMA as n, parsePagingOptions as nt, instrumentPgPool as o, DriveCollectionId as p, AuthorizationDeniedError as q, getMigrationStatus as r, throwIfAborted as rt, KyselyOperationStore as s, DEFAULT_DRIVE_CONTAINER_TYPES as t, matchesScope as tt, SimpleJobExecutor as u, KyselyOperationIndex as v, DuplicateModuleError as w, DEFAULT_DEFERRED_JOB_TTL_MS as x, DocumentMetaCache as y, AppendConditionFailedError as z };
+export { DocumentNotFoundError as $, ModuleNotFoundError as A, authDecisionModel as B, DocumentMetaCache as C, DuplicateManifestError as D, JobExecutorEventTypes as E, summarizeSubmittedActions as F, DocumentExistence as G, APPEND_CONDITION_FAILED_PREFIX as H, targetDocumentId as I, RevisionMismatchError as J, DuplicateOperationError as K, decideAtHead as L, createConsistencyToken as M, createEmptyConsistencyToken as N, DuplicateModuleError as O, submittedActionIds as P, DocumentDeletedError as Q, selectDecisionModel as R, KyselyOperationIndex as S, DEFAULT_DEFERRED_JOB_TTL_MS as T, AppendConditionFailedError as U, buildDecisionModel as V, DocumentAlreadyExistsError as W, AuthTimestampNotMonotonicError as X, AuthEnforcementDisabledError as Y, AuthorizationDeniedError as Z, DriveCollectionId as _, DEFAULT_DRIVE_CONTAINER_TYPES as a, EventBusAggregateError as at, EventBus as b, runMigrations as c, parsePagingOptions as ct, KyselyOperationStore as d, __exportAll as dt, ExcessiveReshuffleError as et, KyselyKeyframeStore as f, PassthroughSigner as g, verifyActionSignature as h, fromErrorInfo as i, UpgradePreconditionFailedError as it, GATED_DOCUMENT_ACTIONS as j, InvalidModuleError as k, createForwardingPoolInstrumentation as l, throwIfAborted as lt, SimpleJobExecutor as m, errorToInfo as n, InvalidSignatureError as nt, REACTOR_SCHEMA as o, ReactorEventTypes as ot, DocumentModelRegistry as p, OptimisticLockError as q, sanitizeArg as r, RelationshipNotFoundError as rt, getMigrationStatus as s, matchesScope as st, createForwardingLogger as t, InvalidOperationTimestampError as tt, instrumentPgPool as u, yieldToMain as ut, KyselyExecutionScope as v, CollectionMembershipCache as w, KyselyWriteCache as x, resolveFeatureFlags as y, documentDecisionModel as z };
 
-//# sourceMappingURL=drive-container-types-Be5-EY9W.js.map
+//# sourceMappingURL=forwarding-logger-CnuVDVze.js.map