@powerhousedao/reactor 6.2.0-dev.5 → 6.2.0-dev.50

package/dist/index.js

@@ -1,13 +1,13 @@
-import { A as parsePagingOptions, C as DuplicateManifestError, D as DocumentDeletedError, E as ModuleNotFoundError, O as DocumentNotFoundError, S as CollectionMembershipCache, T as InvalidModuleError, _ as KyselyWriteCache, a as createForwardingPoolInstrumentation, b as createConsistencyToken, c as DuplicateOperationError, d as KyselyKeyframeStore, f as DocumentModelRegistry, g as EventBus, h as KyselyExecutionScope, i as runMigrations, j as throwIfAborted, k as matchesScope, l as OptimisticLockError, m as driveCollectionId, n as REACTOR_SCHEMA, o as instrumentPgPool, p as SimpleJobExecutor, r as getMigrationStatus, s as KyselyOperationStore, t as DEFAULT_DRIVE_CONTAINER_TYPES, u as RevisionMismatchError, v as KyselyOperationIndex, w as DuplicateModuleError, x as createEmptyConsistencyToken, y as DocumentMetaCache } from "./drive-container-types-BNpMlgT_.js";
-import { n as ReactorEventTypes, t as EventBusAggregateError } from "./types-CxSpmNGK.js";
+import { A as parsePagingOptions, C as DuplicateManifestError, D as DocumentDeletedError, E as ModuleNotFoundError, O as DocumentNotFoundError, S as CollectionMembershipCache, T as InvalidModuleError, _ as KyselyWriteCache, a as createForwardingPoolInstrumentation, b as createConsistencyToken, c as DuplicateOperationError, d as KyselyKeyframeStore, f as DocumentModelRegistry, g as EventBus, h as KyselyExecutionScope, i as runMigrations, j as throwIfAborted, k as matchesScope, l as OptimisticLockError, m as DriveCollectionId, n as REACTOR_SCHEMA, o as instrumentPgPool, p as SimpleJobExecutor, r as getMigrationStatus, s as KyselyOperationStore, t as DEFAULT_DRIVE_CONTAINER_TYPES, u as RevisionMismatchError, v as KyselyOperationIndex, w as DuplicateModuleError, x as createEmptyConsistencyToken, y as DocumentMetaCache } from "./drive-container-types-BuFNr0j0.js";
+import { n as ReactorEventTypes, t as EventBusAggregateError } from "./types-DMKLa0Ok.js";
 import { i as WorkerInitFailedError, r as WorkerExitedError, t as WorkerAbortTimeoutError } from "./errors-D3S6Eysd.js";
-import { a as ReadModelCoordinator, i as KyselyDocumentView, n as ConsistencyTracker, o as BaseReadModel, r as makeConsistencyKey, t as KyselyDocumentIndexer } from "./document-indexer-B2iLRB0o.js";
+import { a as ReadModelCoordinator, i as KyselyDocumentView, n as ConsistencyTracker, o as BaseReadModel, r as makeConsistencyKey, t as KyselyDocumentIndexer } from "./document-indexer-B6iippzG.js";
 import { n as errorToInfo, r as sanitizeArg, t as createForwardingLogger } from "./forwarding-logger-BBkMSxuJ.js";
-import { t as workerEntryPath } from "./worker-SUoDhurA.js";
+import { t as workerEntryPath } from "./worker-Dzrw1YMV.js";
 import { actions, actions as documentActions, createPresignedHeader, generateId, hashDocumentStateForScope, replayDocument } from "@powerhousedao/shared/document-model";
 import { addFile, addFolder, copyNode, deleteNode, driveCreateDocument, generateNodesCopy, getDescendants, handleTargetNameCollisions, isFileNode, isFolderNode, moveNode, updateNode } from "@powerhousedao/shared/document-drive";
 import { v4 } from "uuid";
-import { ConsoleLogger } from "document-model";
+import { ConsoleLogger, childLogger } from "document-model";
 import { sql } from "kysely";
 import { RelationalDbProcessor, createRelationalDb } from "@powerhousedao/shared/processors";
 //#region src/actions/index.ts
@@ -737,6 +737,14 @@ var ReactorClient = class {
 		return await this.reactor.getByIdOrSlug(identifier, view, void 0, signal);
 	}
 	/**
+	* Resolves an identifier (id or slug) to the canonical document id, using the
+	* same lookup as the data path. Resolves against the "main" branch. Throws if
+	* the identifier cannot be resolved or is ambiguous.
+	*/
+	async resolveIdOrSlug(identifier, signal) {
+		return this.documentView.resolveIdOrSlug(identifier, void 0, void 0, signal);
+	}
+	/**
 	* Retrieves operations for a document
 	*/
 	async getOperations(documentIdentifier, view, filter, paging, signal) {
@@ -1858,6 +1866,7 @@ var InMemoryJobTracker = class {
 		if (!job) {
 			this.jobs.set(jobId, {
 				id: jobId,
+				documentId: "",
 				status: JobStatus.RUNNING,
 				createdAtUtcIso: (/* @__PURE__ */ new Date()).toISOString(),
 				consistencyToken: createEmptyConsistencyToken(),
@@ -1878,6 +1887,7 @@ var InMemoryJobTracker = class {
 		if (!existing) {
 			this.jobs.set(jobId, {
 				id: jobId,
+				documentId: job?.documentId ?? "",
 				status: JobStatus.FAILED,
 				createdAtUtcIso: (/* @__PURE__ */ new Date()).toISOString(),
 				completedAtUtcIso: (/* @__PURE__ */ new Date()).toISOString(),
@@ -2686,6 +2696,8 @@ var DocumentModelResolver = class {
 	loadingModels = /* @__PURE__ */ new Map();
 	failedModelTypes = /* @__PURE__ */ new Set();
 	broadcastHook = null;
+	modelLoadedHook = null;
+	logger = childLogger(["reactor", "document-model-resolver"]);
 	constructor(registry, loader) {
 		this.registry = registry;
 		this.loader = loader;
@@ -2698,6 +2710,13 @@ var DocumentModelResolver = class {
 	setBroadcastHook(hook) {
 		this.broadcastHook = hook;
 	}
+	/**
+	* Post-success hook called with the document type after a model loads, so
+	* peers (tabs) can load the same type via the event bus.
+	*/
+	setModelLoadedHook(hook) {
+		this.modelLoadedHook = hook;
+	}
 	async ensureModelLoaded(documentType) {
 		try {
 			this.registry.getModule(documentType);
@@ -2710,20 +2729,32 @@ var DocumentModelResolver = class {
 		if (existing) return existing;
 		const loadPromise = (async () => {
 			try {
-				const module = await this.loader.load(documentType);
-				const [result] = this.registry.registerModules(module);
-				if (result.status === "error" && !DuplicateModuleError.isError(result.error)) throw result.error;
-				await this.broadcastIfPossible(documentType);
+				await this.loadRegisterAndBroadcast(documentType);
 			} catch (error) {
 				this.failedModelTypes.add(documentType);
 				throw error;
 			} finally {
 				this.loadingModels.delete(documentType);
 			}
+			await this.notifyPeersModelLoaded(documentType);
 		})();
 		this.loadingModels.set(documentType, loadPromise);
 		return loadPromise;
 	}
+	async loadRegisterAndBroadcast(documentType) {
+		const module = await this.loader.load(documentType);
+		const [result] = this.registry.registerModules(module);
+		if (result.status === "error" && !DuplicateModuleError.isError(result.error)) throw result.error;
+		await this.broadcastIfPossible(documentType);
+	}
+	async notifyPeersModelLoaded(documentType) {
+		if (!this.modelLoadedHook) return;
+		try {
+			await this.modelLoadedHook(documentType);
+		} catch (error) {
+			this.logger.warn(`MODEL_LOADED hook failed: ${documentType}`, error);
+		}
+	}
 	async broadcastIfPossible(documentType) {
 		if (!this.broadcastHook || !this.loader.resolveSpec) return;
 		const entry = await this.loader.resolveSpec(documentType);
@@ -3295,6 +3326,20 @@ var GraphQLRequestError = class extends Error {
 		this.statusCode = statusCode;
 	}
 };
+/** Auth-rejection message fragments the switchboard emits. Shared with
+* reactor-api so server throws and this client check can't drift. */
+const DRIVE_AUTH_ERROR_MESSAGES = {
+	forbidden: "Forbidden: insufficient permissions",
+	authenticationRequired: "Forbidden: authentication required"
+};
+/** True when the remote rejected the caller as unauthenticated/unauthorized:
+* an HTTP 401/403, or a Forbidden/Unauthorized GraphQL error. */
+function isDriveAuthError(error) {
+	if (!(error instanceof GraphQLRequestError)) return false;
+	if (error.category === "http") return error.statusCode === 401 || error.statusCode === 403;
+	if (error.category === "graphql") return Object.values(DRIVE_AUTH_ERROR_MESSAGES).some((m) => error.message.includes(m));
+	return false;
+}
 var PollingChannelError = class extends Error {
 	constructor(message) {
 		super(message);
@@ -3946,7 +3991,10 @@ var GqlRequestChannel = class {
 	isPushing = false;
 	pendingDrain = false;
 	receivingPages = false;
+	isRecovering = false;
 	connectionState = "connecting";
+	/** Latest unrecoverable error was an auth rejection; cleared on connect. */
+	requiresAuth = false;
 	connectionStateCallbacks = /* @__PURE__ */ new Set();
 	constructor(logger, channelId, remoteName, cursorStorage, config, operationIndex, pollTimer) {
 		this.logger = logger;
@@ -4038,7 +4086,8 @@ var GqlRequestChannel = class {
 			lastFailureUtcMs: this.lastFailureUtcMs ?? 0,
 			pushBlocked: this.pushBlocked,
 			pushFailureCount: this.pushFailureCount,
-			receivingPages: this.receivingPages
+			receivingPages: this.receivingPages,
+			requiresAuth: this.requiresAuth
 		};
 	}
 	onConnectionStateChange(callback) {
@@ -4069,6 +4118,7 @@ var GqlRequestChannel = class {
 		this.transitionConnectionState("connected");
 	}
 	transitionConnectionState(next) {
+		if (next === "connected") this.requiresAuth = false;
 		if (this.connectionState === next) return;
 		this.connectionState = next;
 		const snapshot = this.getConnectionState();
@@ -4143,6 +4193,7 @@ var GqlRequestChannel = class {
 		this.logger.error("GqlChannel poll error (@FailureCount, @Classification): @Error", this.failureCount, classification, channelError);
 		if (classification === "unrecoverable") {
 			this.pollTimer.stop();
+			this.requiresAuth = isDriveAuthError(err);
 			this.transitionConnectionState("error");
 			return true;
 		}
@@ -4154,16 +4205,23 @@ var GqlRequestChannel = class {
 	* Self-retries with backoff instead of restarting the poll timer on failure.
 	*/
 	recoverFromChannelNotFound() {
+		if (this.isRecovering) return;
+		this.isRecovering = true;
 		this.logger.info("GqlChannel @ChannelId not found on remote, re-registering...", this.channelId);
 		this.pollTimer.stop();
 		const attemptRecovery = (attempt) => {
-			if (this.isShutdown) return;
+			if (this.isShutdown) {
+				this.isRecovering = false;
+				return;
+			}
 			this.touchRemoteChannel().then(({ ackOrdinal }) => {
 				this.logger.info("GqlChannel @ChannelId re-registered successfully", this.channelId);
+				this.isRecovering = false;
 				this.failureCount = 0;
 				if (ackOrdinal > 0) trimMailboxFromAckOrdinal(this.outbox, ackOrdinal);
 				this.pollTimer.start();
 				this.transitionConnectionState("connected");
+				this.resumePushAfterRecovery();
 			}).catch((recoveryError) => {
 				const err = recoveryError instanceof Error ? recoveryError : new Error(String(recoveryError));
 				const classification = this.classifyError(err);
@@ -4171,6 +4229,8 @@ var GqlRequestChannel = class {
 				this.failureCount++;
 				this.lastFailureUtcMs = Date.now();
 				if (classification === "unrecoverable") {
+					this.isRecovering = false;
+					this.requiresAuth = isDriveAuthError(err);
 					this.transitionConnectionState("error");
 					return;
 				}
@@ -4182,6 +4242,22 @@ var GqlRequestChannel = class {
 		attemptRecovery(1);
 	}
 	/**
+	* Resumes pushing outbox items that were blocked while the channel was being
+	* recreated. Called after a successful re-registration.
+	*/
+	resumePushAfterRecovery() {
+		if (this.isShutdown) return;
+		if (!this.pushBlocked) return;
+		if (this.pushRetryTimer) {
+			clearTimeout(this.pushRetryTimer);
+			this.pushRetryTimer = null;
+		}
+		this.pushBlocked = false;
+		this.pushFailureCount = 0;
+		const items = this.outbox.items;
+		if (items.length > 0) this.attemptPush([...items]);
+	}
+	/**
 	* Queries the remote GraphQL endpoint for sync envelopes.
 	*/
 	async pollSyncEnvelopes(ackOrdinal, latestOrdinal) {
@@ -4272,7 +4348,7 @@ var GqlRequestChannel = class {
 	async touchRemoteChannel() {
 		let sinceTimestampUtcMs = "0";
 		try {
-			const result = await this.operationIndex.getLatestTimestampForCollection(this.config.collectionId);
+			const result = await this.operationIndex.getLatestTimestampForCollection(this.config.collectionId.key);
 			if (result) sinceTimestampUtcMs = result;
 		} catch {}
 		const mutation = `
@@ -4286,7 +4362,7 @@ var GqlRequestChannel = class {
 		const variables = { input: {
 			id: this.channelId,
 			name: this.channelId,
-			collectionId: this.config.collectionId,
+			collectionId: this.config.collectionId.key,
 			filter: {
 				documentId: this.config.filter.documentId,
 				scope: this.config.filter.scope,
@@ -4317,6 +4393,12 @@ var GqlRequestChannel = class {
 			this.pendingDrain = false;
 			if (this.isShutdown) return;
 			const err = error instanceof Error ? error : new Error(String(error));
+			if (err.message.includes("Channel not found")) {
+				this.pushBlocked = true;
+				this.transitionConnectionState("reconnecting");
+				this.recoverFromChannelNotFound();
+				return;
+			}
 			if (this.classifyError(err) === "recoverable") {
 				this.pushFailureCount++;
 				this.pushBlocked = true;
@@ -4328,6 +4410,7 @@ var GqlRequestChannel = class {
 				for (const syncOp of syncOps) syncOp.failed(channelError);
 				this.deadLetter.add(...syncOps);
 				this.outbox.remove(...syncOps);
+				this.requiresAuth = isDriveAuthError(err);
 				this.transitionConnectionState("error");
 			}
 		});
@@ -4620,7 +4703,8 @@ var GqlResponseChannel = class {
 			lastFailureUtcMs: 0,
 			pushBlocked: false,
 			pushFailureCount: 0,
-			receivingPages: false
+			receivingPages: false,
+			requiresAuth: false
 		};
 	}
 	onConnectionStateChange(callback) {
@@ -4819,7 +4903,7 @@ function rowToRemoteRecord(row) {
 	return {
 		id: row.channel_id,
 		name: row.name,
-		collectionId: row.collection_id,
+		collectionId: DriveCollectionId.fromKey(row.collection_id),
 		channelConfig: {
 			type: row.channel_type,
 			parameters: row.channel_parameters ?? {}
@@ -4846,16 +4930,21 @@ function rowToRemoteRecord(row) {
 		}
 	};
 }
+/**
+* Maps a RemoteRecord to a row. jsonb array columns are JSON-encoded because the
+* pg driver would otherwise emit a Postgres array literal ("{a,b}"), which jsonb
+* rejects (matches sync-dead-letter-storage).
+*/
 function remoteRecordToRow(remote) {
 	return {
 		name: remote.name,
-		collection_id: remote.collectionId,
+		collection_id: remote.collectionId.key,
 		channel_type: remote.channelConfig.type,
 		channel_id: remote.id,
 		remote_name: remote.name,
 		channel_parameters: remote.channelConfig.parameters,
-		filter_document_ids: remote.filter.documentId.length > 0 ? remote.filter.documentId : null,
-		filter_scopes: remote.filter.scope.length > 0 ? remote.filter.scope : null,
+		filter_document_ids: remote.filter.documentId.length > 0 ? JSON.stringify(remote.filter.documentId) : null,
+		filter_scopes: remote.filter.scope.length > 0 ? JSON.stringify(remote.filter.scope) : null,
 		filter_branch: remote.filter.branch,
 		push_state: remote.status.push.state,
 		push_last_success_utc_ms: remote.status.push.lastSuccessUtcMs ? new Date(remote.status.push.lastSuccessUtcMs).toISOString() : null,
@@ -5002,7 +5091,7 @@ var BatchAggregator = class {
 				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);
+				const collectionId = DriveCollectionId.forDrive(input.sourceId, op.context.branch).key;
 				if (!(input.targetId in mergedMemberships)) mergedMemberships[input.targetId] = [];
 				if (!mergedMemberships[input.targetId].includes(collectionId)) mergedMemberships[input.targetId].push(collectionId);
 			}
@@ -5292,11 +5381,14 @@ var SyncManager = class {
 		for (const record of remoteRecords) {
 			const channel = this.channelFactory.instance(record.id, record.name, record.channelConfig, this.cursorStorage, record.collectionId, record.filter, this.operationIndex, record.options);
 			const remote = {
-				id: record.id,
-				name: record.name,
-				collectionId: record.collectionId,
-				filter: record.filter,
-				options: record.options,
+				meta: {
+					id: record.id,
+					name: record.name,
+					collectionId: record.collectionId,
+					channelConfig: record.channelConfig,
+					filter: record.filter,
+					options: record.options
+				},
 				channel
 			};
 			this.remotes.set(record.name, remote);
@@ -5315,7 +5407,7 @@ var SyncManager = class {
 				this.backfillAbortControllers.set(record.name, backfillController);
 				this.updateOutbox(remote, outboxAckOrdinal, OutboxMode.Backfill, backfillController.signal).catch((error) => {
 					if (backfillController.signal.aborted) return;
-					this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.name, error instanceof Error ? error : new Error(String(error)));
+					this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.meta.name, error instanceof Error ? error : new Error(String(error)));
 				}).finally(() => {
 					this.backfillAbortControllers.delete(record.name);
 				});
@@ -5359,7 +5451,7 @@ var SyncManager = class {
 		return remote;
 	}
 	getById(id) {
-		for (const remote of this.remotes.values()) if (remote.id === id) return remote;
+		for (const remote of this.remotes.values()) if (remote.meta.id === id) return remote;
 		throw new Error(`Remote with id '${id}' does not exist`);
 	}
 	async add(name, collectionId, channelConfig, filter = {
@@ -5369,7 +5461,7 @@ var SyncManager = class {
 	}, options = { sinceTimestampUtcMs: "0" }, id) {
 		if (this.isShutdown) throw new Error("SyncManager is shutdown and cannot add remotes");
 		if (this.remotes.has(name)) throw new Error(`Remote with name '${name}' already exists`);
-		this.logger.debug("Adding remote (@name, @collectionId, @channelConfig, @filter, @options, @id)", name, collectionId, channelConfig, filter, options, id);
+		this.logger.debug("Adding remote (@name, @collectionId, @channelConfig, @filter, @options, @id)", name, collectionId.key, channelConfig, filter, options, id);
 		const remoteId = id ?? crypto.randomUUID();
 		const remoteRecord = {
 			id: remoteId,
@@ -5386,11 +5478,14 @@ var SyncManager = class {
 		await this.remoteStorage.upsert(remoteRecord);
 		const channel = this.channelFactory.instance(remoteId, name, channelConfig, this.cursorStorage, collectionId, filter, this.operationIndex, options);
 		const remote = {
-			id: remoteId,
-			name,
-			collectionId,
-			filter,
-			options,
+			meta: {
+				id: remoteId,
+				name,
+				collectionId,
+				channelConfig,
+				filter,
+				options
+			},
 			channel
 		};
 		this.remotes.set(name, remote);
@@ -5407,7 +5502,7 @@ var SyncManager = class {
 		this.backfillAbortControllers.set(name, backfillController);
 		this.updateOutbox(remote, 0, OutboxMode.Backfill, backfillController.signal).catch((error) => {
 			if (backfillController.signal.aborted) return;
-			this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.name, error instanceof Error ? error : new Error(String(error)));
+			this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.meta.name, error instanceof Error ? error : new Error(String(error)));
 		}).finally(() => {
 			this.backfillAbortControllers.delete(name);
 		});
@@ -5458,20 +5553,20 @@ var SyncManager = class {
 	}
 	wireChannelCallbacks(remote) {
 		remote.channel.inbox.onAdded((syncOps) => this.handleInboxAdded(remote, syncOps));
-		this.syncStatusTracker.trackRemote(remote.name, remote.channel);
+		this.syncStatusTracker.trackRemote(remote.meta.name, remote.channel);
 		const unsubscribe = remote.channel.onConnectionStateChange((snapshot) => {
 			this.eventBus.emit(SyncEventTypes.CONNECTION_STATE_CHANGED, {
-				remoteName: remote.name,
-				remoteId: remote.id,
+				remoteName: remote.meta.name,
+				remoteId: remote.meta.id,
 				previous: snapshot.state,
 				current: snapshot.state,
 				snapshot
 			}).catch(() => {});
 		});
-		this.connectionStateUnsubscribes.set(remote.name, unsubscribe);
+		this.connectionStateUnsubscribes.set(remote.meta.name, unsubscribe);
 		remote.channel.deadLetter.onAdded((syncOps) => {
 			for (const syncOp of syncOps) {
-				this.logger.error("Dead letter (@remote, @documentId, @jobId, @error, @dependencies)", remote.name, syncOp.documentId, syncOp.jobId, syncOp.error?.message ?? "unknown", syncOp.jobDependencies);
+				this.logger.error("Dead letter (@remote, @documentId, @jobId, @error, @dependencies)", remote.meta.name, syncOp.documentId, syncOp.jobId, syncOp.error?.message ?? "unknown", syncOp.jobDependencies);
 				this.quarantinedDocumentIds.add(syncOp.documentId);
 				const record = {
 					id: syncOp.id,
@@ -5507,12 +5602,12 @@ var SyncManager = class {
 	async loadDeadLetters(remote) {
 		let records;
 		try {
-			records = (await this.deadLetterStorage.list(remote.name, {
+			records = (await this.deadLetterStorage.list(remote.meta.name, {
 				cursor: "0",
 				limit: this.config.maxDeadLettersPerRemote
 			})).results;
 		} catch (error) {
-			this.logger.error("Failed to load dead letters for remote (@name, @error)", remote.name, error instanceof Error ? error.message : String(error));
+			this.logger.error("Failed to load dead letters for remote (@name, @error)", remote.meta.name, error instanceof Error ? error.message : String(error));
 			return;
 		}
 		if (records.length === 0) return;
@@ -5524,10 +5619,10 @@ var SyncManager = class {
 			syncOps.push(syncOp);
 		}
 		remote.channel.deadLetter.add(...syncOps);
-		this.logger.debug("Loaded @count persisted dead letters for remote @name", records.length, remote.name);
+		this.logger.debug("Loaded @count persisted dead letters for remote @name", records.length, remote.meta.name);
 	}
 	getRemotesForCollection(collectionId) {
-		return Array.from(this.remotes.values()).filter((remote) => remote.collectionId === collectionId);
+		return Array.from(this.remotes.values()).filter((remote) => remote.meta.collectionId.key === collectionId);
 	}
 	async processCompleteBatch(batch) {
 		if (this.isShutdown) return;
@@ -5573,11 +5668,11 @@ var SyncManager = class {
 		const operations = syncOp.operations.map((op) => op.operation);
 		let jobInfo;
 		try {
-			jobInfo = await this.reactor.load(syncOp.documentId, syncOp.branch, operations, this.abortController.signal, { sourceRemote: remote.name });
+			jobInfo = await this.reactor.load(syncOp.documentId, syncOp.branch, operations, this.abortController.signal, { sourceRemote: remote.meta.name });
 		} catch (error) {
 			if (this.isShutdown) return;
 			const err = error instanceof Error ? error : new Error(String(error));
-			this.logger.error("Failed to load operations from inbox (@remote, @documentId, @error)", remote.name, syncOp.documentId, err.message);
+			this.logger.error("Failed to load operations from inbox (@remote, @documentId, @error)", remote.meta.name, syncOp.documentId, err.message);
 			const channelError = new ChannelError(ChannelErrorSource.Inbox, err);
 			syncOp.failed(channelError);
 			remote.channel.deadLetter.add(syncOp);
@@ -5590,7 +5685,7 @@ var SyncManager = class {
 		} catch (error) {
 			if (this.isShutdown) return;
 			const err = error instanceof Error ? error : new Error(String(error));
-			this.logger.error("Failed to wait for job completion (@remote, @documentId, @jobId, @error)", remote.name, syncOp.documentId, jobInfo.id, err.message);
+			this.logger.error("Failed to wait for job completion (@remote, @documentId, @jobId, @error)", remote.meta.name, syncOp.documentId, jobInfo.id, err.message);
 			const channelError = new ChannelError(ChannelErrorSource.Inbox, err);
 			syncOp.failed(channelError);
 			remote.channel.deadLetter.add(syncOp);
@@ -5600,7 +5695,7 @@ var SyncManager = class {
 		if (this.isShutdown) return;
 		if (completedJobInfo.status === JobStatus.FAILED) {
 			const errorMessage = completedJobInfo.error?.message || "Unknown error";
-			this.logger.error("Failed to apply operations from inbox (@remote, @documentId, @jobId, @error)", remote.name, syncOp.documentId, completedJobInfo.id, errorMessage);
+			this.logger.error("Failed to apply operations from inbox (@remote, @documentId, @jobId, @error)", remote.meta.name, syncOp.documentId, completedJobInfo.id, errorMessage);
 			const error = new ChannelError(ChannelErrorSource.Inbox, /* @__PURE__ */ new Error(`Failed to apply operations: ${errorMessage}`));
 			syncOp.failed(error);
 			remote.channel.deadLetter.add(syncOp);
@@ -5608,7 +5703,7 @@ var SyncManager = class {
 		remote.channel.inbox.remove(syncOp);
 	}
 	async applyInboxBatch(items) {
-		const sourceRemote = items[0].remote.name;
+		const sourceRemote = items[0].remote.meta.name;
 		const chunkKeys = new Set(items.map(({ syncOp }) => syncOp.jobId));
 		const jobs = items.map(({ syncOp }) => {
 			const dependsOn = [];
@@ -5658,7 +5753,7 @@ var SyncManager = class {
 		}
 		for (const { remote, syncOp } of items) {
 			if (!(syncOp.jobId in result.jobs)) {
-				this.logger.error("Job key missing from batch load result (@remote, @documentId, @jobId)", remote.name, syncOp.documentId, syncOp.jobId);
+				this.logger.error("Job key missing from batch load result (@remote, @documentId, @jobId)", remote.meta.name, syncOp.documentId, syncOp.jobId);
 				const error = new ChannelError(ChannelErrorSource.Inbox, /* @__PURE__ */ new Error(`Job key '${syncOp.jobId}' missing from batch load result`));
 				syncOp.failed(error);
 				remote.channel.deadLetter.add(syncOp);
@@ -5692,7 +5787,7 @@ var SyncManager = class {
 		let maxOrdinal = ackOrdinal;
 		const lastJobByDoc = /* @__PURE__ */ new Map();
 		let prevChainJobId;
-		const sinceTimestamp = remote.options.sinceTimestampUtcMs;
+		const sinceTimestamp = remote.meta.options.sinceTimestampUtcMs;
 		const emitBatches = (operations) => {
 			if (operations.length === 0) return;
 			const batches = batchOperationsByDocument(operations);
@@ -5703,14 +5798,14 @@ var SyncManager = class {
 				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);
+				const syncOp = new SyncOperation(crypto.randomUUID(), jobId, deps, remote.meta.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 page = await this.operationIndex.find(remote.meta.collectionId.key, ackOrdinal, { excludeSourceRemote: remote.meta.name }, void 0, composedSignal);
 		let carry = [];
 		let hasMore;
 		do {
@@ -5722,7 +5817,7 @@ var SyncManager = class {
 				carry = [];
 			}
 			if (sinceTimestamp && sinceTimestamp !== "0") operations = operations.filter((op) => op.operation.timestampUtcMs >= sinceTimestamp);
-			operations = filterOperations(operations, remote.filter);
+			operations = filterOperations(operations, remote.meta.filter);
 			operations = operations.filter((op) => !this.quarantinedDocumentIds.has(op.context.documentId));
 			hasMore = !!page.next;
 			if (operations.length > 0) {
@@ -6029,6 +6124,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6067,6 +6163,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6104,6 +6201,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6143,6 +6241,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6177,6 +6276,7 @@ var Reactor = class {
 		for (const jobPlan of request.jobs) {
 			const jobInfo = {
 				id: planKeyToJobId.get(jobPlan.key),
+				documentId: jobPlan.documentId,
 				status: JobStatus.PENDING,
 				createdAtUtcIso,
 				consistencyToken: {
@@ -6246,6 +6346,7 @@ var Reactor = class {
 		for (const jobPlan of request.jobs) {
 			const jobInfo = {
 				id: planKeyToJobId.get(jobPlan.key),
+				documentId: jobPlan.documentId,
 				status: JobStatus.PENDING,
 				createdAtUtcIso,
 				consistencyToken: {
@@ -6318,6 +6419,7 @@ var Reactor = class {
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			return Promise.resolve({
 				id: jobId,
+				documentId: "",
 				status: JobStatus.FAILED,
 				createdAtUtcIso: now,
 				completedAtUtcIso: now,
@@ -6645,6 +6747,7 @@ var ReactorBuilder = class {
 		const keyframeStore = new KyselyKeyframeStore(database);
 		const eventBus = this.eventBus || new EventBus();
 		const resolver = this.documentModelLoader ? new DocumentModelResolver(documentModelRegistry, this.documentModelLoader) : new NullDocumentModelResolver(documentModelRegistry);
+		if (resolver instanceof DocumentModelResolver) resolver.setModelLoadedHook((documentType) => eventBus.emit(ReactorEventTypes.MODEL_LOADED, { documentType }));
 		const queue = this.queueInstance ?? new InMemoryQueue(eventBus, resolver);
 		const jobTracker = new InMemoryJobTracker(eventBus);
 		const writeCache = new KyselyWriteCache(keyframeStore, operationStore, documentModelRegistry, {
@@ -6760,7 +6863,7 @@ var ReactorBuilder = class {
 			poolInstrumentations.push(forwarder);
 			this.instrumentedPools.push(forwarder);
 		}
-		const { ProjectionShardManager } = await import("./projection-shard-manager-_c7orNo5.js");
+		const { ProjectionShardManager } = await import("./projection-shard-manager-BnQKFqQd.js");
 		const manager = new ProjectionShardManager({
 			shardCount: config.shardCount,
 			db,
@@ -6793,7 +6896,7 @@ var ReactorBuilder = class {
 		const [{ WorkerHandle }, { createThreadTransport }, { workerEntryPath }] = await Promise.all([
 			import("./worker-handle-B1w03nRA.js"),
 			import("./transport-ByGviWdZ.js"),
-			import("./worker-SUoDhurA.js").then((n) => n.n)
+			import("./worker-Dzrw1YMV.js").then((n) => n.n)
 		]);
 		const db = this.workerDbConfig;
 		const signatureVerifier = this.workerSignatureVerifierSpec;
@@ -7160,6 +7263,6 @@ var DocumentIntegrityService = class {
 	}
 };
 //#endregion
-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, createForwardingLogger, createMutableShutdownStatus, createRelationalDb, deleteDocumentAction, documentActions, driveCollectionId, driveIdFromUrl, envelopesToSyncOperations, errorToInfo, getMigrationStatus, instrumentPgPool, makeConsistencyKey, parseDriveUrl, parsePagingOptions, removeRelationshipAction, runMigrations, sanitizeArg, trimMailboxFromAckOrdinal, updateRelationshipAction, upgradeDocumentAction, workerEntryPath };
+export { BaseReadModel, ChannelError, ChannelErrorSource, ChannelScheme, ConsistencyTracker, DEFAULT_DRIVE_CONTAINER_TYPES, DRIVE_AUTH_ERROR_MESSAGES, DefaultSubscriptionErrorHandler, DocumentChangeType, DocumentIntegrityService, DocumentModelRegistry, DocumentModelResolver, DriveClient, DriveCollectionId, 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, createForwardingLogger, createMutableShutdownStatus, createRelationalDb, deleteDocumentAction, documentActions, driveIdFromUrl, envelopesToSyncOperations, errorToInfo, getMigrationStatus, instrumentPgPool, isDriveAuthError, makeConsistencyKey, parseDriveUrl, parsePagingOptions, removeRelationshipAction, runMigrations, sanitizeArg, trimMailboxFromAckOrdinal, updateRelationshipAction, upgradeDocumentAction, workerEntryPath };
 
 //# sourceMappingURL=index.js.map