@oxy.so/core 7.23.2 → 7.25.0

package/dist/esm/api/accounts.js

@@ -1,4 +1,4 @@
-import { agentKeyListResponseCheck, agentKeyOperationChallengeCheck, agentKeyOperationCheck, agentKeyOperationResultCheck, executeAgentKeyOperationCheck, parseContract, } from '@oxy.so/contracts/client';
+import { agentKeyListResponseCheck, agentKeyOperationChallengeCheck, agentKeyOperationCheck, agentKeyOperationResultCheck, executeAgentKeyOperationCheck, organizationIdentityKeyStateCheck, organizationKeyApplyRequestCheck, organizationKeyChallengeCheck, organizationKeyChallengeRequestCheck, organizationKeyProofClaims, parseContract, } from '@oxy.so/contracts/client';
 import { normalizeUserIdentity } from '../utils/userIdentity.js';
 import { evictOxyIdentityCache } from '../utils/identityCacheSweep.js';
 import { evictOxyAccountForestCache, oxyAccountDetailCacheKey, OXY_ACCOUNT_PER_ACCOUNT_CACHE_PREFIX, } from '../utils/accountCacheSweep.js';
@@ -75,6 +75,72 @@ export class AccountAgentKeysApi {
         return parseContract(agentKeyOperationResultCheck, response);
     }
 }
+/**
+ * `oxy.accounts.identityKey` — an organization's identity key (ADR 0061): its
+ * DID `#key-1`, the key Peable derives its FairCoin receive addresses from.
+ * Only the organization's owners and admins may read or change it; the key is
+ * created and held in Commons and never signs anybody in.
+ *
+ * `get` answers `publicKey: null` for an organization that has no key yet (its
+ * DID lists no `#key-1`): that is when a client shows its owners "Set up the
+ * organization's Peable wallet". A 403 (`ORGANIZATION_KEY_FORBIDDEN`) means the
+ * signed-in person is not an owner or admin of a claimed, active organization.
+ */
+export class AccountIdentityKeyApi {
+    constructor(ctx) {
+        this.ctx = ctx;
+    }
+    /** The organization's key (`null` without one) and every key it has had, oldest first. */
+    async get(accountId) {
+        return parseContract(organizationIdentityKeyStateCheck, await this.ctx.request('GET', `/accounts/${enc(accountId)}/identity-key`, undefined, { cache: false }));
+    }
+    /** A one-use challenge for one change, with the claims every signer signs. */
+    async requestChallenge(accountId, request) {
+        return parseContract(organizationKeyChallengeCheck, await this.ctx.request('POST', `/accounts/${enc(accountId)}/identity-key/challenge`, parseContract(organizationKeyChallengeRequestCheck, request), { cache: false }));
+    }
+    /** Apply a change with its signatures (see {@link link} for the whole ceremony). */
+    async apply(accountId, request) {
+        return parseContract(organizationIdentityKeyStateCheck, await this.ctx.request('POST', `/accounts/${enc(accountId)}/identity-key`, parseContract(organizationKeyApplyRequestCheck, request), { cache: false }));
+    }
+    /**
+     * Commons' whole ceremony. NATIVE-ONLY: the actor is THIS device's personal
+     * root (`KeyManager`), which must be the signed-in person's. `key` is the
+     * organization key the device generated (`create`, or `replace` with a new
+     * one); `previousKey` is the current organization key when the device holds
+     * it, so the replacement is recorded as proven by it.
+     */
+    async link(accountId, input) {
+        const { KeyManager, signIdentityProof } = await import('../crypto/index.js');
+        const [rootPrivateKey, rootPublicKey] = await Promise.all([
+            KeyManager.getPrivateKey(),
+            KeyManager.getPublicKey(),
+        ]);
+        if (!rootPrivateKey || !rootPublicKey) {
+            throw new Error('No identity on this device to sign with');
+        }
+        const challenge = await this.requestChallenge(accountId, {
+            operation: input.operation,
+            publicKey: input.key.publicKey,
+        });
+        const root = rootPublicKey.trim().toLowerCase();
+        if (challenge.actorPublicKey !== root) {
+            throw new Error("This device's identity is not the signed-in account's");
+        }
+        const sign = async (signer, publicKey) => (await signIdentityProof({ privateKey: signer.privateKey, publicKey }, organizationKeyProofClaims(challenge, publicKey))).signature;
+        const previousPublicKey = challenge.previousPublicKey;
+        return this.apply(accountId, {
+            operation: input.operation,
+            publicKey: challenge.publicKey,
+            challenge: challenge.challenge,
+            expiresAt: challenge.expiresAt,
+            actorSignature: await sign({ privateKey: rootPrivateKey, publicKey: root }, root),
+            keySignature: await sign(input.key, challenge.publicKey),
+            ...(input.previousKey && previousPublicKey
+                ? { previousKeySignature: await sign(input.previousKey, previousPublicKey) }
+                : {}),
+        });
+    }
+}
 /** Consent-based invitations; never cached or queued as offline mutations. */
 export class AccountInvitationsApi {
     constructor(ctx) {
@@ -109,6 +175,7 @@ export class AccountsApi {
         this.members = new AccountMembersApi(ctx);
         this.invitations = new AccountInvitationsApi(ctx);
         this.agentKeys = new AccountAgentKeysApi(ctx);
+        this.identityKey = new AccountIdentityKeyApi(ctx);
     }
     /**
      * List the accounts the caller can access: their own personal (root)

package/dist/esm/crypto/identitySigner.js

@@ -1 +1,14 @@
-export {};
+/**
+ * The store Commons registered, readable by modules that `KeyManager` itself
+ * imports (`./organizationKeys`), which therefore cannot import `KeyManager`.
+ * Written only by `KeyManager.setIdentitySignerStore`. @internal
+ */
+let registeredSignerStore = null;
+/** @internal */
+export function registerIdentitySignerStore(store) {
+    registeredSignerStore = store;
+}
+/** @internal */
+export function registeredIdentitySignerStore() {
+    return registeredSignerStore;
+}

package/dist/esm/crypto/index.js

@@ -15,6 +15,8 @@
 import './polyfill.js';
 export { KeyManager, IdentityAlreadyExistsError, IdentityPersistError, IdentityUnavailableError, } from './keyManager.js';
 export { readIdentityMarker, updateIdentityMarker } from './identityMarker.js';
+// Organization keys on the device (docs/adr/0061-organization-identity-key.md D6)
+export { generateOrganizationKey, organizationKeyFromPhrase, storeOrganizationKey, getOrganizationPublicKey, getOrganizationPrivateKey, getOrganizationRecoveryPhrase, listOrganizationKeys, deleteOrganizationKey, syncOrganizationKeys, isOrganizationAccountId, isHealthyOrganizationKeyPair, } from './organizationKeys.js';
 export { SignatureService } from './signatureService.js';
 export { RecoveryPhraseService, BACKUP_KDF_ENCRYPTION_INFO } from './recoveryPhrase.js';
 // Low-level primitives (encrypted backup, device transfer)

package/dist/esm/crypto/keyManager.js

@@ -9,6 +9,8 @@ import { isReactNative, isNodeJS, loadAsyncStorage, loadCommonsIdentityBridge, l
 import { deriveSecp256k1PublicKey, generateSecp256k1KeyPair, isValidSecp256k1PrivateKey, isValidSecp256k1PublicKey, normalizeSecp256k1PrivateKey, normalizeSecp256k1PublicKey, signSecp256k1Digest, verifySecp256k1Digest, } from '@oxy.so/protocol/secp256k1';
 import { isDev, logger } from '../logger/index.js';
 import { deriveScopedSeedFromKey, signSocialReceiveDigest } from './identityDerivations.js';
+import { registerIdentitySignerStore } from './identitySigner.js';
+import { getOrganizationPrivateKey, isOrganizationAccountId } from './organizationKeys.js';
 import { clearIdentityMarker, readIdentityMarker, updateIdentityMarker, writeIdentityMarker, } from './identityMarker.js';
 import { DEVICE_BACKUP_VERSION, parseDeviceBackup, serializeDeviceBackup, } from './deviceBackup.js';
 /**
@@ -257,6 +259,7 @@ export class KeyManager {
      */
     static setIdentitySignerStore(store) {
         KeyManager.identitySignerStore = store;
+        registerIdentitySignerStore(store);
         KeyManager.invalidateSharedCache();
     }
     /** Whether this app registered an identity signer store (Commons on Android). */
@@ -2573,14 +2576,23 @@ export class KeyManager {
      * Both reproduce from the user's Oxy recovery phrase, so the seed is
      * recoverable, and the IPC answer is byte-identical to the local one.
      *
+     * With `opts.accountId` the seed is derived from that ORGANIZATION's key
+     * instead (ADR 0061 D6), from the same places: Commons' own copy, the iOS
+     * keychain group, or Commons' identity host. It never falls back to the
+     * personal key.
+     *
      * @param info Context/domain-binding label (distinct labels → independent seeds).
+     * @param opts.accountId An organization's account id, for its key.
      * @returns 32 bytes of derived keying material, or `null` on web / when no
      *          identity key is available to this app.
      */
-    static async deriveScopedSeed(info) {
+    static async deriveScopedSeed(info, opts) {
         if (isWebPlatform()) {
             return null;
         }
+        if (opts?.accountId !== undefined) {
+            return KeyManager._deriveOrganizationScopedSeed(info, opts.accountId);
+        }
         if (isAndroid()) {
             if (KeyManager.identitySignerStore) {
                 // Commons: its own key.
@@ -2597,6 +2609,24 @@ export class KeyManager {
         }
         return deriveScopedSeedFromKey(privateKey, info);
     }
+    /**
+     * {@link deriveScopedSeed} over an ORGANIZATION key (ADR 0061 D6): Commons'
+     * own copy inside Commons and on iOS the keychain group, everywhere else on
+     * Android Commons' identity host. Never falls back to the personal key: an
+     * organization this device cannot reach is `null`.
+     */
+    static async _deriveOrganizationScopedSeed(info, accountId) {
+        if (!isOrganizationAccountId(accountId)) {
+            return null;
+        }
+        if (isAndroid() && !KeyManager.identitySignerStore) {
+            const bridge = await loadCommonsIdentityBridge();
+            const seed = (await bridge?.deriveScopedSeed(info, accountId)) ?? null;
+            return seed ? hexToBytes(seed) : null;
+        }
+        const privateKey = await getOrganizationPrivateKey(accountId);
+        return privateKey ? deriveScopedSeedFromKey(privateKey, info) : null;
+    }
     /**
      * Sign a 32-byte digest (a transaction sighash, lowercase hex) with the
      * identity's social-receive child key `index`: the non-hardened BIP32 child
@@ -2604,16 +2634,30 @@ export class KeyManager {
      * signature is RFC 6979, low-S, DER hex; `publicKey` is the child's
      * compressed public key for the scriptSig.
      *
-     * Key source: as {@link deriveScopedSeed}. On Android outside Commons the
-     * signature comes from Commons, which allows it for the wallet app only.
+     * Key source: as {@link deriveScopedSeed}, including `opts.accountId` for an
+     * organization's key (ADR 0061 D6). On Android outside Commons the signature
+     * comes from Commons, which allows it for the wallet app only.
      *
      * @returns the signature, or `null` on web / when no identity key is
      *          available to this app.
      */
-    static async signSocialReceive(index, digest) {
+    static async signSocialReceive(index, digest, opts) {
         if (isWebPlatform()) {
             return null;
         }
+        const accountId = opts?.accountId;
+        if (accountId !== undefined) {
+            // An organization key (ADR 0061 D6); never the personal one in its place.
+            if (!isOrganizationAccountId(accountId)) {
+                return null;
+            }
+            if (isAndroid() && !KeyManager.identitySignerStore) {
+                const bridge = await loadCommonsIdentityBridge();
+                return (await bridge?.signSocialReceive(index, digest, accountId)) ?? null;
+            }
+            const organizationKey = await getOrganizationPrivateKey(accountId);
+            return organizationKey ? signSocialReceiveDigest(organizationKey, index, digest) : null;
+        }
         if (isAndroid() && !KeyManager.identitySignerStore) {
             // Every app but Commons: Commons signs.
             const bridge = await loadCommonsIdentityBridge();

package/dist/esm/crypto/organizationKeys.js

@@ -0,0 +1,336 @@
+/**
+ * Organization keys on the device (ADR 0061 D6).
+ *
+ * An organization's identity key is created in Commons by one of its owners or
+ * admins, from a fresh 24-word phrase (`seed[0:32]`, the personal-root
+ * derivation), and is published as the organization's DID `#key-1`. Commons
+ * holds it beside the person's own root, under the organization's account id;
+ * other Oxy apps reach it the way they reach the personal identity, by
+ * derivation and never by the key:
+ *
+ * - iOS: the keychain access group `group.so.oxy.shared`, like the personal
+ *   shared slot. Only Commons writes it.
+ * - Android: Commons' own expo-secure-store slot, mirrored into the identity
+ *   signer store (`./identitySigner`) that Commons' identity host answers
+ *   `accountId` requests from. Every other app asks Commons over IPC
+ *   (`loadCommonsIdentityBridge`), and never gets the key.
+ *
+ * The phrase is kept only in Commons, on the device that created or imported
+ * it, so an owner can show it to another owner (ADR 0061 D5); it never reaches
+ * the keychain group, an IPC answer or a log.
+ *
+ * This module imports nothing from `./keyManager` (which imports it): the
+ * signer store comes from `./identitySigner`'s registry.
+ */
+import { generateMnemonic, mnemonicToSeed, validateMnemonic } from '@scure/bip39';
+import { wordlist } from '@scure/bip39/wordlists/english.js';
+import { loadCommonsIdentityBridge, loadSecureStore, } from '@oxy.so/protocol';
+import { deriveSecp256k1PublicKey, isValidSecp256k1PrivateKey, isValidSecp256k1PublicKey, normalizeSecp256k1PrivateKey, normalizeSecp256k1PublicKey, } from '@oxy.so/protocol/secp256k1';
+import { logger } from '../logger/index.js';
+import { isAndroid, isIOS, isWeb } from '../utils/platform.js';
+import { registeredIdentitySignerStore } from './identitySigner.js';
+/** Same set the server's account ids come from: a legacy 24-hex id or a lowercase uuid. */
+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})$/;
+const IOS_KEYCHAIN_GROUP = 'group.so.oxy.shared';
+/** Android, Commons-local: its own Keystore key, shared with no personal slot. */
+const ANDROID_KEYCHAIN_SERVICE = 'oxy_org_identity';
+const MNEMONIC_KEYCHAIN_SERVICE = 'oxy_org_identity_mnemonic';
+const INDEX_KEYCHAIN_SERVICE = 'oxy_org_identity_index';
+const INDEX_STORAGE_KEY = 'oxy_org_identity_index_v1';
+const ORGANIZATION_PHRASE_WORDS = 24;
+/** Whether `value` is an account id an organization key can be stored under. */
+export function isOrganizationAccountId(value) {
+    return ACCOUNT_ID.test(value);
+}
+function assertAccountId(accountId) {
+    if (!isOrganizationAccountId(accountId)) {
+        throw new Error('organization key: accountId must be a 24-hex or uuid account id');
+    }
+}
+const privateKeyName = (accountId) => `oxy_org_identity_private_key.${accountId}`;
+const publicKeyName = (accountId) => `oxy_org_identity_public_key.${accountId}`;
+const mnemonicName = (accountId) => `oxy_org_identity_mnemonic.${accountId}`;
+function toHex(bytes) {
+    return Array.from(bytes, (b) => b.toString(16).padStart(2, '0')).join('');
+}
+/** Lowercase uncompressed public key of `privateKey`. */
+function publicKeyOf(privateKey) {
+    return deriveSecp256k1PublicKey(normalizeSecp256k1PrivateKey(privateKey));
+}
+/** True only when both halves are well-formed AND the public key derives from the private one. */
+export function isHealthyOrganizationKeyPair(privateKey, publicKey) {
+    if (!privateKey || !publicKey)
+        return false;
+    if (!isValidSecp256k1PrivateKey(privateKey) || !isValidSecp256k1PublicKey(publicKey)) {
+        return false;
+    }
+    try {
+        return publicKeyOf(privateKey) === normalizeSecp256k1PublicKey(publicKey);
+    }
+    catch {
+        return false;
+    }
+}
+function normalizePhrase(phrase) {
+    return phrase.trim().toLowerCase().split(/\s+/).join(' ');
+}
+async function pairFromPhrase(phrase) {
+    const normalized = normalizePhrase(phrase);
+    if (normalized.split(' ').length !== ORGANIZATION_PHRASE_WORDS ||
+        !validateMnemonic(normalized, wordlist)) {
+        throw new Error('organization key: not a valid 24-word recovery phrase');
+    }
+    const seed = await mnemonicToSeed(normalized);
+    const privateKey = toHex(seed.subarray(0, 32));
+    return { privateKey, publicKey: publicKeyOf(privateKey) };
+}
+/**
+ * A fresh organization key: a 24-word phrase and the pair derived from it
+ * exactly as a personal root is (`seed[0:32]`). Stores NOTHING: the caller shows
+ * the phrase, links the key (`oxy.accounts.identityKey`), and only then calls
+ * {@link storeOrganizationKey}.
+ */
+export async function generateOrganizationKey() {
+    const mnemonic = generateMnemonic(wordlist, 256);
+    return { mnemonic, ...(await pairFromPhrase(mnemonic)) };
+}
+/**
+ * The pair a 24-word organization phrase derives. Stores nothing; the caller
+ * checks the public key against the organization's DID `#key-1` before keeping
+ * it (ADR 0061 D5).
+ */
+export async function organizationKeyFromPhrase(phrase) {
+    return pairFromPhrase(phrase);
+}
+async function secureStore() {
+    return loadSecureStore();
+}
+async function readIndex(store) {
+    const raw = await store.getItemAsync(INDEX_STORAGE_KEY, {
+        keychainService: INDEX_KEYCHAIN_SERVICE,
+    });
+    if (!raw)
+        return [];
+    try {
+        const parsed = JSON.parse(raw);
+        return Array.isArray(parsed)
+            ? parsed.filter((id) => typeof id === 'string' && isOrganizationAccountId(id))
+            : [];
+    }
+    catch (error) {
+        logger.warn('Organization key index unreadable; treating as empty', {
+            component: 'OrganizationKeys',
+            error: error instanceof Error ? error.name : 'unknown',
+        });
+        return [];
+    }
+}
+async function writeIndex(store, ids) {
+    await store.setItemAsync(INDEX_STORAGE_KEY, JSON.stringify([...new Set(ids)].sort()), {
+        keychainService: INDEX_KEYCHAIN_SERVICE,
+    });
+}
+/** Where this platform keeps the pair: the iOS keychain group, or Commons' own Android slot. */
+function pairOptions(store, forPrivateWrite) {
+    if (isIOS()) {
+        return forPrivateWrite
+            ? {
+                keychainAccessible: store.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+                keychainAccessGroup: IOS_KEYCHAIN_GROUP,
+            }
+            : { keychainAccessGroup: IOS_KEYCHAIN_GROUP };
+    }
+    return forPrivateWrite
+        ? {
+            keychainAccessible: store.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+            keychainService: ANDROID_KEYCHAIN_SERVICE,
+        }
+        : { keychainService: ANDROID_KEYCHAIN_SERVICE };
+}
+/** The pair from this app's own storage (iOS group; Android Commons slot, then signer store). */
+async function readLocalPair(accountId) {
+    if (isWeb())
+        return null;
+    if (isAndroid()) {
+        const signer = registeredIdentitySignerStore();
+        if (!signer)
+            return null; // Only Commons holds organization keys on Android.
+        const store = await secureStore();
+        const options = pairOptions(store, false);
+        const privateKey = await store.getItemAsync(privateKeyName(accountId), options);
+        const publicKey = await store.getItemAsync(publicKeyName(accountId), options);
+        if (privateKey && publicKey && isHealthyOrganizationKeyPair(privateKey, publicKey)) {
+            return {
+                privateKey: normalizeSecp256k1PrivateKey(privateKey),
+                publicKey: normalizeSecp256k1PublicKey(publicKey),
+            };
+        }
+        // The signer store is a rung: a wiped expo-secure-store slot still has it.
+        const mirrored = (await signer.readOrganization?.(accountId)) ?? null;
+        return mirrored && isHealthyOrganizationKeyPair(mirrored.privateKey, mirrored.publicKey)
+            ? mirrored
+            : null;
+    }
+    if (!isIOS())
+        return null;
+    const store = await secureStore();
+    const options = pairOptions(store, false);
+    const privateKey = await store.getItemAsync(privateKeyName(accountId), options);
+    const publicKey = await store.getItemAsync(publicKeyName(accountId), options);
+    return privateKey && publicKey && isHealthyOrganizationKeyPair(privateKey, publicKey)
+        ? {
+            privateKey: normalizeSecp256k1PrivateKey(privateKey),
+            publicKey: normalizeSecp256k1PublicKey(publicKey),
+        }
+        : null;
+}
+/**
+ * Keep an organization key on this device. Commons only: on Android it needs
+ * the identity signer store Commons registers, so the identity host can serve
+ * it; on iOS only Commons calls it (the keychain group is shared).
+ *
+ * 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).
+ */
+export async function storeOrganizationKey(accountId, key) {
+    assertAccountId(accountId);
+    if (isWeb())
+        throw new Error('organization key: only a native device holds one');
+    if (!isHealthyOrganizationKeyPair(key.privateKey, key.publicKey)) {
+        throw new Error('organization key: the public key does not derive from the private key');
+    }
+    const privateKey = normalizeSecp256k1PrivateKey(key.privateKey);
+    const publicKey = normalizeSecp256k1PublicKey(key.publicKey);
+    if (key.mnemonic !== undefined) {
+        const fromPhrase = await pairFromPhrase(key.mnemonic);
+        if (fromPhrase.publicKey !== publicKey) {
+            throw new Error('organization key: the phrase derives a different key');
+        }
+    }
+    const signer = isAndroid() ? registeredIdentitySignerStore() : null;
+    if (isAndroid() && !signer?.writeOrganization) {
+        throw new Error('On Android only Commons holds organization keys; this app has no identity signer store for them.');
+    }
+    const store = await secureStore();
+    await store.setItemAsync(privateKeyName(accountId), privateKey, pairOptions(store, true));
+    await store.setItemAsync(publicKeyName(accountId), publicKey, pairOptions(store, false));
+    if (signer?.writeOrganization &&
+        !(await signer.writeOrganization(accountId, privateKey, publicKey))) {
+        throw new Error(`The identity signer store (${signer.name}) did not confirm the organization key.`);
+    }
+    if (key.mnemonic !== undefined) {
+        await store.setItemAsync(mnemonicName(accountId), normalizePhrase(key.mnemonic), {
+            keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+            keychainAccessible: store.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+        });
+    }
+    else {
+        await store.deleteItemAsync(mnemonicName(accountId), {
+            keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+        });
+    }
+    await writeIndex(store, [...(await readIndex(store)), accountId]);
+}
+/**
+ * The organization's public key as THIS device can reach it, or `null`.
+ * iOS: the keychain group. Android: Commons' own slot inside Commons, and
+ * Commons' identity host (`describe` with `accountId`) everywhere else. Compare
+ * it with the organization's DID `#key-1` before receiving (Peable ADR 0002).
+ */
+export async function getOrganizationPublicKey(accountId) {
+    if (!isOrganizationAccountId(accountId) || isWeb())
+        return null;
+    try {
+        if (isAndroid() && !registeredIdentitySignerStore()) {
+            const bridge = await loadCommonsIdentityBridge();
+            const description = (await bridge?.describe(accountId)) ?? null;
+            return description?.accountId === accountId ? description.publicKey : null;
+        }
+        return (await readLocalPair(accountId))?.publicKey ?? null;
+    }
+    catch (error) {
+        logger.warn('Failed to read an organization public key', {
+            component: 'OrganizationKeys',
+            error: error instanceof Error ? error.name : 'unknown',
+        });
+        return null;
+    }
+}
+/**
+ * The organization's private key, where this app may hold it: Commons (both
+ * platforms) and, on iOS, the keychain group. `null` on Android outside
+ * Commons. Use it to sign within the app only; never transmit it.
+ */
+export async function getOrganizationPrivateKey(accountId) {
+    if (!isOrganizationAccountId(accountId))
+        return null;
+    try {
+        return (await readLocalPair(accountId))?.privateKey ?? null;
+    }
+    catch (error) {
+        logger.warn('Failed to read an organization private key', {
+            component: 'OrganizationKeys',
+            error: error instanceof Error ? error.name : 'unknown',
+        });
+        return null;
+    }
+}
+/** The organization's phrase, if this device created or imported it with one. Commons only. */
+export async function getOrganizationRecoveryPhrase(accountId) {
+    if (!isOrganizationAccountId(accountId) || isWeb())
+        return null;
+    const store = await secureStore();
+    return store.getItemAsync(mnemonicName(accountId), {
+        keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+    });
+}
+/** The organizations this device keeps a key for (Commons' own index). */
+export async function listOrganizationKeys() {
+    if (isWeb())
+        return [];
+    return readIndex(await secureStore());
+}
+/** Forget an organization key on this device: its pair, its phrase, its signer copy and its index entry. */
+export async function deleteOrganizationKey(accountId) {
+    assertAccountId(accountId);
+    if (isWeb())
+        return;
+    const store = await secureStore();
+    const options = pairOptions(store, false);
+    await store.deleteItemAsync(privateKeyName(accountId), options);
+    await store.deleteItemAsync(publicKeyName(accountId), options);
+    await store.deleteItemAsync(mnemonicName(accountId), {
+        keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+    });
+    const signer = isAndroid() ? registeredIdentitySignerStore() : null;
+    await signer?.clearOrganization?.(accountId);
+    await writeIndex(store, (await readIndex(store)).filter((id) => id !== accountId));
+}
+/**
+ * Commons on Android: copy every held organization 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
+ * `KeyManager.syncSharedIdentity`. Resolves how many it mirrored. Elsewhere 0.
+ */
+export async function syncOrganizationKeys() {
+    const signer = isAndroid() ? registeredIdentitySignerStore() : null;
+    if (!signer?.writeOrganization || !signer.readOrganization)
+        return 0;
+    const store = await secureStore();
+    let mirrored = 0;
+    for (const accountId of await readIndex(store)) {
+        const options = pairOptions(store, false);
+        const privateKey = await store.getItemAsync(privateKeyName(accountId), options);
+        const publicKey = await store.getItemAsync(publicKeyName(accountId), options);
+        if (!privateKey || !publicKey || !isHealthyOrganizationKeyPair(privateKey, publicKey))
+            continue;
+        const current = await signer.readOrganization(accountId);
+        if (current?.publicKey.toLowerCase() === publicKey.toLowerCase())
+            continue;
+        if (await signer.writeOrganization(accountId, normalizeSecp256k1PrivateKey(privateKey), publicKey.toLowerCase())) {
+            mirrored += 1;
+        }
+    }
+    return mirrored;
+}

package/dist/types/api/accounts.d.ts

@@ -18,7 +18,7 @@ import type { AccountAccessGrant, OrganizationType } from '@oxy.so/contracts';
  * no per-request "acting-as" header. Identity is carried by the session/token,
  * so a switch propagates through reload and cross-domain exactly like a login.
  */
-import type { AgentKeyOperation, AgentKeyOperationProof } from '@oxy.so/contracts';
+import type { AgentKeyOperation, AgentKeyOperationProof, OrganizationIdentityKeyState, OrganizationKeyApplyRequest, OrganizationKeyChallenge, OrganizationKeyChallengeRequest, OrganizationKeyOperation } from '@oxy.so/contracts';
 import type { User } from '../models/interfaces';
 import type { AccountCategoryId, AccountKind, AvatarCharacter, ChildAccountKind } from '@oxy.so/contracts';
 import type { SessionLoginResponse } from '../models/session';
@@ -384,6 +384,44 @@ export declare class AccountAgentKeysApi {
         revokedMethodIds: string[];
     }>;
 }
+/** A secp256k1 key pair held on this device: lowercase hex, the public key uncompressed. */
+export interface OrganizationKeyPair {
+    privateKey: string;
+    publicKey: string;
+}
+/**
+ * `oxy.accounts.identityKey` — an organization's identity key (ADR 0061): its
+ * DID `#key-1`, the key Peable derives its FairCoin receive addresses from.
+ * Only the organization's owners and admins may read or change it; the key is
+ * created and held in Commons and never signs anybody in.
+ *
+ * `get` answers `publicKey: null` for an organization that has no key yet (its
+ * DID lists no `#key-1`): that is when a client shows its owners "Set up the
+ * organization's Peable wallet". A 403 (`ORGANIZATION_KEY_FORBIDDEN`) means the
+ * signed-in person is not an owner or admin of a claimed, active organization.
+ */
+export declare class AccountIdentityKeyApi {
+    private readonly ctx;
+    constructor(ctx: OxyContext);
+    /** The organization's key (`null` without one) and every key it has had, oldest first. */
+    get(accountId: string): Promise<OrganizationIdentityKeyState>;
+    /** A one-use challenge for one change, with the claims every signer signs. */
+    requestChallenge(accountId: string, request: OrganizationKeyChallengeRequest): Promise<OrganizationKeyChallenge>;
+    /** Apply a change with its signatures (see {@link link} for the whole ceremony). */
+    apply(accountId: string, request: OrganizationKeyApplyRequest): Promise<OrganizationIdentityKeyState>;
+    /**
+     * Commons' whole ceremony. NATIVE-ONLY: the actor is THIS device's personal
+     * root (`KeyManager`), which must be the signed-in person's. `key` is the
+     * organization key the device generated (`create`, or `replace` with a new
+     * one); `previousKey` is the current organization key when the device holds
+     * it, so the replacement is recorded as proven by it.
+     */
+    link(accountId: string, input: {
+        operation: OrganizationKeyOperation;
+        key: OrganizationKeyPair;
+        previousKey?: OrganizationKeyPair;
+    }): Promise<OrganizationIdentityKeyState>;
+}
 export interface AccountInvitation {
     id: string;
     accountId: string;
@@ -425,6 +463,8 @@ export declare class AccountsApi {
     readonly members: AccountMembersApi;
     readonly invitations: AccountInvitationsApi;
     readonly agentKeys: AccountAgentKeysApi;
+    /** An organization's identity key: its DID `#key-1` and Peable wallet key (ADR 0061). */
+    readonly identityKey: AccountIdentityKeyApi;
     constructor(ctx: OxyContext);
     /**
      * List the accounts the caller can access: their own personal (root)

package/dist/types/crypto/identitySigner.d.ts

@@ -26,4 +26,22 @@ export interface IdentitySignerStore {
     write(privateKey: string, publicKey: string): Promise<boolean>;
     /** Drop the stored key pair. */
     clear(): Promise<void>;
+    /**
+     * An ORGANIZATION key Commons holds (ADR 0061 D6), by the organization's
+     * account id: the copy the identity host answers `accountId` requests from.
+     * Optional so a store built before organization keys still type-checks; a
+     * store without them cannot hold an organization key.
+     */
+    readOrganization?(accountId: string): Promise<{
+        privateKey: string;
+        publicKey: string;
+    } | null>;
+    /** Replace that organization's pair. Resolves whether a read-back confirmed it. */
+    writeOrganization?(accountId: string, privateKey: string, publicKey: string): Promise<boolean>;
+    /** Drop that organization's pair. */
+    clearOrganization?(accountId: string): Promise<void>;
 }
+/** @internal */
+export declare function registerIdentitySignerStore(store: IdentitySignerStore | null): void;
+/** @internal */
+export declare function registeredIdentitySignerStore(): IdentitySignerStore | null;

package/dist/types/crypto/index.d.ts

@@ -17,6 +17,8 @@ export { readIdentityMarker, updateIdentityMarker } from './identityMarker';
 export type { IdentityMarker } from './identityMarker';
 export type { IdentityDeviceBackupStore } from './deviceBackup';
 export type { IdentitySignerStore } from './identitySigner';
+export { generateOrganizationKey, organizationKeyFromPhrase, storeOrganizationKey, getOrganizationPublicKey, getOrganizationPrivateKey, getOrganizationRecoveryPhrase, listOrganizationKeys, deleteOrganizationKey, syncOrganizationKeys, isOrganizationAccountId, isHealthyOrganizationKeyPair, } from './organizationKeys';
+export type { OrganizationKeyPair, GeneratedOrganizationKey, StoredOrganizationKey, } from './organizationKeys';
 export { SignatureService } from './signatureService';
 export type { SignedMessage, AuthChallenge } from './signatureService';
 export { RecoveryPhraseService, BACKUP_KDF_ENCRYPTION_INFO } from './recoveryPhrase';