@syncular/server 0.0.6-204 → 0.0.6-206

package/dist/pull.js

@@ -1,4 +1,4 @@
-import { captureSyncException, countSyncMetric, distributionSyncMetric, encodeSnapshotRowFrames, encodeSnapshotRows, gzipBytes, randomId, SYNC_SNAPSHOT_CHUNK_COMPRESSION, SYNC_SNAPSHOT_CHUNK_ENCODING, sha256Hex, startSyncSpan, } from '@syncular/core';
+import { bytesToReadableStream, captureSyncException, concatByteChunks, countSyncMetric, distributionSyncMetric, encodeSnapshotRowFrames, encodeSnapshotRows, gzipBytes, randomId, SYNC_SNAPSHOT_CHUNK_COMPRESSION, SYNC_SNAPSHOT_CHUNK_ENCODING, sha256Hex, startSyncSpan, } from '@syncular/core';
 import { getServerBootstrapOrderFor, } from './handlers/collection.js';
 import { EXTERNAL_CLIENT_ID } from './notify.js';
 import { insertSnapshotChunk, readSnapshotChunkRefByPageKey, scopesToSnapshotChunkScopeKey, } from './snapshot-chunks.js';
@@ -9,6 +9,8 @@ const DEFAULT_MAX_SNAPSHOT_BUNDLE_ROW_FRAME_BYTES = 512 * 1024;
 const MAX_ADAPTIVE_SNAPSHOT_BUNDLE_ROW_FRAME_BYTES = 4 * 1024 * 1024;
 const DEFAULT_INLINE_SNAPSHOT_ROW_FRAME_BYTES = 256 * 1024;
 const EMPTY_SNAPSHOT_ROW_FRAMES = encodeSnapshotRows([]);
+const MAX_PULL_TRANSACTION_RETRIES = 2;
+const PULL_TRANSACTION_RETRY_DELAY_MS = 15;
 function createPullBootstrapTimings() {
     return {
         snapshotQueryMs: 0,
@@ -19,103 +21,6 @@ function createPullBootstrapTimings() {
         chunkPersistMs: 0,
     };
 }
-function concatByteChunks(chunks) {
-    if (chunks.length === 1) {
-        return chunks[0] ?? new Uint8Array();
-    }
-    let total = 0;
-    for (const chunk of chunks) {
-        total += chunk.length;
-    }
-    const merged = new Uint8Array(total);
-    let offset = 0;
-    for (const chunk of chunks) {
-        merged.set(chunk, offset);
-        offset += chunk.length;
-    }
-    return merged;
-}
-function byteChunksToStream(chunks) {
-    return new ReadableStream({
-        start(controller) {
-            for (const chunk of chunks) {
-                if (chunk.length === 0)
-                    continue;
-                controller.enqueue(chunk.slice());
-            }
-            controller.close();
-        },
-    });
-}
-function bufferSourceToUint8Array(chunk) {
-    if (chunk instanceof Uint8Array) {
-        return chunk;
-    }
-    if (chunk instanceof ArrayBuffer) {
-        return new Uint8Array(chunk);
-    }
-    return new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength);
-}
-async function streamToBytes(stream) {
-    const reader = stream.getReader();
-    const chunks = [];
-    let total = 0;
-    try {
-        while (true) {
-            const { done, value } = await reader.read();
-            if (done)
-                break;
-            if (!value)
-                continue;
-            const bytes = bufferSourceToUint8Array(value);
-            if (bytes.length === 0)
-                continue;
-            chunks.push(bytes);
-            total += bytes.length;
-        }
-    }
-    finally {
-        reader.releaseLock();
-    }
-    if (chunks.length === 0)
-        return new Uint8Array();
-    if (chunks.length === 1)
-        return chunks[0] ?? new Uint8Array();
-    const merged = new Uint8Array(total);
-    let offset = 0;
-    for (const chunk of chunks) {
-        merged.set(chunk, offset);
-        offset += chunk.length;
-    }
-    return merged;
-}
-function bufferSourceStreamToUint8ArrayStream(stream) {
-    return new ReadableStream({
-        async start(controller) {
-            const reader = stream.getReader();
-            try {
-                while (true) {
-                    const { done, value } = await reader.read();
-                    if (done)
-                        break;
-                    if (!value)
-                        continue;
-                    const bytes = bufferSourceToUint8Array(value);
-                    if (bytes.length === 0)
-                        continue;
-                    controller.enqueue(bytes);
-                }
-                controller.close();
-            }
-            catch (err) {
-                controller.error(err);
-            }
-            finally {
-                reader.releaseLock();
-            }
-        },
-    });
-}
 let nodeCryptoModulePromise = null;
 async function getNodeCryptoModule() {
     if (!nodeCryptoModulePromise) {
@@ -137,10 +42,6 @@ async function sha256HexFromByteChunks(chunks) {
     return sha256Hex(concatByteChunks(chunks));
 }
 async function gzipByteChunks(chunks) {
-    if (typeof CompressionStream !== 'undefined') {
-        const stream = byteChunksToStream(chunks).pipeThrough(new CompressionStream('gzip'));
-        return streamToBytes(stream);
-    }
     return gzipBytes(concatByteChunks(chunks));
 }
 async function encodeCompressedSnapshotChunk(chunks) {
@@ -163,7 +64,7 @@ async function encodeCompressedSnapshotChunk(chunks) {
 async function encodeCompressedSnapshotChunkToStream(chunks) {
     const encoded = await encodeCompressedSnapshotChunk(chunks);
     return {
-        stream: bufferSourceStreamToUint8ArrayStream(byteChunksToStream([encoded.body])),
+        stream: bytesToReadableStream(encoded.body),
         byteLength: encoded.body.length,
         sha256: encoded.sha256,
         gzipMs: encoded.gzipMs,
@@ -209,6 +110,16 @@ function sanitizeLimit(value, defaultValue, min, max) {
         return defaultValue;
     return Math.max(min, Math.min(max, value));
 }
+function isSerializablePullError(error) {
+    const withCode = error;
+    return (withCode.code === '40001' ||
+        error.message.toLowerCase().includes('could not serialize access'));
+}
+async function delay(ms) {
+    await new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}
 /**
  * Merge all scope values into a flat ScopeValues for cursor tracking.
  */
@@ -341,8 +252,6 @@ export async function pull(args) {
             const limitSnapshotRows = sanitizeLimit(request.limitSnapshotRows, 1000, 1, 20000);
             const maxSnapshotPages = sanitizeLimit(request.maxSnapshotPages, 4, 1, 50);
             const dedupeRows = request.dedupeRows === true;
-            const pendingExternalChunkWrites = [];
-            const bootstrapTimings = createPullBootstrapTimings();
             // Resolve effective scopes for each subscription
             const resolved = await resolveEffectiveScopesForSubscriptions({
                 db,
@@ -351,509 +260,491 @@ export async function pull(args) {
                 handlers: args.handlers,
                 scopeCache: args.scopeCache ?? defaultScopeCache,
             });
-            const result = await dialect.executeInTransaction(db, async (trx) => {
-                await dialect.setRepeatableRead(trx);
-                const maxCommitSeq = await dialect.readMaxCommitSeq(trx, {
-                    partitionId,
-                });
-                const minCommitSeq = await dialect.readMinCommitSeq(trx, {
-                    partitionId,
-                });
-                const subResponses = [];
-                const activeSubscriptions = [];
-                const nextCursors = [];
-                // Detect external data changes (synthetic commits from notifyExternalDataChange)
-                // Compute minimum cursor across all active subscriptions to scope the query.
-                let minSubCursor = Number.MAX_SAFE_INTEGER;
-                const activeTables = new Set();
-                for (const sub of resolved) {
-                    if (sub.status === 'revoked' ||
-                        Object.keys(sub.scopes).length === 0)
-                        continue;
-                    activeTables.add(sub.table);
-                    const cursor = Math.max(-1, sub.cursor ?? -1);
-                    if (cursor >= 0 && cursor < minSubCursor) {
-                        minSubCursor = cursor;
-                    }
-                }
-                const maxExternalCommitByTable = minSubCursor < Number.MAX_SAFE_INTEGER && minSubCursor >= 0
-                    ? await readLatestExternalCommitByTable(trx, {
-                        partitionId,
-                        afterCursor: minSubCursor,
-                        tables: Array.from(activeTables),
-                    })
-                    : new Map();
-                for (const sub of resolved) {
-                    const cursor = Math.max(-1, sub.cursor ?? -1);
-                    // Validate table handler exists (throws if not registered)
-                    if (!args.handlers.byTable.has(sub.table)) {
-                        throw new Error(`Unknown table: ${sub.table}`);
-                    }
-                    if (sub.status === 'revoked' ||
-                        Object.keys(sub.scopes).length === 0) {
-                        subResponses.push({
-                            id: sub.id,
-                            status: 'revoked',
-                            scopes: {},
-                            bootstrap: false,
-                            nextCursor: cursor,
-                            commits: [],
+            for (let attemptIndex = 0; attemptIndex < MAX_PULL_TRANSACTION_RETRIES; attemptIndex += 1) {
+                const pendingExternalChunkWrites = [];
+                const bootstrapTimings = createPullBootstrapTimings();
+                try {
+                    const result = await dialect.executeInTransaction(db, async (trx) => {
+                        await dialect.setRepeatableRead(trx);
+                        const maxCommitSeq = await dialect.readMaxCommitSeq(trx, {
+                            partitionId,
                         });
-                        continue;
-                    }
-                    const effectiveScopes = sub.scopes;
-                    activeSubscriptions.push({ scopes: effectiveScopes });
-                    const latestExternalCommitForTable = maxExternalCommitByTable.get(sub.table);
-                    const needsBootstrap = sub.bootstrapState != null ||
-                        cursor < 0 ||
-                        cursor > maxCommitSeq ||
-                        (minCommitSeq > 0 && cursor < minCommitSeq - 1) ||
-                        (latestExternalCommitForTable !== undefined &&
-                            latestExternalCommitForTable > cursor);
-                    if (needsBootstrap) {
-                        const tables = getServerBootstrapOrderFor(args.handlers, sub.table).map((handler) => handler.table);
-                        const preferInlineBootstrapSnapshot = cursor >= 0 ||
-                            sub.bootstrapState != null ||
-                            (latestExternalCommitForTable !== undefined &&
-                                latestExternalCommitForTable > cursor);
-                        const initState = {
-                            asOfCommitSeq: maxCommitSeq,
-                            tables,
-                            tableIndex: 0,
-                            rowCursor: null,
-                        };
-                        const requestedState = sub.bootstrapState ?? null;
-                        const state = requestedState &&
-                            typeof requestedState.asOfCommitSeq === 'number' &&
-                            Array.isArray(requestedState.tables) &&
-                            typeof requestedState.tableIndex === 'number'
-                            ? requestedState
-                            : initState;
-                        // If the bootstrap state's asOfCommitSeq is no longer catch-up-able, restart bootstrap.
-                        const effectiveState = state.asOfCommitSeq < minCommitSeq - 1 ? initState : state;
-                        const tableName = effectiveState.tables[effectiveState.tableIndex];
-                        // No tables (or ran past the end): treat bootstrap as complete.
-                        if (!tableName) {
-                            subResponses.push({
-                                id: sub.id,
-                                status: 'active',
-                                scopes: effectiveScopes,
-                                bootstrap: true,
-                                bootstrapState: null,
-                                nextCursor: effectiveState.asOfCommitSeq,
-                                commits: [],
-                                snapshots: [],
-                            });
-                            nextCursors.push(effectiveState.asOfCommitSeq);
-                            continue;
+                        const minCommitSeq = await dialect.readMinCommitSeq(trx, {
+                            partitionId,
+                        });
+                        const subResponses = [];
+                        const activeSubscriptions = [];
+                        const nextCursors = [];
+                        // Detect external data changes (synthetic commits from notifyExternalDataChange)
+                        // Compute minimum cursor across all active subscriptions to scope the query.
+                        let minSubCursor = Number.MAX_SAFE_INTEGER;
+                        const activeTables = new Set();
+                        for (const sub of resolved) {
+                            if (sub.status === 'revoked' ||
+                                Object.keys(sub.scopes).length === 0)
+                                continue;
+                            activeTables.add(sub.table);
+                            const cursor = Math.max(-1, sub.cursor ?? -1);
+                            if (cursor >= 0 && cursor < minSubCursor) {
+                                minSubCursor = cursor;
+                            }
                         }
-                        const snapshots = [];
-                        let nextState = effectiveState;
-                        const cacheKey = `${partitionId}:${await scopesToSnapshotChunkScopeKey(effectiveScopes)}`;
-                        const flushSnapshotBundle = async (bundle) => {
-                            if (bundle.inlineRows) {
-                                snapshots.push({
-                                    table: bundle.table,
-                                    rows: bundle.inlineRows,
-                                    isFirstPage: bundle.isFirstPage,
-                                    isLastPage: bundle.isLastPage,
+                        const maxExternalCommitByTable = minSubCursor < Number.MAX_SAFE_INTEGER && minSubCursor >= 0
+                            ? await readLatestExternalCommitByTable(trx, {
+                                partitionId,
+                                afterCursor: minSubCursor,
+                                tables: Array.from(activeTables),
+                            })
+                            : new Map();
+                        for (const sub of resolved) {
+                            const cursor = Math.max(-1, sub.cursor ?? -1);
+                            // Validate table handler exists (throws if not registered)
+                            if (!args.handlers.byTable.has(sub.table)) {
+                                throw new Error(`Unknown table: ${sub.table}`);
+                            }
+                            if (sub.status === 'revoked' ||
+                                Object.keys(sub.scopes).length === 0) {
+                                subResponses.push({
+                                    id: sub.id,
+                                    status: 'revoked',
+                                    scopes: {},
+                                    bootstrap: false,
+                                    nextCursor: cursor,
+                                    commits: [],
                                 });
-                                return;
+                                continue;
                             }
-                            const nowIso = new Date().toISOString();
-                            const bundleRowLimit = Math.max(1, limitSnapshotRows * bundle.pageCount);
-                            const cacheLookupStartedAt = Date.now();
-                            const cached = await readSnapshotChunkRefByPageKey(trx, {
-                                partitionId,
-                                scopeKey: cacheKey,
-                                scope: bundle.table,
-                                asOfCommitSeq: effectiveState.asOfCommitSeq,
-                                rowCursor: bundle.startCursor,
-                                rowLimit: bundleRowLimit,
-                                encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
-                                compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
-                                nowIso,
-                            });
-                            bootstrapTimings.chunkCacheLookupMs += Math.max(0, Date.now() - cacheLookupStartedAt);
-                            let chunkRef = cached;
-                            if (!chunkRef) {
-                                const expiresAt = new Date(Date.now() + Math.max(1000, bundle.ttlMs)).toISOString();
-                                if (args.chunkStorage) {
-                                    const snapshot = {
-                                        table: bundle.table,
-                                        rows: [],
-                                        chunks: [],
-                                        isFirstPage: bundle.isFirstPage,
-                                        isLastPage: bundle.isLastPage,
-                                    };
-                                    snapshots.push(snapshot);
-                                    pendingExternalChunkWrites.push({
-                                        snapshot,
-                                        cacheLookup: {
+                            const effectiveScopes = sub.scopes;
+                            activeSubscriptions.push({ scopes: effectiveScopes });
+                            const latestExternalCommitForTable = maxExternalCommitByTable.get(sub.table);
+                            const needsBootstrap = sub.bootstrapState != null ||
+                                cursor < 0 ||
+                                cursor > maxCommitSeq ||
+                                (minCommitSeq > 0 && cursor < minCommitSeq - 1) ||
+                                (latestExternalCommitForTable !== undefined &&
+                                    latestExternalCommitForTable > cursor);
+                            if (needsBootstrap) {
+                                const tables = getServerBootstrapOrderFor(args.handlers, sub.table).map((handler) => handler.table);
+                                const preferInlineBootstrapSnapshot = cursor >= 0 ||
+                                    sub.bootstrapState != null ||
+                                    (latestExternalCommitForTable !== undefined &&
+                                        latestExternalCommitForTable > cursor);
+                                const initState = {
+                                    asOfCommitSeq: maxCommitSeq,
+                                    tables,
+                                    tableIndex: 0,
+                                    rowCursor: null,
+                                };
+                                const requestedState = sub.bootstrapState ?? null;
+                                const state = requestedState &&
+                                    typeof requestedState.asOfCommitSeq === 'number' &&
+                                    Array.isArray(requestedState.tables) &&
+                                    typeof requestedState.tableIndex === 'number'
+                                    ? requestedState
+                                    : initState;
+                                // If the bootstrap state's asOfCommitSeq is no longer catch-up-able, restart bootstrap.
+                                const effectiveState = state.asOfCommitSeq < minCommitSeq - 1
+                                    ? initState
+                                    : state;
+                                const tableName = effectiveState.tables[effectiveState.tableIndex];
+                                // No tables (or ran past the end): treat bootstrap as complete.
+                                if (!tableName) {
+                                    subResponses.push({
+                                        id: sub.id,
+                                        status: 'active',
+                                        scopes: effectiveScopes,
+                                        bootstrap: true,
+                                        bootstrapState: null,
+                                        nextCursor: effectiveState.asOfCommitSeq,
+                                        commits: [],
+                                        snapshots: [],
+                                    });
+                                    nextCursors.push(effectiveState.asOfCommitSeq);
+                                    continue;
+                                }
+                                const snapshots = [];
+                                let nextState = effectiveState;
+                                const cacheKey = `${partitionId}:${await scopesToSnapshotChunkScopeKey(effectiveScopes)}`;
+                                const flushSnapshotBundle = async (bundle) => {
+                                    if (bundle.inlineRows) {
+                                        snapshots.push({
+                                            table: bundle.table,
+                                            rows: bundle.inlineRows,
+                                            isFirstPage: bundle.isFirstPage,
+                                            isLastPage: bundle.isLastPage,
+                                        });
+                                        return;
+                                    }
+                                    const nowIso = new Date().toISOString();
+                                    const bundleRowLimit = Math.max(1, limitSnapshotRows * bundle.pageCount);
+                                    const cacheLookupStartedAt = Date.now();
+                                    const cached = await readSnapshotChunkRefByPageKey(trx, {
+                                        partitionId,
+                                        scopeKey: cacheKey,
+                                        scope: bundle.table,
+                                        asOfCommitSeq: effectiveState.asOfCommitSeq,
+                                        rowCursor: bundle.startCursor,
+                                        rowLimit: bundleRowLimit,
+                                        encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
+                                        compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
+                                        nowIso,
+                                    });
+                                    bootstrapTimings.chunkCacheLookupMs += Math.max(0, Date.now() - cacheLookupStartedAt);
+                                    let chunkRef = cached;
+                                    if (!chunkRef) {
+                                        const expiresAt = new Date(Date.now() + Math.max(1000, bundle.ttlMs)).toISOString();
+                                        if (args.chunkStorage) {
+                                            const snapshot = {
+                                                table: bundle.table,
+                                                rows: [],
+                                                chunks: [],
+                                                isFirstPage: bundle.isFirstPage,
+                                                isLastPage: bundle.isLastPage,
+                                            };
+                                            snapshots.push(snapshot);
+                                            pendingExternalChunkWrites.push({
+                                                snapshot,
+                                                cacheLookup: {
+                                                    partitionId,
+                                                    scopeKey: cacheKey,
+                                                    scope: bundle.table,
+                                                    asOfCommitSeq: effectiveState.asOfCommitSeq,
+                                                    rowCursor: bundle.startCursor,
+                                                    rowLimit: bundleRowLimit,
+                                                },
+                                                rowFrameParts: [...bundle.rowFrameParts],
+                                                expiresAt,
+                                            });
+                                            return;
+                                        }
+                                        const encodedChunk = await encodeCompressedSnapshotChunk(bundle.rowFrameParts);
+                                        bootstrapTimings.chunkGzipMs += encodedChunk.gzipMs;
+                                        bootstrapTimings.chunkHashMs += encodedChunk.hashMs;
+                                        const chunkId = randomId();
+                                        const chunkPersistStartedAt = Date.now();
+                                        chunkRef = await insertSnapshotChunk(trx, {
+                                            chunkId,
                                             partitionId,
                                             scopeKey: cacheKey,
                                             scope: bundle.table,
                                             asOfCommitSeq: effectiveState.asOfCommitSeq,
                                             rowCursor: bundle.startCursor,
                                             rowLimit: bundleRowLimit,
-                                        },
-                                        rowFrameParts: [...bundle.rowFrameParts],
-                                        expiresAt,
+                                            encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
+                                            compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
+                                            sha256: encodedChunk.sha256,
+                                            body: encodedChunk.body,
+                                            expiresAt,
+                                        });
+                                        bootstrapTimings.chunkPersistMs += Math.max(0, Date.now() - chunkPersistStartedAt);
+                                    }
+                                    snapshots.push({
+                                        table: bundle.table,
+                                        rows: [],
+                                        chunks: [chunkRef],
+                                        isFirstPage: bundle.isFirstPage,
+                                        isLastPage: bundle.isLastPage,
                                     });
-                                    return;
-                                }
-                                const encodedChunk = await encodeCompressedSnapshotChunk(bundle.rowFrameParts);
-                                bootstrapTimings.chunkGzipMs += encodedChunk.gzipMs;
-                                bootstrapTimings.chunkHashMs += encodedChunk.hashMs;
-                                const chunkId = randomId();
-                                const chunkPersistStartedAt = Date.now();
-                                chunkRef = await insertSnapshotChunk(trx, {
-                                    chunkId,
-                                    partitionId,
-                                    scopeKey: cacheKey,
-                                    scope: bundle.table,
-                                    asOfCommitSeq: effectiveState.asOfCommitSeq,
-                                    rowCursor: bundle.startCursor,
-                                    rowLimit: bundleRowLimit,
-                                    encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
-                                    compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
-                                    sha256: encodedChunk.sha256,
-                                    body: encodedChunk.body,
-                                    expiresAt,
-                                });
-                                bootstrapTimings.chunkPersistMs += Math.max(0, Date.now() - chunkPersistStartedAt);
-                            }
-                            snapshots.push({
-                                table: bundle.table,
-                                rows: [],
-                                chunks: [chunkRef],
-                                isFirstPage: bundle.isFirstPage,
-                                isLastPage: bundle.isLastPage,
-                            });
-                        };
-                        let activeBundle = null;
-                        for (let pageIndex = 0; pageIndex < maxSnapshotPages; pageIndex++) {
-                            if (!nextState)
-                                break;
-                            const nextTableName = nextState.tables[nextState.tableIndex];
-                            if (!nextTableName) {
-                                if (activeBundle) {
+                                };
+                                let activeBundle = null;
+                                for (let pageIndex = 0; pageIndex < maxSnapshotPages; pageIndex++) {
+                                    if (!nextState)
+                                        break;
+                                    const nextTableName = nextState.tables[nextState.tableIndex];
+                                    if (!nextTableName) {
+                                        if (activeBundle) {
+                                            activeBundle.isLastPage = true;
+                                            await flushSnapshotBundle(activeBundle);
+                                            activeBundle = null;
+                                        }
+                                        nextState = null;
+                                        break;
+                                    }
+                                    const tableHandler = args.handlers.byTable.get(nextTableName);
+                                    if (!tableHandler) {
+                                        throw new Error(`Unknown table: ${nextTableName}`);
+                                    }
+                                    if (!activeBundle ||
+                                        activeBundle.table !== nextTableName) {
+                                        if (activeBundle) {
+                                            await flushSnapshotBundle(activeBundle);
+                                        }
+                                        const bundleHeader = EMPTY_SNAPSHOT_ROW_FRAMES;
+                                        activeBundle = {
+                                            table: nextTableName,
+                                            startCursor: nextState.rowCursor,
+                                            isFirstPage: nextState.rowCursor == null,
+                                            isLastPage: false,
+                                            pageCount: 0,
+                                            ttlMs: tableHandler.snapshotChunkTtlMs ??
+                                                24 * 60 * 60 * 1000,
+                                            rowFrameByteLength: bundleHeader.length,
+                                            rowFrameParts: [bundleHeader],
+                                            inlineRows: null,
+                                        };
+                                    }
+                                    const snapshotQueryStartedAt = Date.now();
+                                    const page = await tableHandler.snapshot({
+                                        db: trx,
+                                        actorId: args.auth.actorId,
+                                        auth: args.auth,
+                                        scopeValues: effectiveScopes,
+                                        cursor: nextState.rowCursor,
+                                        limit: limitSnapshotRows,
+                                    }, sub.params);
+                                    bootstrapTimings.snapshotQueryMs += Math.max(0, Date.now() - snapshotQueryStartedAt);
+                                    const rowFrameEncodeStartedAt = Date.now();
+                                    const rowFrames = encodeSnapshotRowFrames(page.rows ?? []);
+                                    bootstrapTimings.rowFrameEncodeMs += Math.max(0, Date.now() - rowFrameEncodeStartedAt);
+                                    const bundleMaxBytes = resolveSnapshotBundleMaxBytes({
+                                        configuredMaxBytes: tableHandler.snapshotBundleMaxBytes,
+                                        pageRowCount: page.rows?.length ?? 0,
+                                        pageRowFrameBytes: rowFrames.length,
+                                    });
+                                    if (activeBundle.pageCount > 0 &&
+                                        activeBundle.rowFrameByteLength + rowFrames.length >
+                                            bundleMaxBytes) {
+                                        await flushSnapshotBundle(activeBundle);
+                                        const bundleHeader = EMPTY_SNAPSHOT_ROW_FRAMES;
+                                        activeBundle = {
+                                            table: nextTableName,
+                                            startCursor: nextState.rowCursor,
+                                            isFirstPage: nextState.rowCursor == null,
+                                            isLastPage: false,
+                                            pageCount: 0,
+                                            ttlMs: tableHandler.snapshotChunkTtlMs ??
+                                                24 * 60 * 60 * 1000,
+                                            rowFrameByteLength: bundleHeader.length,
+                                            rowFrameParts: [bundleHeader],
+                                            inlineRows: null,
+                                        };
+                                    }
+                                    if (preferInlineBootstrapSnapshot &&
+                                        activeBundle.pageCount === 0 &&
+                                        page.nextCursor == null &&
+                                        rowFrames.length <=
+                                            DEFAULT_INLINE_SNAPSHOT_ROW_FRAME_BYTES) {
+                                        activeBundle.inlineRows = page.rows ?? [];
+                                    }
+                                    else {
+                                        activeBundle.inlineRows = null;
+                                    }
+                                    activeBundle.rowFrameParts.push(rowFrames);
+                                    activeBundle.rowFrameByteLength += rowFrames.length;
+                                    activeBundle.pageCount += 1;
+                                    if (page.nextCursor != null) {
+                                        nextState = {
+                                            ...nextState,
+                                            rowCursor: page.nextCursor,
+                                        };
+                                        continue;
+                                    }
                                     activeBundle.isLastPage = true;
                                     await flushSnapshotBundle(activeBundle);
                                     activeBundle = null;
+                                    if (nextState.tableIndex + 1 < nextState.tables.length) {
+                                        nextState = {
+                                            ...nextState,
+                                            tableIndex: nextState.tableIndex + 1,
+                                            rowCursor: null,
+                                        };
+                                        continue;
+                                    }
+                                    nextState = null;
+                                    break;
                                 }
-                                nextState = null;
-                                break;
-                            }
-                            const tableHandler = args.handlers.byTable.get(nextTableName);
-                            if (!tableHandler) {
-                                throw new Error(`Unknown table: ${nextTableName}`);
-                            }
-                            if (!activeBundle || activeBundle.table !== nextTableName) {
                                 if (activeBundle) {
                                     await flushSnapshotBundle(activeBundle);
                                 }
-                                const bundleHeader = EMPTY_SNAPSHOT_ROW_FRAMES;
-                                activeBundle = {
-                                    table: nextTableName,
-                                    startCursor: nextState.rowCursor,
-                                    isFirstPage: nextState.rowCursor == null,
-                                    isLastPage: false,
-                                    pageCount: 0,
-                                    ttlMs: tableHandler.snapshotChunkTtlMs ?? 24 * 60 * 60 * 1000,
-                                    rowFrameByteLength: bundleHeader.length,
-                                    rowFrameParts: [bundleHeader],
-                                    inlineRows: null,
-                                };
-                            }
-                            const snapshotQueryStartedAt = Date.now();
-                            const page = await tableHandler.snapshot({
-                                db: trx,
-                                actorId: args.auth.actorId,
-                                auth: args.auth,
-                                scopeValues: effectiveScopes,
-                                cursor: nextState.rowCursor,
-                                limit: limitSnapshotRows,
-                            }, sub.params);
-                            bootstrapTimings.snapshotQueryMs += Math.max(0, Date.now() - snapshotQueryStartedAt);
-                            const rowFrameEncodeStartedAt = Date.now();
-                            const rowFrames = encodeSnapshotRowFrames(page.rows ?? []);
-                            bootstrapTimings.rowFrameEncodeMs += Math.max(0, Date.now() - rowFrameEncodeStartedAt);
-                            const bundleMaxBytes = resolveSnapshotBundleMaxBytes({
-                                configuredMaxBytes: tableHandler.snapshotBundleMaxBytes,
-                                pageRowCount: page.rows?.length ?? 0,
-                                pageRowFrameBytes: rowFrames.length,
-                            });
-                            if (activeBundle.pageCount > 0 &&
-                                activeBundle.rowFrameByteLength + rowFrames.length >
-                                    bundleMaxBytes) {
-                                await flushSnapshotBundle(activeBundle);
-                                const bundleHeader = EMPTY_SNAPSHOT_ROW_FRAMES;
-                                activeBundle = {
-                                    table: nextTableName,
-                                    startCursor: nextState.rowCursor,
-                                    isFirstPage: nextState.rowCursor == null,
-                                    isLastPage: false,
-                                    pageCount: 0,
-                                    ttlMs: tableHandler.snapshotChunkTtlMs ?? 24 * 60 * 60 * 1000,
-                                    rowFrameByteLength: bundleHeader.length,
-                                    rowFrameParts: [bundleHeader],
-                                    inlineRows: null,
-                                };
+                                subResponses.push({
+                                    id: sub.id,
+                                    status: 'active',
+                                    scopes: effectiveScopes,
+                                    bootstrap: true,
+                                    bootstrapState: nextState,
+                                    nextCursor: effectiveState.asOfCommitSeq,
+                                    commits: [],
+                                    snapshots,
+                                });
+                                nextCursors.push(effectiveState.asOfCommitSeq);
+                                continue;
                             }
-                            if (preferInlineBootstrapSnapshot &&
-                                activeBundle.pageCount === 0 &&
-                                page.nextCursor == null &&
-                                rowFrames.length <= DEFAULT_INLINE_SNAPSHOT_ROW_FRAME_BYTES) {
-                                activeBundle.inlineRows = page.rows ?? [];
+                            // Incremental pull for this subscription. The dialect row query
+                            // carries the scanned commit-window max when matching rows exist,
+                            // so we only need a separate commit-window scan when the row query
+                            // returns no matches at all.
+                            const incrementalRows = [];
+                            let maxScannedCommitSeq = cursor;
+                            for await (const row of dialect.iterateIncrementalPullRows(trx, {
+                                partitionId,
+                                table: sub.table,
+                                scopes: effectiveScopes,
+                                cursor,
+                                limitCommits,
+                            })) {
+                                incrementalRows.push(row);
+                                maxScannedCommitSeq = Math.max(maxScannedCommitSeq, row.scanned_max_commit_seq ?? row.commit_seq);
                             }
-                            else {
-                                activeBundle.inlineRows = null;
+                            if (incrementalRows.length === 0) {
+                                const scannedCommitSeqs = await dialect.readCommitSeqsForPull(trx, {
+                                    partitionId,
+                                    cursor,
+                                    limitCommits,
+                                    tables: [sub.table],
+                                });
+                                maxScannedCommitSeq =
+                                    scannedCommitSeqs.length > 0
+                                        ? scannedCommitSeqs[scannedCommitSeqs.length - 1]
+                                        : cursor;
+                                if (scannedCommitSeqs.length === 0) {
+                                    subResponses.push({
+                                        id: sub.id,
+                                        status: 'active',
+                                        scopes: effectiveScopes,
+                                        bootstrap: false,
+                                        nextCursor: cursor,
+                                        commits: [],
+                                    });
+                                    nextCursors.push(cursor);
+                                    continue;
+                                }
                             }
-                            activeBundle.rowFrameParts.push(rowFrames);
-                            activeBundle.rowFrameByteLength += rowFrames.length;
-                            activeBundle.pageCount += 1;
-                            if (page.nextCursor != null) {
-                                nextState = { ...nextState, rowCursor: page.nextCursor };
+                            let nextCursor = cursor;
+                            if (dedupeRows) {
+                                const latestByRowKey = new Map();
+                                for (const r of incrementalRows) {
+                                    nextCursor = Math.max(nextCursor, r.commit_seq);
+                                    const rowKey = `${r.table}\u0000${r.row_id}`;
+                                    const change = {
+                                        table: r.table,
+                                        row_id: r.row_id,
+                                        op: r.op,
+                                        row_json: r.row_json,
+                                        row_version: r.row_version,
+                                        scopes: r.scopes,
+                                    };
+                                    // Move row keys to insertion tail so Map iteration yields
+                                    // "latest change wins" order without a full array sort.
+                                    if (latestByRowKey.has(rowKey)) {
+                                        latestByRowKey.delete(rowKey);
+                                    }
+                                    latestByRowKey.set(rowKey, {
+                                        commitSeq: r.commit_seq,
+                                        createdAt: r.created_at,
+                                        actorId: r.actor_id,
+                                        change,
+                                    });
+                                }
+                                nextCursor = Math.max(nextCursor, maxScannedCommitSeq);
+                                if (latestByRowKey.size === 0) {
+                                    subResponses.push({
+                                        id: sub.id,
+                                        status: 'active',
+                                        scopes: effectiveScopes,
+                                        bootstrap: false,
+                                        nextCursor,
+                                        commits: [],
+                                    });
+                                    nextCursors.push(nextCursor);
+                                    continue;
+                                }
+                                const commits = [];
+                                for (const item of latestByRowKey.values()) {
+                                    const lastCommit = commits[commits.length - 1];
+                                    if (!lastCommit ||
+                                        lastCommit.commitSeq !== item.commitSeq) {
+                                        commits.push({
+                                            commitSeq: item.commitSeq,
+                                            createdAt: item.createdAt,
+                                            actorId: item.actorId,
+                                            changes: [item.change],
+                                        });
+                                        continue;
+                                    }
+                                    lastCommit.changes.push(item.change);
+                                }
+                                subResponses.push({
+                                    id: sub.id,
+                                    status: 'active',
+                                    scopes: effectiveScopes,
+                                    bootstrap: false,
+                                    nextCursor,
+                                    commits,
+                                });
+                                nextCursors.push(nextCursor);
                                 continue;
                             }
-                            activeBundle.isLastPage = true;
-                            await flushSnapshotBundle(activeBundle);
-                            activeBundle = null;
-                            if (nextState.tableIndex + 1 < nextState.tables.length) {
-                                nextState = {
-                                    ...nextState,
-                                    tableIndex: nextState.tableIndex + 1,
-                                    rowCursor: null,
+                            const commitsBySeq = new Map();
+                            const commitSeqs = [];
+                            for (const r of incrementalRows) {
+                                nextCursor = Math.max(nextCursor, r.commit_seq);
+                                const seq = r.commit_seq;
+                                let commit = commitsBySeq.get(seq);
+                                if (!commit) {
+                                    commit = {
+                                        commitSeq: seq,
+                                        createdAt: r.created_at,
+                                        actorId: r.actor_id,
+                                        changes: [],
+                                    };
+                                    commitsBySeq.set(seq, commit);
+                                    commitSeqs.push(seq);
+                                }
+                                const change = {
+                                    table: r.table,
+                                    row_id: r.row_id,
+                                    op: r.op,
+                                    row_json: r.row_json,
+                                    row_version: r.row_version,
+                                    scopes: r.scopes,
                                 };
-                                continue;
+                                commit.changes.push(change);
                             }
-                            nextState = null;
-                            break;
-                        }
-                        if (activeBundle) {
-                            await flushSnapshotBundle(activeBundle);
-                        }
-                        subResponses.push({
-                            id: sub.id,
-                            status: 'active',
-                            scopes: effectiveScopes,
-                            bootstrap: true,
-                            bootstrapState: nextState,
-                            nextCursor: effectiveState.asOfCommitSeq,
-                            commits: [],
-                            snapshots,
-                        });
-                        nextCursors.push(effectiveState.asOfCommitSeq);
-                        continue;
-                    }
-                    // Incremental pull for this subscription
-                    // Read the commit window for this table up-front so the subscription cursor
-                    // can advance past commits that don't match the requested scopes.
-                    const scannedCommitSeqs = await dialect.readCommitSeqsForPull(trx, {
-                        partitionId,
-                        cursor,
-                        limitCommits,
-                        tables: [sub.table],
-                    });
-                    const maxScannedCommitSeq = scannedCommitSeqs.length > 0
-                        ? scannedCommitSeqs[scannedCommitSeqs.length - 1]
-                        : cursor;
-                    if (scannedCommitSeqs.length === 0) {
-                        subResponses.push({
-                            id: sub.id,
-                            status: 'active',
-                            scopes: effectiveScopes,
-                            bootstrap: false,
-                            nextCursor: cursor,
-                            commits: [],
-                        });
-                        nextCursors.push(cursor);
-                        continue;
-                    }
-                    let nextCursor = cursor;
-                    if (dedupeRows) {
-                        const latestByRowKey = new Map();
-                        for await (const r of dialect.iterateIncrementalPullRows(trx, {
-                            partitionId,
-                            table: sub.table,
-                            scopes: effectiveScopes,
-                            cursor,
-                            limitCommits,
-                        })) {
-                            nextCursor = Math.max(nextCursor, r.commit_seq);
-                            const rowKey = `${r.table}\u0000${r.row_id}`;
-                            const change = {
-                                table: r.table,
-                                row_id: r.row_id,
-                                op: r.op,
-                                row_json: r.row_json,
-                                row_version: r.row_version,
-                                scopes: r.scopes,
-                            };
-                            // Move row keys to insertion tail so Map iteration yields
-                            // "latest change wins" order without a full array sort.
-                            if (latestByRowKey.has(rowKey)) {
-                                latestByRowKey.delete(rowKey);
+                            nextCursor = Math.max(nextCursor, maxScannedCommitSeq);
+                            if (commitSeqs.length === 0) {
+                                subResponses.push({
+                                    id: sub.id,
+                                    status: 'active',
+                                    scopes: effectiveScopes,
+                                    bootstrap: false,
+                                    nextCursor,
+                                    commits: [],
+                                });
+                                nextCursors.push(nextCursor);
+                                continue;
                             }
-                            latestByRowKey.set(rowKey, {
-                                commitSeq: r.commit_seq,
-                                createdAt: r.created_at,
-                                actorId: r.actor_id,
-                                change,
-                            });
-                        }
-                        nextCursor = Math.max(nextCursor, maxScannedCommitSeq);
-                        if (latestByRowKey.size === 0) {
+                            const commits = commitSeqs
+                                .map((seq) => commitsBySeq.get(seq))
+                                .filter((c) => !!c)
+                                .filter((c) => c.changes.length > 0);
                             subResponses.push({
                                 id: sub.id,
                                 status: 'active',
                                 scopes: effectiveScopes,
                                 bootstrap: false,
                                 nextCursor,
-                                commits: [],
+                                commits,
                             });
                             nextCursors.push(nextCursor);
-                            continue;
-                        }
-                        const commits = [];
-                        for (const item of latestByRowKey.values()) {
-                            const lastCommit = commits[commits.length - 1];
-                            if (!lastCommit || lastCommit.commitSeq !== item.commitSeq) {
-                                commits.push({
-                                    commitSeq: item.commitSeq,
-                                    createdAt: item.createdAt,
-                                    actorId: item.actorId,
-                                    changes: [item.change],
-                                });
-                                continue;
-                            }
-                            lastCommit.changes.push(item.change);
-                        }
-                        subResponses.push({
-                            id: sub.id,
-                            status: 'active',
-                            scopes: effectiveScopes,
-                            bootstrap: false,
-                            nextCursor,
-                            commits,
-                        });
-                        nextCursors.push(nextCursor);
-                        continue;
-                    }
-                    const commitsBySeq = new Map();
-                    const commitSeqs = [];
-                    for await (const r of dialect.iterateIncrementalPullRows(trx, {
-                        partitionId,
-                        table: sub.table,
-                        scopes: effectiveScopes,
-                        cursor,
-                        limitCommits,
-                    })) {
-                        nextCursor = Math.max(nextCursor, r.commit_seq);
-                        const seq = r.commit_seq;
-                        let commit = commitsBySeq.get(seq);
-                        if (!commit) {
-                            commit = {
-                                commitSeq: seq,
-                                createdAt: r.created_at,
-                                actorId: r.actor_id,
-                                changes: [],
-                            };
-                            commitsBySeq.set(seq, commit);
-                            commitSeqs.push(seq);
                         }
-                        const change = {
-                            table: r.table,
-                            row_id: r.row_id,
-                            op: r.op,
-                            row_json: r.row_json,
-                            row_version: r.row_version,
-                            scopes: r.scopes,
+                        const effectiveScopes = mergeScopes(activeSubscriptions);
+                        const clientCursor = nextCursors.length > 0
+                            ? Math.min(...nextCursors)
+                            : maxCommitSeq;
+                        return {
+                            response: {
+                                ok: true,
+                                subscriptions: subResponses,
+                            },
+                            effectiveScopes,
+                            clientCursor,
                         };
-                        commit.changes.push(change);
-                    }
-                    nextCursor = Math.max(nextCursor, maxScannedCommitSeq);
-                    if (commitSeqs.length === 0) {
-                        subResponses.push({
-                            id: sub.id,
-                            status: 'active',
-                            scopes: effectiveScopes,
-                            bootstrap: false,
-                            nextCursor,
-                            commits: [],
-                        });
-                        nextCursors.push(nextCursor);
-                        continue;
-                    }
-                    const commits = commitSeqs
-                        .map((seq) => commitsBySeq.get(seq))
-                        .filter((c) => !!c)
-                        .filter((c) => c.changes.length > 0);
-                    subResponses.push({
-                        id: sub.id,
-                        status: 'active',
-                        scopes: effectiveScopes,
-                        bootstrap: false,
-                        nextCursor,
-                        commits,
                     });
-                    nextCursors.push(nextCursor);
-                }
-                const effectiveScopes = mergeScopes(activeSubscriptions);
-                const clientCursor = nextCursors.length > 0 ? Math.min(...nextCursors) : maxCommitSeq;
-                return {
-                    response: {
-                        ok: true,
-                        subscriptions: subResponses,
-                    },
-                    effectiveScopes,
-                    clientCursor,
-                };
-            });
-            const chunkStorage = args.chunkStorage;
-            if (chunkStorage && pendingExternalChunkWrites.length > 0) {
-                await runWithConcurrency(pendingExternalChunkWrites, 4, async (pending) => {
-                    const cacheLookupStartedAt = Date.now();
-                    let chunkRef = await readSnapshotChunkRefByPageKey(db, {
-                        partitionId: pending.cacheLookup.partitionId,
-                        scopeKey: pending.cacheLookup.scopeKey,
-                        scope: pending.cacheLookup.scope,
-                        asOfCommitSeq: pending.cacheLookup.asOfCommitSeq,
-                        rowCursor: pending.cacheLookup.rowCursor,
-                        rowLimit: pending.cacheLookup.rowLimit,
-                        encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
-                        compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
-                    });
-                    bootstrapTimings.chunkCacheLookupMs += Math.max(0, Date.now() - cacheLookupStartedAt);
-                    if (!chunkRef) {
-                        if (chunkStorage.storeChunkStream) {
-                            const { stream: bodyStream, byteLength, sha256, gzipMs, hashMs, } = await encodeCompressedSnapshotChunkToStream(pending.rowFrameParts);
-                            bootstrapTimings.chunkGzipMs += gzipMs;
-                            bootstrapTimings.chunkHashMs += hashMs;
-                            const chunkPersistStartedAt = Date.now();
-                            chunkRef = await chunkStorage.storeChunkStream({
-                                partitionId: pending.cacheLookup.partitionId,
-                                scopeKey: pending.cacheLookup.scopeKey,
-                                scope: pending.cacheLookup.scope,
-                                asOfCommitSeq: pending.cacheLookup.asOfCommitSeq,
-                                rowCursor: pending.cacheLookup.rowCursor,
-                                rowLimit: pending.cacheLookup.rowLimit,
-                                encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
-                                compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
-                                sha256,
-                                byteLength,
-                                bodyStream,
-                                expiresAt: pending.expiresAt,
-                            });
-                            bootstrapTimings.chunkPersistMs += Math.max(0, Date.now() - chunkPersistStartedAt);
-                        }
-                        else {
-                            const encodedChunk = await encodeCompressedSnapshotChunk(pending.rowFrameParts);
-                            bootstrapTimings.chunkGzipMs += encodedChunk.gzipMs;
-                            bootstrapTimings.chunkHashMs += encodedChunk.hashMs;
-                            const chunkPersistStartedAt = Date.now();
-                            chunkRef = await chunkStorage.storeChunk({
+                    const chunkStorage = args.chunkStorage;
+                    if (chunkStorage && pendingExternalChunkWrites.length > 0) {
+                        await runWithConcurrency(pendingExternalChunkWrites, 4, async (pending) => {
+                            const cacheLookupStartedAt = Date.now();
+                            let chunkRef = await readSnapshotChunkRefByPageKey(db, {
                                 partitionId: pending.cacheLookup.partitionId,
                                 scopeKey: pending.cacheLookup.scopeKey,
                                 scope: pending.cacheLookup.scope,
@@ -862,43 +753,93 @@ export async function pull(args) {
                                 rowLimit: pending.cacheLookup.rowLimit,
                                 encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
                                 compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
-                                sha256: encodedChunk.sha256,
-                                body: encodedChunk.body,
-                                expiresAt: pending.expiresAt,
                             });
-                            bootstrapTimings.chunkPersistMs += Math.max(0, Date.now() - chunkPersistStartedAt);
-                        }
+                            bootstrapTimings.chunkCacheLookupMs += Math.max(0, Date.now() - cacheLookupStartedAt);
+                            if (!chunkRef) {
+                                if (chunkStorage.storeChunkStream) {
+                                    const { stream: bodyStream, byteLength, sha256, gzipMs, hashMs, } = await encodeCompressedSnapshotChunkToStream(pending.rowFrameParts);
+                                    bootstrapTimings.chunkGzipMs += gzipMs;
+                                    bootstrapTimings.chunkHashMs += hashMs;
+                                    const chunkPersistStartedAt = Date.now();
+                                    chunkRef = await chunkStorage.storeChunkStream({
+                                        partitionId: pending.cacheLookup.partitionId,
+                                        scopeKey: pending.cacheLookup.scopeKey,
+                                        scope: pending.cacheLookup.scope,
+                                        asOfCommitSeq: pending.cacheLookup.asOfCommitSeq,
+                                        rowCursor: pending.cacheLookup.rowCursor,
+                                        rowLimit: pending.cacheLookup.rowLimit,
+                                        encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
+                                        compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
+                                        sha256,
+                                        byteLength,
+                                        bodyStream,
+                                        expiresAt: pending.expiresAt,
+                                    });
+                                    bootstrapTimings.chunkPersistMs += Math.max(0, Date.now() - chunkPersistStartedAt);
+                                }
+                                else {
+                                    const encodedChunk = await encodeCompressedSnapshotChunk(pending.rowFrameParts);
+                                    bootstrapTimings.chunkGzipMs += encodedChunk.gzipMs;
+                                    bootstrapTimings.chunkHashMs += encodedChunk.hashMs;
+                                    const chunkPersistStartedAt = Date.now();
+                                    chunkRef = await chunkStorage.storeChunk({
+                                        partitionId: pending.cacheLookup.partitionId,
+                                        scopeKey: pending.cacheLookup.scopeKey,
+                                        scope: pending.cacheLookup.scope,
+                                        asOfCommitSeq: pending.cacheLookup.asOfCommitSeq,
+                                        rowCursor: pending.cacheLookup.rowCursor,
+                                        rowLimit: pending.cacheLookup.rowLimit,
+                                        encoding: SYNC_SNAPSHOT_CHUNK_ENCODING,
+                                        compression: SYNC_SNAPSHOT_CHUNK_COMPRESSION,
+                                        sha256: encodedChunk.sha256,
+                                        body: encodedChunk.body,
+                                        expiresAt: pending.expiresAt,
+                                    });
+                                    bootstrapTimings.chunkPersistMs += Math.max(0, Date.now() - chunkPersistStartedAt);
+                                }
+                            }
+                            pending.snapshot.chunks = [chunkRef];
+                        });
                     }
-                    pending.snapshot.chunks = [chunkRef];
-                });
+                    const durationMs = Math.max(0, Date.now() - startedAtMs);
+                    const stats = summarizePullResponse(result.response);
+                    span.setAttribute('status', 'ok');
+                    span.setAttribute('duration_ms', durationMs);
+                    span.setAttribute('subscription_count', stats.subscriptionCount);
+                    span.setAttribute('commit_count', stats.commitCount);
+                    span.setAttribute('change_count', stats.changeCount);
+                    span.setAttribute('snapshot_page_count', stats.snapshotPageCount);
+                    span.setAttributes({
+                        bootstrap_snapshot_query_ms: bootstrapTimings.snapshotQueryMs,
+                        bootstrap_row_frame_encode_ms: bootstrapTimings.rowFrameEncodeMs,
+                        bootstrap_chunk_cache_lookup_ms: bootstrapTimings.chunkCacheLookupMs,
+                        bootstrap_chunk_gzip_ms: bootstrapTimings.chunkGzipMs,
+                        bootstrap_chunk_hash_ms: bootstrapTimings.chunkHashMs,
+                        bootstrap_chunk_persist_ms: bootstrapTimings.chunkPersistMs,
+                    });
+                    span.setStatus('ok');
+                    recordPullMetrics({
+                        status: 'ok',
+                        dedupeRows,
+                        durationMs,
+                        stats,
+                    });
+                    return {
+                        ...result,
+                        bootstrapTimings,
+                    };
+                }
+                catch (error) {
+                    if (error instanceof Error &&
+                        attemptIndex < MAX_PULL_TRANSACTION_RETRIES - 1 &&
+                        isSerializablePullError(error)) {
+                        await delay(PULL_TRANSACTION_RETRY_DELAY_MS * (attemptIndex + 1));
+                        continue;
+                    }
+                    throw error;
+                }
             }
-            const durationMs = Math.max(0, Date.now() - startedAtMs);
-            const stats = summarizePullResponse(result.response);
-            span.setAttribute('status', 'ok');
-            span.setAttribute('duration_ms', durationMs);
-            span.setAttribute('subscription_count', stats.subscriptionCount);
-            span.setAttribute('commit_count', stats.commitCount);
-            span.setAttribute('change_count', stats.changeCount);
-            span.setAttribute('snapshot_page_count', stats.snapshotPageCount);
-            span.setAttributes({
-                bootstrap_snapshot_query_ms: bootstrapTimings.snapshotQueryMs,
-                bootstrap_row_frame_encode_ms: bootstrapTimings.rowFrameEncodeMs,
-                bootstrap_chunk_cache_lookup_ms: bootstrapTimings.chunkCacheLookupMs,
-                bootstrap_chunk_gzip_ms: bootstrapTimings.chunkGzipMs,
-                bootstrap_chunk_hash_ms: bootstrapTimings.chunkHashMs,
-                bootstrap_chunk_persist_ms: bootstrapTimings.chunkPersistMs,
-            });
-            span.setStatus('ok');
-            recordPullMetrics({
-                status: 'ok',
-                dedupeRows,
-                durationMs,
-                stats,
-            });
-            return {
-                ...result,
-                bootstrapTimings,
-            };
+            throw new Error('Pull transaction retry loop exhausted unexpectedly');
         }
         catch (error) {
             const durationMs = Math.max(0, Date.now() - startedAtMs);