@keyhive/keyhive 0.1.0-alpha.4 → 0.1.0-alpha.6

package/pkg/keyhive_wasm_bg.wasm.d.ts

@@ -1,25 +1,14 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const __wbg_signedcgkaoperation_free: (a: number, b: number) => void;
-export const signedcgkaoperation_delegation: (a: number) => number;
-export const signedcgkaoperation_signature: (a: number) => [number, number];
-export const signedcgkaoperation_verify: (a: number) => number;
-export const signedcgkaoperation_verifyingKey: (a: number) => [number, number];
-export const __wbg_invocation_free: (a: number, b: number) => void;
-export const __wbg_signedinvocation_free: (a: number, b: number) => void;
-export const symmetricDecrypt: (a: number, b: number, c: number, d: number) => [number, number, number, number];
-export const symmetricEncrypt: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number, number];
 export const __wbg_agent_free: (a: number, b: number) => void;
-export const __wbg_allagentevents_free: (a: number, b: number) => void;
-export const __wbg_ciphertextstore_free: (a: number, b: number) => void;
-export const __wbg_doccontentrefs_free: (a: number, b: number) => void;
+export const __wbg_document_free: (a: number, b: number) => void;
 export const __wbg_encryptedcontentwithupdate_free: (a: number, b: number) => void;
+export const __wbg_encryptedkeyed_free: (a: number, b: number) => void;
+export const __wbg_group_free: (a: number, b: number) => void;
 export const __wbg_individual_free: (a: number, b: number) => void;
 export const __wbg_keyhive_free: (a: number, b: number) => void;
 export const __wbg_peer_free: (a: number, b: number) => void;
-export const __wbg_revocation_free: (a: number, b: number) => void;
-export const __wbg_stats_free: (a: number, b: number) => void;
 export const agent_id: (a: number) => number;
 export const agent_isDocument: (a: number) => number;
 export const agent_isGroup: (a: number) => number;
@@ -27,29 +16,31 @@ export const agent_isIndividual: (a: number) => number;
 export const agent_keyOpHashes: (a: number) => any;
 export const agent_keyOps: (a: number) => any;
 export const agent_toString: (a: number) => [number, number];
-export const allagentevents_agentCgkaSources: (a: number) => any;
-export const allagentevents_agentMembershipSources: (a: number) => any;
-export const allagentevents_agentPrekeySources: (a: number) => any;
-export const allagentevents_cgkaSources: (a: number) => any;
-export const allagentevents_events: (a: number) => any;
-export const allagentevents_membershipSources: (a: number) => any;
-export const allagentevents_prekeySources: (a: number) => any;
-export const ciphertextstore_newFromWebStorage: (a: any) => number;
-export const ciphertextstore_newInMemory: () => number;
-export const doccontentrefs_addChangeId: (a: number, b: number) => any;
-export const doccontentrefs_change_hashes: (a: number) => any;
-export const doccontentrefs_docId: (a: number) => number;
-export const doccontentrefs_new: (a: number, b: number, c: number) => [number, number, number];
-export const encryptedcontentwithupdate_applicationSecret: (a: number) => [number, number];
+export const document___wasm_refgen_toJsDocument: (a: number) => number;
+export const document_doc_id: (a: number) => number;
+export const document_id: (a: number) => number;
+export const document_members: (a: number) => any;
+export const document_toAgent: (a: number) => number;
+export const document_toMembered: (a: number) => number;
+export const document_toPeer: (a: number) => number;
 export const encryptedcontentwithupdate_encrypted_content: (a: number) => number;
 export const encryptedcontentwithupdate_update_op: (a: number) => number;
-export const individual_id: (a: number) => number;
+export const encryptedkeyed_applicationSecret: (a: number) => [number, number];
+export const encryptedkeyed_encrypted_content: (a: number) => number;
+export const encryptedkeyed_update_op: (a: number) => number;
+export const group___wasm_refgen_toJsGroup: (a: number) => number;
+export const group_members: (a: number) => any;
+export const group_toAgent: (a: number) => number;
+export const group_toMembered: (a: number) => number;
+export const group_toPeer: (a: number) => number;
+export const individual_individualId: (a: number) => number;
 export const individual_pickPrekey: (a: number, b: number) => any;
 export const individual_toAgent: (a: number) => number;
 export const individual_toPeer: (a: number) => number;
 export const keyhive_accessForDoc: (a: number, b: number, c: number) => any;
 export const keyhive_addMember: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
 export const keyhive_allAgentEvents: (a: number) => any;
+export const keyhive_bestAccessForDoc: (a: number, b: number, c: number) => any;
 export const keyhive_contactCard: (a: number) => any;
 export const keyhive_docMemberCapabilities: (a: number, b: number) => any;
 export const keyhive_eventHashesForAgent: (a: number, b: number) => any;
@@ -82,9 +73,10 @@ export const keyhive_rotatePrekey: (a: number, b: number) => any;
 export const keyhive_stats: (a: number) => any;
 export const keyhive_toArchive: (a: number) => any;
 export const keyhive_tryDecrypt: (a: number, b: number, c: number) => any;
-export const keyhive_tryDecryptWithKey: (a: number, b: number, c: number) => any;
+export const keyhive_tryDecryptKeyed: (a: number, b: number, c: number) => any;
 export const keyhive_tryEncrypt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
 export const keyhive_tryEncryptArchive: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
+export const keyhive_tryEncryptKeyed: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
 export const keyhive_tryPcsKeyHash: (a: number, b: number) => any;
 export const keyhive_trySign: (a: number, b: number, c: number) => any;
 export const keyhive_whoami: (a: number) => number;
@@ -93,11 +85,57 @@ export const peer_isDocument: (a: number) => number;
 export const peer_isGroup: (a: number) => number;
 export const peer_isIndividual: (a: number) => number;
 export const peer_toString: (a: number) => [number, number];
-export const revocation_after: (a: number) => number;
-export const revocation_proof: (a: number) => number;
-export const revocation_revoked: (a: number) => number;
-export const revocation_subject_id: (a: number) => number;
 export const setPanicHook: () => void;
+export const group_groupId: (a: number) => number;
+export const group_id: (a: number) => number;
+export const individual_id: (a: number) => number;
+export const peer_id: (a: number) => number;
+export const __wbg_signed_free: (a: number, b: number) => void;
+export const __wbg_signedcgkaoperation_free: (a: number, b: number) => void;
+export const signed_fromBytes: (a: number, b: number) => [number, number, number];
+export const signed_payload: (a: number) => [number, number];
+export const signed_signature: (a: number) => [number, number];
+export const signed_toBytes: (a: number) => [number, number, number, number];
+export const signed_verify: (a: number) => number;
+export const signed_verifyingKey: (a: number) => [number, number];
+export const signedcgkaoperation_delegation: (a: number) => number;
+export const signedcgkaoperation_signature: (a: number) => [number, number];
+export const signedcgkaoperation_verify: (a: number) => number;
+export const signedcgkaoperation_verifyingKey: (a: number) => [number, number];
+export const __wbg_archive_free: (a: number, b: number) => void;
+export const __wbg_capability_free: (a: number, b: number) => void;
+export const __wbg_delegation_free: (a: number, b: number) => void;
+export const __wbg_history_free: (a: number, b: number) => void;
+export const __wbg_membered_free: (a: number, b: number) => void;
+export const __wbg_membership_free: (a: number, b: number) => void;
+export const __wbg_signeddelegation_free: (a: number, b: number) => void;
+export const __wbg_signedrevocation_free: (a: number, b: number) => void;
+export const __wbg_stats_free: (a: number, b: number) => void;
+export const __wbg_summary_free: (a: number, b: number) => void;
+export const archive_toBytes: (a: number) => [number, number, number, number];
+export const archive_tryToKeyhive: (a: number, b: number, c: number, d: any) => any;
+export const archive_try_from_bytes: (a: number, b: number) => [number, number, number];
+export const capability_can: (a: number) => number;
+export const capability_proof: (a: number) => number;
+export const capability_who: (a: number) => number;
+export const delegation_after: (a: number) => number;
+export const delegation_can: (a: number) => number;
+export const delegation_delegate: (a: number) => number;
+export const delegation_proof: (a: number) => number;
+export const history_contentRefs: (a: number) => [number, number];
+export const history_delegations: (a: number) => [number, number];
+export const history_revocations: (a: number) => [number, number];
+export const membership_can: (a: number) => number;
+export const membership_who: (a: number) => number;
+export const signeddelegation_delegation: (a: number) => number;
+export const signeddelegation_signature: (a: number) => [number, number];
+export const signeddelegation_subjectId: (a: number) => number;
+export const signeddelegation_verify: (a: number) => number;
+export const signeddelegation_verifyingKey: (a: number) => [number, number];
+export const signedrevocation_delegation: (a: number) => number;
+export const signedrevocation_signature: (a: number) => [number, number];
+export const signedrevocation_verify: (a: number) => number;
+export const signedrevocation_verifyingKey: (a: number) => [number, number];
 export const stats_activePrekeyCount: (a: number) => bigint;
 export const stats_cgkaOperations: (a: number) => bigint;
 export const stats_delegations: (a: number) => bigint;
@@ -119,8 +157,8 @@ export const stats_prekeysExpanded: (a: number) => bigint;
 export const stats_revocations: (a: number) => bigint;
 export const stats_totalOps: (a: number) => bigint;
 export const stats_totalPendingOps: (a: number) => bigint;
-export const individual_individualId: (a: number) => number;
-export const peer_id: (a: number) => number;
+export const summary_access: (a: number) => number;
+export const summary_doc: (a: number) => number;
 export const __wbg_access_free: (a: number, b: number) => void;
 export const __wbg_cannotparseed25519signingkey_free: (a: number, b: number) => void;
 export const __wbg_cgkaoperation_free: (a: number, b: number) => void;
@@ -130,8 +168,19 @@ export const __wbg_encrypted_free: (a: number, b: number) => void;
 export const __wbg_event_free: (a: number, b: number) => void;
 export const __wbg_generatewebcryptoerror_free: (a: number, b: number) => void;
 export const __wbg_groupid_free: (a: number, b: number) => void;
-export const __wbg_individualid_free: (a: number, b: number) => void;
+export const __wbg_sharekey_free: (a: number, b: number) => void;
 export const __wbg_signer_free: (a: number, b: number) => void;
+export const access_admin: () => number;
+export const access_atLeast: (a: number, b: number) => number;
+export const access_compareTo: (a: number, b: number) => number;
+export const access_edit: () => number;
+export const access_equals: (a: number, b: number) => number;
+export const access_fromString: (a: number, b: number) => [number, number, number];
+export const access_isEditor: (a: number) => number;
+export const access_isReader: (a: number) => number;
+export const access_level: (a: number) => number;
+export const access_read: () => number;
+export const access_relay: () => number;
 export const access_toString: (a: number) => [number, number];
 export const access_tryFromString: (a: number, b: number) => number;
 export const cgkaoperation_variant: (a: number) => [number, number];
@@ -162,7 +211,6 @@ export const event_tryIntoSignedRevocation: (a: number) => number;
 export const event_variant: (a: number) => [number, number];
 export const generatewebcryptoerror_message: (a: number) => [number, number];
 export const groupid_toString: (a: number) => [number, number];
-export const individualid_bytes: (a: number) => [number, number];
 export const signer_clone: (a: number) => number;
 export const signer_generate: () => any;
 export const signer_generateMemory: () => number;
@@ -172,82 +220,48 @@ export const signer_trySign: (a: number, b: number, c: number) => any;
 export const signer_variant: (a: number) => [number, number];
 export const signer_verifyingKey: (a: number) => [number, number];
 export const signer_webCryptoSigner: (a: any) => any;
+export const symmetricDecrypt: (a: number, b: number, c: number, d: number) => [number, number, number, number];
+export const symmetricEncrypt: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number, number];
 export const encrypted_toBytes: (a: number) => [number, number];
-export const __wbg_archive_free: (a: number, b: number) => void;
+export const __wbg_invocation_free: (a: number, b: number) => void;
+export const __wbg_signedinvocation_free: (a: number, b: number) => void;
 export const __wbg_cannotparseidentifier_free: (a: number, b: number) => void;
-export const __wbg_capability_free: (a: number, b: number) => void;
-export const __wbg_changeid_free: (a: number, b: number) => void;
 export const __wbg_identifier_free: (a: number, b: number) => void;
-export const __wbg_membered_free: (a: number, b: number) => void;
-export const __wbg_membership_free: (a: number, b: number) => void;
-export const __wbg_sharekey_free: (a: number, b: number) => void;
-export const __wbg_signed_free: (a: number, b: number) => void;
-export const __wbg_signeddelegation_free: (a: number, b: number) => void;
-export const __wbg_signedrevocation_free: (a: number, b: number) => void;
-export const archive_toBytes: (a: number) => [number, number, number, number];
-export const archive_tryToKeyhive: (a: number, b: number, c: number, d: any) => any;
-export const archive_try_from_bytes: (a: number, b: number) => [number, number, number];
-export const capability_can: (a: number) => number;
-export const capability_proof: (a: number) => number;
-export const capability_who: (a: number) => number;
-export const changeid___wasm_refgen_toJsChangeId: (a: number) => number;
-export const changeid_bytes: (a: number) => [number, number];
-export const changeid_new: (a: number, b: number) => number;
 export const identifier_new: (a: number, b: number) => [number, number, number];
 export const identifier_publicId: () => number;
 export const identifier_toBytes: (a: number) => [number, number];
-export const membership_can: (a: number) => number;
-export const membership_who: (a: number) => number;
-export const signed_fromBytes: (a: number, b: number) => [number, number, number];
-export const signed_payload: (a: number) => [number, number];
-export const signed_signature: (a: number) => [number, number];
-export const signed_toBytes: (a: number) => [number, number, number, number];
-export const signed_verify: (a: number) => number;
-export const signed_verifyingKey: (a: number) => [number, number];
-export const signeddelegation_delegation: (a: number) => number;
-export const signeddelegation_signature: (a: number) => [number, number];
-export const signeddelegation_subjectId: (a: number) => number;
-export const signeddelegation_verify: (a: number) => number;
-export const signeddelegation_verifyingKey: (a: number) => [number, number];
-export const signedrevocation_delegation: (a: number) => number;
-export const signedrevocation_signature: (a: number) => [number, number];
-export const signedrevocation_verify: (a: number) => number;
-export const signedrevocation_verifyingKey: (a: number) => [number, number];
-export const __wbg_addmemberupdate_free: (a: number, b: number) => void;
-export const __wbg_decryptedwithkey_free: (a: number, b: number) => void;
-export const __wbg_delegation_free: (a: number, b: number) => void;
-export const __wbg_document_free: (a: number, b: number) => void;
-export const __wbg_group_free: (a: number, b: number) => void;
-export const __wbg_history_free: (a: number, b: number) => void;
-export const __wbg_summary_free: (a: number, b: number) => void;
-export const addmemberupdate_delegation: (a: number) => number;
-export const decryptedwithkey_applicationSecret: (a: number) => [number, number];
-export const decryptedwithkey_plaintext: (a: number) => [number, number];
-export const delegation_after: (a: number) => number;
-export const delegation_can: (a: number) => number;
-export const delegation_delegate: (a: number) => number;
-export const delegation_proof: (a: number) => number;
-export const document___wasm_refgen_toJsDocument: (a: number) => number;
-export const document_doc_id: (a: number) => number;
-export const document_id: (a: number) => number;
-export const document_members: (a: number) => any;
-export const document_toAgent: (a: number) => number;
-export const document_toMembered: (a: number) => number;
-export const document_toPeer: (a: number) => number;
-export const group___wasm_refgen_toJsGroup: (a: number) => number;
-export const group_members: (a: number) => any;
-export const group_toAgent: (a: number) => number;
-export const group_toMembered: (a: number) => number;
-export const group_toPeer: (a: number) => number;
-export const history_contentRefs: (a: number) => [number, number];
-export const history_delegations: (a: number) => [number, number];
-export const history_revocations: (a: number) => [number, number];
-export const summary_access: (a: number) => number;
-export const summary_doc: (a: number) => number;
-export const group_groupId: (a: number) => number;
-export const group_id: (a: number) => number;
-export const wasm_bindgen__convert__closures_____invoke__h9887d5ab72723f8a: (a: number, b: number, c: any) => [number, number];
-export const wasm_bindgen__convert__closures_____invoke__h58982df154245cbc: (a: number, b: number, c: any, d: any) => void;
+export const __wbg_allagentevents_free: (a: number, b: number) => void;
+export const __wbg_changeid_free: (a: number, b: number) => void;
+export const __wbg_ciphertextstore_free: (a: number, b: number) => void;
+export const __wbg_decryptedkeyed_free: (a: number, b: number) => void;
+export const __wbg_doccontentrefs_free: (a: number, b: number) => void;
+export const __wbg_individualid_free: (a: number, b: number) => void;
+export const __wbg_revocation_free: (a: number, b: number) => void;
+export const allagentevents_agentCgkaSources: (a: number) => any;
+export const allagentevents_agentMembershipSources: (a: number) => any;
+export const allagentevents_agentPrekeySources: (a: number) => any;
+export const allagentevents_cgkaSources: (a: number) => any;
+export const allagentevents_events: (a: number) => any;
+export const allagentevents_membershipSources: (a: number) => any;
+export const allagentevents_prekeySources: (a: number) => any;
+export const changeid___wasm_refgen_toJsChangeId: (a: number) => number;
+export const changeid_bytes: (a: number) => [number, number];
+export const changeid_new: (a: number, b: number) => number;
+export const ciphertextstore_newFromWebStorage: (a: any) => number;
+export const ciphertextstore_newInMemory: () => number;
+export const decryptedkeyed_applicationSecret: (a: number) => [number, number];
+export const decryptedkeyed_plaintext: (a: number) => [number, number];
+export const doccontentrefs_addChangeId: (a: number, b: number) => any;
+export const doccontentrefs_change_hashes: (a: number) => any;
+export const doccontentrefs_docId: (a: number) => number;
+export const doccontentrefs_new: (a: number, b: number, c: number) => [number, number, number];
+export const individualid_bytes: (a: number) => [number, number];
+export const revocation_after: (a: number) => number;
+export const revocation_proof: (a: number) => number;
+export const revocation_revoked: (a: number) => number;
+export const revocation_subject_id: (a: number) => number;
+export const wasm_bindgen__convert__closures_____invoke__h264249ebd10d2c4e: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen__convert__closures_____invoke__h3240482818b7fa6b: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;

package/pkg-node/keyhive_wasm.d.ts

@@ -5,18 +5,56 @@ export class Access {
     private constructor();
     free(): void;
     [Symbol.dispose](): void;
+    /**
+     * The ability to revoke any members of a group, not just those that they have causal senority over.
+     */
+    static admin(): Access;
+    /**
+     * True if this level is at least as permissive as `other`.
+     */
+    atLeast(other: Access): boolean;
+    /**
+     * Standard comparator result: -1 if less permissive than `other`,
+     * 0 if equal, 1 if more permissive.
+     */
+    compareTo(other: Access): number;
+    /**
+     * The ability to edit (append ops to) the content of a document.
+     */
+    static edit(): Access;
+    equals(other: Access): boolean;
+    /**
+     * Parse an access level, throwing on invalid input.
+     * Accepts "relay", "read", "edit", or "admin" (case-insensitive).
+     */
+    static fromString(s: string): Access;
+    /**
+     * The ability to read (decrypt) the content of a document.
+     */
+    static read(): Access;
+    /**
+     * The ability to retrieve bytes over the network.
+     */
+    static relay(): Access;
     toString(): string;
+    /**
+     * Parse an access level, returning undefined on invalid input.
+     * Prefer `fromString`, which throws a descriptive error instead.
+     */
     static tryFromString(s: string): Access | undefined;
-}
-
-/**
- * The result of adding a member: the membership delegation.
- */
-export class AddMemberUpdate {
-    private constructor();
-    free(): void;
-    [Symbol.dispose](): void;
-    readonly delegation: SignedDelegation;
+    /**
+     * True for Edit access or higher.
+     */
+    readonly isEditor: boolean;
+    /**
+     * True for Read access or higher.
+     */
+    readonly isReader: boolean;
+    /**
+     * Numeric level for ordering: Relay = 0, Read = 1, Edit = 2, Admin = 3.
+     * Higher levels imply all lower levels.
+     */
+    readonly level: number;
 }
 
 export class Agent {
@@ -127,16 +165,14 @@ export class ContactCard {
 
 /**
  * Plaintext plus the application secret key that decrypted it.
- *
- * The key lets the consumer recover the blob's external predecessor-secret
- * chain and chain further encryptions onto it, without re-entering CGKA.
  */
-export class DecryptedWithKey {
+export class DecryptedKeyed {
     private constructor();
     free(): void;
     [Symbol.dispose](): void;
     /**
      * The 32-byte application secret key used to decrypt this content.
+     * Treat as secret: do not log or persist unencrypted.
      */
     readonly applicationSecret: Uint8Array;
     readonly plaintext: Uint8Array;
@@ -192,8 +228,7 @@ export class Encrypted {
     [Symbol.dispose](): void;
     /**
      * Decrypt this content with an explicit 32-byte application secret key,
-     * bypassing CGKA. The consumer uses this to follow the external
-     * predecessor-secret chain once it has recovered a blob's key.
+     * bypassing CGKA.
      */
     decryptWithKey(key: Uint8Array): Uint8Array;
     static fromBytes(bytes: Uint8Array): Encrypted;
@@ -212,11 +247,20 @@ export class EncryptedContentWithUpdate {
     [Symbol.dispose](): void;
     encrypted_content(): Encrypted;
     update_op(): SignedCgkaOperation | undefined;
+}
+
+/**
+ * Encrypted content plus the application secret key it was encrypted under.
+ */
+export class EncryptedKeyed {
+    private constructor();
+    free(): void;
+    [Symbol.dispose](): void;
+    encrypted_content(): Encrypted;
+    update_op(): SignedCgkaOperation | undefined;
     /**
      * The 32-byte application secret key used to encrypt this content.
-     *
-     * Lets the consumer build the external predecessor-secret chain and chain
-     * further encryptions onto this blob.
+     * Treat as secret: do not log or persist unencrypted.
      */
     readonly applicationSecret: Uint8Array;
 }
@@ -313,12 +357,18 @@ export class Keyhive {
     free(): void;
     [Symbol.dispose](): void;
     accessForDoc(id: Identifier, doc_id: DocumentId): Promise<Access | undefined>;
-    addMember(to_add: Agent, membered: Membered, access: Access, other_relevant_docs: Document[]): Promise<AddMemberUpdate>;
+    addMember(to_add: Agent, membered: Membered, access: Access, other_relevant_docs: Document[]): Promise<SignedDelegation>;
     /**
      * Returns all agent events with deduplicated storage and two-tier indirection
      * for membership, prekey, and CGKA ops.
      */
     allAgentEvents(): Promise<AllAgentEvents>;
+    /**
+     * The most permissive of `id`'s direct access and the document's
+     * public access. Returns undefined if neither grants access (or the
+     * document is unknown).
+     */
+    bestAccessForDoc(id: Identifier, doc_id: DocumentId): Promise<Access | undefined>;
     contactCard(): Promise<ContactCard>;
     docMemberCapabilities(doc_id: DocumentId): Promise<Membership[]>;
     /**
@@ -334,14 +384,10 @@ export class Keyhive {
     /**
      * Force a PCS key rotation and return the new leaf secret, serialized as a
      * one-entry `BTreeMap<ShareKey, ShareSecretKey>` (the exact format
-     * `importPrekeySecrets` accepts). A sibling instance of this identity can
-     * install it to derive the rotated key without re-importing the whole bundle.
+     * `importPrekeySecrets` accepts).
+     * The returned bytes are secret key material: do not log or persist unencrypted.
      */
     forcePcsUpdate(doc: Document): Promise<Uint8Array>;
-    /**
-     * Generate a document. Whether it provides forward secrecy is determined by
-     * this peer's forward-secrecy policy (chosen at `Keyhive.init`).
-     */
     generateDocument(coparents: Peer[], initial_content_ref_head: ChangeId, more_initial_content_refs: ChangeId[]): Promise<Document>;
     generateGroup(js_coparents: Peer[]): Promise<Group>;
     getAgent(id: Identifier): Promise<Agent | undefined>;
@@ -352,9 +398,6 @@ export class Keyhive {
     importPrekeySecrets(bytes: Uint8Array): Promise<void>;
     ingestArchive(archive: Archive): Promise<void>;
     ingestEventsBytes(events_bytes_array: Array<any>): Promise<Array<any>>;
-    /**
-     * Initialize a peer.
-     */
     static init(signer: Signer, ciphertext_store: CiphertextStore, event_handler: Function): Promise<Keyhive>;
     intoArchive(): Promise<Archive>;
     membershipOpsForAgent(agent: Agent): Promise<Map<any, any>>;
@@ -369,13 +412,15 @@ export class Keyhive {
     tryDecrypt(doc: Document, encrypted: Encrypted): Promise<Uint8Array>;
     /**
      * Decrypt content and also return the 32-byte application secret key used.
-     *
-     * The consumer follows the external predecessor-secret chain from this key
-     * with `Encrypted.decryptWithKey`, avoiding further CGKA dives.
      */
-    tryDecryptWithKey(doc: Document, encrypted: Encrypted): Promise<DecryptedWithKey>;
+    tryDecryptKeyed(doc: Document, encrypted: Encrypted): Promise<DecryptedKeyed>;
     tryEncrypt(doc: Document, content_ref: ChangeId, js_pred_refs: ChangeId[], content: Uint8Array): Promise<EncryptedContentWithUpdate>;
     tryEncryptArchive(doc: Document, content_ref: ChangeId, pred_refs: ChangeId[], content: Uint8Array): Promise<EncryptedContentWithUpdate>;
+    /**
+     * Encrypt content and also return the application secret key it was
+     * encrypted under.
+     */
+    tryEncryptKeyed(doc: Document, content_ref: ChangeId, js_pred_refs: ChangeId[], content: Uint8Array): Promise<EncryptedKeyed>;
     tryPcsKeyHash(doc: Document): Promise<Uint8Array | undefined>;
     trySign(data: Uint8Array): Promise<Signed>;
     readonly id: IndividualId;
@@ -542,12 +587,6 @@ export function setPanicHook(): void;
 export function symmetricDecrypt(key: Uint8Array, blob: Uint8Array): Uint8Array;
 
 /**
- * AEAD-encrypt `plaintext` under a 32-byte `key`.
- *
- * `associated_data` flavors the synthetic nonce (e.g. the document or content
- * id) so identical plaintext under the same key in different contexts produces
- * distinct ciphertext. Returns `nonce(24) || ciphertext` (the ciphertext
- * includes the Poly1305 tag). The nonce is carried in the output, so
- * [`symmetric_decrypt`] does not need the associated data.
+ * Encrypt `plaintext` under a 32-byte `key`, returning `nonce(24) || ciphertext`.
  */
 export function symmetricEncrypt(key: Uint8Array, plaintext: Uint8Array, associated_data: Uint8Array): Uint8Array;