jazz-tools 0.20.17 → 0.20.18

package/dist/tools/subscribe/SubscriptionScope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionScope.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/SubscriptionScope.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SubscriptionScope.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/SubscriptionScope.ts"],"names":[],"mappings":"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"}

package/dist/worker/index.d.ts

@@ -22,6 +22,7 @@ type WorkerOptions<S extends (AccountClass<Account> & CoValueFromRaw<Account>) |
      */
     asActiveAccount?: boolean;
     storage?: StorageAPI;
+    experimental_clockSyncFromServerPings?: boolean;
 };
 /** @category Context Creation */
 export declare function startWorker<S extends (AccountClass<Account> & CoValueFromRaw<Account>) | AnyAccountSchema>(options: WorkerOptions<S>): Promise<{

package/dist/worker/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EAEd,IAAI,EACJ,UAAU,EACX,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,OAAO,EACP,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,KAAK,EAEL,MAAM,EAGP,MAAM,YAAY,CAAC;AAEpB,KAAK,aAAa,CAChB,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,IAClB;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,uBAAuB,CAAC;IACpC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB,CAAC;AAEF,iCAAiC;AACjC,wBAAsB,WAAW,CAC/B,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,EACpB,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IAwFvB;;OAEG;YACwB,MAAM,CAAC,CAAC,CAAC;;QAElC;;;;WAIG;;uBAhByC,KAAK,CAAC,WAAW,CAAC;;;;;IAmBhE;;;;;OAKG;;0CAImC,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI;IAalE;;;;;;OAMG;;IAEH;;;;OAIG;;GAKN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EAEd,IAAI,EACJ,UAAU,EACX,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,OAAO,EACP,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,KAAK,EAEL,MAAM,EAGP,MAAM,YAAY,CAAC;AAEpB,KAAK,aAAa,CAChB,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,IAClB;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,uBAAuB,CAAC;IACpC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,qCAAqC,CAAC,EAAE,OAAO,CAAC;CACjD,CAAC;AAEF,iCAAiC;AACjC,wBAAsB,WAAW,CAC/B,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,EACpB,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IA6FvB;;OAEG;YACwB,MAAM,CAAC,CAAC,CAAC;;QAElC;;;;WAIG;;uBAhByC,KAAK,CAAC,WAAW,CAAC;;;;;IAmBhE;;;;;OAKG;;0CAImC,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI;IAalE;;;;;;OAMG;;IAEH;;;;OAIG;;GAKN"}

package/dist/worker/index.js

@@ -36,7 +36,10 @@ async function startWorker(options) {
       },
       removePeer: () => {
       },
-      WebSocketConstructor: options.WebSocket
+      WebSocketConstructor: options.WebSocket,
+      onPingReceived: (sample) => {
+        node?.clockOffset.addSample(sample);
+      }
     });
     wsPeer.enable();
   }
@@ -62,7 +65,8 @@ async function startWorker(options) {
     peers,
     crypto: options.crypto ?? await WasmCrypto.create(),
     asActiveAccount,
-    storage: options.storage
+    storage: options.storage,
+    experimental_clockSyncFromServerPings: options.experimental_clockSyncFromServerPings
   });
   const account = context.account;
   node = account.$jazz.localNode;

package/dist/worker/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/worker/index.ts"],"sourcesContent":["import {\n  AgentSecret,\n  CryptoProvider,\n  LocalNode,\n  Peer,\n  StorageAPI,\n} from \"cojson\";\nimport {\n  type AnyWebSocketConstructor,\n  WebSocketPeerWithReconnection,\n} from \"cojson-transport-ws\";\nimport { WasmCrypto } from \"cojson/crypto/WasmCrypto\";\nimport {\n  Account,\n  AccountClass,\n  AnyAccountSchema,\n  CoValueFromRaw,\n  Inbox,\n  InstanceOfSchema,\n  Loaded,\n  createJazzContextFromExistingCredentials,\n  MockSessionProvider,\n} from \"jazz-tools\";\n\ntype WorkerOptions<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n> = {\n  accountID?: string;\n  accountSecret?: string;\n  /**\n   * A peer to connect to for synchronization.\n   * If provided, syncServer is ignored.\n   */\n  peer?: Peer;\n  syncServer?: string;\n  WebSocket?: AnyWebSocketConstructor;\n  AccountSchema?: S;\n  crypto?: CryptoProvider;\n  /**\n   * If true, the inbox will not be loaded.\n   */\n  skipInboxLoad?: boolean;\n  /**\n   * If false, the worker will not set in the global account context\n   */\n  asActiveAccount?: boolean;\n  storage?: StorageAPI;\n};\n\n/** @category Context Creation */\nexport async function startWorker<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n>(options: WorkerOptions<S>) {\n  const {\n    accountID = process.env.JAZZ_WORKER_ACCOUNT,\n    accountSecret = process.env.JAZZ_WORKER_SECRET,\n    syncServer = \"wss://cloud.jazz.tools\",\n    AccountSchema = Account as unknown as S,\n    skipInboxLoad = false,\n    asActiveAccount = true,\n  } = options;\n\n  let node: LocalNode | undefined = undefined;\n\n  const peers: Peer[] = [];\n\n  // If a peer is provided directly, use it instead of WebSocket\n  let wsPeer: WebSocketPeerWithReconnection | undefined;\n\n  if (options.peer) {\n    peers.push(options.peer);\n  } else {\n    wsPeer = new WebSocketPeerWithReconnection({\n      peer: syncServer,\n      reconnectionTimeout: 100,\n      addPeer: (peer) => {\n        if (node) {\n          node.syncManager.addPeer(peer);\n        } else {\n          peers.push(peer);\n        }\n      },\n      removePeer: () => {},\n      WebSocketConstructor: options.WebSocket,\n    });\n\n    wsPeer.enable();\n  }\n\n  if (!accountID) {\n    throw new Error(\"No accountID provided\");\n  }\n  if (!accountSecret) {\n    throw new Error(\"No accountSecret provided\");\n  }\n  if (!accountID.startsWith(\"co_\")) {\n    throw new Error(\"Invalid accountID\");\n  }\n  if (!accountSecret?.startsWith(\"sealerSecret_\")) {\n    throw new Error(\"Invalid accountSecret\");\n  }\n\n  const context = await createJazzContextFromExistingCredentials({\n    credentials: {\n      accountID: accountID,\n      secret: accountSecret as AgentSecret,\n    },\n    AccountSchema,\n    sessionProvider: new MockSessionProvider(),\n    peers,\n    crypto: options.crypto ?? (await WasmCrypto.create()),\n    asActiveAccount,\n    storage: options.storage,\n  });\n\n  const account = context.account as InstanceOfSchema<S>;\n  node = account.$jazz.localNode;\n\n  if (!account.$jazz.refs.profile?.id) {\n    throw new Error(\"Account has no profile\");\n  }\n\n  const inbox = skipInboxLoad ? undefined : await Inbox.load(account);\n\n  async function done() {\n    await context.account.$jazz.waitForAllCoValuesSync();\n\n    wsPeer?.disable();\n    context.done();\n  }\n\n  const inboxPublicApi = inbox\n    ? {\n        subscribe: inbox.subscribe.bind(inbox) as Inbox[\"subscribe\"],\n      }\n    : {\n        subscribe: () => {},\n      };\n\n  return {\n    /**\n     * The worker account instance.\n     */\n    worker: context.account as Loaded<S>,\n    experimental: {\n      /**\n       * API to subscribe to the inbox messages.\n       *\n       * More info on the Inbox API: https://jazz.tools/docs/react/server-side/inbox\n       */\n      inbox: inboxPublicApi,\n    },\n    /**\n     * Wait for the connection to the sync server to be established.\n     *\n     * If already connected, it will resolve immediately.\n     * Returns immediately if using a custom peer.\n     */\n    waitForConnection() {\n      return wsPeer?.waitUntilConnected() ?? Promise.resolve();\n    },\n    subscribeToConnectionChange(listener: (connected: boolean) => void) {\n      if (!wsPeer) {\n        // For custom peers, immediately notify as connected\n        listener(true);\n        return () => {};\n      }\n\n      wsPeer.subscribe(listener);\n\n      return () => {\n        wsPeer.unsubscribe(listener);\n      };\n    },\n    /**\n     * Waits for all CoValues to sync and then shuts down the worker.\n     *\n     * To only wait for sync use worker.$jazz.waitForAllCoValuesSync()\n     *\n     * @deprecated Use shutdownWorker\n     */\n    done,\n    /**\n     * Waits for all CoValues to sync and then shuts down the worker.\n     *\n     * To only wait for sync use worker.$jazz.waitForAllCoValuesSync()\n     */\n    shutdownWorker() {\n      return done();\n    },\n  };\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/worker/index.ts"],"sourcesContent":["import {\n  AgentSecret,\n  CryptoProvider,\n  LocalNode,\n  Peer,\n  StorageAPI,\n} from \"cojson\";\nimport {\n  type AnyWebSocketConstructor,\n  WebSocketPeerWithReconnection,\n} from \"cojson-transport-ws\";\nimport { WasmCrypto } from \"cojson/crypto/WasmCrypto\";\nimport {\n  Account,\n  AccountClass,\n  AnyAccountSchema,\n  CoValueFromRaw,\n  Inbox,\n  InstanceOfSchema,\n  Loaded,\n  createJazzContextFromExistingCredentials,\n  MockSessionProvider,\n} from \"jazz-tools\";\n\ntype WorkerOptions<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n> = {\n  accountID?: string;\n  accountSecret?: string;\n  /**\n   * A peer to connect to for synchronization.\n   * If provided, syncServer is ignored.\n   */\n  peer?: Peer;\n  syncServer?: string;\n  WebSocket?: AnyWebSocketConstructor;\n  AccountSchema?: S;\n  crypto?: CryptoProvider;\n  /**\n   * If true, the inbox will not be loaded.\n   */\n  skipInboxLoad?: boolean;\n  /**\n   * If false, the worker will not set in the global account context\n   */\n  asActiveAccount?: boolean;\n  storage?: StorageAPI;\n  experimental_clockSyncFromServerPings?: boolean;\n};\n\n/** @category Context Creation */\nexport async function startWorker<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n>(options: WorkerOptions<S>) {\n  const {\n    accountID = process.env.JAZZ_WORKER_ACCOUNT,\n    accountSecret = process.env.JAZZ_WORKER_SECRET,\n    syncServer = \"wss://cloud.jazz.tools\",\n    AccountSchema = Account as unknown as S,\n    skipInboxLoad = false,\n    asActiveAccount = true,\n  } = options;\n\n  let node: LocalNode | undefined = undefined;\n\n  const peers: Peer[] = [];\n\n  // If a peer is provided directly, use it instead of WebSocket\n  let wsPeer: WebSocketPeerWithReconnection | undefined;\n\n  if (options.peer) {\n    peers.push(options.peer);\n  } else {\n    wsPeer = new WebSocketPeerWithReconnection({\n      peer: syncServer,\n      reconnectionTimeout: 100,\n      addPeer: (peer) => {\n        if (node) {\n          node.syncManager.addPeer(peer);\n        } else {\n          peers.push(peer);\n        }\n      },\n      removePeer: () => {},\n      WebSocketConstructor: options.WebSocket,\n      onPingReceived: (sample) => {\n        node?.clockOffset.addSample(sample);\n      },\n    });\n\n    wsPeer.enable();\n  }\n\n  if (!accountID) {\n    throw new Error(\"No accountID provided\");\n  }\n  if (!accountSecret) {\n    throw new Error(\"No accountSecret provided\");\n  }\n  if (!accountID.startsWith(\"co_\")) {\n    throw new Error(\"Invalid accountID\");\n  }\n  if (!accountSecret?.startsWith(\"sealerSecret_\")) {\n    throw new Error(\"Invalid accountSecret\");\n  }\n\n  const context = await createJazzContextFromExistingCredentials({\n    credentials: {\n      accountID: accountID,\n      secret: accountSecret as AgentSecret,\n    },\n    AccountSchema,\n    sessionProvider: new MockSessionProvider(),\n    peers,\n    crypto: options.crypto ?? (await WasmCrypto.create()),\n    asActiveAccount,\n    storage: options.storage,\n    experimental_clockSyncFromServerPings:\n      options.experimental_clockSyncFromServerPings,\n  });\n\n  const account = context.account as InstanceOfSchema<S>;\n  node = account.$jazz.localNode;\n\n  if (!account.$jazz.refs.profile?.id) {\n    throw new Error(\"Account has no profile\");\n  }\n\n  const inbox = skipInboxLoad ? undefined : await Inbox.load(account);\n\n  async function done() {\n    await context.account.$jazz.waitForAllCoValuesSync();\n\n    wsPeer?.disable();\n    context.done();\n  }\n\n  const inboxPublicApi = inbox\n    ? {\n        subscribe: inbox.subscribe.bind(inbox) as Inbox[\"subscribe\"],\n      }\n    : {\n        subscribe: () => {},\n      };\n\n  return {\n    /**\n     * The worker account instance.\n     */\n    worker: context.account as Loaded<S>,\n    experimental: {\n      /**\n       * API to subscribe to the inbox messages.\n       *\n       * More info on the Inbox API: https://jazz.tools/docs/react/server-side/inbox\n       */\n      inbox: inboxPublicApi,\n    },\n    /**\n     * Wait for the connection to the sync server to be established.\n     *\n     * If already connected, it will resolve immediately.\n     * Returns immediately if using a custom peer.\n     */\n    waitForConnection() {\n      return wsPeer?.waitUntilConnected() ?? Promise.resolve();\n    },\n    subscribeToConnectionChange(listener: (connected: boolean) => void) {\n      if (!wsPeer) {\n        // For custom peers, immediately notify as connected\n        listener(true);\n        return () => {};\n      }\n\n      wsPeer.subscribe(listener);\n\n      return () => {\n        wsPeer.unsubscribe(listener);\n      };\n    },\n    /**\n     * Waits for all CoValues to sync and then shuts down the worker.\n     *\n     * To only wait for sync use worker.$jazz.waitForAllCoValuesSync()\n     *\n     * @deprecated Use shutdownWorker\n     */\n    done,\n    /**\n     * Waits for all CoValues to sync and then shuts down the worker.\n     *\n     * To only wait for sync use worker.$jazz.waitForAllCoValuesSync()\n     */\n    shutdownWorker() {\n      return done();\n    },\n  };\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -206,7 +206,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.20.17",
+  "version": "0.20.18",
   "dependencies": {
     "@scure/base": "1.2.1",
     "@scure/bip39": "^1.3.0",
@@ -223,9 +223,9 @@
     "prosemirror-transform": "^1.9.0",
     "use-sync-external-store": "^1.5.0",
     "zod": "4.1.11",
-    "cojson": "0.20.17",
-    "cojson-storage-indexeddb": "0.20.17",
-    "cojson-transport-ws": "0.20.17"
+    "cojson": "0.20.18",
+    "cojson-storage-indexeddb": "0.20.18",
+    "cojson-transport-ws": "0.20.18"
   },
   "devDependencies": {
     "@scure/bip39": "^1.3.0",

package/src/better-auth/auth/client.ts

@@ -26,8 +26,10 @@ export const jazzPluginClient = () => {
   let jazzContext: JazzContextType<Account>;
   let authSecretStorage: AuthSecretStorage;
   let signOutUnsubscription: () => void;
+  let authGeneration = 0;
 
   const authenticateOnJazz = async (jazzAuth: AuthSetPayload) => {
+    authGeneration++;
     const parsedJazzAuth = {
       ...jazzAuth,
       secretSeed: jazzAuth.secretSeed
@@ -89,6 +91,12 @@ export const jazzPluginClient = () => {
         name: "jazz-plugin",
         hooks: {
           async onRequest(context) {
+            if (context.url.toString().includes("/get-session")) {
+              context.headers.set(
+                "x-jazz-auth-generation",
+                String(authGeneration),
+              );
+            }
             if (
               SIGNUP_URLS.some((url) => context.url.toString().includes(url))
             ) {
@@ -123,7 +131,13 @@ export const jazzPluginClient = () => {
 
             if (context.request.url.toString().includes("/get-session")) {
               if (context.data === null) {
-                if (authSecretStorage.isAuthenticated === true) {
+                const requestAuthGeneration = Number(
+                  context.request.headers.get("x-jazz-auth-generation") ?? "0",
+                );
+                if (
+                  authSecretStorage.isAuthenticated === true &&
+                  requestAuthGeneration === authGeneration
+                ) {
                   console.info(
                     "Jazz is authenticated, but the session is null. Logging out",
                   );

package/src/better-auth/auth/tests/client.test.ts

@@ -610,6 +610,98 @@ describe("Better-Auth client plugin", () => {
       expect(customFetchImpl).toHaveBeenCalledTimes(3);
     });
 
+    it("should NOT logout from Jazz if a stale null get-session arrives after authentication", async () => {
+      const credentials = await authSecretStorage.get();
+      assert(credentials, "Jazz credentials are not available");
+
+      // This test validates race condition handling where a stale null response
+      // arrives after authentication. The authGeneration is tracked via the
+      // x-jazz-auth-generation header set in onRequest and read in onSuccess.
+      // Since authGeneration increments after sign-in, the stale response's
+      // generation number will be older, preventing an unintended logout.
+
+      const capturedHeaders: any[] = [];
+      let resolveStaleSession: (value: Response) => void;
+      const staleSessionPromise = new Promise<Response>((resolve) => {
+        resolveStaleSession = resolve;
+      });
+
+      customFetchImpl.mockImplementation(
+        (urlOrRequest: string | Request, init?: RequestInit) => {
+          const headers =
+            urlOrRequest instanceof Request
+              ? urlOrRequest.headers
+              : init?.headers || {};
+          capturedHeaders.push(headers);
+
+          const url =
+            urlOrRequest instanceof Request ? urlOrRequest.url : urlOrRequest;
+
+          if (url.toString().includes("/get-session")) {
+            return staleSessionPromise;
+          }
+          return Promise.resolve(
+            new Response(
+              JSON.stringify({
+                user: {
+                  id: "user-1",
+                  email: "test@jazz.dev",
+                  name: "Matteo",
+                },
+                jazzAuth: {
+                  accountID: credentials.accountID,
+                  secretSeed: credentials.secretSeed,
+                  accountSecret: credentials.accountSecret,
+                  provider: "better-auth",
+                },
+              }),
+            ),
+          );
+        },
+      );
+
+      const staleSessionFetch = authClient.getSession();
+
+      // We need to wait a tick for onRequest to be called and customFetchImpl to be triggered
+      await new Promise((resolve) => setTimeout(resolve, 0));
+
+      const getHeader = (headers: any, name: string) => {
+        if (!headers) return null;
+        if (typeof headers.get === "function") return headers.get(name);
+        if (Array.isArray(headers)) {
+          const pair = (headers as string[][]).find(
+            (h) => h[0]?.toLowerCase() === name.toLowerCase(),
+          );
+          return pair ? pair[1] : null;
+        }
+        return headers[name] || headers[name.toLowerCase()] || null;
+      };
+
+      // Verify the stale request had authGeneration=0 in the header
+      expect(getHeader(capturedHeaders[0], "x-jazz-auth-generation")).toBe("0");
+
+      // Now sign in, which increments authGeneration to 1
+      await authClient.signIn.email({
+        email: "test@jazz.dev",
+        password: "password",
+      });
+
+      expect(authSecretStorage.isAuthenticated).toBe(true);
+
+      // Verify the sign-in request had no x-jazz-auth-generation header (it is gated to get-session)
+      expect(
+        getHeader(capturedHeaders[1], "x-jazz-auth-generation"),
+      ).toBeNull();
+
+      // Resolve the stale get-session response with null
+      resolveStaleSession!(new Response(JSON.stringify(null)));
+      await staleSessionFetch;
+
+      // The stale null response should not trigger a logout because its
+      // authGeneration (0) < current authGeneration (1), so >= comparison fails
+      expect(authSecretStorage.isAuthenticated).toBe(true);
+    });
+
     it("should deduplicate auth requests for the same account", async () => {
       const credentials = await authSecretStorage.get();
       assert(credentials, "Jazz credentials are not available");

package/src/browser/BrowserContextManager.ts

@@ -31,6 +31,7 @@ export type JazzContextManagerProps<
   storage?: BaseBrowserContextOptions["storage"];
   AccountSchema?: S;
   defaultProfileName?: string;
+  experimental_clockSyncFromServerPings?: boolean;
 };
 
 export class JazzBrowserContextManager<
@@ -57,6 +58,8 @@ export class JazzBrowserContextManager<
         sync: props.sync,
         storage: props.storage,
         authSecretStorage: this.authSecretStorage,
+        experimental_clockSyncFromServerPings:
+          props.experimental_clockSyncFromServerPings,
       });
     } else {
       return createJazzBrowserContext<S>({
@@ -67,6 +70,8 @@ export class JazzBrowserContextManager<
         newAccountProps: authProps?.newAccountProps,
         defaultProfileName: props.defaultProfileName,
         authSecretStorage: this.authSecretStorage,
+        experimental_clockSyncFromServerPings:
+          props.experimental_clockSyncFromServerPings,
       });
     }
   }

package/src/browser/createBrowserContext.ts

@@ -30,6 +30,7 @@ export type BaseBrowserContextOptions = {
   storage?: "indexedDB";
   crypto?: CryptoProvider;
   authSecretStorage: AuthSecretStorage;
+  experimental_clockSyncFromServerPings?: boolean;
 };
 
 class BrowserWebSocketPeerWithReconnection extends WebSocketPeerWithReconnection {
@@ -79,6 +80,9 @@ async function setupPeers(options: BaseBrowserContextOptions) {
     removePeer: (peer) => {
       peers.splice(peers.indexOf(peer), 1);
     },
+    onPingReceived: (sample) => {
+      node?.clockOffset.addSample(sample);
+    },
   });
 
   function toggleNetwork(enabled: boolean) {
@@ -136,6 +140,8 @@ export async function createJazzBrowserGuestContext(
     peers,
     syncWhen,
     storage,
+    experimental_clockSyncFromServerPings:
+      options.experimental_clockSyncFromServerPings,
   });
 
   setNode(context.agent.node);
@@ -214,6 +220,8 @@ export async function createJazzBrowserContext<
     AccountSchema: options.AccountSchema,
     sessionProvider: getBrowserLockSessionProvider(),
     authSecretStorage: options.authSecretStorage,
+    experimental_clockSyncFromServerPings:
+      options.experimental_clockSyncFromServerPings,
   });
 
   setNode(context.node);

package/src/react/provider.tsx

@@ -47,6 +47,7 @@ export function JazzReactProvider<
   enableSSR,
   fallback = null,
   authSecretStorageKey,
+  experimental_clockSyncFromServerPings,
 }: JazzProviderProps<S>) {
   if (useContext(JazzContext)) {
     throw new Error(
@@ -82,8 +83,15 @@ export function JazzReactProvider<
       onAnonymousAccountDiscarded: onAnonymousAccountDiscarded
         ? onAnonymousAccountDiscardedRefCallback
         : undefined,
+      experimental_clockSyncFromServerPings,
     } satisfies JazzContextManagerProps<S>;
-  }, [guestMode, sync.peer, sync.when, storage]);
+  }, [
+    guestMode,
+    sync.peer,
+    sync.when,
+    storage,
+    experimental_clockSyncFromServerPings,
+  ]);
 
   if (contextManager.propsChanged(props) && typeof window !== "undefined") {
     contextManager.createContext(props).catch((error) => {

package/src/react-native-core/ReactNativeContextManager.ts

@@ -33,6 +33,7 @@ export type JazzContextManagerProps<
   onAnonymousAccountDiscarded?: (
     anonymousAccount: InstanceOfSchema<S>,
   ) => Promise<void>;
+  experimental_clockSyncFromServerPings?: boolean;
 };
 
 export class ReactNativeContextManager<
@@ -49,6 +50,8 @@ export class ReactNativeContextManager<
         sync: props.sync,
         storage: props.storage,
         authSecretStorage: this.authSecretStorage,
+        experimental_clockSyncFromServerPings:
+          props.experimental_clockSyncFromServerPings,
       });
     } else {
       return createJazzReactNativeContext<S>({
@@ -59,6 +62,8 @@ export class ReactNativeContextManager<
         newAccountProps: authProps?.newAccountProps,
         defaultProfileName: props.defaultProfileName,
         authSecretStorage: this.authSecretStorage,
+        experimental_clockSyncFromServerPings:
+          props.experimental_clockSyncFromServerPings,
       });
     }
   }

package/src/react-native-core/platform.ts

@@ -26,6 +26,7 @@ export type BaseReactNativeContextOptions = {
   reconnectionTimeout?: number;
   storage?: SQLiteDatabaseDriverAsync | "disabled";
   authSecretStorage: AuthSecretStorage;
+  experimental_clockSyncFromServerPings?: boolean;
 };
 
 class ReactNativeWebSocketPeerWithReconnection extends WebSocketPeerWithReconnection {
@@ -73,6 +74,9 @@ async function setupPeers(options: BaseReactNativeContextOptions) {
     removePeer: (peer) => {
       peers.splice(peers.indexOf(peer), 1);
     },
+    onPingReceived: (sample) => {
+      node?.clockOffset.addSample(sample);
+    },
   });
 
   function toggleNetwork(enabled: boolean) {
@@ -128,6 +132,8 @@ export async function createJazzReactNativeGuestContext(
     peers,
     syncWhen,
     storage,
+    experimental_clockSyncFromServerPings:
+      options.experimental_clockSyncFromServerPings,
   });
 
   setNode(context.agent.node);
@@ -211,6 +217,8 @@ export async function createJazzReactNativeContext<
     sessionProvider,
     authSecretStorage: options.authSecretStorage,
     storage,
+    experimental_clockSyncFromServerPings:
+      options.experimental_clockSyncFromServerPings,
   });
 
   setNode(context.node);

package/src/react-native-core/provider.tsx

@@ -47,6 +47,7 @@ export function JazzProviderCore<
   kvStore,
   authSecretStorageKey,
   fallback = null,
+  experimental_clockSyncFromServerPings,
 }: JazzProviderProps<S>) {
   if (useContext(JazzContext)) {
     throw new Error(
@@ -80,8 +81,15 @@ export function JazzProviderCore<
       onAnonymousAccountDiscarded: onAnonymousAccountDiscarded
         ? onAnonymousAccountDiscardedRefCallback
         : undefined,
+      experimental_clockSyncFromServerPings,
     } satisfies JazzContextManagerProps<S>;
-  }, [guestMode, sync.peer, sync.when, storage]);
+  }, [
+    guestMode,
+    sync.peer,
+    sync.when,
+    storage,
+    experimental_clockSyncFromServerPings,
+  ]);
 
   if (contextManager.propsChanged(props)) {
     contextManager.createContext(props).catch((error) => {

package/src/svelte/Provider.svelte

@@ -77,6 +77,7 @@
     props.sync.peer;
     props.storage;
     props.guestMode;
+    props.experimental_clockSyncFromServerPings;
     return untrack(() => {
       if (!props.sync) return;
 
@@ -89,6 +90,8 @@
           defaultProfileName: props.defaultProfileName,
           onAnonymousAccountDiscarded: props.onAnonymousAccountDiscarded,
           onLogOut: props.onLogOut,
+          experimental_clockSyncFromServerPings:
+            props.experimental_clockSyncFromServerPings,
         })
         .catch((error) => {
           console.error("Error creating Jazz browser context:", error);

package/src/tools/coValues/schemaUnion.ts

@@ -22,6 +22,19 @@ import {
   subscribeToCoValueWithoutMe,
 } from "../internal.js";
 
+/**
+ * Thrown by a discriminated union's `fromRaw` when the stored value doesn't
+ * match any declared variant. Caught at the subscription layer so that
+ * `load()` can settle as unavailable instead of hanging, since the throw
+ * would otherwise disappear into cojson's async update loop.
+ */
+export class SchemaUnionNoMatchingVariantError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "SchemaUnionNoMatchingVariantError";
+  }
+}
+
 /**
  * Extends `SchemaUnion` with a non-abstract constructor.
  */

package/src/tools/implementation/createContext.ts

@@ -118,6 +118,7 @@ export async function createJazzContextFromExistingCredentials<
   sessionProvider,
   onLogOut,
   asActiveAccount,
+  experimental_clockSyncFromServerPings,
 }: {
   credentials: Credentials;
   peers: Peer[];
@@ -128,6 +129,7 @@ export async function createJazzContextFromExistingCredentials<
   onLogOut?: () => void;
   storage?: StorageAPI;
   asActiveAccount: boolean;
+  experimental_clockSyncFromServerPings?: boolean;
 }): Promise<JazzContextWithAccount<InstanceOfSchema<S>>> {
   const { sessionID, sessionDone } = await sessionProvider.acquireSession(
     credentials.accountID,
@@ -149,6 +151,7 @@ export async function createJazzContextFromExistingCredentials<
     crypto,
     storage,
     enableFullStorageReconciliation: !!storage,
+    experimental_clockSyncFromServerPings,
     migration: async (rawAccount, _node, creationProps) => {
       const account = AccountClass.fromRaw(rawAccount) as InstanceOfSchema<S>;
       if (asActiveAccount) {
@@ -193,6 +196,7 @@ export async function createJazzContextForNewAccount<
   onLogOut,
   storage,
   sessionProvider,
+  experimental_clockSyncFromServerPings,
 }: {
   creationProps: { name: string };
   initialAgentSecret?: AgentSecret;
@@ -203,6 +207,7 @@ export async function createJazzContextForNewAccount<
   onLogOut?: () => Promise<void>;
   storage?: StorageAPI;
   sessionProvider: SessionProvider;
+  experimental_clockSyncFromServerPings?: boolean;
 }): Promise<JazzContextWithAccount<InstanceOfSchema<S>>> {
   const CurrentAccountSchema =
     PropsAccountSchema ?? (RegisteredSchemas["Account"] as unknown as S);
@@ -218,6 +223,7 @@ export async function createJazzContextForNewAccount<
     initialAgentSecret,
     storage,
     enableFullStorageReconciliation: !!storage,
+    experimental_clockSyncFromServerPings,
     migration: async (rawAccount, _node, creationProps) => {
       const account = AccountClass.fromRaw(rawAccount) as InstanceOfSchema<S>;
       activeAccountContext.set(account);
@@ -263,6 +269,7 @@ export async function createJazzContext<
   sessionProvider: SessionProvider;
   authSecretStorage: AuthSecretStorage;
   storage?: StorageAPI;
+  experimental_clockSyncFromServerPings?: boolean;
 }) {
   const crypto = options.crypto;
 
@@ -294,6 +301,8 @@ export async function createJazzContext<
       },
       storage: options.storage,
       asActiveAccount: true,
+      experimental_clockSyncFromServerPings:
+        options.experimental_clockSyncFromServerPings,
     });
   } else {
     const secretSeed = options.crypto.newRandomSecretSeed();
@@ -318,6 +327,8 @@ export async function createJazzContext<
         await authSecretStorage.clearWithoutNotify();
       },
       storage: options.storage,
+      experimental_clockSyncFromServerPings:
+        options.experimental_clockSyncFromServerPings,
     });
 
     if (!options.newAccountProps) {
@@ -341,11 +352,13 @@ export function createAnonymousJazzContext({
   syncWhen,
   crypto,
   storage,
+  experimental_clockSyncFromServerPings,
 }: {
   peers: Peer[];
   syncWhen?: SyncWhen;
   crypto: CryptoProvider;
   storage?: StorageAPI;
+  experimental_clockSyncFromServerPings?: boolean;
 }): JazzContextWithAgent {
   const agentSecret = crypto.newRandomAgentSecret();
 
@@ -355,6 +368,7 @@ export function createAnonymousJazzContext({
     crypto,
     syncWhen,
     !!storage,
+    { experimental_clockSyncFromServerPings },
   );
 
   for (const peer of peers) {

package/src/tools/implementation/zodSchema/schemaTypes/CoMapSchema.ts

@@ -524,11 +524,19 @@ export class CoMapSchema<
     Owner,
     DefaultResolveQuery
   > {
+    const extendedShape = {} as z.core.util.Extend<Shape, ExtendShape>;
+
+    Object.defineProperties(
+      extendedShape,
+      Object.getOwnPropertyDescriptors(this.shape),
+    );
+    Object.defineProperties(
+      extendedShape,
+      Object.getOwnPropertyDescriptors(shape),
+    );
+
     return this.copy({
-      shape: {
-        ...this.shape,
-        ...shape,
-      } as z.core.util.Extend<Shape, ExtendShape>,
+      shape: extendedShape,
     });
   }
 
@@ -549,11 +557,19 @@ export class CoMapSchema<
     Owner,
     DefaultResolveQuery
   > {
+    const extendedShape = {} as z.core.util.Extend<Shape, ExtendShape>;
+
+    Object.defineProperties(
+      extendedShape,
+      Object.getOwnPropertyDescriptors(this.shape),
+    );
+    Object.defineProperties(
+      extendedShape,
+      Object.getOwnPropertyDescriptors(shape),
+    );
+
     return this.copy({
-      shape: {
-        ...this.shape,
-        ...shape,
-      } as z.core.util.Extend<Shape, ExtendShape>,
+      shape: extendedShape,
     });
   }
 

package/src/tools/implementation/zodSchema/unionUtils.ts

@@ -8,6 +8,7 @@ import {
   DiscriminableCoValueSchemas,
   DiscriminableCoreCoValueSchema,
   SchemaUnionDiscriminator,
+  SchemaUnionNoMatchingVariantError,
   createCoreCoMapSchema,
 } from "../../internal.js";
 import {
@@ -118,7 +119,7 @@ export function schemaUnionDiscriminatorFor(
         }
       }
 
-      throw new Error(
+      throw new SchemaUnionNoMatchingVariantError(
         "co.discriminatedUnion() of collaborative types with no matching discriminator value found",
       );
     };

package/src/tools/subscribe/SubscriptionScope.ts

@@ -8,6 +8,7 @@ import {
   NotLoaded,
   type RefEncoded,
   type RefsToResolve,
+  SchemaUnionNoMatchingVariantError,
   TypeSym,
   createUnloadedCoValue,
   instantiateRefEncodedFromRaw,
@@ -173,7 +174,28 @@ export class SubscriptionScope<D extends CoValue> {
           }
 
           this.migrating = true;
-          const instance = instantiateRefEncodedFromRaw(this.schema, value);
+          let instance: CoValue;
+          try {
+            instance = instantiateRefEncodedFromRaw(this.schema, value);
+          } catch (error) {
+            // A discriminated union whose stored value doesn't match any
+            // declared variant would otherwise hang load() — the throw
+            // escapes into cojson's async update loop and nothing settles.
+            // Treat it as unavailable so load() resolves. Other
+            // instantiation errors (e.g. CoVector dimension mismatch) keep
+            // throwing loudly, as they indicate schema drift that callers
+            // should surface.
+            if (!(error instanceof SchemaUnionNoMatchingVariantError)) {
+              throw error;
+            }
+            this.migrationFailed = true;
+            this.migrated = true;
+            console.error(
+              `Schema instantiation failed for ${this.id}: ${error.message}`,
+            );
+            this.handleUpdate(CoValueLoadingState.UNAVAILABLE);
+            return;
+          }
           try {
             applyCoValueMigrations(instance);
           } catch (error) {