@oxyhq/core 9.2.3 → 10.0.0

package/dist/types/index.d.ts

@@ -26,7 +26,7 @@ export type { ServiceTokenResponse } from './mixins/OxyServices.auth';
 export type { CommonsSignInHandle, CommonsSignInStatus, CommonsApprovalInfo, CommonsSignInActionResult, } from './mixins/OxyServices.auth';
 export type { ServiceApp, ServiceActingAsVerification } from './mixins/OxyServices.utility';
 export type { ContactDiscoveryMatch, ContactDiscoveryResponse, } from './mixins/OxyServices.contacts';
-export type { BulkFollowEntry, BulkFollowResult, BulkUnfollowEntry, BulkUnfollowResult, } from './mixins/OxyServices.user';
+export type { BulkFollowEntry, BulkFollowResult, BulkUnfollowEntry, BulkUnfollowResult, ViewerGraph, } from './mixins/OxyServices.user';
 export { OxyAppDataIdentifierError } from './mixins/OxyServices.appData';
 export { getNormalizedUserId, normalizeUserIdentity, normalizeUserIdentityOrNull, } from './utils/userIdentity';
 export { getCanonicalUserHandle, getNormalizedUserHandle, } from './utils/userHandle';
@@ -58,8 +58,8 @@ export type { OxyConfig, PrivacySettings, NotificationPreferences, UserPreferenc
 export { SECURITY_EVENT_SEVERITY_MAP } from './models/interfaces';
 export { TopicType, TopicSource } from './models/Topic';
 export type { TopicData, TopicTranslation } from './models/Topic';
-export { SUPPORTED_LANGUAGES, getLanguageMetadata, getLanguageName, getNativeLanguageName, normalizeLanguageCode, isRTLLocale, } from './utils/languageUtils';
-export type { LanguageMetadata } from './utils/languageUtils';
+export { SUPPORTED_LANGUAGES, FALLBACK_LOCALE, getBaseLanguage, normalizeLocale, isSupportedLocale, getLanguageMetadata, getLanguageName, getNativeLanguageName, isRTLLocale, getUserLanguages, getPrimaryLanguage, } from './utils/languageUtils';
+export type { SupportedLanguage } from './utils/languageUtils';
 export { getPlatformOS, setPlatformOS, isWeb, isNative, isIOS, isAndroid, isWebBrowser, } from './utils/platform';
 export type { PlatformOS } from './utils/platform';
 export { darkenColor, lightenColor, hexToRgb, rgbToHex, withOpacity, isLightColor, getContrastTextColor, } from './shared/utils/colorUtils';

package/dist/types/mixins/OxyServices.language.d.ts

@@ -1,4 +1,4 @@
-import type { LanguageMetadata } from '../utils/languageUtils';
+import type { SupportedLanguage } from '../utils/languageUtils';
 import type { OxyServicesBase } from '../OxyServices.base';
 export declare function OxyServicesLanguageMixin<T extends typeof OxyServicesBase>(Base: T): {
     new (...args: any[]): {
@@ -11,9 +11,9 @@ export declare function OxyServicesLanguageMixin<T extends typeof OxyServicesBas
             removeItem: (key: string) => Promise<void>;
         }>;
         /**
-         * Get the current language from storage or user profile
+         * Get the current locale from the user profile or local storage.
          * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
-         * @returns The current language code (e.g., 'en-US') or null if not set
+         * @returns The current BCP-47 locale (e.g., 'en-US') or null if not set
          */
         getCurrentLanguage(storageKeyPrefix?: string): Promise<string | null>;
         /**
@@ -21,7 +21,7 @@ export declare function OxyServicesLanguageMixin<T extends typeof OxyServicesBas
          * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
          * @returns Language metadata object or null if not set
          */
-        getCurrentLanguageMetadata(storageKeyPrefix?: string): Promise<LanguageMetadata | null>;
+        getCurrentLanguageMetadata(storageKeyPrefix?: string): Promise<SupportedLanguage | null>;
         /**
          * Get the current language name (e.g., 'English')
          * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')

package/dist/types/mixins/OxyServices.user.d.ts

@@ -21,6 +21,22 @@ export interface BulkFollowResult {
     /** Number of users newly followed by this request. */
     followedCount: number;
 }
+/**
+ * The authenticated viewer's OWN social graph, ids-only — the response of
+ * `GET /users/me/graph`. Consolidates the accounts the viewer follows, the
+ * subset who follow back (mutuals), and the accounts the viewer has blocked
+ * into one payload so a consumer can fetch its whole viewer graph in a single
+ * round trip instead of three. Each list is server-bounded; bare ids only (no
+ * hydrated DTOs) because the consumer hydrates/ranks itself.
+ */
+export interface ViewerGraph {
+    /** Accounts the viewer follows (most-recent first, bounded). */
+    followingIds: string[];
+    /** Accounts the viewer follows that ALSO follow the viewer back (bounded). */
+    mutualIds: string[];
+    /** Accounts the viewer has blocked (bounded). */
+    blockedIds: string[];
+}
 /** Per-user outcome returned by `POST /users/unfollow/bulk`. */
 export interface BulkUnfollowEntry {
     /** The user ID that was processed. */
@@ -383,6 +399,20 @@ export declare function OxyServicesUserMixin<T extends typeof OxyServicesBase>(B
         getFollowsOfFollowsIds(params?: {
             limit?: number;
         }): Promise<string[]>;
+        /**
+         * Get the authenticated VIEWER's OWN social graph — the accounts they follow,
+         * the subset who follow back (mutuals), and the accounts they have blocked —
+         * as ONE ids-only payload. The viewer is derived server-side from the SDK's
+         * auth token (never a param).
+         *
+         * Consolidates what were three separate round trips (`getUserFollowing` /
+         * `getMutualUserIds` / `getBlockedUsers`) into a single request so a consumer
+         * can prime its whole viewer graph at once. Mirrors {@link getMutualUserIds}'s
+         * caching posture (2-minute identity-scoped cache); the follow/unfollow/block/
+         * unblock write methods bust this entry so a local mutation is reflected
+         * immediately. An anonymous caller resolves to empty lists.
+         */
+        getViewerGraph(): Promise<ViewerGraph>;
         /**
          * Get notifications
          */

package/dist/types/models/interfaces.d.ts

@@ -131,6 +131,14 @@ export interface User {
     managedBy?: string;
     /** Real-estate taxonomy when this user is a `kind: 'organization'` account. */
     organizationCategory?: OrganizationCategory;
+    /**
+     * The account's languages as full BCP-47 locales (`language-REGION`, e.g.
+     * `en-US`, `es-MX`, `pt-BR`), ordered with the PRIMARY (UI) locale first.
+     * `languages[0]` is the primary locale — there is no singular `language`
+     * field. Resolve via `getUserLanguages` / `getPrimaryLanguage`, which
+     * normalize, validate against the supported catalog, and de-duplicate.
+     */
+    languages?: string[];
     notificationPreferences?: NotificationPreferences;
     userPreferences?: UserPreferences;
     [key: string]: unknown;

package/dist/types/session/accountDialogController.d.ts

@@ -27,7 +27,7 @@
  */
 import type { OxyServices } from '../OxyServices';
 import type { SessionLoginResponse, MinimalUserData } from '../models/session';
-import { SessionClient } from './SessionClient';
+import type { SessionClient } from './SessionClient';
 import { type SwitchableAccount } from './accountProjection';
 /** The dialog's top-level view. */
 export type AccountDialogView = 'accounts' | 'signin' | 'qr' | 'add';

package/dist/types/utils/languageUtils.d.ts

@@ -1,38 +1,100 @@
 /**
- * Language utilities for OxyServices
- * Provides access to supported languages and language metadata
+ * Locale utilities for OxyServices.
+ *
+ * The Oxy platform models account languages as full BCP-47 locales
+ * (`language-REGION`, e.g. `es-ES`, `es-MX`, `pt-BR`). Region is significant:
+ * "Spanish (Spain)" is a different locale than "Spanish (Mexico)". A user's
+ * account locales live on `User.languages` as an ordered list with the PRIMARY
+ * (UI) locale first — there is no singular `language` field.
+ *
+ * This module is the single source of truth for the supported-locale catalog
+ * and every locale operation the SDK exposes: parsing base subtags, canonical
+ * normalization, validation, metadata lookup, and resolving a user's locales.
+ * It is pure and side-effect free.
  */
-export interface LanguageMetadata {
-    id: string;
+import type { User } from '../models/interfaces';
+/**
+ * A supported BCP-47 locale in the Oxy catalog.
+ */
+export interface SupportedLanguage {
+    /** Canonical BCP-47 locale tag, `language-REGION` (e.g. `'es-ES'`). */
+    code: string;
+    /** ISO 639-1 base language subtag, lowercased (e.g. `'es'`). */
+    language: string;
+    /** ISO 3166-1 alpha-2 region subtag, uppercased (e.g. `'ES'`). */
+    region: string;
+    /** English display name, `'Language (Region)'` (e.g. `'Spanish (Spain)'`). */
     name: string;
+    /** Endonym — the name as written in the locale itself (e.g. `'Español (España)'`). */
     nativeName: string;
-    flag: string;
-    icon: string;
-    color: string;
+    /** `true` when the locale is written right-to-left. Omitted for LTR locales. */
+    rtl?: boolean;
 }
-export declare const SUPPORTED_LANGUAGES: LanguageMetadata[];
 /**
- * Get language metadata by language code
- * @param languageCode - BCP-47 language code (e.g., 'en-US', 'es-ES')
- * @returns Language metadata or null if not found
+ * The supported-locale catalog. Ordered by prominence for display; the order
+ * is not otherwise significant. Every entry is a full `language-REGION` tag,
+ * with the base subtag lowercased and the region uppercased.
+ */
+export declare const SUPPORTED_LANGUAGES: readonly SupportedLanguage[];
+/** Canonical fallback locale used when a display value cannot be resolved. */
+export declare const FALLBACK_LOCALE = "en-US";
+/**
+ * Extract the base language subtag from a locale, lowercased.
+ *
+ * Tolerant of bare base subtags and of extra subtags (script/variant):
+ * `'es-ES'` → `'es'`, `'es'` → `'es'`, `'zh-Hant-TW'` → `'zh'`. Returns an
+ * empty string for empty input.
+ */
+export declare function getBaseLanguage(locale: string): string;
+/**
+ * Normalize a locale string to its canonical `language-REGION` form when it is
+ * a supported locale, otherwise `undefined`.
+ *
+ * Canonicalization lowercases the base subtag and uppercases the region
+ * subtag (`'es-es'` → `'es-ES'`, `'EN-us'` → `'en-US'`) and validates the
+ * result against {@link SUPPORTED_LANGUAGES}. A bare base subtag (`'es'`) has
+ * no region and is therefore not a locale — it returns `undefined`.
+ */
+export declare function normalizeLocale(input: string): string | undefined;
+/**
+ * Whether `input` resolves to a supported BCP-47 locale.
+ */
+export declare function isSupportedLocale(input: string): boolean;
+/**
+ * Resolve catalog metadata for a locale.
+ *
+ * @param code - A locale tag (any case; e.g. `'es-ES'`, `'es-es'`).
+ * @returns The {@link SupportedLanguage} entry, or `null` when the tag is empty
+ *   or not a supported locale.
  */
-export declare function getLanguageMetadata(languageCode: string | null | undefined): LanguageMetadata | null;
+export declare function getLanguageMetadata(code: string | null | undefined): SupportedLanguage | null;
 /**
- * Get language name by language code
- * @param languageCode - BCP-47 language code (e.g., 'en-US', 'es-ES')
- * @returns Language name (e.g., 'English') or the code if not found
+ * English display name for a locale (e.g. `'Spanish (Spain)'`).
+ * Falls back to the input tag, then {@link FALLBACK_LOCALE}.
  */
-export declare function getLanguageName(languageCode: string | null | undefined): string;
+export declare function getLanguageName(code: string | null | undefined): string;
 /**
- * Get native language name by language code
- * @param languageCode - BCP-47 language code (e.g., 'en-US', 'es-ES')
- * @returns Native language name (e.g., 'Español') or the code if not found
+ * Native display name (endonym) for a locale (e.g. `'Español (España)'`).
+ * Falls back to the input tag, then {@link FALLBACK_LOCALE}.
  */
-export declare function getNativeLanguageName(languageCode: string | null | undefined): string;
+export declare function getNativeLanguageName(code: string | null | undefined): string;
 /**
- * Normalize language code to BCP-47 format
- * @param lang - Language code (may be short like 'en' or full like 'en-US')
- * @returns Normalized BCP-47 language code
+ * Whether a locale (or bare base subtag) is written right-to-left. Unknown
+ * tags are treated as left-to-right.
  */
-export declare function normalizeLanguageCode(lang?: string | null): string;
 export declare function isRTLLocale(locale?: string | null): boolean;
+/**
+ * Resolve the ordered list of account locales for a user, primary first.
+ *
+ * Reads `user.languages` (the only source — there is no singular `language`
+ * field), then normalizes each entry to its canonical `language-REGION` form,
+ * drops non-string and unsupported entries, and de-duplicates while preserving
+ * first-seen order. Pure and side-effect free — never throws on bad input.
+ */
+export declare function getUserLanguages(user: Pick<User, 'languages'> | null | undefined): string[];
+/**
+ * Resolve the single PRIMARY locale for a user (the first entry from
+ * {@link getUserLanguages}), or `undefined` when the user has no supported
+ * locale.
+ */
+export declare function getPrimaryLanguage(user: Pick<User, 'languages'> | null | undefined): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/core",
-  "version": "9.2.3",
+  "version": "10.0.0",
   "description": "OxyHQ SDK Foundation — API client, authentication, cryptographic identity, and shared utilities",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -94,8 +94,8 @@
     }
   },
   "dependencies": {
-    "@oxyhq/contracts": "^0.13.2",
-    "@oxyhq/protocol": "^0.1.3",
+    "@oxyhq/contracts": "^0.14.0",
+    "@oxyhq/protocol": "^0.1.5",
     "bip39": "^3.1.0",
     "buffer": "^6.0.3",
     "elliptic": "^6.6.1",

package/src/HttpService.ts

@@ -232,7 +232,7 @@ export class HttpService {
   private logger: SimpleLogger;
   private config: OxyConfig;
   private tokenRefreshPromise: Promise<string | null> | null = null;
-  private tokenRefreshCooldownUntil: number = 0;
+  private tokenRefreshCooldownUntil = 0;
   private authRefreshHandler: AuthRefreshHandler | null = null;
   private accessTokenProvider: AccessTokenProvider | null = null;
   private deviceSecretMintInFlight: Promise<DeviceSecretMintOutcome> | null = null;
@@ -242,7 +242,7 @@ export class HttpService {
    * re-emitted. Throttles the {@link CACHE_SOFT_MAX_ENTRIES} warning to at most
    * one per {@link CACHE_SIZE_WARNING_THROTTLE_MS} window.
    */
-  private cacheSizeWarningSilentUntil: number = 0;
+  private cacheSizeWarningSilentUntil = 0;
 
   /**
    * Fan-out listeners notified on EVERY access-token change on this instance:

package/src/crypto/keyManager.ts

@@ -1178,9 +1178,9 @@ export class KeyManager {
    * @param userConfirmed - If true, user has explicitly confirmed deletion (default: false)
    */
   static async deleteIdentity(
-    skipBackup: boolean = false, 
-    force: boolean = false,
-    userConfirmed: boolean = false
+    skipBackup = false, 
+    force = false,
+    userConfirmed = false
   ): Promise<void> {
     if (isWebPlatform()) {
       return; // Identity storage is only available on native platforms, nothing to delete

package/src/crypto/recoveryPhrase.ts

@@ -160,7 +160,7 @@ export class RecoveryPhraseService {
   /**
    * Get suggestions for a partial word
    */
-  static getSuggestions(partial: string, limit: number = 5): string[] {
+  static getSuggestions(partial: string, limit = 5): string[] {
     const lowerPartial = partial.toLowerCase();
     return bip39.wordlists.english
       .filter((word: string) => word.startsWith(lowerPartial))

package/src/i18n/index.ts

@@ -9,6 +9,7 @@ import jaJP from './locales/ja-JP.json';
 import koKR from './locales/ko-KR.json';
 import zhCN from './locales/zh-CN.json';
 import arSA from './locales/ar-SA.json';
+import { getBaseLanguage } from '../utils/languageUtils';
 
 export type LocaleDict = Record<string, any>;
 
@@ -39,12 +40,30 @@ const DICTS: Record<string, LocaleDict> = {
 
 const FALLBACK = 'en-US';
 
+/**
+ * Resolve a locale tag to the key of the dictionary that should serve it.
+ *
+ * Account locales are full BCP-47 tags (e.g. `es-MX`, `pt-BR`, `fr-CA`), but a
+ * translation dictionary is shipped per base language. Resolution order:
+ *   1. Exact dictionary for the tag (e.g. `es-ES`).
+ *   2. Dictionary for the base subtag (e.g. `es-MX` → `es`).
+ *   3. The English fallback.
+ */
+function resolveLang(locale: string | undefined): string {
+  if (locale) {
+    if (DICTS[locale]) return locale;
+    const base = getBaseLanguage(locale);
+    if (DICTS[base]) return base;
+  }
+  return FALLBACK;
+}
+
 function getNested(obj: any, path: string): any {
   return path.split('.').reduce((acc, key) => (acc && acc[key] != null ? acc[key] : undefined), obj);
 }
 
 export function translate(locale: string | undefined, key: string, vars?: Record<string, string | number>): string {
-  const lang = locale && DICTS[locale] ? locale : FALLBACK;
+  const lang = resolveLang(locale);
   const dict = DICTS[lang] || DICTS[FALLBACK];
   let val = getNested(dict, key);
   // Per-key fallback to the English dictionary when a key is missing from the
@@ -64,6 +83,6 @@ export function translate(locale: string | undefined, key: string, vars?: Record
 }
 
 export function hasKey(locale: string | undefined, key: string): boolean {
-  const lang = locale && DICTS[locale] ? locale : FALLBACK;
+  const lang = resolveLang(locale);
   return getNested(DICTS[lang], key) != null || getNested(DICTS[FALLBACK], key) != null;
 }

package/src/i18n/locales/en-US.json

@@ -169,9 +169,12 @@
   },
   "language": {
     "title": "Language",
-    "subtitle": "Choose your preferred language",
+    "subtitle": "Choose the languages you use. The first is your primary interface language.",
     "current": "Current Language",
+    "selected": "Your languages",
     "available": "Available Languages",
+    "primary": "Primary",
+    "remove": "Remove",
     "changed": "Language changed to {{lang}}",
     "saveFailed": "Failed to save language preference",
     "search": "Search languages"

package/src/i18n/locales/es-ES.json

@@ -123,9 +123,12 @@
   },
   "language": {
     "title": "Idioma",
-    "subtitle": "Elige tu idioma preferido",
+    "subtitle": "Elige los idiomas que usas. El primero es tu idioma de interfaz principal.",
     "current": "Idioma actual",
+    "selected": "Tus idiomas",
     "available": "Idiomas disponibles",
+    "primary": "Principal",
+    "remove": "Quitar",
     "changed": "Idioma cambiado a {{lang}}",
     "saveFailed": "Error al guardar la preferencia de idioma",
     "search": "Buscar idiomas"

package/src/index.ts

@@ -53,6 +53,7 @@ export type {
     BulkFollowResult,
     BulkUnfollowEntry,
     BulkUnfollowResult,
+    ViewerGraph,
 } from './mixins/OxyServices.user';
 export { OxyAppDataIdentifierError } from './mixins/OxyServices.appData';
 
@@ -323,13 +324,18 @@ export type { TopicData, TopicTranslation } from './models/Topic';
 // ---------------------------------------------------------------------------
 export {
     SUPPORTED_LANGUAGES,
+    FALLBACK_LOCALE,
+    getBaseLanguage,
+    normalizeLocale,
+    isSupportedLocale,
     getLanguageMetadata,
     getLanguageName,
     getNativeLanguageName,
-    normalizeLanguageCode,
     isRTLLocale,
+    getUserLanguages,
+    getPrimaryLanguage,
 } from './utils/languageUtils';
-export type { LanguageMetadata } from './utils/languageUtils';
+export type { SupportedLanguage } from './utils/languageUtils';
 
 // ---------------------------------------------------------------------------
 // Platform detection

package/src/mixins/OxyServices.assets.ts

@@ -435,12 +435,16 @@ export function OxyServicesAssetsMixin<T extends typeof OxyServicesBase>(Base: T
         if (error instanceof Error) {
           errorMessage = error.message || errorMessage;
         } else if (error && typeof error === 'object') {
-          if ('message' in error) {
-            errorMessage = String((error as any).message) || errorMessage;
-          } else if ('error' in error && typeof (error as any).error === 'string') {
-            errorMessage = (error as any).error;
-          } else if ('data' in error && (error as any).data?.message) {
-            errorMessage = String((error as any).data.message);
+          const errObj = error as Record<string, unknown>;
+          if ('message' in errObj) {
+            errorMessage = String(errObj.message) || errorMessage;
+          } else if (typeof errObj.error === 'string') {
+            errorMessage = errObj.error;
+          } else if (errObj.data && typeof errObj.data === 'object') {
+            const dataObj = errObj.data as Record<string, unknown>;
+            if (dataObj.message) {
+              errorMessage = String(dataObj.message);
+            }
           }
         } else if (error) {
           errorMessage = String(error) || errorMessage;
@@ -462,8 +466,8 @@ export function OxyServicesAssetsMixin<T extends typeof OxyServicesBase>(Base: T
           throw handledError;
         }
         
-        const newError = new Error(errorMessage);
-        (newError as any).fileContext = contextError.fileContext;
+        const newError: Error & { fileContext?: Record<string, unknown> } = new Error(errorMessage);
+        newError.fileContext = contextError.fileContext;
         throw this.handleError(newError);
       }
     }
@@ -546,7 +550,7 @@ export function OxyServicesAssetsMixin<T extends typeof OxyServicesBase>(Base: T
     /**
      * Delete asset with optional force
      */
-    async assetDelete(fileId: string, force: boolean = false): Promise<any> {
+    async assetDelete(fileId: string, force = false): Promise<any> {
       try {
         const params: any = force ? { force: 'true' } : undefined;
         const result = await this.makeRequest('DELETE', `/assets/${fileId}`, params, { cache: false });
@@ -590,7 +594,7 @@ export function OxyServicesAssetsMixin<T extends typeof OxyServicesBase>(Base: T
       }
     }
 
-    async uploadAvatar(file: AssetUploadInput, userId: string, app: string = 'profiles'): Promise<any> {
+    async uploadAvatar(file: AssetUploadInput, userId: string, app = 'profiles'): Promise<any> {
       try {
         const asset = await this.assetUpload(file, 'public');
         await this.assetLink(asset.file.id, app, 'avatar', userId, 'public');
@@ -600,7 +604,7 @@ export function OxyServicesAssetsMixin<T extends typeof OxyServicesBase>(Base: T
       }
     }
 
-    async uploadProfileBanner(file: AssetUploadInput, userId: string, app: string = 'profiles'): Promise<any> {
+    async uploadProfileBanner(file: AssetUploadInput, userId: string, app = 'profiles'): Promise<any> {
       try {
         const asset = await this.assetUpload(file, 'public');
         await this.assetLink(asset.file.id, app, 'profile-banner', userId, 'public');

package/src/mixins/OxyServices.language.ts

@@ -1,12 +1,25 @@
 /**
  * Language Methods Mixin
  */
-import { normalizeLanguageCode, getLanguageMetadata, getLanguageName, getNativeLanguageName } from '../utils/languageUtils';
-import type { LanguageMetadata } from '../utils/languageUtils';
+import { normalizeLocale, getPrimaryLanguage, getLanguageMetadata, getLanguageName, getNativeLanguageName } from '../utils/languageUtils';
+import type { SupportedLanguage } from '../utils/languageUtils';
 import type { OxyServicesBase } from '../OxyServices.base';
 import { loadAsyncStorage } from '@oxyhq/protocol';
 import { isDev } from '../shared/utils/debugUtils';
 
+/**
+ * Cross-mixin surface consumed by the language methods. `getCurrentUser` is
+ * provided by the user mixin at runtime — both live on the composed
+ * `OxyServices` instance — but it is not visible on `OxyServicesBase` at the
+ * type level. We narrow `this` through this interface (mirroring the
+ * `OxyAuthInstance` pattern in `OxyServices.utility.ts`) instead of casting to
+ * `any`. Only the fields this mixin reads are declared, keeping it decoupled
+ * from the full `User` shape.
+ */
+interface LanguageMixinCrossAccess {
+  getCurrentUser(): Promise<{ languages?: string[] }>;
+}
+
 export function OxyServicesLanguageMixin<T extends typeof OxyServicesBase>(Base: T) {
   return class extends Base {
     constructor(...args: any[]) {
@@ -62,29 +75,30 @@ export function OxyServicesLanguageMixin<T extends typeof OxyServicesBase>(Base:
     }
 
     /**
-     * Get the current language from storage or user profile
+     * Get the current locale from the user profile or local storage.
      * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
-     * @returns The current language code (e.g., 'en-US') or null if not set
+     * @returns The current BCP-47 locale (e.g., 'en-US') or null if not set
      */
-    async getCurrentLanguage(storageKeyPrefix: string = 'oxy_session'): Promise<string | null> {
+    async getCurrentLanguage(storageKeyPrefix = 'oxy_session'): Promise<string | null> {
       try {
-        // First try to get from user profile if authenticated
+        // First try the authenticated user's primary account locale.
         try {
-          const user = await (this as any).getCurrentUser();
-          const userLanguage = (user as Record<string, unknown>)?.language as string | undefined;
-          if (userLanguage) {
-            return normalizeLanguageCode(userLanguage) || userLanguage;
+          const user = await (this as unknown as LanguageMixinCrossAccess).getCurrentUser();
+          const primary = getPrimaryLanguage(user);
+          if (primary) {
+            return primary;
           }
-        } catch (e) {
-          // User not authenticated or error, continue to storage
+        } catch {
+          // Not authenticated or the profile fetch failed — fall through to the
+          // locally stored preference below.
         }
 
-        // Fall back to storage
+        // Fall back to the locally stored locale preference.
         const storage = await this.getStorage();
         const storageKey = `${storageKeyPrefix}_language`;
         const storedLanguage = await storage.getItem(storageKey);
         if (storedLanguage) {
-          return normalizeLanguageCode(storedLanguage) || storedLanguage;
+          return normalizeLocale(storedLanguage) ?? storedLanguage;
         }
 
         return null;
@@ -101,7 +115,7 @@ export function OxyServicesLanguageMixin<T extends typeof OxyServicesBase>(Base:
      * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
      * @returns Language metadata object or null if not set
      */
-    async getCurrentLanguageMetadata(storageKeyPrefix: string = 'oxy_session'): Promise<LanguageMetadata | null> {
+    async getCurrentLanguageMetadata(storageKeyPrefix = 'oxy_session'): Promise<SupportedLanguage | null> {
       const languageCode = await this.getCurrentLanguage(storageKeyPrefix);
       return getLanguageMetadata(languageCode);
     }
@@ -111,7 +125,7 @@ export function OxyServicesLanguageMixin<T extends typeof OxyServicesBase>(Base:
      * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
      * @returns Language name or null if not set
      */
-    async getCurrentLanguageName(storageKeyPrefix: string = 'oxy_session'): Promise<string | null> {
+    async getCurrentLanguageName(storageKeyPrefix = 'oxy_session'): Promise<string | null> {
       const languageCode = await this.getCurrentLanguage(storageKeyPrefix);
       if (!languageCode) return null;
       return getLanguageName(languageCode);
@@ -122,7 +136,7 @@ export function OxyServicesLanguageMixin<T extends typeof OxyServicesBase>(Base:
      * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
      * @returns Native language name or null if not set
      */
-    async getCurrentNativeLanguageName(storageKeyPrefix: string = 'oxy_session'): Promise<string | null> {
+    async getCurrentNativeLanguageName(storageKeyPrefix = 'oxy_session'): Promise<string | null> {
       const languageCode = await this.getCurrentLanguage(storageKeyPrefix);
       if (!languageCode) return null;
       return getNativeLanguageName(languageCode);

package/src/mixins/OxyServices.privacy.ts

@@ -82,6 +82,9 @@ export function OxyServicesPrivacyMixin<T extends typeof OxyServicesBase>(Base:
           cache: false,
         });
         this.clearCacheEntry('GET:/privacy/blocked');
+        // The block changed the viewer's graph (`blockedIds`) — bust the cached
+        // consolidated `GET /users/me/graph` so the next read reflects it.
+        this.clearCacheEntry('GET:/users/me/graph');
         return result;
       } catch (error) {
         throw this.handleError(error);
@@ -105,6 +108,9 @@ export function OxyServicesPrivacyMixin<T extends typeof OxyServicesBase>(Base:
           cache: false,
         });
         this.clearCacheEntry('GET:/privacy/blocked');
+        // Symmetric to blockUser: the unblock changed the viewer's `blockedIds`,
+        // so bust the consolidated `GET /users/me/graph` cache.
+        this.clearCacheEntry('GET:/users/me/graph');
         return result;
       } catch (error) {
         throw this.handleError(error);

package/src/mixins/OxyServices.security.ts

@@ -57,7 +57,7 @@ export function OxyServicesSecurityMixin<T extends typeof OxyServicesBase>(Base:
      * @param limit - Number of recent events to fetch (default: 10)
      * @returns Array of recent security activities
      */
-    async getRecentSecurityActivity(limit: number = 10): Promise<SecurityActivity[]> {
+    async getRecentSecurityActivity(limit = 10): Promise<SecurityActivity[]> {
       try {
         const response = await this.getSecurityActivity(limit, 0);
         return response.data || [];