@rocicorp/zero 0.16.2025021801 → 0.16.2025021900

package/out/{chunk-X7ACPYAD.js → chunk-A5B7QS5J.js}

@@ -12008,7 +12008,8 @@ var pokeStartBodySchema = valita_exports.object({
   // with initial cookie `null`, before the first request. So we have to be
   // able to send a base cookie with value `null` to match that state.
   baseCookie: nullableVersionSchema,
-  cookie: versionSchema,
+  // Deprecated: Replaced by pokeEnd.cookie.
+  cookie: versionSchema.optional(),
   /**
    * This field is always set if the poke contains a `rowsPatch`.
    * It may be absent for patches that only update clients and queries.
@@ -12033,10 +12034,8 @@ var pokePartBodySchema = valita_exports.object({
 });
 var pokeEndBodySchema = valita_exports.object({
   pokeID: valita_exports.string(),
-  // If present, this should be the cookie stored with the client,
-  // instead of the cookie presented in pokeStart.
-  // TODO: Consider making this required and removing it from pokeStart.
-  cookie: versionSchema.optional(),
+  // Note: This should be ignored (and may be empty) if cancel === `true`.
+  cookie: versionSchema,
   // If `true`, the poke with id `pokeID` should be discarded without
   // applying it.
   cancel: valita_exports.boolean().optional()
@@ -12105,7 +12104,7 @@ var CRUD = "crud";
 var Custom = "custom";
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 5;
+var PROTOCOL_VERSION = 6;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 2;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 var MIN_SERVER_SUPPORTED_PERMISSIONS_PROTOCOL = 4;
@@ -14087,7 +14086,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.16.2025021801";
+var version2 = "0.16.2025021900";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -14870,19 +14869,19 @@ function mergePokes(pokeBuffer, schema, serverToClient2) {
   }
   const { baseCookie } = pokeBuffer[0].pokeStart;
   const lastPoke = pokeBuffer[pokeBuffer.length - 1];
-  const cookie = lastPoke.pokeEnd.cookie ?? lastPoke.pokeStart.cookie;
+  const { cookie } = lastPoke.pokeEnd;
   const mergedPatch = [];
   const mergedLastMutationIDChanges = {};
-  let prevPokeStart = void 0;
+  let prevPokeEnd = void 0;
   for (const pokeAccumulator of pokeBuffer) {
-    if (prevPokeStart && pokeAccumulator.pokeStart.baseCookie && pokeAccumulator.pokeStart.baseCookie > prevPokeStart.cookie) {
+    if (prevPokeEnd && pokeAccumulator.pokeStart.baseCookie && pokeAccumulator.pokeStart.baseCookie > prevPokeEnd.cookie) {
       throw Error(
-        `unexpected cookie gap ${JSON.stringify(
-          prevPokeStart
-        )} ${JSON.stringify(pokeAccumulator.pokeStart)}`
+        `unexpected cookie gap ${JSON.stringify(prevPokeEnd)} ${JSON.stringify(
+          pokeAccumulator.pokeStart
+        )}`
       );
     }
-    prevPokeStart = pokeAccumulator.pokeStart;
+    prevPokeEnd = pokeAccumulator.pokeEnd;
     for (const pokePart of pokeAccumulator.parts) {
       if (pokePart.lastMutationIDChanges) {
         for (const [clientID, lastMutationID] of Object.entries(
@@ -16250,4 +16249,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-X7ACPYAD.js.map
+//# sourceMappingURL=chunk-A5B7QS5J.js.map