@powerhousedao/reactor 6.0.2-staging.8 → 6.1.0-dev.0

package/dist/index.js

@@ -55,13 +55,18 @@ function deleteDocumentAction(documentId) {
 	};
 }
 /**
-* Creates an ADD_RELATIONSHIP action to establish a parent-child relationship.
+* Creates an ADD_RELATIONSHIP action that records a directed edge from
+* `sourceId` to `targetId` with an arbitrary `relationshipType` and optional
+* `metadata`. The edge is opaque to the reactor — consumers (e.g. reactor-drive)
+* define their own type strings such as `"drive/child"` and attach
+* domain-specific metadata.
 */
-function addRelationshipAction(sourceId, targetId, relationshipType = "child") {
+function addRelationshipAction(sourceId, targetId, relationshipType, metadata) {
 	const input = {
 		sourceId,
 		targetId,
-		relationshipType
+		relationshipType,
+		...metadata !== void 0 ? { metadata } : {}
 	};
 	return {
 		id: generateId(),
@@ -72,6 +77,25 @@ function addRelationshipAction(sourceId, targetId, relationshipType = "child") {
 	};
 }
 /**
+* Creates an UPDATE_RELATIONSHIP action to replace a relationship's metadata
+* without losing its createdAt ordering.
+*/
+function updateRelationshipAction(sourceId, targetId, relationshipType, metadata) {
+	const input = {
+		sourceId,
+		targetId,
+		relationshipType,
+		metadata
+	};
+	return {
+		id: generateId(),
+		type: "UPDATE_RELATIONSHIP",
+		scope: "document",
+		timestampUtcMs: (/* @__PURE__ */ new Date()).toISOString(),
+		input
+	};
+}
+/**
 * Creates a REMOVE_RELATIONSHIP action to remove a parent-child relationship.
 */
 function removeRelationshipAction(sourceId, targetId, relationshipType = "child") {
@@ -291,6 +315,44 @@ let JobStatus = /* @__PURE__ */ function(JobStatus) {
 	return JobStatus;
 }({});
 //#endregion
+//#region src/shared/utils.ts
+function matchesScope(view = {}, scope) {
+	if (view.scopes) return view.scopes.includes(scope);
+	return true;
+}
+function yieldToMain() {
+	const s = globalThis.scheduler;
+	if (s?.yield) return s.yield();
+	return new Promise((resolve) => setTimeout(resolve, 0));
+}
+const defaultAbortError = () => /* @__PURE__ */ new Error("Operation aborted");
+function throwIfAborted(signal, makeError = defaultAbortError) {
+	if (signal?.aborted) throw makeError();
+}
+/**
+* Validates PagingOptions and returns a normalized offset and limit.
+* Throws if the cursor is not empty and not a non-negative integer, or if
+* limit is less than 1. When `paging` is undefined, returns offset 0 and
+* the caller-supplied `defaultLimit`.
+*/
+function parsePagingOptions(paging, defaultLimit) {
+	if (paging === void 0) return {
+		offset: 0,
+		limit: defaultLimit
+	};
+	if (!Number.isInteger(paging.limit) || paging.limit < 1) throw new Error(`Invalid paging limit: ${String(paging.limit)} (must be an integer >= 1)`);
+	if (paging.cursor === "") return {
+		offset: 0,
+		limit: paging.limit
+	};
+	const parsed = Number(paging.cursor);
+	if (!Number.isInteger(parsed) || parsed < 0) throw new Error(`Invalid paging cursor: ${JSON.stringify(paging.cursor)} (must be empty or a non-negative integer)`);
+	return {
+		offset: parsed,
+		limit: paging.limit
+	};
+}
+//#endregion
 //#region src/client/drive-client.ts
 /**
 * Implementation of {@link IDriveClient}.
@@ -409,6 +471,10 @@ var DriveClient = class {
 		if (!node) throw new Error("Node missing from drive after rename");
 		return node;
 	}
+	async setPreferredEditorOnNode(nodeId, preferredEditor, signal) {
+		this.logger.verbose("drives.setPreferredEditorOnNode(@nodeId, @preferredEditor)", nodeId, preferredEditor);
+		return this.client.setPreferredEditor(nodeId, preferredEditor, "main", signal);
+	}
 	async moveNode(driveIdentifier, srcNodeId, targetParentFolderId, signal) {
 		this.logger.verbose("drives.moveNode(@driveIdentifier, @srcNodeId, @targetParentFolderId)", driveIdentifier, srcNodeId, targetParentFolderId);
 		return this.client.execute(driveIdentifier, "main", [moveNode({
@@ -456,11 +522,22 @@ var DriveClient = class {
 		if (!node) throw new Error(`Node ${nodeId} not found in drive ${driveIdentifier}`);
 		return node;
 	}
-	async listNodes(driveIdentifier, parentFolder, signal) {
-		this.logger.verbose("drives.listNodes(@driveIdentifier, @parentFolder)", driveIdentifier, parentFolder);
-		const nodes = (await this.client.get(driveIdentifier, void 0, signal)).state.global.nodes;
-		if (parentFolder === void 0) return [...nodes];
-		return nodes.filter((n) => (n.parentFolder ?? null) === parentFolder);
+	async listNodes(driveIdentifier, parentFolder, paging, signal) {
+		this.logger.verbose("drives.listNodes(@driveIdentifier, @parentFolder, @paging)", driveIdentifier, parentFolder, paging);
+		const allNodes = (await this.client.get(driveIdentifier, void 0, signal)).state.global.nodes;
+		const filtered = parentFolder === void 0 ? [...allNodes] : allNodes.filter((n) => (n.parentFolder ?? null) === parentFolder);
+		const { offset: startIndex, limit } = parsePagingOptions(paging, filtered.length);
+		const effective = paging ?? {
+			cursor: "",
+			limit
+		};
+		const endIndex = startIndex + limit;
+		return {
+			results: filtered.slice(startIndex, endIndex),
+			options: effective,
+			...endIndex < filtered.length ? { nextCursor: String(endIndex) } : {},
+			totalCount: filtered.length
+		};
 	}
 	async removeFileNode(driveId, fileId, signal) {
 		const relationshipActions = await signActions([removeRelationshipAction(driveId, fileId, "child")], this.signer, signal);
@@ -642,7 +719,7 @@ function decodeCompositeCursor(cursor) {
 		if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new Error("Invalid composite cursor format");
 		return parsed;
 	} catch (error) {
-		if (error instanceof SyntaxError) throw new Error("Invalid composite cursor format");
+		if (error instanceof SyntaxError) throw new Error("Invalid composite cursor format", { cause: error });
 		throw error;
 	}
 }
@@ -920,6 +997,17 @@ var ReactorClient = class {
 		const signedActions = await signActions(actions, this.signer, signal);
 		return this.reactor.execute(documentIdentifier, branch, signedActions, signal);
 	}
+	async executeBatch(request, signal) {
+		this.logger.verbose("executeBatch(@count jobs)", request.jobs.length);
+		const signedJobs = await Promise.all(request.jobs.map(async (job) => ({
+			...job,
+			actions: await signActions(job.actions, this.signer, signal)
+		})));
+		const batchResult = await this.reactor.executeBatch({ jobs: signedJobs }, signal);
+		const completedJobs = await Promise.all(Object.values(batchResult.jobs).map((job) => this.waitForJob(job, signal)));
+		for (const job of completedJobs) if (job.status === JobStatus.FAILED) throw new Error(job.error?.message);
+		return batchResult;
+	}
 	/**
 	* Renames a document and waits for completion
 	*/
@@ -928,6 +1016,14 @@ var ReactorClient = class {
 		return this.execute(documentIdentifier, branch, [actions.setName(name)], signal);
 	}
 	/**
+	* Updates the preferred editor recorded in the document header meta.
+	* Pass `null` to clear it.
+	*/
+	async setPreferredEditor(documentIdentifier, preferredEditor, branch = "main", signal) {
+		this.logger.verbose("setPreferredEditor(@documentIdentifier, @preferredEditor, @branch)", documentIdentifier, preferredEditor, branch);
+		return this.execute(documentIdentifier, branch, [actions.setPreferredEditor(preferredEditor)], signal);
+	}
+	/**
 	* Adds multiple documents as children to another and waits for completion
 	*/
 	async addRelationship(sourceIdentifier, targetIdentifier, relationshipType, branch = "main", signal) {
@@ -2150,7 +2246,6 @@ var KyselyWriteCache = class KyselyWriteCache {
 			startRevision = keyframe.revision;
 			documentType = keyframe.document.header.documentType;
 		} else {
-			document = void 0;
 			startRevision = -1;
 			const createOpResult = await this.operationStore.getSince(documentId, "document", branch, -1, void 0, {
 				cursor: "0",
@@ -2205,7 +2300,7 @@ var KyselyWriteCache = class KyselyWriteCache {
 				hasMorePages = Boolean(result.nextCursor) && !reachedTarget;
 				if (hasMorePages) cursor = result.nextCursor;
 			} catch (err) {
-				throw new Error(`Failed to rebuild document ${documentId}: ${err instanceof Error ? err.message : String(err)}`);
+				throw new Error(`Failed to rebuild document ${documentId}: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
 			}
 		} while (hasMorePages);
 		const revisions = await this.operationStore.getRevisions(documentId, branch, signal);
@@ -2230,7 +2325,7 @@ var KyselyWriteCache = class KyselyWriteCache {
 				if (targetRevision !== void 0 && operation.index === targetRevision) break;
 			}
 		} catch (err) {
-			throw new Error(`Failed to rebuild document ${documentId}: ${err instanceof Error ? err.message : String(err)}`);
+			throw new Error(`Failed to rebuild document ${documentId}: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
 		}
 		const revisions = await this.operationStore.getRevisions(documentId, branch, signal);
 		document.header.revision = revisions.revision;
@@ -2368,7 +2463,7 @@ let JobQueueState = /* @__PURE__ */ function(JobQueueState) {
 */
 const QueueEventTypes = { JOB_AVAILABLE: 1e4 };
 //#endregion
-//#region src/registry/implementation.ts
+//#region src/registry/errors.ts
 /**
 * Error thrown when a document model module is not found in the registry.
 */
@@ -2456,140 +2551,6 @@ var InvalidUpgradeStepError = class extends Error {
 		this.name = "InvalidUpgradeStepError";
 	}
 };
-/**
-* In-memory implementation of the IDocumentModelRegistry interface.
-* Manages document model modules with version-aware storage and upgrade manifest support.
-*/
-var DocumentModelRegistry = class {
-	modules = [];
-	manifests = [];
-	registerModules(...modules) {
-		return modules.map((module) => {
-			try {
-				const documentType = module.documentModel.global.id;
-				const version = module.version ?? 1;
-				for (let i = 0; i < this.modules.length; i++) {
-					const existing = this.modules[i];
-					const existingType = existing.documentModel.global.id;
-					const existingVersion = existing.version ?? 1;
-					if (existingType === documentType && existingVersion === version) throw new DuplicateModuleError(documentType, version);
-				}
-				this.modules.push(module);
-				return {
-					status: "success",
-					item: module
-				};
-			} catch (error) {
-				return {
-					status: "error",
-					item: module,
-					error: error instanceof Error ? error : new Error(String(error))
-				};
-			}
-		});
-	}
-	unregisterModules(...documentTypes) {
-		let allFound = true;
-		for (const documentType of documentTypes) {
-			if (!this.modules.some((m) => m.documentModel.global.id === documentType)) allFound = false;
-			this.modules = this.modules.filter((m) => m.documentModel.global.id !== documentType);
-		}
-		return allFound;
-	}
-	getModule(documentType, version) {
-		let latestModule;
-		let latestVersion = -1;
-		for (let i = 0; i < this.modules.length; i++) {
-			const module = this.modules[i];
-			const moduleType = module.documentModel.global.id;
-			const moduleVersion = module.version ?? 1;
-			if (moduleType === documentType) {
-				if (version !== void 0 && moduleVersion === version) return module;
-				if (moduleVersion > latestVersion) {
-					latestModule = module;
-					latestVersion = moduleVersion;
-				}
-			}
-		}
-		if (version === void 0 && latestModule !== void 0) return latestModule;
-		throw new ModuleNotFoundError(documentType, version);
-	}
-	getAllModules() {
-		return [...this.modules];
-	}
-	clear() {
-		this.modules = [];
-		this.manifests = [];
-	}
-	getSupportedVersions(documentType) {
-		const versions = [];
-		for (const module of this.modules) if (module.documentModel.global.id === documentType) versions.push(module.version ?? 1);
-		if (versions.length === 0) throw new ModuleNotFoundError(documentType);
-		return versions.sort((a, b) => a - b);
-	}
-	getLatestVersion(documentType) {
-		let latest = -1;
-		let found = false;
-		for (const module of this.modules) if (module.documentModel.global.id === documentType) {
-			found = true;
-			const version = module.version ?? 1;
-			if (version > latest) latest = version;
-		}
-		if (!found) throw new ModuleNotFoundError(documentType);
-		return latest;
-	}
-	registerUpgradeManifests(...manifestsToRegister) {
-		return manifestsToRegister.map((manifestToRegister) => {
-			try {
-				if (!manifestToRegister.documentType) throw new Error("Upgrade manifest is missing a documentType");
-				for (const registeredManifest of this.manifests) if (registeredManifest.documentType === manifestToRegister.documentType) throw new DuplicateManifestError(manifestToRegister.documentType);
-				this.manifests.push(manifestToRegister);
-				return {
-					status: "success",
-					item: manifestToRegister
-				};
-			} catch (error) {
-				return {
-					status: "error",
-					item: manifestToRegister,
-					error: error instanceof Error ? error : new Error(String(error))
-				};
-			}
-		});
-	}
-	unregisterUpgradeManifests(...documentTypes) {
-		let allFound = true;
-		for (const documentType of documentTypes) {
-			if (!this.manifests.some((m) => m.documentType === documentType)) allFound = false;
-			this.manifests = this.manifests.filter((m) => m.documentType !== documentType);
-		}
-		return allFound;
-	}
-	getUpgradeManifest(documentType) {
-		for (let i = 0; i < this.manifests.length; i++) if (this.manifests[i].documentType === documentType) return this.manifests[i];
-		throw new ManifestNotFoundError(documentType);
-	}
-	computeUpgradePath(documentType, fromVersion, toVersion) {
-		if (fromVersion === toVersion) return [];
-		if (toVersion < fromVersion) throw new DowngradeNotSupportedError(documentType, fromVersion, toVersion);
-		const manifest = this.getUpgradeManifest(documentType);
-		const path = [];
-		for (let v = fromVersion + 1; v <= toVersion; v++) {
-			const key = `v${v}`;
-			if (!(key in manifest.upgrades)) throw new MissingUpgradeTransitionError(documentType, v - 1, v);
-			const transition = manifest.upgrades[key];
-			path.push(transition);
-		}
-		return path;
-	}
-	getUpgradeReducer(documentType, fromVersion, toVersion) {
-		if (toVersion !== fromVersion + 1) throw new InvalidUpgradeStepError(documentType, fromVersion, toVersion);
-		const manifest = this.getUpgradeManifest(documentType);
-		const key = `v${toVersion}`;
-		if (!(key in manifest.upgrades)) throw new MissingUpgradeTransitionError(documentType, fromVersion, toVersion);
-		return manifest.upgrades[key].upgradeReducer;
-	}
-};
 //#endregion
 //#region src/executor/simple-job-executor-manager.ts
 /**
@@ -2844,24 +2805,17 @@ var SimpleJobExecutorManager = class {
 	}
 };
 //#endregion
-//#region src/shared/utils.ts
-function matchesScope(view = {}, scope) {
-	if (view.scopes) return view.scopes.includes(scope);
-	return true;
-}
-function yieldToMain() {
-	const s = globalThis.scheduler;
-	if (s?.yield) return s.yield();
-	return new Promise((resolve) => setTimeout(resolve, 0));
-}
-//#endregion
 //#region src/utils/reshuffle.ts
 const STRICT_ORDER_ACTION_TYPES = new Set([
 	"CREATE_DOCUMENT",
 	"DELETE_DOCUMENT",
 	"UPGRADE_DOCUMENT",
 	"ADD_RELATIONSHIP",
-	"REMOVE_RELATIONSHIP"
+	"REMOVE_RELATIONSHIP",
+	"UPDATE_RELATIONSHIP",
+	"ADD_FOLDER",
+	"UPDATE_FOLDER",
+	"REMOVE_FOLDER"
 ]);
 /**
 * Reshuffles operations by timestamp, then applies deterministic tie-breaking.
@@ -2908,9 +2862,10 @@ function driveCollectionId(branch, driveId) {
 //#endregion
 //#region src/executor/document-action-handler.ts
 var DocumentActionHandler = class {
-	constructor(registry, logger) {
+	constructor(registry, logger, driveContainerTypes) {
 		this.registry = registry;
 		this.logger = logger;
+		this.driveContainerTypes = driveContainerTypes;
 	}
 	async execute(job, action, startTime, indexTxn, stores, skip = 0, sourceRemote = "", signal) {
 		switch (action.type) {
@@ -2919,6 +2874,7 @@ var DocumentActionHandler = class {
 			case "UPGRADE_DOCUMENT": return this.executeUpgrade(job, action, startTime, indexTxn, stores, skip, sourceRemote, signal);
 			case "ADD_RELATIONSHIP": return this.executeAddRelationship(job, action, startTime, indexTxn, stores, sourceRemote, signal);
 			case "REMOVE_RELATIONSHIP": return this.executeRemoveRelationship(job, action, startTime, indexTxn, stores, sourceRemote, signal);
+			case "UPDATE_RELATIONSHIP": return this.executeUpdateRelationship(job, action, startTime, indexTxn, stores, sourceRemote, signal);
 			default: return buildErrorResult(job, /* @__PURE__ */ new Error(`Unknown document action type: ${action.type}`), startTime);
 		}
 	}
@@ -2943,6 +2899,10 @@ var DocumentActionHandler = class {
 		const writeError = await this.writeOperationToStore(document.header.id, document.header.documentType, job.scope, job.branch, operation, job, startTime, stores, signal);
 		if (writeError !== null) return writeError;
 		updateDocumentRevision(document, job.scope, operation.index);
+		document.operations = {
+			...document.operations,
+			[job.scope]: [...document.operations[job.scope] ?? [], operation]
+		};
 		stores.writeCache.putState(document.header.id, job.scope, job.branch, operation.index, document);
 		indexTxn.write([{
 			...operation,
@@ -2952,7 +2912,7 @@ var DocumentActionHandler = class {
 			scope: job.scope,
 			sourceRemote
 		}]);
-		if (document.header.documentType === "powerhouse/document-drive") {
+		if (this.driveContainerTypes.has(document.header.documentType)) {
 			const collectionId = driveCollectionId(job.branch, document.header.id);
 			indexTxn.createCollection(collectionId);
 			indexTxn.addToCollection(collectionId, document.header.id);
@@ -2990,6 +2950,10 @@ var DocumentActionHandler = class {
 		const writeError = await this.writeOperationToStore(documentId, document.header.documentType, job.scope, job.branch, operation, job, startTime, stores, signal);
 		if (writeError !== null) return writeError;
 		updateDocumentRevision(document, job.scope, operation.index);
+		document.operations = {
+			...document.operations,
+			[job.scope]: [...document.operations[job.scope] ?? [], operation]
+		};
 		stores.writeCache.putState(documentId, job.scope, job.branch, operation.index, document);
 		indexTxn.write([{
 			...operation,
@@ -3052,6 +3016,10 @@ var DocumentActionHandler = class {
 		const writeError = await this.writeOperationToStore(documentId, document.header.documentType, job.scope, job.branch, operation, job, startTime, stores, signal);
 		if (writeError !== null) return writeError;
 		updateDocumentRevision(document, job.scope, operation.index);
+		document.operations = {
+			...document.operations,
+			[job.scope]: [...document.operations[job.scope] ?? [], operation]
+		};
 		stores.writeCache.putState(documentId, job.scope, job.branch, operation.index, document);
 		indexTxn.write([{
 			...operation,
@@ -3068,66 +3036,40 @@ var DocumentActionHandler = class {
 		});
 		return buildSuccessResult(job, operation, documentId, document.header.documentType, resultingState, startTime);
 	}
-	async executeAddRelationship(job, action, startTime, indexTxn, stores, sourceRemote = "", signal) {
-		if (job.scope !== "document") return buildErrorResult(job, /* @__PURE__ */ new Error(`ADD_RELATIONSHIP must be in "document" scope, got "${job.scope}"`), startTime);
-		const input = action.input;
-		if (!input.sourceId || !input.targetId || !input.relationshipType) return buildErrorResult(job, /* @__PURE__ */ new Error("ADD_RELATIONSHIP action requires sourceId, targetId, and relationshipType in input"), startTime);
-		if (input.sourceId === input.targetId) return buildErrorResult(job, /* @__PURE__ */ new Error("ADD_RELATIONSHIP: sourceId and targetId cannot be the same (self-relationships not allowed)"), startTime);
-		let sourceDoc;
-		try {
-			sourceDoc = await stores.writeCache.getState(input.sourceId, "document", job.branch, void 0, signal);
-		} catch (error) {
-			return buildErrorResult(job, /* @__PURE__ */ new Error(`ADD_RELATIONSHIP: source document ${input.sourceId} not found: ${error instanceof Error ? error.message : String(error)}`), startTime);
-		}
-		const operation = createOperation(action, getNextIndexForScope(sourceDoc, job.scope), 0, {
-			documentId: input.sourceId,
-			scope: job.scope,
-			branch: job.branch
+	executeAddRelationship(job, action, startTime, indexTxn, stores, sourceRemote = "", signal) {
+		return this.withRelationshipAction("ADD_RELATIONSHIP", job, action, startTime, indexTxn, stores, sourceRemote, signal, (input) => input.sourceId === input.targetId ? /* @__PURE__ */ new Error("ADD_RELATIONSHIP: sourceId and targetId cannot be the same (self-relationships not allowed)") : null, ({ indexTxn: txn, stores: s, sourceDoc, input, job: j }) => {
+			if (this.driveContainerTypes.has(sourceDoc.header.documentType)) {
+				const collectionId = driveCollectionId(j.branch, input.sourceId);
+				txn.addToCollection(collectionId, input.targetId);
+				s.collectionMembershipCache.invalidate(input.targetId);
+			}
 		});
-		const writeError = await this.writeOperationToStore(input.sourceId, sourceDoc.header.documentType, job.scope, job.branch, operation, job, startTime, stores, signal);
-		if (writeError !== null) return writeError;
-		sourceDoc.header.lastModifiedAtUtcIso = operation.timestampUtcMs || (/* @__PURE__ */ new Date()).toISOString();
-		updateDocumentRevision(sourceDoc, job.scope, operation.index);
-		sourceDoc.operations = {
-			...sourceDoc.operations,
-			[job.scope]: [...sourceDoc.operations[job.scope] ?? [], operation]
-		};
-		const scopeState = sourceDoc.state[job.scope];
-		const resultingStateObj = {
-			header: structuredClone(sourceDoc.header),
-			[job.scope]: scopeState === void 0 ? {} : structuredClone(scopeState)
-		};
-		const resultingState = JSON.stringify(resultingStateObj);
-		stores.writeCache.putState(input.sourceId, job.scope, job.branch, operation.index, sourceDoc);
-		indexTxn.write([{
-			...operation,
-			documentId: input.sourceId,
-			documentType: sourceDoc.header.documentType,
-			branch: job.branch,
-			scope: job.scope,
-			sourceRemote
-		}]);
-		if (sourceDoc.header.documentType === "powerhouse/document-drive") {
-			const collectionId = driveCollectionId(job.branch, input.sourceId);
-			indexTxn.addToCollection(collectionId, input.targetId);
-			stores.collectionMembershipCache.invalidate(input.targetId);
-		}
-		stores.documentMetaCache.putDocumentMeta(input.sourceId, job.branch, {
-			state: sourceDoc.state.document,
-			documentType: sourceDoc.header.documentType,
-			documentScopeRevision: operation.index + 1
+	}
+	executeRemoveRelationship(job, action, startTime, indexTxn, stores, sourceRemote = "", signal) {
+		return this.withRelationshipAction("REMOVE_RELATIONSHIP", job, action, startTime, indexTxn, stores, sourceRemote, signal, null, ({ indexTxn: txn, stores: s, sourceDoc, input, job: j }) => {
+			if (this.driveContainerTypes.has(sourceDoc.header.documentType)) {
+				const collectionId = driveCollectionId(j.branch, input.sourceId);
+				txn.removeFromCollection(collectionId, input.targetId);
+				s.collectionMembershipCache.invalidate(input.targetId);
+			}
 		});
-		return buildSuccessResult(job, operation, input.sourceId, sourceDoc.header.documentType, resultingState, startTime);
 	}
-	async executeRemoveRelationship(job, action, startTime, indexTxn, stores, sourceRemote = "", signal) {
-		if (job.scope !== "document") return buildErrorResult(job, /* @__PURE__ */ new Error(`REMOVE_RELATIONSHIP must be in "document" scope, got "${job.scope}"`), startTime);
+	executeUpdateRelationship(job, action, startTime, indexTxn, stores, sourceRemote = "", signal) {
+		return this.withRelationshipAction("UPDATE_RELATIONSHIP", job, action, startTime, indexTxn, stores, sourceRemote, signal, null, null);
+	}
+	async withRelationshipAction(actionTypeName, job, action, startTime, indexTxn, stores, sourceRemote, signal, preValidate, postWrite) {
+		if (job.scope !== "document") return buildErrorResult(job, /* @__PURE__ */ new Error(`${actionTypeName} must be in "document" scope, got "${job.scope}"`), startTime);
 		const input = action.input;
-		if (!input.sourceId || !input.targetId || !input.relationshipType) return buildErrorResult(job, /* @__PURE__ */ new Error("REMOVE_RELATIONSHIP action requires sourceId, targetId, and relationshipType in input"), startTime);
+		if (!input.sourceId || !input.targetId || !input.relationshipType) return buildErrorResult(job, /* @__PURE__ */ new Error(`${actionTypeName} action requires sourceId, targetId, and relationshipType in input`), startTime);
+		if (preValidate !== null) {
+			const validationError = preValidate(input);
+			if (validationError !== null) return buildErrorResult(job, validationError, startTime);
+		}
 		let sourceDoc;
 		try {
 			sourceDoc = await stores.writeCache.getState(input.sourceId, "document", job.branch, void 0, signal);
 		} catch (error) {
-			return buildErrorResult(job, /* @__PURE__ */ new Error(`REMOVE_RELATIONSHIP: source document ${input.sourceId} not found: ${error instanceof Error ? error.message : String(error)}`), startTime);
+			return buildErrorResult(job, /* @__PURE__ */ new Error(`${actionTypeName}: source document ${input.sourceId} not found: ${error instanceof Error ? error.message : String(error)}`), startTime);
 		}
 		const operation = createOperation(action, getNextIndexForScope(sourceDoc, job.scope), 0, {
 			documentId: input.sourceId,
@@ -3157,11 +3099,13 @@ var DocumentActionHandler = class {
 			scope: job.scope,
 			sourceRemote
 		}]);
-		if (sourceDoc.header.documentType === "powerhouse/document-drive") {
-			const collectionId = driveCollectionId(job.branch, input.sourceId);
-			indexTxn.removeFromCollection(collectionId, input.targetId);
-			stores.collectionMembershipCache.invalidate(input.targetId);
-		}
+		if (postWrite !== null) postWrite({
+			indexTxn,
+			stores,
+			sourceDoc,
+			input,
+			job
+		});
 		stores.documentMetaCache.putDocumentMeta(input.sourceId, job.branch, {
 			state: sourceDoc.state.document,
 			documentType: sourceDoc.header.documentType,
@@ -3200,7 +3144,7 @@ var SignatureVerifier = class {
 			if (!signer) continue;
 			if (signer.signatures.length === 0) throw new InvalidSignatureError(documentId, `Action ${action.id} has signer but no signatures`);
 			const publicKey = signer.app.key;
-			let isValid = false;
+			let isValid;
 			try {
 				const tempOperation = {
 					id: deriveOperationId(documentId, action.scope, branch, action.id),
@@ -3226,7 +3170,7 @@ var SignatureVerifier = class {
 			if (!signer) continue;
 			if (signer.signatures.length === 0) throw new InvalidSignatureError(documentId, `Operation ${operation.id} at index ${operation.index} has signer but no signatures`);
 			const publicKey = signer.app.key;
-			let isValid = false;
+			let isValid;
 			try {
 				isValid = await this.verifier(operation, publicKey);
 			} catch (error) {
@@ -3250,7 +3194,8 @@ const documentScopeActions = [
 	"DELETE_DOCUMENT",
 	"UPGRADE_DOCUMENT",
 	"ADD_RELATIONSHIP",
-	"REMOVE_RELATIONSHIP"
+	"REMOVE_RELATIONSHIP",
+	"UPDATE_RELATIONSHIP"
 ];
 /**
 * Simple job executor that processes a job by applying actions through document model reducers.
@@ -3260,7 +3205,7 @@ var SimpleJobExecutor = class {
 	signatureVerifierModule;
 	documentActionHandler;
 	executionScope;
-	constructor(logger, registry, operationStore, eventBus, writeCache, operationIndex, documentMetaCache, collectionMembershipCache, config, signatureVerifier, executionScope) {
+	constructor(logger, registry, operationStore, eventBus, writeCache, operationIndex, documentMetaCache, collectionMembershipCache, driveContainerTypes, config, signatureVerifier, executionScope) {
 		this.logger = logger;
 		this.registry = registry;
 		this.operationStore = operationStore;
@@ -3269,6 +3214,7 @@ var SimpleJobExecutor = class {
 		this.operationIndex = operationIndex;
 		this.documentMetaCache = documentMetaCache;
 		this.collectionMembershipCache = collectionMembershipCache;
+		this.driveContainerTypes = driveContainerTypes;
 		this.config = {
 			maxSkipThreshold: config.maxSkipThreshold ?? MAX_SKIP_THRESHOLD,
 			maxConcurrency: config.maxConcurrency ?? 1,
@@ -3278,7 +3224,7 @@ var SimpleJobExecutor = class {
 			yieldDeadlineMs: config.yieldDeadlineMs ?? 50
 		};
 		this.signatureVerifierModule = new SignatureVerifier(signatureVerifier);
-		this.documentActionHandler = new DocumentActionHandler(registry, logger);
+		this.documentActionHandler = new DocumentActionHandler(registry, logger, driveContainerTypes);
 		this.executionScope = executionScope ?? new DefaultExecutionScope(operationStore, operationIndex, writeCache, documentMetaCache, collectionMembershipCache);
 	}
 	/**
@@ -3513,7 +3459,7 @@ var SimpleJobExecutor = class {
 		} catch {}
 		if (docMeta?.state.isDeleted) return buildErrorResult(job, new DocumentDeletedError(job.documentId, docMeta.state.deletedAtUtcIso), startTime);
 		const scope = job.scope;
-		let latestRevision = 0;
+		let latestRevision;
 		try {
 			latestRevision = (await stores.operationStore.getRevisions(job.documentId, job.branch, signal)).revision[scope] ?? 0;
 		} catch {
@@ -3532,7 +3478,7 @@ var SimpleJobExecutor = class {
 			const ts = operation.timestampUtcMs || "";
 			if (ts < minIncomingTimestamp) minIncomingTimestamp = ts;
 		}
-		let conflictingOps = [];
+		let conflictingOps;
 		try {
 			conflictingOps = (await stores.operationStore.getConflicting(job.documentId, scope, job.branch, minIncomingTimestamp, void 0, signal)).results;
 		} catch {
@@ -3547,7 +3493,9 @@ var SimpleJobExecutor = class {
 				allOpsFromMinConflictingIndex = conflictingOps;
 			}
 		}
+		const incomingActionIds = new Set(job.operations.map((op) => op.action.id));
 		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;
 			}
@@ -3585,7 +3533,10 @@ var SimpleJobExecutor = class {
 			operationsWithContext: [],
 			duration: Date.now() - startTime
 		};
-		const reshuffledOperations = reshuffleByTimestamp({
+		const reshuffledOperations = existingOpsToReshuffle.length === 0 && skipCount === 0 ? incomingOpsToApply.slice().sort((a, b) => a.index - b.index).map((operation, i) => ({
+			...operation,
+			index: latestRevision + i
+		})) : reshuffleByTimestamp({
 			index: latestRevision,
 			skip: skipCount
 		}, existingOpsToReshuffle, incomingOpsToApply.map((operation) => ({
@@ -3854,10 +3805,6 @@ var BaseReadModel = class {
 };
 //#endregion
 //#region src/processors/utils.ts
-const DRIVE_DOCUMENT_TYPE = "powerhouse/document-drive";
-function isDriveCreation(op) {
-	return op.operation.action.type === "CREATE_DOCUMENT" && op.context.documentType === "powerhouse/document-drive";
-}
 function isDriveDeletion(op) {
 	return op.operation.action.type === "DELETE_DOCUMENT";
 }
@@ -3868,10 +3815,10 @@ function extractDriveHeader(op) {
 function extractDeletedDocumentId(op) {
 	return op.operation.action.input.documentId ?? op.context.documentId;
 }
-function createMinimalDriveHeader(driveId) {
+function createMinimalDriveHeader(driveId, documentType) {
 	return {
 		id: driveId,
-		documentType: DRIVE_DOCUMENT_TYPE,
+		documentType,
 		sig: {
 			publicKey: {},
 			nonce: ""
@@ -3916,15 +3863,17 @@ var ProcessorManager = class extends BaseReadModel {
 	factoryRegistry = /* @__PURE__ */ new Map();
 	processorsByDrive = /* @__PURE__ */ new Map();
 	factoryToProcessors = /* @__PURE__ */ new Map();
-	knownDriveIds = /* @__PURE__ */ new Set();
+	knownDrives = /* @__PURE__ */ new Map();
 	cursorCache = /* @__PURE__ */ new Map();
 	logger;
-	constructor(db, operationIndex, writeCache, consistencyTracker, logger) {
+	driveContainerTypes;
+	constructor(db, operationIndex, writeCache, consistencyTracker, logger, driveContainerTypes) {
 		super(db, operationIndex, writeCache, consistencyTracker, {
 			readModelId: "processor-manager",
 			rebuildStateOnInit: true
 		});
 		this.logger = logger;
+		this.driveContainerTypes = driveContainerTypes;
 	}
 	async init() {
 		await super.init();
@@ -3940,8 +3889,8 @@ var ProcessorManager = class extends BaseReadModel {
 		if (this.factoryRegistry.has(identifier)) await this.unregisterFactory(identifier);
 		this.factoryRegistry.set(identifier, factory);
 		this.factoryToProcessors.set(identifier, /* @__PURE__ */ new Map());
-		for (const driveId of this.knownDriveIds) {
-			const driveHeader = createMinimalDriveHeader(driveId);
+		for (const [driveId, documentType] of this.knownDrives) {
+			const driveHeader = createMinimalDriveHeader(driveId, documentType);
 			await this.createProcessorsForDrive(driveId, identifier, factory, driveHeader);
 		}
 	}
@@ -3972,34 +3921,37 @@ var ProcessorManager = class extends BaseReadModel {
 	}
 	async detectAndRegisterNewDrives(operations) {
 		for (const op of operations) {
-			if (!isDriveCreation(op)) continue;
+			if (!this.isDriveCreation(op)) continue;
 			const driveId = op.context.documentId;
-			if (this.knownDriveIds.has(driveId)) continue;
-			this.knownDriveIds.add(driveId);
+			if (this.knownDrives.has(driveId)) continue;
+			this.knownDrives.set(driveId, op.context.documentType);
 			const driveHeader = extractDriveHeader(op);
 			if (!driveHeader) continue;
 			for (const [identifier, factory] of this.factoryRegistry) await this.createProcessorsForDrive(driveId, identifier, factory, driveHeader);
 		}
 	}
+	isDriveCreation(op) {
+		return op.operation.action.type === "CREATE_DOCUMENT" && this.driveContainerTypes.has(op.context.documentType);
+	}
 	async detectAndCleanupDeletedDrives(operations) {
 		for (const op of operations) {
 			if (!isDriveDeletion(op)) continue;
 			const driveId = extractDeletedDocumentId(op);
-			if (!driveId || !this.knownDriveIds.has(driveId)) continue;
+			if (!driveId || !this.knownDrives.has(driveId)) continue;
 			if (!this.isDeletedDocumentADrive(driveId)) continue;
 			await this.cleanupDriveProcessors(driveId);
-			this.knownDriveIds.delete(driveId);
+			this.knownDrives.delete(driveId);
 		}
 	}
 	async discoverExistingDrives() {
-		const drives = await this.db.selectFrom("DocumentSnapshot").select("documentId").where("documentType", "=", DRIVE_DOCUMENT_TYPE).where("isDeleted", "=", false).execute();
-		for (const drive of drives) this.knownDriveIds.add(drive.documentId);
+		const drives = await this.db.selectFrom("DocumentSnapshot").select(["documentId", "documentType"]).where("documentType", "in", [...this.driveContainerTypes]).where("isDeleted", "=", false).execute();
+		for (const drive of drives) this.knownDrives.set(drive.documentId, drive.documentType);
 	}
 	isDeletedDocumentADrive(documentId) {
-		return this.knownDriveIds.has(documentId);
+		return this.knownDrives.has(documentId);
 	}
 	async createProcessorsForDrive(driveId, identifier, factory, driveHeader) {
-		let records = [];
+		let records;
 		try {
 			records = await factory(driveHeader);
 		} catch (error) {
@@ -4668,11 +4620,11 @@ var KyselyDocumentView = class extends BaseReadModel {
 				const { documentId, scope, branch, documentType, resultingState } = context;
 				const { index, hash } = operation;
 				if (!resultingState) throw new Error(`Missing resultingState in context for operation ${operation.id || "unknown"}. IDocumentView requires resultingState from upstream - it does not rebuild documents.`);
-				let fullState = {};
+				let fullState;
 				try {
 					fullState = JSON.parse(resultingState);
 				} catch (error) {
-					throw new Error(`Failed to parse resultingState for operation ${operation.id || "unknown"}: ${error instanceof Error ? error.message : String(error)}`);
+					throw new Error(`Failed to parse resultingState for operation ${operation.id || "unknown"}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
 				}
 				const operationType = operation.action.type;
 				if (operationType === "DELETE_DOCUMENT") {
@@ -4995,6 +4947,142 @@ var NullDocumentModelResolver = class {
 	}
 };
 //#endregion
+//#region src/registry/implementation.ts
+/**
+* In-memory implementation of the IDocumentModelRegistry interface.
+* Manages document model modules with version-aware storage and upgrade manifest support.
+*/
+var DocumentModelRegistry = class {
+	modules = [];
+	manifests = [];
+	registerModules(...modules) {
+		return modules.map((module) => {
+			try {
+				const documentType = module.documentModel.global.id;
+				const version = module.version ?? 1;
+				for (let i = 0; i < this.modules.length; i++) {
+					const existing = this.modules[i];
+					const existingType = existing.documentModel.global.id;
+					const existingVersion = existing.version ?? 1;
+					if (existingType === documentType && existingVersion === version) throw new DuplicateModuleError(documentType, version);
+				}
+				this.modules.push(module);
+				return {
+					status: "success",
+					item: module
+				};
+			} catch (error) {
+				return {
+					status: "error",
+					item: module,
+					error: error instanceof Error ? error : new Error(String(error))
+				};
+			}
+		});
+	}
+	unregisterModules(...documentTypes) {
+		let allFound = true;
+		for (const documentType of documentTypes) {
+			if (!this.modules.some((m) => m.documentModel.global.id === documentType)) allFound = false;
+			this.modules = this.modules.filter((m) => m.documentModel.global.id !== documentType);
+		}
+		return allFound;
+	}
+	getModule(documentType, version) {
+		let latestModule;
+		let latestVersion = -1;
+		for (let i = 0; i < this.modules.length; i++) {
+			const module = this.modules[i];
+			const moduleType = module.documentModel.global.id;
+			const moduleVersion = module.version ?? 1;
+			if (moduleType === documentType) {
+				if (version !== void 0 && moduleVersion === version) return module;
+				if (moduleVersion > latestVersion) {
+					latestModule = module;
+					latestVersion = moduleVersion;
+				}
+			}
+		}
+		if (version === void 0 && latestModule !== void 0) return latestModule;
+		throw new ModuleNotFoundError(documentType, version);
+	}
+	getAllModules() {
+		return [...this.modules];
+	}
+	clear() {
+		this.modules = [];
+		this.manifests = [];
+	}
+	getSupportedVersions(documentType) {
+		const versions = [];
+		for (const module of this.modules) if (module.documentModel.global.id === documentType) versions.push(module.version ?? 1);
+		if (versions.length === 0) throw new ModuleNotFoundError(documentType);
+		return versions.sort((a, b) => a - b);
+	}
+	getLatestVersion(documentType) {
+		let latest = -1;
+		let found = false;
+		for (const module of this.modules) if (module.documentModel.global.id === documentType) {
+			found = true;
+			const version = module.version ?? 1;
+			if (version > latest) latest = version;
+		}
+		if (!found) throw new ModuleNotFoundError(documentType);
+		return latest;
+	}
+	registerUpgradeManifests(...manifestsToRegister) {
+		return manifestsToRegister.map((manifestToRegister) => {
+			try {
+				if (!manifestToRegister.documentType) throw new Error("Upgrade manifest is missing a documentType");
+				for (const registeredManifest of this.manifests) if (registeredManifest.documentType === manifestToRegister.documentType) throw new DuplicateManifestError(manifestToRegister.documentType);
+				this.manifests.push(manifestToRegister);
+				return {
+					status: "success",
+					item: manifestToRegister
+				};
+			} catch (error) {
+				return {
+					status: "error",
+					item: manifestToRegister,
+					error: error instanceof Error ? error : new Error(String(error))
+				};
+			}
+		});
+	}
+	unregisterUpgradeManifests(...documentTypes) {
+		let allFound = true;
+		for (const documentType of documentTypes) {
+			if (!this.manifests.some((m) => m.documentType === documentType)) allFound = false;
+			this.manifests = this.manifests.filter((m) => m.documentType !== documentType);
+		}
+		return allFound;
+	}
+	getUpgradeManifest(documentType) {
+		for (let i = 0; i < this.manifests.length; i++) if (this.manifests[i].documentType === documentType) return this.manifests[i];
+		throw new ManifestNotFoundError(documentType);
+	}
+	computeUpgradePath(documentType, fromVersion, toVersion) {
+		if (fromVersion === toVersion) return [];
+		if (toVersion < fromVersion) throw new DowngradeNotSupportedError(documentType, fromVersion, toVersion);
+		const manifest = this.getUpgradeManifest(documentType);
+		const path = [];
+		for (let v = fromVersion + 1; v <= toVersion; v++) {
+			const key = `v${v}`;
+			if (!(key in manifest.upgrades)) throw new MissingUpgradeTransitionError(documentType, v - 1, v);
+			const transition = manifest.upgrades[key];
+			path.push(transition);
+		}
+		return path;
+	}
+	getUpgradeReducer(documentType, fromVersion, toVersion) {
+		if (toVersion !== fromVersion + 1) throw new InvalidUpgradeStepError(documentType, fromVersion, toVersion);
+		const manifest = this.getUpgradeManifest(documentType);
+		const key = `v${toVersion}`;
+		if (!(key in manifest.upgrades)) throw new MissingUpgradeTransitionError(documentType, fromVersion, toVersion);
+		return manifest.upgrades[key].upgradeReducer;
+	}
+};
+//#endregion
 //#region src/shared/consistency-tracker.ts
 /**
 * Creates a consistency key from documentId, scope, and branch.
@@ -5126,6 +5214,7 @@ var KyselyDocumentIndexer = class extends BaseReadModel {
 				const actionType = operation.action.type;
 				if (actionType === "ADD_RELATIONSHIP") await this.handleAddRelationship(trx, operation);
 				else if (actionType === "REMOVE_RELATIONSHIP") await this.handleRemoveRelationship(trx, operation);
+				else if (actionType === "UPDATE_RELATIONSHIP") await this.handleUpdateRelationship(trx, operation);
 			}
 		});
 	}
@@ -5340,6 +5429,13 @@ var KyselyDocumentIndexer = class extends BaseReadModel {
 		const input = operation.action.input;
 		await trx.deleteFrom("DocumentRelationship").where("sourceId", "=", input.sourceId).where("targetId", "=", input.targetId).where("relationshipType", "=", input.relationshipType).execute();
 	}
+	async handleUpdateRelationship(trx, operation) {
+		const input = operation.action.input;
+		await trx.updateTable("DocumentRelationship").set({
+			metadata: input.metadata,
+			updatedAt: /* @__PURE__ */ new Date()
+		}).where("sourceId", "=", input.sourceId).where("targetId", "=", input.targetId).where("relationshipType", "=", input.relationshipType).execute();
+	}
 };
 //#endregion
 //#region src/storage/kysely/keyframe-store.ts
@@ -5403,6 +5499,29 @@ var KyselyKeyframeStore = class KyselyKeyframeStore {
 	}
 };
 //#endregion
+//#region src/storage/kysely/pagination.ts
+const DEFAULT_LIMIT = 100;
+function paginateRows(rows, paging, cursorOf, toItem, refetch) {
+	let hasMore = false;
+	let items = rows;
+	if (paging?.limit && rows.length > paging.limit) {
+		hasMore = true;
+		items = rows.slice(0, paging.limit);
+	}
+	const nextCursor = hasMore && items.length > 0 ? cursorOf(items[items.length - 1]).toString() : void 0;
+	const cursor = paging?.cursor || "0";
+	const limit = paging?.limit || DEFAULT_LIMIT;
+	return {
+		results: items.map(toItem),
+		options: {
+			cursor,
+			limit
+		},
+		nextCursor,
+		next: hasMore ? () => refetch(nextCursor, limit) : void 0
+	};
+}
+//#endregion
 //#region src/storage/interfaces.ts
 /**
 * Thrown when an operation with the same identity already exists in the store.
@@ -5486,7 +5605,7 @@ var KyselyOperationStore = class KyselyOperationStore {
 		});
 	}
 	async executeApply(trx, documentId, documentType, scope, branch, revision, fn, signal) {
-		if (signal?.aborted) throw new Error("Operation aborted");
+		throwIfAborted(signal);
 		const latestOp = await trx.selectFrom("Operation").selectAll().where("documentId", "=", documentId).where("scope", "=", scope).where("branch", "=", branch).orderBy("index", "desc").limit(1).executeTakeFirst();
 		const currentRevision = latestOp ? latestOp.index : -1;
 		if (currentRevision !== revision - 1) throw new RevisionMismatchError(currentRevision + 1, revision);
@@ -5514,7 +5633,7 @@ var KyselyOperationStore = class KyselyOperationStore {
 		}
 	}
 	async getSince(documentId, scope, branch, revision, filter, paging, signal) {
-		if (signal?.aborted) throw new Error("Operation aborted");
+		throwIfAborted(signal);
 		let query = this.queryExecutor.selectFrom("Operation").selectAll().where("documentId", "=", documentId).where("scope", "=", scope).where("branch", "=", branch).where("index", ">", revision).orderBy("index", "asc");
 		if (filter) {
 			if (filter.actionTypes && filter.actionTypes.length > 0) {
@@ -5530,93 +5649,39 @@ var KyselyOperationStore = class KyselyOperationStore {
 			if (cursorValue > 0) query = query.where("index", ">", cursorValue);
 			if (paging.limit) query = query.limit(paging.limit + 1);
 		}
-		const rows = await query.execute();
-		let hasMore = false;
-		let items = rows;
-		if (paging?.limit && rows.length > paging.limit) {
-			hasMore = true;
-			items = rows.slice(0, paging.limit);
-		}
-		const nextCursor = hasMore && items.length > 0 ? items[items.length - 1].index.toString() : void 0;
-		const cursor = paging?.cursor || "0";
-		const limit = paging?.limit || 100;
-		return {
-			results: items.map((row) => this.rowToOperation(row)),
-			options: {
-				cursor,
-				limit
-			},
-			nextCursor,
-			next: hasMore ? () => this.getSince(documentId, scope, branch, revision, filter, {
-				cursor: nextCursor,
-				limit
-			}, signal) : void 0
-		};
+		return paginateRows(await query.execute(), paging, (row) => row.index, (row) => this.rowToOperation(row), (cursor, limit) => this.getSince(documentId, scope, branch, revision, filter, {
+			cursor,
+			limit
+		}, signal));
 	}
 	async getSinceId(id, paging, signal) {
-		if (signal?.aborted) throw new Error("Operation aborted");
+		throwIfAborted(signal);
 		let query = this.queryExecutor.selectFrom("Operation").selectAll().where("id", ">", id).orderBy("id", "asc");
 		if (paging) {
 			const cursorValue = Number.parseInt(paging.cursor, 10);
 			if (cursorValue > 0) query = query.where("id", ">", cursorValue);
 			if (paging.limit) query = query.limit(paging.limit + 1);
 		}
-		const rows = await query.execute();
-		let hasMore = false;
-		let items = rows;
-		if (paging?.limit && rows.length > paging.limit) {
-			hasMore = true;
-			items = rows.slice(0, paging.limit);
-		}
-		const nextCursor = hasMore && items.length > 0 ? items[items.length - 1].id.toString() : void 0;
-		const cursor = paging?.cursor || "0";
-		const limit = paging?.limit || 100;
-		return {
-			results: items.map((row) => this.rowToOperationWithContext(row)),
-			options: {
-				cursor,
-				limit
-			},
-			nextCursor,
-			next: hasMore ? () => this.getSinceId(id, {
-				cursor: nextCursor,
-				limit
-			}, signal) : void 0
-		};
+		return paginateRows(await query.execute(), paging, (row) => row.id, (row) => this.rowToOperationWithContext(row), (cursor, limit) => this.getSinceId(id, {
+			cursor,
+			limit
+		}, signal));
 	}
 	async getConflicting(documentId, scope, branch, minTimestamp, paging, signal) {
-		if (signal?.aborted) throw new Error("Operation aborted");
+		throwIfAborted(signal);
 		let query = this.queryExecutor.selectFrom("Operation").selectAll().where("documentId", "=", documentId).where("scope", "=", scope).where("branch", "=", branch).where("timestampUtcMs", ">=", new Date(minTimestamp)).orderBy("index", "asc");
 		if (paging) {
 			const cursorValue = Number.parseInt(paging.cursor, 10);
 			if (cursorValue > 0) query = query.where("index", ">", cursorValue);
 			if (paging.limit) query = query.limit(paging.limit + 1);
 		}
-		const rows = await query.execute();
-		let hasMore = false;
-		let items = rows;
-		if (paging?.limit && rows.length > paging.limit) {
-			hasMore = true;
-			items = rows.slice(0, paging.limit);
-		}
-		const nextCursor = hasMore && items.length > 0 ? items[items.length - 1].index.toString() : void 0;
-		const cursor = paging?.cursor || "0";
-		const limit = paging?.limit || 100;
-		return {
-			results: items.map((row) => this.rowToOperation(row)),
-			options: {
-				cursor,
-				limit
-			},
-			nextCursor,
-			next: hasMore ? () => this.getConflicting(documentId, scope, branch, minTimestamp, {
-				cursor: nextCursor,
-				limit
-			}, signal) : void 0
-		};
+		return paginateRows(await query.execute(), paging, (row) => row.index, (row) => this.rowToOperation(row), (cursor, limit) => this.getConflicting(documentId, scope, branch, minTimestamp, {
+			cursor,
+			limit
+		}, signal));
 	}
 	async getRevisions(documentId, branch, signal) {
-		if (signal?.aborted) throw new Error("Operation aborted");
+		throwIfAborted(signal);
 		const scopeRevisions = await this.queryExecutor.selectFrom("Operation as o1").select([
 			"o1.scope",
 			"o1.index",
@@ -6610,6 +6675,38 @@ function batchOperationsByDocument(operations) {
 	flushBatch();
 	return batches;
 }
+/**
+* Splits a sorted page of operations into a safe-to-emit prefix and a
+* deferred tail containing the trailing run that shares the same
+* (documentId, branch, scope, timestampUtcMs) as the last operation.
+*
+* The page is assumed to be sorted by (documentId, scope, ordinal), so a
+* same-(docId, scope, ts) run is contiguous and lives at the end of any
+* page that contains its last member. Holding that tail back lets callers
+* prepend it to the next page so a single producer-side execute() call
+* never gets split across two outbound envelopes.
+*/
+function splitTrailingSameTimestampRun(operations) {
+	if (operations.length === 0) return {
+		emit: [],
+		carry: []
+	};
+	const last = operations[operations.length - 1];
+	const lastDocId = last.context.documentId;
+	const lastBranch = last.context.branch;
+	const lastScope = last.context.scope;
+	const lastTs = last.operation.timestampUtcMs;
+	let carryStart = operations.length;
+	for (let i = operations.length - 1; i >= 0; i--) {
+		const op = operations[i];
+		if (op.context.documentId === lastDocId && op.context.branch === lastBranch && op.context.scope === lastScope && op.operation.timestampUtcMs === lastTs) carryStart = i;
+		else break;
+	}
+	return {
+		emit: operations.slice(0, carryStart),
+		carry: operations.slice(carryStart)
+	};
+}
 function toOperationWithContext(entry) {
 	return {
 		operation: {
@@ -6676,25 +6773,6 @@ function consolidateSyncOperations(syncOps) {
 	}
 	return result;
 }
-function mergeCollectionMemberships(events) {
-	const mergedMemberships = {};
-	for (const event of events) {
-		if (event.collectionMemberships) for (const [docId, collections] of Object.entries(event.collectionMemberships)) {
-			if (!(docId in mergedMemberships)) mergedMemberships[docId] = [];
-			for (const c of collections) if (!mergedMemberships[docId].includes(c)) mergedMemberships[docId].push(c);
-		}
-		for (const op of event.operations) {
-			const action = op.operation.action;
-			if (action.type !== "ADD_RELATIONSHIP") continue;
-			const input = action.input;
-			if (!input?.sourceId || !input.targetId) continue;
-			const collectionId = driveCollectionId(op.context.branch, input.sourceId);
-			if (!(input.targetId in mergedMemberships)) mergedMemberships[input.targetId] = [];
-			if (!mergedMemberships[input.targetId].includes(collectionId)) mergedMemberships[input.targetId].push(collectionId);
-		}
-	}
-	return mergedMemberships;
-}
 /**
 * Chunks sync operations into batches that respect dependency-connected
 * components. SyncOps linked by jobDependencies are kept in the same chunk.
@@ -8023,12 +8101,14 @@ var KyselySyncRemoteStorage = class {
 //#region src/sync/batch-aggregator.ts
 var BatchAggregator = class {
 	logger;
+	driveContainerTypes;
 	onBatchReady;
 	queue = [];
 	processing = false;
 	pendingBatches = /* @__PURE__ */ new Map();
-	constructor(logger, onBatchReady) {
+	constructor(logger, driveContainerTypes, onBatchReady) {
 		this.logger = logger;
+		this.driveContainerTypes = driveContainerTypes;
 		this.onBatchReady = onBatchReady;
 	}
 	async enqueueWriteReady(event) {
@@ -8087,7 +8167,7 @@ var BatchAggregator = class {
 		}
 	}
 	prepareBatch(events) {
-		const collectionMemberships = mergeCollectionMemberships(events);
+		const collectionMemberships = this.mergeCollectionMemberships(events);
 		const isBatch = events.length > 1;
 		const priorJobIds = [];
 		const entries = [];
@@ -8103,6 +8183,26 @@ var BatchAggregator = class {
 			entries
 		};
 	}
+	mergeCollectionMemberships(events) {
+		const mergedMemberships = {};
+		for (const event of events) {
+			if (event.collectionMemberships) for (const [docId, collections] of Object.entries(event.collectionMemberships)) {
+				if (!(docId in mergedMemberships)) mergedMemberships[docId] = [];
+				for (const c of collections) if (!mergedMemberships[docId].includes(c)) mergedMemberships[docId].push(c);
+			}
+			for (const op of event.operations) {
+				const action = op.operation.action;
+				if (action.type !== "ADD_RELATIONSHIP") continue;
+				if (!this.driveContainerTypes.has(op.context.documentType)) continue;
+				const input = action.input;
+				if (!input?.sourceId || !input.targetId) continue;
+				const collectionId = driveCollectionId(op.context.branch, input.sourceId);
+				if (!(input.targetId in mergedMemberships)) mergedMemberships[input.targetId] = [];
+				if (!mergedMemberships[input.targetId].includes(collectionId)) mergedMemberships[input.targetId].push(collectionId);
+			}
+		}
+		return mergedMemberships;
+	}
 };
 //#endregion
 //#region src/sync/sync-awaiter.ts
@@ -8354,7 +8454,7 @@ var SyncManager = class {
 	planKeyToJobUuid = /* @__PURE__ */ new Map();
 	lastEnqueuedJobIdByKey = /* @__PURE__ */ new Map();
 	inboxChunkChain = Promise.resolve();
-	constructor(logger, remoteStorage, cursorStorage, deadLetterStorage, channelFactory, operationIndex, reactor, eventBus, config = {}) {
+	constructor(logger, remoteStorage, cursorStorage, deadLetterStorage, channelFactory, operationIndex, reactor, eventBus, driveContainerTypes, config = {}) {
 		this.logger = logger;
 		this.remoteStorage = remoteStorage;
 		this.cursorStorage = cursorStorage;
@@ -8371,7 +8471,7 @@ var SyncManager = class {
 		this.awaiter = new JobAwaiter(eventBus, (jobId, signal) => reactor.getJobStatus(jobId, signal));
 		this.syncAwaiter = new SyncAwaiter(eventBus);
 		this.isShutdown = false;
-		this.batchAggregator = new BatchAggregator(logger, (batch) => this.processCompleteBatch(batch));
+		this.batchAggregator = new BatchAggregator(logger, driveContainerTypes, (batch) => this.processCompleteBatch(batch));
 		this.syncStatusTracker = new SyncStatusTracker();
 	}
 	async startup() {
@@ -8744,8 +8844,8 @@ var SyncManager = class {
 		}
 		if (this.isShutdown) return;
 		for (const plan of jobs) {
+			if (!(plan.key in result.jobs)) continue;
 			const info = result.jobs[plan.key];
-			if (!info) continue;
 			this.recordPlanKeyMapping(plan.key, info.id);
 			const fifoKey = `${plan.documentId}:${plan.scope}:${plan.branch}`;
 			this.lastEnqueuedJobIdByKey.set(fifoKey, info.id);
@@ -8785,41 +8885,55 @@ var SyncManager = class {
 		const composedSignal = signal ? AbortSignal.any([signal, this.abortController.signal]) : this.abortController.signal;
 		let maxOrdinal = ackOrdinal;
 		const lastJobByDoc = /* @__PURE__ */ new Map();
+		let prevChainJobId;
 		const sinceTimestamp = remote.options.sinceTimestampUtcMs;
+		const emitBatches = (operations) => {
+			if (operations.length === 0) return;
+			const batches = batchOperationsByDocument(operations);
+			const syncOps = [];
+			for (const batch of batches) {
+				const jobId = crypto.randomUUID();
+				const prevJobId = lastJobByDoc.get(batch.documentId);
+				const deps = [];
+				if (prevJobId) deps.push(prevJobId);
+				if (mode === OutboxMode.BatchTriggered && prevChainJobId && prevChainJobId !== prevJobId) deps.push(prevChainJobId);
+				const syncOp = new SyncOperation(crypto.randomUUID(), jobId, deps, remote.name, batch.documentId, [batch.scope], batch.branch, batch.operations);
+				syncOps.push(syncOp);
+				lastJobByDoc.set(batch.documentId, jobId);
+				if (mode === OutboxMode.BatchTriggered) prevChainJobId = jobId;
+			}
+			remote.channel.outbox.add(...syncOps);
+		};
 		let page = await this.operationIndex.find(remote.collectionId, ackOrdinal, { excludeSourceRemote: remote.name }, void 0, composedSignal);
+		let carry = [];
 		let hasMore;
 		do {
 			if (composedSignal.aborted) return;
 			for (const entry of page.results) maxOrdinal = Math.max(maxOrdinal, entry.ordinal ?? 0);
 			let operations = page.results.map((entry) => toOperationWithContext(entry));
+			if (carry.length > 0) {
+				operations = [...carry, ...operations];
+				carry = [];
+			}
 			if (sinceTimestamp && sinceTimestamp !== "0") operations = operations.filter((op) => op.operation.timestampUtcMs >= sinceTimestamp);
 			operations = filterOperations(operations, remote.filter);
 			operations = operations.filter((op) => !this.quarantinedDocumentIds.has(op.context.documentId));
+			hasMore = !!page.next;
 			if (operations.length > 0) {
 				operations.sort((a, b) => {
 					if (a.context.documentId !== b.context.documentId) return a.context.documentId < b.context.documentId ? -1 : 1;
 					if (a.context.scope !== b.context.scope) return a.context.scope < b.context.scope ? -1 : 1;
 					return a.context.ordinal - b.context.ordinal;
 				});
-				const batches = batchOperationsByDocument(operations);
-				const syncOps = [];
-				let prevChainJobId;
-				for (const batch of batches) {
-					const jobId = crypto.randomUUID();
-					const prevJobId = lastJobByDoc.get(batch.documentId);
-					const deps = [];
-					if (prevJobId) deps.push(prevJobId);
-					if (mode === OutboxMode.BatchTriggered && prevChainJobId && prevChainJobId !== prevJobId) deps.push(prevChainJobId);
-					const syncOp = new SyncOperation(crypto.randomUUID(), jobId, deps, remote.name, batch.documentId, [batch.scope], batch.branch, batch.operations);
-					syncOps.push(syncOp);
-					lastJobByDoc.set(batch.documentId, jobId);
-					if (mode === OutboxMode.BatchTriggered) prevChainJobId = jobId;
-				}
-				remote.channel.outbox.add(...syncOps);
+				if (hasMore) {
+					const split = splitTrailingSameTimestampRun(operations);
+					carry = split.carry;
+					emitBatches(split.emit);
+				} else emitBatches(operations);
 			}
-			hasMore = !!page.next;
 			if (hasMore) page = await page.next();
 		} while (hasMore);
+		if (carry.length > 0) emitBatches(carry);
 		remote.channel.outbox.advanceOrdinal(maxOrdinal);
 	}
 };
@@ -8855,15 +8969,15 @@ var SyncBuilder = class {
 		this.config.maxInboxBatchSize = limit;
 		return this;
 	}
-	build(reactor, logger, operationIndex, eventBus, db) {
-		return this.buildModule(reactor, logger, operationIndex, eventBus, db).syncManager;
+	build(reactor, logger, operationIndex, eventBus, db, driveContainerTypes) {
+		return this.buildModule(reactor, logger, operationIndex, eventBus, db, driveContainerTypes).syncManager;
 	}
-	buildModule(reactor, logger, operationIndex, eventBus, db) {
+	buildModule(reactor, logger, operationIndex, eventBus, db, driveContainerTypes) {
 		if (!this.channelFactory) throw new Error("Channel factory is required");
 		const remoteStorage = this.remoteStorage ?? new KyselySyncRemoteStorage(db);
 		const cursorStorage = this.cursorStorage ?? new KyselySyncCursorStorage(db);
 		const deadLetterStorage = this.deadLetterStorage ?? new KyselySyncDeadLetterStorage(db);
-		const syncManager = new SyncManager(logger, remoteStorage, cursorStorage, deadLetterStorage, this.channelFactory, operationIndex, reactor, eventBus, this.config);
+		const syncManager = new SyncManager(logger, remoteStorage, cursorStorage, deadLetterStorage, this.channelFactory, operationIndex, reactor, eventBus, driveContainerTypes, this.config);
 		return {
 			remoteStorage,
 			cursorStorage,
@@ -8882,6 +8996,9 @@ async function createDefaultDatabase() {
 	return new Kysely({ dialect: new PGliteDialect(new PGlite()) });
 }
 //#endregion
+//#region src/core/drive-container-types.ts
+const DEFAULT_DRIVE_CONTAINER_TYPES = new Set(["powerhouse/document-drive", "powerhouse/reactor-drive"]);
+//#endregion
 //#region src/shared/factories.ts
 /**
 * Factory method to create a ShutdownStatus that can be updated
@@ -8976,7 +9093,7 @@ var Reactor = class {
 	}
 	getDocumentModels(namespace, paging, signal) {
 		this.logger.verbose("getDocumentModels(@namespace, @paging)", namespace, paging);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		const filteredModels = this.documentModelRegistry.getAllModules().filter((module) => !namespace || module.documentModel.global.id.startsWith(namespace));
 		const startIndex = paging ? parseInt(paging.cursor) || 0 : 0;
 		const limit = paging?.limit || filteredModels.length;
@@ -9012,24 +9129,24 @@ var Reactor = class {
 	}
 	async getOutgoingRelationships(sourceId, relationshipType, consistencyToken, signal) {
 		const relationships = await this.documentIndexer.getOutgoing(sourceId, [relationshipType], void 0, consistencyToken, signal);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		return relationships.results.map((rel) => rel.targetId);
 	}
 	async getIncomingRelationships(targetId, relationshipType, consistencyToken, signal) {
 		const relationships = await this.documentIndexer.getIncoming(targetId, [relationshipType], void 0, consistencyToken, signal);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		return relationships.results.map((rel) => rel.sourceId);
 	}
 	async getOperations(documentId, view, filter, paging, consistencyToken, signal) {
 		this.logger.verbose("getOperations(@documentId, @view, @filter, @paging)", documentId, view, filter, paging);
 		const branch = view?.branch || "main";
 		const revisions = await this.operationStore.getRevisions(documentId, branch, signal);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		const allScopes = Object.keys(revisions.revision);
 		const result = {};
 		for (const scope of allScopes) {
 			if (!matchesScope(view, scope)) continue;
-			if (signal?.aborted) throw new AbortError();
+			throwIfAborted(signal, () => new AbortError());
 			const scopeResult = await this.operationStore.getSince(documentId, scope, branch, -1, filter, paging, signal);
 			result[scope] = {
 				results: scopeResult.results,
@@ -9060,13 +9177,13 @@ var Reactor = class {
 			if (search.type) results = filterByType(results, search.type);
 		} else if (search.type) results = await this.findByType(search.type, view, paging, consistencyToken, signal);
 		else throw new Error("No search criteria provided");
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		return results;
 	}
 	async create(document, signer, signal, meta) {
 		this.logger.verbose("create(@id, @type, @slug)", document.header.id, document.header.documentType, document.header.slug);
 		const createdAtUtcIso = (/* @__PURE__ */ new Date()).toISOString();
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		let actions = [createDocumentAction({
 			model: document.header.documentType,
 			version: 0,
@@ -9126,7 +9243,7 @@ var Reactor = class {
 	async deleteDocument(id, signer, signal, meta) {
 		this.logger.verbose("deleteDocument(@id)", id);
 		const createdAtUtcIso = (/* @__PURE__ */ new Date()).toISOString();
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		let action = deleteDocumentAction(id);
 		if (signer) action = await signAction(action, signer, signal);
 		const jobId = v4();
@@ -9163,7 +9280,7 @@ var Reactor = class {
 	}
 	async execute(docId, branch, actions, signal, meta) {
 		this.logger.verbose("execute(@docId, @branch, @actions)", docId, branch, actions);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		const createdAtUtcIso = (/* @__PURE__ */ new Date()).toISOString();
 		const scope = getSharedActionScope(actions);
 		const jobId = v4();
@@ -9196,12 +9313,12 @@ var Reactor = class {
 		this.jobTracker.registerJob(jobInfo);
 		this.emitJobPending(jobInfo.id, jobMeta);
 		await this.queue.enqueue(job);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		return jobInfo;
 	}
 	async load(docId, branch, operations, signal, meta) {
 		this.logger.verbose("load(@docId, @branch, @count, @operations)", docId, branch, operations.length, operations);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		if (operations.length === 0) throw new Error("load requires at least one operation");
 		const scope = getSharedOperationScope(operations);
 		const createdAtUtcIso = (/* @__PURE__ */ new Date()).toISOString();
@@ -9235,12 +9352,12 @@ var Reactor = class {
 		this.jobTracker.registerJob(jobInfo);
 		this.emitJobPending(jobInfo.id, jobMeta);
 		await this.queue.enqueue(job);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		return jobInfo;
 	}
 	async executeBatch(request, signal, meta) {
 		this.logger.verbose("executeBatch(@count jobs)", request.jobs.length);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		validateBatchRequest(request.jobs);
 		for (const jobPlan of request.jobs) validateActionScopes(jobPlan);
 		const createdAtUtcIso = (/* @__PURE__ */ new Date()).toISOString();
@@ -9274,7 +9391,7 @@ var Reactor = class {
 		const enqueuedKeys = [];
 		try {
 			for (const key of sortedKeys) {
-				if (signal?.aborted) throw new AbortError();
+				throwIfAborted(signal, () => new AbortError());
 				const jobPlan = request.jobs.find((j) => j.key === key);
 				const jobId = planKeyToJobId.get(key);
 				const queueHint = jobPlan.dependsOn.map((depKey) => planKeyToJobId.get(depKey));
@@ -9309,7 +9426,7 @@ var Reactor = class {
 	}
 	async loadBatch(request, signal, meta) {
 		this.logger.verbose("loadBatch(@count jobs)", request.jobs.length);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		validateBatchLoadRequest(request.jobs);
 		for (const jobPlan of request.jobs) validateOperationScopes(jobPlan);
 		const createdAtUtcIso = (/* @__PURE__ */ new Date()).toISOString();
@@ -9343,7 +9460,7 @@ var Reactor = class {
 		const enqueuedKeys = [];
 		try {
 			for (const key of sortedKeys) {
-				if (signal?.aborted) throw new AbortError();
+				throwIfAborted(signal, () => new AbortError());
 				const jobPlan = request.jobs.find((j) => j.key === key);
 				const jobId = planKeyToJobId.get(key);
 				const queueHint = [...jobPlan.dependsOn.map((depKey) => planKeyToJobId.get(depKey)), ...jobPlan.externalDeps];
@@ -9378,21 +9495,21 @@ var Reactor = class {
 	}
 	async addRelationship(sourceId, targetId, relationshipType, branch = "main", signer, signal) {
 		this.logger.verbose("addRelationship(@sourceId, @targetId, @relationshipType, @branch)", sourceId, targetId, relationshipType, branch);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		let actions = [addRelationshipAction(sourceId, targetId, relationshipType)];
 		if (signer) actions = await signActions(actions, signer, signal);
 		return await this.execute(sourceId, branch, actions, signal);
 	}
 	async removeRelationship(sourceId, targetId, relationshipType, branch = "main", signer, signal) {
 		this.logger.verbose("removeRelationship(@sourceId, @targetId, @relationshipType, @branch)", sourceId, targetId, relationshipType, branch);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		let actions = [removeRelationshipAction(sourceId, targetId, relationshipType)];
 		if (signer) actions = await signActions(actions, signer, signal);
 		return await this.execute(sourceId, branch, actions, signal);
 	}
 	getJobStatus(jobId, signal) {
 		this.logger.verbose("getJobStatus(@jobId)", jobId);
-		if (signal?.aborted) throw new AbortError();
+		throwIfAborted(signal, () => new AbortError());
 		const jobInfo = this.jobTracker.getJobStatus(jobId);
 		if (!jobInfo) {
 			const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -9461,6 +9578,7 @@ var ReactorBuilder = class {
 	upgradeManifests = [];
 	features = { legacyStorageEnabled: false };
 	readModels = [];
+	readModelFactories = [];
 	executorManager;
 	executorConfig = {};
 	writeCacheConfig;
@@ -9476,6 +9594,7 @@ var ReactorBuilder = class {
 	jwtHandler;
 	documentModelLoader;
 	shutdownHooks = [];
+	driveContainerTypes = DEFAULT_DRIVE_CONTAINER_TYPES;
 	withLogger(logger) {
 		this.logger = logger;
 		return this;
@@ -9499,6 +9618,17 @@ var ReactorBuilder = class {
 		this.readModels.push(readModel);
 		return this;
 	}
+	/**
+	* Register a factory that builds a pre-ready read model after the reactor's
+	* internal `operationIndex`, `writeCache`, and processor-manager consistency
+	* tracker are constructed. Use this for read models (e.g. `BaseReadModel`
+	* subclasses) that need those dependencies and therefore cannot be built
+	* before calling `buildModule()`.
+	*/
+	withReadModelFactory(factory) {
+		this.readModelFactories.push(factory);
+		return this;
+	}
 	withReadModelCoordinator(readModelCoordinator) {
 		this.readModelCoordinator = readModelCoordinator;
 		return this;
@@ -9518,6 +9648,10 @@ var ReactorBuilder = class {
 		this.writeCacheConfig = config;
 		return this;
 	}
+	withDriveContainerTypes(types) {
+		this.driveContainerTypes = new Set(types);
+		return this;
+	}
 	withMigrationStrategy(strategy) {
 		this.migrationStrategy = strategy;
 		return this;
@@ -9608,7 +9742,7 @@ var ReactorBuilder = class {
 		const collectionMembershipCache = new CollectionMembershipCache(operationIndex);
 		const executionScope = new KyselyExecutionScope(database, operationStore, operationIndex, keyframeStore, writeCache, documentMetaCache, collectionMembershipCache);
 		let executorManager = this.executorManager;
-		if (!executorManager) executorManager = new SimpleJobExecutorManager(() => new SimpleJobExecutor(this.logger, documentModelRegistry, operationStore, eventBus, writeCache, operationIndex, documentMetaCache, collectionMembershipCache, this.executorConfig, this.signatureVerifier, executionScope), eventBus, queue, jobTracker, this.logger, resolver, this.executorConfig.jobTimeoutMs);
+		if (!executorManager) executorManager = new SimpleJobExecutorManager(() => new SimpleJobExecutor(this.logger, documentModelRegistry, operationStore, eventBus, writeCache, operationIndex, documentMetaCache, collectionMembershipCache, this.driveContainerTypes, this.executorConfig, this.signatureVerifier, executionScope), eventBus, queue, jobTracker, this.logger, resolver, this.executorConfig.jobTimeoutMs);
 		await executorManager.start(this.executorConfig.maxConcurrency ?? 1);
 		const readModelInstances = Array.from(new Set([...this.readModels]));
 		const documentViewConsistencyTracker = new ConsistencyTracker();
@@ -9630,21 +9764,29 @@ var ReactorBuilder = class {
 		const subscriptionManager = new ReactorSubscriptionManager(new DefaultSubscriptionErrorHandler());
 		const subscriptionNotificationReadModel = new SubscriptionNotificationReadModel(subscriptionManager, documentView);
 		const processorManagerConsistencyTracker = new ConsistencyTracker();
-		const processorManager = new ProcessorManager(database, operationIndex, writeCache, processorManagerConsistencyTracker, this.logger);
+		const processorManager = new ProcessorManager(database, operationIndex, writeCache, processorManagerConsistencyTracker, this.logger, this.driveContainerTypes);
 		try {
 			await processorManager.init();
 		} catch (error) {
 			console.error("Error initializing processor manager", error);
 		}
+		for (const factory of this.readModelFactories) {
+			const readModel = await factory({
+				operationIndex,
+				writeCache,
+				processorManagerConsistencyTracker
+			});
+			readModelInstances.push(readModel);
+		}
 		const readModelCoordinator = this.readModelCoordinator ? this.readModelCoordinator : new ReadModelCoordinator(eventBus, readModelInstances, [subscriptionNotificationReadModel, processorManager]);
 		const reactor = new Reactor(this.logger, documentModelRegistry, queue, jobTracker, readModelCoordinator, this.features, documentView, documentIndexer, operationStore, eventBus, executorManager);
 		let syncModule = void 0;
 		if (this.channelScheme) {
 			const factory = this.channelScheme === ChannelScheme.CONNECT ? new GqlRequestChannelFactory(this.logger, this.jwtHandler, queue) : new GqlResponseChannelFactory(this.logger);
-			syncModule = new SyncBuilder().withChannelFactory(factory).buildModule(reactor, this.logger, operationIndex, eventBus, database);
+			syncModule = new SyncBuilder().withChannelFactory(factory).buildModule(reactor, this.logger, operationIndex, eventBus, database, this.driveContainerTypes);
 			await syncModule.syncManager.startup();
 		} else if (this.syncBuilder) {
-			syncModule = this.syncBuilder.buildModule(reactor, this.logger, operationIndex, eventBus, database);
+			syncModule = this.syncBuilder.buildModule(reactor, this.logger, operationIndex, eventBus, database, this.driveContainerTypes);
 			await syncModule.syncManager.startup();
 		}
 		const module = {
@@ -9890,13 +10032,15 @@ const JobExecutorEventTypes = {
 	EXECUTOR_STOPPED: 20004
 };
 //#endregion
-//#region src/admin/document-integrity-service.ts
-const nullKeyframeStore = {
+//#region src/admin/passthrough-keyframe-store.ts
+const passthroughKeyframeStore = {
 	putKeyframe: () => Promise.resolve(),
 	findNearestKeyframe: () => Promise.resolve(void 0),
 	listKeyframes: () => Promise.resolve([]),
 	deleteKeyframes: () => Promise.resolve(0)
 };
+//#endregion
+//#region src/admin/document-integrity-service.ts
 var DocumentIntegrityService = class {
 	keyframeStore;
 	operationStore;
@@ -9913,14 +10057,14 @@ var DocumentIntegrityService = class {
 	async validateDocument(documentId, branch = "main", signal) {
 		const keyframeIssues = [];
 		const snapshotIssues = [];
-		const replayCache = new KyselyWriteCache(nullKeyframeStore, this.operationStore, this.documentModelRegistry, {
+		const replayCache = new KyselyWriteCache(passthroughKeyframeStore, this.operationStore, this.documentModelRegistry, {
 			maxDocuments: 1,
 			ringBufferSize: 1,
 			keyframeInterval: Number.MAX_SAFE_INTEGER
 		});
 		const keyframes = await this.keyframeStore.listKeyframes(documentId, void 0, branch, signal);
 		for (const keyframe of keyframes) {
-			if (signal?.aborted) throw new Error("Operation aborted");
+			throwIfAborted(signal);
 			replayCache.invalidate(documentId, keyframe.scope, branch);
 			const replayedDoc = await replayCache.getState(documentId, keyframe.scope, branch, keyframe.revision, signal);
 			const kfHash = hashDocumentStateForScope(keyframe.document, keyframe.scope);
@@ -9953,7 +10097,7 @@ var DocumentIntegrityService = class {
 			try {
 				replayedDoc = await replayCache.getState(documentId, scope, branch, void 0, signal);
 			} catch {
-				if (signal?.aborted) throw new Error("Operation aborted");
+				throwIfAborted(signal);
 				continue;
 			}
 			const snapshotHash = hashDocumentStateForScope(currentDoc, scope);
@@ -9982,7 +10126,7 @@ var DocumentIntegrityService = class {
 	async rebuildSnapshots(documentId, branch = "main", signal) {
 		const scopes = await this.discoverScopes(documentId, branch, signal);
 		for (const scope of scopes) {
-			if (signal?.aborted) throw new Error("Operation aborted");
+			throwIfAborted(signal);
 			this.writeCache.invalidate(documentId, scope, branch);
 		}
 		return {
@@ -9997,6 +10141,6 @@ var DocumentIntegrityService = class {
 	}
 };
 //#endregion
-export { BaseReadModel, ChannelError, ChannelErrorSource, ChannelScheme, ConsistencyTracker, DefaultSubscriptionErrorHandler, DocumentChangeType, DocumentIntegrityService, DocumentModelRegistry, DocumentModelResolver, DriveClient, DuplicateManifestError, DuplicateModuleError, DuplicateOperationError, EventBus, EventBusAggregateError, GqlRequestChannel, GqlRequestChannelFactory, GqlResponseChannel, GqlResponseChannelFactory, SimpleJobExecutor as InMemoryJobExecutor, SimpleJobExecutor, InMemoryJobTracker, InMemoryQueue, IntervalPollTimer, InvalidModuleError, JobAwaiter, JobExecutorEventTypes, JobStatus, KyselyDocumentIndexer, KyselyDocumentView, KyselyKeyframeStore, KyselyOperationStore, KyselySyncCursorStorage, KyselySyncRemoteStorage, KyselyWriteCache, Mailbox, ModuleNotFoundError, NullDocumentModelResolver, OptimisticLockError, PollBehavior, PollingChannelError, ProcessorManager, PropagationMode, QueueEventTypes, REACTOR_SCHEMA, Reactor, ReactorBuilder, ReactorClient, ReactorClientBuilder, ReactorEventTypes, ReactorSubscriptionManager, ReadModelCoordinator, RelationalDbProcessor, RelationshipChangeType, RevisionMismatchError, SimpleJobExecutorManager, SyncBuilder, SyncEventTypes, SyncOperation, SyncOperationAggregateError, SyncOperationStatus, SyncStatus, SyncStatusTracker, addRelationshipAction, batchOperationsByDocument, consolidateSyncOperations, createDocumentAction, createMutableShutdownStatus, createRelationalDb, deleteDocumentAction, documentActions, driveCollectionId, driveIdFromUrl, envelopesToSyncOperations, getMigrationStatus, makeConsistencyKey, parseDriveUrl, removeRelationshipAction, runMigrations, trimMailboxFromAckOrdinal, upgradeDocumentAction };
+export { BaseReadModel, ChannelError, ChannelErrorSource, ChannelScheme, ConsistencyTracker, DEFAULT_DRIVE_CONTAINER_TYPES, DefaultSubscriptionErrorHandler, DocumentChangeType, DocumentIntegrityService, DocumentModelRegistry, DocumentModelResolver, DriveClient, DuplicateManifestError, DuplicateModuleError, DuplicateOperationError, EventBus, EventBusAggregateError, GqlRequestChannel, GqlRequestChannelFactory, GqlResponseChannel, GqlResponseChannelFactory, SimpleJobExecutor as InMemoryJobExecutor, SimpleJobExecutor, InMemoryJobTracker, InMemoryQueue, IntervalPollTimer, InvalidModuleError, JobAwaiter, JobExecutorEventTypes, JobStatus, KyselyDocumentIndexer, KyselyDocumentView, KyselyKeyframeStore, KyselyOperationStore, KyselySyncCursorStorage, KyselySyncRemoteStorage, KyselyWriteCache, Mailbox, ModuleNotFoundError, NullDocumentModelResolver, OptimisticLockError, PollBehavior, PollingChannelError, ProcessorManager, PropagationMode, QueueEventTypes, REACTOR_SCHEMA, Reactor, ReactorBuilder, ReactorClient, ReactorClientBuilder, ReactorEventTypes, ReactorSubscriptionManager, ReadModelCoordinator, RelationalDbProcessor, RelationshipChangeType, RevisionMismatchError, SimpleJobExecutorManager, SyncBuilder, SyncEventTypes, SyncOperation, SyncOperationAggregateError, SyncOperationStatus, SyncStatus, SyncStatusTracker, addRelationshipAction, batchOperationsByDocument, consolidateSyncOperations, createDocumentAction, createMutableShutdownStatus, createRelationalDb, deleteDocumentAction, documentActions, driveCollectionId, driveIdFromUrl, envelopesToSyncOperations, getMigrationStatus, makeConsistencyKey, parseDriveUrl, parsePagingOptions, removeRelationshipAction, runMigrations, trimMailboxFromAckOrdinal, updateRelationshipAction, upgradeDocumentAction };
 
 //# sourceMappingURL=index.js.map