@oxy.so/core 7.31.0 → 7.33.0

package/dist/cjs/crypto/organizationKeys.js

@@ -46,6 +46,7 @@ const keychainAccessGroups_1 = require("../utils/keychainAccessGroups");
 const platform_1 = require("../utils/platform");
 const identitySigner_1 = require("./identitySigner");
 const keychainGroupMigration_1 = require("./keychainGroupMigration");
+const retiredKeys_1 = require("./retiredKeys");
 const keychainItems_1 = require("./keychainItems");
 Object.defineProperty(exports, "isOrganizationAccountId", { enumerable: true, get: function () { return keychainItems_1.isOrganizationAccountId; } });
 const ORGANIZATION_PHRASE_WORDS = 24;
@@ -115,9 +116,7 @@ async function organizationKeyFromPhrase(phrase) {
 async function secureStore(item) {
     const raw = await (0, protocol_1.loadSecureStore)();
     const access = await (0, keychainAccessGroups_1.resolveKeychainAccess)();
-    if (access.mode === 'grouped' && access.role === 'holder') {
-        await (0, keychainGroupMigration_1.ensureKeychainGroupsMigrated)();
-    }
+    await (0, keychainGroupMigration_1.prepareKeychainAccess)(access);
     return (0, keychainAccessGroups_1.groupedKeychainStore)(raw, access, item);
 }
 const pairStore = () => secureStore('spending-key');
@@ -208,8 +207,10 @@ async function readLocalPair(accountId) {
  * it; on iOS only Commons holds the groups it writes (any other app throws).
  *
  * Refuses a pair whose public key does not derive from its private key, and a
- * phrase that does not derive the pair. Overwrites whatever this device held for
- * the organization (a replaced key is the caller's decision, ADR 0061 D7).
+ * phrase that does not derive the pair. A DIFFERENT key this device already
+ * held for the organization is first kept in the organization's retired ring
+ * (ADR 0061 D7 as amended; R4-12): coins under it still need it. When that
+ * cannot be confirmed nothing is overwritten and this throws.
  */
 async function storeOrganizationKey(accountId, key) {
     assertAccountId(accountId);
@@ -231,6 +232,18 @@ async function storeOrganizationKey(accountId, key) {
         throw new Error('On Android only Commons holds organization keys; this app has no identity signer store for them.');
     }
     const store = await pairStore();
+    const previous = await heldPrivateKey(store, accountId);
+    if (previous) {
+        const previousPublic = (0, secp256k1_1.deriveSecp256k1PublicKey)(previous);
+        if (previousPublic !== publicKey) {
+            try {
+                await (0, retiredKeys_1.retireIdentityKey)({ privateKey: previous, publicKey: previousPublic }, { accountId });
+            }
+            catch (error) {
+                throw new Error(`organization key: the key this device held could not be kept as a previous key, so it was not replaced (${error instanceof Error ? error.message : 'unknown'})`);
+            }
+        }
+    }
     await store.setItemAsync((0, keychainItems_1.organizationPrivateKeyName)(accountId), privateKey, pairOptions(store, true));
     await store.setItemAsync((0, keychainItems_1.organizationPublicKeyName)(accountId), publicKey, pairOptions(store, false));
     if (signer?.writeOrganization &&
@@ -311,6 +324,21 @@ async function listOrganizationKeys() {
         return [];
     return readIndex(await indexStore());
 }
+/**
+ * The private key this device holds for `accountId`, whatever its public half
+ * says (an unhealthy pair is still a key coins may sit under): the slot, then
+ * on Android the signer store's copy. `null` when there is none.
+ */
+async function heldPrivateKey(store, accountId) {
+    const local = await store.getItemAsync((0, keychainItems_1.organizationPrivateKeyName)(accountId), pairOptions(store, false));
+    if (local && (0, secp256k1_1.isValidSecp256k1PrivateKey)(local))
+        return (0, secp256k1_1.normalizeSecp256k1PrivateKey)(local);
+    const signer = (0, platform_1.isAndroid)() ? (0, identitySigner_1.registeredIdentitySignerStore)() : null;
+    const mirrored = (await signer?.readOrganization?.(accountId)) ?? null;
+    return mirrored && (0, secp256k1_1.isValidSecp256k1PrivateKey)(mirrored.privateKey)
+        ? (0, secp256k1_1.normalizeSecp256k1PrivateKey)(mirrored.privateKey)
+        : null;
+}
 /** Forget an organization key on this device: its pair, its phrase, its signer copy and its index entry. */
 async function deleteOrganizationKey(accountId) {
     assertAccountId(accountId);

package/dist/cjs/crypto/retiredKeys.js

@@ -43,13 +43,20 @@
  * This module imports nothing from `./keyManager` (which imports it).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RetiredKeyRingUnreadableError = void 0;
 exports.retiredKeyScope = retiredKeyScope;
 exports.retireIdentityKey = retireIdentityKey;
+exports.retireIdentityKeyDuringMigration = retireIdentityKeyDuringMigration;
+exports.claimRetiredIdentityKeys = claimRetiredIdentityKeys;
+exports.countQuarantinedRetiredKeys = countQuarantinedRetiredKeys;
 exports.listRetiredIdentityKeys = listRetiredIdentityKeys;
 exports.getRetiredPrivateKey = getRetiredPrivateKey;
 exports.forgetRetiredIdentityKey = forgetRetiredIdentityKey;
 exports.forgetRetiredIdentityKeys = forgetRetiredIdentityKeys;
 exports.syncRetiredKeys = syncRetiredKeys;
+exports.exportRetiredIdentityKeys = exportRetiredIdentityKeys;
+exports.unmirrorPersonalRetiredKeys = unmirrorPersonalRetiredKeys;
+exports.retiredKeyFromPrivateKey = retiredKeyFromPrivateKey;
 exports.retiredKeyFromPhrase = retiredKeyFromPhrase;
 const bip39_1 = require("@scure/bip39");
 const english_js_1 = require("@scure/bip39/wordlists/english.js");
@@ -59,8 +66,16 @@ const logger_1 = require("../logger");
 const keychainAccessGroups_1 = require("../utils/keychainAccessGroups");
 const platform_1 = require("../utils/platform");
 const identitySigner_1 = require("./identitySigner");
+const keychainItems_1 = require("./keychainItems");
 const keychainGroupMigration_1 = require("./keychainGroupMigration");
-const organizationKeys_1 = require("./organizationKeys");
+/** Thrown when the ring's index cannot be read as the ring: never treated as empty (R5-9). */
+class RetiredKeyRingUnreadableError extends Error {
+    constructor(reason) {
+        super(`retired key ring: ${reason}`);
+        this.name = 'RetiredKeyRingUnreadableError';
+    }
+}
+exports.RetiredKeyRingUnreadableError = RetiredKeyRingUnreadableError;
 const PERSONAL_SCOPE = 'personal';
 /** Android, Commons-local: its own Keystore-backed slot, shared with no other key. */
 const ANDROID_KEYCHAIN_SERVICE = 'oxy_retired_identity';
@@ -71,15 +86,15 @@ const PUBLIC_KEY = /^04[0-9a-f]{128}$/;
  * The secure store for the ring. On iOS every item is a `spending-key`
  * (ADR 0062): the private keys AND the index live in the wallet group, which
  * only Commons and the Peable wallet can read, never the shared one. In
- * Commons every access first awaits the access-group migration. On Android
- * the grouping is a no-op and Commons' own services below apply.
+ * Commons every access first awaits the access-group migration (`gate: false`
+ * is the migration itself, keeping a pre-split copy). On Android the grouping
+ * is a no-op and Commons' own services below apply.
  */
-async function ringStore() {
+async function ringStore(gate = true) {
     const raw = await (0, protocol_1.loadSecureStore)();
     const access = await (0, keychainAccessGroups_1.resolveKeychainAccess)();
-    if (access.mode === 'grouped' && access.role === 'holder') {
-        await (0, keychainGroupMigration_1.ensureKeychainGroupsMigrated)();
-    }
+    if (gate)
+        await (0, keychainGroupMigration_1.prepareKeychainAccess)(access);
     return (0, keychainAccessGroups_1.groupedKeychainStore)(raw, access, 'spending-key');
 }
 /** The ring a selector names: `personal`, or the organization's account id. */
@@ -87,7 +102,7 @@ function retiredKeyScope(selector) {
     const accountId = selector?.accountId;
     if (accountId === undefined)
         return PERSONAL_SCOPE;
-    return (0, organizationKeys_1.isOrganizationAccountId)(accountId) ? accountId : null;
+    return (0, keychainItems_1.isOrganizationAccountId)(accountId) ? accountId : null;
 }
 function canonicalPublicKey(publicKey) {
     try {
@@ -129,32 +144,58 @@ function privateOptions(store, forWrite) {
 function indexOptions() {
     return (0, platform_1.isIOS)() ? {} : { keychainService: INDEX_KEYCHAIN_SERVICE };
 }
+const ACCOUNT_ID = /^(?:[0-9a-f]{24}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i;
+/** A well-formed Oxy account id (24-hex or uuid), else `null`. */
+function ownerOf(ownerAccountId) {
+    return ownerAccountId !== undefined && ACCOUNT_ID.test(ownerAccountId)
+        ? ownerAccountId.toLowerCase()
+        : null;
+}
+/**
+ * Whether `entry` may be reached by a reader of `scope` acting for `owner`: an
+ * organization's entries by its own scope, a personal entry only by its owner.
+ */
+function isVisible(entry, scope, owner) {
+    if (entry.scope !== scope)
+        return false;
+    if (scope !== PERSONAL_SCOPE)
+        return true;
+    return owner !== null && entry.owner === owner;
+}
 function isIndexEntry(value) {
     if (typeof value !== 'object' || value === null)
         return false;
     const entry = value;
     return (typeof entry.scope === 'string' &&
-        (entry.scope === PERSONAL_SCOPE || (0, organizationKeys_1.isOrganizationAccountId)(entry.scope)) &&
+        (entry.scope === PERSONAL_SCOPE || (0, keychainItems_1.isOrganizationAccountId)(entry.scope)) &&
         typeof entry.publicKey === 'string' &&
         PUBLIC_KEY.test(entry.publicKey) &&
         typeof entry.retiredAt === 'number' &&
-        Number.isFinite(entry.retiredAt));
+        Number.isFinite(entry.retiredAt) &&
+        (entry.owner === undefined || (typeof entry.owner === 'string' && ACCOUNT_ID.test(entry.owner))));
 }
+/**
+ * The ring's index. STRICT (R5-6, R5-9): an index that does not parse, or that
+ * holds an entry this version cannot read, THROWS
+ * {@link RetiredKeyRingUnreadableError} instead of reading as empty, so no
+ * writer overwrites it (losing every entry) and no backup is sealed without
+ * the keys it names. A thrown keychain read propagates.
+ */
 async function readIndex(store) {
     const raw = await store.getItemAsync(INDEX_STORAGE_KEY, indexOptions());
     if (!raw)
         return [];
+    let parsed;
     try {
-        const parsed = JSON.parse(raw);
-        return Array.isArray(parsed) ? parsed.filter(isIndexEntry) : [];
+        parsed = JSON.parse(raw);
     }
-    catch (error) {
-        logger_1.logger.warn('Retired key index unreadable; treating as empty', {
-            component: 'RetiredKeys',
-            error: error instanceof Error ? error.name : 'unknown',
-        });
-        return [];
+    catch {
+        throw new RetiredKeyRingUnreadableError('the index does not parse');
+    }
+    if (!Array.isArray(parsed) || !parsed.every(isIndexEntry)) {
+        throw new RetiredKeyRingUnreadableError('the index holds an entry this version cannot read');
     }
+    return parsed.map((entry) => entry.owner === undefined ? entry : { ...entry, owner: entry.owner.toLowerCase() });
 }
 async function writeIndex(store, entries) {
     const unique = new Map();
@@ -167,81 +208,178 @@ async function writeIndex(store, entries) {
     await store.setItemAsync(INDEX_STORAGE_KEY, JSON.stringify(sorted), indexOptions());
 }
 function toListed(entry) {
+    // The owner is the reader's own id; it is not repeated.
     return entry.scope === PERSONAL_SCOPE
         ? { publicKey: entry.publicKey, retiredAt: entry.retiredAt }
         : { publicKey: entry.publicKey, accountId: entry.scope, retiredAt: entry.retiredAt };
 }
-/** Whether this app writes the ring: Commons (Android: the signer store it registers; iOS: native). */
-function assertMayWrite() {
+/**
+ * Whether this app writes the ring: Commons only (Android: the signer store it
+ * registers; iOS: the keychain role `holder`). The Peable wallet holds the
+ * wallet group too, but only reads, derives and signs: a key the wallet could
+ * add to the ring is a key it could choose (R4-14).
+ */
+async function assertMayWrite() {
     if ((0, platform_1.isWeb)())
         throw new Error('retired key: only a native device holds one');
     if ((0, platform_1.isAndroid)() && !(0, identitySigner_1.registeredIdentitySignerStore)()?.writeRetired) {
         throw new Error('On Android only Commons holds retired keys; this app has no identity signer store for them.');
     }
+    if ((0, platform_1.isIOS)()) {
+        const access = await (0, keychainAccessGroups_1.resolveKeychainAccess)();
+        if (access.mode === 'grouped' && access.role !== 'holder') {
+            throw new Error('On iOS only Commons writes retired keys; this app may only read them.');
+        }
+    }
 }
 /**
- * Keep `key` in the ring of `selector`'s account. Commons only. Idempotent: a
- * key already kept stays, with its first date. Refuses a pair whose public key
- * does not derive from its private key. Resolves once every copy confirmed it
+ * Keep `key` in the ring of `selector`'s account. Commons only. A PERSONAL key
+ * needs `selector.ownerAccountId`, the person whose key it was (R5-2): the
+ * signed-in account at a rotation, the account whose key history or backup
+ * named it. Idempotent: a key already kept stays, with its first date; a
+ * quarantined entry of the same key is bound to that owner; an entry bound to
+ * a DIFFERENT owner is refused. Refuses a pair whose public key does not
+ * derive from its private key. Resolves once every copy confirmed it
  * (Android: the signer store's read-back too), and throws otherwise, so a
  * caller about to replace the key can stop before anything is lost.
  */
 async function retireIdentityKey(key, selector) {
+    const scope = retiredKeyScope(selector);
+    if (scope === PERSONAL_SCOPE && ownerOf(selector?.ownerAccountId) === null) {
+        throw new Error('retired key: a personal key needs ownerAccountId, the account it belongs to');
+    }
+    await keepRetired(key, selector, true);
+}
+/**
+ * {@link retireIdentityKey} from inside the iOS access-group migration, which
+ * keeps a pre-split copy before deleting it from the shared group and cannot
+ * await itself. A personal key without `ownerAccountId` is kept QUARANTINED:
+ * held (it may be money) but reached by nobody until
+ * {@link claimRetiredIdentityKeys} binds it. @internal
+ */
+async function retireIdentityKeyDuringMigration(key, selector) {
+    await keepRetired(key, selector, false);
+}
+async function keepRetired(key, selector, gate) {
     const scope = retiredKeyScope(selector);
     if (!scope)
         throw new Error('retired key: accountId must be a 24-hex or uuid account id');
-    assertMayWrite();
+    const owner = scope === PERSONAL_SCOPE ? ownerOf(selector?.ownerAccountId) : null;
+    await assertMayWrite();
     if (!isHealthyPair(key.privateKey, key.publicKey)) {
         throw new Error('retired key: the public key does not derive from the private key');
     }
     const privateKey = (0, secp256k1_1.normalizeSecp256k1PrivateKey)(key.privateKey);
     const publicKey = (0, secp256k1_1.normalizeSecp256k1PublicKey)(key.publicKey);
-    const store = await ringStore();
+    const store = await ringStore(gate);
+    // Strict: an unreadable index stops the write before the key is touched.
+    const before = await readIndex(store);
+    const existing = before.find((entry) => entry.scope === scope && entry.publicKey === publicKey);
+    if (existing?.owner !== undefined && owner !== null && existing.owner !== owner) {
+        throw new Error('retired key: this key is kept for a different account');
+    }
     await store.setItemAsync(privateKeyName(scope, publicKey), privateKey, privateOptions(store, true));
     const readBack = await store.getItemAsync(privateKeyName(scope, publicKey), privateOptions(store, false));
     if (readBack !== privateKey) {
         throw new Error('retired key: the keychain did not confirm the key');
     }
+    const index = await readIndex(store);
+    const kept = index.find((entry) => entry.scope === scope && entry.publicKey === publicKey);
+    if (!kept) {
+        await writeIndex(store, [
+            ...index,
+            owner === null
+                ? { scope, publicKey, retiredAt: Date.now() }
+                : { scope, publicKey, retiredAt: Date.now(), owner },
+        ]);
+    }
+    else if (kept.owner === undefined && owner !== null) {
+        await writeIndex(store, index.map((entry) => (entry === kept ? { ...entry, owner } : entry)));
+    }
+    // The identity host answers only from the signer store, which holds the
+    // organizations' rings and the CURRENT person's personal entries; a
+    // quarantined entry is never mirrored.
     const signer = (0, platform_1.isAndroid)() ? (0, identitySigner_1.registeredIdentitySignerStore)() : null;
-    if (signer?.writeRetired && !(await signer.writeRetired(scope, privateKey, publicKey))) {
+    if (signer?.writeRetired &&
+        (scope !== PERSONAL_SCOPE || owner !== null) &&
+        !(await signer.writeRetired(scope, privateKey, publicKey))) {
         throw new Error(`The identity signer store (${signer.name}) did not confirm the retired key.`);
     }
+}
+/**
+ * Bind the QUARANTINED personal entries whose public key `publicKeys` names to
+ * `ownerAccountId` (R5-2, R5-3). Commons only, with the signed-in person's
+ * account id and that account's key history from Oxy
+ * (`oxy.identity.keyHistory()`: retired and current public keys): a key the
+ * account's own history names is that account's. Entries bound to anyone, and
+ * keys the history does not name, are left as they are. Resolves how many it
+ * bound; call {@link syncRetiredKeys} after it on Android.
+ */
+async function claimRetiredIdentityKeys(ownerAccountId, publicKeys) {
+    const owner = ownerOf(ownerAccountId);
+    if (owner === null)
+        throw new Error('retired key: ownerAccountId must be an account id');
+    if ((0, platform_1.isWeb)())
+        return 0;
+    await assertMayWrite();
+    const named = new Set(publicKeys.map((key) => canonicalPublicKey(key)).filter((key) => key !== null));
+    const store = await ringStore();
     const index = await readIndex(store);
-    if (!index.some((entry) => entry.scope === scope && entry.publicKey === publicKey)) {
-        await writeIndex(store, [...index, { scope, publicKey, retiredAt: Date.now() }]);
-    }
+    let bound = 0;
+    const next = index.map((entry) => {
+        if (entry.scope !== PERSONAL_SCOPE || entry.owner !== undefined)
+            return entry;
+        if (!named.has(entry.publicKey))
+            return entry;
+        bound += 1;
+        return { ...entry, owner };
+    });
+    if (bound > 0)
+        await writeIndex(store, next);
+    return bound;
+}
+/**
+ * How many personal entries are quarantined (no known owner). Commons shows
+ * them as "keys from before" the person can claim by adding the phrase, and
+ * {@link claimRetiredIdentityKeys} binds the ones the account's history names.
+ */
+async function countQuarantinedRetiredKeys() {
+    if ((0, platform_1.isWeb)() || ((0, platform_1.isAndroid)() && !(0, identitySigner_1.registeredIdentitySignerStore)()))
+        return 0;
+    const store = await ringStore();
+    return (await readIndex(store)).filter((entry) => entry.scope === PERSONAL_SCOPE && entry.owner === undefined).length;
 }
 /**
  * The retired keys of `selector`'s account this app can reach, oldest first.
- * iOS and Commons: the ring's index. Android elsewhere: Commons' identity host
- * (the wallet only), which leaves out the scope's current key. After an
- * interrupted rotation the local list can include the current key: compare
- * with the DID's `#key-1` before treating an entry as retired.
+ * The personal ring answers only `selector.ownerAccountId`'s entries (none
+ * without it; R5-2). iOS and Commons: the ring's index. Android elsewhere:
+ * Commons' identity host (the wallet only), which holds only the personal
+ * entries of the person Commons is signed in as and leaves out the scope's
+ * current key. After an interrupted rotation the local list can include the
+ * current key: compare with the DID's `#key-1` before treating an entry as
+ * retired, and check every entry against the account's key history.
+ *
+ * STRICT (R5-6): a ring that cannot be read throws (the keychain's error, or
+ * {@link RetiredKeyRingUnreadableError}); it never reads as empty.
  */
 async function listRetiredIdentityKeys(selector) {
     const scope = retiredKeyScope(selector);
     if (!scope || (0, platform_1.isWeb)())
         return [];
-    try {
-        if ((0, platform_1.isAndroid)() && !(0, identitySigner_1.registeredIdentitySignerStore)()) {
-            const bridge = await (0, protocol_1.loadCommonsIdentityBridge)();
-            const keys = (await bridge?.listRetiredKeys?.(selector?.accountId)) ?? null;
-            return (keys ?? []).map((publicKey) => scope === PERSONAL_SCOPE
-                ? { publicKey, retiredAt: 0 }
-                : { publicKey, accountId: scope, retiredAt: 0 });
-        }
-        if (!(0, platform_1.isIOS)() && !(0, platform_1.isAndroid)())
-            return [];
-        const store = await ringStore();
-        return (await readIndex(store)).filter((entry) => entry.scope === scope).map(toListed);
-    }
-    catch (error) {
-        logger_1.logger.warn('Failed to list retired keys', {
-            component: 'RetiredKeys',
-            error: error instanceof Error ? error.name : 'unknown',
-        });
+    const owner = ownerOf(selector?.ownerAccountId);
+    if (scope === PERSONAL_SCOPE && owner === null)
         return [];
+    if ((0, platform_1.isAndroid)() && !(0, identitySigner_1.registeredIdentitySignerStore)()) {
+        const bridge = await (0, protocol_1.loadCommonsIdentityBridge)();
+        const keys = (await bridge?.listRetiredKeys?.(selector?.accountId)) ?? null;
+        return (keys ?? []).map((publicKey) => scope === PERSONAL_SCOPE
+            ? { publicKey, retiredAt: 0 }
+            : { publicKey, accountId: scope, retiredAt: 0 });
     }
+    if (!(0, platform_1.isIOS)() && !(0, platform_1.isAndroid)())
+        return [];
+    const store = await ringStore();
+    return (await readIndex(store)).filter((entry) => isVisible(entry, scope, owner)).map(toListed);
 }
 /**
  * The private half of a retired key, where this app may hold it: Commons (both
@@ -255,12 +393,18 @@ async function getRetiredPrivateKey(publicKey, selector) {
     const canonical = canonicalPublicKey(publicKey);
     if (!scope || !canonical || (0, platform_1.isWeb)())
         return null;
+    const owner = ownerOf(selector?.ownerAccountId);
+    if (scope === PERSONAL_SCOPE && owner === null)
+        return null;
     try {
         if ((0, platform_1.isAndroid)()) {
             const signer = (0, identitySigner_1.registeredIdentitySignerStore)();
             if (!signer)
                 return null;
             const store = await ringStore();
+            if (!(await readIndex(store)).some((entry) => isVisible(entry, scope, owner) && entry.publicKey === canonical)) {
+                return null;
+            }
             const local = await store.getItemAsync(privateKeyName(scope, canonical), privateOptions(store, false));
             if (local && isHealthyPair(local, canonical))
                 return (0, secp256k1_1.normalizeSecp256k1PrivateKey)(local);
@@ -273,6 +417,11 @@ async function getRetiredPrivateKey(publicKey, selector) {
         if (!(0, platform_1.isIOS)())
             return null;
         const store = await ringStore();
+        // The index decides who may reach a key (R5-2); a key it does not list for
+        // this reader is not theirs, whatever item exists.
+        if (!(await readIndex(store)).some((entry) => isVisible(entry, scope, owner) && entry.publicKey === canonical)) {
+            return null;
+        }
         const value = await store.getItemAsync(privateKeyName(scope, canonical), privateOptions(store, false));
         return value && isHealthyPair(value, canonical) ? (0, secp256k1_1.normalizeSecp256k1PrivateKey)(value) : null;
     }
@@ -294,18 +443,24 @@ async function forgetRetiredIdentityKey(publicKey, selector) {
     const canonical = canonicalPublicKey(publicKey);
     if (!scope || !canonical)
         throw new Error('retired key: invalid selector or public key');
-    assertMayWrite();
+    const owner = ownerOf(selector?.ownerAccountId);
+    await assertMayWrite();
     const store = await ringStore();
+    const visible = (await readIndex(store)).some((entry) => isVisible(entry, scope, owner) && entry.publicKey === canonical);
+    if (!visible)
+        throw new Error('retired key: not a key of this account');
     await store.deleteItemAsync(privateKeyName(scope, canonical), privateOptions(store, false));
     const signer = (0, platform_1.isAndroid)() ? (0, identitySigner_1.registeredIdentitySignerStore)() : null;
     await signer?.clearRetired?.(scope, canonical);
     await writeIndex(store, (await readIndex(store)).filter((entry) => !(entry.scope === scope && entry.publicKey === canonical)));
 }
 /**
- * Forget every retired key of one ring (the person's, or an organization's):
- * called when the identity itself is deleted from this device, so a phone
- * handed on keeps none of the person's old keys. Commons only. Resolves how
- * many it removed.
+ * Forget every retired key of one ring (the person's, or an organization's).
+ * Commons only, and only when the person deletes their Oxy ACCOUNT (Commons'
+ * delete-account flow), which tells them the coins go with it. Deleting the
+ * identity from this device — "Start over", a forced delete — never calls it:
+ * the ring is money, and the same person restoring their identity later must
+ * find it (R4-4). Resolves how many it removed.
  */
 async function forgetRetiredIdentityKeys(selector) {
     const scope = retiredKeyScope(selector);
@@ -313,33 +468,47 @@ async function forgetRetiredIdentityKeys(selector) {
         return 0;
     if ((0, platform_1.isAndroid)() && !(0, identitySigner_1.registeredIdentitySignerStore)())
         return 0;
+    const owner = ownerOf(selector?.ownerAccountId);
+    if (scope === PERSONAL_SCOPE && owner === null)
+        return 0;
     const store = await ringStore();
     const index = await readIndex(store);
     const signer = (0, platform_1.isAndroid)() ? (0, identitySigner_1.registeredIdentitySignerStore)() : null;
     let removed = 0;
     for (const entry of index) {
-        if (entry.scope !== scope)
+        if (!isVisible(entry, scope, owner))
             continue;
         await store.deleteItemAsync(privateKeyName(scope, entry.publicKey), privateOptions(store, false));
         await signer?.clearRetired?.(scope, entry.publicKey);
         removed += 1;
     }
-    await writeIndex(store, index.filter((entry) => entry.scope !== scope));
+    await writeIndex(store, index.filter((entry) => !isVisible(entry, scope, owner)));
     return removed;
 }
 /**
- * Commons on Android: copy every retired key into the identity signer store
- * again, so the identity host answers for it after that file was rebuilt (its
- * self-heal leaves it empty). Call on every boot, beside `syncOrganizationKeys`.
- * Resolves how many it mirrored. Elsewhere 0.
+ * Commons on Android: make the identity signer store hold exactly what the
+ * identity host may answer — every organization ring, and the personal entries
+ * of `ownerAccountId` (the person Commons is signed in as) — so the host
+ * answers for them after that file was rebuilt (its self-heal leaves it
+ * empty), and never for a previous person's keys (R5-2): every other personal
+ * entry is removed from the signer store (its own slot keeps it). Without
+ * `ownerAccountId` no personal entry is mirrored. Call on every boot and after
+ * every sign-in, beside `syncOrganizationKeys`. Resolves how many it mirrored.
+ * Elsewhere 0.
  */
-async function syncRetiredKeys() {
+async function syncRetiredKeys(ownerAccountId) {
     const signer = (0, platform_1.isAndroid)() ? (0, identitySigner_1.registeredIdentitySignerStore)() : null;
     if (!signer?.writeRetired || !signer.readRetired)
         return 0;
+    const owner = ownerOf(ownerAccountId);
     const store = await ringStore();
+    const index = await readIndex(store);
+    const allowed = new Set(index.filter((entry) => isVisible(entry, PERSONAL_SCOPE, owner)).map((e) => e.publicKey));
+    await clearPersonalMirror(signer, index, allowed);
     let mirrored = 0;
-    for (const entry of await readIndex(store)) {
+    for (const entry of index) {
+        if (entry.scope === PERSONAL_SCOPE && !isVisible(entry, PERSONAL_SCOPE, owner))
+            continue;
         const privateKey = await store.getItemAsync(privateKeyName(entry.scope, entry.publicKey), privateOptions(store, false));
         if (!privateKey || !isHealthyPair(privateKey, entry.publicKey))
             continue;
@@ -352,6 +521,88 @@ async function syncRetiredKeys() {
     }
     return mirrored;
 }
+/**
+ * Every retired key of `selector`'s ring (personal: `ownerAccountId`'s entries)
+ * WITH its private half, for the encrypted identity backup
+ * (`oxy.identity.backup.create`), which carries them under the CURRENT phrase
+ * so a lost phone costs no more than the current phrase does (R4-4). Commons
+ * only. STRICT (R5-6): an unreadable ring, or a listed entry whose private
+ * half is missing or does not derive its public key, THROWS — a backup is
+ * never sealed without a key the ring says it holds. Never log or transmit the
+ * result except inside that encrypted envelope.
+ */
+async function exportRetiredIdentityKeys(selector) {
+    const scope = retiredKeyScope(selector);
+    if (!scope || (0, platform_1.isWeb)())
+        return [];
+    await assertMayWrite();
+    const out = [];
+    for (const entry of await listRetiredIdentityKeys(selector)) {
+        const privateKey = await readRetiredStrict(entry.publicKey, scope);
+        out.push({ privateKey, publicKey: entry.publicKey, retiredAt: entry.retiredAt });
+    }
+    return out;
+}
+/** A listed entry's private half, or a throw: Commons' own slot, then (Android) the signer copy. */
+async function readRetiredStrict(publicKey, scope) {
+    const store = await ringStore();
+    const local = await store.getItemAsync(privateKeyName(scope, publicKey), privateOptions(store, false));
+    if (local && isHealthyPair(local, publicKey))
+        return (0, secp256k1_1.normalizeSecp256k1PrivateKey)(local);
+    const signer = (0, platform_1.isAndroid)() ? (0, identitySigner_1.registeredIdentitySignerStore)() : null;
+    const mirrored = (await signer?.readRetired?.(scope, publicKey)) ?? null;
+    if (mirrored && isHealthyPair(mirrored.privateKey, publicKey)) {
+        return (0, secp256k1_1.normalizeSecp256k1PrivateKey)(mirrored.privateKey);
+    }
+    throw new RetiredKeyRingUnreadableError('a listed key has no readable private half');
+}
+/**
+ * Commons on Android, when the identity leaves this device ("Start over", a
+ * forced delete): remove every PERSONAL entry from the identity signer store,
+ * so the identity host answers no other app with them before the next person
+ * signs in (R5-2). Commons' own slot and index keep them (money, bound to
+ * their owner). Elsewhere a no-op.
+ */
+async function unmirrorPersonalRetiredKeys() {
+    const signer = (0, platform_1.isAndroid)() ? (0, identitySigner_1.registeredIdentitySignerStore)() : null;
+    if (!signer?.clearRetired)
+        return;
+    let index = [];
+    try {
+        index = await readIndex(await ringStore());
+    }
+    catch {
+        // The signer store's own list below still reaches every mirrored entry.
+    }
+    await clearPersonalMirror(signer, index, new Set());
+}
+/** Remove from the signer store every personal entry not in `allowed`: the index's and the store's own list. */
+async function clearPersonalMirror(signer, index, allowed) {
+    if (!signer.clearRetired)
+        return;
+    const mirrored = new Set(index.filter((entry) => entry.scope === PERSONAL_SCOPE).map((entry) => entry.publicKey));
+    for (const publicKey of (await signer.listRetired?.(PERSONAL_SCOPE)) ?? []) {
+        mirrored.add(publicKey.toLowerCase());
+    }
+    for (const publicKey of mirrored) {
+        if (!allowed.has(publicKey))
+            await signer.clearRetired(PERSONAL_SCOPE, publicKey);
+    }
+}
+/**
+ * The pair a previous key's raw PRIVATE KEY gives (64 hex, an optional `0x`),
+ * for a person whose old identity was imported as a private key and so has no
+ * phrase to re-enter. Stores nothing: the caller checks the public key against
+ * the account's key history and only then calls {@link retireIdentityKey}.
+ */
+function retiredKeyFromPrivateKey(privateKeyHex) {
+    const trimmed = privateKeyHex.trim().toLowerCase().replace(/^0x/, '');
+    if (!/^[0-9a-f]{64}$/.test(trimmed) || !(0, secp256k1_1.isValidSecp256k1PrivateKey)(trimmed)) {
+        throw new Error('retired key: not a valid private key');
+    }
+    const privateKey = (0, secp256k1_1.normalizeSecp256k1PrivateKey)(trimmed);
+    return { privateKey, publicKey: publicKeyOf(privateKey) };
+}
 /**
  * The pair a previous recovery phrase derives (`seed[0:32]`, the personal-root
  * and organization-key derivation; 12–24 words). Stores nothing: the caller