@tanstack/db-sqlite-persistence-core 0.4.4 → 0.4.7

package/dist/cjs/sqlite-value.cjs

@@ -22,10 +22,61 @@ function serializeSQLiteBigInt(value) {
     [PERSISTED_VALUE_TAG]: value.toString()
   };
 }
+function sqliteTemporalKind(value) {
+  if (value === null || typeof value !== `object`) return;
+  const tag = value[Symbol.toStringTag];
+  if (tag === `Temporal.Instant` || tag === `Temporal.PlainDate`) return tag;
+  return void 0;
+}
+function requireSQLiteTemporalConstructor(kind) {
+  const name = kind.slice(`Temporal.`.length);
+  const constructor = globalThis.Temporal?.[name];
+  if (typeof constructor?.from !== `function` || typeof constructor.prototype.toString !== `function`) {
+    throw new errors.InvalidPersistedCollectionConfigError(
+      `Missing global ${kind} constructor for SQLite persistence`
+    );
+  }
+  return constructor;
+}
+function reviveSQLiteTemporal(kind, value) {
+  return requireSQLiteTemporalConstructor(kind).from(value);
+}
+function serializeSQLiteTemporal(value) {
+  if (value === null || typeof value !== `object`) return;
+  const prototype = Object.getPrototypeOf(value);
+  if (prototype === null || prototype === Object.prototype) return;
+  const tag = value[Symbol.toStringTag];
+  if (typeof tag !== `string` || !tag.startsWith(`Temporal.`)) return;
+  const kind = sqliteTemporalKind(value);
+  if (!kind)
+    throw new errors.InvalidPersistedCollectionConfigError(
+      `Unsupported ${tag} value for SQLite persistence`
+    );
+  const constructor = requireSQLiteTemporalConstructor(kind);
+  let text;
+  try {
+    text = constructor.prototype.toString.call(value);
+  } catch {
+    throw new errors.InvalidPersistedCollectionConfigError(
+      `Invalid ${kind} value for the registered global constructor`
+    );
+  }
+  const native = constructor.from(text);
+  const iso = kind === `Temporal.PlainDate` ? native.withCalendar(`iso8601`) : void 0;
+  const order = iso ? `${String(iso.year + 1e6).padStart(7, `0`)}${String(iso.month).padStart(2, `0`)}${String(iso.day).padStart(2, `0`)}` : (native.epochNanoseconds + 10000000000000000000000n).toString().padStart(23, `0`);
+  return { [PERSISTED_TYPE_TAG]: kind, [PERSISTED_VALUE_TAG]: text, order };
+}
+function sqliteTemporalIdentity(value) {
+  return `${value[PERSISTED_TYPE_TAG]}:${value[PERSISTED_VALUE_TAG]}`;
+}
 exports.PERSISTED_TYPE_TAG = PERSISTED_TYPE_TAG;
 exports.PERSISTED_VALUE_TAG = PERSISTED_VALUE_TAG;
 exports.SQLITE_BIGINT_MAX = SQLITE_BIGINT_MAX;
 exports.SQLITE_BIGINT_MIN = SQLITE_BIGINT_MIN;
 exports.assertSQLiteBigIntInRange = assertSQLiteBigIntInRange;
+exports.reviveSQLiteTemporal = reviveSQLiteTemporal;
 exports.serializeSQLiteBigInt = serializeSQLiteBigInt;
+exports.serializeSQLiteTemporal = serializeSQLiteTemporal;
+exports.sqliteTemporalIdentity = sqliteTemporalIdentity;
+exports.sqliteTemporalKind = sqliteTemporalKind;
 //# sourceMappingURL=sqlite-value.cjs.map

package/dist/cjs/sqlite-value.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-value.cjs","sources":["../../src/sqlite-value.ts"],"sourcesContent":["import { SQLiteBigIntOutOfRangeError } from './errors'\n\nexport const SQLITE_BIGINT_MIN = -9_223_372_036_854_775_808n\nexport const SQLITE_BIGINT_MAX = 9_223_372_036_854_775_807n\nexport const PERSISTED_TYPE_TAG = `__tanstack_db_persisted_type__`\nexport const PERSISTED_VALUE_TAG = `value`\n\nexport type SerializedSQLiteBigInt = {\n  [PERSISTED_TYPE_TAG]: `bigint`\n  [PERSISTED_VALUE_TAG]: string\n}\n\nexport function assertSQLiteBigIntInRange(value: bigint): bigint {\n  if (value < SQLITE_BIGINT_MIN || value > SQLITE_BIGINT_MAX) {\n    throw new SQLiteBigIntOutOfRangeError(\n      value,\n      SQLITE_BIGINT_MIN,\n      SQLITE_BIGINT_MAX,\n    )\n  }\n  return value\n}\n\nexport function serializeSQLiteBigInt(value: bigint): SerializedSQLiteBigInt {\n  assertSQLiteBigIntInRange(value)\n  return {\n    [PERSISTED_TYPE_TAG]: `bigint`,\n    [PERSISTED_VALUE_TAG]: value.toString(),\n  }\n}\n"],"names":["SQLiteBigIntOutOfRangeError"],"mappings":";;;AAEO,MAAM,oBAAoB,CAAC;AAC3B,MAAM,oBAAoB;AAC1B,MAAM,qBAAqB;AAC3B,MAAM,sBAAsB;AAO5B,SAAS,0BAA0B,OAAuB;AAC/D,MAAI,QAAQ,qBAAqB,QAAQ,mBAAmB;AAC1D,UAAM,IAAIA,OAAAA;AAAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AACA,SAAO;AACT;AAEO,SAAS,sBAAsB,OAAuC;AAC3E,4BAA0B,KAAK;AAC/B,SAAO;AAAA,IACL,CAAC,kBAAkB,GAAG;AAAA,IACtB,CAAC,mBAAmB,GAAG,MAAM,SAAA;AAAA,EAAS;AAE1C;;;;;;;"}
+{"version":3,"file":"sqlite-value.cjs","sources":["../../src/sqlite-value.ts"],"sourcesContent":["import {\n  InvalidPersistedCollectionConfigError,\n  SQLiteBigIntOutOfRangeError,\n} from './errors'\n\nexport const SQLITE_BIGINT_MIN = -9_223_372_036_854_775_808n\nexport const SQLITE_BIGINT_MAX = 9_223_372_036_854_775_807n\nexport const PERSISTED_TYPE_TAG = `__tanstack_db_persisted_type__`\nexport const PERSISTED_VALUE_TAG = `value`\n\nexport type SerializedSQLiteBigInt = {\n  [PERSISTED_TYPE_TAG]: `bigint`\n  [PERSISTED_VALUE_TAG]: string\n}\n\nexport function assertSQLiteBigIntInRange(value: bigint): bigint {\n  if (value < SQLITE_BIGINT_MIN || value > SQLITE_BIGINT_MAX) {\n    throw new SQLiteBigIntOutOfRangeError(\n      value,\n      SQLITE_BIGINT_MIN,\n      SQLITE_BIGINT_MAX,\n    )\n  }\n  return value\n}\n\nexport function serializeSQLiteBigInt(value: bigint): SerializedSQLiteBigInt {\n  assertSQLiteBigIntInRange(value)\n  return {\n    [PERSISTED_TYPE_TAG]: `bigint`,\n    [PERSISTED_VALUE_TAG]: value.toString(),\n  }\n}\n\ntype SQLiteTemporalKind = `Temporal.Instant` | `Temporal.PlainDate`\ntype SQLiteTemporal = {\n  epochNanoseconds: bigint\n  year: number\n  month: number\n  day: number\n  withCalendar: (calendar: string) => SQLiteTemporal\n}\ntype TemporalConstructor = {\n  from: (value: string) => SQLiteTemporal\n  prototype: { toString: () => string }\n}\n\nexport type SerializedSQLiteTemporal = {\n  [PERSISTED_TYPE_TAG]: SQLiteTemporalKind\n  [PERSISTED_VALUE_TAG]: string\n  order: string\n}\n\nexport function sqliteTemporalKind(\n  value: unknown,\n): SQLiteTemporalKind | undefined {\n  if (value === null || typeof value !== `object`) return\n  const tag = (value as { [Symbol.toStringTag]?: unknown })[Symbol.toStringTag]\n  if (tag === `Temporal.Instant` || tag === `Temporal.PlainDate`) return tag\n  return undefined\n}\n\nfunction requireSQLiteTemporalConstructor(\n  kind: SQLiteTemporalKind,\n): TemporalConstructor {\n  const name = kind.slice(`Temporal.`.length)\n  const constructor = (\n    globalThis as { Temporal?: Record<string, TemporalConstructor> }\n  ).Temporal?.[name]\n  if (\n    typeof constructor?.from !== `function` ||\n    typeof constructor.prototype.toString !== `function`\n  ) {\n    throw new InvalidPersistedCollectionConfigError(\n      `Missing global ${kind} constructor for SQLite persistence`,\n    )\n  }\n  return constructor\n}\n\nexport function reviveSQLiteTemporal(\n  kind: SQLiteTemporalKind,\n  value: string,\n): unknown {\n  return requireSQLiteTemporalConstructor(kind).from(value)\n}\n\n/** Registered prototype methods validate the brand; user toString is ignored. */\nexport function serializeSQLiteTemporal(\n  value: unknown,\n): SerializedSQLiteTemporal | undefined {\n  if (value === null || typeof value !== `object`) return\n  const prototype = Object.getPrototypeOf(value)\n  if (prototype === null || prototype === Object.prototype) return\n  const tag = (value as { [Symbol.toStringTag]?: unknown })[Symbol.toStringTag]\n  if (typeof tag !== `string` || !tag.startsWith(`Temporal.`)) return\n  const kind = sqliteTemporalKind(value)\n  if (!kind)\n    throw new InvalidPersistedCollectionConfigError(\n      `Unsupported ${tag} value for SQLite persistence`,\n    )\n  const constructor = requireSQLiteTemporalConstructor(kind)\n  let text: string\n  try {\n    text = constructor.prototype.toString.call(value)\n  } catch {\n    throw new InvalidPersistedCollectionConfigError(\n      `Invalid ${kind} value for the registered global constructor`,\n    )\n  }\n  const native = constructor.from(text)\n  const iso =\n    kind === `Temporal.PlainDate` ? native.withCalendar(`iso8601`) : undefined\n  // Text keys avoid both floating-point precision loss and SQLite's int64 cap.\n  const order = iso\n    ? `${String(iso.year + 1_000_000).padStart(7, `0`)}${String(iso.month).padStart(2, `0`)}${String(iso.day).padStart(2, `0`)}`\n    : (native.epochNanoseconds + 10_000_000_000_000_000_000_000n)\n        .toString()\n        .padStart(23, `0`)\n  return { [PERSISTED_TYPE_TAG]: kind, [PERSISTED_VALUE_TAG]: text, order }\n}\n\nexport function sqliteTemporalIdentity(\n  value: SerializedSQLiteTemporal,\n): string {\n  return `${value[PERSISTED_TYPE_TAG]}:${value[PERSISTED_VALUE_TAG]}`\n}\n"],"names":["SQLiteBigIntOutOfRangeError","InvalidPersistedCollectionConfigError"],"mappings":";;;AAKO,MAAM,oBAAoB,CAAC;AAC3B,MAAM,oBAAoB;AAC1B,MAAM,qBAAqB;AAC3B,MAAM,sBAAsB;AAO5B,SAAS,0BAA0B,OAAuB;AAC/D,MAAI,QAAQ,qBAAqB,QAAQ,mBAAmB;AAC1D,UAAM,IAAIA,OAAAA;AAAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AACA,SAAO;AACT;AAEO,SAAS,sBAAsB,OAAuC;AAC3E,4BAA0B,KAAK;AAC/B,SAAO;AAAA,IACL,CAAC,kBAAkB,GAAG;AAAA,IACtB,CAAC,mBAAmB,GAAG,MAAM,SAAA;AAAA,EAAS;AAE1C;AAqBO,SAAS,mBACd,OACgC;AAChC,MAAI,UAAU,QAAQ,OAAO,UAAU,SAAU;AACjD,QAAM,MAAO,MAA6C,OAAO,WAAW;AAC5E,MAAI,QAAQ,sBAAsB,QAAQ,qBAAsB,QAAO;AACvE,SAAO;AACT;AAEA,SAAS,iCACP,MACqB;AACrB,QAAM,OAAO,KAAK,MAAM,YAAY,MAAM;AAC1C,QAAM,cACJ,WACA,WAAW,IAAI;AACjB,MACE,OAAO,aAAa,SAAS,cAC7B,OAAO,YAAY,UAAU,aAAa,YAC1C;AACA,UAAM,IAAIC,OAAAA;AAAAA,MACR,kBAAkB,IAAI;AAAA,IAAA;AAAA,EAE1B;AACA,SAAO;AACT;AAEO,SAAS,qBACd,MACA,OACS;AACT,SAAO,iCAAiC,IAAI,EAAE,KAAK,KAAK;AAC1D;AAGO,SAAS,wBACd,OACsC;AACtC,MAAI,UAAU,QAAQ,OAAO,UAAU,SAAU;AACjD,QAAM,YAAY,OAAO,eAAe,KAAK;AAC7C,MAAI,cAAc,QAAQ,cAAc,OAAO,UAAW;AAC1D,QAAM,MAAO,MAA6C,OAAO,WAAW;AAC5E,MAAI,OAAO,QAAQ,YAAY,CAAC,IAAI,WAAW,WAAW,EAAG;AAC7D,QAAM,OAAO,mBAAmB,KAAK;AACrC,MAAI,CAAC;AACH,UAAM,IAAIA,OAAAA;AAAAA,MACR,eAAe,GAAG;AAAA,IAAA;AAEtB,QAAM,cAAc,iCAAiC,IAAI;AACzD,MAAI;AACJ,MAAI;AACF,WAAO,YAAY,UAAU,SAAS,KAAK,KAAK;AAAA,EAClD,QAAQ;AACN,UAAM,IAAIA,OAAAA;AAAAA,MACR,WAAW,IAAI;AAAA,IAAA;AAAA,EAEnB;AACA,QAAM,SAAS,YAAY,KAAK,IAAI;AACpC,QAAM,MACJ,SAAS,uBAAuB,OAAO,aAAa,SAAS,IAAI;AAEnE,QAAM,QAAQ,MACV,GAAG,OAAO,IAAI,OAAO,GAAS,EAAE,SAAS,GAAG,GAAG,CAAC,GAAG,OAAO,IAAI,KAAK,EAAE,SAAS,GAAG,GAAG,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,SAAS,GAAG,GAAG,CAAC,MACvH,OAAO,mBAAmB,0BACxB,WACA,SAAS,IAAI,GAAG;AACvB,SAAO,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,mBAAmB,GAAG,MAAM,MAAA;AACpE;AAEO,SAAS,uBACd,OACQ;AACR,SAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,MAAM,mBAAmB,CAAC;AACnE;;;;;;;;;;;"}

package/dist/cjs/sqlite-value.d.cts

@@ -8,3 +8,15 @@ export type SerializedSQLiteBigInt = {
 };
 export declare function assertSQLiteBigIntInRange(value: bigint): bigint;
 export declare function serializeSQLiteBigInt(value: bigint): SerializedSQLiteBigInt;
+type SQLiteTemporalKind = `Temporal.Instant` | `Temporal.PlainDate`;
+export type SerializedSQLiteTemporal = {
+    [PERSISTED_TYPE_TAG]: SQLiteTemporalKind;
+    [PERSISTED_VALUE_TAG]: string;
+    order: string;
+};
+export declare function sqliteTemporalKind(value: unknown): SQLiteTemporalKind | undefined;
+export declare function reviveSQLiteTemporal(kind: SQLiteTemporalKind, value: string): unknown;
+/** Registered prototype methods validate the brand; user toString is ignored. */
+export declare function serializeSQLiteTemporal(value: unknown): SerializedSQLiteTemporal | undefined;
+export declare function sqliteTemporalIdentity(value: SerializedSQLiteTemporal): string;
+export {};

package/dist/esm/index.js

@@ -1,8 +1,8 @@
 import { SQLITE_DRIVER_SHARED_LOGICAL_SCHEDULING_KEY, SingleProcessCoordinator, createPersistedTableName, decodePersistedStorageKey, encodePersistedStorageKey, forwardSQLiteDriverSharedLogicalScheduling, persistedCollectionOptions, validatePersistedCollectionCoordinator } from "./persisted.js";
 import { DuplicateRemoteSubsetOwnerError, IndeterminateCommitError, InvalidPersistedCollectionConfigError, InvalidPersistedCollectionCoordinatorError, InvalidPersistedStorageKeyEncodingError, InvalidPersistedStorageKeyError, InvalidPersistenceAdapterError, InvalidSyncConfigError, PersistedCollectionCoreError, PersistedCollectionDurabilityError, PersistenceUnavailableError, RetryableRemoteSubsetAcquisitionError, SQLiteBigIntOutOfRangeError, toPersistedCollectionDurabilityError } from "./errors.js";
 import { DEFAULT_APPLIED_TX_PRUNE_MAX_AGE_SECONDS, DEFAULT_APPLIED_TX_PRUNE_MAX_ROWS, SQLiteCorePersistenceAdapter, createSQLiteCorePersistenceAdapter } from "./sqlite-core-adapter.js";
-import { PERSISTED_TYPE_TAG, PERSISTED_VALUE_TAG, SQLITE_BIGINT_MAX, SQLITE_BIGINT_MIN, assertSQLiteBigIntInRange, serializeSQLiteBigInt } from "./sqlite-value.js";
-import { RemoteSubsetWireValueError, toProcessLocalLoadSubsetOptions, toTransportedLoadSubsetOptions } from "./remote-subset-wire.js";
+import { PERSISTED_TYPE_TAG, PERSISTED_VALUE_TAG, SQLITE_BIGINT_MAX, SQLITE_BIGINT_MIN, assertSQLiteBigIntInRange, reviveSQLiteTemporal, serializeSQLiteBigInt, serializeSQLiteTemporal, sqliteTemporalIdentity, sqliteTemporalKind } from "./sqlite-value.js";
+import { RemoteSubsetWireValueError, toProcessLocalLoadSubsetOptions, toTransportedLoadSubsetOptions, validateRemoteSubsetOptions } from "./remote-subset-wire.js";
 import { safeRandomUUID } from "@tanstack/db";
 export {
   DEFAULT_APPLIED_TX_PRUNE_MAX_AGE_SECONDS,
@@ -35,11 +35,16 @@ export {
   encodePersistedStorageKey,
   forwardSQLiteDriverSharedLogicalScheduling,
   persistedCollectionOptions,
+  reviveSQLiteTemporal,
   safeRandomUUID,
   serializeSQLiteBigInt,
+  serializeSQLiteTemporal,
+  sqliteTemporalIdentity,
+  sqliteTemporalKind,
   toPersistedCollectionDurabilityError,
   toProcessLocalLoadSubsetOptions,
   toTransportedLoadSubsetOptions,
-  validatePersistedCollectionCoordinator
+  validatePersistedCollectionCoordinator,
+  validateRemoteSubsetOptions
 };
 //# sourceMappingURL=index.js.map

package/dist/esm/persisted.d.ts

@@ -358,6 +358,12 @@ export interface PersistedCollectionCoordinator {
      */
     requestEnsurePersistedIndex: (collectionId: string, signature: string, spec: PersistedIndexSpec, scopedAdapter?: HydrationPersistenceAdapter, localEnsureCompleted?: boolean) => Promise<void>;
     requestApplyLocalMutations?: (collectionId: string, mutations: Array<PersistedMutationEnvelope>) => Promise<ApplyLocalMutationsResponse>;
+    /**
+     * Applies a committed transaction through the supplied adapter when present.
+     * Wrappers must forward this leader-local loan: scheduling it again can wait
+     * on the hydration that is awaiting this call. Never serialize or retain the
+     * loan after the call; ordinary work uses the registered collection adapter.
+     */
     requestApplyCommittedTx: (collectionId: string, tx: PersistedTx, scopedAdapter?: HydrationPersistenceAdapter) => Promise<ApplyCommittedTxResponse>;
     /** The scoped adapter is leader-local and is never serialized to a follower. */
     pullSince?: (collectionId: string, fromRowVersion: number, scopedAdapter?: HydrationPersistenceAdapter) => Promise<PullSinceResponse>;
@@ -433,7 +439,7 @@ export declare class SingleProcessCoordinator implements PersistedCollectionCoor
     registerRemoteSubsetOwner(collectionId: string, owner: RemoteSubsetOwner): () => void;
     requestEnsurePersistedIndex(): Promise<void>;
     setAdapterForCollection(collectionId: string, adapter: PersistenceAdapter): void;
-    requestApplyCommittedTx(collectionId: string, tx: PersistedTx): Promise<ApplyCommittedTxResponse>;
+    requestApplyCommittedTx(collectionId: string, tx: PersistedTx, scopedAdapter?: HydrationPersistenceAdapter): Promise<ApplyCommittedTxResponse>;
     pullSince(): Promise<PullSinceResponse>;
 }
 export declare function validatePersistedCollectionCoordinator(coordinator: PersistedCollectionCoordinator): void;

package/dist/esm/persisted.js

@@ -1,7 +1,7 @@
 import { safeRandomUUID, withCollectionConfigFactory, whenSyncAccepted, SyncTransactionAbortedError, getLoadSubsetDemandKey, compileSingleRowExpression, toBooleanPredicate, SYNC_PERSISTENCE_VERSION, SYNC_PERSISTENCE_PROTOCOL, PERSISTED_READINESS, NoPendingSyncTransactionCommitError, NoPendingSyncTransactionWriteError, withAcceptedReceipt } from "@tanstack/db";
 import { InvalidPersistedCollectionConfigError, DuplicateRemoteSubsetOwnerError, toPersistedCollectionDurabilityError, InvalidPersistedStorageKeyEncodingError, InvalidPersistedStorageKeyError, InvalidSyncConfigError, InvalidPersistedCollectionCoordinatorError, PersistedCollectionDurabilityError, InvalidPersistenceAdapterError } from "./errors.js";
-import { serializeSQLiteBigInt } from "./sqlite-value.js";
-import { toTransportedLoadSubsetOptions, toProcessLocalLoadSubsetOptions } from "./remote-subset-wire.js";
+import { serializeSQLiteBigInt, serializeSQLiteTemporal } from "./sqlite-value.js";
+import { toTransportedLoadSubsetOptions, toProcessLocalLoadSubsetOptions, validateRemoteSubsetOptions } from "./remote-subset-wire.js";
 import { reportRemoteSubsetOwnerError, unloadRemoteSubsetOwner } from "./remote-subset-owner.js";
 const SQLITE_DRIVER_SHARED_LOGICAL_SCHEDULING_KEY = /* @__PURE__ */ Symbol.for(
   `tanstack-db.sqlite-driver-supports-shared-logical-scheduling`
@@ -176,8 +176,8 @@ class SingleProcessCoordinator {
   setAdapterForCollection(collectionId, adapter) {
     this.collectionAdapters.set(collectionId, adapter);
   }
-  async requestApplyCommittedTx(collectionId, tx) {
-    const adapter = this.collectionAdapters.get(collectionId);
+  async requestApplyCommittedTx(collectionId, tx, scopedAdapter) {
+    const adapter = scopedAdapter ?? this.collectionAdapters.get(collectionId);
     if (!adapter) {
       throw new InvalidPersistedCollectionConfigError(
         `SingleProcessCoordinator has no persistence adapter configured for collection "${collectionId}"`
@@ -333,6 +333,8 @@ function toStableSerializable(value) {
     case `undefined`:
       return void 0;
   }
+  const temporal = serializeSQLiteTemporal(value);
+  if (temporal) return temporal;
   if (value instanceof Date) {
     return value.toISOString();
   }
@@ -745,7 +747,6 @@ class PersistedCollectionRuntime {
     await this.hydrateSubsetUnsafe(
       baseline,
       {
-        requestRemoteEnsure: false,
         lifecycleGeneration,
         bindKeySetEvidence: true
       },
@@ -828,6 +829,7 @@ class PersistedCollectionRuntime {
     const subsetKey = this.getSubsetKey(options);
     const truncateGeneration = this.sourceTruncateGeneration;
     const routeRemoteDemandDuringHydration = this.canRouteRemoteDemandThroughCoordinator();
+    if (routeRemoteDemandDuringHydration) validateRemoteSubsetOptions(options);
     this.activeSubsets.set(subsetKey, options);
     const appliedCursor = this.appliedReceiptSequence;
     try {
@@ -837,7 +839,6 @@ class PersistedCollectionRuntime {
             (adapter) => this.hydrateSubsetUnsafe(
               options,
               {
-                requestRemoteEnsure: this.mode === `sync-present` && !routeRemoteDemandDuringHydration,
                 lifecycleGeneration,
                 requestLocalLoadFailure: true,
                 rejectBufferedReplayFailure: true
@@ -853,6 +854,9 @@ class PersistedCollectionRuntime {
       });
       if (lifecycleGeneration !== this.lifecycleGeneration) return;
       await this.waitForAppliedReceiptsAfter(appliedCursor);
+      if (!routeRemoteDemandDuringHydration && this.canRouteRemoteDemandThroughCoordinator()) {
+        validateRemoteSubsetOptions(options);
+      }
     } catch (error) {
       if (this.activeSubsets.get(subsetKey) === options) {
         this.activeSubsets.delete(subsetKey);
@@ -962,7 +966,6 @@ class PersistedCollectionRuntime {
         (adapter) => this.hydrateSubsetUnsafe(
           options,
           {
-            requestRemoteEnsure: false,
             lifecycleGeneration,
             rejectBufferedReplayFailure: true
           },
@@ -1215,9 +1218,6 @@ class PersistedCollectionRuntime {
       if (config.lifecycleGeneration !== this.lifecycleGeneration) return;
       replayFailure = await this.flushQueuedHydrationTransactionsUnsafe(adapter);
       if (config.lifecycleGeneration !== this.lifecycleGeneration) return;
-      if (config.requestRemoteEnsure && !replayFailure) {
-        this.queueRemoteSubsetEnsure(options);
-      }
     } catch (error) {
       if (config.requestLocalLoadFailure && !rowsLoaded) {
         this.hydratingGeneration = config.lifecycleGeneration;
@@ -1810,6 +1810,7 @@ class PersistedCollectionRuntime {
     }
     const subsetKey = this.getSubsetKey(options);
     if (this.activeSubsets.get(subsetKey) !== options) return;
+    validateRemoteSubsetOptions(options);
     this.pendingRemoteSubsetEnsures.set(subsetKey, options);
     void this.flushPendingRemoteSubsetEnsures();
   }
@@ -2212,8 +2213,8 @@ class PersistedCollectionRuntime {
     await this.requestCoordinatorPersistedIndex(indexMetadata, completedLocally);
   }
   async ensureLocalPersistedIndex(indexMetadata, adapter) {
-    const spec = this.buildPersistedIndexSpec(indexMetadata);
     try {
+      const spec = this.buildPersistedIndexSpec(indexMetadata);
       await adapter.ensureIndex(
         this.collectionId,
         indexMetadata.signature,
@@ -2226,8 +2227,8 @@ class PersistedCollectionRuntime {
     }
   }
   async requestCoordinatorPersistedIndex(indexMetadata, completedLocally) {
-    const spec = this.buildPersistedIndexSpec(indexMetadata);
     try {
+      const spec = this.buildPersistedIndexSpec(indexMetadata);
       await this.persistence.coordinator.requestEnsurePersistedIndex(
         this.collectionId,
         indexMetadata.signature,
@@ -2835,6 +2836,7 @@ function createWrappedSyncConfig(sourceSyncConfig, runtime, persistedReadiness)
             settleRuntimeTransaction(openTransaction, applied2);
             return visibleAfterDurable(openTransaction, applied2);
           }
+          openTransaction.hydrationSequence = void 0;
           let applied;
           try {
             applied = runtime.applyHydrationBufferedTransaction(transaction);