@interop/wallet-core 0.41.0 → 0.42.0

package/dist/recovery/index.d.ts

@@ -12,16 +12,18 @@
  * - `recoveryClientFromCode` -- the deterministic client key set:
  *   unlock identity, client seed (signing + key-agreement pair), and the
  *   single did:webvh update key whose hash stands pre-committed.
- * - `wrapRecoveryRecord` / `unwrapRecoveryRecord` -- the keyring-record
- *   sibling carrying the account pointer plus the pre-minted
- *   PUT-on-`did.jsonl` delegation (never a seed, never a user key wrap),
- *   signed into the same frame under the mixed-signer policy (the code's
- *   unlock key at issuance, an enrolled client's account key on a re-mint),
- *   with the `{ controller, pointer }` core authenticated by a MAC under a
- *   code-derived key (`computeRecoveryBinding` / `recoveryRecordBinding`),
- *   so a storage host can never redirect recovery at another account.
+ * - The record codec lives in `@interop/wallet-core/unlock` now
+ *   (`wrapUnlockRecord` / `unwrapUnlockRecord`, re-exported here): a
+ *   recovery record is an unlock record with no ladder member -- the account
+ *   pointer plus the pre-minted PUT-on-`did.jsonl` bridge delegation (never
+ *   a seed, never a user key wrap), signed under the mixed-signer policy
+ *   (the code's unlock key at issuance, an enrolled client's account key on
+ *   a re-mint), with the account core authenticated by a MAC under a
+ *   code-derived key, so a storage host can never redirect recovery at
+ *   another account.
  * - `publishRecoveryKey` / `removeRecoveryKey` / `recoverWebvhClient` -- the
- *   document half: issuance's split posture, revocation's removal, and the
+ *   document half: issuance's split posture and revocation's removal (thin
+ *   wrappers over the unlock subpath's merged posture core), and the
  *   self-enrolling recovery continuation.
  * - `delegateLogWrite` / `delegationProofKeyId` /
  *   `remintRecoveryDelegations` -- the authorization bridge: the pre-minted
@@ -35,9 +37,9 @@
  */
 export { decodeRecoveryCode, formatRecoveryCode, generateRecoveryCode, normalizeRecoveryCode, RECOVERY_CODE_BYTES, RECOVERY_KDF, RecoveryCodeInvalidError, recoveryClientFromCode } from './recoveryCode.js';
 export type { RecoveryClient } from './recoveryCode.js';
-export { computeRecoveryBinding, RecoveryBindingError, recoveryRecordBinding, unwrapRecoveryRecord, wrapRecoveryRecord } from './recoveryRecord.js';
-export type { RecoveryRecordContents, RecoveryRecordProofState, SignedRecoveryRecord } from './recoveryRecord.js';
-export { delegateLogWrite, delegationProofKeyId, RECOVERY_DELEGATION_TTL_MS, remintRecoveryDelegations } from './recoveryDelegation.js';
+export { computeUnlockBinding, remintUnlockRecordBridge, UnlockBindingError, unlockRecordBinding, unwrapUnlockRecord, wrapUnlockRecord } from '../unlock/unlockRecord.js';
+export type { SignedUnlockRecord, UnlockRecordContents, UnlockRecordProofState } from '../unlock/unlockRecord.js';
+export { delegateLogWrite, delegationProofKeyId, RECOVERY_DELEGATION_TTL_MS, remintRecoveryDelegations, ZCAP_RENEWAL_WINDOW_MS, zcapExpiring } from './recoveryDelegation.js';
 export type { RecoveryDelegationEntry } from './recoveryDelegation.js';
 export { publishRecoveryKey, recoverWebvhClient, RecoveryKeyNotCommittedError, recoveryVmId, removeRecoveryKey } from './recoveryWebvh.js';
 export type { RecoveryLogStore, RecoveryPublicKeys } from './recoveryWebvh.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/recovery/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EACV,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAA;AAChC,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,4BAA4B,EAC5B,YAAY,EACZ,iBAAiB,EAClB,MAAM,oBAAoB,CAAA;AAC3B,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/recovery/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,2BAA2B,CAAA;AAClC,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,2BAA2B,CAAA;AAElC,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,EACtB,YAAY,EACb,MAAM,yBAAyB,CAAA;AAChC,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,4BAA4B,EAC5B,YAAY,EACZ,iBAAiB,EAClB,MAAM,oBAAoB,CAAA;AAC3B,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/recovery/index.js

@@ -12,16 +12,18 @@
  * - `recoveryClientFromCode` -- the deterministic client key set:
  *   unlock identity, client seed (signing + key-agreement pair), and the
  *   single did:webvh update key whose hash stands pre-committed.
- * - `wrapRecoveryRecord` / `unwrapRecoveryRecord` -- the keyring-record
- *   sibling carrying the account pointer plus the pre-minted
- *   PUT-on-`did.jsonl` delegation (never a seed, never a user key wrap),
- *   signed into the same frame under the mixed-signer policy (the code's
- *   unlock key at issuance, an enrolled client's account key on a re-mint),
- *   with the `{ controller, pointer }` core authenticated by a MAC under a
- *   code-derived key (`computeRecoveryBinding` / `recoveryRecordBinding`),
- *   so a storage host can never redirect recovery at another account.
+ * - The record codec lives in `@interop/wallet-core/unlock` now
+ *   (`wrapUnlockRecord` / `unwrapUnlockRecord`, re-exported here): a
+ *   recovery record is an unlock record with no ladder member -- the account
+ *   pointer plus the pre-minted PUT-on-`did.jsonl` bridge delegation (never
+ *   a seed, never a user key wrap), signed under the mixed-signer policy
+ *   (the code's unlock key at issuance, an enrolled client's account key on
+ *   a re-mint), with the account core authenticated by a MAC under a
+ *   code-derived key, so a storage host can never redirect recovery at
+ *   another account.
  * - `publishRecoveryKey` / `removeRecoveryKey` / `recoverWebvhClient` -- the
- *   document half: issuance's split posture, revocation's removal, and the
+ *   document half: issuance's split posture and revocation's removal (thin
+ *   wrappers over the unlock subpath's merged posture core), and the
  *   self-enrolling recovery continuation.
  * - `delegateLogWrite` / `delegationProofKeyId` /
  *   `remintRecoveryDelegations` -- the authorization bridge: the pre-minted
@@ -34,7 +36,7 @@
  * was-client dependency graph (the same isolation pattern as `./keyring`).
  */
 export { decodeRecoveryCode, formatRecoveryCode, generateRecoveryCode, normalizeRecoveryCode, RECOVERY_CODE_BYTES, RECOVERY_KDF, RecoveryCodeInvalidError, recoveryClientFromCode } from './recoveryCode.js';
-export { computeRecoveryBinding, RecoveryBindingError, recoveryRecordBinding, unwrapRecoveryRecord, wrapRecoveryRecord } from './recoveryRecord.js';
-export { delegateLogWrite, delegationProofKeyId, RECOVERY_DELEGATION_TTL_MS, remintRecoveryDelegations } from './recoveryDelegation.js';
+export { computeUnlockBinding, remintUnlockRecordBridge, UnlockBindingError, unlockRecordBinding, unwrapUnlockRecord, wrapUnlockRecord } from '../unlock/unlockRecord.js';
+export { delegateLogWrite, delegationProofKeyId, RECOVERY_DELEGATION_TTL_MS, remintRecoveryDelegations, ZCAP_RENEWAL_WINDOW_MS, zcapExpiring } from './recoveryDelegation.js';
 export { publishRecoveryKey, recoverWebvhClient, RecoveryKeyNotCommittedError, recoveryVmId, removeRecoveryKey } from './recoveryWebvh.js';
 //# sourceMappingURL=index.js.map

package/dist/recovery/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/recovery/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAO5B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAA;AAGhC,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,4BAA4B,EAC5B,YAAY,EACZ,iBAAiB,EAClB,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/recovery/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,2BAA2B,CAAA;AAOlC,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,EACtB,YAAY,EACb,MAAM,yBAAyB,CAAA;AAGhC,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,4BAA4B,EAC5B,YAAY,EACZ,iBAAiB,EAClB,MAAM,oBAAoB,CAAA"}

package/dist/recovery/recoveryCode.d.ts

@@ -1,5 +1,5 @@
-import type { ProfileAgents } from '../identity/agents.js';
 import type { UnlockKdf } from '../keyring/kdf.js';
+import type { UnlockClientIdentity } from '../unlock/standingClient.js';
 /**
  * The byte length of a recovery code: 16 random bytes is ~128 bits, enough
  * that the unlock derivation is a single expansion rather than a stretched
@@ -73,28 +73,16 @@ export declare function decodeRecoveryCode({ code }: {
  * agents, and the public multibases / ids the issuance and recovery flows
  * publish and look up.
  */
-export interface RecoveryClient {
+export interface RecoveryClient extends UnlockClientIdentity {
     codeBytes: Uint8Array;
-    clientSeed: Uint8Array;
     updateSeed: Uint8Array;
     /**
-     * The symmetric key that MACs the recovery record's account binding
-     * (`{ controller, pointer }`): computed at issuance, verified at recovery
-     * before the pointer is trusted. Derived from the code bytes, so the
-     * storage host never holds it.
+     * The symmetric key that MACs the recovery record's account binding:
+     * computed at issuance, verified at recovery before the pointer is trusted.
+     * Derived from the code bytes, so the storage host never holds it.
      */
     bindingMacKey: Uint8Array;
-    agents: ProfileAgents;
-    clientDid: string;
-    signingKeyMultibase: string;
-    keyAgreementKeyMultibase: string;
     updateKeyMultibase: string;
-    /**
-     * The kid of the code's user-key-roster entry -- its key-agreement key's id
-     * exactly as `agentsFromSeed` derives it (`did:key:<ed>#<x>`), so the wrap
-     * minted at issuance is the one the recovery flow's roster read looks for.
-     */
-    recipientKid: string;
 }
 /**
  * Derives the code's whole client identity from a (possibly formatted) code.

package/dist/recovery/recoveryCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recoveryCode.d.ts","sourceRoot":"","sources":["../../src/recovery/recoveryCode.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGlD;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,EAAE,SAM1B,CAAA;AAoBD;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,SAAuC;CAI3D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAI7C;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAErE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE1E;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,UAAU,CAazE;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,UAAU,CAAA;IACrB,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB;;;;;OAKG;IACH,aAAa,EAAE,UAAU,CAAA;IACzB,MAAM,EAAE,aAAa,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,EAAE,MAAM,CAAA;IAC1B;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,EAC3C,IAAI,EACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CAAC,cAAc,CAAC,CA2C1B"}
+{"version":3,"file":"recoveryCode.d.ts","sourceRoot":"","sources":["../../src/recovery/recoveryCode.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAElD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAGvE;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,EAAE,SAM1B,CAAA;AAoBD;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,SAAuC;CAI3D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAI7C;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAErE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE1E;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,UAAU,CAazE;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAe,SAAQ,oBAAoB;IAC1D,SAAS,EAAE,UAAU,CAAA;IACrB,UAAU,EAAE,UAAU,CAAA;IACtB;;;;OAIG;IACH,aAAa,EAAE,UAAU,CAAA;IACzB,kBAAkB,EAAE,MAAM,CAAA;CAC3B;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,EAC3C,IAAI,EACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CAAC,cAAc,CAAC,CAgC1B"}

package/dist/recovery/recoveryCode.js

@@ -20,7 +20,7 @@
 import { base58 } from '@scure/base';
 import { hkdf } from '@noble/hashes/hkdf.js';
 import { sha256 } from '@noble/hashes/sha2.js';
-import { agentsFromSeed } from '../identity/agents.js';
+import { unlockClientIdentityFromSeed } from '../unlock/standingClient.js';
 import { updateKeyMultibase } from '../webvh/didWebvh.js';
 /**
  * The byte length of a recovery code: 16 random bytes is ~128 bits, enough
@@ -143,23 +143,13 @@ export async function recoveryClientFromCode({ code }) {
     const clientSeed = hkdf(sha256, codeBytes, salt, new TextEncoder().encode(RECOVERY_CLIENT_SEED_INFO), 32);
     const updateSeed = hkdf(sha256, codeBytes, salt, new TextEncoder().encode(RECOVERY_UPDATE_SEED_INFO), 32);
     const bindingMacKey = hkdf(sha256, codeBytes, new TextEncoder().encode(RECOVERY_KDF.salt), new TextEncoder().encode(RECOVERY_BINDING_MAC_INFO), 32);
-    const agents = await agentsFromSeed({ seed: clientSeed });
-    const { publicKeyMultibase: keyAgreementKeyMultibase } = agents.keyAgreementKey;
-    if (!keyAgreementKeyMultibase) {
-        throw new Error('The derived key-agreement key has no public multibase.');
-    }
-    const [, , signingKeyMultibase] = agents.keyAgent.id.split(':');
+    const identity = await unlockClientIdentityFromSeed({ clientSeed });
     return {
+        ...identity,
         codeBytes,
-        clientSeed,
         updateSeed,
         bindingMacKey,
-        agents,
-        clientDid: agents.keyAgent.id,
-        signingKeyMultibase: signingKeyMultibase,
-        keyAgreementKeyMultibase,
-        updateKeyMultibase: await updateKeyMultibase({ seed: updateSeed }),
-        recipientKid: `${agents.keyAgent.id}#${keyAgreementKeyMultibase}`
+        updateKeyMultibase: await updateKeyMultibase({ seed: updateSeed })
     };
 }
 //# sourceMappingURL=recoveryCode.js.map

package/dist/recovery/recoveryCode.js.map

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

package/dist/recovery/recoveryDelegation.d.ts

@@ -3,15 +3,45 @@ import type { ZcapClient } from '@interop/ezcap';
 import type { PublishedKeyDocument } from '../webvh/listClients.js';
 import type { AccountPointer, RecordSigner } from '../keyring/record.js';
 /**
- * The recovery delegation's lifetime: ten years. Deliberately long-lived: a
- * recovery code must work years after issuance, and the delegation's scope is
- * one resource (the world-readable DID log), whose worst-case abuse is a log
- * write that still has to verify against the published hash chain and
- * prerotation commitments to resolve. The login-time recovery health check
- * watches for delegation rot (the signing client's verification method
- * leaving the document) rather than expiry.
+ * The recovery delegation's lifetime: one year, following NIST SP 800-57's
+ * one-to-two-year cryptoperiod guidance for private signature keys. The
+ * delegation's scope stays narrow (PUT on the one world-readable DID log
+ * resource, whose worst-case abuse is a log write that still has to verify
+ * against the published hash chain and prerotation commitments to resolve),
+ * but a standing bearer artifact should not outlive its signing key's
+ * recommended cryptoperiod. A code must keep working past the year, so
+ * expiry is watched rather than terminal: the registry entry records the
+ * delegation's `expires`, {@link zcapExpiring} treats the
+ * renewal window before it as stale, the re-mint refreshes a stale
+ * delegation, and the login-time recovery health check flags one the same
+ * way it flags rot (the signing client's verification method leaving the
+ * document).
  */
 export declare const RECOVERY_DELEGATION_TTL_MS: number;
+/**
+ * How long before its `expires` a standing recorded zcap counts as stale:
+ * thirty days, so a refresh (a re-mint, a login-time re-delegation) or a
+ * regenerate nudge lands well before the zcap actually lapses.
+ */
+export declare const ZCAP_RENEWAL_WINDOW_MS: number;
+/**
+ * Whether a recorded zcap expiry is past or inside the renewal window -- the
+ * expiry half of the staleness predicate for every long-lived zcap a wallet
+ * records beside its registry entries (the recovery `did.jsonl` delegation,
+ * an unlock Space's management zcap). The re-mint and the wallets'
+ * login-time checks all ask this one predicate. A record carrying no expiry
+ * (or an unparseable one) is uncheckable and therefore not assumed healthy,
+ * matching the rot check's treatment of a missing `delegationKeyId`.
+ *
+ * @param options {object}
+ * @param [options.expires] {string}   the recorded ISO 8601 expiry
+ * @param [options.now] {number}   epoch milliseconds, for tests
+ * @returns {boolean}
+ */
+export declare function zcapExpiring({ expires, now }: {
+    expires?: string;
+    now?: number;
+}): boolean;
 /**
  * Delegates the narrow log-write bridge to a code-derived client: PUT on the
  * one `did.jsonl` resource, {@link RECOVERY_DELEGATION_TTL_MS} lifetime. The
@@ -42,8 +72,9 @@ export declare function delegationProofKeyId(delegation: IZcap): string | undefi
 /**
  * The members of a recovery-code registry entry the re-mint reads: where the
  * code's unlock Space and record are (`unlockSpaceId`, `manageCapability`),
- * which key signed the recorded delegation (`delegationKeyId` -- absent on an
- * entry predating the field, which the rot check conservatively flags), and
+ * which key signed the recorded delegation and when it expires
+ * (`delegationKeyId` / `delegationExpires` -- either absent on an entry
+ * predating its field, which the staleness checks conservatively flag), and
  * the re-mint fields: the code-derived signing DID the fresh delegation names
  * and the unlock KAK public half the record is re-wrapped to. Structural on
  * purpose -- an app's richer registry entry satisfies it, and the re-mint
@@ -55,6 +86,7 @@ export interface RecoveryDelegationEntry {
     unlockSpaceId: string;
     manageCapability?: IZcap;
     delegationKeyId?: string;
+    delegationExpires?: string;
     recoveryClientDid?: string;
     unlockKeyAgreementKeyId?: string;
     unlockKeyAgreementKeyMultibase?: string;
@@ -64,13 +96,15 @@ export interface RecoveryDelegationEntry {
  * the recovery-code delta riding the revocation cascade (see the module doc
  * for the mechanism and the skip policy).
  *
- * The record's code-authenticated account binding is preserved verbatim: the
+ * The record's credential-authenticated core is preserved verbatim: the
  * re-mint reads the standing record through the entry's management zcap and
- * carries its `binding` frame member forward (the tag rides in the clear; it
- * cannot be recomputed without the code, and does not need to be). A re-mint
- * therefore can never change the pointer or controller the code was issued
- * against -- and after a host migration the tag no longer matches the moved
- * pointer, so codes must be re-issued when the account moves hosts.
+ * replaces only its bridge member ({@link remintUnlockRecordBridge}) -- the
+ * shell, the ladder member (where one rides), and the binding tag all travel
+ * untouched, since the re-mint can decrypt none of them and does not need to.
+ * A re-mint therefore can never change the pointer or controller the
+ * credential was bound against -- and after a host migration the tag no
+ * longer matches the moved pointer, so credentials must be rebound (codes
+ * re-issued) when the account moves hosts.
  *
  * The re-mint holds the code's KAK public half but not its signing key, so
  * every record it re-PUTs is signed with the acting client's own account key
@@ -86,8 +120,6 @@ export interface RecoveryDelegationEntry {
  * @param options.entries {RecoveryDelegationEntry[]}   the registry's
  *   recovery-code entries, as the app's registry read returned them
  * @param options.pointer {AccountPointer}
- * @param options.controller {string}   the account controller to stamp into
- *   re-wrapped records (an identity label, as at issuance)
  * @param options.storageServerUrl {string}   the unlock Spaces' storage server
  * @param options.zcapClient {ZcapClient}   the acting client's promoted
  *   signer, which mints the fresh delegations
@@ -99,11 +131,10 @@ export interface RecoveryDelegationEntry {
  *   persists one updated registry entry (matching on the app's entry key)
  * @returns {Promise<{ reminted: number; skipped: number }>}
  */
-export declare function remintRecoveryDelegations<Entry extends RecoveryDelegationEntry>({ doc, entries, pointer, controller, storageServerUrl, zcapClient, recordSigner, managementZcapClient, recordEntry }: {
+export declare function remintRecoveryDelegations<Entry extends RecoveryDelegationEntry>({ doc, entries, pointer, storageServerUrl, zcapClient, recordSigner, managementZcapClient, recordEntry }: {
     doc: PublishedKeyDocument;
     entries: Entry[];
     pointer: AccountPointer;
-    controller: string;
     storageServerUrl: string;
     zcapClient: ZcapClient;
     recordSigner: RecordSigner;

package/dist/recovery/recoveryDelegation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recoveryDelegation.d.ts","sourceRoot":"","sources":["../../src/recovery/recoveryDelegation.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAoB,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAGhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAKnE,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGxE;;;;;;;;GAQG;AACH,eAAO,MAAM,0BAA0B,QAAiC,CAAA;AAiBxE;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,UAAU,EACV,OAAO,EACP,iBAAiB,EAClB,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,cAAc,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,GAAG,OAAO,CAAC,KAAK,CAAC,CAOjB;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAU1E;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,CAAC,EAAE,KAAK,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,8BAA8B,CAAC,EAAE,MAAM,CAAA;CACxC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,SAAS,uBAAuB,EACrC,EACA,GAAG,EACH,OAAO,EACP,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACZ,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;IACzB,OAAO,EAAE,KAAK,EAAE,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,YAAY,EAAE,YAAY,CAAA;IAC1B,oBAAoB,EAAE,CAAC,OAAO,EAAE;QAAE,UAAU,EAAE,KAAK,CAAA;KAAE,KAAK,UAAU,CAAA;IACpE,WAAW,EAAE,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1D,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAyFjD"}
+{"version":3,"file":"recoveryDelegation.d.ts","sourceRoot":"","sources":["../../src/recovery/recoveryDelegation.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAoB,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAGhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAKnE,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGxE;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,0BAA0B,QAA4B,CAAA;AAEnE;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAA2B,CAAA;AAE9D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,GAAgB,EACjB,EAAE;IACD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CASV;AAiBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,UAAU,EACV,OAAO,EACP,iBAAiB,EAClB,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,cAAc,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,GAAG,OAAO,CAAC,KAAK,CAAC,CAOjB;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAU1E;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,CAAC,EAAE,KAAK,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,8BAA8B,CAAC,EAAE,MAAM,CAAA;CACxC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,SAAS,uBAAuB,EACrC,EACA,GAAG,EACH,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACZ,EAAE;IACD,GAAG,EAAE,oBAAoB,CAAA;IACzB,OAAO,EAAE,KAAK,EAAE,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,YAAY,EAAE,YAAY,CAAA;IAC1B,oBAAoB,EAAE,CAAC,OAAO,EAAE;QAAE,UAAU,EAAE,KAAK,CAAA;KAAE,KAAK,UAAU,CAAA;IACpE,WAAW,EAAE,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1D,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CA+FjD"}

package/dist/recovery/recoveryDelegation.js

@@ -6,21 +6,24 @@
  * delegation and the revocation cascade's re-mint of it. The delegation is a
  * wire artifact both apps must mint byte-identically (issuance and every
  * re-mint produce the record another replica later recovers with), so its
- * builder lives here: PUT on the one `did.jsonl` resource, long TTL, delegated
- * to the code-derived signing DID. Its narrow scope is what keeps recovery
- * loud -- a stolen code must extend the world-readable log before it can read
- * anything.
+ * builder lives here: PUT on the one `did.jsonl` resource, one-year TTL,
+ * delegated to the code-derived signing DID. Its narrow scope is what keeps
+ * recovery loud -- a stolen code must extend the world-readable log before it
+ * can read anything.
  *
  * Beside the builder lives the re-mint core (`remintRecoveryDelegations`):
  * revoking a client kills, by the current-key-set rule, every `did.jsonl`
  * delegation that client signed, which would brick recovery exactly when it
- * is needed. For each registry entry whose recorded delegation no longer
- * chains (its signing verification method left the document), the acting
+ * is needed -- and a delegation left standing eventually reaches its own
+ * expiry. For each registry entry whose recorded delegation no longer
+ * chains (its signing verification method left the document) or is expired
+ * or inside the renewal window, the acting
  * client signs a fresh delegation to the code's signing DID, re-wraps the
  * record to the code's unlock KAK (the public half the registry records --
  * the record carries no secrets, so re-encryption needs none), re-PUTs it
  * through the entry's management zcap, and updates the registry's
- * `delegationKeyId`. The skip policy is cross-replica correctness and is
+ * `delegationKeyId` and `delegationExpires`. The skip policy is
+ * cross-replica correctness and is
  * decided here once: an entry that predates the re-mint fields, or whose
  * standing record cannot be read or carries no binding, is skipped and stays
  * flagged by the login-time health check. What stays app-side is the seams:
@@ -31,17 +34,53 @@ import { X25519KeyAgreementKey2020 } from '@interop/x25519-key-agreement-key';
 import { DID_LOG_RESOURCE, ID_COLLECTION } from '../space/collections.js';
 import { delegationKeyInDocument } from '../webvh/listClients.js';
 import { getUnlockKeyringWithCapability, putUnlockKeyringWithCapability } from '../keyring/unlockSpace.js';
-import { recoveryRecordBinding, wrapRecoveryRecord } from './recoveryRecord.js';
+import { remintUnlockRecordBridge } from '../unlock/unlockRecord.js';
 /**
- * The recovery delegation's lifetime: ten years. Deliberately long-lived: a
- * recovery code must work years after issuance, and the delegation's scope is
- * one resource (the world-readable DID log), whose worst-case abuse is a log
- * write that still has to verify against the published hash chain and
- * prerotation commitments to resolve. The login-time recovery health check
- * watches for delegation rot (the signing client's verification method
- * leaving the document) rather than expiry.
+ * The recovery delegation's lifetime: one year, following NIST SP 800-57's
+ * one-to-two-year cryptoperiod guidance for private signature keys. The
+ * delegation's scope stays narrow (PUT on the one world-readable DID log
+ * resource, whose worst-case abuse is a log write that still has to verify
+ * against the published hash chain and prerotation commitments to resolve),
+ * but a standing bearer artifact should not outlive its signing key's
+ * recommended cryptoperiod. A code must keep working past the year, so
+ * expiry is watched rather than terminal: the registry entry records the
+ * delegation's `expires`, {@link zcapExpiring} treats the
+ * renewal window before it as stale, the re-mint refreshes a stale
+ * delegation, and the login-time recovery health check flags one the same
+ * way it flags rot (the signing client's verification method leaving the
+ * document).
  */
-export const RECOVERY_DELEGATION_TTL_MS = 10 * 365 * 24 * 60 * 60 * 1000;
+export const RECOVERY_DELEGATION_TTL_MS = 365 * 24 * 60 * 60 * 1000;
+/**
+ * How long before its `expires` a standing recorded zcap counts as stale:
+ * thirty days, so a refresh (a re-mint, a login-time re-delegation) or a
+ * regenerate nudge lands well before the zcap actually lapses.
+ */
+export const ZCAP_RENEWAL_WINDOW_MS = 30 * 24 * 60 * 60 * 1000;
+/**
+ * Whether a recorded zcap expiry is past or inside the renewal window -- the
+ * expiry half of the staleness predicate for every long-lived zcap a wallet
+ * records beside its registry entries (the recovery `did.jsonl` delegation,
+ * an unlock Space's management zcap). The re-mint and the wallets'
+ * login-time checks all ask this one predicate. A record carrying no expiry
+ * (or an unparseable one) is uncheckable and therefore not assumed healthy,
+ * matching the rot check's treatment of a missing `delegationKeyId`.
+ *
+ * @param options {object}
+ * @param [options.expires] {string}   the recorded ISO 8601 expiry
+ * @param [options.now] {number}   epoch milliseconds, for tests
+ * @returns {boolean}
+ */
+export function zcapExpiring({ expires, now = Date.now() }) {
+    if (!expires) {
+        return true;
+    }
+    const expiresAt = Date.parse(expires);
+    if (Number.isNaN(expiresAt)) {
+        return true;
+    }
+    return expiresAt - now <= ZCAP_RENEWAL_WINDOW_MS;
+}
 /**
  * The absolute URL of the account's `did.jsonl` log resource -- the
  * invocation target of the pre-minted recovery delegation.
@@ -92,13 +131,15 @@ export function delegationProofKeyId(delegation) {
  * the recovery-code delta riding the revocation cascade (see the module doc
  * for the mechanism and the skip policy).
  *
- * The record's code-authenticated account binding is preserved verbatim: the
+ * The record's credential-authenticated core is preserved verbatim: the
  * re-mint reads the standing record through the entry's management zcap and
- * carries its `binding` frame member forward (the tag rides in the clear; it
- * cannot be recomputed without the code, and does not need to be). A re-mint
- * therefore can never change the pointer or controller the code was issued
- * against -- and after a host migration the tag no longer matches the moved
- * pointer, so codes must be re-issued when the account moves hosts.
+ * replaces only its bridge member ({@link remintUnlockRecordBridge}) -- the
+ * shell, the ladder member (where one rides), and the binding tag all travel
+ * untouched, since the re-mint can decrypt none of them and does not need to.
+ * A re-mint therefore can never change the pointer or controller the
+ * credential was bound against -- and after a host migration the tag no
+ * longer matches the moved pointer, so credentials must be rebound (codes
+ * re-issued) when the account moves hosts.
  *
  * The re-mint holds the code's KAK public half but not its signing key, so
  * every record it re-PUTs is signed with the acting client's own account key
@@ -114,8 +155,6 @@ export function delegationProofKeyId(delegation) {
  * @param options.entries {RecoveryDelegationEntry[]}   the registry's
  *   recovery-code entries, as the app's registry read returned them
  * @param options.pointer {AccountPointer}
- * @param options.controller {string}   the account controller to stamp into
- *   re-wrapped records (an identity label, as at issuance)
  * @param options.storageServerUrl {string}   the unlock Spaces' storage server
  * @param options.zcapClient {ZcapClient}   the acting client's promoted
  *   signer, which mints the fresh delegations
@@ -127,20 +166,26 @@ export function delegationProofKeyId(delegation) {
  *   persists one updated registry entry (matching on the app's entry key)
  * @returns {Promise<{ reminted: number; skipped: number }>}
  */
-export async function remintRecoveryDelegations({ doc, entries, pointer, controller, storageServerUrl, zcapClient, recordSigner, managementZcapClient, recordEntry }) {
+export async function remintRecoveryDelegations({ doc, entries, pointer, storageServerUrl, zcapClient, recordSigner, managementZcapClient, recordEntry }) {
     let reminted = 0;
     let skipped = 0;
     for (const entry of entries) {
         // The current-key-set rule, decided once in `webvh`: an entry whose
         // recorded signing key the document no longer publishes -- or that
-        // records no signing key at all -- is rotted.
+        // records no signing key at all -- is rotted. Expiry is the other
+        // staleness axis: a delegation expired or inside the renewal window
+        // (or recording no expiry at all) is re-minted even though its key
+        // still stands.
         const stands = delegationKeyInDocument({
             doc,
             ...(entry.delegationKeyId
                 ? { delegationKeyId: entry.delegationKeyId }
                 : {})
         });
-        if (stands) {
+        const expiring = zcapExpiring({
+            ...(entry.delegationExpires ? { expires: entry.delegationExpires } : {})
+        });
+        if (stands && !expiring) {
             continue;
         }
         if (!entry.recoveryClientDid ||
@@ -153,10 +198,10 @@ export async function remintRecoveryDelegations({ doc, entries, pointer, control
             continue;
         }
         try {
-            // The standing record's code-authenticated binding, carried forward
-            // verbatim (a record with none predates the binding and cannot be
-            // re-minted -- `recoveryRecordBinding` refuses, and the entry is
-            // skipped into the health check's regenerate nudge).
+            // The standing record, whose credential-authenticated core travels
+            // verbatim (a record with no binding predates the standing layout and
+            // cannot be re-minted -- `remintUnlockRecordBridge` refuses, and the
+            // entry is skipped into the health check's regenerate nudge).
             const standing = await getUnlockKeyringWithCapability({
                 storageServerUrl,
                 zcapClient: managementZcapClient({
@@ -165,28 +210,26 @@ export async function remintRecoveryDelegations({ doc, entries, pointer, control
                 spaceId: entry.unlockSpaceId,
                 capability: entry.manageCapability
             });
-            const binding = recoveryRecordBinding({ record: standing });
             const delegation = await delegateLogWrite({
                 zcapClient,
                 pointer,
                 recoveryClientDid: entry.recoveryClientDid
             });
-            // The code's unlock KAK, public half only -- exactly enough to
-            // re-encrypt the record to the same recipient the code derives (the
-            // wrap seals through the encrypt-only cipher, so no secret is needed).
+            // The credential's unlock KAK, public half only -- exactly enough to
+            // seal the fresh bridge to the same recipient the credential derives
+            // (sealing goes through the encrypt-only cipher, so no secret is
+            // needed).
             const unlockKak = (await X25519KeyAgreementKey2020.from({
                 id: entry.unlockKeyAgreementKeyId,
                 controller: entry.unlockKeyAgreementKeyId.split('#')[0],
                 type: 'X25519KeyAgreementKey2020',
                 publicKeyMultibase: entry.unlockKeyAgreementKeyMultibase
             }));
-            const wrapped = await wrapRecoveryRecord({
-                controller,
-                pointer,
+            const wrapped = await remintUnlockRecordBridge({
+                record: standing,
                 delegation,
                 keyAgreementKey: unlockKak,
-                signer: recordSigner,
-                binding
+                signer: recordSigner
             });
             await putUnlockKeyringWithCapability({
                 storageServerUrl,
@@ -198,10 +241,12 @@ export async function remintRecoveryDelegations({ doc, entries, pointer, control
                 capability: entry.manageCapability
             });
             const delegationKeyId = delegationProofKeyId(delegation);
+            const delegationExpires = delegation.expires;
             await recordEntry({
                 entry: {
                     ...entry,
-                    ...(delegationKeyId ? { delegationKeyId } : {})
+                    ...(delegationKeyId ? { delegationKeyId } : {}),
+                    ...(delegationExpires ? { delegationExpires } : {})
                 }
             });
             reminted += 1;

package/dist/recovery/recoveryDelegation.js.map

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