@syncular/client 0.30.12 → 0.30.14

package/src/client.ts

@@ -1,9 +1,14 @@
+import { BLOB_COMMIT_REFS } from './blob';
+import { hasUniqueIndex } from './schema';
+import { OUTCOMES_TABLE } from './outcomes';
+import { OUTBOX_TABLE } from './outbox';
 import { RETAINED_ROWS } from './failed-overlay';
 import {
   dropFailedRows,
   failedOverlayCommits,
   retainFailedRows,
   restoreFailedBases,
+  type OverlayScope,
   uniqueConflicts,
 } from './failed-overlay';
 import {
@@ -349,6 +354,7 @@ export interface SyncClientLimits {
 }
 
 export interface SyncClientConfig {
+  readonly transportEnabled?: boolean;
   /** Keep rejected/conflicting local intent visible until explicit resolution. */
   readonly retainFailedCommits?: boolean;
   readonly database: ClientDatabase;
@@ -747,6 +753,7 @@ export class SyncClient {
   /** RFC 0005 resolved capture budgets; undefined ⇒ feature off. */
   readonly #previousVersion: PreviousVersionCaptureConfig | undefined;
   #securityLifecycle: SecurityLifecycle;
+  #transportEnabled: boolean;
   readonly #now: () => number;
   readonly #outcomeRetentionMaxEntries: number;
   readonly #retainFailedCommits: boolean;
@@ -838,6 +845,13 @@ export class SyncClient {
   #preflightBarrier: Promise<void> | undefined;
 
   constructor(config: SyncClientConfig) {
+    if (
+      config.transportEnabled !== undefined &&
+      typeof config.transportEnabled !== 'boolean'
+    ) {
+      throw invalidRequest('transportEnabled must be a boolean');
+    }
+    this.#transportEnabled = config.transportEnabled !== false;
     if (config.securityPreflight === true && config.encryption !== undefined) {
       throw invalidRequest(
         'securityPreflight and encryption are mutually exclusive; activateSecurity installs keys',
@@ -1159,6 +1173,13 @@ export class SyncClient {
 
   /** §2.1 reset after the server reports a different log continuity. */
   #runLogEpochReset(logEpoch: string): string[] {
+    if (getMeta(this.#db, LOG_EPOCH_META_KEY) === undefined) {
+      this.#applyBatch(() => setMeta(this.#db, LOG_EPOCH_META_KEY, logEpoch));
+      this.#setSyncNeeded(true);
+      this.#emitSyncNeeded('startup');
+      this.#emitSyncIntent({ kind: 'interactive' });
+      return [];
+    }
     const subscriptions = loadSubscriptions(this.#db);
     const pending = listOutbox(this.#db);
     this.#setUpgrading(true);
@@ -1225,6 +1246,7 @@ export class SyncClient {
   }
 
   #emitSyncNeeded(reason: 'startup' | 'hello' | WakeReason): void {
+    if (!this.#transportEnabled) return;
     try {
       this.#config.onSyncNeeded?.(reason);
     } catch {
@@ -1240,6 +1262,7 @@ export class SyncClient {
   }
 
   #emitSyncIntent(intent: SyncIntent): void {
+    if (!this.#transportEnabled && intent.kind !== 'none') return;
     try {
       this.#config.onSyncIntent?.(intent);
     } catch {
@@ -1254,6 +1277,27 @@ export class SyncClient {
     }
   }
 
+  /** Host-owned transport policy; the local replica remains available. */
+  setTransportEnabled(enabled: boolean): void {
+    this.#requireStarted();
+    if (typeof enabled !== 'boolean')
+      throw invalidRequest('transportEnabled must be a boolean');
+    if (this.#transportEnabled === enabled) return;
+    this.#transportEnabled = enabled;
+    if (!enabled && !this.#syncOutstanding) this.disconnectRealtime();
+    this.#emitSyncIntent(
+      enabled && this.#securityLifecycle === 'active'
+        ? { kind: 'interactive' }
+        : { kind: 'none' },
+    );
+    this.#emitDiagnostics();
+  }
+
+  #requireTransport(): void {
+    if (!this.#transportEnabled)
+      throw new ClientSyncError('sync.offline', 'transport gate is closed');
+  }
+
   /** Current fail-closed local-replica security state. */
   securityLifecycle(): SecurityLifecycle {
     return this.#securityLifecycle;
@@ -1799,8 +1843,9 @@ export class SyncClient {
     }
     const capturedAtMs = this.#now();
     const leaseState = this.#diagnosticLease(capturedAtMs);
-    const connectivity =
-      this.#lastRound?.status === 'succeeded'
+    const connectivity = !this.#transportEnabled
+      ? 'offline'
+      : this.#lastRound?.status === 'succeeded'
         ? 'online'
         : this.#lastRound?.status === 'failed' &&
             this.#transportFailureCode(this.#lastRound.errorCode)
@@ -1833,16 +1878,12 @@ export class SyncClient {
         realtimeRetryDelayMs: this.#realtimeRetryDelayMs,
       }),
       securityLifecycle: this.#securityLifecycle,
-      schema: {
+      schema: definedObject({
         currentVersion: this.#config.schema.version,
         upgrading: this.#upgrading,
-        ...(this.#schemaFloor?.requiredSchemaVersion !== undefined
-          ? { requiredVersion: this.#schemaFloor.requiredSchemaVersion }
-          : {}),
-        ...(this.#schemaFloor?.latestSchemaVersion !== undefined
-          ? { latestVersion: this.#schemaFloor.latestSchemaVersion }
-          : {}),
-      },
+        requiredVersion: this.#schemaFloor?.requiredSchemaVersion,
+        latestVersion: this.#schemaFloor?.latestSchemaVersion,
+      }),
       replica: {
         localRevision: getLocalRevision(this.#db).toString(),
         syncNeeded: this.#needsPull,
@@ -1888,11 +1929,11 @@ export class SyncClient {
       );
       const outboxBytes = Number(
         this.#db.query(
-          'SELECT COALESCE(SUM(LENGTH(operations)),0)AS bytes FROM _syncular_outbox',
+          `SELECT COALESCE(SUM(LENGTH(operations)),0)AS bytes FROM ${OUTBOX_TABLE}`,
         )[0]?.bytes ?? 0,
       );
       const outcome = this.#db.query(
-        'SELECT COUNT(*)AS entries,COALESCE(SUM(LENGTH(results)+ COALESCE(LENGTH(operations),0)),0)AS bytes FROM _syncular_commit_outcomes',
+        `SELECT COUNT(*)AS entries,COALESCE(SUM(LENGTH(results)+ COALESCE(LENGTH(operations),0)),0)AS bytes FROM ${OUTCOMES_TABLE}`,
       )[0];
       const blobBytes = this.#hasBlobs
         ? Number(
@@ -2058,10 +2099,11 @@ export class SyncClient {
     this.#requireActive();
     const task = Promise.resolve().then(fn);
     this.#protectedAsync.add(task);
-    void task.then(
-      () => this.#protectedAsync.delete(task),
-      () => this.#protectedAsync.delete(task),
-    );
+    const settled = () => {
+      if (this.#realtimeConnectPromise === task)
+        this.#realtimeConnectPromise = undefined;
+    };
+    void task.then(settled, settled);
     return task;
   }
 
@@ -2098,14 +2140,12 @@ export class SyncClient {
       recordPendingUpload(this.#db, blobId, nowMs, options?.mediaType);
     });
     this.#enforceBlobCacheCap();
-    return {
+    return definedObject({
       blobId,
       byteLength: bytes.length,
-      ...(options?.mediaType !== undefined
-        ? { mediaType: options.mediaType }
-        : {}),
-      ...(options?.name !== undefined ? { name: options.name } : {}),
-    };
+      mediaType: options?.mediaType,
+      name: options?.name,
+    });
   }
 
   /** Serialize a BlobRef to the canonical string a `blob_ref` column holds. */
@@ -2139,6 +2179,7 @@ export class SyncClient {
     // presign configured) a signed url the client fetches directly. On a url
     // arm the client MUST NOT attach host auth and MUST NOT fall through:
     // failure => re-request, the caller's next fetchBlob mints a fresh url.
+    this.#requireTransport();
     const response = await transport.download(blobId);
     let bytes: Uint8Array;
     if (response.kind === 'url') {
@@ -2190,6 +2231,7 @@ export class SyncClient {
 
   /** Flush any queued blob uploads (§5.9.7 B4); safe to call standalone. */
   flushBlobUploads(): Promise<void> {
+    this.#requireTransport();
     return this.#runProtectedAsync(() => this.#flushBlobUploads());
   }
 
@@ -2318,12 +2360,9 @@ export class SyncClient {
       );
     }
     const allowed =
-      (current.status === 'conflict' &&
+      ((current.status === 'conflict' || current.status === 'rejected') &&
         (input.resolution === 'resolved_keep_server' ||
           input.resolution === 'superseded')) ||
-      (current.status === 'rejected' &&
-        (input.resolution === 'superseded' ||
-          input.resolution === 'resolved_keep_server')) ||
       ((current.status === 'applied' || current.status === 'cached') &&
         input.resolution === 'dismissed');
     if (!allowed) {
@@ -2426,6 +2465,7 @@ export class SyncClient {
    */
   setPresence(scopeKey: string, doc: Record<string, unknown> | null): void {
     this.#requireActive();
+    this.#requireTransport();
     const socket = this.#socket;
     if (socket === undefined) {
       throw invalidRequest(
@@ -2594,7 +2634,10 @@ export class SyncClient {
       }
     });
     const effects: CommandEffects = {
-      sync: changed || widened ? { kind: 'interactive' } : { kind: 'none' },
+      sync:
+        this.#transportEnabled && (changed || widened)
+          ? { kind: 'interactive' }
+          : { kind: 'none' },
     };
     if (effects.sync.kind === 'interactive') {
       this.#emitSyncIntent(effects.sync);
@@ -2863,7 +2906,7 @@ export class SyncClient {
               continue;
             }
             this.#db.exec(
-              'INSERT OR IGNORE INTO _syncular_blob_commit_refs(commit_id,blob_id)SELECT ?,? WHERE EXISTS(SELECT 1 FROM _syncular_blobs WHERE blob_id=?)',
+              `INSERT OR IGNORE INTO ${BLOB_COMMIT_REFS}(commit_id,blob_id)SELECT ?,? WHERE EXISTS(SELECT 1 FROM _syncular_blobs WHERE blob_id=?)`,
               [clientCommitId, blobId, blobId],
             );
           }
@@ -2898,7 +2941,9 @@ export class SyncClient {
   mutateCommand(mutations: readonly MutationInput[]): CommandResult<string> {
     return {
       value: this.mutate(mutations),
-      effects: { sync: { kind: 'interactive' } },
+      effects: {
+        sync: { kind: this.#transportEnabled ? 'interactive' : 'none' },
+      },
     };
   }
 
@@ -2927,17 +2972,15 @@ export class SyncClient {
       );
     }
     return this.#recordMutations([
-      {
+      definedObject({
         table,
         op: 'patch',
         values: {
           ...Object.fromEntries(normalized),
           [pkColumn.name]: rowId,
         },
-        ...(options?.baseVersion !== undefined
-          ? { baseVersion: options.baseVersion }
-          : {}),
-      },
+        baseVersion: options?.baseVersion,
+      }),
     ]);
   }
 
@@ -3222,7 +3265,9 @@ export class SyncClient {
   ): CommandResult<string> {
     return {
       value: this.patch(table, rowId, partial, options),
-      effects: { sync: { kind: 'interactive' } },
+      effects: {
+        sync: { kind: this.#transportEnabled ? 'interactive' : 'none' },
+      },
     };
   }
 
@@ -3262,7 +3307,7 @@ export class SyncClient {
     // Pin before the first encryption await: mutations can append while a
     // round is encoding, and belong to the next request.
     const bounds = this.#db.query(
-      'SELECT COUNT(*)AS count,MAX(seq)AS last_seq FROM _syncular_outbox',
+      `SELECT COUNT(*)AS count,MAX(seq)AS last_seq FROM ${OUTBOX_TABLE}`,
     )[0]!;
     const pendingCount = bounds.count as number;
     const throughSeq = (bounds.last_seq as number | null) ?? 0;
@@ -3346,16 +3391,14 @@ export class SyncClient {
         );
       this.#rollbackFailedCommit(commit, batch);
       this.#replayOutbox();
-      const rejection: RejectionRecord = {
+      const rejection: RejectionRecord = definedObject({
         clientCommitId: commit.clientCommitId,
         opIndex: 0,
         code,
         message,
         retryable: false,
-        ...(commit.operations[0] !== undefined
-          ? { operation: commit.operations[0] }
-          : {}),
-      };
+        operation: commit.operations[0],
+      });
       this.#rejections.push(rejection);
       recordCommitOutcome(this.#db, {
         clientCommitId: commit.clientCommitId,
@@ -3386,9 +3429,7 @@ export class SyncClient {
     this.#requireActive();
     if (this.#syncOutstanding) {
       return Promise.reject(
-        invalidRequest(
-          'sync() is already running — the core owns one loop (coalesce wake-ups)',
-        ),
+        invalidRequest('sync() is already running; coalesce wake-ups'),
       );
     }
     this.#syncOutstanding = true;
@@ -3438,6 +3479,7 @@ export class SyncClient {
       )
       .finally(() => {
         this.#syncOutstanding = false;
+        if (!this.#transportEnabled) this.disconnectRealtime();
         this.#endDiagnosticsDeferral();
       });
   }
@@ -3476,6 +3518,7 @@ export class SyncClient {
   }
 
   async #runSync(): Promise<SyncSummary> {
+    this.#requireTransport();
     this.#roundRetryDelayMs = undefined;
     this.#progress.emit({
       attempt: ++this.#progressAttempt,
@@ -3507,7 +3550,7 @@ export class SyncClient {
         this.#hasBlobs &&
         this.#config.blobs !== undefined
       ) {
-        await this.flushBlobUploads();
+        await this.#flushBlobUploads();
       }
       // §7.4.4: encode the outbox with the CURRENT codec; a commit that
       // cannot express itself under the new schema (a dropped column/table)
@@ -3641,6 +3684,8 @@ export class SyncClient {
         loadSubscriptions(this.#db).map((sub) => [sub.id, sub.bootstrapState]),
       );
       last = await this.sync();
+      if (!this.#transportEnabled || last.schemaFloor !== undefined)
+        return last;
       if (
         maxRounds === undefined &&
         last.segmentRowsApplied > 0 &&
@@ -3654,7 +3699,6 @@ export class SyncClient {
           )
       )
         round = -1;
-      if (last.schemaFloor !== undefined) return last;
       if (
         last.commitsApplied === 0 &&
         last.segmentRowsApplied === 0 &&
@@ -3770,6 +3814,7 @@ export class SyncClient {
 
   connectRealtime(): Promise<void> {
     this.#requireActive();
+    this.#requireTransport();
     if (this.#realtimePolicy === 'off') {
       return Promise.reject(
         invalidRequest("realtimePolicy is 'off'; realtime connect is refused"),
@@ -3830,12 +3875,13 @@ export class SyncClient {
         },
       });
       openedSocket = socket;
+      if (!this.#transportEnabled) {
+        socket.close();
+        this.#requireTransport();
+      }
       if (this.#securityLifecycle === 'preflight') {
         socket.close();
-        throw new ClientSyncError(
-          SECURITY_PREFLIGHT_REQUIRED_CODE,
-          'realtime connected after the client entered security preflight',
-        );
+        this.#requireActive();
       }
       if (generation !== this.#realtimeGeneration || !this.#started) {
         socket.close();
@@ -3983,6 +4029,7 @@ export class SyncClient {
   }
 
   async #handleRealtimeBinary(bytes: Uint8Array): Promise<void> {
+    if (!this.#transportEnabled) return;
     if (this.#syncing) {
       // Fast path: a pull is mid-flight; let it win and recover the gap
       // itself — re-pulling is idempotent, interleaved application is not
@@ -4010,7 +4057,8 @@ export class SyncClient {
   }
 
   #sendAck(cursor: number): void {
-    this.#socket?.send(JSON.stringify({ type: 'ack', cursor }));
+    if (this.#transportEnabled)
+      this.#socket?.send(JSON.stringify({ type: 'ack', cursor }));
   }
 
   /** Ack the highest cursor that is contiguously applied for every sub. */
@@ -4220,74 +4268,16 @@ export class SyncClient {
               await this.#applyCommit(frame, summary);
             }
             break;
-          case 'SEGMENT_INLINE': {
-            if (
-              section === undefined ||
-              section.skip ||
-              section.sub === undefined
-            ) {
-              break;
-            }
-            const segment = decodeRowsSegment(frame.payload);
-            this.#progress.update({
-              phase: 'import',
-              subscriptionId: section.sub.id,
-              table: section.sub.table,
-              segmentId: undefined,
-              bytesReceived: frame.payload.byteLength,
-              bytesTotal: frame.payload.byteLength,
-              rowsProcessed: 0,
-              rowsTotal: segment.blocks.reduce(
-                (n, block) => n + block.length,
-                0,
-              ),
-            });
-            await this.#applySegmentOrFail(
-              section,
-              summary,
-              (table, clearFirst, effective) =>
-                applyRowsSegment(
-                  this.#db,
-                  this.#schema,
-                  table,
-                  segment,
-                  {
-                    clearFirst,
-                    isCurrent: () => this.#localResetEpoch === resetEpoch,
-                    onProgress: (rowsProcessed) =>
-                      this.#progress.update({ rowsProcessed }),
-                    effective,
-                    transaction: (fn) =>
-                      this.#applyBatch((batch) => {
-                        if (
-                          segment.blocks.some((block) => block.length > 0) ||
-                          (clearFirst &&
-                            this.#scopedRowsExist(table, effective))
-                        ) {
-                          batch.table(table.name);
-                        }
-                        const result = fn();
-                        this.#replayOutbox();
-                        return result;
-                      }),
-                  },
-                  this.#encryption,
-                ),
-              section.fresh && !section.cleared,
-            );
-            break;
-          }
+          case 'SEGMENT_INLINE':
           case 'SEGMENT_REF': {
             if (
               section === undefined ||
               section.skip ||
               section.sub === undefined
-            ) {
+            )
               break;
-            }
-            // §4.2: a descriptor whose mediaType was not advertised is a
-            // broken server — fail loud, never skip or guess.
             if (
+              frame.type === 'SEGMENT_REF' &&
               frame.mediaType === 'sqlite' &&
               (this.#acceptMask() & ACCEPT_SQLITE) === 0
             ) {
@@ -4295,11 +4285,14 @@ export class SyncClient {
                 'SEGMENT_REF mediaType sqlite was not advertised in accept (§4.2)',
               );
             }
-            const bytes = await this.#downloadSegment(frame, section.sub);
-            this.#progress.update({ phase: 'import' });
-            if (frame.mediaType === 'sqlite') {
-              // §5.3: images are whole-table — a paged descriptor is
-              // invalid, and the image is always its table's first page.
+            const bytes =
+              frame.type === 'SEGMENT_REF'
+                ? await this.#downloadSegment(frame, section.sub)
+                : frame.payload;
+            if (frame.type === 'SEGMENT_REF')
+              this.#progress.update({ phase: 'import' });
+            if (frame.type === 'SEGMENT_REF' && frame.mediaType === 'sqlite') {
+              // Images are whole-table; paged image descriptors are invalid.
               if (
                 frame.rowCursor !== undefined ||
                 frame.nextRowCursor !== undefined
@@ -4323,31 +4316,33 @@ export class SyncClient {
                       asOfCommitSeq: frame.asOfCommitSeq,
                       scopeDigest: frame.scopeDigest,
                     },
-                    {
+                    this.#segmentApplyOptions(
+                      table,
                       clearFirst,
-                      isCurrent: () => this.#localResetEpoch === resetEpoch,
-                      onProgress: (rowsProcessed) =>
-                        this.#progress.update({ rowsProcessed }),
                       effective,
-                      transaction: (fn) =>
-                        this.#applyBatch((batch) => {
-                          if (
-                            frame.rowCount > 0 ||
-                            (clearFirst &&
-                              this.#scopedRowsExist(table, effective))
-                          ) {
-                            batch.table(table.name);
-                          }
-                          const result = fn();
-                          this.#replayOutbox();
-                          return result;
-                        }),
-                    },
+                      frame.rowCount > 0,
+                      resetEpoch,
+                    ),
                   ),
                 section.fresh && !section.cleared,
               );
             } else {
               const segment = decodeRowsSegment(bytes);
+              if (frame.type === 'SEGMENT_INLINE') {
+                this.#progress.update({
+                  phase: 'import',
+                  subscriptionId: section.sub.id,
+                  table: section.sub.table,
+                  segmentId: undefined,
+                  bytesReceived: bytes.byteLength,
+                  bytesTotal: bytes.byteLength,
+                  rowsProcessed: 0,
+                  rowsTotal: segment.blocks.reduce(
+                    (n, block) => n + block.length,
+                    0,
+                  ),
+                });
+              }
               await this.#applySegmentOrFail(
                 section,
                 summary,
@@ -4357,31 +4352,19 @@ export class SyncClient {
                     this.#schema,
                     table,
                     segment,
-                    {
+                    this.#segmentApplyOptions(
+                      table,
                       clearFirst,
-                      isCurrent: () => this.#localResetEpoch === resetEpoch,
-                      onProgress: (rowsProcessed) =>
-                        this.#progress.update({ rowsProcessed }),
                       effective,
-                      transaction: (fn) =>
-                        this.#applyBatch((batch) => {
-                          if (
-                            segment.blocks.some((block) => block.length > 0) ||
-                            (clearFirst &&
-                              this.#scopedRowsExist(table, effective))
-                          ) {
-                            batch.table(table.name);
-                          }
-                          const result = fn();
-                          this.#replayOutbox();
-                          return result;
-                        }),
-                    },
+                      segment.blocks.some((block) => block.length > 0),
+                      resetEpoch,
+                    ),
                     this.#encryption,
                   ),
                 section.fresh &&
                   !section.cleared &&
-                  frame.rowCursor === undefined,
+                  (frame.type === 'SEGMENT_INLINE' ||
+                    frame.rowCursor === undefined),
               );
             }
             break;
@@ -4427,13 +4410,7 @@ export class SyncClient {
         if (errorFrame !== undefined) break;
       }
     } finally {
-      try {
-        // §7.1: local reads see outbox state applied optimistically — replay
-        // the still-pending commits on top of the freshly applied server state.
-        this.#replayOutbox();
-      } finally {
-        this.#endDiagnosticsDeferral();
-      }
+      this.#endDiagnosticsDeferral();
     }
 
     if (errorFrame !== undefined) throw errorFrame;
@@ -4587,6 +4564,15 @@ export class SyncClient {
           listOutboxBeforeImages(this.#db, commit.clientCommitId),
         );
       this.#rollbackFailedCommit(commit, batch);
+      this.#replayOutbox(
+        commit.operations.map((operation) =>
+          JSON.stringify(
+            hasUniqueIndex(this.#table(operation.table))
+              ? [operation.table]
+              : [operation.table, operation.rowId],
+          ),
+        ),
+      );
     });
     batch.status();
     summary.rejected.push(frame.clientCommitId);
@@ -4596,7 +4582,7 @@ export class SyncClient {
   #outboxCommitExists(clientCommitId: string): boolean {
     return (
       this.#db.query(
-        'SELECT 1 FROM _syncular_outbox WHERE client_commit_id=? LIMIT 1',
+        `SELECT 1 FROM ${OUTBOX_TABLE} WHERE client_commit_id=? LIMIT 1`,
         [clientCommitId],
       ).length > 0
     );
@@ -4650,7 +4636,7 @@ export class SyncClient {
         this.#applyBatch((batch) => {
           this.#recordCommitChanges(batch, frame);
           const result = fn();
-          this.#replayOutbox(result);
+          this.#replayOutbox(result, false);
           return result;
         }),
     );
@@ -4712,6 +4698,33 @@ export class SyncClient {
     );
   }
 
+  /** Shared transaction, reset fence and progress for both segment formats. */
+  #segmentApplyOptions(
+    table: CompiledClientTable,
+    clearFirst: boolean,
+    effective: ScopeMap,
+    hasRows: boolean,
+    resetEpoch: number,
+  ): Parameters<typeof applyRowsSegment>[4] {
+    return {
+      clearFirst,
+      effective,
+      isCurrent: () => this.#localResetEpoch === resetEpoch,
+      onProgress: (rowsProcessed) => this.#progress.update({ rowsProcessed }),
+      transaction: (fn) =>
+        this.#applyBatch((batch) => {
+          if (
+            hasRows ||
+            (clearFirst && this.#scopedRowsExist(table, effective))
+          )
+            batch.table(table.name);
+          const result = fn();
+          this.#replayOutbox(result, false);
+          return result;
+        }),
+    };
+  }
+
   /**
    * Apply a segment (rows or sqlite image); a §5.6/§3.3 fail-closed error
    * (no local scope-column mapping) marks the subscription `failed` and
@@ -4890,14 +4903,17 @@ export class SyncClient {
               }),
             );
           if (covered.length) {
-            restoreFailedBases(this.#db, this.#schema);
+            const scope = covered.map((row) =>
+              JSON.stringify([sub.table, String(row.id)]),
+            );
+            restoreFailedBases(this.#db, this.#schema, scope);
             for (const row of covered)
               this.#db.exec(
                 `DELETE FROM ${RETAINED_ROWS} WHERE tbl=? AND id=? AND commit_seq<=?`,
                 [sub.table, String(row.id), nextCursor],
               );
             batch.table(sub.table);
-            this.#replayOutbox();
+            this.#replayOutbox(scope, false);
           }
         }
         if (completed && registered !== undefined) {
@@ -4947,13 +4963,15 @@ export class SyncClient {
         Object.keys(lastEffective).length > 0
       ) {
         try {
-          restoreFailedBases(this.#db, this.#schema);
-          this.#dropRetainedRows(
-            batch,
-            (name, values) =>
-              name === table.name &&
-              matchesLocalScopes(table, lastEffective, values),
-          );
+          const scope = [
+            JSON.stringify([table.name]),
+            ...this.#dropRetainedRows(
+              batch,
+              (name, values) =>
+                name === table.name &&
+                matchesLocalScopes(table, lastEffective, values),
+            ),
+          ];
           deleteScopedRows(this.#db, table, lastEffective);
           batch.scopeMap(table, lastEffective);
           const pendingById = new Map(
@@ -4999,6 +5017,7 @@ export class SyncClient {
             batch.rejections();
             batch.outcomes();
           }
+          this.#replayOutbox(scope);
           this.#deleteUnreferencedBlobs();
         } catch (error) {
           if (
@@ -5219,7 +5238,7 @@ export class SyncClient {
           : (local[SYNC_VERSION_COLUMN] as number);
       if (
         replay &&
-        table.indexes.some((index) => index.unique) &&
+        hasUniqueIndex(table) &&
         uniqueConflicts(
           this.#db,
           table,
@@ -5247,8 +5266,9 @@ export class SyncClient {
       table: string,
       values: Readonly<Record<string, JsonRowValue>>,
     ) => boolean,
-  ): void {
-    for (const commit of dropFailedRows(this.#db, matches)) {
+  ): string[] {
+    const scope: string[] = [];
+    for (const commit of dropFailedRows(this.#db, this.#schema, matches)) {
       batch.conflicts();
       batch.rejections();
       batch.outcomes();
@@ -5258,32 +5278,39 @@ export class SyncClient {
       this.#rejections = this.#rejections.filter(
         (record) => record.clientCommitId !== commit.clientCommitId,
       );
-      for (const op of commit.operations) batch.table(op.table);
+      for (const op of commit.operations) {
+        batch.table(op.table);
+        scope.push(JSON.stringify([op.table, op.rowId]));
+      }
     }
+    return scope;
   }
 
-  #replayOutbox(rowKeys?: readonly string[]): void {
-    const acknowledged = failedOverlayCommits(this.#db, true, rowKeys);
-    const pending = [
-      ...failedOverlayCommits(this.#db, false, rowKeys),
-      ...listOutbox(this.#db, rowKeys),
-    ].sort((a, b) => a.createdAtMs - b.createdAtMs || a.seq - b.seq);
-    if (pending.length === 0 && acknowledged.length === 0) return;
+  #replayOutbox(scope?: OverlayScope, restoreBases = true): void {
+    if (scope?.length === 0) return;
     this.#applyBatch((batch) => {
-      this.#db.transaction(() => {
-        restoreFailedBases(this.#db, this.#schema, false, rowKeys);
-        restoreFailedBases(this.#db, this.#schema, true, rowKeys);
-        for (const commit of [...acknowledged, ...pending])
-          this.#applyOperationsLocally(
-            rowKeys === undefined
-              ? commit.operations
-              : commit.operations.filter((op) =>
-                  rowKeys.includes(JSON.stringify([op.table, op.rowId])),
-                ),
-            batch,
-            true,
-          );
-      });
+      if (restoreBases) restoreFailedBases(this.#db, this.#schema, scope);
+      const acknowledged = failedOverlayCommits(
+        this.#db,
+        true,
+        scope,
+        this.#schema,
+      );
+      const pending = [
+        ...failedOverlayCommits(this.#db, false, scope, this.#schema),
+        ...listOutbox(this.#db, scope),
+      ].sort((a, b) => a.createdAtMs - b.createdAtMs || a.seq - b.seq);
+      for (const commit of [...acknowledged, ...pending])
+        this.#applyOperationsLocally(
+          commit.operations.filter(
+            (op) =>
+              scope === undefined ||
+              scope.includes(JSON.stringify([op.table, op.rowId])) ||
+              scope.includes(JSON.stringify([op.table])),
+          ),
+          batch,
+          true,
+        );
     });
   }