@rocicorp/zero 0.24.2025091100 → 0.24.2025091200

package/out/{chunk-V2KPKXLX.js → chunk-6XNI6IVJ.js}

@@ -1,8 +1,9 @@
 import {
-  promiseFalse,
-  promiseTrue,
-  promiseVoid
-} from "./chunk-MKB4RXL3.js";
+  maybeTransactionIsClosedRejection,
+  storeIsClosedRejection,
+  throwIfStoreClosed,
+  transactionIsClosedRejection
+} from "./chunk-ASRS2LFV.js";
 import {
   BTreeRead,
   Chunk,
@@ -128,7 +129,7 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-MLYQCVBG.js";
+} from "./chunk-K5ZSWG54.js";
 import {
   assert,
   assertArray,
@@ -329,6 +330,14 @@ function mustGetBrowserGlobal(name) {
   return r;
 }
 
+// ../shared/src/resolved-promises.ts
+var promiseTrue = Promise.resolve(true);
+var promiseFalse = Promise.resolve(false);
+var promiseUndefined = Promise.resolve(void 0);
+var promiseVoid = Promise.resolve();
+var promiseNever = new Promise(() => {
+});
+
 // ../replicache/src/kv/write-impl-base.ts
 var deleteSentinel = Symbol();
 var WriteImplBase = class {
@@ -338,6 +347,9 @@ var WriteImplBase = class {
     this.#read = read;
   }
   has(key) {
+    if (this.#read.closed) {
+      return transactionIsClosedRejection();
+    }
     switch (this._pending.get(key)) {
       case void 0:
         return this.#read.has(key);
@@ -348,6 +360,9 @@ var WriteImplBase = class {
     }
   }
   async get(key) {
+    if (this.#read.closed) {
+      return transactionIsClosedRejection();
+    }
     const v = this._pending.get(key);
     switch (v) {
       case deleteSentinel:
@@ -361,12 +376,10 @@ var WriteImplBase = class {
     }
   }
   put(key, value) {
-    this._pending.set(key, deepFreeze(value));
-    return promiseVoid;
+    return maybeTransactionIsClosedRejection(this.#read) ?? (this._pending.set(key, deepFreeze(value)), promiseVoid);
   }
   del(key) {
-    this._pending.set(key, deleteSentinel);
-    return promiseVoid;
+    return maybeTransactionIsClosedRejection(this.#read) ?? (this._pending.set(key, deleteSentinel), promiseVoid);
   }
   release() {
     this.#read.release();
@@ -387,9 +400,15 @@ var IDBStore = class {
     this.#db = openDatabase(name);
   }
   read() {
+    if (this.#closed) {
+      return storeIsClosedRejection();
+    }
     return this.#withReopen(readImpl);
   }
   write() {
+    if (this.#closed) {
+      return storeIsClosedRejection();
+    }
     return this.#withReopen(writeImpl);
   }
   async close() {
@@ -451,6 +470,9 @@ var ReadImpl = class {
     this.#tx = tx;
   }
   has(key) {
+    if (this.#closed) {
+      return transactionIsClosedRejection();
+    }
     return new Promise((resolve, reject) => {
       const req = objectStore(this.#tx).count(key);
       req.onsuccess = () => resolve(req.result > 0);
@@ -458,6 +480,9 @@ var ReadImpl = class {
     });
   }
   get(key) {
+    if (this.#closed) {
+      return transactionIsClosedRejection();
+    }
     return new Promise((resolve, reject) => {
       const req = objectStore(this.#tx).get(key);
       req.onsuccess = () => resolve(deepFreezeAllowUndefined(req.result));
@@ -479,6 +504,9 @@ var WriteImpl = class extends WriteImplBase {
     this.#tx = tx;
   }
   commit() {
+    if (this.#closed) {
+      return transactionIsClosedRejection();
+    }
     if (this._pending.size === 0) {
       return promiseVoid;
     }
@@ -498,6 +526,7 @@ var WriteImpl = class extends WriteImplBase {
   }
   release() {
     this.#closed = true;
+    super.release();
   }
   get closed() {
     return this.#closed;
@@ -550,7 +579,7 @@ var AbortError = class extends Error {
 // ../shared/src/sleep.ts
 import { resolver as resolver2 } from "@rocicorp/resolver";
 var promiseVoid2 = Promise.resolve();
-var promiseNever = new Promise(() => void 0);
+var promiseNever2 = new Promise(() => void 0);
 function sleep(ms, signal) {
   const newAbortError = () => new AbortError("Aborted");
   if (signal?.aborted) {
@@ -576,7 +605,7 @@ function sleep(ms, signal) {
 }
 function sleepWithAbort(ms, signal) {
   if (ms === 0) {
-    return [promiseVoid2, promiseNever];
+    return [promiseVoid2, promiseNever2];
   }
   const { promise: abortedPromise, resolve: abortedResolve } = resolver2();
   const sleepPromise = new Promise((resolve) => {
@@ -927,17 +956,46 @@ var WriteImpl2 = class extends ReadImpl2 {
 };
 
 // ../replicache/src/deleted-clients.ts
-var DELETED_CLIENTS_HEAD_NAME = "deleted-clients";
-var deletedClientsSchema = readonlyObject({
-  clientIDs: readonlyArray(valita_exports.string()),
-  clientGroupIDs: readonlyArray(valita_exports.string())
-});
-var legacyDeletedClientsSchema = readonlyArray(valita_exports.string());
-async function setDeletedClients(dagWrite, clientIDs, clientGroupIDs) {
-  const data = {
-    clientIDs: normalize(clientIDs),
-    clientGroupIDs: normalize(clientGroupIDs)
-  };
+var DELETED_CLIENTS_HEAD_NAME = "deleted-clients-v2";
+var deletedClientsSchema = readonlyArray(
+  readonlyObject({
+    clientGroupID: clientGroupIDSchema,
+    clientID: clientIDSchema
+  })
+);
+function compare(a, b) {
+  const cg = stringCompare(a.clientGroupID, b.clientGroupID);
+  if (cg !== 0) {
+    return cg;
+  }
+  return stringCompare(a.clientID, b.clientID);
+}
+function normalizeDeletedClients(deletedClients) {
+  return [...deletedClients].sort(compare).filter(
+    (item, index) => index === 0 || compare(item, [...deletedClients].sort(compare)[index - 1]) !== 0
+  );
+}
+function mergeDeletedClients(a, b) {
+  const merged = [];
+  a = normalizeDeletedClients(a);
+  b = normalizeDeletedClients(b);
+  for (let i = 0, j = 0; i < a.length || j < b.length; ) {
+    if (i < a.length && (j >= b.length || compare(a[i], b[j]) < 0)) {
+      merged.push(a[i]);
+      i++;
+    } else if (j < b.length && (i >= a.length || compare(b[j], a[i]) < 0)) {
+      merged.push(b[j]);
+      j++;
+    } else {
+      merged.push(a[i]);
+      i++;
+      j++;
+    }
+  }
+  return merged;
+}
+async function setDeletedClients(dagWrite, deletedClients) {
+  const data = normalizeDeletedClients(deletedClients);
   const chunkData = deepFreeze(data);
   const chunk = dagWrite.createChunk(chunkData, []);
   await dagWrite.putChunk(chunk);
@@ -947,35 +1005,44 @@ async function setDeletedClients(dagWrite, clientIDs, clientGroupIDs) {
 async function getDeletedClients(dagRead) {
   const hash = await dagRead.getHead(DELETED_CLIENTS_HEAD_NAME);
   if (hash === void 0) {
-    return { clientIDs: [], clientGroupIDs: [] };
+    return [];
   }
   const chunk = await dagRead.mustGetChunk(hash);
-  const res = test(chunk.data, legacyDeletedClientsSchema);
-  if (res.ok) {
-    return { clientIDs: res.value, clientGroupIDs: [] };
+  const res = test(chunk.data, deletedClientsSchema);
+  if (!res.ok) {
+    return [];
   }
-  return parse(chunk.data, deletedClientsSchema);
+  return res.value;
 }
-async function addDeletedClients(dagWrite, clientIDs, clientGroupIDs) {
-  const { clientIDs: oldClientIDs, clientGroupIDs: oldClientGroupIDs } = await getDeletedClients(dagWrite);
+async function addDeletedClients(dagWrite, deletedClientsToAdd) {
+  const oldDeletedClients = await getDeletedClients(dagWrite);
   return setDeletedClients(
     dagWrite,
-    [...oldClientIDs, ...clientIDs],
-    [...oldClientGroupIDs, ...clientGroupIDs]
+    mergeDeletedClients(oldDeletedClients, deletedClientsToAdd)
   );
 }
-async function removeDeletedClients(dagWrite, clientIDs, clientGroupIDs) {
-  const { clientIDs: oldClientIDs, clientGroupIDs: oldClientGroupIDs } = await getDeletedClients(dagWrite);
-  const newDeletedClients = oldClientIDs.filter(
-    (clientID) => !clientIDs.includes(clientID)
-  );
-  const newDeletedClientGroups = oldClientGroupIDs.filter(
-    (clientGroupID) => !clientGroupIDs.includes(clientGroupID)
+async function confirmDeletedClients(dagWrite, deletedClientIds, deletedClientGroupIds) {
+  const deletedClientIDSet = new Set(deletedClientIds);
+  const deletedClientGroupIDSet = new Set(deletedClientGroupIds);
+  const oldDeletedClients = await getDeletedClients(dagWrite);
+  const clients = new Map(await getClients(dagWrite));
+  for (const clientID of deletedClientIds) {
+    clients.delete(clientID);
+  }
+  for (const clientGroupID of deletedClientGroupIds) {
+    for (const [clientID, client] of clients) {
+      if (client.clientGroupID === clientGroupID) {
+        clients.delete(clientID);
+      }
+    }
+  }
+  await setClients(clients, dagWrite);
+  return setDeletedClients(
+    dagWrite,
+    oldDeletedClients.filter(
+      ({ clientGroupID, clientID }) => !deletedClientGroupIDSet.has(clientGroupID) && !deletedClientIDSet.has(clientID)
+    )
   );
-  return setDeletedClients(dagWrite, newDeletedClients, newDeletedClientGroups);
-}
-function normalize(arr) {
-  return [...new Set(arr)].sort();
 }
 
 // ../shared/src/navigator.ts
@@ -1001,10 +1068,10 @@ var ReadImpl3 = class {
     return this.#closed;
   }
   has(key) {
-    return Promise.resolve(this.#map.has(key));
+    return maybeTransactionIsClosedRejection(this) ?? Promise.resolve(this.#map.has(key));
   }
   get(key) {
-    return Promise.resolve(this.#map.get(key));
+    return maybeTransactionIsClosedRejection(this) ?? Promise.resolve(this.#map.get(key));
   }
 };
 
@@ -1016,6 +1083,9 @@ var WriteImpl3 = class extends WriteImplBase {
     this.#map = map;
   }
   commit() {
+    if (this.closed) {
+      return transactionIsClosedRejection();
+    }
     this._pending.forEach((value, key) => {
       if (value === deleteSentinel) {
         this.#map.delete(key);
@@ -1054,10 +1124,12 @@ var MemStore = class {
     this.#map = map;
   }
   async read() {
+    throwIfStoreClosed(this);
     const release = await this.#rwLock.read();
     return new ReadImpl3(this.#map, release);
   }
   async write() {
+    throwIfStoreClosed(this);
     const release = await this.#rwLock.write();
     return new WriteImpl3(this.#map, release);
   }
@@ -1312,16 +1384,11 @@ async function collectIDBDatabases(idbDatabasesStore, now, maxAge, kvDropStore,
   );
   const dbNamesToRemove = [];
   const dbNamesToKeep = [];
-  const clientIDsToRemove = [];
-  const clientGroupIDsToRemove = [];
-  for (const [
-    dbName,
-    [canCollect, clientIDs, clientGroupIDs]
-  ] of collectResults) {
+  const deletedClientsToRemove = [];
+  for (const [dbName, [canCollect, deletedClients]] of collectResults) {
     if (canCollect) {
       dbNamesToRemove.push(dbName);
-      clientIDsToRemove.push(...clientIDs);
-      clientGroupIDsToRemove.push(...clientGroupIDs);
+      deletedClientsToRemove.push(...deletedClients);
     } else {
       dbNamesToKeep.push(dbName);
     }
@@ -1334,24 +1401,22 @@ async function collectIDBDatabases(idbDatabasesStore, now, maxAge, kvDropStore,
   if (errors.length) {
     throw errors[0];
   }
-  if (clientIDsToRemove.length || clientGroupIDsToRemove.length) {
-    const newClientIDsToRemove = clientIDsToRemove;
-    const newClientGroupIDsToRemove = clientGroupIDsToRemove;
+  if (deletedClientsToRemove.length > 0) {
+    let allDeletedClients = deletedClientsToRemove;
     for (const name of dbNamesToKeep) {
       await withWrite(newDagStore(name), async (dagWrite) => {
-        const { clientIDs, clientGroupIDs } = await addDeletedClients(
+        const newDeletedClients = await addDeletedClients(
           dagWrite,
-          clientIDsToRemove,
-          clientGroupIDsToRemove
+          deletedClientsToRemove
+        );
+        allDeletedClients = mergeDeletedClients(
+          allDeletedClients,
+          newDeletedClients
         );
-        newClientIDsToRemove.push(...clientIDs);
-        newClientGroupIDsToRemove.push(...clientGroupIDs);
       });
     }
-    onClientsDeleted(
-      normalize(newClientIDsToRemove),
-      normalize(newClientGroupIDsToRemove)
-    );
+    const normalizedDeletedClients = normalizeDeletedClients(allDeletedClients);
+    await onClientsDeleted(normalizedDeletedClients);
   }
 }
 async function dropDatabaseInternal(name, idbDatabasesStore, kvDropStore) {
@@ -1428,14 +1493,15 @@ function canDatabaseBeCollectedAndGetDeletedClientIDs(enableMutationRecovery, pe
       }
     }
     const clients = await getClients(read);
-    const { clientIDs, clientGroupIDs } = await getDeletedClients(read);
-    const newClientIDs = [...clientIDs];
-    const newClientGroupIDs = [...clientGroupIDs];
+    const existingDeletedClients = await getDeletedClients(read);
+    const deletedClients = [...existingDeletedClients];
     for (const [clientID, client] of clients) {
-      newClientIDs.push(clientID);
-      newClientGroupIDs.push(client.clientGroupID);
+      deletedClients.push({
+        clientID,
+        clientGroupID: client.clientGroupID
+      });
     }
-    return [true, newClientIDs, newClientGroupIDs];
+    return [true, deletedClients];
   });
 }
 
@@ -1554,7 +1620,7 @@ function table(name) {
     primaryKey: []
   });
 }
-function string3() {
+function string2() {
   return new ColumnBuilder({
     type: "string",
     optional: false,
@@ -3702,20 +3768,21 @@ function gcClients(clientID, dagStore, clientMaxInactiveTime, onClientsDeleted)
       if (id === clientID || now - client.heartbeatTimestampMs <= clientMaxInactiveTime) {
         newClients.set(id, client);
       } else {
-        deletedClients.push(id);
+        deletedClients.push({
+          clientGroupID: client.clientGroupID,
+          clientID: id
+        });
       }
     }
     if (newClients.size === clients.size) {
       return clients;
     }
     await setClients(newClients, dagWrite);
-    const { clientIDs, clientGroupIDs } = await addDeletedClients(
+    const normalizedDeletedClients = await addDeletedClients(
       dagWrite,
-      deletedClients,
-      // gcClients does not delete client groups
-      []
+      deletedClients
     );
-    onClientsDeleted(clientIDs, clientGroupIDs);
+    await onClientsDeleted(normalizedDeletedClients);
     return newClients;
   });
 }
@@ -3723,15 +3790,11 @@ function gcClients(clientID, dagStore, clientMaxInactiveTime, onClientsDeleted)
 // ../replicache/src/persist/client-group-gc.ts
 var GC_INTERVAL_MS = 5 * 60 * 1e3;
 var latestGCUpdate2;
-function initClientGroupGC(dagStore, enableMutationRecovery, onClientsDeleted, lc, signal) {
+function initClientGroupGC(dagStore, enableMutationRecovery, lc, signal) {
   initBgIntervalProcess(
     "ClientGroupGC",
     () => {
-      latestGCUpdate2 = gcClientGroups(
-        dagStore,
-        enableMutationRecovery,
-        onClientsDeleted
-      );
+      latestGCUpdate2 = gcClientGroups(dagStore, enableMutationRecovery);
       return latestGCUpdate2;
     },
     () => GC_INTERVAL_MS,
@@ -3739,7 +3802,7 @@ function initClientGroupGC(dagStore, enableMutationRecovery, onClientsDeleted, l
     signal
   );
 }
-function gcClientGroups(dagStore, enableMutationRecovery, onClientsDeleted) {
+function gcClientGroups(dagStore, enableMutationRecovery) {
   return withWrite(dagStore, async (tx) => {
     const clients = await getClients(tx);
     const clientGroupIDs = /* @__PURE__ */ new Set();
@@ -3756,7 +3819,6 @@ function gcClientGroups(dagStore, enableMutationRecovery, onClientsDeleted) {
       }
     }
     await setClientGroups(clientGroups, tx);
-    onClientsDeleted([], [...removeClientGroups].sort());
     return clientGroups;
   });
 }
@@ -4922,8 +4984,7 @@ var ReplicacheImpl = class {
       enableScheduledRefresh = true,
       enablePullAndPushInOpen = true,
       enableClientGroupForking = true,
-      onClientsDeleted = () => {
-      }
+      onClientsDeleted = () => promiseVoid
     } = implOptions;
     this.#zero = implOptions.zero;
     this.#auth = auth ?? "";
@@ -5068,13 +5129,7 @@ var ReplicacheImpl = class {
       this.#lc,
       signal
     );
-    initClientGroupGC(
-      this.perdag,
-      enableMutationRecovery,
-      onClientsDeleted,
-      this.#lc,
-      signal
-    );
+    initClientGroupGC(this.perdag, enableMutationRecovery, this.#lc, signal);
     initNewClientChannel(
       this.name,
       this.idbName,
@@ -5906,6 +5961,11 @@ function validateOptions(options) {
   }
 }
 
+// ../shared/src/sentinels.ts
+function emptyFunction() {
+}
+var emptyObject = Object.freeze({});
+
 // ../shared/src/subscribable.ts
 var Subscribable = class {
   _listeners = /* @__PURE__ */ new Set();
@@ -6364,7 +6424,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 30;
+var PROTOCOL_VERSION = 31;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 18;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -6591,7 +6651,7 @@ var ActiveClientsManager = class _ActiveClientsManager {
   }
   #removeClient(clientID) {
     if (this.#activeClients.delete(clientID)) {
-      this.onDelete?.(clientID);
+      this.onDelete?.(clientID, this.clientGroupID);
     }
   }
 };
@@ -7433,8 +7493,8 @@ var MemorySource = class _MemorySource {
       indexSort.push(...requestedSort);
     }
     const index = this.#getOrCreateIndex(indexSort, from);
-    const { data, comparator: compare } = index;
-    const comparator2 = (r1, r2) => compare(r1, r2) * (req.reverse ? -1 : 1);
+    const { data, comparator: compare2 } = index;
+    const comparator2 = (r1, r2) => compare2(r1, r2) * (req.reverse ? -1 : 1);
     const startAt = req.start?.row;
     let scanStart;
     if (fetchOrPkConstraint) {
@@ -7634,7 +7694,7 @@ function* genPush(change, exists, connections, setOverlay, setSplitEditOverlay)
   }
   setOverlay(void 0);
 }
-function* generateWithStart(nodes, start, compare) {
+function* generateWithStart(nodes, start, compare2) {
   if (!start) {
     yield* nodes;
     return;
@@ -7643,11 +7703,11 @@ function* generateWithStart(nodes, start, compare) {
   for (const node of nodes) {
     if (!started) {
       if (start.basis === "at") {
-        if (compare(node.row, start.row) >= 0) {
+        if (compare2(node.row, start.row) >= 0) {
           started = true;
         }
       } else if (start.basis === "after") {
-        if (compare(node.row, start.row) > 0) {
+        if (compare2(node.row, start.row) > 0) {
           started = true;
         }
       }
@@ -7657,7 +7717,7 @@ function* generateWithStart(nodes, start, compare) {
     }
   }
 }
-function* generateWithOverlay(startAt, rows, constraint, overlay, splitEditOverlay, connectionIndex, compare, filterPredicate) {
+function* generateWithOverlay(startAt, rows, constraint, overlay, splitEditOverlay, connectionIndex, compare2, filterPredicate) {
   let overlayToApply = void 0;
   if (splitEditOverlay && splitEditOverlay.outputIndex === connectionIndex) {
     overlayToApply = splitEditOverlay;
@@ -7668,12 +7728,12 @@ function* generateWithOverlay(startAt, rows, constraint, overlay, splitEditOverl
     startAt,
     constraint,
     overlayToApply,
-    compare,
+    compare2,
     filterPredicate
   );
-  yield* generateWithOverlayInner(rows, overlays, compare);
+  yield* generateWithOverlayInner(rows, overlays, compare2);
 }
-function computeOverlays(startAt, constraint, overlay, compare, filterPredicate) {
+function computeOverlays(startAt, constraint, overlay, compare2, filterPredicate) {
   let overlays = {
     add: void 0,
     remove: void 0
@@ -7699,7 +7759,7 @@ function computeOverlays(startAt, constraint, overlay, compare, filterPredicate)
       break;
   }
   if (startAt) {
-    overlays = overlaysForStartAt(overlays, startAt, compare);
+    overlays = overlaysForStartAt(overlays, startAt, compare2);
   }
   if (constraint) {
     overlays = overlaysForConstraint(overlays, constraint);
@@ -7709,8 +7769,8 @@ function computeOverlays(startAt, constraint, overlay, compare, filterPredicate)
   }
   return overlays;
 }
-function overlaysForStartAt({ add, remove }, startAt, compare) {
-  const undefinedIfBeforeStartAt = (row) => row === void 0 || compare(row, startAt) < 0 ? void 0 : row;
+function overlaysForStartAt({ add, remove }, startAt, compare2) {
+  const undefinedIfBeforeStartAt = (row) => row === void 0 || compare2(row, startAt) < 0 ? void 0 : row;
   return {
     add: undefinedIfBeforeStartAt(add),
     remove: undefinedIfBeforeStartAt(remove)
@@ -7730,19 +7790,19 @@ function overlaysForFilterPredicate({ add, remove }, filterPredicate) {
     remove: undefinedIfDoesntMatchFilter(remove)
   };
 }
-function* generateWithOverlayInner(rowIterator, overlays, compare) {
+function* generateWithOverlayInner(rowIterator, overlays, compare2) {
   let addOverlayYielded = false;
   let removeOverlaySkipped = false;
   for (const row of rowIterator) {
     if (!addOverlayYielded && overlays.add) {
-      const cmp = compare(overlays.add, row);
+      const cmp = compare2(overlays.add, row);
       if (cmp < 0) {
         addOverlayYielded = true;
         yield { row: overlays.add, relationships: {} };
       }
     }
     if (!removeOverlaySkipped && overlays.remove) {
-      const cmp = compare(overlays.remove, row);
+      const cmp = compare2(overlays.remove, row);
       if (cmp === 0) {
         removeOverlaySkipped = true;
         continue;
@@ -8249,11 +8309,6 @@ async function deleteImpl(tx, arg, schema, ivmBranch) {
   }
 }
 
-// ../shared/src/sentinels.ts
-function emptyFunction() {
-}
-var emptyObject = Object.freeze({});
-
 // ../zero-client/src/client/custom.ts
 var TransactionImpl = class {
   constructor(lc, repTx, schema) {
@@ -8374,30 +8429,40 @@ var DeleteClientsManager = class {
   #send;
   #lc;
   #dagStore;
-  constructor(send2, dagStore, lc) {
+  #clientGroupID;
+  constructor(send2, dagStore, lc, clientGroupID) {
     this.#send = send2;
     this.#dagStore = dagStore;
     this.#lc = lc;
+    this.#clientGroupID = clientGroupID;
   }
   /**
    * This gets called by Replicache when it deletes clients from the persistent
    * storage.
    */
-  onClientsDeleted(clientIDs, clientGroupIDs) {
-    this.#lc.debug?.("DeletedClientsManager, send:", clientIDs);
-    this.#send(["deleteClients", { clientIDs, clientGroupIDs }]);
+  async onClientsDeleted(deletedClients) {
+    this.#lc.debug?.("DeletedClientsManager, send:", deletedClients);
+    const clientGroupID = await this.#clientGroupID;
+    this.#send([
+      "deleteClients",
+      {
+        clientIDs: deletedClients.filter((dc) => dc.clientGroupID === clientGroupID).map((dc) => dc.clientID)
+      }
+    ]);
   }
   /**
    * Zero calls this after it connects to ensure that the server knows about all
    * the clients that might have been deleted locally since the last connection.
    */
   async sendDeletedClientsToServer() {
+    const clientGroupID = await this.#clientGroupID;
     const deleted = await withRead(
       this.#dagStore,
       (dagRead) => getDeletedClients(dagRead)
     );
-    if (deleted.clientIDs.length > 0 || deleted.clientGroupIDs.length > 0) {
-      this.#send(["deleteClients", deleted]);
+    const clientIDs = deleted.filter((d) => d.clientGroupID === clientGroupID).map((d) => d.clientID);
+    if (clientIDs.length > 0) {
+      this.#send(["deleteClients", { clientIDs }]);
       this.#lc.debug?.("DeletedClientsManager, send:", deleted);
     }
   }
@@ -8410,13 +8475,18 @@ var DeleteClientsManager = class {
     if (clientIDs.length > 0 || clientGroupIDs.length > 0) {
       return withWrite(this.#dagStore, async (dagWrite) => {
         this.#lc.debug?.("clientsDeletedOnServer:", clientIDs, clientGroupIDs);
-        await removeDeletedClients(dagWrite, clientIDs, clientGroupIDs);
+        await confirmDeletedClients(dagWrite, clientIDs, clientGroupIDs);
       });
     }
     return promiseVoid;
   }
-  getDeletedClients() {
-    return withRead(this.#dagStore, getDeletedClients);
+  async getDeletedClients() {
+    const deletedClients = await withRead(
+      this.#dagStore,
+      (read) => getDeletedClients(read)
+    );
+    const clientGroupID = await this.#clientGroupID;
+    return deletedClients.filter((d) => d.clientGroupID === clientGroupID);
   }
 };
 
@@ -8668,7 +8738,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.24.2025091100";
+var version2 = "0.24.2025091200";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -10422,7 +10492,7 @@ var Zero = class _Zero {
       enableMutationRecovery: false,
       enablePullAndPushInOpen: false,
       // Zero calls push in its connection management code
-      onClientsDeleted: (clientIDs, clientGroupIDs) => this.#deleteClientsManager.onClientsDeleted(clientIDs, clientGroupIDs),
+      onClientsDeleted: (deletedClients) => this.#deleteClientsManager.onClientsDeleted(deletedClients),
       zero: new ZeroRep(
         this.#zeroContext,
         this.#ivmMain,
@@ -10446,7 +10516,9 @@ var Zero = class _Zero {
       rep.clientGroupID,
       this.clientID,
       this.#closeAbortController.signal,
-      (clientID) => this.#deleteClientsManager.onClientsDeleted([clientID], [])
+      (clientID, clientGroupID) => this.#deleteClientsManager.onClientsDeleted([
+        { clientGroupID, clientID }
+      ])
     );
     const onUpdateNeededCallback = (reason, serverErrorMsg) => {
       if (onUpdateNeeded) {
@@ -10512,7 +10584,8 @@ var Zero = class _Zero {
     this.#deleteClientsManager = new DeleteClientsManager(
       (msg) => this.#send(msg),
       rep.perdag,
-      this.#lc
+      this.#lc,
+      this.#rep.clientGroupID
     );
     this.query = this.#registerQueries(schema);
     reportReloadReason(this.#lc);
@@ -11459,7 +11532,7 @@ var Zero = class _Zero {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-NC6TPMRA.js");
+      const m = await import("./inspector-ZZSIUMBB.js");
       return m.newInspector(
         this.#rep,
         this.#queryManager,
@@ -11520,7 +11593,8 @@ async function createSocket(rep, queryManager, deleteClientsManager, socketOrigi
   lc.info?.("Connecting to", url.toString());
   const WS = mustGetBrowserGlobal("WebSocket");
   const queriesPatchP = rep.query((tx) => queryManager.getQueriesPatch(tx));
-  let deletedClients = await deleteClientsManager.getDeletedClients();
+  const deletedClientsArray = await deleteClientsManager.getDeletedClients();
+  let deletedClients = convertDeletedClientsToBody(deletedClientsArray, clientGroupID);
   let queriesPatch = await queriesPatchP;
   const { activeClients } = activeClientsManager;
   let secProtocol = encodeSecProtocols(
@@ -11576,6 +11650,16 @@ function skipEmptyDeletedClients(deletedClients) {
   data.clientGroupIDs = skipEmptyArray(clientGroupIDs);
   return data;
 }
+function convertDeletedClientsToBody(deletedClients, clientGroupID) {
+  if (deletedClients.length === 0) {
+    return void 0;
+  }
+  const clientIDs = deletedClients.filter((pair) => pair.clientID && pair.clientGroupID === clientGroupID).map((pair) => pair.clientID);
+  if (clientIDs.length === 0) {
+    return void 0;
+  }
+  return { clientIDs };
+}
 function addWebSocketIDFromSocketToLogContext({ url }, lc) {
   const wsid = new URL(url).searchParams.get("wsid") ?? nanoid();
   return addWebSocketIDToLogContext(wsid, lc);
@@ -11616,7 +11700,7 @@ export {
   transformResponseMessageSchema,
   error_kind_enum_exports,
   table,
-  string3 as string,
+  string2 as string,
   number2 as number,
   boolean,
   json,
@@ -11626,4 +11710,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-V2KPKXLX.js.map
+//# sourceMappingURL=chunk-6XNI6IVJ.js.map