@interop/was-react 0.1.2 → 0.1.4

package/dist/storage/syncStatusStore.js

@@ -16,4 +16,44 @@ export const useSyncStatusStore = create()(set => ({
     })),
     reset: () => set({ statuses: {} })
 }));
+/**
+ * Rolls the per-collection replication statuses up to a single aggregate plus
+ * its display copy. With no collections registered it reports `offline`
+ * (local-only, no sync running); otherwise it applies the
+ * error > syncing > synced precedence (`idle` counts as syncing -- a collection
+ * configured but not yet cycled). Kept beside the status vocabulary so the
+ * precedence lives with the store rather than the view; `useSyncStatus` is a
+ * thin subscription over it.
+ *
+ * @param statuses {SyncStatus[]}   the per-collection statuses (store values)
+ * @returns {{ state: SyncRollup, label: string, title: string }}
+ */
+export function deriveSyncRollup(statuses) {
+    if (statuses.length === 0) {
+        return {
+            state: 'offline',
+            label: 'Offline',
+            title: 'Local-only mode -- no storage sync running'
+        };
+    }
+    if (statuses.includes('error')) {
+        return {
+            state: 'error',
+            label: 'Sync error',
+            title: 'A collection failed to sync; retrying'
+        };
+    }
+    if (statuses.includes('syncing') || statuses.includes('idle')) {
+        return {
+            state: 'syncing',
+            label: 'Syncing',
+            title: 'Replicating with your wallet storage'
+        };
+    }
+    return {
+        state: 'synced',
+        label: 'Synced',
+        title: 'All collections replicated'
+    };
+}
 //# sourceMappingURL=syncStatusStore.js.map

package/dist/storage/syncStatusStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncStatusStore.js","sourceRoot":"","sources":["../../src/storage/syncStatusStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAkBhC,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,EAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClE,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,CAClC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACZ,QAAQ,EAAE,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE;KACxD,CAAC,CAAC;IACL,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;CACnC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"syncStatusStore.js","sourceRoot":"","sources":["../../src/storage/syncStatusStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAoBhC,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,EAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClE,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,CAClC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACZ,QAAQ,EAAE,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE;KACxD,CAAC,CAAC;IACL,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;CACnC,CAAC,CAAC,CAAA;AASH;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAsB;IAKrD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,4CAA4C;SACpD,CAAA;IACH,CAAC;IACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,OAAO;YACL,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,uCAAuC;SAC/C,CAAA;IACH,CAAC;IACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9D,OAAO;YACL,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,sCAAsC;SAC9C,CAAA;IACH,CAAC;IACD,OAAO;QACL,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,4BAA4B;KACpC,CAAA;AACH,CAAC"}

package/dist/storage/wasRemoteStore.d.ts

@@ -21,7 +21,9 @@ import type { ZcapClient } from '@interop/ezcap';
 import type { IZcap } from '@interop/data-integrity-core';
 import { WasClient } from '@interop/was-client';
 import type { ParsedGrants } from '../grants.js';
-/** The outcome of a best-effort encryption-marker PUT, for diagnostics. */
+/**
+ * The outcome of a best-effort encryption-marker PUT, for diagnostics.
+ */
 export interface MarkerResult {
     collectionId: string;
     ok: boolean;

package/dist/storage/wasRemoteStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wasRemoteStore.d.ts","sourceRoot":"","sources":["../../src/storage/wasRemoteStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,2EAA2E;AAC3E,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAA;IACpB,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,cAAc;IACzB,SAAgB,GAAG,EAAE,SAAS,CAAA;IAC9B,SAAgB,SAAS,EAAE,MAAM,CAAA;IACjC,SAAgB,OAAO,EAAE,MAAM,CAAA;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;IAEvD,OAAO;IAaP;;;;;;;;;;OAUG;IACH,MAAM,CAAC,UAAU,CAAC,EAChB,MAAM,EACN,UAAU,EACX,EAAE;QACD,MAAM,EAAE,YAAY,CAAA;QACpB,UAAU,EAAE,UAAU,CAAA;KACvB,GAAG,cAAc;IASlB;;;;;;;OAOG;IACH,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS;IAI7D;;;;;;;;;OASG;IACG,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAqB3E"}
+{"version":3,"file":"wasRemoteStore.d.ts","sourceRoot":"","sources":["../../src/storage/wasRemoteStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAG/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAA;IACpB,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,cAAc;IACzB,SAAgB,GAAG,EAAE,SAAS,CAAA;IAC9B,SAAgB,SAAS,EAAE,MAAM,CAAA;IACjC,SAAgB,OAAO,EAAE,MAAM,CAAA;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;IAEvD,OAAO;IAaP;;;;;;;;;;OAUG;IACH,MAAM,CAAC,UAAU,CAAC,EAChB,MAAM,EACN,UAAU,EACX,EAAE;QACD,MAAM,EAAE,YAAY,CAAA;QACpB,UAAU,EAAE,UAAU,CAAA;KACvB,GAAG,cAAc;IASlB;;;;;;;OAOG;IACH,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS;IAI7D;;;;;;;;;OASG;IACG,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAmB3E"}

package/dist/storage/wasRemoteStore.js

@@ -1,5 +1,6 @@
 import { WasClient } from '@interop/was-client';
 import { createEdvEncryption } from '@interop/was-client/edv';
+import { errorStatus, errorMessage } from '../sync/index.js';
 export class WasRemoteStore {
     was;
     serverUrl;
@@ -66,9 +67,8 @@ export class WasRemoteStore {
             return { collectionId, ok: true, status: response.status };
         }
         catch (err) {
-            const status = err.status ??
-                err.response?.status;
-            const message = err instanceof Error ? err.message : String(err);
+            const status = errorStatus(err);
+            const message = errorMessage(err);
             return { collectionId, ok: false, status, error: message };
         }
     }

package/dist/storage/wasRemoteStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"wasRemoteStore.js","sourceRoot":"","sources":["../../src/storage/wasRemoteStore.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAW7D,MAAM,OAAO,cAAc;IACT,GAAG,CAAW;IACd,SAAS,CAAQ;IACjB,OAAO,CAAQ;IACd,eAAe,CAAuB;IAEvD,YAAoB,EAClB,GAAG,EACH,MAAM,EAIP;QACC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,cAAc,CAAA;IAC9C,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,UAAU,CAAC,EAChB,MAAM,EACN,UAAU,EAIX;QACC,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU;YACV,UAAU,EAAE,mBAAmB,CAAC,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;SACnE,CAAC,CAAA;QACF,OAAO,IAAI,cAAc,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED;;;;;;;OAOG;IACH,oBAAoB,CAAC,YAAoB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;IAC3C,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,uBAAuB,CAAC,YAAoB;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC1D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,CAAA;QAC5D,CAAC;QACD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBACtC,UAAU;gBACV,IAAI,EAAE,UAAU,IAAI,CAAC,OAAO,IAAI,YAAY,EAAE;gBAC9C,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;aAC1D,CAAC,CAAA;YACF,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAA;QAC5D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,GACT,GAA2B,CAAC,MAAM;gBAClC,GAA0C,CAAC,QAAQ,EAAE,MAAM,CAAA;YAC9D,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAChE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;QAC5D,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"wasRemoteStore.js","sourceRoot":"","sources":["../../src/storage/wasRemoteStore.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAa5D,MAAM,OAAO,cAAc;IACT,GAAG,CAAW;IACd,SAAS,CAAQ;IACjB,OAAO,CAAQ;IACd,eAAe,CAAuB;IAEvD,YAAoB,EAClB,GAAG,EACH,MAAM,EAIP;QACC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,cAAc,CAAA;IAC9C,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,UAAU,CAAC,EAChB,MAAM,EACN,UAAU,EAIX;QACC,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU;YACV,UAAU,EAAE,mBAAmB,CAAC,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;SACnE,CAAC,CAAA;QACF,OAAO,IAAI,cAAc,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED;;;;;;;OAOG;IACH,oBAAoB,CAAC,YAAoB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;IAC3C,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,uBAAuB,CAAC,YAAoB;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC1D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,CAAA;QAC5D,CAAC;QACD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBACtC,UAAU;gBACV,IAAI,EAAE,UAAU,IAAI,CAAC,OAAO,IAAI,YAAY,EAAE;gBAC9C,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;aAC1D,CAAC,CAAA;YACF,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAA;QAC5D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;YAC/B,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;YACjC,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;QAC5D,CAAC;IACH,CAAC;CACF"}

package/dist/sync/feedMasterPort.d.ts

@@ -2,29 +2,31 @@
  * Copyright (c) 2026 Interop Alliance. All rights reserved.
  */
 /**
- * A thin adapter over a {@link WasSyncPort} that resolves a resource's current
- * master state (for the 412 conflict re-read) from the CHANGES-FEED BODY rather
- * than the base port's `GET` ETag header.
+ * The `get` half of a {@link WasSyncPort}: resolves a resource's current master
+ * state (for the 412 conflict re-read) from the CHANGES-FEED BODY. Wraps a
+ * {@link WasSyncBasePort} (query + conditional writes) and adds the `get` the
+ * conflict assembler needs, producing a full {@link WasSyncPort}.
  *
- * Why this exists: the mutable-head model settles a 412 by re-reading the
- * resource's current `version` and comparing payloads (LWW). The verbatim
- * `wasSyncPort.get()` reads that `version` from the response's `etag` header --
- * which a browser hides on a CROSS-ORIGIN response unless the server sends
- * `Access-Control-Expose-Headers: etag`. A server that does not expose it makes
- * cross-origin `get()` report `version: 0`, which makes the loser of a push race
- * re-push forever with a stale `If-Match` and never converge. The `changes` feed
- * carries `version` (and `data`, `_deleted`, ...) in the JSON BODY, which CORS
- * never strips, so resolving the master from the feed is both correct and
- * origin-independent. Normal pull/push are unaffected (they already read
- * `version` from the feed body), so only `get` is overridden.
+ * Why the feed body rather than a `GET` ETag header: the mutable-head model
+ * settles a 412 by re-reading the resource's current `version` and comparing
+ * payloads (LWW). A raw `GET` reads that `version` from the response's `etag`
+ * header -- which a browser hides on a CROSS-ORIGIN response unless the server
+ * sends `Access-Control-Expose-Headers: etag`. A server that does not expose it
+ * would make a cross-origin re-read report `version: 0`, so the loser of a push
+ * race would re-push forever with a stale `If-Match` and never converge. The
+ * `changes` feed carries `version` (and `data`, `_deleted`, ...) in the JSON
+ * BODY, which CORS never strips, so resolving the master from the feed is both
+ * correct and origin-independent. Normal pull/push are unaffected (they already
+ * read `version` from the feed body).
  */
-import type { WasSyncPort } from './types.js';
+import type { WasSyncBasePort, WasSyncPort } from './types.js';
 /**
- * Wraps a base port so its `get` resolves the master state from the changes feed.
- * `query`, `putContent`, `deleteContent`, and `putMeta` pass straight through.
+ * Wraps a base port with a `get` that resolves the master state from the changes
+ * feed. `query`, `putContent`, `deleteContent`, and `putMeta` pass straight
+ * through.
  *
- * @param base {WasSyncPort}
+ * @param base {WasSyncBasePort}
  * @returns {WasSyncPort}
  */
-export declare function withFeedMasterRead(base: WasSyncPort): WasSyncPort;
+export declare function withFeedMasterRead(base: WasSyncBasePort): WasSyncPort;
 //# sourceMappingURL=feedMasterPort.d.ts.map

package/dist/sync/feedMasterPort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feedMasterPort.d.ts","sourceRoot":"","sources":["../../src/sync/feedMasterPort.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,EAIV,WAAW,EAEZ,MAAM,YAAY,CAAA;AA4BnB;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAyBjE"}
+{"version":3,"file":"feedMasterPort.d.ts","sourceRoot":"","sources":["../../src/sync/feedMasterPort.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAIV,eAAe,EACf,WAAW,EAEZ,MAAM,YAAY,CAAA;AA4BnB;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,WAAW,CAuCrE"}

package/dist/sync/feedMasterPort.js

@@ -23,10 +23,11 @@ function toMasterState(doc) {
     return master;
 }
 /**
- * Wraps a base port so its `get` resolves the master state from the changes feed.
- * `query`, `putContent`, `deleteContent`, and `putMeta` pass straight through.
+ * Wraps a base port with a `get` that resolves the master state from the changes
+ * feed. `query`, `putContent`, `deleteContent`, and `putMeta` pass straight
+ * through.
  *
- * @param base {WasSyncPort}
+ * @param base {WasSyncBasePort}
  * @returns {WasSyncPort}
  */
 export function withFeedMasterRead(base) {
@@ -46,12 +47,24 @@ export function withFeedMasterRead(base) {
                 if (found) {
                     return toMasterState(found);
                 }
+                // Reached the end of the feed without finding it: the resource is
+                // genuinely absent (a delete/delete race), so report `null` and let the
+                // conflict assembler synthesize a tombstone.
                 if (next === null || documents.length === 0) {
-                    break;
+                    return null;
                 }
                 checkpoint = next;
             }
-            return null;
+            // The page budget ran out before the feed's end. The feed is keyset-
+            // ordered ascending on `updatedAt`, so a just-conflicted resource sits at
+            // the tail -- the least-reachable position -- and may well be past the
+            // cap. Reporting `null` here would fabricate a false tombstone in the
+            // conflict assembler and drop the winner's payload. Throw instead: RxDB
+            // treats a thrown push-handler error as retryable, so the whole
+            // replication cycle retries rather than diverging.
+            throw new Error(`Feed master re-read for resource "${id}" exhausted its ` +
+                `${MAX_PAGES}-page scan budget without reaching the end of the ` +
+                `changes feed; retrying.`);
         }
     };
 }

package/dist/sync/feedMasterPort.js.map

@@ -1 +1 @@
-{"version":3,"file":"feedMasterPort.js","sourceRoot":"","sources":["../../src/sync/feedMasterPort.ts"],"names":[],"mappings":"AA4BA,gFAAgF;AAChF,oEAAoE;AACpE,MAAM,SAAS,GAAG,EAAE,CAAA;AACpB,MAAM,SAAS,GAAG,GAAG,CAAA;AAErB;;GAEG;AACH,SAAS,aAAa,CAAC,GAAY;IACjC,MAAM,MAAM,GAAgB;QAC1B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,OAAO,EAAE,GAAG,CAAC,QAAQ;KACtB,CAAA;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC,IAAY,CAAA;IAChC,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAA;IACtC,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,MAAc,CAAA;IACpC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAiB;IAClD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QACtC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QAChC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE;YACd,IAAI,UAAsC,CAAA;YAC1C,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;gBAC5C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;oBACvD,GAAG,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,CAAC;oBAC/C,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAA;gBACF,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAClD,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,aAAa,CAAC,KAAK,CAAC,CAAA;gBAC7B,CAAC;gBACD,IAAI,IAAI,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC5C,MAAK;gBACP,CAAC;gBACD,UAAU,GAAG,IAAI,CAAA;YACnB,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"feedMasterPort.js","sourceRoot":"","sources":["../../src/sync/feedMasterPort.ts"],"names":[],"mappings":"AA8BA,gFAAgF;AAChF,oEAAoE;AACpE,MAAM,SAAS,GAAG,EAAE,CAAA;AACpB,MAAM,SAAS,GAAG,GAAG,CAAA;AAErB;;GAEG;AACH,SAAS,aAAa,CAAC,GAAY;IACjC,MAAM,MAAM,GAAgB;QAC1B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,OAAO,EAAE,GAAG,CAAC,QAAQ;KACtB,CAAA;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC,IAAY,CAAA;IAChC,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAA;IACtC,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,MAAc,CAAA;IACpC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAqB;IACtD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QACtC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QAChC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE;YACd,IAAI,UAAsC,CAAA;YAC1C,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;gBAC5C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;oBACvD,GAAG,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,CAAC;oBAC/C,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAA;gBACF,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAClD,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,aAAa,CAAC,KAAK,CAAC,CAAA;gBAC7B,CAAC;gBACD,kEAAkE;gBAClE,wEAAwE;gBACxE,6CAA6C;gBAC7C,IAAI,IAAI,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC5C,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,UAAU,GAAG,IAAI,CAAA;YACnB,CAAC;YACD,qEAAqE;YACrE,0EAA0E;YAC1E,uEAAuE;YACvE,sEAAsE;YACtE,wEAAwE;YACxE,gEAAgE;YAChE,mDAAmD;YACnD,MAAM,IAAI,KAAK,CACb,qCAAqC,EAAE,kBAAkB;gBACvD,GAAG,SAAS,oDAAoD;gBAChE,yBAAyB,CAC5B,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/sync/index.d.ts

@@ -11,9 +11,9 @@
 export { createWasReplication } from './wasReplication.js';
 export { syncedDocSchema } from './syncedDocSchema.js';
 export { createPullHandler, wireDocToRxDoc } from './changesQuery.js';
-export { createPushHandler, formatEtag } from './pushWrites.js';
-export { WasSyncConflictError, type Json, type SyncCheckpoint, type WireDoc, type SyncedDoc, type MasterState, type WasSyncPort } from './types.js';
-export { createWasSyncPort } from './wasSyncPort.js';
+export { createPushHandler, formatEtag, type PushWriteAck } from './pushWrites.js';
+export { WasSyncConflictError, WasSyncAuthError, type Json, type SyncCheckpoint, type WireDoc, type SyncedDoc, type MasterState, type WasSyncBasePort, type WasSyncPort } from './types.js';
+export { createWasSyncPort, errorStatus, errorMessage } from './wasSyncPort.js';
 export { withFeedMasterRead } from './feedMasterPort.js';
 export { createDocCipher, isEncryptedEnvelope, type DocCipher } from './docCipher.js';
 export { makeLwwConflictHandler } from './lwwConflictHandler.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EACL,oBAAoB,EACpB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,WAAW,EACjB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA"}

package/dist/sync/index.js

@@ -12,8 +12,8 @@ export { createWasReplication } from './wasReplication.js';
 export { syncedDocSchema } from './syncedDocSchema.js';
 export { createPullHandler, wireDocToRxDoc } from './changesQuery.js';
 export { createPushHandler, formatEtag } from './pushWrites.js';
-export { WasSyncConflictError } from './types.js';
-export { createWasSyncPort } from './wasSyncPort.js';
+export { WasSyncConflictError, WasSyncAuthError } from './types.js';
+export { createWasSyncPort, errorStatus, errorMessage } from './wasSyncPort.js';
 export { withFeedMasterRead } from './feedMasterPort.js';
 export { createDocCipher, isEncryptedEnvelope } from './docCipher.js';
 export { makeLwwConflictHandler } from './lwwConflictHandler.js';

package/dist/sync/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EACL,oBAAoB,EAOrB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,mBAAmB,EAEpB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEX,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAQjB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,mBAAmB,EAEpB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA"}

package/dist/sync/lwwConflictHandler.d.ts

@@ -19,10 +19,42 @@
  * every replica compares that same master against its own local edit, and the
  * `payloadWins` comparator is a total order over `(updatedAt, deviceId)`, so the
  * globally-latest payload wins on every replica with no coordination.
+ *
+ * The resolution rules, in order:
+ *
+ * 1. Version-only conflict: when the real master's whole content (`data` +
+ *    `custom` + `_deleted`) still equals the assumed master's, the server holds
+ *    nothing newer than what this replica last synced -- the 412 came from a
+ *    stale `If-Match` (typically our own earlier write racing its feed echo).
+ *    The local state (edit or tombstone) is re-asserted and re-pushed against
+ *    the corrected version. Without this rule a local delete would be dropped by
+ *    rule 5 and the entity would silently resurrect. `custom` MUST be part of
+ *    this comparison, or a concurrent metadata-only edit committed on the server
+ *    would be misclassified here and clobbered (rule 2 is what settles it).
+ * 2. Metadata conflict: `data` and `_deleted` are unchanged from the assumed
+ *    master but `custom` differs -- a metadata-only edit committed on the server
+ *    since this replica last synced (another device won the `/meta` race).
+ *    Metadata carries no LWW timestamp of its own (the payload `updatedAt` lives
+ *    in the encrypted `data`, which is equal on both sides here), so there is no
+ *    payload to compare; the sound, replica-independent default is that the
+ *    server-committed state wins -- the real master is adopted for `custom`.
+ *    Without this rule the equal-`data` case would fall through to rule 3, where
+ *    the two payloads compare equal and the tie keeps the local (stale) `custom`,
+ *    silently clobbering the committed metadata.
+ * 3. Both sides carry an LWW payload: pure payload LWW via `payloadWins`.
+ * 4. A live local edit vs an incomparable remote (e.g. a remote tombstone):
+ *    the edit wins and is re-pushed (resurrection).
+ * 5. Everything else -- a local tombstone vs a REAL remote content change, or
+ *    both sides incomparable: the master wins. Together with rule 4 this makes
+ *    the delete-vs-concurrent-edit rule "the edit wins" on every replica: a
+ *    tombstone carries no LWW payload of its own, so a genuine racing edit
+ *    deterministically survives, whichever write reached the server first.
  */
 import type { WithDeleted } from 'rxdb/plugins/core';
 import type { Json, SyncedDoc } from './types.js';
-/** The LWW fields read out of a decrypted entity payload. */
+/**
+ * The LWW fields read out of a decrypted entity payload.
+ */
 interface LwwPayload {
     updatedAt: string;
     deviceId: string;
@@ -40,9 +72,10 @@ interface LwwPayload {
  */
 export declare function makeLwwConflictHandler(decrypt: (envelope: Json) => Promise<Json>, payloadWins?: (remote: LwwPayload, local: LwwPayload) => boolean): {
     isEqual(a: WithDeleted<SyncedDoc>, b: WithDeleted<SyncedDoc>): boolean;
-    resolve({ realMasterState, newDocumentState }: {
+    resolve({ realMasterState, newDocumentState, assumedMasterState }: {
         realMasterState: WithDeleted<SyncedDoc>;
         newDocumentState: WithDeleted<SyncedDoc>;
+        assumedMasterState?: WithDeleted<SyncedDoc>;
     }): Promise<WithDeleted<SyncedDoc>>;
 };
 export {};

package/dist/sync/lwwConflictHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lwwConflictHandler.d.ts","sourceRoot":"","sources":["../../src/sync/lwwConflictHandler.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAGjD,6DAA6D;AAC7D,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAiCD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,EAC1C,WAAW,GAAE,CACX,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,UAAU,KACd,OAA2B;eAKnB,WAAW,CAAC,SAAS,CAAC,KAAK,WAAW,CAAC,SAAS,CAAC,GAAG,OAAO;mDAOnE;QACD,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACvC,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;KACzC,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;EAmBtC"}
+{"version":3,"file":"lwwConflictHandler.d.ts","sourceRoot":"","sources":["../../src/sync/lwwConflictHandler.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAGjD;;GAEG;AACH,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAmCD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,EAC1C,WAAW,GAAE,CACX,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,UAAU,KACd,OAA2B;eAQnB,WAAW,CAAC,SAAS,CAAC,KAAK,WAAW,CAAC,SAAS,CAAC,GAAG,OAAO;uEAcnE;QACD,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACvC,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACxC,kBAAkB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;KAC5C,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;EAoDtC"}

package/dist/sync/lwwConflictHandler.js

@@ -1,5 +1,7 @@
 import { remotePayloadWins } from './lww.js';
-/** Structural equality of two opaque bodies (used for the fast `isEqual`). */
+/**
+ * Structural equality of two opaque bodies (used for the fast `isEqual`).
+ */
 function bodiesEqual(a, b) {
     return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
 }
@@ -37,27 +39,63 @@ async function lwwFieldsOf(doc, decrypt) {
  */
 export function makeLwwConflictHandler(decrypt, payloadWins = remotePayloadWins) {
     return {
-        // Non-async and fast, as RxDB requires: no real conflict when the opaque
-        // content + deletion flag already agree (e.g. our own write echoing back).
+        // Non-async and fast, as RxDB requires. The server revisions (`version` /
+        // `metaVersion`) participate deliberately: our own write's feed echo comes
+        // back byte-identical but one revision ahead, and it must NOT compare
+        // equal, or the higher version is never adopted and every later
+        // conditional write sends a stale `If-Match` (a guaranteed 412).
         isEqual(a, b) {
-            return a._deleted === b._deleted && bodiesEqual(a.data, b.data);
+            return (a._deleted === b._deleted &&
+                a.version === b.version &&
+                a.metaVersion === b.metaVersion &&
+                bodiesEqual(a.data, b.data) &&
+                bodiesEqual(a.custom, b.custom));
         },
-        async resolve({ realMasterState, newDocumentState }) {
+        async resolve({ realMasterState, newDocumentState, assumedMasterState }) {
+            // Rule 1 -- version-only conflict: the master's whole content (`data` +
+            // `custom`) is exactly what this replica last synced (only the revision
+            // moved, e.g. our own write racing its feed echo), so nothing remote is
+            // actually newer. Re-assert the local state -- crucially including a local
+            // TOMBSTONE, which rule 5 would otherwise drop (the silent-resurrection
+            // bug). `custom` is part of this equality so a concurrent metadata-only
+            // edit is NOT misclassified here (rule 2 handles it).
+            if (assumedMasterState !== undefined &&
+                realMasterState._deleted === assumedMasterState._deleted &&
+                bodiesEqual(realMasterState.data, assumedMasterState.data) &&
+                bodiesEqual(realMasterState.custom, assumedMasterState.custom)) {
+                return newDocumentState;
+            }
+            // Rule 2 -- metadata conflict: `data` and `_deleted` are unchanged from
+            // the assumed master, but `custom` moved on the server (a metadata-only
+            // edit that won the `/meta` race on another device). Metadata has no LWW
+            // timestamp of its own -- the payload `updatedAt` lives in `data`, equal
+            // on both sides here -- so the sound, replica-independent default is that
+            // the server-committed state wins: adopt the real master for `custom`.
+            // Without this rule the equal-`data` case would reach rule 3 with two
+            // equal payloads and the tie would keep the local (stale) metadata.
+            if (assumedMasterState !== undefined &&
+                realMasterState._deleted === assumedMasterState._deleted &&
+                bodiesEqual(realMasterState.data, assumedMasterState.data) &&
+                !bodiesEqual(realMasterState.custom, assumedMasterState.custom)) {
+                return realMasterState;
+            }
             const [remote, local] = await Promise.all([
                 lwwFieldsOf(realMasterState, decrypt),
                 lwwFieldsOf(newDocumentState, decrypt)
             ]);
-            // Both sides comparable: pure payload LWW.
+            // Rule 3 -- both sides comparable: pure payload LWW.
             if (remote && local) {
                 return payloadWins(remote, local) ? realMasterState : newDocumentState;
             }
-            // A live local edit against a remote tombstone (or otherwise
+            // Rule 4 -- a live local edit against a remote tombstone (or otherwise
             // incomparable remote): keep the edit (resurrect / re-assert the write).
             if (local && !remote) {
                 return newDocumentState;
             }
-            // Everything else (local tombstone, both incomparable): the master wins,
-            // which is deterministic and convergent across replicas.
+            // Rule 5 -- everything else (a local tombstone racing a REAL remote
+            // content change, or both incomparable): the master wins, which is
+            // deterministic and convergent across replicas (the edit survives the
+            // delete on every device).
             return realMasterState;
         }
     };

package/dist/sync/lwwConflictHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"lwwConflictHandler.js","sourceRoot":"","sources":["../../src/sync/lwwConflictHandler.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAQ5C,8EAA8E;AAC9E,SAAS,WAAW,CAAC,CAAmB,EAAE,CAAmB;IAC3D,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI,CAAC,CAAA;AAChE,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,WAAW,CACxB,GAA2B,EAC3B,OAA0C;IAE1C,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAwB,CAAA;QAChE,IACE,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;YACrC,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EACpC,CAAC;YACD,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAA;QACrE,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAA0C,EAC1C,cAGe,iBAAiB;IAEhC,OAAO;QACL,yEAAyE;QACzE,2EAA2E;QAC3E,OAAO,CAAC,CAAyB,EAAE,CAAyB;YAC1D,OAAO,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;QACjE,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,EACZ,eAAe,EACf,gBAAgB,EAIjB;YACC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACxC,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC;gBACrC,WAAW,CAAC,gBAAgB,EAAE,OAAO,CAAC;aACvC,CAAC,CAAA;YACF,2CAA2C;YAC3C,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;gBACpB,OAAO,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAA;YACxE,CAAC;YACD,6DAA6D;YAC7D,yEAAyE;YACzE,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,OAAO,gBAAgB,CAAA;YACzB,CAAC;YACD,yEAAyE;YACzE,yDAAyD;YACzD,OAAO,eAAe,CAAA;QACxB,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"lwwConflictHandler.js","sourceRoot":"","sources":["../../src/sync/lwwConflictHandler.ts"],"names":[],"mappings":"AAsDA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAU5C;;GAEG;AACH,SAAS,WAAW,CAAC,CAAmB,EAAE,CAAmB;IAC3D,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI,CAAC,CAAA;AAChE,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,WAAW,CACxB,GAA2B,EAC3B,OAA0C;IAE1C,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAwB,CAAA;QAChE,IACE,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;YACrC,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EACpC,CAAC;YACD,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAA;QACrE,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAA0C,EAC1C,cAGe,iBAAiB;IAEhC,OAAO;QACL,0EAA0E;QAC1E,2EAA2E;QAC3E,sEAAsE;QACtE,gEAAgE;QAChE,iEAAiE;QACjE,OAAO,CAAC,CAAyB,EAAE,CAAyB;YAC1D,OAAO,CACL,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;gBACzB,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO;gBACvB,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW;gBAC/B,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC3B,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAChC,CAAA;QACH,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,EACZ,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAKnB;YACC,wEAAwE;YACxE,wEAAwE;YACxE,wEAAwE;YACxE,2EAA2E;YAC3E,wEAAwE;YACxE,wEAAwE;YACxE,sDAAsD;YACtD,IACE,kBAAkB,KAAK,SAAS;gBAChC,eAAe,CAAC,QAAQ,KAAK,kBAAkB,CAAC,QAAQ;gBACxD,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC;gBAC1D,WAAW,CAAC,eAAe,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAC9D,CAAC;gBACD,OAAO,gBAAgB,CAAA;YACzB,CAAC;YACD,wEAAwE;YACxE,wEAAwE;YACxE,yEAAyE;YACzE,yEAAyE;YACzE,0EAA0E;YAC1E,uEAAuE;YACvE,sEAAsE;YACtE,oEAAoE;YACpE,IACE,kBAAkB,KAAK,SAAS;gBAChC,eAAe,CAAC,QAAQ,KAAK,kBAAkB,CAAC,QAAQ;gBACxD,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC;gBAC1D,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAC/D,CAAC;gBACD,OAAO,eAAe,CAAA;YACxB,CAAC;YACD,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACxC,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC;gBACrC,WAAW,CAAC,gBAAgB,EAAE,OAAO,CAAC;aACvC,CAAC,CAAA;YACF,qDAAqD;YACrD,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;gBACpB,OAAO,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAA;YACxE,CAAC;YACD,uEAAuE;YACvE,yEAAyE;YACzE,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,OAAO,gBAAgB,CAAA;YACzB,CAAC;YACD,oEAAoE;YACpE,mEAAmE;YACnE,sEAAsE;YACtE,2BAA2B;YAC3B,OAAO,eAAe,CAAA;QACxB,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/sync/pushWrites.d.ts

@@ -20,16 +20,29 @@
  * `/meta` write to a resource that does not yet exist.
  *
  * RxDB's push contract asks only for *conflicts* back (the current master state
- * of each rejected row); a successful write's new `version` / `metaVersion` is
- * not returned here -- it is picked up on the next pull, where our own write
- * echoes back as a remote change (idempotent, since the bodies are
- * byte-identical). We deliberately do not capture the `204` ETag to short-circuit
- * that echo: doing so would require a side write to the local revision fields
- * from inside the push handler, which risks a re-push loop, for no correctness
- * gain on immutable content-addressed collections.
+ * of each rejected row), so a successful write's new `version` / `metaVersion`
+ * is reported out-of-band: the response ETag of each accepted write is captured
+ * and handed to the optional `onWriteAccepted` callback, which writes the acked
+ * revision back into the local row (see `createWasReplication`). Without that
+ * write-back the local `version` would stay one revision behind the server and
+ * every subsequent conditional write would send a stale `If-Match` and 412. The
+ * write-back only touches the revision fields (never `data` / `updatedAt`), so
+ * the follow-up push cycle it triggers finds nothing changed to write and
+ * settles -- no re-push loop.
  */
 import type { WithDeleted } from 'rxdb/plugins/core';
 import type { SyncedDoc, WasSyncPort } from './types.js';
+/**
+ * The acked server revisions of one row's accepted writes: the new content
+ * `version` (from a `PUT /:id` or `DELETE /:id` response ETag) and/or the new
+ * `metaVersion` (from a `PUT /:id/meta` response ETag). Absent fields mean the
+ * corresponding write did not run or its response carried no ETag.
+ */
+export interface PushWriteAck {
+    id: string;
+    version?: number;
+    metaVersion?: number;
+}
 /**
  * Formats a master revision (`version` or `metaVersion`) as the quoted strong
  * ETag the server compares `If-Match` against (revision `3` becomes `"3"`).
@@ -45,12 +58,18 @@ export declare function formatEtag(revision: number): string;
  * Rows are pushed concurrently; if any non-conflict error is thrown the whole
  * batch rejects (RxDB re-sends it later), matching RxDB's all-or-nothing retry.
  *
+ * Each accepted write's acked server revision(s) are handed to
+ * `onWriteAccepted` (when supplied) as soon as that row's writes settle, so the
+ * caller can write the new `version` / `metaVersion` back into the local row
+ * and keep subsequent conditional writes' `If-Match` in step with the server.
+ *
  * @param port {WasSyncPort}
+ * @param [onWriteAccepted] {(ack: PushWriteAck) => Promise<void>}
  * @returns {(rows: Array<{ newDocumentState: WithDeleted<SyncedDoc>,
  *   assumedMasterState?: WithDeleted<SyncedDoc> }>) =>
  *   Promise<WithDeleted<SyncedDoc>[]>}
  */
-export declare function createPushHandler(port: WasSyncPort): (rows: Array<{
+export declare function createPushHandler(port: WasSyncPort, onWriteAccepted?: (ack: PushWriteAck) => Promise<void>): (rows: Array<{
     newDocumentState: WithDeleted<SyncedDoc>;
     assumedMasterState?: WithDeleted<SyncedDoc>;
 }>) => Promise<WithDeleted<SyncedDoc>[]>;

package/dist/sync/pushWrites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pushWrites.d.ts","sourceRoot":"","sources":["../../src/sync/pushWrites.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAqB,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAG3E;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEnD;AA0JD;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,IAE/C,MAAM,KAAK,CAAC;IACV,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACxC,kBAAkB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;CAC5C,CAAC,KACD,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAcrC"}
+{"version":3,"file":"pushWrites.d.ts","sourceRoot":"","sources":["../../src/sync/pushWrites.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAqB,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAG3E;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEnD;AA4KD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,EACjB,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,IAGpD,MAAM,KAAK,CAAC;IACV,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACxC,kBAAkB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;CAC5C,CAAC,KACD,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAoBrC"}

package/dist/sync/pushWrites.js

@@ -67,35 +67,41 @@ async function assembleConflict({ port, id, fallbackUpdatedAt, fallbackVersion }
 /**
  * Sends one local change to the remote Collection as up to two conditional
  * writes (content, then metadata). Returns the master-state conflict entry on a
- * `412` at either step, or `null` on success.
+ * `412` at either step (with `ack: null`), or the accepted writes' acked
+ * revisions on success (`ack: null` when no response carried a revision).
  *
  * @param options {object}
  * @param options.port {WasSyncPort}
  * @param options.newDocumentState {WithDeleted<SyncedDoc>}
  * @param [options.assumedMasterState] {WithDeleted<SyncedDoc>}
- * @returns {Promise<WithDeleted<SyncedDoc> | null>}
+ * @returns {Promise<{ conflict: WithDeleted<SyncedDoc> | null,
+ *   ack: PushWriteAck | null }>}
  */
 async function pushRow({ port, newDocumentState, assumedMasterState }) {
     const { id } = newDocumentState;
     const assumedVersion = assumedMasterState?.version;
     const isCreate = assumedMasterState === undefined;
     try {
+        const ack = { id };
         if (newDocumentState._deleted) {
             // Delete supersedes any metadata write: drop the content, tombstone wins.
-            await port.deleteContent({
+            const ackedVersion = await port.deleteContent({
                 id,
                 ...(assumedVersion !== undefined && {
                     ifMatch: formatEtag(assumedVersion)
                 })
             });
-            return null;
+            if (ackedVersion !== undefined) {
+                ack.version = ackedVersion;
+            }
+            return { conflict: null, ack: ack.version !== undefined ? ack : null };
         }
         // Content half: write on create, or when the content body changed. For a
         // content-addressed collection the update case never fires (an immutable
         // body for a stable id), but it is handled for generality.
         const contentChanged = isCreate || !bodiesEqual(newDocumentState.data, assumedMasterState?.data);
         if (contentChanged) {
-            await port.putContent({
+            const ackedVersion = await port.putContent({
                 id,
                 data: newDocumentState.data ?? null,
                 ...(isCreate
@@ -104,30 +110,38 @@ async function pushRow({ port, newDocumentState, assumedMasterState }) {
                         ifMatch: formatEtag(assumedVersion)
                     })
             });
+            if (ackedVersion !== undefined) {
+                ack.version = ackedVersion;
+            }
         }
         // Metadata half: write when the resource has metadata and it changed. On a
         // create this runs after the content write (the resource must exist first).
         const metadataChanged = !bodiesEqual(newDocumentState.custom, assumedMasterState?.custom);
         if (newDocumentState.custom !== undefined && metadataChanged) {
             const assumedMetaVersion = assumedMasterState?.metaVersion;
-            await port.putMeta({
+            const ackedMetaVersion = await port.putMeta({
                 id,
                 custom: newDocumentState.custom,
                 ...(assumedMetaVersion !== undefined
                     ? { ifMatch: formatEtag(assumedMetaVersion) }
                     : { ifNoneMatch: true })
             });
+            if (ackedMetaVersion !== undefined) {
+                ack.metaVersion = ackedMetaVersion;
+            }
         }
-        return null;
+        const hasAck = ack.version !== undefined || ack.metaVersion !== undefined;
+        return { conflict: null, ack: hasAck ? ack : null };
     }
     catch (err) {
         if (err instanceof WasSyncConflictError) {
-            return assembleConflict({
+            const conflict = await assembleConflict({
                 port,
                 id,
                 fallbackUpdatedAt: newDocumentState.updatedAt,
                 fallbackVersion: assumedVersion ?? newDocumentState.version
             });
+            return { conflict, ack: null };
         }
         // Any non-conflict error (network, 5xx, auth) propagates so RxDB retries
         // the whole batch with backoff.
@@ -141,19 +155,33 @@ async function pushRow({ port, newDocumentState, assumedMasterState }) {
  * Rows are pushed concurrently; if any non-conflict error is thrown the whole
  * batch rejects (RxDB re-sends it later), matching RxDB's all-or-nothing retry.
  *
+ * Each accepted write's acked server revision(s) are handed to
+ * `onWriteAccepted` (when supplied) as soon as that row's writes settle, so the
+ * caller can write the new `version` / `metaVersion` back into the local row
+ * and keep subsequent conditional writes' `If-Match` in step with the server.
+ *
  * @param port {WasSyncPort}
+ * @param [onWriteAccepted] {(ack: PushWriteAck) => Promise<void>}
  * @returns {(rows: Array<{ newDocumentState: WithDeleted<SyncedDoc>,
  *   assumedMasterState?: WithDeleted<SyncedDoc> }>) =>
  *   Promise<WithDeleted<SyncedDoc>[]>}
  */
-export function createPushHandler(port) {
+export function createPushHandler(port, onWriteAccepted) {
     return async function push(rows) {
-        const results = await Promise.all(rows.map(row => pushRow({
-            port,
-            newDocumentState: row.newDocumentState,
-            assumedMasterState: row.assumedMasterState
-        })));
-        return results.filter((conflict) => conflict !== null);
+        const results = await Promise.all(rows.map(async (row) => {
+            const result = await pushRow({
+                port,
+                newDocumentState: row.newDocumentState,
+                assumedMasterState: row.assumedMasterState
+            });
+            if (result.ack !== null && onWriteAccepted !== undefined) {
+                await onWriteAccepted(result.ack);
+            }
+            return result;
+        }));
+        return results
+            .map(result => result.conflict)
+            .filter((conflict) => conflict !== null);
     };
 }
 //# sourceMappingURL=pushWrites.js.map