@interop/wallet-core 0.40.0 → 0.42.0

package/dist/webvh/index.js

@@ -11,9 +11,19 @@
  *   `revokeWebvhClient` -- provisioning, per-client update-key rotation, the
  *   two-entry client enrollment ceremony, and the one-entry client
  *   revocation edit, all over the narrow `WebvhIdStore` seam.
+ * - `markedVerificationMethodPair` -- the one builder of a client's published
+ *   verification-method pair (the account-controlled signing method plus the
+ *   key-agreement method under the controller marker), which every write site
+ *   uses and which refuses a key-agreement key that is not the signing key's
+ *   canonical X25519 twin (`keyAgreementTwinMultibase`).
  * - `listEnrolledWebvhClients` -- the enrolled-client listing over a
  *   caller-verified log (keyed on `capabilityInvocation`, update keys
  *   recovered by log attribution), for a "your wallets" surface.
+ * - `keyAgreementCommitment` / `commitmentMatchesKey` -- the
+ *   `MultikeyCommitment` wire rule: the bare sha2-256 multihash, base64url
+ *   no-pad, over a key-agreement key's decoded multikey bytes, and the
+ *   decode-based check that verifies a candidate key against a published
+ *   commitment.
  * - `delegationKeyInDocument` -- the current-key-set rule for one recorded
  *   delegation: does the document still publish the key that signed it (a
  *   missing key id reads as "cannot be checked", so: no).
@@ -33,10 +43,11 @@
  * Kept out of the root export: this subpath pulls the did:webvh, ed25519, and
  * ezcap dependency graph (the same isolation pattern as `./identity`).
  */
-export { didWebvhControllerTemplate, ensureDidWebvh, enrollWebvhClient, mintClientWebvhUpdateKeys, relationIds, repairKeyBindings, rotateWebvhUpdateKey, updateKeyMultibase, WebvhLogConflictError, withLogConflictRetry } from './didWebvh.js';
-export { AccountLogMissingError, verifyAccountLog } from './verifyLog.js';
+export { BYOE_CONTEXT_URL, clientKeyAgreementController, commitmentMatchesKey, didWebvhControllerTemplate, ensureDidWebvh, enrollWebvhClient, keyAgreementCommitment, keyAgreementTwinMultibase, MULTIKEY_COMMITMENT_VM_TYPE, markedVerificationMethodPair, mintClientWebvhUpdateKeys, relationIds, repairKeyBindings, rotateWebvhUpdateKey, updateKeyMultibase, WebvhLogConflictError, withLogConflictRetry } from './didWebvh.js';
+export { accountLogPinId, AccountLogMissingError, verifyAccountLog } from './verifyLog.js';
 export { wasWebvhIdStore } from './wasIdStore.js';
-export { attributeClientUpdateKey, delegationKeyInDocument, documentKeyMultibases, keyAgreementTwinMultibase, listEnrolledWebvhClients } from './listClients.js';
+export { attributeClientUpdateKey, delegationKeyInDocument, documentKeyMultibases, listEnrolledWebvhClients, markedKeyAgreementMethods, markedKeyAgreementMultibases } from './listClients.js';
+export { resolvedKeyAgreementMethods } from './keyAgreement.js';
 export { revokeWebvhClient, StagedCommitmentAmbiguousError } from './revokeClient.js';
 export { multibaseOf } from './didWeb.js';
 export { clientSigningKeyMultibase, didKeyZcapClient, isWebvhDid, webvhCapabilityAgent, webvhSigner, webvhZcapClient } from './zcap.js';

package/dist/webvh/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/webvh/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,EACL,0BAA0B,EAC1B,cAAc,EACd,iBAAiB,EACjB,yBAAyB,EACzB,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,qBAAqB,EACrB,yBAAyB,EACzB,wBAAwB,EACzB,MAAM,kBAAkB,CAAA;AAKzB,OAAO,EACL,iBAAiB,EACjB,8BAA8B,EAC/B,MAAM,mBAAmB,CAAA;AAW1B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,UAAU,EACV,oBAAoB,EACpB,WAAW,EACX,eAAe,EAChB,MAAM,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/webvh/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,oBAAoB,EACpB,0BAA0B,EAC1B,cAAc,EACd,iBAAiB,EACjB,sBAAsB,EACtB,yBAAyB,EACzB,2BAA2B,EAC3B,4BAA4B,EAC5B,yBAAyB,EACzB,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,qBAAqB,EACrB,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC7B,MAAM,kBAAkB,CAAA;AAKzB,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EACL,iBAAiB,EACjB,8BAA8B,EAC/B,MAAM,mBAAmB,CAAA;AAW1B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,UAAU,EACV,oBAAoB,EACpB,WAAW,EACX,eAAe,EAChB,MAAM,WAAW,CAAA"}

package/dist/webvh/keyAgreement.d.ts

@@ -0,0 +1,72 @@
+/*!
+ * Copyright (c) 2026 Interop Alliance. All rights reserved.
+ */
+/**
+ * The ONE reference-resolving reader for a did:webvh document's `keyAgreement`
+ * relation, and the document shape it reads.
+ *
+ * The relation may carry either form the DID Core data model allows -- a string
+ * reference into `verificationMethod`, or an embedded method -- so every
+ * consumer that asks "which key-agreement methods does this document publish"
+ * must resolve references first. That resolution lives here once, and the
+ * consumers are plain filters over its result: the client listing and the
+ * revocation removal keep only the methods carrying a client's controller
+ * marker, while the user key roster's recipient resolver deliberately keeps
+ * unmarked methods too.
+ *
+ * Deliberately dependency-light -- it imports nothing at all -- so the `keys`
+ * layer can share the reader without pulling the ceremony or signing graph.
+ */
+/**
+ * A locally verified did:webvh document, read for the `keyAgreement` methods it
+ * publishes and the controller each one carries. Structural on purpose: a
+ * resolved `DIDDoc` satisfies it, and so does any narrower document shape a
+ * wallet already holds.
+ */
+export interface KeyAgreementDocument {
+    verificationMethod?: Array<{
+        id?: string;
+        type?: string;
+        controller?: string;
+        publicKeyMultibase?: string;
+        publicKeyCommitment?: string;
+    }>;
+    keyAgreement?: Array<string | {
+        id?: string;
+        type?: string;
+        controller?: string;
+        publicKeyMultibase?: string;
+        publicKeyCommitment?: string;
+    }>;
+}
+/**
+ * The materialized shape {@link resolvedKeyAgreementMethods} returns: a
+ * `keyAgreement` verification method carrying either the key itself
+ * (`publicKeyMultibase`) or, for a low-entropy-derived standing unlock
+ * credential, its hash commitment (`publicKeyCommitment`). The `type` rides
+ * along so a consumer can tell the two published flavors apart (`Multikey` vs
+ * `MultikeyCommitment`) instead of inferring the flavor from which property
+ * happens to be present.
+ */
+export interface ResolvedKeyAgreementMethod {
+    id?: string;
+    type?: string;
+    controller?: string;
+    publicKeyMultibase?: string;
+    publicKeyCommitment?: string;
+}
+/**
+ * The `keyAgreement` verification methods a document publishes, materialized:
+ * string references resolved against `verificationMethod` (a reference nothing
+ * backs is dropped), embedded methods taken verbatim. Document order is
+ * preserved, and nothing is filtered -- deciding which of these methods belongs
+ * to whom is each caller's own rule.
+ *
+ * @param options {object}
+ * @param options.doc {KeyAgreementDocument}   a locally verified document
+ * @returns {ResolvedKeyAgreementMethod[]}
+ */
+export declare function resolvedKeyAgreementMethods({ doc }: {
+    doc: KeyAgreementDocument;
+}): ResolvedKeyAgreementMethod[];
+//# sourceMappingURL=keyAgreement.d.ts.map

package/dist/webvh/keyAgreement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyAgreement.d.ts","sourceRoot":"","sources":["../../src/webvh/keyAgreement.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;GAeG;AAEH;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,kBAAkB,CAAC,EAAE,KAAK,CAAC;QACzB,EAAE,CAAC,EAAE,MAAM,CAAA;QACX,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAC7B,CAAC,CAAA;IACF,YAAY,CAAC,EAAE,KAAK,CAChB,MAAM,GACN;QACE,EAAE,CAAC,EAAE,MAAM,CAAA;QACX,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAC7B,CACJ,CAAA;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,0BAA0B;IACzC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CAAC,EAC1C,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;CAC1B,GAAG,0BAA0B,EAAE,CAe/B"}

package/dist/webvh/keyAgreement.js

@@ -0,0 +1,47 @@
+/*!
+ * Copyright (c) 2026 Interop Alliance. All rights reserved.
+ */
+/**
+ * The ONE reference-resolving reader for a did:webvh document's `keyAgreement`
+ * relation, and the document shape it reads.
+ *
+ * The relation may carry either form the DID Core data model allows -- a string
+ * reference into `verificationMethod`, or an embedded method -- so every
+ * consumer that asks "which key-agreement methods does this document publish"
+ * must resolve references first. That resolution lives here once, and the
+ * consumers are plain filters over its result: the client listing and the
+ * revocation removal keep only the methods carrying a client's controller
+ * marker, while the user key roster's recipient resolver deliberately keeps
+ * unmarked methods too.
+ *
+ * Deliberately dependency-light -- it imports nothing at all -- so the `keys`
+ * layer can share the reader without pulling the ceremony or signing graph.
+ */
+/**
+ * The `keyAgreement` verification methods a document publishes, materialized:
+ * string references resolved against `verificationMethod` (a reference nothing
+ * backs is dropped), embedded methods taken verbatim. Document order is
+ * preserved, and nothing is filtered -- deciding which of these methods belongs
+ * to whom is each caller's own rule.
+ *
+ * @param options {object}
+ * @param options.doc {KeyAgreementDocument}   a locally verified document
+ * @returns {ResolvedKeyAgreementMethod[]}
+ */
+export function resolvedKeyAgreementMethods({ doc }) {
+    const byId = new Map();
+    for (const method of doc.verificationMethod ?? []) {
+        if (typeof method?.id === 'string') {
+            byId.set(method.id, method);
+        }
+    }
+    const methods = [];
+    for (const entry of doc.keyAgreement ?? []) {
+        const method = typeof entry === 'string' ? byId.get(entry) : entry;
+        if (method) {
+            methods.push(method);
+        }
+    }
+    return methods;
+}
+//# sourceMappingURL=keyAgreement.js.map

package/dist/webvh/keyAgreement.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyAgreement.js","sourceRoot":"","sources":["../../src/webvh/keyAgreement.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;GAeG;AA6CH;;;;;;;;;;GAUG;AACH,MAAM,UAAU,2BAA2B,CAAC,EAC1C,GAAG,EAGJ;IACC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAsC,CAAA;IAC1D,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,kBAAkB,IAAI,EAAE,EAAE,CAAC;QAClD,IAAI,OAAO,MAAM,EAAE,EAAE,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAiC,EAAE,CAAA;IAChD,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAClE,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}

package/dist/webvh/listClients.d.ts

@@ -28,12 +28,18 @@
  * - `addedAt` -- the `versionTime` of the entry that published the client's
  *   verification methods (its enrollment moment, as the log states it).
  *
- * The X25519 `keyAgreementKeyMultibase` is derived from the signing key (the
- * canonical Montgomery twin -- the same derivation every roster wrap uses)
- * rather than paired from the document, because a recovery continuation's
- * add-and-retire entry publishes two `keyAgreement` methods at once (the new
- * client's and the replacement code's) and the document deliberately carries
- * no marker to tell them apart.
+ * The X25519 `keyAgreementKeyMultibases` set is READ from the document, not
+ * derived: it is every `keyAgreement` method published under the client's
+ * controller marker (`controller: did:key:<signing multibase>`, the write-side
+ * convention every enrollment follows). The marker is what tells a client's
+ * key-agreement methods apart from the deliberately unmarked ones a recovery
+ * continuation publishes beside them. It is hard-required -- a client with no
+ * marked method reports an EMPTY set, the same refuse-not-guess rule the
+ * update-key attribution follows, since a guessed key-agreement key would make
+ * a revocation report success over a method that never left the document. The
+ * whole set is built in a single pass over the document's resolved
+ * key-agreement methods, grouped by controller once and looked up per client,
+ * rather than a per-client rescan.
  *
  * Verification is the CALLER's job: pass a log that was resolved and checked
  * against the account pointer (the wallet's ordinary
@@ -46,14 +52,22 @@
  * decide "does this delegation still chain" decides it in one place.
  */
 import type { DIDLog } from '@interop/did-method-webvh';
-import type { WebvhClientKeys } from './didWebvh.js';
+import type { KeyAgreementDocument } from './keyAgreement.js';
 /**
- * One enrolled wallet client as the log states it. `updateKeyMultibase` and
- * `addedAt` are absent when the log attribution cannot recover them (see the
- * module doc); a client with all three key members present is exactly a
- * `RevokedClientKeys`.
+ * One enrolled wallet client as the log states it. `keyAgreementKeyMultibases`
+ * is REQUIRED and set-valued: every key-agreement method the client's
+ * controller marker claims, in document order, deduplicated. An EMPTY array is
+ * the refuse-not-guess state -- the document carries no marked method for the
+ * client. `updateKeyMultibase` and `addedAt` are absent when the log
+ * attribution cannot recover them (see the module doc).
+ *
+ * A client that published several marked key-agreement methods surfaces the
+ * full set here; revoking it removes them all regardless, because the removal
+ * filters the document by the marker rather than by this member.
  */
-export interface EnrolledWebvhClient extends WebvhClientKeys {
+export interface EnrolledWebvhClient {
+    signingKeyMultibase: string;
+    keyAgreementKeyMultibases: string[];
     updateKeyMultibase?: string;
     addedAt?: string;
 }
@@ -110,19 +124,54 @@ export declare function delegationKeyInDocument({ doc, delegationKeyId }: {
     delegationKeyId?: string;
 }): boolean;
 /**
- * The multibase of an Ed25519 signing key's canonical X25519 twin -- the
- * key-agreement key the client's enrollment published and its roster wraps
- * are minted to. Delegates to was-client's `x25519RecipientFromDidKey`, the
- * one rule for this derivation, which also refuses a multibase that is not an
- * Ed25519 key (no twin exists for anything else).
+ * The `keyAgreement` verification methods one client's controller marker
+ * claims: the document's resolved key-agreement methods
+ * ({@link resolvedKeyAgreementMethods}) filtered to those whose `controller` is
+ * the client's did:key (see `clientKeyAgreementController`).
+ *
+ * The marker is HARD-REQUIRED here, and that is where this predicate parts
+ * company with the user key roster's recipient resolver, which filters the same
+ * reader's result by nothing more than "carries a public key multibase".
+ * Listing and revocation are refuse-not-guess surfaces: an unmarked method
+ * matched by proximity would make a revocation report success over a method
+ * that never left the document. The roster resolver's job is the opposite --
+ * it must keep wrapping the user key to the deliberately unmarked
+ * key-agreement methods a recovery code publishes, so it matches them too.
+ *
+ * The ordinary shape is exactly one method, but the result is a SET rather
+ * than a first match on purpose: a revocation has to remove every method the
+ * marker claims, or a client with a second published key-agreement key would
+ * keep a standing wrap target after a revocation reported success.
+ *
+ * @param options {object}
+ * @param options.doc {KeyAgreementDocument}   a locally verified document
+ * @param options.signingKeyMultibase {string}   the client's Ed25519 signing
+ *   key, as the document publishes it
+ * @returns {Array<{ id?: string, publicKeyMultibase?: string }>}
+ */
+export declare function markedKeyAgreementMethods({ doc, signingKeyMultibase }: {
+    doc: KeyAgreementDocument;
+    signingKeyMultibase: string;
+}): Array<{
+    id?: string;
+    publicKeyMultibase?: string;
+}>;
+/**
+ * The key multibases of the `keyAgreement` methods one client's controller
+ * marker claims -- {@link markedKeyAgreementMethods}, reduced to the
+ * multibases a roster wrap and a listing row speak in. A method carrying no
+ * `publicKeyMultibase` falls back to the fragment of its id (for a did:webvh
+ * document the two agree).
  *
  * @param options {object}
+ * @param options.doc {KeyAgreementDocument}   a locally verified document
  * @param options.signingKeyMultibase {string}
- * @returns {string}
+ * @returns {string[]}
  */
-export declare function keyAgreementTwinMultibase({ signingKeyMultibase }: {
+export declare function markedKeyAgreementMultibases({ doc, signingKeyMultibase }: {
+    doc: KeyAgreementDocument;
     signingKeyMultibase: string;
-}): string;
+}): string[];
 /**
  * One enrolled client's ACTIVE update key as the log states it, keyed on the
  * signing key the document publishes for it -- the same attribution the

package/dist/webvh/listClients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listClients.d.ts","sourceRoot":"","sources":["../../src/webvh/listClients.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAIvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEpD;;;;;GAKG;AACH,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,kBAAkB,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACzE;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;CAC1B,GAAG,GAAG,CAAC,MAAM,CAAC,CAYd;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,GAAG,EACH,eAAe,EAChB,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,GAAG,OAAO,CAMV;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,mBAAmB,EACpB,EAAE;IACD,mBAAmB,EAAE,MAAM,CAAA;CAC5B,GAAG,MAAM,CAGT;AAwFD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,GAAG,EACH,mBAAmB,EACpB,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;IACX,mBAAmB,EAAE,MAAM,CAAA;CAC5B,GAAG,MAAM,GAAG,SAAS,CAKrB;AA0BD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,mBAAmB,EAAE,CA6BxB"}
+{"version":3,"file":"listClients.d.ts","sourceRoot":"","sources":["../../src/webvh/listClients.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAQvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAE7D;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,mBAAmB;IAClC,mBAAmB,EAAE,MAAM,CAAA;IAC3B,yBAAyB,EAAE,MAAM,EAAE,CAAA;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,kBAAkB,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACzE;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;CAC1B,GAAG,GAAG,CAAC,MAAM,CAAC,CAYd;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,GAAG,EACH,eAAe,EAChB,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,GAAG,OAAO,CAMV;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,GAAG,EACH,mBAAmB,EACpB,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;CAC5B,GAAG,KAAK,CAAC;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAKtD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,4BAA4B,CAAC,EAC3C,GAAG,EACH,mBAAmB,EACpB,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;CAC5B,GAAG,MAAM,EAAE,CAcX;AAyID;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,GAAG,EACH,mBAAmB,EACpB,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;IACX,mBAAmB,EAAE,MAAM,CAAA;CAC5B,GAAG,MAAM,GAAG,SAAS,CAKrB;AA0BD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,mBAAmB,EAAE,CAmCxB"}

package/dist/webvh/listClients.js

@@ -1,6 +1,6 @@
-import { x25519RecipientFromDidKey } from '@interop/was-client/edv';
 import { vmFragmentOf } from '../resourceLog/vmFragment.js';
-import { effectiveParameters, relationIds } from './didWebvh.js';
+import { clientKeyAgreementController, effectiveParameters, relationIds } from './didWebvh.js';
+import { resolvedKeyAgreementMethods } from './keyAgreement.js';
 /**
  * The key multibases the document currently publishes: every verification
  * method's `publicKeyMultibase`, plus the fragment of its id (for a did:webvh
@@ -56,19 +56,104 @@ export function delegationKeyInDocument({ doc, delegationKeyId }) {
     return documentKeyMultibases({ doc }).has(multibase);
 }
 /**
- * The multibase of an Ed25519 signing key's canonical X25519 twin -- the
- * key-agreement key the client's enrollment published and its roster wraps
- * are minted to. Delegates to was-client's `x25519RecipientFromDidKey`, the
- * one rule for this derivation, which also refuses a multibase that is not an
- * Ed25519 key (no twin exists for anything else).
+ * The `keyAgreement` verification methods one client's controller marker
+ * claims: the document's resolved key-agreement methods
+ * ({@link resolvedKeyAgreementMethods}) filtered to those whose `controller` is
+ * the client's did:key (see `clientKeyAgreementController`).
+ *
+ * The marker is HARD-REQUIRED here, and that is where this predicate parts
+ * company with the user key roster's recipient resolver, which filters the same
+ * reader's result by nothing more than "carries a public key multibase".
+ * Listing and revocation are refuse-not-guess surfaces: an unmarked method
+ * matched by proximity would make a revocation report success over a method
+ * that never left the document. The roster resolver's job is the opposite --
+ * it must keep wrapping the user key to the deliberately unmarked
+ * key-agreement methods a recovery code publishes, so it matches them too.
+ *
+ * The ordinary shape is exactly one method, but the result is a SET rather
+ * than a first match on purpose: a revocation has to remove every method the
+ * marker claims, or a client with a second published key-agreement key would
+ * keep a standing wrap target after a revocation reported success.
+ *
+ * @param options {object}
+ * @param options.doc {KeyAgreementDocument}   a locally verified document
+ * @param options.signingKeyMultibase {string}   the client's Ed25519 signing
+ *   key, as the document publishes it
+ * @returns {Array<{ id?: string, publicKeyMultibase?: string }>}
+ */
+export function markedKeyAgreementMethods({ doc, signingKeyMultibase }) {
+    const marker = clientKeyAgreementController({ signingKeyMultibase });
+    return resolvedKeyAgreementMethods({ doc }).filter(method => method.controller === marker);
+}
+/**
+ * The key multibases of the `keyAgreement` methods one client's controller
+ * marker claims -- {@link markedKeyAgreementMethods}, reduced to the
+ * multibases a roster wrap and a listing row speak in. A method carrying no
+ * `publicKeyMultibase` falls back to the fragment of its id (for a did:webvh
+ * document the two agree).
  *
  * @param options {object}
+ * @param options.doc {KeyAgreementDocument}   a locally verified document
  * @param options.signingKeyMultibase {string}
- * @returns {string}
+ * @returns {string[]}
  */
-export function keyAgreementTwinMultibase({ signingKeyMultibase }) {
-    return x25519RecipientFromDidKey({ did: `did:key:${signingKeyMultibase}` })
-        .publicKeyMultibase;
+export function markedKeyAgreementMultibases({ doc, signingKeyMultibase }) {
+    const multibases = [];
+    for (const method of markedKeyAgreementMethods({
+        doc,
+        signingKeyMultibase
+    })) {
+        const multibase = method.publicKeyMultibase ??
+            (method.id ? vmFragmentOf(method.id) : undefined);
+        if (multibase) {
+            multibases.push(multibase);
+        }
+    }
+    return [...new Set(multibases)];
+}
+/**
+ * Every `keyAgreement` method the document publishes, grouped by its
+ * `controller` in one pass -- the listing's batch counterpart to
+ * {@link markedKeyAgreementMultibases}, which resolves and rescans the whole
+ * relation per client. A method carrying no `publicKeyMultibase` falls back to
+ * the fragment of its id (for a did:webvh document the two agree), and a
+ * method with no `controller` at all, or that yields no multibase, is
+ * dropped: it can never be a client's marked method.
+ *
+ * Keying by controller string is what keeps this MARKED-only without an extra
+ * filter: only a client's own methods carry a `did:key:<signing multibase>`
+ * controller marker, while the deliberately unmarked methods a recovery
+ * continuation publishes carry the account DID as controller instead, so their
+ * group is simply never looked up by {@link listEnrolledWebvhClients}.
+ *
+ * Multibases within a group are deduplicated, first-seen order preserved.
+ *
+ * @param options {object}
+ * @param options.doc {KeyAgreementDocument}   a locally verified document
+ * @returns {Map<string, string[]>}
+ */
+function markedKeyAgreementIndex({ doc }) {
+    const index = new Map();
+    for (const method of resolvedKeyAgreementMethods({ doc })) {
+        if (!method.controller) {
+            continue;
+        }
+        const multibase = method.publicKeyMultibase ??
+            (method.id ? vmFragmentOf(method.id) : undefined);
+        if (!multibase) {
+            continue;
+        }
+        const group = index.get(method.controller);
+        if (group) {
+            if (!group.includes(multibase)) {
+                group.push(multibase);
+            }
+        }
+        else {
+            index.set(method.controller, [multibase]);
+        }
+    }
+    return index;
 }
 /**
  * The update keys an entry newly revealed: the effective `updateKeys` at
@@ -198,6 +283,11 @@ export function listEnrolledWebvhClients({ log }) {
     // The entry that published each client's verification methods -- its
     // enrollment moment, and the attribution anchor for its update key.
     const addIndexes = clientAddIndexes({ log });
+    // Every keyAgreement method, grouped by controller, in one pass -- keying by
+    // controller string picks up only MARKED methods (a client's own), since the
+    // account DID controller a recovery code's unmarked method carries is never
+    // looked up below.
+    const keyAgreementIndex = markedKeyAgreementIndex({ doc });
     const clients = [];
     for (const vmId of relationIds(doc.capabilityInvocation)) {
         const signingKeyMultibase = vmFragmentOf(vmId);
@@ -207,9 +297,7 @@ export function listEnrolledWebvhClients({ log }) {
         const addIndex = addIndexes.get(signingKeyMultibase);
         clients.push({
             signingKeyMultibase,
-            keyAgreementKeyMultibase: keyAgreementTwinMultibase({
-                signingKeyMultibase
-            }),
+            keyAgreementKeyMultibases: keyAgreementIndex.get(clientKeyAgreementController({ signingKeyMultibase })) ?? [],
             updateKeyMultibase: addIndex === undefined
                 ? undefined
                 : attributeActiveUpdateKey({ params, addIndex }),

package/dist/webvh/listClients.js.map

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

package/dist/webvh/revokeClient.d.ts

@@ -1,12 +1,18 @@
-import type { DIDDoc } from '@interop/did-method-webvh';
-import type { ClientWebvhUpdateKeys, WebvhClientKeys, WebvhIdStore } from './didWebvh.js';
+import type { DIDDoc, DIDLog } from '@interop/did-method-webvh';
+import type { ClientWebvhUpdateKeys, WebvhIdStore } from './didWebvh.js';
 /**
  * The public halves of the client being revoked, as the document and log
- * carry them: its two verification-method multibases and its active update
- * key. The staged-key hash is deliberately absent -- it is recovered from the
- * log (see the module doc), since no other party ever held the staged key.
+ * carry them: its signing-key multibase and its active update key. The
+ * staged-key hash is deliberately absent -- it is recovered from the log (see
+ * the module doc), since no other party ever held the staged key.
+ *
+ * The key-agreement half is deliberately absent too: the removal reads every
+ * key-agreement method the client's controller marker claims off the document
+ * itself, so no caller-supplied key-agreement key is ever needed to revoke the
+ * client completely.
  */
-export interface RevokedClientKeys extends WebvhClientKeys {
+export interface RevokedClientKeys {
+    signingKeyMultibase: string;
     updateKeyMultibase: string;
 }
 /**
@@ -75,11 +81,14 @@ export declare class StagedCommitmentAmbiguousError extends Error {
  *   excluded from the staged-hash attribution
  * @param [options.expectedDid] {string}   the account DID the log must resolve
  *   to, from the caller's stored account pointer
- * @returns {Promise<{ did: string, doc: DIDDoc }>}   the account's DID and its
- *   resolved document AFTER the edit -- what the roster rotation that follows
- *   resolves its remaining recipients from, so the caller needs no re-fetch of
- *   the log it just extended. On the idempotent no-op path this is the
- *   already-published document, which states the same thing.
+ * @returns {Promise<{ did: string, doc: DIDDoc, log: DIDLog }>}   the
+ *   account's DID, its resolved document AFTER the edit -- what the roster
+ *   rotation that follows resolves its remaining recipients from, so the
+ *   caller needs no re-fetch of the log it just extended -- and the post-edit
+ *   log itself, from which that rotation's controller view is built (the
+ *   revocation cascade's post-edit anchoring). On the idempotent no-op path
+ *   these are the already-published document and log, which state the same
+ *   thing.
  */
 export declare function revokeWebvhClient(options: {
     idStore: WebvhIdStore;
@@ -90,5 +99,6 @@ export declare function revokeWebvhClient(options: {
 }): Promise<{
     did: string;
     doc: DIDDoc;
+    log: DIDLog;
 }>;
 //# sourceMappingURL=revokeClient.d.ts.map

package/dist/webvh/revokeClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revokeClient.d.ts","sourceRoot":"","sources":["../../src/webvh/revokeClient.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EACV,MAAM,EAGP,MAAM,2BAA2B,CAAA;AAalC,OAAO,KAAK,EACV,qBAAqB,EAErB,eAAe,EACf,YAAY,EACb,MAAM,eAAe,CAAA;AAEtB;;;;;GAKG;AACH,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,kBAAkB,EAAE,MAAM,CAAA;CAC3B;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,UAAU,EAAE,MAAM,EAAE,CAAA;gBACR,EAAE,UAAU,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE;CASrD;AAwKD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,OAAO,EAAE,YAAY,CAAA;IACrB,UAAU,EAAE,qBAAqB,CAAA;IACjC,aAAa,EAAE,iBAAiB,CAAA;IAChC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAExC"}
+{"version":3,"file":"revokeClient.d.ts","sourceRoot":"","sources":["../../src/webvh/revokeClient.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EACV,MAAM,EACN,MAAM,EAEP,MAAM,2BAA2B,CAAA;AAgBlC,OAAO,KAAK,EACV,qBAAqB,EAErB,YAAY,EACb,MAAM,eAAe,CAAA;AAEtB;;;;;;;;;;GAUG;AACH,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,EAAE,MAAM,CAAA;IAC3B,kBAAkB,EAAE,MAAM,CAAA;CAC3B;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,UAAU,EAAE,MAAM,EAAE,CAAA;gBACR,EAAE,UAAU,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE;CASrD;AAwKD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,OAAO,EAAE,YAAY,CAAA;IACrB,UAAU,EAAE,qBAAqB,CAAA;IACjC,aAAa,EAAE,iBAAiB,CAAA;IAChC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAErD"}