@korajs/sync 1.0.0-beta.1 → 1.0.0-beta.11

package/dist/index.cjs

@@ -41,6 +41,7 @@ __export(index_exports, {
   InvalidScopeError: () => InvalidScopeError,
   JsonMessageSerializer: () => JsonMessageSerializer,
   KeyDerivationError: () => KeyDerivationError,
+  MemoryRejectedOperationStorage: () => MemoryRejectedOperationStorage,
   NegotiatedMessageSerializer: () => NegotiatedMessageSerializer,
   OFFLINE_SYNC_STATUS: () => OFFLINE_SYNC_STATUS,
   OutboundQueue: () => OutboundQueue,
@@ -79,11 +80,13 @@ __export(index_exports, {
   isHandshakeMessage: () => isHandshakeMessage,
   isHandshakeResponseMessage: () => isHandshakeResponseMessage,
   isOperationBatchMessage: () => isOperationBatchMessage,
+  isOperationRejectedMessage: () => isOperationRejectedMessage,
   isSchemaMismatchReject: () => isSchemaMismatchReject,
   isSyncMessage: () => isSyncMessage,
   isYjsDocUpdateMessage: () => isYjsDocUpdateMessage,
   operationMatchesQuerySubsets: () => operationMatchesQuerySubsets,
   operationMatchesScope: () => operationMatchesScope,
+  querySubsetContains: () => querySubsetContains,
   richtextDocKey: () => richtextDocKey,
   sliceOperationsAfterCursor: () => sliceOperationsAfterCursor,
   subscribeRemoteAwarenessStates: () => subscribeRemoteAwarenessStates,
@@ -104,13 +107,29 @@ var SYNC_STATES = [
 ];
 var SYNC_STATUSES = [
   "connected",
+  "reconnecting",
   "syncing",
   "synced",
   "offline",
   "clock-error",
   "error",
-  "schema-mismatch"
+  "schema-mismatch",
+  "auth-required"
 ];
+var MemoryRejectedOperationStorage = class {
+  rejected = /* @__PURE__ */ new Map();
+  async record(rejected) {
+    this.rejected.set(rejected.operationId, rejected);
+  }
+  async list() {
+    return [...this.rejected.values()];
+  }
+  async remove(operationIds) {
+    for (const id of operationIds) {
+      this.rejected.delete(id);
+    }
+  }
+};
 var ScopeViolationError = class extends import_core.KoraError {
   constructor(operationId, collection, scope, message) {
     super(
@@ -143,12 +162,19 @@ function operationMatchesScope(op, scopeMap, fullRecord) {
   const snapshot = buildSnapshot(op, fullRecord ?? void 0);
   if (!snapshot) return false;
   for (const [field, expected] of Object.entries(collectionScope)) {
-    if (snapshot[field] !== expected) {
+    if (!matchesPredicate(snapshot[field], expected)) {
       return false;
     }
   }
   return true;
 }
+function matchesPredicate(actual, expected) {
+  if (expected && typeof expected === "object" && !Array.isArray(expected) && "$in" in expected) {
+    const values = expected.$in;
+    return Array.isArray(values) && values.some((value) => Object.is(actual, value));
+  }
+  return Object.is(actual, expected);
+}
 function filterOperationsByScope(operations, scopeMap) {
   if (!scopeMap) return operations;
   return operations.filter((op) => operationMatchesScope(op, scopeMap));
@@ -205,24 +231,77 @@ function operationMatchesQuerySubsets(op, subsets, fullRecord) {
   if (collectionSubsets.length === 0) {
     return true;
   }
+  if (collectionSubsets.some((subset) => Object.keys(subset.where).length === 0)) {
+    return true;
+  }
   const snapshot = buildSnapshot2(op, fullRecord);
   if (!snapshot) {
     return false;
   }
   return collectionSubsets.some((subset) => recordMatchesWhere(snapshot, subset.where));
 }
+function stableValue(value) {
+  if (Array.isArray(value)) return value.map(stableValue);
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).filter(([, entry]) => entry !== void 0).sort(([a], [b]) => a.localeCompare(b)).map(([key, entry]) => [key, stableValue(entry)])
+    );
+  }
+  return value;
+}
+function whereContains(broad, narrow) {
+  return Object.entries(broad).every(
+    ([field, expected]) => JSON.stringify(stableValue(narrow[field])) === JSON.stringify(stableValue(expected))
+  );
+}
 function dedupeQuerySubsets(subsets) {
-  const seen = /* @__PURE__ */ new Set();
+  const normalized = subsets.map((subset) => ({
+    collection: subset.collection,
+    where: stableValue(subset.where)
+  }));
   const result = [];
-  for (const subset of subsets) {
-    const key = `${subset.collection}:${JSON.stringify(subset.where)}`;
-    if (seen.has(key)) {
+  for (const candidate of normalized) {
+    if (normalized.some(
+      (other) => other !== candidate && other.collection === candidate.collection && whereContains(other.where, candidate.where) && (Object.keys(other.where).length < Object.keys(candidate.where).length || JSON.stringify(other.where) === JSON.stringify(candidate.where))
+    )) {
+      const duplicateAlreadyKept = result.some(
+        (item) => item.collection === candidate.collection && JSON.stringify(item.where) === JSON.stringify(candidate.where)
+      );
+      if (duplicateAlreadyKept || normalized.some(
+        (other) => other !== candidate && other.collection === candidate.collection && Object.keys(other.where).length < Object.keys(candidate.where).length && whereContains(other.where, candidate.where)
+      ))
+        continue;
+    }
+    if (!result.some(
+      (item) => item.collection === candidate.collection && JSON.stringify(item.where) === JSON.stringify(candidate.where)
+    ))
+      result.push(candidate);
+  }
+  return result.sort(
+    (a, b) => `${a.collection}:${JSON.stringify(a.where)}`.localeCompare(
+      `${b.collection}:${JSON.stringify(b.where)}`
+    )
+  );
+}
+function querySubsetContains(broad, narrow) {
+  const collections = /* @__PURE__ */ new Set([
+    ...broad.map((subset) => subset.collection),
+    ...narrow.map((subset) => subset.collection)
+  ]);
+  for (const collection of collections) {
+    const broadForCollection = broad.filter((subset) => subset.collection === collection);
+    const narrowForCollection = narrow.filter((subset) => subset.collection === collection);
+    if (narrowForCollection.length === 0) {
+      if (broadForCollection.length > 0) return false;
       continue;
     }
-    seen.add(key);
-    result.push(subset);
+    if (broadForCollection.length === 0) continue;
+    if (!narrowForCollection.every(
+      (candidate) => broadForCollection.some((other) => whereContains(other.where, candidate.where))
+    ))
+      return false;
   }
-  return result;
+  return true;
 }
 
 // src/delta/delta-cursor.ts
@@ -308,6 +387,8 @@ function isSyncMessage(value) {
       return isAcknowledgmentMessage(value);
     case "error":
       return isErrorMessage(value);
+    case "operation-rejected":
+      return isOperationRejectedMessage(value);
     case "awareness-update":
       return isAwarenessUpdateMessage(value);
     case "yjs-doc-update":
@@ -347,6 +428,11 @@ function isErrorMessage(value) {
   const msg = value;
   return msg.type === "error" && typeof msg.messageId === "string" && typeof msg.code === "string" && typeof msg.message === "string" && typeof msg.retriable === "boolean";
 }
+function isOperationRejectedMessage(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const msg = value;
+  return msg.type === "operation-rejected" && typeof msg.messageId === "string" && typeof msg.operationId === "string" && typeof msg.collection === "string" && typeof msg.recordId === "string" && typeof msg.code === "string" && typeof msg.message === "string" && typeof msg.retriable === "boolean";
+}
 function isAwarenessUpdateMessage(value) {
   if (typeof value !== "object" || value === null) return false;
   const msg = value;
@@ -597,7 +683,8 @@ function toProtoEnvelope(message) {
         })),
         schemaVersion: message.schemaVersion,
         authToken: message.authToken,
-        supportedWireFormats: message.supportedWireFormats
+        supportedWireFormats: message.supportedWireFormats,
+        ...message.lastDeliverySequence !== void 0 ? { lastDeliverySequence: message.lastDeliverySequence } : {}
       };
     case "handshake-response":
       return {
@@ -613,7 +700,8 @@ function toProtoEnvelope(message) {
         rejectReason: message.rejectReason,
         selectedWireFormat: message.selectedWireFormat,
         serverTime: message.serverTime,
-        blobStorageEnabled: message.blobStorageEnabled
+        blobStorageEnabled: message.blobStorageEnabled,
+        ...message.serverMaxDeliverySequence !== void 0 ? { serverMaxDeliverySequence: message.serverMaxDeliverySequence } : {}
       };
     case "operation-batch":
       return {
@@ -621,14 +709,17 @@ function toProtoEnvelope(message) {
         messageId: message.messageId,
         operations: message.operations.map(serializeProtoOperation),
         isFinal: message.isFinal,
-        batchIndex: message.batchIndex
+        batchIndex: message.batchIndex,
+        ...message.baseDeliverySequence !== void 0 ? { baseDeliverySequence: message.baseDeliverySequence } : {},
+        ...message.maxDeliverySequence !== void 0 ? { maxDeliverySequence: message.maxDeliverySequence } : {}
       };
     case "acknowledgment":
       return {
         type: message.type,
         messageId: message.messageId,
         acknowledgedMessageId: message.acknowledgedMessageId,
-        lastSequenceNumber: message.lastSequenceNumber
+        lastSequenceNumber: message.lastSequenceNumber,
+        ...message.deliverySequence !== void 0 ? { deliverySequence: message.deliverySequence } : {}
       };
     case "error":
       return {
@@ -638,6 +729,17 @@ function toProtoEnvelope(message) {
         errorMessage: message.message,
         retriable: message.retriable
       };
+    case "operation-rejected":
+      return {
+        type: message.type,
+        messageId: message.messageId,
+        operationId: message.operationId,
+        collection: message.collection,
+        recordId: message.recordId,
+        errorCode: message.code,
+        errorMessage: message.message,
+        retriable: message.retriable
+      };
     case "awareness-update":
     case "yjs-doc-update":
       return {
@@ -682,7 +784,8 @@ function fromProtoEnvelope(envelope) {
         authToken: envelope.authToken,
         supportedWireFormats: envelope.supportedWireFormats?.filter(
           (format) => format === "json" || format === "protobuf"
-        )
+        ),
+        ...envelope.lastDeliverySequence !== void 0 ? { lastDeliverySequence: envelope.lastDeliverySequence } : {}
       };
     case "handshake-response":
       return {
@@ -699,7 +802,8 @@ function fromProtoEnvelope(envelope) {
         // Preserve the server's wall-clock time so clock-skew detection and
         // automatic timestamp rebase work over the protobuf wire, not just JSON.
         ...envelope.serverTime !== void 0 ? { serverTime: envelope.serverTime } : {},
-        ...envelope.blobStorageEnabled !== void 0 ? { blobStorageEnabled: envelope.blobStorageEnabled } : {}
+        ...envelope.blobStorageEnabled !== void 0 ? { blobStorageEnabled: envelope.blobStorageEnabled } : {},
+        ...envelope.serverMaxDeliverySequence !== void 0 ? { serverMaxDeliverySequence: envelope.serverMaxDeliverySequence } : {}
       };
     case "operation-batch":
       return {
@@ -707,14 +811,17 @@ function fromProtoEnvelope(envelope) {
         messageId: envelope.messageId,
         operations: (envelope.operations ?? []).map(deserializeProtoOperation),
         isFinal: envelope.isFinal ?? false,
-        batchIndex: envelope.batchIndex ?? 0
+        batchIndex: envelope.batchIndex ?? 0,
+        ...envelope.baseDeliverySequence !== void 0 ? { baseDeliverySequence: envelope.baseDeliverySequence } : {},
+        ...envelope.maxDeliverySequence !== void 0 ? { maxDeliverySequence: envelope.maxDeliverySequence } : {}
       };
     case "acknowledgment":
       return {
         type: "acknowledgment",
         messageId: envelope.messageId,
         acknowledgedMessageId: envelope.acknowledgedMessageId ?? "",
-        lastSequenceNumber: envelope.lastSequenceNumber ?? 0
+        lastSequenceNumber: envelope.lastSequenceNumber ?? 0,
+        ...envelope.deliverySequence !== void 0 ? { deliverySequence: envelope.deliverySequence } : {}
       };
     case "error":
       return {
@@ -724,6 +831,17 @@ function fromProtoEnvelope(envelope) {
         message: envelope.errorMessage ?? "Unknown error",
         retriable: envelope.retriable ?? false
       };
+    case "operation-rejected":
+      return {
+        type: "operation-rejected",
+        messageId: envelope.messageId,
+        operationId: envelope.operationId ?? "",
+        collection: envelope.collection ?? "",
+        recordId: envelope.recordId ?? "",
+        code: envelope.errorCode ?? "REJECTED",
+        message: envelope.errorMessage ?? "",
+        retriable: envelope.retriable ?? false
+      };
     case "blob-chunk-request":
       return {
         type: "blob-chunk-request",
@@ -898,6 +1016,21 @@ function encodeEnvelope(envelope) {
   if (envelope.hasBytes !== void 0) writer.uint32(184).bool(envelope.hasBytes);
   if (envelope.blobStorageEnabled !== void 0)
     writer.uint32(200).bool(envelope.blobStorageEnabled);
+  if (envelope.operationId && envelope.operationId.length > 0)
+    writer.uint32(210).string(envelope.operationId);
+  if (envelope.collection && envelope.collection.length > 0)
+    writer.uint32(218).string(envelope.collection);
+  if (envelope.recordId && envelope.recordId.length > 0)
+    writer.uint32(226).string(envelope.recordId);
+  if (envelope.lastDeliverySequence !== void 0)
+    writer.uint32(232).int64(envelope.lastDeliverySequence);
+  if (envelope.baseDeliverySequence !== void 0)
+    writer.uint32(240).int64(envelope.baseDeliverySequence);
+  if (envelope.maxDeliverySequence !== void 0)
+    writer.uint32(248).int64(envelope.maxDeliverySequence);
+  if (envelope.deliverySequence !== void 0) writer.uint32(256).int64(envelope.deliverySequence);
+  if (envelope.serverMaxDeliverySequence !== void 0)
+    writer.uint32(264).int64(envelope.serverMaxDeliverySequence);
   return writer.finish();
 }
 function decodeEnvelope(bytes) {
@@ -984,6 +1117,30 @@ function decodeEnvelope(bytes) {
       case 25:
         envelope.blobStorageEnabled = reader.bool();
         break;
+      case 26:
+        envelope.operationId = reader.string();
+        break;
+      case 27:
+        envelope.collection = reader.string();
+        break;
+      case 28:
+        envelope.recordId = reader.string();
+        break;
+      case 29:
+        envelope.lastDeliverySequence = longToNumber(reader.int64());
+        break;
+      case 30:
+        envelope.baseDeliverySequence = longToNumber(reader.int64());
+        break;
+      case 31:
+        envelope.maxDeliverySequence = longToNumber(reader.int64());
+        break;
+      case 32:
+        envelope.deliverySequence = longToNumber(reader.int64());
+        break;
+      case 33:
+        envelope.serverMaxDeliverySequence = longToNumber(reader.int64());
+        break;
       default:
         reader.skipType(tag & 7);
     }
@@ -1483,6 +1640,7 @@ var ChaosTransport = class {
   reorderRate;
   maxLatency;
   random;
+  dropPredicate;
   messageHandler = null;
   reorderBuffer = [];
   pending = [];
@@ -1493,6 +1651,7 @@ var ChaosTransport = class {
     this.reorderRate = config?.reorderRate ?? 0;
     this.maxLatency = config?.maxLatency ?? 0;
     this.random = config?.randomSource ?? Math.random;
+    this.dropPredicate = config?.dropPredicate ?? null;
   }
   async connect(url, options) {
     this.inner.onMessage((msg) => this.handleIncoming(msg));
@@ -1511,6 +1670,9 @@ var ChaosTransport = class {
     return this.inner.disconnect();
   }
   send(message) {
+    if (this.dropPredicate?.(message, "outgoing")) {
+      return;
+    }
     if (this.random() < this.dropRate) {
       return;
     }
@@ -1538,6 +1700,9 @@ var ChaosTransport = class {
   }
   handleIncoming(message) {
     if (!this.messageHandler) return;
+    if (this.dropPredicate?.(message, "incoming")) {
+      return;
+    }
     if (this.random() < this.dropRate) {
       return;
     }
@@ -2502,6 +2667,32 @@ var OutboundQueue = class {
     const ids = ops.map((op) => op.id);
     await this.storage.dequeue(ids);
   }
+  /**
+   * Acknowledge only operations in an in-flight batch whose local sequence number is
+   * covered by the server's ack. Any later operations return to the front of the
+   * queue for retry. This is required when the server accepts a prefix but rejects a
+   * later operation retriably (for example a stale-scope push after auth changed).
+   */
+  async acknowledgeThrough(batchId, lastSequenceNumber) {
+    const ops = this.inFlight.get(batchId);
+    if (!ops) return;
+    this.inFlight.delete(batchId);
+    const acknowledged = ops.filter((op) => op.sequenceNumber <= lastSequenceNumber);
+    const retry = ops.filter((op) => op.sequenceNumber > lastSequenceNumber);
+    if (retry.length > 0) {
+      this.queue.unshift(...retry);
+      if (this.queue.length > 1) {
+        this.queue = (0, import_internal.topologicalSort)(this.queue);
+      }
+    }
+    if (acknowledged.length > 0) {
+      const ids = acknowledged.map((op) => op.id);
+      for (const id of ids) {
+        this.seen.delete(id);
+      }
+      await this.storage.dequeue(ids);
+    }
+  }
   /**
    * Return a failed batch to the front of the queue for retry.
    * Prepends the operations to maintain priority.
@@ -2584,6 +2775,37 @@ var OutboundQueue = class {
   get isInitialized() {
     return this.initialized;
   }
+  /**
+   * Remove a single operation the server permanently rejected — from the queue,
+   * from any in-flight batch, and from durable storage — so a later batch ack or
+   * a reconnect `returnBatch` can never resend or resurrect it. Returns the
+   * removed operation so the caller can record it in a durable rejected store,
+   * or null if it was not present (already acknowledged and removed).
+   */
+  async reject(opId) {
+    let removed = null;
+    for (const [batchId, ops] of this.inFlight) {
+      const idx = ops.findIndex((op) => op.id === opId);
+      if (idx !== -1) {
+        removed = ops[idx] ?? null;
+        ops.splice(idx, 1);
+        if (ops.length === 0) {
+          this.inFlight.delete(batchId);
+        }
+        break;
+      }
+    }
+    if (!removed) {
+      const idx = this.queue.findIndex((op) => op.id === opId);
+      if (idx !== -1) {
+        removed = this.queue[idx] ?? null;
+        this.queue.splice(idx, 1);
+      }
+    }
+    this.seen.delete(opId);
+    await this.storage.dequeue([opId]);
+    return removed;
+  }
   /**
    * Remove operations by id from queue and persistent storage.
    * Used when ops were already sent during handshake delta exchange.
@@ -2602,6 +2824,7 @@ var OutboundQueue = class {
 // src/engine/sync-engine.ts
 var DEFAULT_BATCH_SIZE = 100;
 var DEFAULT_SCHEMA_VERSION = 1;
+var DEFAULT_OUTBOUND_ACK_TIMEOUT_MS = 3e4;
 var VALID_TRANSITIONS = {
   disconnected: ["connecting"],
   connecting: ["handshaking", "error", "disconnected"],
@@ -2615,6 +2838,17 @@ var nextQuerySubsetId = 0;
 function generateMessageId() {
   return `msg-${Date.now()}-${nextMessageId++}`;
 }
+var MAX_DELIVERY_VIEW_WATERMARKS = 64;
+function stableStringify(value) {
+  if (value === null || typeof value !== "object") {
+    return JSON.stringify(value) ?? "null";
+  }
+  if (Array.isArray(value)) {
+    return `[${value.map(stableStringify).join(",")}]`;
+  }
+  const entries = Object.entries(value).filter(([, v]) => v !== void 0).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([k, v]) => `${JSON.stringify(k)}:${stableStringify(v)}`);
+  return `{${entries.join(",")}}`;
+}
 var SyncEngine = class {
   state = "disconnected";
   transport;
@@ -2623,7 +2857,9 @@ var SyncEngine = class {
   serializer;
   emitter;
   outboundQueue;
+  rejectedStorage;
   batchSize;
+  outboundAckTimeoutMs;
   encryptor;
   awarenessManager;
   richtextDocChannel;
@@ -2638,11 +2874,21 @@ var SyncEngine = class {
   lastSuccessfulPull = null;
   conflictCount = 0;
   currentBatch = null;
+  currentBatchRequiresPartialAck = false;
   reconnecting = false;
   schemaBlocked = false;
   clockBlocked = false;
   clockSkewMs = null;
   blobStorageEnabled = false;
+  suspensionReason = null;
+  authRejected = false;
+  serverFrontier = null;
+  hasInFlightDeliveryBatch = false;
+  blockedFailure = null;
+  outboundAckTimer = null;
+  startPromise = null;
+  stopPromise = null;
+  reconnectPromise = null;
   // Track delta exchange state
   deltaBatchesReceived = 0;
   deltaReceiveComplete = false;
@@ -2659,10 +2905,32 @@ var SyncEngine = class {
   activeScope;
   /** Live query subsets registered from reactive subscriptions */
   querySubsets = /* @__PURE__ */ new Map();
+  staticQuerySubsets = [];
   querySubsetReconnectTimer = null;
   /** Resume cursor for paginated initial sync (persisted across reconnects) */
   resumeDeltaCursor = null;
   initialSyncTotalBatches = 0;
+  /**
+   * The delivery watermark for the CURRENT sync view: the highest server delivery
+   * sequence up to which every operation in the current view (scope + active query
+   * subscriptions) has been contiguously applied. Advanced only through the server's
+   * gap-free delivery stream (never through live relay), so it is a durable lower bound
+   * on what this client holds for this view. Reported at handshake to resume the stream.
+   *
+   * The watermark is keyed by view: switching views (a scope or subscription change)
+   * saves the current view's watermark and loads the target view's, so returning to a
+   * previously-synced view resumes exactly where it left off instead of re-syncing. This
+   * is correct because a view's watermark is a lower bound specific to that view's
+   * filter; a widened view is simply a different (initially unsynced) view.
+   */
+  deliveryWatermark = 0;
+  /**
+   * In-memory cache of watermark per view signature, preloaded from persistence at start
+   * so a view switch resolves synchronously (no race with the reconnect it triggers).
+   */
+  deliverySignatureWatermarks = /* @__PURE__ */ new Map();
+  deliveryGapRepeatCount = 0;
+  lastDeliveryGapKey = null;
   constructor(options) {
     this.transport = options.transport;
     this.store = options.store;
@@ -2670,11 +2938,13 @@ var SyncEngine = class {
     this.serializer = options.serializer ?? new NegotiatedMessageSerializer("json");
     this.emitter = options.emitter ?? null;
     this.batchSize = options.config.batchSize ?? DEFAULT_BATCH_SIZE;
+    this.outboundAckTimeoutMs = options.config.outboundAckTimeoutMs ?? DEFAULT_OUTBOUND_ACK_TIMEOUT_MS;
     this.encryptor = options.encryptor ?? null;
     this.syncState = options.syncState ?? null;
     this.activeScope = options.config.scopeMap;
     const queueStorage = options.queueStorage ?? new MemoryQueueStorage();
     this.outboundQueue = new OutboundQueue(queueStorage);
+    this.rejectedStorage = options.rejectedStorage ?? new MemoryRejectedOperationStorage();
     this.metricsCollector = new SyncMetricsCollector(options.metricsConfig);
     if (this.emitter) {
       this.metricsCollector.attachEmitter(this.emitter);
@@ -2714,17 +2984,53 @@ var SyncEngine = class {
    * Start the sync engine: connect → handshake → delta exchange → streaming.
    */
   async start() {
+    if (this.state === "streaming") return;
+    if (this.startPromise) return this.startPromise;
+    this.startPromise = this.startInternal().finally(() => {
+      this.startPromise = null;
+    });
+    return this.startPromise;
+  }
+  async startInternal() {
+    if (this.stopPromise) {
+      await this.stopPromise;
+    }
+    if (this.state === "streaming") return;
     if (this.state !== "disconnected") {
-      throw new import_core7.SyncError("Cannot start sync engine: not in disconnected state", {
-        currentState: this.state
+      await this.stop();
+    }
+    if (this.authRejected) {
+      this.emitter?.emit({
+        type: "sync:suspended",
+        reason: this.suspensionReason ?? "auth-rejected"
       });
+      return;
     }
+    if (this.config.authState) {
+      const authState = await this.config.authState();
+      if (authState.state === "loading" || authState.state === "signed-out") {
+        this.suspensionReason = authState.state === "loading" ? "auth-loading" : "auth-required";
+        this.emitter?.emit({ type: "sync:suspended", reason: this.suspensionReason });
+        return;
+      }
+    }
+    this.suspensionReason = null;
     await this.outboundQueue.initialize();
     if (this.syncState) {
       this.lastAckedServerVector = await this.syncState.loadLastAckedServerVector();
       if (this.syncState.loadDeltaCursor) {
         this.resumeDeltaCursor = await this.syncState.loadDeltaCursor();
       }
+      if (this.syncState.loadAllDeliveryWatermarks) {
+        const all = await this.syncState.loadAllDeliveryWatermarks();
+        for (const [signature, watermark] of Object.entries(all)) {
+          this.deliverySignatureWatermarks.set(signature, watermark);
+        }
+      } else if (this.syncState.loadDeliveryWatermark) {
+        this.deliverySignatureWatermarks.set("", await this.syncState.loadDeliveryWatermark(""));
+      }
+      this.deliveryWatermark = this.deliverySignatureWatermarks.get(this.deliverySignature()) ?? 0;
+      this.evictColdViewWatermarks();
     }
     await this.reconcileOutboundFromOpLog();
     await this.refreshPendingCount();
@@ -2740,7 +3046,12 @@ var SyncEngine = class {
     this.transitionTo("connecting");
     try {
       const authToken = this.config.auth ? (await this.config.auth()).token : void 0;
+      if (this.state !== "connecting") return;
       await this.transport.connect(this.config.url, { authToken });
+      if (this.state !== "connecting") {
+        await this.transport.disconnect();
+        return;
+      }
       this.transitionTo("handshaking");
       const localVector = this.store.getVersionVector();
       const activeQuerySubsets = this.getActiveQuerySubsets();
@@ -2754,7 +3065,11 @@ var SyncEngine = class {
         supportedWireFormats: ["json", "protobuf"],
         ...this.config.scopeMap ? { syncScope: this.config.scopeMap } : {},
         ...activeQuerySubsets.length > 0 ? { syncQueries: activeQuerySubsets } : {},
-        ...this.resumeDeltaCursor ? { deltaCursor: encodeDeltaCursor(this.resumeDeltaCursor) } : {}
+        ...this.resumeDeltaCursor ? { deltaCursor: encodeDeltaCursor(this.resumeDeltaCursor) } : {},
+        // Resume the server's gap-free delivery stream from our watermark. A server
+        // that understands it drives server->client sync from delivery sequences; an
+        // older server ignores it and falls back to the version-vector delta.
+        lastDeliverySequence: this.deliveryWatermark
       };
       this.transport.send(handshake);
     } catch (err) {
@@ -2766,11 +3081,20 @@ var SyncEngine = class {
    * Stop the sync engine. Disconnects the transport.
    */
   async stop() {
+    if (this.stopPromise) return this.stopPromise;
+    this.stopPromise = this.stopInternal().finally(() => {
+      this.stopPromise = null;
+    });
+    return this.stopPromise;
+  }
+  async stopInternal() {
     if (this.state === "disconnected") return;
+    this.clearOutboundAckTimer();
     this.awarenessManager.stopCleanupTimer();
     if (this.currentBatch) {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
     }
     try {
       await this.transport.disconnect();
@@ -2791,7 +3115,7 @@ var SyncEngine = class {
    * because they should remain local-only and not be sent to the server.
    */
   async pushOperation(op) {
-    if (!this.operationAllowedForSync(op)) {
+    if (!await this.operationAllowedForSync(op)) {
       return;
     }
     if (this.syncState) {
@@ -2820,13 +3144,30 @@ var SyncEngine = class {
   getStatus() {
     const pendingOperations = this.syncState ? this.cachedUnsyncedCount : this.outboundQueue.totalPending;
     const base = {
+      phase: this.resolvePhase(),
+      ...this.suspensionReason ? { reason: this.suspensionReason } : {},
+      reconnecting: this.reconnecting,
       pendingOperations,
       lastSyncedAt: this.lastSyncedAt,
       lastSuccessfulPush: this.lastSuccessfulPush,
       lastSuccessfulPull: this.lastSuccessfulPull,
       conflicts: this.conflictCount,
-      clockSkewMs: this.clockSkewMs
+      clockSkewMs: this.clockSkewMs,
+      inFlightUploadOperations: this.currentBatch?.operations.length ?? 0,
+      hasInFlightDeliveryBatch: this.hasInFlightDeliveryBatch,
+      activeViewId: this.deliverySignature(),
+      activeViewComplete: this.state === "streaming" && !this.hasInFlightDeliveryBatch && this.blockedFailure === null && (this.serverFrontier === null || this.deliveryWatermark >= this.serverFrontier),
+      initialSync: {
+        complete: this.deltaReceiveComplete && this.deltaSendComplete,
+        receivedBatches: this.deltaBatchesReceived,
+        totalBatches: this.initialSyncTotalBatches || null,
+        progress: this.initialSyncTotalBatches > 0 ? Math.min(1, this.deltaBatchesReceived / this.initialSyncTotalBatches) : null
+      },
+      deliveryWatermark: this.deliveryWatermark,
+      serverFrontier: this.serverFrontier,
+      blockedFailure: this.blockedFailure
     };
+    if (this.suspensionReason) return { ...base, status: "auth-required" };
     switch (this.state) {
       case "disconnected":
         if (this.clockBlocked) {
@@ -2839,7 +3180,7 @@ var SyncEngine = class {
       case "connecting":
       case "handshaking":
       case "syncing":
-        return { ...base, status: this.reconnecting ? "offline" : "syncing" };
+        return { ...base, status: this.reconnecting ? "reconnecting" : "syncing" };
       case "streaming":
         return { ...base, status: pendingOperations > 0 ? "syncing" : "synced" };
       case "error":
@@ -2849,6 +3190,26 @@ var SyncEngine = class {
         return { ...base, status: this.schemaBlocked ? "schema-mismatch" : "error" };
     }
   }
+  resolvePhase() {
+    if (this.suspensionReason) return "suspended";
+    if (this.blockedFailure || this.schemaBlocked || this.clockBlocked) return "blocked";
+    if (this.hasInFlightDeliveryBatch) return "applying";
+    if (this.currentBatch) return "uploading";
+    switch (this.state) {
+      case "disconnected":
+        return "offline";
+      case "connecting":
+        return "connecting";
+      case "handshaking":
+        return "handshaking";
+      case "syncing":
+        return "receiving";
+      case "streaming":
+        return "streaming";
+      case "error":
+        return "blocked";
+    }
+  }
   /**
    * True when the server rejected the client's schema version at handshake.
    * Sync stays blocked until the app schema is upgraded or sync config changes.
@@ -2901,8 +3262,25 @@ var SyncEngine = class {
     await this.refreshPendingCount();
     return this.getStatus().pendingOperations;
   }
-  emitApplyFailure(op, result, overrides) {
+  emitApplyFailure(op, result, overrides, blocking = false) {
     const reason = (0, import_core7.defaultApplyFailureReason)(result, overrides);
+    if (blocking || reason.retriable) {
+      const prior = this.blockedFailure;
+      this.blockedFailure = {
+        operationId: op.id,
+        collection: op.collection,
+        recordId: op.recordId,
+        code: reason.code,
+        message: reason.message,
+        retriable: reason.retriable,
+        firstSeenAt: prior?.operationId === op.id ? prior.firstSeenAt : Date.now(),
+        retryCount: prior?.operationId === op.id ? prior.retryCount + 1 : 0
+      };
+      this.emitter?.emit({
+        type: prior?.operationId === op.id ? "sync:apply-retrying" : "sync:apply-blocked",
+        failure: this.blockedFailure
+      });
+    }
     this.emitter?.emit({
       type: "sync:apply-failed",
       operationId: op.id,
@@ -2919,11 +3297,36 @@ var SyncEngine = class {
    */
   async retryNow() {
     if (this.schemaBlocked) return;
+    this.authRejected = false;
+    this.suspensionReason = null;
     if (this.state === "disconnected" || this.state === "error") {
       this.reconnecting = false;
       await this.start();
     }
   }
+  /** Wake a permanent auth suspension after the binding reports a new auth state. */
+  notifyAuthChanged() {
+    this.authRejected = false;
+    this.suspensionReason = null;
+  }
+  /**
+   * Atomically refresh the transport session. Overlapping callers share one
+   * reconnect, in-flight outbound batches are returned to the queue by stop(), and the
+   * next start handshakes with the latest auth token, sync scope, and query subsets.
+   */
+  async reconnect() {
+    if (this.schemaBlocked) return;
+    if (this.reconnectPromise) return this.reconnectPromise;
+    this.reconnecting = false;
+    this.reconnectPromise = this.reconnectInternal().finally(() => {
+      this.reconnectPromise = null;
+    });
+    return this.reconnectPromise;
+  }
+  async reconnectInternal() {
+    await this.stop();
+    await this.start();
+  }
   /**
    * Export a diagnostics snapshot for debugging and support tickets.
    * Contains connection state, timing info, and queue metrics.
@@ -2942,6 +3345,8 @@ var SyncEngine = class {
       pendingOperations: this.outboundQueue.totalPending,
       hasInFlightBatch: this.currentBatch !== null,
       reconnecting: this.reconnecting,
+      deliveryWatermark: this.deliveryWatermark,
+      deliveryGapRepeatCount: this.deliveryGapRepeatCount,
       timestamp: Date.now()
     };
   }
@@ -2970,8 +3375,84 @@ var SyncEngine = class {
    * @param scopeMap - New per-collection scope filters, or undefined to remove scope
    */
   updateScope(scopeMap) {
+    const previousSignature = this.deliverySignature();
     this.activeScope = scopeMap;
     this.config.scopeMap = scopeMap;
+    this.switchDeliveryView(previousSignature);
+  }
+  /**
+   * A stable identifier for the current sync view: the auth/tenant scope plus the set of
+   * active query subscriptions, canonicalized so the same view always produces the same
+   * string. The delivery watermark is keyed by this, so each distinct view resumes from
+   * its own last position.
+   */
+  deliverySignature() {
+    const subsets = this.getActiveQuerySubsets();
+    if (!this.activeScope && subsets.length === 0) {
+      return "";
+    }
+    const normalizedSubsets = subsets.map((s) => `${s.collection}:${stableStringify(s.where)}`).sort();
+    return stableStringify({ scope: this.activeScope ?? null, subsets: normalizedSubsets });
+  }
+  /**
+   * Switch the active delivery watermark to the current view after a scope or subscription
+   * change. The prior view's watermark is saved so returning to it resumes; the new view's
+   * watermark is restored from the in-memory cache (0 for a never-synced view, which then
+   * does a one-time resync under that view). No data is lost: a view's watermark is a lower
+   * bound for that specific view's filter.
+   */
+  switchDeliveryView(previousSignature) {
+    const nextSignature = this.deliverySignature();
+    if (nextSignature === previousSignature) {
+      return;
+    }
+    this.setViewWatermark(previousSignature, this.deliveryWatermark);
+    void this.persistDeliveryWatermark(this.deliveryWatermark, previousSignature);
+    this.deliveryWatermark = this.deliverySignatureWatermarks.get(nextSignature) ?? 0;
+  }
+  /**
+   * Record a view's watermark in the in-memory cache as the most-recently-used entry (the
+   * Map preserves insertion order, so re-inserting moves it to the tail), then evict cold
+   * views past the retention cap. This is the single place the cache is written, so LRU
+   * order and the size bound are always maintained together.
+   */
+  setViewWatermark(signature, watermark) {
+    this.deliverySignatureWatermarks.delete(signature);
+    this.deliverySignatureWatermarks.set(signature, watermark);
+    this.evictColdViewWatermarks();
+  }
+  /**
+   * Trim the per-view watermark cache to `MAX_DELIVERY_VIEW_WATERMARKS`, evicting the
+   * least-recently-used views. The default view ('') and the live view are never evicted
+   * (evicting the live view would force an immediate re-scan of what we are actively
+   * syncing). Each eviction also removes the persisted row, bounding storage. Safe by
+   * construction: an evicted view simply back-fills from 0 (deduplicated) when next seen.
+   */
+  evictColdViewWatermarks() {
+    if (this.deliverySignatureWatermarks.size <= MAX_DELIVERY_VIEW_WATERMARKS) {
+      return;
+    }
+    const liveSignature = this.deliverySignature();
+    for (const signature of this.deliverySignatureWatermarks.keys()) {
+      if (this.deliverySignatureWatermarks.size <= MAX_DELIVERY_VIEW_WATERMARKS) {
+        break;
+      }
+      if (signature === "" || signature === liveSignature) {
+        continue;
+      }
+      this.deliverySignatureWatermarks.delete(signature);
+      void this.deleteDeliveryWatermark(signature);
+    }
+  }
+  /**
+   * Remove a view's persisted watermark row (best-effort; a persistence layer that omits
+   * the delete simply keeps the row, which is harmless).
+   */
+  async deleteDeliveryWatermark(signature) {
+    if (!this.syncState?.deleteDeliveryWatermark) {
+      return;
+    }
+    await this.syncState.deleteDeliveryWatermark(signature);
   }
   /**
    * Get the currently active scope map. Returns undefined if no scope is configured.
@@ -2984,19 +3465,49 @@ var SyncEngine = class {
    * Takes effect on the next connection; reconnects when already connected.
    */
   registerQuerySubset(subset) {
+    if ((this.config.querySubsets?.mode ?? "reactive") !== "reactive") return () => {
+    };
     const id = `query-${nextQuerySubsetId++}`;
+    const previousSignature = this.deliverySignature();
+    const previousEffective = this.getActiveQuerySubsets();
     this.querySubsets.set(id, subset);
-    this.scheduleQuerySubsetReconnect();
+    this.switchDeliveryViewWithInheritance(previousSignature, previousEffective);
+    if (this.deliverySignature() !== previousSignature) this.scheduleQuerySubsetReconnect();
     return () => {
+      const sigBeforeRemove = this.deliverySignature();
+      const effectiveBeforeRemove = this.getActiveQuerySubsets();
       this.querySubsets.delete(id);
-      this.scheduleQuerySubsetReconnect();
+      this.switchDeliveryViewWithInheritance(sigBeforeRemove, effectiveBeforeRemove);
+      if (this.deliverySignature() !== sigBeforeRemove) this.scheduleQuerySubsetReconnect();
     };
   }
+  switchDeliveryViewWithInheritance(previousSignature, previousSubsets) {
+    const nextSubsets = this.getActiveQuerySubsets();
+    const previousWatermark = this.deliveryWatermark;
+    this.switchDeliveryView(previousSignature);
+    if (this.deliveryWatermark === 0 && querySubsetContains(previousSubsets, nextSubsets)) {
+      this.deliveryWatermark = previousWatermark;
+      this.setViewWatermark(this.deliverySignature(), previousWatermark);
+      void this.persistDeliveryWatermark(previousWatermark);
+    }
+  }
+  /** Atomically replace the manifest used by static query-subset mode. */
+  setQuerySubsets(subsets) {
+    if ((this.config.querySubsets?.mode ?? "reactive") !== "static")
+      throw new Error('setQuerySubsets() requires sync.querySubsets.mode = "static"');
+    const previousSignature = this.deliverySignature();
+    const previousEffective = this.getActiveQuerySubsets();
+    this.staticQuerySubsets = dedupeQuerySubsets(subsets);
+    this.switchDeliveryViewWithInheritance(previousSignature, previousEffective);
+    if (this.deliverySignature() !== previousSignature) this.scheduleQuerySubsetReconnect();
+  }
   /**
    * Returns deduplicated active query subsets from registered subscriptions.
    */
   getActiveQuerySubsets() {
-    return dedupeQuerySubsets([...this.querySubsets.values()]);
+    const mode = this.config.querySubsets?.mode ?? "reactive";
+    if (mode === "disabled") return [];
+    return mode === "static" ? this.staticQuerySubsets : dedupeQuerySubsets([...this.querySubsets.values()]);
   }
   /**
    * Get the awareness manager for collaborative presence.
@@ -3051,11 +3562,14 @@ var SyncEngine = class {
         await this.handleOperationBatch(message);
         break;
       case "acknowledgment":
-        this.handleAcknowledgment(message);
+        await this.handleAcknowledgment(message);
         break;
       case "error":
         this.handleError(message);
         break;
+      case "operation-rejected":
+        await this.handleOperationRejected(message);
+        break;
       case "awareness-update":
         this.handleAwarenessUpdate(message);
         break;
@@ -3070,6 +3584,7 @@ var SyncEngine = class {
     }
   }
   handleMessageFailure(error) {
+    this.hasInFlightDeliveryBatch = false;
     const reason = error instanceof Error ? error.message : "Message handling failed";
     this.handleTransportClose(reason);
   }
@@ -3138,6 +3653,12 @@ var SyncEngine = class {
     }
     this.remoteVector = wireToVersionVector(msg.versionVector);
     void this.persistLastAckedServerVector(this.remoteVector);
+    if (typeof msg.serverMaxDeliverySequence === "number" && this.deliveryWatermark > msg.serverMaxDeliverySequence) {
+      this.deliveryWatermark = 0;
+      this.setViewWatermark(this.deliverySignature(), 0);
+      await this.persistDeliveryWatermark(0);
+    }
+    this.serverFrontier = msg.serverMaxDeliverySequence ?? null;
     if (msg.selectedWireFormat) {
       this.setSerializerWireFormat(msg.selectedWireFormat);
     }
@@ -3203,7 +3724,7 @@ var SyncEngine = class {
   async sendDelta() {
     const localVector = this.store.getVersionVector();
     const allMissingOps = await this.collectDelta(localVector, this.remoteVector);
-    const missingOps = allMissingOps.filter((op) => this.operationAllowedForSync(op));
+    const missingOps = await this.filterAllowedForSync(allMissingOps);
     this.deltaSentOpIds = missingOps.map((op) => op.id);
     if (missingOps.length === 0) {
       const messageId = generateMessageId();
@@ -3278,11 +3799,35 @@ var SyncEngine = class {
     return missing;
   }
   async handleOperationBatch(msg) {
+    const isDeliveryBatch = msg.maxDeliverySequence !== void 0;
+    if (isDeliveryBatch) {
+      const base = msg.baseDeliverySequence ?? 0;
+      if (base > this.deliveryWatermark) {
+        const gapKey = `${this.deliveryWatermark}:${base}`;
+        this.deliveryGapRepeatCount = this.lastDeliveryGapKey === gapKey ? this.deliveryGapRepeatCount + 1 : 1;
+        this.lastDeliveryGapKey = gapKey;
+        this.emitter?.emit({
+          type: "sync:delivery-gap",
+          expectedBase: this.deliveryWatermark,
+          receivedBase: base,
+          currentWatermark: this.deliveryWatermark,
+          messageId: msg.messageId,
+          repeatCount: this.deliveryGapRepeatCount
+        });
+        return;
+      }
+      if (base < this.deliveryWatermark) {
+        this.sendDeliveryAck(msg.messageId, this.deliveryWatermark);
+        return;
+      }
+      this.hasInFlightDeliveryBatch = true;
+    }
     const deserialized = msg.operations.map((s) => this.serializer.decodeOperation(s));
     const operations = this.encryptor ? await this.encryptor.decryptBatch(deserialized) : deserialized;
-    const inScopeOps = operations.filter((op) => this.operationAllowedForSync(op));
+    const inScopeOps = await this.filterAllowedForSync(operations);
     const targetSchemaVersion = this.config.schemaVersion ?? DEFAULT_SCHEMA_VERSION;
     const transforms = this.config.operationTransforms ?? [];
+    let fullyApplied = true;
     for (const op of inScopeOps) {
       const transformed = transforms.length > 0 ? (0, import_core7.applyOperationTransforms)(op, targetSchemaVersion, transforms) : op;
       if (transformed === null) {
@@ -3294,21 +3839,24 @@ var SyncEngine = class {
           this.emitApplyFailure(transformed, result);
         }
       } catch (error) {
+        fullyApplied = false;
         if (error instanceof import_core7.ClockDriftError) {
-          this.emitApplyFailure(transformed, "rejected", {
-            code: import_core7.APPLY_FAILURE_CODES.CLOCK_DRIFT,
-            message: error.message,
-            retriable: false
-          });
+          this.emitApplyFailure(
+            transformed,
+            "rejected",
+            {
+              code: import_core7.APPLY_FAILURE_CODES.CLOCK_DRIFT,
+              message: error.message,
+              retriable: false
+            },
+            true
+          );
           continue;
         }
         const message = error instanceof Error ? error.message : "Apply failed";
         const code = error instanceof import_core7.SyncError ? error.code : error instanceof import_core7.KoraError ? error.code : error instanceof Error && "code" in error && typeof error.code === "string" ? error.code : import_core7.APPLY_FAILURE_CODES.APPLY_FAILED;
-        this.emitApplyFailure(transformed, "rejected", {
-          code,
-          message,
-          retriable: code !== import_core7.APPLY_FAILURE_CODES.REFERENTIAL_INTEGRITY
-        });
+        const retriable = code !== import_core7.APPLY_FAILURE_CODES.REFERENTIAL_INTEGRITY;
+        this.emitApplyFailure(transformed, "rejected", { code, message, retriable }, true);
       }
     }
     if (inScopeOps.length > 0) {
@@ -3319,18 +3867,35 @@ var SyncEngine = class {
         batchSize: inScopeOps.length
       });
     }
-    const lastOp = operations[operations.length - 1];
-    const ack = {
-      type: "acknowledgment",
-      messageId: generateMessageId(),
-      acknowledgedMessageId: msg.messageId,
-      lastSequenceNumber: lastOp ? lastOp.sequenceNumber : 0
-    };
-    this.transport.send(ack);
-    this.emitter?.emit({
-      type: "sync:acknowledged",
-      sequenceNumber: lastOp ? lastOp.sequenceNumber : 0
-    });
+    const deliveryFullyApplied = isDeliveryBatch && fullyApplied;
+    if (!isDeliveryBatch || deliveryFullyApplied) {
+      const lastOp = operations[operations.length - 1];
+      const ack = {
+        type: "acknowledgment",
+        messageId: generateMessageId(),
+        acknowledgedMessageId: msg.messageId,
+        lastSequenceNumber: lastOp ? lastOp.sequenceNumber : 0,
+        ...deliveryFullyApplied && msg.maxDeliverySequence !== void 0 ? { deliverySequence: msg.maxDeliverySequence } : {}
+      };
+      this.transport.send(ack);
+      this.emitter?.emit({
+        type: "sync:acknowledged",
+        sequenceNumber: lastOp ? lastOp.sequenceNumber : 0
+      });
+    }
+    if (isDeliveryBatch && fullyApplied && msg.maxDeliverySequence !== void 0) {
+      this.deliveryGapRepeatCount = 0;
+      this.lastDeliveryGapKey = null;
+      this.deliveryWatermark = msg.maxDeliverySequence;
+      this.setViewWatermark(this.deliverySignature(), this.deliveryWatermark);
+      await this.persistDeliveryWatermark(this.deliveryWatermark);
+      if (this.blockedFailure && inScopeOps.some((op) => op.id === this.blockedFailure?.operationId)) {
+        const recovered = this.blockedFailure;
+        this.blockedFailure = null;
+        this.emitter?.emit({ type: "sync:apply-recovered", failure: recovered });
+      }
+    }
+    this.hasInFlightDeliveryBatch = false;
     if (this.state === "syncing") {
       this.deltaBatchesReceived++;
       const totalBatches = msg.totalBatches ?? this.initialSyncTotalBatches;
@@ -3338,15 +3903,17 @@ var SyncEngine = class {
         this.initialSyncTotalBatches = msg.totalBatches;
       }
       this.metricsCollector.updateInitialSyncProgress(this.deltaBatchesReceived, totalBatches);
-      const cursorFromBatch = msg.cursor !== void 0 ? decodeDeltaCursor(msg.cursor) : createDeltaCursorFromBatch(
-        inScopeOps.length > 0 ? inScopeOps : operations,
-        msg.batchIndex
-      );
-      if (cursorFromBatch) {
-        this.resumeDeltaCursor = cursorFromBatch;
-        await this.persistDeltaCursor(cursorFromBatch);
+      if (!isDeliveryBatch) {
+        const cursorFromBatch = msg.cursor !== void 0 ? decodeDeltaCursor(msg.cursor) : createDeltaCursorFromBatch(
+          inScopeOps.length > 0 ? inScopeOps : operations,
+          msg.batchIndex
+        );
+        if (cursorFromBatch) {
+          this.resumeDeltaCursor = cursorFromBatch;
+          await this.persistDeltaCursor(cursorFromBatch);
+        }
       }
-      if (msg.isFinal) {
+      if (msg.isFinal && (!isDeliveryBatch || fullyApplied)) {
         this.deltaReceiveComplete = true;
         this.resumeDeltaCursor = null;
         await this.persistDeltaCursor(null);
@@ -3355,29 +3922,57 @@ var SyncEngine = class {
       }
     }
   }
-  handleAcknowledgment(msg) {
+  /** Acknowledge a delivery batch (used for duplicates) without re-applying it. */
+  sendDeliveryAck(acknowledgedMessageId, deliverySequence) {
+    const ack = {
+      type: "acknowledgment",
+      messageId: generateMessageId(),
+      acknowledgedMessageId,
+      lastSequenceNumber: 0,
+      deliverySequence
+    };
+    this.transport.send(ack);
+  }
+  async handleAcknowledgment(msg) {
+    this.clearOutboundAckTimer();
     if (this.state === "syncing" && this.config.strictHandshake) {
       this.pendingDeltaBatchAcks.delete(msg.acknowledgedMessageId);
       this.markDeltaSendCompleteIfReady();
     }
     if (this.currentBatch) {
-      this.outboundQueue.acknowledge(this.currentBatch.batchId);
+      if (this.currentBatchRequiresPartialAck) {
+        await this.outboundQueue.acknowledgeThrough(
+          this.currentBatch.batchId,
+          msg.lastSequenceNumber
+        );
+      } else {
+        await this.outboundQueue.acknowledge(this.currentBatch.batchId);
+      }
       this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
       const now = Date.now();
       this.lastSyncedAt = now;
       this.lastSuccessfulPush = now;
     }
-    void this.advanceLastAckedForLocalNode(msg.lastSequenceNumber).then(
-      () => this.refreshPendingCount()
-    );
+    await this.advanceLastAckedForLocalNode(msg.lastSequenceNumber);
+    await this.refreshPendingCount();
     if (this.state === "streaming" && this.outboundQueue.hasOperations) {
       this.flushQueue();
     }
   }
   handleError(msg) {
+    this.clearOutboundAckTimer();
+    if (this.currentBatch) {
+      this.outboundQueue.returnBatch(this.currentBatch.batchId);
+      this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
+    }
     this.transitionTo("error");
-    if (msg.code === "AUTH_FAILED") {
+    if (msg.code === "AUTH_FAILED" || msg.code === "DEVICE_REVOKED") {
+      this.authRejected = true;
+      this.suspensionReason = msg.code === "DEVICE_REVOKED" ? "device-revoked" : "auth-rejected";
       this.emitter?.emit({ type: "sync:auth-failed", reason: msg.message });
+      this.emitter?.emit({ type: "sync:suspended", reason: this.suspensionReason });
     }
     if (msg.code === "INVALID_TIMESTAMP") {
       this.clockBlocked = true;
@@ -3393,6 +3988,64 @@ var SyncEngine = class {
     this.emitter?.emit({ type: "sync:disconnected", reason: msg.message });
     this.transitionTo("disconnected");
   }
+  /**
+   * Handle a per-operation rejection: divert the op out of the pending outbound
+   * queue (so it is never retried or resurrected on reconnect), record it in the
+   * durable rejected store (so it is kept and explainable), and emit an event so
+   * the app can reconcile. Unlike {@link handleError}, this is a normal per-op
+   * signal, so the connection stays up.
+   */
+  async handleOperationRejected(msg) {
+    if (msg.retriable) {
+      this.currentBatchRequiresPartialAck = true;
+      await this.refreshPendingCount();
+      this.emitter?.emit({
+        type: "sync:operation-rejected",
+        operationId: msg.operationId,
+        collection: msg.collection,
+        recordId: msg.recordId,
+        code: msg.code,
+        message: msg.message,
+        retriable: true
+      });
+      return;
+    }
+    await this.outboundQueue.reject(msg.operationId);
+    await this.rejectedStorage.record({
+      operationId: msg.operationId,
+      collection: msg.collection,
+      recordId: msg.recordId,
+      code: msg.code,
+      message: msg.message,
+      retriable: msg.retriable,
+      rejectedAt: Date.now()
+    });
+    await this.refreshPendingCount();
+    this.emitter?.emit({
+      type: "sync:operation-rejected",
+      operationId: msg.operationId,
+      collection: msg.collection,
+      recordId: msg.recordId,
+      code: msg.code,
+      message: msg.message,
+      retriable: msg.retriable
+    });
+  }
+  /**
+   * Every operation the server rejected that has not yet been reconciled. The app
+   * uses this (alongside the `sync:operation-rejected` event) to surface failed
+   * submissions and decide whether to roll back or resubmit.
+   */
+  getRejectedOperations() {
+    return this.rejectedStorage.list();
+  }
+  /**
+   * Forget rejected operations by id once the app has reconciled them (rolled the
+   * optimistic write back or resubmitted a corrected op).
+   */
+  clearRejectedOperations(operationIds) {
+    return this.rejectedStorage.remove(operationIds);
+  }
   async checkDeltaComplete() {
     if (!this.deltaSendComplete || !this.deltaReceiveComplete) {
       return;
@@ -3491,7 +4144,7 @@ var SyncEngine = class {
       return;
     }
     const ops = await this.store.getOperationRange(localNodeId, 1, localSeq);
-    const inScope = ops.filter((op) => this.operationAllowedForSync(op));
+    const inScope = await this.filterAllowedForSync(ops);
     for (const op of inScope) {
       await this.outboundQueue.enqueue(op);
     }
@@ -3502,6 +4155,7 @@ var SyncEngine = class {
     const batch = this.outboundQueue.takeBatch(this.batchSize);
     if (!batch) return;
     this.currentBatch = batch;
+    this.currentBatchRequiresPartialAck = false;
     if (this.encryptor) {
       this.encryptor.encryptBatch(batch.operations).then(
         (encrypted) => {
@@ -3514,6 +4168,7 @@ var SyncEngine = class {
             batchIndex: 0
           };
           this.transport.send(batchMsg);
+          this.startOutboundAckTimer(batch.batchId);
           this.emitter?.emit({
             type: "sync:sent",
             operations: batch.operations,
@@ -3523,6 +4178,7 @@ var SyncEngine = class {
         (err) => {
           this.outboundQueue.returnBatch(batch.batchId);
           this.currentBatch = null;
+          this.currentBatchRequiresPartialAck = false;
           this.emitter?.emit({
             type: "sync:disconnected",
             reason: err instanceof Error ? err.message : "Encryption failed"
@@ -3539,6 +4195,7 @@ var SyncEngine = class {
         batchIndex: 0
       };
       this.transport.send(batchMsg);
+      this.startOutboundAckTimer(batch.batchId);
       this.emitter?.emit({
         type: "sync:sent",
         operations: batch.operations,
@@ -3546,6 +4203,34 @@ var SyncEngine = class {
       });
     }
   }
+  startOutboundAckTimer(batchId) {
+    this.clearOutboundAckTimer();
+    if (this.outboundAckTimeoutMs <= 0) return;
+    this.outboundAckTimer = setTimeout(() => {
+      void this.handleOutboundAckTimeout(batchId);
+    }, this.outboundAckTimeoutMs);
+  }
+  clearOutboundAckTimer() {
+    if (!this.outboundAckTimer) return;
+    clearTimeout(this.outboundAckTimer);
+    this.outboundAckTimer = null;
+  }
+  async handleOutboundAckTimeout(batchId) {
+    if (!this.currentBatch || this.currentBatch.batchId !== batchId) return;
+    this.outboundQueue.returnBatch(batchId);
+    this.currentBatch = null;
+    this.currentBatchRequiresPartialAck = false;
+    this.clearOutboundAckTimer();
+    await this.refreshPendingCount();
+    if (this.state === "disconnected") return;
+    const reason = `Timed out waiting for acknowledgment of outbound batch ${batchId}`;
+    try {
+      await this.transport.disconnect();
+    } finally {
+      this.ensureDisconnected();
+      this.emitter?.emit({ type: "sync:disconnected", reason });
+    }
+  }
   handleAwarenessUpdate(msg) {
     const awarenessMessage = {
       type: "awareness",
@@ -3555,9 +4240,11 @@ var SyncEngine = class {
     this.awarenessManager.handleRemoteMessage(awarenessMessage);
   }
   handleTransportClose(reason) {
+    this.clearOutboundAckTimer();
     if (this.currentBatch) {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
     }
     if (this.schemaBlocked) {
       return;
@@ -3589,11 +4276,40 @@ var SyncEngine = class {
       this.serializer.setWireFormat(format);
     }
   }
-  operationAllowedForSync(op) {
-    if (!operationMatchesScope(op, this.activeScope)) {
+  async operationAllowedForSync(op) {
+    if (this.matchesScopeAndSubsets(op)) {
+      return true;
+    }
+    const fullRecord = await this.readRecordForBackfill(op);
+    if (!fullRecord) {
       return false;
     }
-    return operationMatchesQuerySubsets(op, this.getActiveQuerySubsets());
+    return this.matchesScopeAndSubsets(op, fullRecord);
+  }
+  matchesScopeAndSubsets(op, fullRecord) {
+    if (!operationMatchesScope(op, this.activeScope, fullRecord)) {
+      return false;
+    }
+    return operationMatchesQuerySubsets(op, this.getActiveQuerySubsets(), fullRecord);
+  }
+  async readRecordForBackfill(op) {
+    if (!this.store.readRecordFields) {
+      return null;
+    }
+    try {
+      return await this.store.readRecordFields(op.collection, op.recordId);
+    } catch {
+      return null;
+    }
+  }
+  async filterAllowedForSync(ops) {
+    const allowed = [];
+    for (const op of ops) {
+      if (await this.operationAllowedForSync(op)) {
+        allowed.push(op);
+      }
+    }
+    return allowed;
   }
   async persistDeltaCursor(cursor) {
     if (!this.syncState?.saveDeltaCursor) {
@@ -3601,6 +4317,12 @@ var SyncEngine = class {
     }
     await this.syncState.saveDeltaCursor(cursor);
   }
+  async persistDeliveryWatermark(watermark, signature = this.deliverySignature()) {
+    if (!this.syncState?.saveDeliveryWatermark) {
+      return;
+    }
+    await this.syncState.saveDeliveryWatermark(signature, watermark);
+  }
   scheduleQuerySubsetReconnect() {
     if (this.querySubsetReconnectTimer) {
       clearTimeout(this.querySubsetReconnectTimer);
@@ -3613,8 +4335,7 @@ var SyncEngine = class {
     }, 500);
   }
   async reconnectForQuerySubsets() {
-    await this.stop();
-    await this.start();
+    await this.reconnect();
   }
 };
 function awarenessStatesToWire(states) {
@@ -4295,12 +5016,22 @@ function fromBase642(str) {
 // src/reactivity/sync-status-controller.ts
 var OFFLINE_SYNC_STATUS = Object.freeze({
   status: "offline",
+  phase: "offline",
+  reconnecting: false,
   pendingOperations: 0,
   lastSyncedAt: null,
   lastSuccessfulPush: null,
   lastSuccessfulPull: null,
   conflicts: 0,
-  clockSkewMs: null
+  clockSkewMs: null,
+  inFlightUploadOperations: 0,
+  hasInFlightDeliveryBatch: false,
+  activeViewId: "",
+  activeViewComplete: false,
+  initialSync: { complete: false, receivedBatches: 0, totalBatches: null, progress: null },
+  deliveryWatermark: 0,
+  serverFrontier: null,
+  blockedFailure: null
 });
 var SYNC_STATUS_EVENT_TYPES = [
   "sync:connected",
@@ -4312,6 +5043,11 @@ var SYNC_STATUS_EVENT_TYPES = [
   "sync:received",
   "sync:acknowledged",
   "sync:apply-failed",
+  "sync:suspended",
+  "sync:apply-blocked",
+  "sync:apply-retrying",
+  "sync:apply-recovered",
+  "sync:delivery-gap",
   "sync:diagnostics",
   "sync:initial-sync-progress"
 ];
@@ -4458,6 +5194,7 @@ function subscribeRemoteAwarenessStates(awareness, listener) {
   InvalidScopeError,
   JsonMessageSerializer,
   KeyDerivationError,
+  MemoryRejectedOperationStorage,
   NegotiatedMessageSerializer,
   OFFLINE_SYNC_STATUS,
   OutboundQueue,
@@ -4496,11 +5233,13 @@ function subscribeRemoteAwarenessStates(awareness, listener) {
   isHandshakeMessage,
   isHandshakeResponseMessage,
   isOperationBatchMessage,
+  isOperationRejectedMessage,
   isSchemaMismatchReject,
   isSyncMessage,
   isYjsDocUpdateMessage,
   operationMatchesQuerySubsets,
   operationMatchesScope,
+  querySubsetContains,
   richtextDocKey,
   sliceOperationsAfterCursor,
   subscribeRemoteAwarenessStates,