@powersync/service-module-mongodb-storage 0.0.0-dev-20260602073133 → 0.0.0-dev-20260803144812

package/src/storage/implementation/v3/MongoBucketBatchV3.ts

@@ -1,11 +1,11 @@
 import * as lib_mongo from '@powersync/lib-service-mongodb';
 import { ReplicationAssertionError } from '@powersync/lib-services-framework';
-import { ColumnDescriptor, storage } from '@powersync/service-core';
-import { HydratedSyncConfig, MatchingSources } from '@powersync/service-sync-rules';
+import { storage } from '@powersync/service-core';
 import * as bson from 'bson';
 import { mongoTableId } from '../../../utils/util.js';
-import { calculateCheckpointState } from '../CheckpointState.js';
+import { canCheckpointState } from '../CheckpointState.js';
 import { MongoBucketBatch, MongoBucketBatchOptions } from '../MongoBucketBatch.js';
+import { MongoParsedSyncConfigSet } from '../MongoParsedSyncConfigSet.js';
 import { syncRuleStateUpdatePipeline } from '../SyncRuleStateUpdate.js';
 import { PersistedBatch } from '../common/PersistedBatch.js';
 import { SourceRecordStore } from '../common/SourceRecordStore.js';
@@ -13,31 +13,39 @@ import { PersistedBatchV3 } from './PersistedBatchV3.js';
 import { SourceRecordStoreV3 } from './SourceRecordStoreV3.js';
 import { VersionedPowerSyncMongoV3 } from './VersionedPowerSyncMongoV3.js';
 import { ReplicationStreamDocumentV3, SourceTableDocumentV3 } from './models.js';
-
-function sameStringArray(left: string[], right: string[]) {
-  return left.length == right.length && left.every((value, index) => value == right[index]);
-}
+import {
+  createNewSourceTable,
+  designateEventCarrier,
+  overlappingSourceTableFilter,
+  planSourceTableReconciliation,
+  sourceTableDesiredResolution,
+  sourceTableFromDocument,
+  SourceTableReconciliationContext
+} from './source-table-utils.js';
 
 export class MongoBucketBatchV3 extends MongoBucketBatch {
-  declare public readonly db: VersionedPowerSyncMongoV3;
+  declare readonly db: VersionedPowerSyncMongoV3;
 
   private readonly store: SourceRecordStore;
-  private readonly syncConfigId: bson.ObjectId;
+  private readonly syncConfigIds: bson.ObjectId[];
   private needsActivationV3 = true;
   private lastWaitingLogThrottledV3 = 0;
 
   constructor(options: MongoBucketBatchOptions) {
     super(options);
-    if (options.syncConfigId == null) {
+    const syncConfigIds = options.syncConfigIds ?? [];
+    if (syncConfigIds.length == 0) {
       throw new ReplicationAssertionError('Missing sync config id for v3 batch');
     }
-    this.syncConfigId = options.syncConfigId;
-    this.store = new SourceRecordStoreV3(this.db, this.group_id, this.mapping);
+    this.syncConfigIds = syncConfigIds;
+    this.store = new SourceRecordStoreV3(this.db, this.replicationStreamId, this.mapping);
   }
 
   protected createPersistedBatch(writtenSize: number): PersistedBatch {
-    return new PersistedBatchV3(this.db, this.group_id, this.mapping, writtenSize, {
-      logger: this.logger
+    return new PersistedBatchV3(this.db, this.replicationStreamId, this.mapping, writtenSize, {
+      logger: this.logger,
+      objectStorage: this.options.objectStorage,
+      inlineThresholdBytes: this.options.inlineThresholdBytes
     });
   }
 
@@ -45,10 +53,83 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
     return this.store;
   }
 
+  protected override async onReplicationTransactionFlush(
+    session: lib_mongo.mongo.ClientSession,
+    lastOp: bigint
+  ): Promise<void> {
+    // Durably advance the stream-level head of persisted ops within the flush transaction.
+    // This ensures a checkpoint created later (even by an empty commit, or by a freshly-appended
+    // config that replicates nothing) covers all ops persisted before a potential crash.
+    await this.db.sync_rules.updateOne(
+      {
+        _id: this.replicationStreamId
+      },
+      {
+        $max: {
+          last_persisted_op: lastOp
+        }
+      },
+      { session }
+    );
+  }
+
+  private selectedSyncConfigObjectIds(syncConfigIds: string[]): bson.ObjectId[] {
+    const selectedIds = new Set(this.syncConfigIds.map((id) => id.toHexString()));
+    return syncConfigIds
+      .filter((id) => selectedIds.has(id) && bson.ObjectId.isValid(id))
+      .map((id) => new bson.ObjectId(id));
+  }
+
+  private relevantSyncConfigIds(table: storage.SourceTable): bson.ObjectId[] {
+    const bucketDataSourceIds = table.bucketDataSources.map((source) => this.mapping.bucketSourceId(source));
+    const parameterLookupSourceIds = table.parameterLookupSources.map((source) =>
+      this.mapping.parameterLookupId(source)
+    );
+    return this.selectedSyncConfigObjectIds(
+      this.mapping.syncConfigIdsForSourceTable(
+        this.syncConfigIds.map((id) => id.toHexString()),
+        table.ref,
+        bucketDataSourceIds,
+        parameterLookupSourceIds
+      )
+    );
+  }
+
+  private relevantSyncConfigIdsForTables(tables: storage.SourceTable[]): bson.ObjectId[] {
+    const ids = new Map<string, bson.ObjectId>();
+    for (const table of tables) {
+      for (const id of this.relevantSyncConfigIds(table)) {
+        ids.set(id.toHexString(), id);
+      }
+    }
+    return [...ids.values()];
+  }
+
+  private snapshotBlockingSourceTablesFilter(): Record<string, unknown> {
+    const clauses = this.syncConfigIds.flatMap((syncConfigId) => {
+      const filter = this.mapping.snapshotBlockingSourceTablesFilter(syncConfigId.toHexString()) as {
+        $or?: Record<string, unknown>[];
+      };
+      return filter.$or ?? [];
+    });
+
+    if (clauses.length == 0) {
+      return {
+        snapshot_done: false,
+        _id: { $exists: false }
+      };
+    }
+
+    return {
+      snapshot_done: false,
+      $or: clauses
+    };
+  }
+
   protected async cleanupDroppedSourceTables(sourceTables: storage.SourceTable[]) {
     for (const table of sourceTables) {
       await this.db
-        .sourceRecordsV3(this.group_id, mongoTableId(table.id))
+        .sourceRecords(this.replicationStreamId, mongoTableId(table.id))
         .drop()
         .catch((error) => {
           if (lib_mongo.isMongoServerError(error) && error.codeName === 'NamespaceNotFound') {
@@ -60,235 +141,103 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
   }
 
   async resolveTables(options: storage.ResolveTablesOptions): Promise<storage.ResolveTablesResult> {
-    const ref = options.source;
-    const syncRules = options.syncRules ?? this.sync_rules;
-    const matchingSources = syncRules.getMatchingSources(ref);
+    // The test-only override is a whole parsed set, so the sync rules and the mapping
+    // used below always come from the same parse.
+    const parsedOverride = options.parsedSyncConfig as MongoParsedSyncConfigSet | undefined;
+    const syncConfig = parsedOverride?.hydratedSyncConfig ?? this.sync_rules;
+    const mapping = parsedOverride?.mapping ?? this.mapping;
 
     const { connection_id, source } = options;
-    const { schema, name, objectId, replicaIdColumns, connectionTag } = source;
-    const normalizedReplicaIdColumns = replicaIdColumns.map((column) => ({
-      name: column.name,
-      type: column.type,
-      type_oid: column.typeId
-    }));
+    const context: SourceTableReconciliationContext = {
+      connectionId: connection_id,
+      connectionTag: source.connectionTag,
+      identity: {
+        schema: source.schema,
+        name: source.name,
+        objectId: source.objectId,
+        replicaIdColumns: source.replicaIdColumns.map((column) => ({
+          name: column.name,
+          type: column.type,
+          type_oid: column.typeId
+        }))
+      },
+      storeCurrentData: source.sendsCompleteRows !== true,
+      syncConfig,
+      mapping,
+      desired: sourceTableDesiredResolution(syncConfig, source, mapping)
+    };
 
     let result: storage.ResolveTablesResult | null = null;
-    const initializeSourceRecordsFor: bson.ObjectId[] = [];
-
-    await this.db.client.withSession(async (session) => {
-      const col = this.db.commonSourceTables(this.group_id);
-      const exactFilter: Record<string, unknown> = {
-        connection_id,
-        schema_name: schema,
-        table_name: name,
-        replica_id_columns2: normalizedReplicaIdColumns
-      };
-      if (objectId != null) {
-        exactFilter.relation_id = objectId;
-      }
+    const session = this.db.client.startSession();
+    await using _ = { [Symbol.asyncDispose]: () => session.endSession() };
 
-      const exactDocs = (await col.find(exactFilter, { session }).toArray()) as SourceTableDocumentV3[];
-      const bucketSourceById = new Map(
-        matchingSources.bucketDataSources.map((source) => [this.mapping.bucketSourceId(source), source] as const)
-      );
-      const parameterLookupSourceById = new Map(
-        matchingSources.parameterLookupSources.map(
-          (source) => [this.mapping.parameterLookupId(source), source] as const
-        )
-      );
-      const desiredBucketIds = new Set(bucketSourceById.keys());
-      const desiredLookupIds = new Set(parameterLookupSourceById.keys());
-      const desiredHasMembership = desiredBucketIds.size > 0 || desiredLookupIds.size > 0;
-      const triggersEvent = syncRules.tableTriggersEvent(ref);
-
-      const coveredBucketIds = new Set<string>();
-      const coveredLookupIds = new Set<string>();
-      const retainedDocIds: bson.ObjectId[] = [];
-      const tables: storage.SourceTable[] = [];
-      let retainedEventOnlyTable = false;
-
-      for (const doc of exactDocs) {
-        const bucketDataSourceIds = doc.bucket_data_source_ids.filter((id) => desiredBucketIds.has(id));
-        const parameterLookupSourceIds = doc.parameter_lookup_source_ids.filter((id) => desiredLookupIds.has(id));
-        const coversDesiredMembership = bucketDataSourceIds.length > 0 || parameterLookupSourceIds.length > 0;
-        const coversEventOnlyTable = !desiredHasMembership && triggersEvent && !retainedEventOnlyTable;
-
-        for (const id of bucketDataSourceIds) {
-          coveredBucketIds.add(id);
-        }
-        for (const id of parameterLookupSourceIds) {
-          coveredLookupIds.add(id);
-        }
+    await session.withTransaction(async () => {
+      const col = this.db.sourceTables(this.replicationStreamId);
 
-        if (
-          !sameStringArray(doc.bucket_data_source_ids, bucketDataSourceIds) ||
-          !sameStringArray(doc.parameter_lookup_source_ids, parameterLookupSourceIds)
-        ) {
-          await col.updateOne(
-            { _id: doc._id },
-            {
-              $set: {
-                bucket_data_source_ids: bucketDataSourceIds,
-                parameter_lookup_source_ids: parameterLookupSourceIds
-              }
-            },
-            { session }
-          );
-        }
+      // Fetch every persisted source-table doc that can overlap this physical table.
+      // Exact-identity docs are candidates for reuse; non-exact overlaps are possible drops.
+      const candidateDocs = await col
+        .find(overlappingSourceTableFilter(connection_id, context.identity), { session })
+        .toArray();
 
-        if (coversDesiredMembership || coversEventOnlyTable) {
-          if (coversEventOnlyTable) {
-            retainedEventOnlyTable = true;
-          }
-          retainedDocIds.push(doc._id);
-          tables.push(
-            this.sourceTableFromDocument(
-              {
-                ...doc,
-                bucket_data_source_ids: bucketDataSourceIds,
-                parameter_lookup_source_ids: parameterLookupSourceIds
-              },
-              connectionTag,
-              syncRules,
-              {
-                bucketDataSources: bucketDataSourceIds.map((id) => bucketSourceById.get(id)!),
-                parameterLookupSources: parameterLookupSourceIds.map((id) => parameterLookupSourceById.get(id)!)
-              }
-            )
-          );
-        }
+      // Pure planning: which docs to retain (and narrow), whether a new doc is needed for
+      // uncovered memberships, and which docs conflict with the current identity.
+      const plan = planSourceTableReconciliation(candidateDocs, context);
+
+      // Persist narrowing for incomplete snapshots only. Snapshot-complete docs keep stale
+      // coverage ids so compatible future configs can reuse already-snapshotted data.
+      // Narrowing occurs after removing a sync config, meaning we don't process those
+      // definitions anymore.
+      for (const update of plan.narrowingUpdates) {
+        await col.updateOne(
+          { _id: update.id },
+          {
+            $set: {
+              bucket_data_source_ids: update.memberships.bucketDataSourceIds,
+              parameter_lookup_source_ids: update.memberships.parameterLookupSourceIds
+            }
+          },
+          { session }
+        );
       }
 
-      const uncoveredBucketIds = [...desiredBucketIds].filter((id) => !coveredBucketIds.has(id));
-      const uncoveredLookupIds = [...desiredLookupIds].filter((id) => !coveredLookupIds.has(id));
-
-      if (uncoveredBucketIds.length > 0 || uncoveredLookupIds.length > 0 || (triggersEvent && tables.length == 0)) {
+      // Any desired membership not covered by an existing doc gets a new source table.
+      // That table snapshots only the uncovered memberships.
+      if (plan.newTableMemberships != null) {
         const id = options.idGenerator ? (options.idGenerator() as bson.ObjectId) : new bson.ObjectId();
-        const sourceTable = new storage.SourceTable({
-          id,
-          ref,
-          objectId,
-          replicaIdColumns,
-          snapshotComplete: false,
-          bucketDataSources: uncoveredBucketIds.map((id) => bucketSourceById.get(id)!),
-          parameterLookupSources: uncoveredLookupIds.map((id) => parameterLookupSourceById.get(id)!)
-        });
-        sourceTable.syncData = uncoveredBucketIds.length > 0;
-        sourceTable.syncParameters = uncoveredLookupIds.length > 0;
-        sourceTable.syncEvent = triggersEvent;
-
-        const createDoc: SourceTableDocumentV3 = {
-          _id: id,
-          connection_id,
-          relation_id: objectId,
-          schema_name: schema,
-          table_name: name,
-          replica_id_columns: null,
-          replica_id_columns2: normalizedReplicaIdColumns,
-          snapshot_done: false,
-          snapshot_status: undefined,
-          bucket_data_source_ids: uncoveredBucketIds,
-          parameter_lookup_source_ids: uncoveredLookupIds
-        };
+        const { doc, table } = createNewSourceTable(id, plan.newTableMemberships, context);
 
-        await col.insertOne(createDoc, { session });
-        initializeSourceRecordsFor.push(createDoc._id);
-        retainedDocIds.push(createDoc._id);
-        tables.push(sourceTable);
+        await col.insertOne(doc, { session });
+        await this.db.initializeSourceRecordsCollection(this.replicationStreamId, doc._id, session);
+        plan.tables.push(table);
       }
 
-      const conflictFilter = [{ schema_name: schema, table_name: name }] as Record<string, unknown>[];
-      if (objectId != null) {
-        conflictFilter.push({ relation_id: objectId });
-      }
-      const dropTables = await col
-        .find(
-          {
-            connection_id,
-            _id: { $nin: retainedDocIds },
-            $or: conflictFilter
-          },
-          { session }
-        )
-        .toArray();
+      // If memberships are split across multiple source tables, only one may fire events.
+      designateEventCarrier(plan.tables, context.desired.triggersEvent);
 
       result = {
-        tables,
-        dropTables: dropTables.map((doc) =>
-          this.sourceTableFromDocument(doc as SourceTableDocumentV3, connectionTag, syncRules)
-        )
+        tables: plan.tables,
+        dropTables: plan.dropDocs.map((doc) => sourceTableFromDocument(doc, context.connectionTag, syncConfig, mapping))
       };
     });
 
-    for (const sourceTableId of initializeSourceRecordsFor) {
-      await this.db.initializeSourceRecordsCollection(this.group_id, sourceTableId);
-    }
-
     return result!;
   }
 
-  private sourceTableFromDocument(
-    doc: SourceTableDocumentV3,
-    connectionTag: string,
-    syncRules: HydratedSyncConfig,
-    memberships?: MatchingSources
-  ): storage.SourceTable {
-    const resolvedMemberships = memberships ?? this.sourceTableMembershipsFromDocument(doc, syncRules);
-    const table = new storage.SourceTable({
-      id: doc._id,
-      ref: {
-        connectionTag,
-        schema: doc.schema_name,
-        name: doc.table_name
-      },
-      objectId: doc.relation_id,
-      replicaIdColumns: doc.replica_id_columns2!.map(
-        (c) => ({ name: c.name, typeId: c.type_oid, type: c.type }) satisfies ColumnDescriptor
-      ),
-      snapshotComplete: doc.snapshot_done ?? true,
-      bucketDataSources: resolvedMemberships.bucketDataSources,
-      parameterLookupSources: resolvedMemberships.parameterLookupSources
-    });
-    table.syncData = table.bucketDataSources.length > 0;
-    table.syncParameters = table.parameterLookupSources.length > 0;
-    table.syncEvent = syncRules.tableTriggersEvent(table.ref);
-    table.snapshotStatus =
-      doc.snapshot_status == null
-        ? undefined
-        : {
-            lastKey: doc.snapshot_status.last_key?.buffer ?? null,
-            totalEstimatedCount: doc.snapshot_status.total_estimated_count,
-            replicatedCount: doc.snapshot_status.replicated_count
-          };
-    return table;
-  }
-
-  private sourceTableMembershipsFromDocument(
-    doc: SourceTableDocumentV3,
-    syncRules: HydratedSyncConfig
-  ): MatchingSources {
-    const bucketDataSourceIds = new Set(doc.bucket_data_source_ids);
-    const parameterLookupSourceIds = new Set(doc.parameter_lookup_source_ids);
-
-    return {
-      bucketDataSources: syncRules.bucketDataSources.filter((source) =>
-        bucketDataSourceIds.has(this.mapping.bucketSourceId(source))
-      ),
-      parameterLookupSources: syncRules.bucketParameterLookupSources.filter((source) =>
-        parameterLookupSourceIds.has(this.mapping.parameterLookupId(source))
-      )
-    };
-  }
-
   async getSourceTableStatus(table: storage.SourceTable): Promise<storage.SourceTable | null> {
     const doc = (await this.db
-      .commonSourceTables(this.group_id)
+      .sourceTables(this.replicationStreamId)
       .findOne({ _id: mongoTableId(table.id) }, { session: this.session })) as SourceTableDocumentV3 | null;
     if (doc == null) {
       return null;
     }
 
-    return this.sourceTableFromDocument(doc, table.ref.connectionTag, this.sync_rules);
+    const refreshed = sourceTableFromDocument(doc, table.ref.connectionTag, this.sync_rules, this.mapping);
+    // The event-carrier designation is decided per resolveTables result and not persisted -
+    // preserve the caller's designation instead of recomputing it from the ref, so that
+    // refreshing a non-carrier table does not make it fire events.
+    refreshed.syncEvent = table.syncEvent;
+    return refreshed;
   }
 
   async commit(lsn: string, options?: storage.BucketBatchCommitOptions): Promise<storage.CheckpointResult> {
@@ -296,6 +245,8 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
 
     await this.flush(options);
 
+    using _ = this.tracer.span('storage', 'commit');
+
     const now = new Date();
 
     await this.db.write_checkpoints.updateMany(
@@ -313,97 +264,156 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
       }
     );
 
-    const preUpdateDocument = await this.db.sync_rules.findOne(
+    const preUpdateDocument = (await this.db.sync_rules.findOne(
       {
-        _id: this.group_id,
-        'sync_configs._id': this.syncConfigId
+        _id: this.replicationStreamId,
+        'sync_configs._id': { $in: this.syncConfigIds }
       },
       {
         session: this.session,
         projection: {
-          snapshot_lsn: 1,
-          sync_configs: {
-            $elemMatch: {
-              _id: this.syncConfigId
-            }
-          }
+          sync_configs: 1,
+          last_persisted_op: 1
         }
       }
-    );
+    )) as ReplicationStreamDocumentV3 | null;
 
-    const state = (preUpdateDocument as ReplicationStreamDocumentV3)?.sync_configs?.[0];
-    if (state == null) {
+    const states =
+      preUpdateDocument?.sync_configs?.filter((config) => this.syncConfigIds.some((id) => id.equals(config._id))) ?? [];
+    if (states.length == 0) {
       throw new ReplicationAssertionError(
-        `Failed to update checkpoint - no matching sync_config for _id: ${this.group_id}/${this.syncConfigId.toHexString()}`
+        `Failed to update checkpoint - no matching sync_config for _id: ${this.replicationStreamId}/${this.syncConfigIds
+          .map((id) => id.toHexString())
+          .join(',')}`
       );
     }
+    // The replication job / MongoBucketBatch must be constructed with all replicating (PROCESSING / ACTIVE)
+    // sync configs in the stream, otherwise we'll get inconsistencies. Configs in other states (e.g. STOP)
+    // remain embedded in the document and are ignored here.
+    const missingSyncConfig = preUpdateDocument!.sync_configs.find(
+      (config) =>
+        [storage.SyncRuleState.PROCESSING, storage.SyncRuleState.ACTIVE].includes(config.state) &&
+        !this.syncConfigIds.some((id) => id.equals(config._id))
+    );
+    if (missingSyncConfig != null) {
+      throw new ReplicationAssertionError(`Replication job not configured for sync config ${missingSyncConfig._id}`);
+    }
 
-    const checkpointState = calculateCheckpointState({
-      lsn,
-      snapshotDone: state.snapshot_done === true,
-      lastCheckpointLsn: state.last_checkpoint_lsn,
-      noCheckpointBefore: state.no_checkpoint_before,
-      keepaliveOp: state.keepalive_op == null ? null : BigInt(state.keepalive_op),
-      lastCheckpoint: state.last_checkpoint,
-      persistedOp: this.persisted_op,
-      createEmptyCheckpoints
-    });
+    // Effective head of the stream's op sequence.
+    // last_persisted_op is $max-advanced durably in the same transaction as every flush, and this
+    // read uses the same session, so it covers all ops persisted by this batch.
+    const newCheckpoint =
+      preUpdateDocument?.last_persisted_op == null ? 0n : BigInt(preUpdateDocument.last_persisted_op);
+
+    let checkpointBlocked = false;
+    let checkpointCreated = false;
+    let checkpointLogState: unknown = null;
+    const unblockedConfigIds: bson.ObjectId[] = [];
+
+    for (const state of states) {
+      if (state.last_checkpoint != null && state.last_checkpoint > newCheckpoint) {
+        // last_persisted_op is $max-advanced durably in the same transaction as every flush, and
+        // checkpoints are only ever created at that head, so a checkpoint past the head means the
+        // op sequence or the stored state is corrupt.
+        throw new ReplicationAssertionError(
+          `Invariant violation: sync config ${state._id} has last_checkpoint ${state.last_checkpoint} > stream head ${newCheckpoint}`
+        );
+      }
 
-    const updateSet: Record<string, any> = {
-      last_keepalive_ts: now,
-      last_fatal_error: null,
-      last_fatal_error_ts: null,
-      'sync_configs.$[config].keepalive_op': checkpointState.newKeepaliveOp,
-      'sync_configs.$[config].last_checkpoint': checkpointState.newLastCheckpoint
-    };
-    if (checkpointState.checkpointCreated) {
-      updateSet['sync_configs.$[config].last_checkpoint_lsn'] = lsn;
-      updateSet['snapshot_lsn'] = null;
-      updateSet['last_checkpoint_ts'] = now;
+      const canCheckpoint = canCheckpointState(lsn, {
+        snapshotDone: state.snapshot_done === true,
+        lastCheckpointLsn: state.last_checkpoint_lsn,
+        noCheckpointBefore: state.no_checkpoint_before
+      });
+
+      if (!canCheckpoint) {
+        checkpointBlocked = true;
+        // Log the first blocked config's state.
+        checkpointLogState ??= {
+          snapshot_done: state.snapshot_done,
+          last_checkpoint_lsn: state.last_checkpoint_lsn,
+          no_checkpoint_before: state.no_checkpoint_before
+        };
+        continue;
+      }
+
+      checkpointCreated ||= createEmptyCheckpoints || state.last_checkpoint !== newCheckpoint;
+      unblockedConfigIds.push(state._id);
     }
 
-    await this.db.sync_rules.updateOne(
-      {
-        _id: this.group_id,
-        'sync_configs._id': this.syncConfigId
-      },
-      {
-        $set: updateSet
-      },
-      {
-        session: this.session,
-        arrayFilters: [{ 'config._id': this.syncConfigId }]
+    // Every commit advances the stream's resume position: commit() flushes first, so all
+    // source changes up to this lsn have been persisted, even when checkpoints are blocked.
+    // In the future we could also advance this on flush, when the connector provides the
+    // current position (see setResumeLsn, which connectors may already call after flushing).
+    const resumeLsnUpdate = { resume_lsn: lsn };
+
+    if (unblockedConfigIds.length > 0) {
+      // All unblocked configs get the SAME new value, so we apply it with a single updateOne
+      // (single-document atomicity).
+      const updateSet: Record<string, any> = {
+        last_keepalive_ts: now,
+        last_fatal_error: null,
+        last_fatal_error_ts: null
+      };
+      // Only advance checkpoint fields when an actual (non-empty) checkpoint is created, matching
+      // the previous per-config / v1 behaviour.
+      if (checkpointCreated) {
+        updateSet['sync_configs.$[config].last_checkpoint'] = newCheckpoint;
+        updateSet['sync_configs.$[config].last_checkpoint_lsn'] = lsn;
+        updateSet['last_checkpoint_ts'] = now;
       }
-    );
 
-    if (checkpointState.checkpointBlocked) {
+      await this.db.sync_rules.updateOne(
+        {
+          _id: this.replicationStreamId,
+          'sync_configs._id': { $in: unblockedConfigIds }
+        },
+        { $set: updateSet, $max: resumeLsnUpdate },
+        {
+          session: this.session,
+          arrayFilters: checkpointCreated ? [{ 'config._id': { $in: unblockedConfigIds } }] : undefined
+        }
+      );
+    } else {
+      // All selected configs are blocked - only update keepalive/error tracking and the
+      // resume position.
+      await this.db.sync_rules.updateOne(
+        {
+          _id: this.replicationStreamId
+        },
+        {
+          $set: {
+            last_keepalive_ts: now,
+            last_fatal_error: null,
+            last_fatal_error_ts: null
+          },
+          $max: resumeLsnUpdate
+        },
+        { session: this.session }
+      );
+    }
+
+    if (checkpointBlocked) {
       if (Date.now() - this.lastWaitingLogThrottledV3 > 5_000) {
         this.logger.info(
-          `Waiting before creating checkpoint, currently at ${lsn} / ${checkpointState.newKeepaliveOp}. Current state: ${JSON.stringify(
-            {
-              snapshot_done: state.snapshot_done,
-              last_checkpoint_lsn: state.last_checkpoint_lsn,
-              no_checkpoint_before: state.no_checkpoint_before
-            }
-          )}`
+          `Waiting before creating checkpoint, currently at ${lsn}. Current state: ${JSON.stringify(checkpointLogState)}`
         );
         this.lastWaitingLogThrottledV3 = Date.now();
       }
     } else {
-      if (checkpointState.checkpointCreated) {
-        this.logger.debug(`Created checkpoint at ${lsn} / ${checkpointState.newLastCheckpoint}`);
+      if (checkpointCreated) {
+        this.logger.debug(`Created checkpoint at ${lsn}`);
       }
       await this.autoActivateV3(lsn);
+      // All configs are now checkpointed at newCheckpoint (the stream head).
+      await this.sourceRecordStore.postCommitCleanup(newCheckpoint, this.logger);
+    }
+    if (checkpointCreated) {
       await this.db.notifyCheckpoint();
-      this.persisted_op = null;
-      this.last_checkpoint_lsn = lsn;
-      if (checkpointState.newLastCheckpoint != null) {
-        await this.sourceRecordStore.postCommitCleanup(checkpointState.newLastCheckpoint, this.logger);
-      }
     }
     return {
-      checkpointBlocked: checkpointState.checkpointBlocked,
-      checkpointCreated: checkpointState.checkpointCreated
+      checkpointBlocked,
+      checkpointCreated
     };
   }
 
@@ -412,17 +422,23 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
   }
 
   async setResumeLsn(lsn: string): Promise<void> {
+    using _ = this.tracer.span('storage', 'set_resume_lsn');
     await this.db.sync_rules.updateOne(
       {
-        _id: this.group_id,
-        'sync_configs._id': this.syncConfigId
+        _id: this.replicationStreamId
       },
       {
         $set: {
-          snapshot_lsn: lsn
+          resume_lsn: lsn
         }
       },
-      { session: this.session }
+      {
+        session: this.session,
+        // Losing occasional resume LSN is fine. That may mean reprocessing
+        // some source changes in some edge cases, which is not an issue since
+        // changes are processed in an idempotent way.
+        writeConcern: { w: 1 }
+      }
     );
   }
 
@@ -433,36 +449,43 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
 
     const session = this.session;
     let activated = false;
+    let needsFutureActivationCheck = true;
     await session.withTransaction(async () => {
+      // Reset on transaction retries.
+      needsFutureActivationCheck = true;
+      activated = false;
+
       const doc = await this.db.sync_rules.findOne(
         {
-          _id: this.group_id,
-          'sync_configs._id': this.syncConfigId
+          _id: this.replicationStreamId,
+          'sync_configs._id': { $in: this.syncConfigIds }
         },
         {
           session,
           projection: {
             state: 1,
-            sync_configs: {
-              $elemMatch: {
-                _id: this.syncConfigId
-              }
-            }
+            sync_configs: 1
           }
         }
       );
-      const state = (doc as ReplicationStreamDocumentV3)?.sync_configs?.[0];
+      const states =
+        (doc as ReplicationStreamDocumentV3)?.sync_configs?.filter((config) =>
+          this.syncConfigIds.some((id) => id.equals(config._id))
+        ) ?? [];
+      if (doc == null || states.length == 0) {
+        return;
+      }
+
+      const processingStates = states.filter((state) => state.state == storage.SyncRuleState.PROCESSING);
       if (
-        doc &&
         doc.state == storage.SyncRuleState.PROCESSING &&
-        state?.state == storage.SyncRuleState.PROCESSING &&
-        state.snapshot_done &&
-        state.last_checkpoint != null
+        processingStates.length == states.length &&
+        states.every((state) => state.snapshot_done && state.last_checkpoint != null)
       ) {
         await this.db.sync_rules.updateOne(
           {
-            _id: this.group_id,
-            'sync_configs._id': this.syncConfigId
+            _id: this.replicationStreamId,
+            'sync_configs._id': { $in: this.syncConfigIds }
           },
           {
             $set: {
@@ -472,35 +495,64 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
           },
           {
             session,
-            arrayFilters: [{ 'config._id': this.syncConfigId }]
+            arrayFilters: [{ 'config._id': { $in: this.syncConfigIds } }]
           }
         );
 
         await this.db.sync_rules.updateMany(
           {
-            _id: { $ne: this.group_id },
+            _id: { $ne: this.replicationStreamId },
             state: { $in: [storage.SyncRuleState.ACTIVE, storage.SyncRuleState.ERRORED] }
           },
           syncRuleStateUpdatePipeline(storage.SyncRuleState.STOP),
           { session }
         );
         activated = true;
-      } else if (doc?.state != storage.SyncRuleState.PROCESSING) {
-        this.needsActivationV3 = false;
+      } else if (
+        doc.state == storage.SyncRuleState.ACTIVE &&
+        processingStates.length > 0 &&
+        processingStates.every((state) => state.snapshot_done && state.last_checkpoint != null)
+      ) {
+        await this.db.sync_rules.updateOne(
+          {
+            _id: this.replicationStreamId,
+            'sync_configs._id': { $in: processingStates.map((state) => state._id) }
+          },
+          {
+            $set: {
+              'sync_configs.$[activeConfig].state': storage.SyncRuleState.STOP,
+              'sync_configs.$[processingConfig].state': storage.SyncRuleState.ACTIVE
+            }
+          },
+          {
+            session,
+            arrayFilters: [
+              { 'activeConfig.state': storage.SyncRuleState.ACTIVE },
+              { 'processingConfig._id': { $in: processingStates.map((state) => state._id) } }
+            ]
+          }
+        );
+        activated = true;
+      } else if (doc.state != storage.SyncRuleState.PROCESSING && doc.state != storage.SyncRuleState.ACTIVE) {
+        needsFutureActivationCheck = false;
+      } else if (doc.state == storage.SyncRuleState.ACTIVE && processingStates.length == 0) {
+        needsFutureActivationCheck = false;
       }
     });
     if (activated) {
       this.logger.info(`Activated new replication stream at ${lsn}`);
       await this.db.notifyCheckpoint();
       this.needsActivationV3 = false;
+    } else if (!needsFutureActivationCheck) {
+      this.needsActivationV3 = false;
     }
   }
 
   async markAllSnapshotDone(no_checkpoint_before_lsn: string): Promise<void> {
     await this.db.sync_rules.updateOne(
       {
-        _id: this.group_id,
-        'sync_configs._id': this.syncConfigId
+        _id: this.replicationStreamId,
+        'sync_configs._id': { $in: this.syncConfigIds }
       },
       {
         $set: {
@@ -513,7 +565,7 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
       },
       {
         session: this.session,
-        arrayFilters: [{ 'config._id': this.syncConfigId }]
+        arrayFilters: [{ 'config._id': { $in: this.syncConfigIds } }]
       }
     );
   }
@@ -521,16 +573,18 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
   async markSnapshotDone(no_checkpoint_before_lsn: string, options?: { throwOnConflict?: boolean }): Promise<void> {
     await this.withTransaction(async () => {
       // Protect against race conditions
-      const count = await this.db.sourceTablesV3(this.group_id).countDocuments(
-        {
-          snapshot_done: false
-        },
-        { session: this.session }
-      );
-      if (count > 0) {
+      const blockingTables = await this.db
+        .sourceTables(this.replicationStreamId)
+        .find(this.snapshotBlockingSourceTablesFilter(), {
+          session: this.session,
+          projection: { schema_name: 1, table_name: 1 }
+        })
+        .toArray();
+
+      if (blockingTables.length > 0) {
         if (options?.throwOnConflict ?? true) {
           throw new ReplicationAssertionError(
-            `Cannot mark snapshot done while ${count} source table${count == 1 ? '' : 's'} still require snapshotting`
+            `Cannot mark snapshot done while source tables still require snapshotting. Tables: ${blockingTables.map((t) => `${t.schema_name}.${t.table_name}`).join(', ')}`
           );
         } else {
           return;
@@ -541,11 +595,16 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
     });
   }
 
-  async markTableSnapshotRequired(_table: storage.SourceTable): Promise<void> {
+  async markTableSnapshotRequired(table: storage.SourceTable): Promise<void> {
+    const syncConfigIds = this.relevantSyncConfigIds(table);
+    if (syncConfigIds.length == 0) {
+      return;
+    }
+
     await this.db.sync_rules.updateOne(
       {
-        _id: this.group_id,
-        'sync_configs._id': this.syncConfigId
+        _id: this.replicationStreamId,
+        'sync_configs._id': { $in: syncConfigIds }
       },
       {
         $set: {
@@ -554,7 +613,7 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
       },
       {
         session: this.session,
-        arrayFilters: [{ 'config._id': this.syncConfigId }]
+        arrayFilters: [{ 'config._id': { $in: syncConfigIds } }]
       }
     );
   }
@@ -565,9 +624,10 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
   ): Promise<storage.SourceTable[]> {
     const session = this.session;
     const ids = tables.map((table) => mongoTableId(table.id));
+    const syncConfigIds = this.relevantSyncConfigIdsForTables(tables);
 
     await this.withTransaction(async () => {
-      await this.db.commonSourceTables(this.group_id).updateMany(
+      await this.db.sourceTables(this.replicationStreamId).updateMany(
         { _id: { $in: ids } },
         {
           $set: {
@@ -580,11 +640,11 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
         { session }
       );
 
-      if (no_checkpoint_before_lsn != null) {
+      if (no_checkpoint_before_lsn != null && syncConfigIds.length > 0) {
         await this.db.sync_rules.updateOne(
           {
-            _id: this.group_id,
-            'sync_configs._id': this.syncConfigId
+            _id: this.replicationStreamId,
+            'sync_configs._id': { $in: syncConfigIds }
           },
           {
             $set: {
@@ -596,7 +656,8 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
           },
           {
             session: this.session,
-            arrayFilters: [{ 'config._id': this.syncConfigId }]
+            // Only set for sync configs that use this table
+            arrayFilters: [{ 'config._id': { $in: syncConfigIds } }]
           }
         );
       }