@interop/wallet-core 0.17.1 → 0.18.0

package/dist/keys/clientKeyRecord.js

@@ -5,7 +5,7 @@
  * The client-key record: the contents codec and validation for the local
  * record every wallet client keeps its own key material in -- the random
  * 32-byte client seed behind its Ed25519 signing key and X25519 twin, the
- * cached per-user key (PUK) delivered through the wrap-set roster, this
+ * cached user key delivered through the wrap-set roster, this
  * client's own did:webvh update-key seeds, the account controller the record
  * was bound for, and (when the app stores it beside the keys) the account's
  * did:webvh pointer.
@@ -17,11 +17,11 @@
  * wallet writes is a record the other accepts.
  *
  * Byte fields travel as base64url without padding; every one of them is a
- * 32-byte secret and is length-checked on the way back in. Validation is
- * strict on purpose: an absent optional member is a record written before that
- * member existed, but a present-and-malformed one throws, because both of the
- * members that can be malformed are load-bearing -- the account's encrypted
- * collections are keyed on the PUK, and the account's identity log can only be
+ * 32-byte secret and is length-checked on the way back in. Validation is strict
+ * on purpose: an absent optional member is a record written before that member
+ * existed, but a present-and-malformed one throws, because both of the members
+ * that can be malformed are load-bearing -- the account's encrypted collections
+ * are keyed on the user key, and the account's identity log can only be
  * extended with the update-key seeds, so proceeding without either would
  * silently orphan data or strand update authority.
  *
@@ -29,7 +29,8 @@
  * Neither is enforceable here (the writes are the app's), and both are
  * durability rules a crash must not be able to break:
  *
- * 1. **The PUK and the roster epoch pin persist atomically.** The pin is what
+ * 1. **The user key and the roster epoch pin persist atomically.** The pin is
+ *    what
  *    refuses a rolled-back roster, so it must never advance without the key
  *    that authenticated the roster it advanced to -- and the key must never be
  *    adopted without the pin moving with it. One write, or none.
@@ -79,29 +80,32 @@ function decodeSecret({ value, name }) {
     return bytes;
 }
 /**
- * Parses and validates the optional `puk` member. An absent member resolves to
- * `undefined` (a record written for an account minted before the PUK); a
- * present-but-malformed one throws.
+ * Parses and validates the optional `userKey` member. An absent member resolves
+ * to `undefined` (a record written for an account minted before the user key);
+ * a present-but-malformed one throws.
  *
- * The signing seed is absent on a PUK adopted from a roster rotation (the
+ * The signing seed is absent on a user key adopted from a roster rotation (the
  * roster wraps the key-agreement secret alone); when present it must be
  * well-formed.
  *
- * @param value {unknown}   the record's `puk` member
- * @returns {Puk | undefined}
+ * @param value {unknown}   the record's `userKey` member
+ * @returns {UserKey | undefined}
  */
-export function parseClientRecordPuk(value) {
+export function parseClientRecordUserKey(value) {
     if (value === undefined) {
         return undefined;
     }
     if (value === null || typeof value !== 'object') {
-        throw new Error('Client-key record has a malformed PUK.');
+        throw new Error('Client-key record has a malformed user key.');
     }
     const { id, secret, signingSeed } = value;
     if (typeof id !== 'string' || !id) {
-        throw new Error('Client-key record PUK is missing its key id.');
+        throw new Error('Client-key record user key is missing its key id.');
     }
-    const secretBytes = decodeSecret({ value: secret, name: 'PUK key material' });
+    const secretBytes = decodeSecret({
+        value: secret,
+        name: 'user key material'
+    });
     if (signingSeed === undefined) {
         return { id, secret: secretBytes };
     }
@@ -110,7 +114,7 @@ export function parseClientRecordPuk(value) {
         secret: secretBytes,
         signingSeed: decodeSecret({
             value: signingSeed,
-            name: 'PUK signing seed'
+            name: 'user key signing seed'
         })
     };
 }
@@ -174,7 +178,7 @@ function encodeSecret({ value, name }) {
  *
  * @param options {object}
  * @param options.clientSeed {Uint8Array}   this client's 32-byte seed
- * @param [options.puk] {Puk}   the cached per-user key
+ * @param [options.userKey] {UserKey}   the cached user key
  * @param [options.webvhUpdateKeys] {ClientWebvhUpdateKeys}   this client's
  *   did:webvh update-key seeds
  * @param [options.controller] {string}   the account controller this key set
@@ -185,22 +189,22 @@ function encodeSecret({ value, name }) {
  *   to now
  * @returns {ClientKeyRecordJson}
  */
-export function encodeClientKeyRecord({ clientSeed, puk, webvhUpdateKeys, controller, pointerDid, createdAt = new Date().toISOString() }) {
+export function encodeClientKeyRecord({ clientSeed, userKey, webvhUpdateKeys, controller, pointerDid, createdAt = new Date().toISOString() }) {
     return {
         clientSeed: encodeSecret({ value: clientSeed, name: 'client seed' }),
-        ...(puk
+        ...(userKey
             ? {
-                puk: {
-                    id: puk.id,
+                userKey: {
+                    id: userKey.id,
                     secret: encodeSecret({
-                        value: puk.secret,
-                        name: 'PUK key material'
+                        value: userKey.secret,
+                        name: 'user key material'
                     }),
-                    ...(puk.signingSeed
+                    ...(userKey.signingSeed
                         ? {
                             signingSeed: encodeSecret({
-                                value: puk.signingSeed,
-                                name: 'PUK signing seed'
+                                value: userKey.signingSeed,
+                                name: 'user key signing seed'
                             })
                         }
                         : {})
@@ -248,7 +252,7 @@ export function decodeClientKeyRecord({ contents }) {
     if (contents === null || typeof contents !== 'object') {
         throw new Error('Malformed client-key record.');
     }
-    const { clientSeed, puk, webvh, controller, pointerDid } = contents;
+    const { clientSeed, userKey, webvh, controller, pointerDid } = contents;
     const seed = decodeSecret({ value: clientSeed, name: 'client seed' });
     if (controller !== undefined &&
         (typeof controller !== 'string' || !controller)) {
@@ -258,11 +262,11 @@ export function decodeClientKeyRecord({ contents }) {
         (typeof pointerDid !== 'string' || !pointerDid)) {
         throw new Error('Client-key record has a malformed account pointer DID.');
     }
-    const parsedPuk = parseClientRecordPuk(puk);
+    const parsedUserKey = parseClientRecordUserKey(userKey);
     const webvhUpdateKeys = parseClientRecordWebvhKeys(webvh);
     return {
         clientSeed: seed,
-        ...(parsedPuk ? { puk: parsedPuk } : {}),
+        ...(parsedUserKey ? { userKey: parsedUserKey } : {}),
         ...(webvhUpdateKeys ? { webvhUpdateKeys } : {}),
         ...(controller ? { controller } : {}),
         ...(pointerDid ? { pointerDid } : {})
@@ -279,9 +283,9 @@ export function decodeClientKeyRecord({ contents }) {
  * @returns {EnrolledClientKeyRecord}
  */
 export function assertEnrolledClientKeyRecord({ record }) {
-    const { puk, webvhUpdateKeys, controller, pointerDid } = record;
-    if (!puk) {
-        throw new Error('Client-key record carries no per-user key.');
+    const { userKey, webvhUpdateKeys, controller, pointerDid } = record;
+    if (!userKey) {
+        throw new Error('Client-key record carries no user key.');
     }
     if (!webvhUpdateKeys) {
         throw new Error('Client-key record carries no did:webvh update keys.');
@@ -292,6 +296,6 @@ export function assertEnrolledClientKeyRecord({ record }) {
     if (!pointerDid) {
         throw new Error('Client-key record carries no account pointer DID.');
     }
-    return { ...record, puk, webvhUpdateKeys, controller, pointerDid };
+    return { ...record, userKey, webvhUpdateKeys, controller, pointerDid };
 }
 //# sourceMappingURL=clientKeyRecord.js.map

package/dist/keys/clientKeyRecord.js.map

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

package/dist/keys/index.d.ts

@@ -2,48 +2,50 @@
  * Copyright (c) 2026 Interop Alliance. All rights reserved.
  */
 /**
- * The `@interop/wallet-core/keys` subpath: the per-user key (PUK) and its
+ * The `@interop/wallet-core/keys` subpath: the user key and its
  * wrap-set roster -- recipient zero of every encrypted collection, and the one
  * channel that delivers it to each enrolled wallet client.
  *
- * - `mintPuk` / `pukVaultKeys` -- minting the account's PUK and rebuilding the
+ * - `mintUserKey` / `userKeyVaultKeys` -- minting the account's user key and
+ *   rebuilding the
  *   vault key-agreement key + resolver from stored material.
  * - `encodeClientKeyRecord` / `decodeClientKeyRecord` -- the contents codec and
  *   strict validation of the local client-key record each client keeps its own
  *   key material in (storage and wrapping stay app-side).
- * - `ensurePukRoster` / `addPukRosterRecipient` / `readPukRoster` /
- *   `pukRosterRecipientResolver` -- the `key-map/puk.json` roster over the
+ * - `ensureUserKeyRoster` / `addUserKeyRosterRecipient` / `readUserKeyRoster` /
+ *   `userKeyRosterRecipientResolver` -- the `key-map/user-key.json` roster over the
  *   was-client descriptor-store seam, with the three client-side guards a
  *   resource-hosted descriptor needs (`epochsMac`, the latest-seen epoch pin,
  *   and a recipient resolver backed by the locally verified did:webvh
  *   document).
- * - `pukRosterDescriptorStore` -- that descriptor store, built from a bare
+ * - `userKeyRosterDescriptorStore` -- that descriptor store, built from a bare
  *   signing client for the login-time direct read.
  * - `rosterRecipientKid` -- the one builder of a client's roster kid, shared by
  *   the enrollment wrap, the roster read, and the rotation that retires it.
- * - `convergePukRosterToDocument` -- the standing detector for a revocation
+ * - `convergeUserKeyRosterToDocument` -- the standing detector for a revocation
  *   cascade torn between the document edit and the roster rotation: a roster
  *   recipient the document no longer keys is rotated away from.
  * - `readClientLabels` / `setClientLabel` / `removeClientLabel` /
  *   `wasClientLabelsStore` -- the enrolled-client display labels
  *   (`key-map/client-labels.json`), the record a "your wallets" surface names
  *   clients from, and the WAS-backed store they run through.
- * - `rotatePukRoster` / `unwrapPukGenerations` / `rotateCollectionEpochsToPuk`
- *   / `cascadeCollectionsToPuk` / `pukAsRecipient` -- the PUK rotation
+ * - `rotateUserKeyRoster` / `unwrapUserKeyGenerations` /
+ *   `rotateCollectionEpochsToUserKey`
+ *   / `cascadeCollectionsToUserKey` / `userKeyAsRecipient` -- the user key rotation
  *   cascade: the roster rotation off a revoked recipient, the per-collection
  *   re-epoch that brings an encrypted collection onto the roster's current
- *   PUK, and the parallel best-effort fan-out over the collections the wallet
+ *   user key, and the parallel best-effort fan-out over the collections the wallet
  *   names (also the completion sweep's driver).
  */
-export { mintPuk, pukVaultKeys } from './puk.js';
-export type { Puk } from './puk.js';
-export { assertEnrolledClientKeyRecord, decodeClientKeyRecord, encodeClientKeyRecord, parseClientRecordPuk, parseClientRecordWebvhKeys } from './clientKeyRecord.js';
+export { mintUserKey, userKeyVaultKeys } from './userKey.js';
+export type { UserKey } from './userKey.js';
+export { assertEnrolledClientKeyRecord, decodeClientKeyRecord, encodeClientKeyRecord, parseClientRecordUserKey, parseClientRecordWebvhKeys } from './clientKeyRecord.js';
 export type { ClientKeyRecord, ClientKeyRecordJson, EnrolledClientKeyRecord } from './clientKeyRecord.js';
-export { addPukRosterRecipient, convergePukRosterToDocument, ensurePukRoster, PukRosterContinuityError, PukRosterIntegrityError, PukRosterUnwrapError, pukRosterEpochsSigner, pukRosterRecipientResolver, readPukRoster, rosterRecipientKid, rotatePukRoster, verifyPukRosterEpochsSig } from './pukRoster.js';
-export { cascadeCollectionsToPuk, pukAsRecipient, rotateCollectionEpochsToPuk, unwrapPukGenerations } from './pukCascade.js';
-export type { CollectionPukRotationOutcome, PukCascadeResult } from './pukCascade.js';
-export type { PukRosterReadResult, RosterRecipientDocument } from './pukRoster.js';
-export { pukRosterDescriptorStore } from './rosterStore.js';
+export { addUserKeyRosterRecipient, convergeUserKeyRosterToDocument, ensureUserKeyRoster, UserKeyRosterContinuityError, UserKeyRosterIntegrityError, UserKeyRosterUnwrapError, userKeyRosterEpochsSigner, userKeyRosterRecipientResolver, readUserKeyRoster, rosterRecipientKid, rotateUserKeyRoster, verifyUserKeyRosterEpochsSig } from './userKeyRoster.js';
+export { cascadeCollectionsToUserKey, userKeyAsRecipient, rotateCollectionEpochsToUserKey, unwrapUserKeyGenerations } from './userKeyCascade.js';
+export type { CollectionUserKeyRotationOutcome, UserKeyCascadeResult } from './userKeyCascade.js';
+export type { UserKeyRosterReadResult, RosterRecipientDocument } from './userKeyRoster.js';
+export { userKeyRosterDescriptorStore } from './rosterStore.js';
 export { readClientLabels, removeClientLabel, setClientLabel } from './clientLabels.js';
 export type { ClientLabelsRecord, ClientLabelsStore } from './clientLabels.js';
 export { wasClientLabelsStore } from './wasLabelsStore.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/keys/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAChD,YAAY,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAEnC,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EACL,qBAAqB,EACrB,2BAA2B,EAC3B,eAAe,EACf,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,qBAAqB,EACrB,0BAA0B,EAC1B,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,wBAAwB,EACzB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,2BAA2B,EAC3B,oBAAoB,EACrB,MAAM,iBAAiB,CAAA;AACxB,YAAY,EACV,4BAA4B,EAC5B,gBAAgB,EACjB,MAAM,iBAAiB,CAAA;AACxB,YAAY,EACV,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAE3D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACf,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/keys/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC5D,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,qBAAqB,EACrB,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,mBAAmB,EACnB,4BAA4B,EAC5B,2BAA2B,EAC3B,wBAAwB,EACxB,yBAAyB,EACzB,8BAA8B,EAC9B,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,+BAA+B,EAC/B,wBAAwB,EACzB,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EACV,gCAAgC,EAChC,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EACV,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAA;AAE/D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACf,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA"}

package/dist/keys/index.js

@@ -2,44 +2,46 @@
  * Copyright (c) 2026 Interop Alliance. All rights reserved.
  */
 /**
- * The `@interop/wallet-core/keys` subpath: the per-user key (PUK) and its
+ * The `@interop/wallet-core/keys` subpath: the user key and its
  * wrap-set roster -- recipient zero of every encrypted collection, and the one
  * channel that delivers it to each enrolled wallet client.
  *
- * - `mintPuk` / `pukVaultKeys` -- minting the account's PUK and rebuilding the
+ * - `mintUserKey` / `userKeyVaultKeys` -- minting the account's user key and
+ *   rebuilding the
  *   vault key-agreement key + resolver from stored material.
  * - `encodeClientKeyRecord` / `decodeClientKeyRecord` -- the contents codec and
  *   strict validation of the local client-key record each client keeps its own
  *   key material in (storage and wrapping stay app-side).
- * - `ensurePukRoster` / `addPukRosterRecipient` / `readPukRoster` /
- *   `pukRosterRecipientResolver` -- the `key-map/puk.json` roster over the
+ * - `ensureUserKeyRoster` / `addUserKeyRosterRecipient` / `readUserKeyRoster` /
+ *   `userKeyRosterRecipientResolver` -- the `key-map/user-key.json` roster over the
  *   was-client descriptor-store seam, with the three client-side guards a
  *   resource-hosted descriptor needs (`epochsMac`, the latest-seen epoch pin,
  *   and a recipient resolver backed by the locally verified did:webvh
  *   document).
- * - `pukRosterDescriptorStore` -- that descriptor store, built from a bare
+ * - `userKeyRosterDescriptorStore` -- that descriptor store, built from a bare
  *   signing client for the login-time direct read.
  * - `rosterRecipientKid` -- the one builder of a client's roster kid, shared by
  *   the enrollment wrap, the roster read, and the rotation that retires it.
- * - `convergePukRosterToDocument` -- the standing detector for a revocation
+ * - `convergeUserKeyRosterToDocument` -- the standing detector for a revocation
  *   cascade torn between the document edit and the roster rotation: a roster
  *   recipient the document no longer keys is rotated away from.
  * - `readClientLabels` / `setClientLabel` / `removeClientLabel` /
  *   `wasClientLabelsStore` -- the enrolled-client display labels
  *   (`key-map/client-labels.json`), the record a "your wallets" surface names
  *   clients from, and the WAS-backed store they run through.
- * - `rotatePukRoster` / `unwrapPukGenerations` / `rotateCollectionEpochsToPuk`
- *   / `cascadeCollectionsToPuk` / `pukAsRecipient` -- the PUK rotation
+ * - `rotateUserKeyRoster` / `unwrapUserKeyGenerations` /
+ *   `rotateCollectionEpochsToUserKey`
+ *   / `cascadeCollectionsToUserKey` / `userKeyAsRecipient` -- the user key rotation
  *   cascade: the roster rotation off a revoked recipient, the per-collection
  *   re-epoch that brings an encrypted collection onto the roster's current
- *   PUK, and the parallel best-effort fan-out over the collections the wallet
+ *   user key, and the parallel best-effort fan-out over the collections the wallet
  *   names (also the completion sweep's driver).
  */
-export { mintPuk, pukVaultKeys } from './puk.js';
-export { assertEnrolledClientKeyRecord, decodeClientKeyRecord, encodeClientKeyRecord, parseClientRecordPuk, parseClientRecordWebvhKeys } from './clientKeyRecord.js';
-export { addPukRosterRecipient, convergePukRosterToDocument, ensurePukRoster, PukRosterContinuityError, PukRosterIntegrityError, PukRosterUnwrapError, pukRosterEpochsSigner, pukRosterRecipientResolver, readPukRoster, rosterRecipientKid, rotatePukRoster, verifyPukRosterEpochsSig } from './pukRoster.js';
-export { cascadeCollectionsToPuk, pukAsRecipient, rotateCollectionEpochsToPuk, unwrapPukGenerations } from './pukCascade.js';
-export { pukRosterDescriptorStore } from './rosterStore.js';
+export { mintUserKey, userKeyVaultKeys } from './userKey.js';
+export { assertEnrolledClientKeyRecord, decodeClientKeyRecord, encodeClientKeyRecord, parseClientRecordUserKey, parseClientRecordWebvhKeys } from './clientKeyRecord.js';
+export { addUserKeyRosterRecipient, convergeUserKeyRosterToDocument, ensureUserKeyRoster, UserKeyRosterContinuityError, UserKeyRosterIntegrityError, UserKeyRosterUnwrapError, userKeyRosterEpochsSigner, userKeyRosterRecipientResolver, readUserKeyRoster, rosterRecipientKid, rotateUserKeyRoster, verifyUserKeyRosterEpochsSig } from './userKeyRoster.js';
+export { cascadeCollectionsToUserKey, userKeyAsRecipient, rotateCollectionEpochsToUserKey, unwrapUserKeyGenerations } from './userKeyCascade.js';
+export { userKeyRosterDescriptorStore } from './rosterStore.js';
 export { readClientLabels, removeClientLabel, setClientLabel } from './clientLabels.js';
 export { wasClientLabelsStore } from './wasLabelsStore.js';
 //# sourceMappingURL=index.js.map

package/dist/keys/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/keys/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGhD,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAA;AAO7B,OAAO,EACL,qBAAqB,EACrB,2BAA2B,EAC3B,eAAe,EACf,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,qBAAqB,EACrB,0BAA0B,EAC1B,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,wBAAwB,EACzB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,2BAA2B,EAC3B,oBAAoB,EACrB,MAAM,iBAAiB,CAAA;AAUxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAE3D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACf,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/keys/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAG5D,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,qBAAqB,EACrB,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAA;AAO7B,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,mBAAmB,EACnB,4BAA4B,EAC5B,2BAA2B,EAC3B,wBAAwB,EACxB,yBAAyB,EACzB,8BAA8B,EAC9B,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,+BAA+B,EAC/B,wBAAwB,EACzB,MAAM,qBAAqB,CAAA;AAU5B,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAA;AAE/D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACf,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA"}

package/dist/keys/rosterStore.d.ts

@@ -1,8 +1,8 @@
 import type { ZcapClient } from '@interop/ezcap';
 import { type EncryptionDescriptorStore } from '@interop/was-client/edv';
 /**
- * Builds the compare-and-swap descriptor store over `key-map/puk.json` in a
- * data Space.
+ * Builds the compare-and-swap descriptor store over `key-map/user-key.json` in
+ * a data Space.
  *
  * @param options {object}
  * @param options.storageServerUrl {string}
@@ -10,7 +10,7 @@ import { type EncryptionDescriptorStore } from '@interop/was-client/edv';
  * @param options.spaceId {string}   the data Space id
  * @returns {EncryptionDescriptorStore}
  */
-export declare function pukRosterDescriptorStore({ storageServerUrl, zcapClient, spaceId }: {
+export declare function userKeyRosterDescriptorStore({ storageServerUrl, zcapClient, spaceId }: {
     storageServerUrl: string;
     zcapClient: ZcapClient;
     spaceId: string;

package/dist/keys/rosterStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rosterStore.d.ts","sourceRoot":"","sources":["../../src/keys/rosterStore.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,yBAAyB,CAAA;AAMhC;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,gBAAgB,EAChB,UAAU,EACV,OAAO,EACR,EAAE;IACD,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,yBAAyB,CAQ5B"}
+{"version":3,"file":"rosterStore.d.ts","sourceRoot":"","sources":["../../src/keys/rosterStore.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,yBAAyB,CAAA;AAMhC;;;;;;;;;GASG;AACH,wBAAgB,4BAA4B,CAAC,EAC3C,gBAAgB,EAChB,UAAU,EACV,OAAO,EACR,EAAE;IACD,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,yBAAyB,CAQ5B"}

package/dist/keys/rosterStore.js

@@ -2,11 +2,11 @@
  * Copyright (c) 2026 Interop Alliance. All rights reserved.
  */
 /**
- * The descriptor store over a Space's PUK wrap-set roster (`key-map/puk.json`).
- * Standalone rather than a method on a wallet's remote-store class, because
- * the login-time direct read checks the roster BEFORE any storage client (or
- * cipher) is built: it takes the bare signing client instead of a store
- * instance.
+ * The descriptor store over a Space's user key wrap-set roster
+ * (`key-map/user-key.json`). Standalone rather than a method on a wallet's
+ * remote-store class, because the login-time direct read checks the roster
+ * BEFORE any storage client (or cipher) is built: it takes the bare signing
+ * client instead of a store instance.
  *
  * The `plaintext` collection override is load-bearing. Without it the client
  * decides plaintext vs encrypted by describing the collection first, and a 404
@@ -15,10 +15,10 @@
  */
 import { WasClient } from '@interop/was-client';
 import { resourceDescriptorStore } from '@interop/was-client/edv';
-import { KEY_MAP_COLLECTION, PUK_ROSTER_RESOURCE } from '../space/collections.js';
+import { KEY_MAP_COLLECTION, USER_KEY_ROSTER_RESOURCE } from '../space/collections.js';
 /**
- * Builds the compare-and-swap descriptor store over `key-map/puk.json` in a
- * data Space.
+ * Builds the compare-and-swap descriptor store over `key-map/user-key.json` in
+ * a data Space.
  *
  * @param options {object}
  * @param options.storageServerUrl {string}
@@ -26,13 +26,13 @@ import { KEY_MAP_COLLECTION, PUK_ROSTER_RESOURCE } from '../space/collections.js
  * @param options.spaceId {string}   the data Space id
  * @returns {EncryptionDescriptorStore}
  */
-export function pukRosterDescriptorStore({ storageServerUrl, zcapClient, spaceId }) {
+export function userKeyRosterDescriptorStore({ storageServerUrl, zcapClient, spaceId }) {
     const was = new WasClient({ serverUrl: storageServerUrl, zcapClient });
+    const collection = was
+        .space(spaceId)
+        .collection(KEY_MAP_COLLECTION.id, { encryption: 'plaintext' });
     return resourceDescriptorStore({
-        resource: was
-            .space(spaceId)
-            .collection(KEY_MAP_COLLECTION.id, { encryption: 'plaintext' })
-            .resource(PUK_ROSTER_RESOURCE)
+        resource: collection.resource(USER_KEY_ROSTER_RESOURCE)
     });
 }
 //# sourceMappingURL=rosterStore.js.map

package/dist/keys/rosterStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"rosterStore.js","sourceRoot":"","sources":["../../src/keys/rosterStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EACL,uBAAuB,EAExB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,yBAAyB,CAAA;AAEhC;;;;;;;;;GASG;AACH,MAAM,UAAU,wBAAwB,CAAC,EACvC,gBAAgB,EAChB,UAAU,EACV,OAAO,EAKR;IACC,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAA;IACtE,OAAO,uBAAuB,CAAC;QAC7B,QAAQ,EAAE,GAAG;aACV,KAAK,CAAC,OAAO,CAAC;aACd,UAAU,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;aAC9D,QAAQ,CAAC,mBAAmB,CAAC;KACjC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"rosterStore.js","sourceRoot":"","sources":["../../src/keys/rosterStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EACL,uBAAuB,EAExB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,yBAAyB,CAAA;AAEhC;;;;;;;;;GASG;AACH,MAAM,UAAU,4BAA4B,CAAC,EAC3C,gBAAgB,EAChB,UAAU,EACV,OAAO,EAKR;IACC,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAA;IACtE,MAAM,UAAU,GAAG,GAAG;SACnB,KAAK,CAAC,OAAO,CAAC;SACd,UAAU,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAA;IACjE,OAAO,uBAAuB,CAAC;QAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,wBAAwB,CAAC;KACxD,CAAC,CAAA;AACJ,CAAC"}

package/dist/keys/userKey.d.ts

@@ -0,0 +1,43 @@
+import type { IKeyAgreementKey, IKeyResolver } from '@interop/data-integrity-core';
+/**
+ * The user key material: the X25519 key-agreement half as minted by the epoch
+ * construction (`id` is the key's own did:key; `secret` its raw 32-byte private
+ * key), plus the 32-byte seed of the user key's Ed25519 signing pair. Random
+ * per account; held in memory for the life of a session and persisted only
+ * inside a wrapped client-key record. The signing seed is absent on a user key
+ * adopted from a roster rotation -- the roster wraps the key-agreement secret
+ * alone, and the signing half has no consumer yet.
+ */
+export interface UserKey {
+    id: string;
+    secret: Uint8Array;
+    signingSeed?: Uint8Array;
+}
+/**
+ * Mints a fresh user key: the X25519 key-agreement pair via the was-client
+ * epoch construction (its did:key is the key id, its raw secret is what wraps),
+ * plus a random 32-byte Ed25519 signing seed -- a minted user key is always a
+ * complete identity (only a rotation-adopted one lacks the signing half).
+ *
+ * @returns {Promise<Required<UserKey>>}
+ */
+export declare function mintUserKey(): Promise<Required<UserKey>>;
+/**
+ * Reconstructs the user key's key-agreement key and its single-key resolver
+ * from the stored material -- the vault-key pair a session supplies to the
+ * storage layer, making the user key recipient zero of every encrypted
+ * collection. The key id is the self-describing `<did:key>#<fingerprint>` form,
+ * so grantee-side did:key recipient resolution routes it like any other roster
+ * entry.
+ *
+ * @param options {object}
+ * @param options.userKey {UserKey}
+ * @returns {{ keyAgreementKey: IKeyAgreementKey, keyResolver: IKeyResolver }}
+ */
+export declare function userKeyVaultKeys({ userKey }: {
+    userKey: UserKey;
+}): {
+    keyAgreementKey: IKeyAgreementKey;
+    keyResolver: IKeyResolver;
+};
+//# sourceMappingURL=userKey.d.ts.map

package/dist/keys/userKey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"userKey.d.ts","sourceRoot":"","sources":["../../src/keys/userKey.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,8BAA8B,CAAA;AAIrC;;;;;;;;GAQG;AACH,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,UAAU,CAAA;IAClB,WAAW,CAAC,EAAE,UAAU,CAAA;CACzB;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAK9D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG;IACnE,eAAe,EAAE,gBAAgB,CAAA;IACjC,WAAW,EAAE,YAAY,CAAA;CAC1B,CAQA"}

package/dist/keys/{puk.js → userKey.js}

@@ -2,7 +2,7 @@
  * Copyright (c) 2026 Interop Alliance. All rights reserved.
  */
 /**
- * The per-user key (PUK): the user's single roster identity for encrypted
+ * The user key: the user's single roster identity for encrypted
  * collections, standing in as "recipient zero" of every key-epoch roster. It is
  * minted at wallet provisioning -- random, client-side, never server-held, and
  * never derivable from any passphrase or seed -- and delivered to each enrolled
@@ -12,45 +12,47 @@
  * The key-agreement half is exactly what `@interop/was-client`'s epoch
  * construction mints: a fresh X25519 pair whose did:key is the key's id and
  * whose raw 32-byte secret is what gets wrapped to recipients -- so the roster
- * machinery consumes the PUK unchanged. The Ed25519 signing half is a second
- * independent 32-byte seed, minted now so the PUK is a complete identity, with
- * no consumer yet (the pair derives from the seed on demand once one lands).
+ * machinery consumes the user key unchanged. The Ed25519 signing half is a
+ * second independent 32-byte seed, minted now so the user key is a complete
+ * identity, with no consumer yet (the pair derives from the seed on demand once
+ * one lands).
  */
 import { X25519KeyAgreementKey2020 } from '@interop/x25519-key-agreement-key';
 import { epochKeyIdFor, mintEpoch } from '@interop/was-client/edv';
 import { singleKeyResolver } from '../identity/keyResolver.js';
 /**
- * Mints a fresh PUK: the X25519 key-agreement pair via the was-client epoch
- * construction (its did:key is the key id, its raw secret is what wraps), plus
- * a random 32-byte Ed25519 signing seed -- a minted PUK is always a complete
- * identity (only a rotation-adopted one lacks the signing half).
+ * Mints a fresh user key: the X25519 key-agreement pair via the was-client
+ * epoch construction (its did:key is the key id, its raw secret is what wraps),
+ * plus a random 32-byte Ed25519 signing seed -- a minted user key is always a
+ * complete identity (only a rotation-adopted one lacks the signing half).
  *
- * @returns {Promise<Required<Puk>>}
+ * @returns {Promise<Required<UserKey>>}
  */
-export async function mintPuk() {
+export async function mintUserKey() {
     const { epochId, secret } = await mintEpoch();
     const signingSeed = new Uint8Array(32);
     crypto.getRandomValues(signingSeed);
     return { id: epochId, secret, signingSeed };
 }
 /**
- * Reconstructs the PUK's key-agreement key and its single-key resolver from
- * the stored material -- the vault-key pair a session supplies to the storage
- * layer, making the PUK recipient zero of every encrypted collection. The key
- * id is the self-describing `<did:key>#<fingerprint>` form, so grantee-side
- * did:key recipient resolution routes it like any other roster entry.
+ * Reconstructs the user key's key-agreement key and its single-key resolver
+ * from the stored material -- the vault-key pair a session supplies to the
+ * storage layer, making the user key recipient zero of every encrypted
+ * collection. The key id is the self-describing `<did:key>#<fingerprint>` form,
+ * so grantee-side did:key recipient resolution routes it like any other roster
+ * entry.
  *
  * @param options {object}
- * @param options.puk {Puk}
+ * @param options.userKey {UserKey}
  * @returns {{ keyAgreementKey: IKeyAgreementKey, keyResolver: IKeyResolver }}
  */
-export function pukVaultKeys({ puk }) {
+export function userKeyVaultKeys({ userKey }) {
     const keyAgreementKey = X25519KeyAgreementKey2020.fromRawSecret({
-        secret: puk.secret,
-        controller: puk.id,
-        id: epochKeyIdFor(puk.id)
+        secret: userKey.secret,
+        controller: userKey.id,
+        id: epochKeyIdFor(userKey.id)
     });
     const keyResolver = singleKeyResolver({ keyAgreementKey });
     return { keyAgreementKey, keyResolver };
 }
-//# sourceMappingURL=puk.js.map
+//# sourceMappingURL=userKey.js.map

package/dist/keys/userKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"userKey.js","sourceRoot":"","sources":["../../src/keys/userKey.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAK7E,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAiB9D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,EAAE,CAAA;IAC7C,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;IACtC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;IACnC,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAA;AAC7C,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAAE,OAAO,EAAwB;IAIhE,MAAM,eAAe,GAAG,yBAAyB,CAAC,aAAa,CAAC;QAC9D,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,OAAO,CAAC,EAAE;QACtB,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;KAC9B,CAAqB,CAAA;IACtB,MAAM,WAAW,GAAG,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAC,CAAA;IAC1D,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,CAAA;AACzC,CAAC"}