@interop/wallet-core 0.90.0 → 0.91.0

package/dist/recovery/recoveryWebvh.js

@@ -210,6 +210,18 @@ export async function removeRecoveryKey({ idStore, signer, recovery, ladderSeed,
  *   never-published CLIENT's committed hashes, inert orphans in
  *   `nextKeyHashes` exactly as on the self-enrollment seam (keys of a lost
  *   random seed; nothing can reveal them)
+ * @param [options.resume] {object}   `{ builtOnHead: { scid, versionId } }`
+ *   -- the resume marker the torn run's pending record recorded, the head
+ *   the seam handed it. Supplied, each attempt's first read is refused with
+ *   `BuiltOnHeadNotReachedError` unless the served log carries that SCID and
+ *   an entry with that `versionId`, as the transient continuation's resume
+ *   is. The chain-head pin covers the same fork only once it has advanced
+ *   past the reveal entry, and a tab death between the publish and the
+ *   pin's advance leaves the pin one entry short, so the marker is what
+ *   refuses a served log truncated to the pre-reveal head, where the
+ *   completion check would otherwise build a second reveal entry. Both
+ *   members must be non-empty strings; a malformed marker is refused with a
+ *   `TypeError` before any read
  * @param [options.expectedDid] {string}   the account DID the log must resolve
  *   to, where the recovering flow already knows it. Every read both entries
  *   are built on is checked against the store's own chain-head pin (a served
@@ -247,7 +259,7 @@ export async function recoverWebvhClient(options) {
         signingKeyMultibase: options.newClientKeys.signingKeyMultibase,
         keyAgreementKeyMultibase: options.newClientKeys.keyAgreementKeyMultibase
     });
-    const { newClientKeys, newClientUpdateSeeds, onCommitted, expectedDid, ...shared } = options;
+    const { newClientKeys, newClientUpdateSeeds, onCommitted, resume, expectedDid, ...shared } = options;
     // One run outside the conflict retry: a lost compare-and-swap re-enters
     // the body under the same run, and the emitter reports each stage once.
     const events = ceremonyEvents({
@@ -281,6 +293,7 @@ export async function recoverWebvhClient(options) {
             });
             return { methods, ...relations };
         },
+        ...(resume !== undefined ? { builtOnHead: resume.builtOnHead } : {}),
         ...(expectedDid !== undefined ? { expectedDid } : {}),
         events
     })), spendOutcome);

package/dist/recovery/recoveryWebvh.js.map

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

package/dist/sync/contactsConflict.d.ts

@@ -5,9 +5,9 @@
  * The last-write-wins conflict rule for the mutable `contacts` head
  * collection. Every other synced collection is immutable and content-addressed,
  * so a write-write conflict is impossible there. A contact head document is
- * genuinely overwritten in place under a stable row id, so two replicas CAN
- * race on the same row -- and a remote-master-always default would silently
- * drop one side's edit.
+ * genuinely overwritten in place under a stable resource id, so two replicas
+ * CAN race on the same resource -- and a remote-master-always default would
+ * silently drop one side's edit.
  *
  * The rule lives here rather than in `@interop/social-core` because deciding
  * it means DECRYPTING both sides: a head payload rides inside an encrypted
@@ -59,7 +59,7 @@ import { type ContactHeadPayload } from '@interop/social-core';
  */
 export type ContactConflictWinner = 'remote' | 'local';
 /**
- * Recovers a validated head payload from a stored row body: decrypts an
+ * Recovers a validated head payload from a stored body: decrypts an
  * envelope, passes plaintext through, and resolves `undefined` when the
  * payload (and so the fields the rule compares) cannot be reached.
  *
@@ -69,13 +69,13 @@ export type ContactConflictWinner = 'remote' | 'local';
  * side leaves the reachable local body to win. Neither side is ever compared on
  * a body it could not open.
  *
- * The decrypt is addressed with the row's own id, and an envelope sealed for
+ * The decrypt is addressed with the resource's own id, and an envelope sealed for
  * another resource is refused with an `IntegrityError` rather than read as one
  * more unreachable side. That refusal is rethrown, out of the resolver and into
  * the replication cycle. See the module doc.
  *
  * @param options {object}
- * @param options.id {string}   the contact head row's resource id, the id the
+ * @param options.id {string}   the contact head's resource id, the id the
  *   stored envelope must be sealed for
  * @param options.data {Json}   the stored body: an encrypted envelope or a
  *   plaintext payload
@@ -94,10 +94,10 @@ export declare function contactHeadPayloadOf({ id, data, cipher }: {
  * Decides a contact-head conflict. See the module doc for the fail-safe rule.
  *
  * @param options {object}
- * @param options.id {string}   the contested row's resource id, which both
+ * @param options.id {string}   the contested resource's id, which both
  *   sides' envelopes must be sealed for
- * @param options.remote {Json}   the remote (master) row body
- * @param options.local {Json}   the local row body
+ * @param options.remote {Json}   the remote (master) body
+ * @param options.local {Json}   the local resource replica's body
  * @param [options.cipher] {DocCipher}   the collection's document cipher
  * @param [options.remoteDeleted] {boolean}   the remote side is a tombstone
  * @param [options.localDeleted] {boolean}   the local side is a tombstone

package/dist/sync/contactsConflict.js

@@ -5,9 +5,9 @@
  * The last-write-wins conflict rule for the mutable `contacts` head
  * collection. Every other synced collection is immutable and content-addressed,
  * so a write-write conflict is impossible there. A contact head document is
- * genuinely overwritten in place under a stable row id, so two replicas CAN
- * race on the same row -- and a remote-master-always default would silently
- * drop one side's edit.
+ * genuinely overwritten in place under a stable resource id, so two replicas
+ * CAN race on the same resource -- and a remote-master-always default would
+ * silently drop one side's edit.
  *
  * The rule lives here rather than in `@interop/social-core` because deciding
  * it means DECRYPTING both sides: a head payload rides inside an encrypted
@@ -55,7 +55,7 @@
 import { isEncryptedEnvelope, isIntegrityError } from '@interop/was-client/sync';
 import { isContactHeadPayload, remotePayloadWins } from '@interop/social-core';
 /**
- * Recovers a validated head payload from a stored row body: decrypts an
+ * Recovers a validated head payload from a stored body: decrypts an
  * envelope, passes plaintext through, and resolves `undefined` when the
  * payload (and so the fields the rule compares) cannot be reached.
  *
@@ -65,13 +65,13 @@ import { isContactHeadPayload, remotePayloadWins } from '@interop/social-core';
  * side leaves the reachable local body to win. Neither side is ever compared on
  * a body it could not open.
  *
- * The decrypt is addressed with the row's own id, and an envelope sealed for
+ * The decrypt is addressed with the resource's own id, and an envelope sealed for
  * another resource is refused with an `IntegrityError` rather than read as one
  * more unreachable side. That refusal is rethrown, out of the resolver and into
  * the replication cycle. See the module doc.
  *
  * @param options {object}
- * @param options.id {string}   the contact head row's resource id, the id the
+ * @param options.id {string}   the contact head's resource id, the id the
  *   stored envelope must be sealed for
  * @param options.data {Json}   the stored body: an encrypted envelope or a
  *   plaintext payload
@@ -106,10 +106,10 @@ export async function contactHeadPayloadOf({ id, data, cipher }) {
  * Decides a contact-head conflict. See the module doc for the fail-safe rule.
  *
  * @param options {object}
- * @param options.id {string}   the contested row's resource id, which both
+ * @param options.id {string}   the contested resource's id, which both
  *   sides' envelopes must be sealed for
- * @param options.remote {Json}   the remote (master) row body
- * @param options.local {Json}   the local row body
+ * @param options.remote {Json}   the remote (master) body
+ * @param options.local {Json}   the local resource replica's body
  * @param [options.cipher] {DocCipher}   the collection's document cipher
  * @param [options.remoteDeleted] {boolean}   the remote side is a tombstone
  * @param [options.localDeleted] {boolean}   the local side is a tombstone

package/dist/sync/engine.d.ts

@@ -84,8 +84,8 @@ export interface SyncEngineDeps {
      * provisioning and the migration sweep, so no pending envelope sealed under
      * a losing epoch reaches the push: the consumer builds its cipher from the
      * descriptor provisioning settled on and runs `remintPendingEnvelopes`
-     * (`remint.ts`) with it. The re-mint decides per row from the envelope
-     * itself, so in the settled case the call is free. A lazy minter, whose
+     * (`remint.ts`) with it. The re-mint decides per resource replica from the
+     * envelope itself, so in the settled case the call is free. A lazy minter, whose
      * envelopes are always minted under the settled descriptor, leaves it
      * absent.
      */
@@ -168,7 +168,7 @@ export declare class SyncEngine {
     invalidateProvisioning(): void;
     /**
      * Stops the engine: aborts any in-flight cycle (the injected signal unwinds
-     * pull/push between pages/rows), cancels a pending retry, and resets to idle.
+     * pull/push between pages and resource replicas), cancels a pending retry, and resets to idle.
      * The caller drops the cached agents/ciphers so key material does not outlive
      * the unlocked session.
      */

package/dist/sync/engine.js

@@ -68,7 +68,7 @@ export class SyncEngine {
     }
     /**
      * Stops the engine: aborts any in-flight cycle (the injected signal unwinds
-     * pull/push between pages/rows), cancels a pending retry, and resets to idle.
+     * pull/push between pages and resource replicas), cancels a pending retry, and resets to idle.
      * The caller drops the cached agents/ciphers so key material does not outlive
      * the unlocked session.
      */
@@ -177,8 +177,8 @@ export class SyncEngine {
         if (signal.aborted) {
             return;
         }
-        // A resolved last-write-wins conflict may leave a row dirty (local-wins
-        // re-encrypt); rerun this run so the re-push settles instead of waiting for
+        // A resolved last-write-wins conflict may leave a resource replica dirty
+        // (local-wins re-encrypt); rerun this run so the re-push settles instead of waiting for
         // the next external trigger. Idempotent once the conflict clears.
         if (conflictsResolved > 0) {
             this.rerunRequested = true;

package/dist/sync/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/sync/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/sync/engine.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AAC9B,MAAM,qBAAqB,GAAG,KAAK,CAAA;AACnC,MAAM,oBAAoB,GAAG,MAAM,CAAA;AAmHnC,SAAS,eAAe,CAAC,EAAc,EAAE,OAAe;IACtD,MAAM,KAAK,GAAG,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IACrC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,OAAO,UAAU;IAmBQ;IAlB7B,MAAM,GAAe,MAAM,CAAA;IAEV,SAAS,CAAQ;IACjB,WAAW,CAAQ;IACnB,UAAU,CAAQ;IAClB,QAAQ,CAAiD;IACzD,MAAM,CAAc;IAE7B,OAAO,GAAG,KAAK,CAAA;IACf,cAAc,GAAG,KAAK,CAAA;IACtB,OAAO,GAAG,KAAK,CAAA;IACf,YAAY,GAAG,CAAC,CAAA;IAChB,UAAU,GAAyB,IAAI,CAAA;IACvC,eAAe,GAA2B,IAAI,CAAA;IAC9C,WAAW,GAAwB,IAAI,CAAA;IACvC,WAAW,GAAG,KAAK,CAAA;IACnB,sBAAsB,GAAG,CAAC,CAAA;IAElC,YAA6B,IAAoB;QAApB,SAAI,GAAJ,IAAI,CAAgB;QAC/C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,kBAAkB,CAAA;QACrD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,qBAAqB,CAAA;QACrE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,IAAI,oBAAoB,CAAA;QAClE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,eAAe,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAA;IAC1C,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI;QACF,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;YAC1B,OAAO,IAAI,CAAC,UAAU,CAAA;QACxB,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAED;;;;;;OAMG;IACH,sBAAsB;QACpB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;QACxB,yEAAyE;QACzE,kEAAkE;QAClE,wDAAwD;QACxD,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAA;IAClC,CAAC;IAED;;;;;OAKG;IACH,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAA;QAC7B,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IACxB,CAAC;IAEO,KAAK,CAAC,GAAG;QACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QACzB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;QACxC,IAAI,CAAC,eAAe,GAAG,UAAU,CAAA;QACjC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;QAC7B,IAAI,CAAC;YACH,GAAG,CAAC;gBACF,IAAI,CAAC,cAAc,GAAG,KAAK,CAAA;gBAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC7B,CAAC,QAAQ,IAAI,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAC;YAEjE,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAA;gBACrB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YAC1B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,wEAAwE;YACxE,0EAA0E;YAC1E,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;gBACvB,IAAI,CAAC,aAAa,EAAE,CAAA;YACtB,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;YACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;QACxB,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACK,KAAK,CAAC,QAAQ,CAAC,MAAmB;QACxC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAA;YAC9C,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAA;YACnC,IAAI,UAAU,KAAK,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;YACzB,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAM;QACR,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;YACrC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,OAAM;YACR,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,2EAA2E;QAC3E,wEAAwE;QACxE,yEAAyE;QACzE,IAAI,YAAY,GAAG,CAAC,CAAA;QAEpB,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QAClD,IAAI,UAAU,EAAE,CAAC;YACf,YAAY,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,OAAM;YACR,CAAC;QACH,CAAC;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACxC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAM;QACR,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAA;YAC/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,OAAM;YACR,CAAC;QACH,CAAC;QAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,OAAO,CAAC;YAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;YAC1C,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,MAAM;SACP,CAAC,CAAA;QACF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAM;QACR,CAAC;QACD,yEAAyE;QACzE,wFAAwF;QACxF,kEAAkE;QAClE,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;QAC5B,CAAC;QAED,YAAY,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAM;QACR,CAAC;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAA;QACjC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAA;QAC7B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,MAAmB;QACpC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC;YAChC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;YAC1C,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,MAAM;SACP,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IAChB,CAAC;IAEO,aAAa;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CACrB,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,IAAI,CAAC,YAAY,EACzC,IAAI,CAAC,UAAU,CAChB,CAAA;QACD,yEAAyE;QACzE,yEAAyE;QACzE,0DAA0D;QAC1D,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAClD,IAAI,CAAC,YAAY,IAAI,CAAC,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;YACvB,KAAK,IAAI,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC,EAAE,KAAK,CAAC,CAAA;IACX,CAAC;IAEO,UAAU;QAChB,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,WAAW,EAAE,CAAA;YAClB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACzB,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,MAAkB;QAClC,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC3B,OAAM;QACR,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;CACF"}

package/dist/sync/index.d.ts

@@ -18,8 +18,8 @@
  *   `isSyncNotFoundError` / `isUnknownEpochError`) and the `SyncStatus`
  *   vocabulary ship from `@interop/was-client/sync` too. They are imported
  *   from there rather than re-exported here: one owner per name.
- * - `SyncStore` / `SyncedRow` / `ProjectionAction` / `ResolveConflict` are the
- *   replica-side persistence seam.
+ * - `SyncStore` / `SyncedResourceReplica` / `ProjectionAction` /
+ *   `ResolveConflict` are the replica-side persistence seam.
  * - `runPull` / `projectionForDoc`, `runPush`, and `SyncEngine` are the pull,
  *   push, and orchestration algorithms.
  * - `remintPendingEnvelopes` is the create-loss re-mint for an eager-minting
@@ -38,7 +38,7 @@
  */
 export { UnknownEpochError, WasSyncConflictError, WasSyncNotFoundError } from '@interop/was-client/sync';
 export type { Json, SyncCheckpoint, WireDoc, MasterState, WriteAck, WasSyncPort, DocCipher } from '@interop/was-client/sync';
-export type { SyncStore, SyncedRow, ProjectionAction, ResolveConflict } from './types.js';
+export type { SyncStore, SyncedResourceReplica, ProjectionAction, ResolveConflict } from './types.js';
 export { runPull, projectionForDoc } from './pull.js';
 export { runPush } from './push.js';
 export { remintPendingEnvelopes } from './remint.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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,0BAA0B,CAAA;AACjC,YAAY,EACV,IAAI,EACJ,cAAc,EACd,OAAO,EACP,WAAW,EACX,QAAQ,EACR,WAAW,EACX,SAAS,EACV,MAAM,0BAA0B,CAAA;AAEjC,YAAY,EACV,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,uBAAuB,CAAA;AAC9B,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,0BAA0B,CAAA;AACjC,YAAY,EACV,IAAI,EACJ,cAAc,EACd,OAAO,EACP,WAAW,EACX,QAAQ,EACR,WAAW,EACX,SAAS,EACV,MAAM,0BAA0B,CAAA;AAEjC,YAAY,EACV,SAAS,EACT,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,uBAAuB,CAAA;AAC9B,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA"}

package/dist/sync/index.js

@@ -18,8 +18,8 @@
  *   `isSyncNotFoundError` / `isUnknownEpochError`) and the `SyncStatus`
  *   vocabulary ship from `@interop/was-client/sync` too. They are imported
  *   from there rather than re-exported here: one owner per name.
- * - `SyncStore` / `SyncedRow` / `ProjectionAction` / `ResolveConflict` are the
- *   replica-side persistence seam.
+ * - `SyncStore` / `SyncedResourceReplica` / `ProjectionAction` /
+ *   `ResolveConflict` are the replica-side persistence seam.
  * - `runPull` / `projectionForDoc`, `runPush`, and `SyncEngine` are the pull,
  *   push, and orchestration algorithms.
  * - `remintPendingEnvelopes` is the create-loss re-mint for an eager-minting

package/dist/sync/pull.d.ts

@@ -7,7 +7,7 @@ import type { Json, ProjectionAction, SyncStore, WasSyncPort, WireDoc } from './
  *
  * Decryption runs here, outside the store transaction, so a slow/failing decrypt
  * never holds the store's write lock. A document whose body cannot be decrypted
- * (legacy plaintext row, corrupt/foreign envelope, key mismatch) is skipped with
+ * (legacy plaintext body, corrupt/foreign envelope, key mismatch) is skipped with
  * a `none` projection rather than throwing: the body is still stored and the
  * checkpoint advances past it, so one poison document can never permanently
  * wedge the feed for the whole replica. A document that decrypts but fails the
@@ -15,17 +15,17 @@ import type { Json, ProjectionAction, SyncStore, WasSyncPort, WireDoc } from './
  * possibly a buggy or schema-incompatible writer) is skipped the same way:
  * stored, checkpoint advanced, never projected.
  *
- * The decrypt is addressed: the feed row's own `id` goes to `decryptDoc`, and
+ * The decrypt is addressed: the feed document's own `id` goes to `decryptDoc`, and
  * the cipher refuses an envelope sealed for some other resource with was-
  * client's `IntegrityError`. That refusal has two causes and the reader
  * cannot tell them apart: a host that moved one resource's stored envelope
- * under another resource's id, and a row minted by a writer that predates
- * addressed sealing (the legacy contacts rows
+ * under another resource's id, and a document minted by a writer that
+ * predates addressed sealing (the legacy contacts documents
  * `docs/cross-replica-sync-compatibility.md` records as a stated loss, which
  * every fresh replica bootstrap re-reads). It is logged apart from the
  * ordinary undecryptable skip so a caller can count it, but the benign cause
  * is the common one and an alert on it needs a rate rather than a single
- * event. The projection outcome is the same `none`: the row is not applied,
+ * event. The projection outcome is the same `none`: the document is not applied,
  * the body is still stored, and the checkpoint advances past it.
  *
  * @param doc {WireDoc}

package/dist/sync/pull.js

@@ -41,7 +41,7 @@ import { log } from '../log.js';
  *
  * Decryption runs here, outside the store transaction, so a slow/failing decrypt
  * never holds the store's write lock. A document whose body cannot be decrypted
- * (legacy plaintext row, corrupt/foreign envelope, key mismatch) is skipped with
+ * (legacy plaintext body, corrupt/foreign envelope, key mismatch) is skipped with
  * a `none` projection rather than throwing: the body is still stored and the
  * checkpoint advances past it, so one poison document can never permanently
  * wedge the feed for the whole replica. A document that decrypts but fails the
@@ -49,17 +49,17 @@ import { log } from '../log.js';
  * possibly a buggy or schema-incompatible writer) is skipped the same way:
  * stored, checkpoint advanced, never projected.
  *
- * The decrypt is addressed: the feed row's own `id` goes to `decryptDoc`, and
+ * The decrypt is addressed: the feed document's own `id` goes to `decryptDoc`, and
  * the cipher refuses an envelope sealed for some other resource with was-
  * client's `IntegrityError`. That refusal has two causes and the reader
  * cannot tell them apart: a host that moved one resource's stored envelope
- * under another resource's id, and a row minted by a writer that predates
- * addressed sealing (the legacy contacts rows
+ * under another resource's id, and a document minted by a writer that
+ * predates addressed sealing (the legacy contacts documents
  * `docs/cross-replica-sync-compatibility.md` records as a stated loss, which
  * every fresh replica bootstrap re-reads). It is logged apart from the
  * ordinary undecryptable skip so a caller can count it, but the benign cause
  * is the common one and an alert on it needs a rate rather than a single
- * event. The projection outcome is the same `none`: the row is not applied,
+ * event. The projection outcome is the same `none`: the document is not applied,
  * the body is still stored, and the checkpoint advances past it.
  *
  * @param doc {WireDoc}

package/dist/sync/push.d.ts

@@ -1,9 +1,10 @@
 import type { ResolveConflict, SyncStore, WasSyncPort } from './types.js';
 /**
- * Pushes every dirty row for one feed, sequentially (bounds sockets/CPU, and
- * keeps conflict reconciliation deterministic). Honors `signal` between rows.
- * A non-conflict error from any row propagates so the engine aborts the cycle
- * and backs off; already-pushed rows in the batch stay settled.
+ * Pushes every dirty resource replica for one feed, sequentially (bounds
+ * sockets/CPU, and keeps conflict reconciliation deterministic). Honors
+ * `signal` between resource replicas. A non-conflict error from any resource
+ * replica propagates so the engine aborts the cycle and backs off;
+ * already-pushed resource replicas in the batch stay settled.
  *
  * @param options {object}
  * @param options.port {WasSyncPort}
@@ -12,8 +13,8 @@ import type { ResolveConflict, SyncStore, WasSyncPort } from './types.js';
  * @param [options.writerId] {string}   this writer's attribution label, sent
  *   as `Writer-Id` on every write and delete; absent sends none
  * @param [options.signal] {AbortSignal}
- * @returns {Promise<{ pushed: number; conflictsResolved: number }>}   dirty rows
- *   processed this cycle, and how many invoked the LWW resolver (a positive
+ * @returns {Promise<{ pushed: number; conflictsResolved: number }>}   dirty
+ *   resource replicas processed this cycle, and how many invoked the LWW resolver (a positive
  *   count means the caller should rerun so a local-wins re-push settles)
  */
 export declare function runPush({ port, store, resolveConflict, writerId, signal }: {

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

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/sync/push.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAAQ,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAqM/E;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,KAAK,EACL,eAAe,EACf,QAAQ,EACR,MAAM,EACP,EAAE;IACD,IAAI,EAAE,WAAW,CAAA;IACjB,KAAK,EAAE,SAAS,CAAA;IAChB,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAAC,CAyBzD"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/sync/push.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAAQ,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AA0M/E;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,KAAK,EACL,eAAe,EACf,QAAQ,EACR,MAAM,EACP,EAAE;IACD,IAAI,EAAE,WAAW,CAAA;IACjB,KAAK,EAAE,SAAS,CAAA;IAChB,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAAC,CAyBzD"}

package/dist/sync/push.js

@@ -2,23 +2,23 @@
  * Copyright (c) 2026 Interop Alliance. All rights reserved.
  */
 /**
- * The push side of the WAS replication engine core: fan each dirty local row out
- * to a conditional WAS write, then reconcile per the content-addressed conflict
- * table.
+ * The push side of the WAS replication engine core: fan each dirty local
+ * resource replica out to a conditional WAS write, then reconcile per the
+ * content-addressed conflict table.
  *
- * On a content-addressed collection an id's `data` never mutates, so a live row
- * only ever pushes as a create (`If-None-Match: *`) and a tombstone as a delete;
- * there is no update path. A mutable (last-write-wins) collection pushes a live
- * row as a create while never-acked (`version 0`) and as an in-place update
- * (`If-Match`) once acked, and settles a `412` through its injected
- * {@link ResolveConflict} policy.
+ * On a content-addressed collection an id's `data` never mutates, so a live
+ * resource replica only ever pushes as a create (`If-None-Match: *`) and a
+ * tombstone as a delete; there is no update path. A mutable (last-write-wins)
+ * collection pushes a live resource replica as a create while never-acked
+ * (`version 0`) and as an in-place update (`If-Match`) once acked, and settles
+ * a `412` through its injected {@link ResolveConflict} policy.
  *
  * This loop covers the CONTENT sub-resource only (`data` / `version`, at
  * `PUT/DELETE /:id`). It does not drive the independently-versioned METADATA
  * sub-resource (`custom` / `metaVersion`, at `PUT /:id/meta`): a replica that
  * syncs user-writable metadata (the web wallet's RxDB driver, via
- * `WasSyncPort.putMeta`) keeps that half in its own push handler. It is left out
- * of this core deliberately -- none of the wallet Space collections
+ * `WasSyncPort.putMeta`) keeps that half in its own push handler. It is left
+ * out of this core deliberately -- none of the wallet Space collections
  * (`private-credentials`, `public-credentials`, `wallet-activity`, `contacts`,
  * `contacts-history`) versions its metadata independently of its content, so
  * folding a `putMeta` diff into this loop would add an untested code path with
@@ -34,14 +34,15 @@
  */
 import { isSyncConflictError, isSyncNotFoundError } from '@interop/was-client/sync';
 /**
- * Pushes a dirty live row. A never-acked row (`version 0`) is a create
- * (`PUT /:id` with `If-None-Match: *`); an acked row (`version > 0`) is an
- * in-place update (`If-Match` over its stored `etag`, echoed back verbatim --
- * absent only against a backend that never returned one) -- reachable only on
- * a mutable collection, since a content-addressed row never mutates in place.
- * On success the acked `version` / `etag` are recorded and the row goes clean
- * -- unless a local write landed while the write was in flight, which the
- * row's `revision` token detects (see {@link SyncStore.markPushed}) so the
+ * Pushes a dirty live resource replica. A never-acked resource replica
+ * (`version 0`) is a create (`PUT /:id` with `If-None-Match: *`); an acked
+ * resource replica (`version > 0`) is an in-place update (`If-Match` over its
+ * stored `etag`, echoed back verbatim -- absent only against a backend that
+ * never returned one) -- reachable only on a mutable collection, since a
+ * content-addressed resource replica never mutates in place. On success the
+ * acked `version` / `etag` are recorded and the resource replica goes clean --
+ * unless a local write landed while the write was in flight, which the resource
+ * replica's `revision` token detects (see {@link SyncStore.markPushed}) so the
  * newer write stays dirty for the rerun cycle.
  *
  * A `412` is settled by the collection's policy:
@@ -53,19 +54,21 @@ import { isSyncConflictError, isSyncNotFoundError } from '@interop/was-client/sy
  *   absent/tombstone -> deletion wins, adopt the tombstone and delete the
  *   projection (a later re-add re-encrypts to a fresh id, so nothing is blocked).
  */
-async function pushUpsert({ port, store, row, resolveConflict, writerId }) {
+async function pushUpsert({ port, store, replica, resolveConflict, writerId }) {
     try {
         const ack = await port.putContent({
-            id: row.id,
-            data: row.data ?? null,
-            ...(row.version > 0 ? { ifMatch: row.etag } : { ifNoneMatch: true }),
+            id: replica.id,
+            data: replica.data ?? null,
+            ...(replica.version > 0
+                ? { ifMatch: replica.etag }
+                : { ifNoneMatch: true }),
             ...(writerId !== undefined && { writerId })
         });
         await store.markPushed({
-            id: row.id,
+            id: replica.id,
             version: ack.version,
             etag: ack.etag,
-            ...(row.revision !== undefined && { revision: row.revision })
+            ...(replica.revision !== undefined && { revision: replica.revision })
         });
         return { conflictResolved: false };
     }
@@ -75,26 +78,27 @@ async function pushUpsert({ port, store, row, resolveConflict, writerId }) {
         }
         if (resolveConflict) {
             await resolveConflict({
-                id: row.id,
-                version: row.version,
-                data: row.data
+                id: replica.id,
+                version: replica.version,
+                data: replica.data
             });
-            // The resolver may have left the row dirty (local-wins re-encrypt); the
-            // caller reruns so the re-push settles within the same sync run.
+            // The resolver may have left the resource replica dirty (local-wins
+            // re-encrypt); the caller reruns so the re-push settles within the same
+            // sync run.
             return { conflictResolved: true };
         }
-        const master = await port.get({ id: row.id });
+        const master = await port.get({ id: replica.id });
         // An absent or tombstoned resource surfaces as `get` resolving null.
         if (master === null) {
             await store.adoptLatest({
-                id: row.id,
+                id: replica.id,
                 latest: null,
                 projection: { kind: 'delete' }
             });
         }
         else {
             await store.adoptLatest({
-                id: row.id,
+                id: replica.id,
                 latest: master,
                 projection: { kind: 'none' }
             });
@@ -136,51 +140,53 @@ async function tryDelete({ port, store, id, ifMatch, revision, writerId }) {
     }
 }
 /**
- * Pushes a dirty tombstone. `DELETE /:id` with `If-Match` over the row's stored
- * `etag` when the row was ever acked (`version > 0`), unconditional otherwise:
+ * Pushes a dirty tombstone. `DELETE /:id` with `If-Match` over the resource
+ * replica's stored `etag` when the resource replica was ever acked (`version >
+ * 0`), unconditional otherwise:
  * - `204` / `404` -> settled (clean).
  * - `412` then master absent/tombstone -> delete/delete race, settled.
  * - `412` then master live -> retry once with the master's fresh `etag`; a
- *   second `412` leaves the row dirty for the next cycle (the next pull
- *   refreshes its `version` / `etag` via the dirty-deleted-vs-live rule, so the
- *   retry's `If-Match` becomes current).
+ *   second `412` leaves the resource replica dirty for the next cycle (the next
+ *   pull refreshes its `version` / `etag` via the dirty-deleted-vs-live rule,
+ *   so the retry's `If-Match` becomes current).
  */
-async function pushDelete({ port, store, row, writerId }) {
-    const revisionAck = row.revision !== undefined ? { revision: row.revision } : {};
-    const firstIfMatch = row.version > 0 ? row.etag : undefined;
+async function pushDelete({ port, store, replica, writerId }) {
+    const revisionAck = replica.revision !== undefined ? { revision: replica.revision } : {};
+    const firstIfMatch = replica.version > 0 ? replica.etag : undefined;
     if (await tryDelete({
         port,
         store,
-        id: row.id,
+        id: replica.id,
         ifMatch: firstIfMatch,
         writerId,
         ...revisionAck
     })) {
         return;
     }
-    const master = await port.get({ id: row.id });
+    const master = await port.get({ id: replica.id });
     if (master === null) {
         // delete/delete race -- the resource is already a tombstone / absent.
-        await store.markDeletedPushed({ id: row.id, ...revisionAck });
+        await store.markDeletedPushed({ id: replica.id, ...revisionAck });
         return;
     }
-    // Second attempt with the master's current etag. If it too hits 412 we
-    // simply leave the row dirty (tryDelete returned false and made no store
-    // write).
+    // Second attempt with the master's current etag. If it too hits 412 we simply
+    // leave the resource replica dirty (tryDelete returned false and made no
+    // store write).
     await tryDelete({
         port,
         store,
-        id: row.id,
+        id: replica.id,
         ifMatch: master.etag,
         writerId,
         ...revisionAck
     });
 }
 /**
- * Pushes every dirty row for one feed, sequentially (bounds sockets/CPU, and
- * keeps conflict reconciliation deterministic). Honors `signal` between rows.
- * A non-conflict error from any row propagates so the engine aborts the cycle
- * and backs off; already-pushed rows in the batch stay settled.
+ * Pushes every dirty resource replica for one feed, sequentially (bounds
+ * sockets/CPU, and keeps conflict reconciliation deterministic). Honors
+ * `signal` between resource replicas. A non-conflict error from any resource
+ * replica propagates so the engine aborts the cycle and backs off;
+ * already-pushed resource replicas in the batch stay settled.
  *
  * @param options {object}
  * @param options.port {WasSyncPort}
@@ -189,26 +195,26 @@ async function pushDelete({ port, store, row, writerId }) {
  * @param [options.writerId] {string}   this writer's attribution label, sent
  *   as `Writer-Id` on every write and delete; absent sends none
  * @param [options.signal] {AbortSignal}
- * @returns {Promise<{ pushed: number; conflictsResolved: number }>}   dirty rows
- *   processed this cycle, and how many invoked the LWW resolver (a positive
+ * @returns {Promise<{ pushed: number; conflictsResolved: number }>}   dirty
+ *   resource replicas processed this cycle, and how many invoked the LWW resolver (a positive
  *   count means the caller should rerun so a local-wins re-push settles)
  */
 export async function runPush({ port, store, resolveConflict, writerId, signal }) {
-    const rows = await store.getDirtyRows();
+    const replicas = await store.getDirtyResourceReplicas();
     let pushed = 0;
     let conflictsResolved = 0;
-    for (const row of rows) {
+    for (const replica of replicas) {
         if (signal?.aborted) {
             break;
         }
-        if (row.deleted) {
-            await pushDelete({ port, store, row, writerId });
+        if (replica.deleted) {
+            await pushDelete({ port, store, replica, writerId });
         }
         else {
             const { conflictResolved } = await pushUpsert({
                 port,
                 store,
-                row,
+                replica,
                 resolveConflict,
                 writerId
             });