diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
index b64b0d46f..3cb520a0e 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT, DEFAULT_LANGUAGE_CODE, getLanguageInfo } from '@/utils/dist/core/models/defaults';
+import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT, getLanguageInfo, resolveDefaultLanguage } from '@/utils/dist/core/models/defaults';
 import type {
   PasswordSettings,
   PasswordGeneratorType,
@@ -103,7 +103,9 @@ const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({
   const { t } = useTranslation();
 
   const isDiceware = (settings.Type ?? 'basic') === 'diceware';
-  const currentLanguage = settings.Language ?? DEFAULT_LANGUAGE_CODE;
+  const currentLanguage = (settings.Language && settings.Language.length > 0)
+    ? settings.Language
+    : resolveDefaultLanguage(navigator.language, dicewareLanguages);
 
   /**
    * Human label for a Diceware option value (used in button tooltips).
diff --git a/apps/browser-extension/src/utils/RustCore.ts b/apps/browser-extension/src/utils/RustCore.ts
index 010d75694..7cb338a88 100644
--- a/apps/browser-extension/src/utils/RustCore.ts
+++ b/apps/browser-extension/src/utils/RustCore.ts
@@ -10,6 +10,7 @@
  */
 import { browser } from 'wxt/browser';
 
+import { resolveDefaultLanguage } from '@/utils/dist/core/models/defaults';
 import type { Item, PasswordSettings } from '@/utils/dist/core/models/vault';
 import { FieldKey } from '@/utils/dist/core/models/vault';
 import initWasm, * as core from '@/utils/dist/core/rust/aliasvault_core.js';
@@ -70,10 +71,24 @@ export async function extractRootDomain(domain: string): Promise<string> {
  */
 export async function generatePassword(settings: PasswordSettings, seed?: string): Promise<string> {
   await initRustCore();
-  const payload = seed ? { ...settings, Seed: seed } : settings;
+  const effective = await applyEffectiveDicewareLanguage(settings);
+  const payload = seed ? { ...effective, Seed: seed } : effective;
   return core.generatePassword(JSON.stringify(payload));
 }
 
+/**
+ * Resolve the effective Diceware passphrase language when none is explicitly chosen.
+ *
+ * The passphrase language is left empty by default ("auto").
+ */
+async function applyEffectiveDicewareLanguage(settings: PasswordSettings): Promise<PasswordSettings> {
+  if (settings.Type !== 'diceware' || (settings.Language && settings.Language.trim().length > 0)) {
+    return settings;
+  }
+  const codes = await getDicewareLanguages();
+  return { ...settings, Language: resolveDefaultLanguage(navigator.language, codes) };
+}
+
 /**
  * Get the list of bundled Diceware wordlist language ISO codes (first is the default, 'en').
  * The set is owned by the Rust core; unknown codes fall back to English during generation.
diff --git a/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts b/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
index 8e7a88d4e..f1d56048a 100644
--- a/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
+++ b/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
@@ -1,4 +1,5 @@
-import { DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT, DEFAULT_LANGUAGE_CODE } from '@/utils/dist/core/models/defaults';
+import { getAvailableLanguages } from '@/utils/dist/core/identity-generator';
+import { DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT, DEFAULT_LANGUAGE_CODE, matchAvailableLanguage } from '@/utils/dist/core/models/defaults';
 import type { EncryptionKey, PasswordSettings, TotpCode, Attachment } from '@/utils/dist/core/models/vault';
 
 import { BaseRepository } from '../BaseRepository';
@@ -69,7 +70,8 @@ export class SettingsRepository extends BaseRepository {
       UseNonAmbiguousChars: false,
       Type: 'basic',
       WordCount: DEFAULT_WORD_COUNT,
-      Language: DEFAULT_LANGUAGE_CODE,
+      // Empty = "auto": the passphrase language is resolved from the app language during runtime.
+      Language: '',
       Capitalization: 'Lowercase',
       Separator: 'Dash',
       Salt: 'None'
@@ -151,7 +153,9 @@ export class SettingsRepository extends BaseRepository {
   }
 
   /**
-   * Get the effective identity language, falling back to browser language.
+   * Get the effective identity language. Uses the explicit override when set, otherwise matches the
+   * browser language to one of the identity generator's available languages via the shared
+   * region-variant alternative-code table (e.g. "de-CH" -> "de"), falling back to English.
    * @returns The effective language code
    */
   public getEffectiveIdentityLanguage(): string {
@@ -159,8 +163,7 @@ export class SettingsRepository extends BaseRepository {
     if (storedLanguage) {
       return storedLanguage;
     }
-    // Fall back to browser language (first two characters)
-    return navigator.language.substring(0, 2);
+    return matchAvailableLanguage(navigator.language, getAvailableLanguages()) ?? DEFAULT_LANGUAGE_CODE;
   }
 
   /**
diff --git a/apps/browser-extension/src/utils/dist/core/identity-generator/index.d.ts b/apps/browser-extension/src/utils/dist/core/identity-generator/index.d.ts
index 0622ddd0d..2e6235283 100644
--- a/apps/browser-extension/src/utils/dist/core/identity-generator/index.d.ts
+++ b/apps/browser-extension/src/utils/dist/core/identity-generator/index.d.ts
@@ -399,20 +399,6 @@ declare function convertAgeRangeToBirthdateOptions(ageRange: string): IBirthdate
  * @returns Array of ISO language codes (e.g. ["da", "de", "en", ...]).
  */
 declare function getAvailableLanguages(): string[];
-/**
- * Maps a UI language code to an identity generator language code.
- * If no explicit match is found, returns null to indicate no preference.
- *
- * @param uiLanguageCode - The UI language code (e.g., "en", "en-US", "nl-NL", "de-DE", "fr")
- * @returns The matching identity generator language code or null if no match
- *
- * @example
- * mapUiLanguageToIdentityLanguage("en-US") // returns "en"
- * mapUiLanguageToIdentityLanguage("nl") // returns "nl"
- * mapUiLanguageToIdentityLanguage("de-CH") // returns "de"
- * mapUiLanguageToIdentityLanguage("ja") // returns null (no Japanese identity generator)
- */
-declare function mapUiLanguageToIdentityLanguage(uiLanguageCode: string | null | undefined): string | null;
 
 /**
  * Creates a new identity generator based on the language.
@@ -429,4 +415,4 @@ declare const CreateIdentityGenerator: (language: string) => IdentityGenerator;
  */
 declare const CreateUsernameEmailGenerator: () => UsernameEmailGenerator;
 
-export { CreateIdentityGenerator, CreateUsernameEmailGenerator, Gender, type IAgeRangeOption, type IBirthdateOptions, type IDecadeFirstnames, type IIdentityGenerator, type Identity, IdentityGenerator, IdentityGeneratorDa, IdentityGeneratorDe, IdentityGeneratorEn, IdentityGeneratorEs, IdentityGeneratorFa, IdentityGeneratorFr, IdentityGeneratorIt, IdentityGeneratorNl, IdentityGeneratorRo, IdentityGeneratorSv, IdentityGeneratorUr, IdentityHelperUtils, UsernameEmailGenerator, convertAgeRangeToBirthdateOptions, getAvailableAgeRanges, getAvailableLanguages, mapUiLanguageToIdentityLanguage };
+export { CreateIdentityGenerator, CreateUsernameEmailGenerator, Gender, type IAgeRangeOption, type IBirthdateOptions, type IDecadeFirstnames, type IIdentityGenerator, type Identity, IdentityGenerator, IdentityGeneratorDa, IdentityGeneratorDe, IdentityGeneratorEn, IdentityGeneratorEs, IdentityGeneratorFa, IdentityGeneratorFr, IdentityGeneratorIt, IdentityGeneratorNl, IdentityGeneratorRo, IdentityGeneratorSv, IdentityGeneratorUr, IdentityHelperUtils, UsernameEmailGenerator, convertAgeRangeToBirthdateOptions, getAvailableAgeRanges, getAvailableLanguages };
diff --git a/apps/browser-extension/src/utils/dist/core/identity-generator/index.js b/apps/browser-extension/src/utils/dist/core/identity-generator/index.js
index a4f3c5090..41780e57d 100644
--- a/apps/browser-extension/src/utils/dist/core/identity-generator/index.js
+++ b/apps/browser-extension/src/utils/dist/core/identity-generator/index.js
@@ -42,8 +42,7 @@ __export(index_exports, {
   UsernameEmailGenerator: () => UsernameEmailGenerator,
   convertAgeRangeToBirthdateOptions: () => convertAgeRangeToBirthdateOptions,
   getAvailableAgeRanges: () => getAvailableAgeRanges,
-  getAvailableLanguages: () => getAvailableLanguages,
-  mapUiLanguageToIdentityLanguage: () => mapUiLanguageToIdentityLanguage
+  getAvailableLanguages: () => getAvailableLanguages
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -11763,43 +11762,21 @@ function convertAgeRangeToBirthdateOptions(ageRange) {
 }
 
 // src/utils/LanguageProvider.ts
-var LANGUAGE_DEFS = [
-  { value: "da", alternativeCodes: ["da-DK"] },
-  { value: "de", alternativeCodes: ["de-DE", "de-AT", "de-CH", "de-LU", "de-LI"] },
-  { value: "en", alternativeCodes: ["en-US", "en-GB", "en-CA", "en-AU", "en-NZ", "en-IE", "en-ZA", "en-SG", "en-IN"] },
-  { value: "es", alternativeCodes: ["es-ES", "es-MX", "es-AR", "es-CO", "es-CL", "es-PE", "es-VE", "es-EC", "es-GT", "es-CU", "es-BO", "es-DO", "es-HN", "es-PY", "es-SV", "es-NI", "es-CR", "es-PA", "es-UY", "es-PR"] },
-  { value: "fr", alternativeCodes: ["fr-FR", "fr-CA", "fr-BE", "fr-CH", "fr-LU", "fr-MC"] },
-  { value: "it", alternativeCodes: ["it-IT", "it-CH", "it-SM", "it-VA"] },
-  { value: "nl", alternativeCodes: ["nl-NL", "nl-BE"] },
-  { value: "ro", alternativeCodes: ["ro-RO", "ro-MD"] },
-  { value: "sv", alternativeCodes: ["sv-SE", "sv-FI"] },
-  { value: "ur", alternativeCodes: ["ur-PK", "ur-IN"] },
-  { value: "fa", alternativeCodes: ["fa-IR", "fa-AF"] }
+var SUPPORTED_LANGUAGE_CODES = [
+  "da",
+  "de",
+  "en",
+  "es",
+  "fr",
+  "it",
+  "nl",
+  "ro",
+  "sv",
+  "ur",
+  "fa"
 ];
 function getAvailableLanguages() {
-  return LANGUAGE_DEFS.map((lang) => lang.value);
-}
-function mapUiLanguageToIdentityLanguage(uiLanguageCode) {
-  if (!uiLanguageCode) {
-    return null;
-  }
-  const normalizedCode = uiLanguageCode.toLowerCase();
-  const exactMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === normalizedCode);
-  if (exactMatch) {
-    return exactMatch.value;
-  }
-  const alternativeMatch = LANGUAGE_DEFS.find(
-    (lang) => lang.alternativeCodes?.some((code) => code.toLowerCase() === normalizedCode)
-  );
-  if (alternativeMatch) {
-    return alternativeMatch.value;
-  }
-  const baseCode = normalizedCode.split("-")[0];
-  const baseMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === baseCode);
-  if (baseMatch) {
-    return baseMatch.value;
-  }
-  return null;
+  return [...SUPPORTED_LANGUAGE_CODES];
 }
 
 // src/factories/IdentityGeneratorFactory.ts
@@ -11858,6 +11835,5 @@ var CreateUsernameEmailGenerator = () => {
   UsernameEmailGenerator,
   convertAgeRangeToBirthdateOptions,
   getAvailableAgeRanges,
-  getAvailableLanguages,
-  mapUiLanguageToIdentityLanguage
+  getAvailableLanguages
 });
diff --git a/apps/browser-extension/src/utils/dist/core/identity-generator/index.mjs b/apps/browser-extension/src/utils/dist/core/identity-generator/index.mjs
index c19ae5b4e..5d4cb295a 100644
--- a/apps/browser-extension/src/utils/dist/core/identity-generator/index.mjs
+++ b/apps/browser-extension/src/utils/dist/core/identity-generator/index.mjs
@@ -11718,43 +11718,21 @@ function convertAgeRangeToBirthdateOptions(ageRange) {
 }
 
 // src/utils/LanguageProvider.ts
-var LANGUAGE_DEFS = [
-  { value: "da", alternativeCodes: ["da-DK"] },
-  { value: "de", alternativeCodes: ["de-DE", "de-AT", "de-CH", "de-LU", "de-LI"] },
-  { value: "en", alternativeCodes: ["en-US", "en-GB", "en-CA", "en-AU", "en-NZ", "en-IE", "en-ZA", "en-SG", "en-IN"] },
-  { value: "es", alternativeCodes: ["es-ES", "es-MX", "es-AR", "es-CO", "es-CL", "es-PE", "es-VE", "es-EC", "es-GT", "es-CU", "es-BO", "es-DO", "es-HN", "es-PY", "es-SV", "es-NI", "es-CR", "es-PA", "es-UY", "es-PR"] },
-  { value: "fr", alternativeCodes: ["fr-FR", "fr-CA", "fr-BE", "fr-CH", "fr-LU", "fr-MC"] },
-  { value: "it", alternativeCodes: ["it-IT", "it-CH", "it-SM", "it-VA"] },
-  { value: "nl", alternativeCodes: ["nl-NL", "nl-BE"] },
-  { value: "ro", alternativeCodes: ["ro-RO", "ro-MD"] },
-  { value: "sv", alternativeCodes: ["sv-SE", "sv-FI"] },
-  { value: "ur", alternativeCodes: ["ur-PK", "ur-IN"] },
-  { value: "fa", alternativeCodes: ["fa-IR", "fa-AF"] }
+var SUPPORTED_LANGUAGE_CODES = [
+  "da",
+  "de",
+  "en",
+  "es",
+  "fr",
+  "it",
+  "nl",
+  "ro",
+  "sv",
+  "ur",
+  "fa"
 ];
 function getAvailableLanguages() {
-  return LANGUAGE_DEFS.map((lang) => lang.value);
-}
-function mapUiLanguageToIdentityLanguage(uiLanguageCode) {
-  if (!uiLanguageCode) {
-    return null;
-  }
-  const normalizedCode = uiLanguageCode.toLowerCase();
-  const exactMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === normalizedCode);
-  if (exactMatch) {
-    return exactMatch.value;
-  }
-  const alternativeMatch = LANGUAGE_DEFS.find(
-    (lang) => lang.alternativeCodes?.some((code) => code.toLowerCase() === normalizedCode)
-  );
-  if (alternativeMatch) {
-    return alternativeMatch.value;
-  }
-  const baseCode = normalizedCode.split("-")[0];
-  const baseMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === baseCode);
-  if (baseMatch) {
-    return baseMatch.value;
-  }
-  return null;
+  return [...SUPPORTED_LANGUAGE_CODES];
 }
 
 // src/factories/IdentityGeneratorFactory.ts
@@ -11812,6 +11790,5 @@ export {
   UsernameEmailGenerator,
   convertAgeRangeToBirthdateOptions,
   getAvailableAgeRanges,
-  getAvailableLanguages,
-  mapUiLanguageToIdentityLanguage
+  getAvailableLanguages
 };
diff --git a/apps/browser-extension/src/utils/dist/core/models/defaults/index.d.ts b/apps/browser-extension/src/utils/dist/core/models/defaults/index.d.ts
index 2c5e628a2..e9380650f 100644
--- a/apps/browser-extension/src/utils/dist/core/models/defaults/index.d.ts
+++ b/apps/browser-extension/src/utils/dist/core/models/defaults/index.d.ts
@@ -22,8 +22,8 @@ declare const MIN_WORD_COUNT = 3;
 declare const MAX_WORD_COUNT = 10;
 
 /**
- * Generic, cross-platform language reference: maps a two-letter ISO 639-1 code to a flag and a
- * native display label.
+ * Generic, cross-platform language reference: maps a two-letter ISO 639-1 code to a flag, a native
+ * display label, and the alternative locale codes (BCP-47 region variants) that map onto it
  */
 /**
  * Display metadata for a single language.
@@ -35,12 +35,14 @@ interface ILanguageInfo {
     flag: string;
     /** Native display label. */
     label: string;
+    /** Alternative locale codes (BCP-47 language-region tags) that map onto this language. */
+    alternativeCodes?: string[];
 }
 /** Default ISO language code used as the universal fallback. */
 declare const DEFAULT_LANGUAGE_CODE = "en";
 /**
- * Known languages keyed by ISO 639-1 code, with a flag and native label.
- * Covers the AliasVault app UI languages so this list can be reused beyond a single feature.
+ * Known languages keyed by ISO 639-1 code, with a flag, native label, and the region-variant locale
+ * codes that map onto each.
  */
 declare const LANGUAGES: ILanguageInfo[];
 /**
@@ -56,14 +58,32 @@ declare function normalizeLanguageCode(code: string | null | undefined): string;
  * @returns The flag + label info for the code.
  */
 declare function getLanguageInfo(code: string): ILanguageInfo;
+/**
+ * Match an app/UI/browser locale to one of a feature's available ISO codes, using the region-variant
+ * alternative codes from {@link LANGUAGES} (e.g. 'en-GB' -> 'en', 'de-CH' -> 'de'). Matching order:
+ * exact match against an available code, then the alternative-code table, then the base language code
+ * (the part before the '-'). Returns null when nothing matches, so callers can decide their own
+ * fallback (e.g. "no preference" vs. a concrete default).
+ *
+ * @param appLanguage The app/UI/browser language tag (e.g. 'en', 'en-US', 'nl-BE').
+ * @param availableCodes The codes the feature actually supports.
+ * @returns The matching available code (in its original casing) or null if none matched.
+ *
+ * @example
+ * matchAvailableLanguage('en-US', ['en', 'nl']) // 'en'
+ * matchAvailableLanguage('de-CH', ['de', 'en']) // 'de'
+ * matchAvailableLanguage('ja', ['en', 'nl'])    // null
+ */
+declare function matchAvailableLanguage(appLanguage: string | null | undefined, availableCodes: string[]): string | null;
 /**
  * Resolve a default language code for an app/UI language, restricted to a set of available codes
- * (e.g. the Diceware wordlist languages returned by the Rust core). Returns the app language when it
- * is available, otherwise the first available code, otherwise English.
- * @param appLanguage The app/UI language tag.
+ * (e.g. the Diceware wordlist languages returned by the Rust core, or the identity generator's
+ * supported languages). Uses {@link matchAvailableLanguage} (region-variant aware), then falls back
+ * to the first available code, otherwise English.
+ * @param appLanguage The app/UI/browser language tag.
  * @param availableCodes The codes the feature actually supports.
  * @returns The resolved ISO code.
  */
 declare function resolveDefaultLanguage(appLanguage: string | null | undefined, availableCodes: string[]): string;
 
-export { DEFAULT_LANGUAGE_CODE, DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT, type ILanguageInfo, LANGUAGES, MAX_PASSWORD_LENGTH, MAX_WORD_COUNT, MIN_PASSWORD_LENGTH, MIN_WORD_COUNT, getLanguageInfo, normalizeLanguageCode, resolveDefaultLanguage };
+export { DEFAULT_LANGUAGE_CODE, DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT, type ILanguageInfo, LANGUAGES, MAX_PASSWORD_LENGTH, MAX_WORD_COUNT, MIN_PASSWORD_LENGTH, MIN_WORD_COUNT, getLanguageInfo, matchAvailableLanguage, normalizeLanguageCode, resolveDefaultLanguage };
diff --git a/apps/browser-extension/src/utils/dist/core/models/defaults/index.js b/apps/browser-extension/src/utils/dist/core/models/defaults/index.js
index cc870c2f8..9c2b09b1e 100644
--- a/apps/browser-extension/src/utils/dist/core/models/defaults/index.js
+++ b/apps/browser-extension/src/utils/dist/core/models/defaults/index.js
@@ -13,24 +13,24 @@ var MAX_WORD_COUNT = 10;
 // src/defaults/Languages.ts
 var DEFAULT_LANGUAGE_CODE = "en";
 var LANGUAGES = [
-  { code: "en", flag: "\u{1F1FA}\u{1F1F8}", label: "English" },
-  { code: "nl", flag: "\u{1F1F3}\u{1F1F1}", label: "Nederlands" },
-  { code: "de", flag: "\u{1F1E9}\u{1F1EA}", label: "Deutsch" },
-  { code: "fr", flag: "\u{1F1EB}\u{1F1F7}", label: "Fran\xE7ais" },
-  { code: "es", flag: "\u{1F1EA}\u{1F1F8}", label: "Espa\xF1ol" },
-  { code: "it", flag: "\u{1F1EE}\u{1F1F9}", label: "Italiano" },
-  { code: "da", flag: "\u{1F1E9}\u{1F1F0}", label: "Dansk" },
-  { code: "fi", flag: "\u{1F1EB}\u{1F1EE}", label: "Suomi" },
-  { code: "he", flag: "\u{1F1EE}\u{1F1F1}", label: "\u05E2\u05D1\u05E8\u05D9\u05EA" },
-  { code: "pl", flag: "\u{1F1F5}\u{1F1F1}", label: "Polski" },
-  { code: "pt", flag: "\u{1F1E7}\u{1F1F7}", label: "Portugu\xEAs Brasileiro" },
-  { code: "ro", flag: "\u{1F1F7}\u{1F1F4}", label: "Rom\xE2n\u0103" },
-  { code: "ru", flag: "\u{1F1F7}\u{1F1FA}", label: "\u0420\u0443\u0441\u0441\u043A\u0438\u0439" },
-  { code: "sv", flag: "\u{1F1F8}\u{1F1EA}", label: "Svenska" },
-  { code: "uk", flag: "\u{1F1FA}\u{1F1E6}", label: "\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430" },
-  { code: "zh", flag: "\u{1F1E8}\u{1F1F3}", label: "\u7B80\u4F53\u4E2D\u6587" },
-  { code: "ur", flag: "\u{1F1F5}\u{1F1F0}", label: "\u0627\u0631\u062F\u0648" },
-  { code: "fa", flag: "\u{1F1EE}\u{1F1F7}", label: "\u0641\u0627\u0631\u0633\u06CC" }
+  { code: "en", flag: "\u{1F1FA}\u{1F1F8}", label: "English", alternativeCodes: ["en-US", "en-GB", "en-CA", "en-AU", "en-NZ", "en-IE", "en-ZA", "en-SG", "en-IN"] },
+  { code: "nl", flag: "\u{1F1F3}\u{1F1F1}", label: "Nederlands", alternativeCodes: ["nl-NL", "nl-BE"] },
+  { code: "de", flag: "\u{1F1E9}\u{1F1EA}", label: "Deutsch", alternativeCodes: ["de-DE", "de-AT", "de-CH", "de-LU", "de-LI"] },
+  { code: "fr", flag: "\u{1F1EB}\u{1F1F7}", label: "Fran\xE7ais", alternativeCodes: ["fr-FR", "fr-CA", "fr-BE", "fr-CH", "fr-LU", "fr-MC"] },
+  { code: "es", flag: "\u{1F1EA}\u{1F1F8}", label: "Espa\xF1ol", alternativeCodes: ["es-ES", "es-MX", "es-AR", "es-CO", "es-CL", "es-PE", "es-VE", "es-EC", "es-GT", "es-CU", "es-BO", "es-DO", "es-HN", "es-PY", "es-SV", "es-NI", "es-CR", "es-PA", "es-UY", "es-PR"] },
+  { code: "it", flag: "\u{1F1EE}\u{1F1F9}", label: "Italiano", alternativeCodes: ["it-IT", "it-CH", "it-SM", "it-VA"] },
+  { code: "da", flag: "\u{1F1E9}\u{1F1F0}", label: "Dansk", alternativeCodes: ["da-DK"] },
+  { code: "fi", flag: "\u{1F1EB}\u{1F1EE}", label: "Suomi", alternativeCodes: ["fi-FI"] },
+  { code: "he", flag: "\u{1F1EE}\u{1F1F1}", label: "\u05E2\u05D1\u05E8\u05D9\u05EA", alternativeCodes: ["he-IL"] },
+  { code: "pl", flag: "\u{1F1F5}\u{1F1F1}", label: "Polski", alternativeCodes: ["pl-PL"] },
+  { code: "pt", flag: "\u{1F1E7}\u{1F1F7}", label: "Portugu\xEAs Brasileiro", alternativeCodes: ["pt-BR", "pt-PT"] },
+  { code: "ro", flag: "\u{1F1F7}\u{1F1F4}", label: "Rom\xE2n\u0103", alternativeCodes: ["ro-RO", "ro-MD"] },
+  { code: "ru", flag: "\u{1F1F7}\u{1F1FA}", label: "\u0420\u0443\u0441\u0441\u043A\u0438\u0439", alternativeCodes: ["ru-RU", "ru-BY", "ru-KZ", "ru-UA"] },
+  { code: "sv", flag: "\u{1F1F8}\u{1F1EA}", label: "Svenska", alternativeCodes: ["sv-SE", "sv-FI"] },
+  { code: "uk", flag: "\u{1F1FA}\u{1F1E6}", label: "\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430", alternativeCodes: ["uk-UA"] },
+  { code: "zh", flag: "\u{1F1E8}\u{1F1F3}", label: "\u7B80\u4F53\u4E2D\u6587", alternativeCodes: ["zh-CN", "zh-SG", "zh-Hans", "zh-TW", "zh-HK", "zh-MO", "zh-Hant"] },
+  { code: "ur", flag: "\u{1F1F5}\u{1F1F0}", label: "\u0627\u0631\u062F\u0648", alternativeCodes: ["ur-PK", "ur-IN"] },
+  { code: "fa", flag: "\u{1F1EE}\u{1F1F7}", label: "\u0641\u0627\u0631\u0633\u06CC", alternativeCodes: ["fa-IR", "fa-AF"] }
 ];
 function normalizeLanguageCode(code) {
   return (code ?? "").slice(0, 2).toLowerCase();
@@ -40,12 +40,31 @@ function getLanguageInfo(code) {
   const match = LANGUAGES.find((l) => l.code === iso);
   return match ?? { code, flag: "\u{1F310}", label: code };
 }
-function resolveDefaultLanguage(appLanguage, availableCodes) {
-  const iso = normalizeLanguageCode(appLanguage);
-  if (availableCodes.some((c) => c.toLowerCase() === iso)) {
-    return iso;
+function matchAvailableLanguage(appLanguage, availableCodes) {
+  if (!appLanguage) {
+    return null;
   }
-  return availableCodes[0] ?? DEFAULT_LANGUAGE_CODE;
+  const lower = appLanguage.toLowerCase();
+  const exact = availableCodes.find((c) => c.toLowerCase() === lower);
+  if (exact) {
+    return exact;
+  }
+  const altEntry = LANGUAGES.find((l) => l.alternativeCodes?.some((ac) => ac.toLowerCase() === lower));
+  if (altEntry) {
+    const altMatch = availableCodes.find((c) => c.toLowerCase() === altEntry.code.toLowerCase());
+    if (altMatch) {
+      return altMatch;
+    }
+  }
+  const base = normalizeLanguageCode(appLanguage);
+  const baseMatch = availableCodes.find((c) => c.toLowerCase() === base);
+  if (baseMatch) {
+    return baseMatch;
+  }
+  return null;
+}
+function resolveDefaultLanguage(appLanguage, availableCodes) {
+  return matchAvailableLanguage(appLanguage, availableCodes) ?? availableCodes[0] ?? DEFAULT_LANGUAGE_CODE;
 }
 
-export { DEFAULT_LANGUAGE_CODE, DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT, LANGUAGES, MAX_PASSWORD_LENGTH, MAX_WORD_COUNT, MIN_PASSWORD_LENGTH, MIN_WORD_COUNT, getLanguageInfo, normalizeLanguageCode, resolveDefaultLanguage };
+export { DEFAULT_LANGUAGE_CODE, DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT, LANGUAGES, MAX_PASSWORD_LENGTH, MAX_WORD_COUNT, MIN_PASSWORD_LENGTH, MIN_WORD_COUNT, getLanguageInfo, matchAvailableLanguage, normalizeLanguageCode, resolveDefaultLanguage };
diff --git a/apps/mobile-app/utils/SqliteClient.ts b/apps/mobile-app/utils/SqliteClient.ts
index d4d595eed..0f7d34b4c 100644
--- a/apps/mobile-app/utils/SqliteClient.ts
+++ b/apps/mobile-app/utils/SqliteClient.ts
@@ -339,12 +339,14 @@ class SqliteClient implements IDatabaseClient {
       return explicitLanguage;
     }
 
-    // Otherwise, try to match UI language to an identity generator language
-    const { mapUiLanguageToIdentityLanguage } = await import('@/utils/dist/core/identity-generator');
+    // Otherwise, match the UI language to one of the identity generator's available languages using
+    // the shared region-variant alternative-code table (e.g. "de-CH" -> "de").
+    const { getAvailableLanguages } = await import('@/utils/dist/core/identity-generator');
+    const { matchAvailableLanguage } = await import('@/utils/dist/core/models/defaults');
     const { default: i18n } = await import('@/i18n');
 
     const uiLanguage = i18n.language;
-    const mappedLanguage = mapUiLanguageToIdentityLanguage(uiLanguage);
+    const mappedLanguage = matchAvailableLanguage(uiLanguage, getAvailableLanguages());
 
     // Return the mapped language, or fall back to "en" if no match found
     return mappedLanguage ?? 'en';
diff --git a/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor b/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
index e781fb7b7..ea85008e6 100644
--- a/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
@@ -97,7 +97,7 @@
                         <div>
                             <label for="diceware-language" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">@Localizer["LanguageLabel"]</label>
                             <select id="diceware-language" class="w-full px-3 py-2 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md text-gray-900 dark:text-white focus:ring-primary-500 focus:border-primary-500"
-                                @bind="_workingSettings.Language" @bind:after="OnSettingChanged">
+                                @bind="SelectedLanguage" @bind:after="OnSettingChanged">
                                 @foreach (var language in _dicewareLanguages)
                                 {
                                     <option value="@language">@Languages.GetDisplayLabel(language)</option>
@@ -194,11 +194,27 @@
     /// </summary>
     private List<string> _dicewareLanguages = [Languages.DefaultLanguageCode];
 
+    /// <summary>
+    /// The passphrase language shown when none is explicitly chosen ("auto"): the most appropriate
+    /// available wordlist for the current app language.
+    /// </summary>
+    private string _effectiveLanguage = Languages.DefaultLanguageCode;
+
     /// <summary>
     /// Gets a value indicating whether the Diceware generator is currently selected.
     /// </summary>
     private bool IsDiceware => _workingSettings.Type == "diceware";
 
+    /// <summary>
+    /// Gets or sets the selected passphrase language for the dropdown. When the user has not made an
+    /// explicit choice the resolved "auto" language is shown.
+    /// </summary>
+    private string SelectedLanguage
+    {
+        get => string.IsNullOrEmpty(_workingSettings.Language) ? _effectiveLanguage : _workingSettings.Language;
+        set => _workingSettings.Language = value;
+    }
+
     /// <inheritdoc />
     protected override async Task OnInitializedAsync()
     {
@@ -228,6 +244,10 @@
         // Load the Diceware wordlist languages available from the Rust core for the language picker.
         _dicewareLanguages = (await RustCoreService.GetDicewareLanguagesAsync()).ToList();
 
+        // Resolve the "auto" language shown when the user has not picked one explicitly. Uses the same
+        // app language + shared resolver as the Rust core, so the dropdown matches the generated preview.
+        _effectiveLanguage = Languages.ResolveDefaultLanguage(CultureInfo.CurrentCulture.Name, _dicewareLanguages);
+
         await RefreshPreview(false);
     }
 
diff --git a/apps/server/AliasVault.Client/Main/Models/Languages.cs b/apps/server/AliasVault.Client/Main/Models/Languages.cs
index 7c69d6dc2..51cd03376 100644
--- a/apps/server/AliasVault.Client/Main/Models/Languages.cs
+++ b/apps/server/AliasVault.Client/Main/Models/Languages.cs
@@ -9,7 +9,7 @@ namespace AliasVault.Client.Main.Models;
 
 /// <summary>
 /// Generic language reference shared across all AliasVault clients: maps a two-letter ISO 639-1
-/// code to a flag and native label.
+/// code to a flag, native label, and the region-variant locale codes that map onto it.
 /// </summary>
 public static class Languages
 {
@@ -19,28 +19,29 @@ public static class Languages
     public const string DefaultLanguageCode = "en";
 
     /// <summary>
-    /// Known languages keyed by ISO 639-1 code, with a flag and native label.
+    /// Known languages keyed by ISO 639-1 code, with a flag, native label, and the BCP-47
+    /// region-variant locale codes (e.g. "en-US", "en-GB") that resolve onto the code.
     /// </summary>
-    private static readonly (string Code, string Flag, string Label)[] Meta =
+    private static readonly (string Code, string Flag, string Label, string[] AlternativeCodes)[] Meta =
     [
-        ("en", "🇺🇸", "English"),
-        ("nl", "🇳🇱", "Nederlands"),
-        ("de", "🇩🇪", "Deutsch"),
-        ("fr", "🇫🇷", "Français"),
-        ("es", "🇪🇸", "Español"),
-        ("it", "🇮🇹", "Italiano"),
-        ("da", "🇩🇰", "Dansk"),
-        ("fi", "🇫🇮", "Suomi"),
-        ("he", "🇮🇱", "עברית"),
-        ("pl", "🇵🇱", "Polski"),
-        ("pt", "🇧🇷", "Português Brasileiro"),
-        ("ro", "🇷🇴", "Română"),
-        ("ru", "🇷🇺", "Русский"),
-        ("sv", "🇸🇪", "Svenska"),
-        ("uk", "🇺🇦", "Українська"),
-        ("zh", "🇨🇳", "简体中文"),
-        ("ur", "🇵🇰", "اردو"),
-        ("fa", "🇮🇷", "فارسی"),
+        ("en", "🇺🇸", "English", ["en-US", "en-GB", "en-CA", "en-AU", "en-NZ", "en-IE", "en-ZA", "en-SG", "en-IN"]),
+        ("nl", "🇳🇱", "Nederlands", ["nl-NL", "nl-BE"]),
+        ("de", "🇩🇪", "Deutsch", ["de-DE", "de-AT", "de-CH", "de-LU", "de-LI"]),
+        ("fr", "🇫🇷", "Français", ["fr-FR", "fr-CA", "fr-BE", "fr-CH", "fr-LU", "fr-MC"]),
+        ("es", "🇪🇸", "Español", ["es-ES", "es-MX", "es-AR", "es-CO", "es-CL", "es-PE", "es-VE", "es-EC", "es-GT", "es-CU", "es-BO", "es-DO", "es-HN", "es-PY", "es-SV", "es-NI", "es-CR", "es-PA", "es-UY", "es-PR"]),
+        ("it", "🇮🇹", "Italiano", ["it-IT", "it-CH", "it-SM", "it-VA"]),
+        ("da", "🇩🇰", "Dansk", ["da-DK"]),
+        ("fi", "🇫🇮", "Suomi", ["fi-FI"]),
+        ("he", "🇮🇱", "עברית", ["he-IL"]),
+        ("pl", "🇵🇱", "Polski", ["pl-PL"]),
+        ("pt", "🇧🇷", "Português Brasileiro", ["pt-BR", "pt-PT"]),
+        ("ro", "🇷🇴", "Română", ["ro-RO", "ro-MD"]),
+        ("ru", "🇷🇺", "Русский", ["ru-RU", "ru-BY", "ru-KZ", "ru-UA"]),
+        ("sv", "🇸🇪", "Svenska", ["sv-SE", "sv-FI"]),
+        ("uk", "🇺🇦", "Українська", ["uk-UA"]),
+        ("zh", "🇨🇳", "简体中文", ["zh-CN", "zh-SG", "zh-Hans", "zh-TW", "zh-HK", "zh-MO", "zh-Hant"]),
+        ("ur", "🇵🇰", "اردو", ["ur-PK", "ur-IN"]),
+        ("fa", "🇮🇷", "فارسی", ["fa-IR", "fa-AF"]),
     ];
 
     /// <summary>
@@ -63,7 +64,7 @@ public static class Languages
     public static string GetDisplayLabel(string code)
     {
         var iso = Normalize(code);
-        foreach (var (metaCode, flag, label) in Meta)
+        foreach (var (metaCode, flag, label, _) in Meta)
         {
             if (metaCode == iso)
             {
@@ -82,7 +83,7 @@ public static class Languages
     public static string GetFlag(string code)
     {
         var iso = Normalize(code);
-        foreach (var (metaCode, flag, _) in Meta)
+        foreach (var (metaCode, flag, _, _) in Meta)
         {
             if (metaCode == iso)
             {
@@ -102,7 +103,7 @@ public static class Languages
     public static string GetLabel(string code)
     {
         var iso = Normalize(code);
-        foreach (var (metaCode, _, label) in Meta)
+        foreach (var (metaCode, _, label, _) in Meta)
         {
             if (metaCode == iso)
             {
@@ -113,25 +114,83 @@ public static class Languages
         return code;
     }
 
+    /// <summary>
+    /// Match an app/UI/browser locale to one of a feature's available ISO codes, using the
+    /// region-variant alternative codes (e.g. "en-GB" -> "en", "de-CH" -> "de"). Matching order:
+    /// exact match against an available code, then the alternative-code table, then the base
+    /// language code. Returns null when nothing matches, so callers can decide their own fallback.
+    /// </summary>
+    /// <param name="appLanguage">The app/UI/browser language tag (e.g. "en", "en-US", "nl-BE").</param>
+    /// <param name="availableCodes">The codes the feature actually supports.</param>
+    /// <returns>The matching available code or null if none matched.</returns>
+    public static string? MatchAvailableLanguage(string? appLanguage, System.Collections.Generic.IReadOnlyList<string> availableCodes)
+    {
+        if (string.IsNullOrEmpty(appLanguage))
+        {
+            return null;
+        }
+
+        var lower = appLanguage.ToLowerInvariant();
+
+        // 1. Exact match against an available code.
+        foreach (var code in availableCodes)
+        {
+            if (string.Equals(code, lower, System.StringComparison.OrdinalIgnoreCase))
+            {
+                return code;
+            }
+        }
+
+        // 2. Alternative-code match: find the language whose region variants include this tag, then
+        //    return its base code if the feature supports it.
+        foreach (var (metaCode, _, _, alternativeCodes) in Meta)
+        {
+            var isAlternative = false;
+            foreach (var alt in alternativeCodes)
+            {
+                if (string.Equals(alt, lower, System.StringComparison.OrdinalIgnoreCase))
+                {
+                    isAlternative = true;
+                    break;
+                }
+            }
+
+            if (isAlternative)
+            {
+                foreach (var code in availableCodes)
+                {
+                    if (string.Equals(code, metaCode, System.StringComparison.OrdinalIgnoreCase))
+                    {
+                        return code;
+                    }
+                }
+            }
+        }
+
+        // 3. Base language code match (e.g. an unlisted "en-ZZ" still resolves to "en").
+        var baseCode = Normalize(appLanguage);
+        foreach (var code in availableCodes)
+        {
+            if (string.Equals(code, baseCode, System.StringComparison.OrdinalIgnoreCase))
+            {
+                return code;
+            }
+        }
+
+        return null;
+    }
+
     /// <summary>
     /// Resolve a default language code for an app/UI language, restricted to a set of available
-    /// codes. Returns the app language when available, otherwise the first available code,
-    /// otherwise English.
+    /// codes. Uses <see cref="MatchAvailableLanguage"/> (region-variant aware), then falls back to
+    /// the first available code, otherwise English.
     /// </summary>
     /// <param name="appLanguage">The app/UI language tag.</param>
     /// <param name="availableCodes">The codes the feature actually supports.</param>
     /// <returns>The resolved ISO code.</returns>
     public static string ResolveDefaultLanguage(string? appLanguage, System.Collections.Generic.IReadOnlyList<string> availableCodes)
     {
-        var iso = Normalize(appLanguage);
-        foreach (var code in availableCodes)
-        {
-            if (string.Equals(code, iso, System.StringComparison.OrdinalIgnoreCase))
-            {
-                return iso;
-            }
-        }
-
-        return availableCodes.Count > 0 ? availableCodes[0] : DefaultLanguageCode;
+        return MatchAvailableLanguage(appLanguage, availableCodes)
+            ?? (availableCodes.Count > 0 ? availableCodes[0] : DefaultLanguageCode);
     }
 }
diff --git a/apps/server/AliasVault.Client/Main/Models/PasswordSettings.cs b/apps/server/AliasVault.Client/Main/Models/PasswordSettings.cs
index 077c9ba6f..9119ccb1e 100644
--- a/apps/server/AliasVault.Client/Main/Models/PasswordSettings.cs
+++ b/apps/server/AliasVault.Client/Main/Models/PasswordSettings.cs
@@ -64,10 +64,11 @@ public class PasswordSettings
     public int WordCount { get; set; } = PasswordGeneratorDefaults.DefaultWordCount;
 
     /// <summary>
-    /// Gets or sets the Diceware wordlist language. Unknown languages fall back to English in the Rust core.
+    /// Gets or sets the Diceware wordlist language. Empty means "auto": the most appropriate available
+    /// wordlist is resolved from the app language at runtime.
     /// </summary>
     [JsonPropertyName("Language")]
-    public string Language { get; set; } = "en";
+    public string Language { get; set; } = string.Empty;
 
     /// <summary>
     /// Gets or sets the Diceware capitalization ("None", "TitleCase", "Uppercase", "Lowercase" or "Random").
diff --git a/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs b/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs
index b938f8c81..ca926fb6e 100644
--- a/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs
@@ -503,8 +503,13 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)
                 await InitializeAsync();
             }
 
-            var result = await _identityGeneratorModule!.InvokeAsync<string?>("mapUiLanguageToIdentityLanguage", uiLanguageCode);
-            return result;
+            var codes = await _identityGeneratorModule!.InvokeAsync<List<string>>("getAvailableLanguages");
+            if (codes == null || codes.Count == 0)
+            {
+                return null;
+            }
+
+            return Languages.MatchAvailableLanguage(uiLanguageCode, codes);
         }
         catch (JSException ex)
         {
diff --git a/apps/server/AliasVault.Client/Services/JsInterop/RustCore/RustCoreService.cs b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/RustCoreService.cs
index 4fec203b8..5b3eea5d7 100644
--- a/apps/server/AliasVault.Client/Services/JsInterop/RustCore/RustCoreService.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/RustCore/RustCoreService.cs
@@ -372,6 +372,17 @@ public class RustCoreService : IAsyncDisposable
             node["Seed"] = seed;
         }
 
+        // Resolve the effective passphrase language when none is explicitly chosen ("auto"). Pick the
+        // most appropriate available Diceware wordlist for the current app language using the shared
+        // region-variant table (e.g. "de-CH" -> "de"), falling back to English.
+        if (string.Equals(settings.Type, "diceware", StringComparison.OrdinalIgnoreCase)
+            && string.IsNullOrWhiteSpace(settings.Language))
+        {
+            var codes = await GetDicewareLanguagesAsync();
+            var appLanguage = System.Globalization.CultureInfo.CurrentCulture.Name;
+            node["Language"] = Languages.ResolveDefaultLanguage(appLanguage, codes);
+        }
+
         return await jsRuntime.InvokeAsync<string>("rustCoreGeneratePassword", node.ToJsonString());
     }
 
diff --git a/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.d.ts b/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.d.ts
index 0622ddd0d..2e6235283 100644
--- a/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.d.ts
+++ b/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.d.ts
@@ -399,20 +399,6 @@ declare function convertAgeRangeToBirthdateOptions(ageRange: string): IBirthdate
  * @returns Array of ISO language codes (e.g. ["da", "de", "en", ...]).
  */
 declare function getAvailableLanguages(): string[];
-/**
- * Maps a UI language code to an identity generator language code.
- * If no explicit match is found, returns null to indicate no preference.
- *
- * @param uiLanguageCode - The UI language code (e.g., "en", "en-US", "nl-NL", "de-DE", "fr")
- * @returns The matching identity generator language code or null if no match
- *
- * @example
- * mapUiLanguageToIdentityLanguage("en-US") // returns "en"
- * mapUiLanguageToIdentityLanguage("nl") // returns "nl"
- * mapUiLanguageToIdentityLanguage("de-CH") // returns "de"
- * mapUiLanguageToIdentityLanguage("ja") // returns null (no Japanese identity generator)
- */
-declare function mapUiLanguageToIdentityLanguage(uiLanguageCode: string | null | undefined): string | null;
 
 /**
  * Creates a new identity generator based on the language.
@@ -429,4 +415,4 @@ declare const CreateIdentityGenerator: (language: string) => IdentityGenerator;
  */
 declare const CreateUsernameEmailGenerator: () => UsernameEmailGenerator;
 
-export { CreateIdentityGenerator, CreateUsernameEmailGenerator, Gender, type IAgeRangeOption, type IBirthdateOptions, type IDecadeFirstnames, type IIdentityGenerator, type Identity, IdentityGenerator, IdentityGeneratorDa, IdentityGeneratorDe, IdentityGeneratorEn, IdentityGeneratorEs, IdentityGeneratorFa, IdentityGeneratorFr, IdentityGeneratorIt, IdentityGeneratorNl, IdentityGeneratorRo, IdentityGeneratorSv, IdentityGeneratorUr, IdentityHelperUtils, UsernameEmailGenerator, convertAgeRangeToBirthdateOptions, getAvailableAgeRanges, getAvailableLanguages, mapUiLanguageToIdentityLanguage };
+export { CreateIdentityGenerator, CreateUsernameEmailGenerator, Gender, type IAgeRangeOption, type IBirthdateOptions, type IDecadeFirstnames, type IIdentityGenerator, type Identity, IdentityGenerator, IdentityGeneratorDa, IdentityGeneratorDe, IdentityGeneratorEn, IdentityGeneratorEs, IdentityGeneratorFa, IdentityGeneratorFr, IdentityGeneratorIt, IdentityGeneratorNl, IdentityGeneratorRo, IdentityGeneratorSv, IdentityGeneratorUr, IdentityHelperUtils, UsernameEmailGenerator, convertAgeRangeToBirthdateOptions, getAvailableAgeRanges, getAvailableLanguages };
diff --git a/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.js b/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.js
index a4f3c5090..41780e57d 100644
--- a/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.js
+++ b/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.js
@@ -42,8 +42,7 @@ __export(index_exports, {
   UsernameEmailGenerator: () => UsernameEmailGenerator,
   convertAgeRangeToBirthdateOptions: () => convertAgeRangeToBirthdateOptions,
   getAvailableAgeRanges: () => getAvailableAgeRanges,
-  getAvailableLanguages: () => getAvailableLanguages,
-  mapUiLanguageToIdentityLanguage: () => mapUiLanguageToIdentityLanguage
+  getAvailableLanguages: () => getAvailableLanguages
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -11763,43 +11762,21 @@ function convertAgeRangeToBirthdateOptions(ageRange) {
 }
 
 // src/utils/LanguageProvider.ts
-var LANGUAGE_DEFS = [
-  { value: "da", alternativeCodes: ["da-DK"] },
-  { value: "de", alternativeCodes: ["de-DE", "de-AT", "de-CH", "de-LU", "de-LI"] },
-  { value: "en", alternativeCodes: ["en-US", "en-GB", "en-CA", "en-AU", "en-NZ", "en-IE", "en-ZA", "en-SG", "en-IN"] },
-  { value: "es", alternativeCodes: ["es-ES", "es-MX", "es-AR", "es-CO", "es-CL", "es-PE", "es-VE", "es-EC", "es-GT", "es-CU", "es-BO", "es-DO", "es-HN", "es-PY", "es-SV", "es-NI", "es-CR", "es-PA", "es-UY", "es-PR"] },
-  { value: "fr", alternativeCodes: ["fr-FR", "fr-CA", "fr-BE", "fr-CH", "fr-LU", "fr-MC"] },
-  { value: "it", alternativeCodes: ["it-IT", "it-CH", "it-SM", "it-VA"] },
-  { value: "nl", alternativeCodes: ["nl-NL", "nl-BE"] },
-  { value: "ro", alternativeCodes: ["ro-RO", "ro-MD"] },
-  { value: "sv", alternativeCodes: ["sv-SE", "sv-FI"] },
-  { value: "ur", alternativeCodes: ["ur-PK", "ur-IN"] },
-  { value: "fa", alternativeCodes: ["fa-IR", "fa-AF"] }
+var SUPPORTED_LANGUAGE_CODES = [
+  "da",
+  "de",
+  "en",
+  "es",
+  "fr",
+  "it",
+  "nl",
+  "ro",
+  "sv",
+  "ur",
+  "fa"
 ];
 function getAvailableLanguages() {
-  return LANGUAGE_DEFS.map((lang) => lang.value);
-}
-function mapUiLanguageToIdentityLanguage(uiLanguageCode) {
-  if (!uiLanguageCode) {
-    return null;
-  }
-  const normalizedCode = uiLanguageCode.toLowerCase();
-  const exactMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === normalizedCode);
-  if (exactMatch) {
-    return exactMatch.value;
-  }
-  const alternativeMatch = LANGUAGE_DEFS.find(
-    (lang) => lang.alternativeCodes?.some((code) => code.toLowerCase() === normalizedCode)
-  );
-  if (alternativeMatch) {
-    return alternativeMatch.value;
-  }
-  const baseCode = normalizedCode.split("-")[0];
-  const baseMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === baseCode);
-  if (baseMatch) {
-    return baseMatch.value;
-  }
-  return null;
+  return [...SUPPORTED_LANGUAGE_CODES];
 }
 
 // src/factories/IdentityGeneratorFactory.ts
@@ -11858,6 +11835,5 @@ var CreateUsernameEmailGenerator = () => {
   UsernameEmailGenerator,
   convertAgeRangeToBirthdateOptions,
   getAvailableAgeRanges,
-  getAvailableLanguages,
-  mapUiLanguageToIdentityLanguage
+  getAvailableLanguages
 });
diff --git a/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.mjs b/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.mjs
index c19ae5b4e..5d4cb295a 100644
--- a/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.mjs
+++ b/apps/server/AliasVault.Client/wwwroot/js/dist/core/identity-generator/index.mjs
@@ -11718,43 +11718,21 @@ function convertAgeRangeToBirthdateOptions(ageRange) {
 }
 
 // src/utils/LanguageProvider.ts
-var LANGUAGE_DEFS = [
-  { value: "da", alternativeCodes: ["da-DK"] },
-  { value: "de", alternativeCodes: ["de-DE", "de-AT", "de-CH", "de-LU", "de-LI"] },
-  { value: "en", alternativeCodes: ["en-US", "en-GB", "en-CA", "en-AU", "en-NZ", "en-IE", "en-ZA", "en-SG", "en-IN"] },
-  { value: "es", alternativeCodes: ["es-ES", "es-MX", "es-AR", "es-CO", "es-CL", "es-PE", "es-VE", "es-EC", "es-GT", "es-CU", "es-BO", "es-DO", "es-HN", "es-PY", "es-SV", "es-NI", "es-CR", "es-PA", "es-UY", "es-PR"] },
-  { value: "fr", alternativeCodes: ["fr-FR", "fr-CA", "fr-BE", "fr-CH", "fr-LU", "fr-MC"] },
-  { value: "it", alternativeCodes: ["it-IT", "it-CH", "it-SM", "it-VA"] },
-  { value: "nl", alternativeCodes: ["nl-NL", "nl-BE"] },
-  { value: "ro", alternativeCodes: ["ro-RO", "ro-MD"] },
-  { value: "sv", alternativeCodes: ["sv-SE", "sv-FI"] },
-  { value: "ur", alternativeCodes: ["ur-PK", "ur-IN"] },
-  { value: "fa", alternativeCodes: ["fa-IR", "fa-AF"] }
+var SUPPORTED_LANGUAGE_CODES = [
+  "da",
+  "de",
+  "en",
+  "es",
+  "fr",
+  "it",
+  "nl",
+  "ro",
+  "sv",
+  "ur",
+  "fa"
 ];
 function getAvailableLanguages() {
-  return LANGUAGE_DEFS.map((lang) => lang.value);
-}
-function mapUiLanguageToIdentityLanguage(uiLanguageCode) {
-  if (!uiLanguageCode) {
-    return null;
-  }
-  const normalizedCode = uiLanguageCode.toLowerCase();
-  const exactMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === normalizedCode);
-  if (exactMatch) {
-    return exactMatch.value;
-  }
-  const alternativeMatch = LANGUAGE_DEFS.find(
-    (lang) => lang.alternativeCodes?.some((code) => code.toLowerCase() === normalizedCode)
-  );
-  if (alternativeMatch) {
-    return alternativeMatch.value;
-  }
-  const baseCode = normalizedCode.split("-")[0];
-  const baseMatch = LANGUAGE_DEFS.find((lang) => lang.value.toLowerCase() === baseCode);
-  if (baseMatch) {
-    return baseMatch.value;
-  }
-  return null;
+  return [...SUPPORTED_LANGUAGE_CODES];
 }
 
 // src/factories/IdentityGeneratorFactory.ts
@@ -11812,6 +11790,5 @@ export {
   UsernameEmailGenerator,
   convertAgeRangeToBirthdateOptions,
   getAvailableAgeRanges,
-  getAvailableLanguages,
-  mapUiLanguageToIdentityLanguage
+  getAvailableLanguages
 };
diff --git a/core/models/build.sh b/core/models/build.sh
index b3afdcd56..cdd9261f5 100755
--- a/core/models/build.sh
+++ b/core/models/build.sh
@@ -14,7 +14,7 @@ package_name="models"
 package_path="."
 
 echo "📦 Building $package_name..."
-npm install && npm run lint && npm run build
+npm install && npm run lint && npm run test && npm run build
 
 echo ""
 echo "🔄 Generating platform-specific models (C#, Swift, Kotlin)..."
diff --git a/core/models/package-lock.json b/core/models/package-lock.json
index 063e8c038..bc87e2617 100644
--- a/core/models/package-lock.json
+++ b/core/models/package-lock.json
@@ -13,7 +13,42 @@
                 "@typescript-eslint/parser": "^8.21.0",
                 "eslint": "^9.19.0",
                 "tsup": "^8.4.0",
-                "typescript": "^5.3.3"
+                "typescript": "^5.3.3",
+                "vitest": "^4.1.8"
+            }
+        },
+        "node_modules/@emnapi/core": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz",
+            "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/wasi-threads": "1.2.2",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@emnapi/runtime": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz",
+            "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@emnapi/wasi-threads": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
+            "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
             }
         },
         "node_modules/@esbuild/aix-ppc64": {
@@ -734,9 +769,9 @@
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
             "dev": true,
             "license": "MIT"
         },
@@ -751,6 +786,25 @@
                 "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
+        "node_modules/@napi-rs/wasm-runtime": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
+            "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@tybys/wasm-util": "^0.10.3"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/Brooooooklyn"
+            },
+            "peerDependencies": {
+                "@emnapi/core": "^1.7.1",
+                "@emnapi/runtime": "^1.7.1"
+            }
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -789,6 +843,16 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/@oxc-project/types": {
+            "version": "0.137.0",
+            "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.137.0.tgz",
+            "integrity": "sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/Boshen"
+            }
+        },
         "node_modules/@pkgjs/parseargs": {
             "version": "0.11.0",
             "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -800,6 +864,288 @@
                 "node": ">=14"
             }
         },
+        "node_modules/@rolldown/binding-android-arm64": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.3.tgz",
+            "integrity": "sha512-DT6Z3PhvioeHMvxo+xHc3KtqggrI7CCTXCmC2h/5zUlp5jVitv7XEy+9q5/7v8IolhlioawpMo8Kg0EEBy7J0g==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-darwin-arm64": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.3.tgz",
+            "integrity": "sha512-0NwgwsjM7LrsuVnXMK3koTpagBNOhloc/BNjKqZjv4V5zI5r13qx69uVhRx+o5Z0yy4Hzq+lpy7TAgUG/ocvrw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-darwin-x64": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.3.tgz",
+            "integrity": "sha512-YtiBp4disu6V560loT6PjMdiRaWmVvDNrUunAalbiFx2ggeJwxdAsgZMcoGP17uyAsTwAj5V1niksxlHnVQ1Sw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-freebsd-x64": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.3.tgz",
+            "integrity": "sha512-yD3EkEdXk2LypPxnf/kSZHirarsI8gcPzc62SukhR9VJTyvV+F9Q/GxWNuCojc7sXyuVC4DxRGhdDK4X8VSsbw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.3.tgz",
+            "integrity": "sha512-c+8vieQbsD7HNAHKIA34w0GJ9FedFFuJGD+7E6vz7Q3uqAIugL5p45fhlsj4UaAsHpcmlqugBWMhA0/j7o0sIg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-linux-arm64-gnu": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.3.tgz",
+            "integrity": "sha512-50jD0uUwLvur7Zz9LHz17kaAdTPjn5wN93hEgjvmYFRZwiR7ZJYovTd5ipyWJDAnXKvZ+wgc+/Ika6dwSF5OcA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-linux-arm64-musl": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.3.tgz",
+            "integrity": "sha512-BO9+oPL8K9poZJBfYPsXNtYjPE5uM3qeehT3aFcW4LITOl+iSqhp0abzjR2nWBUNjIZeKXjAEWBZ64WjNoHd6w==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "libc": [
+                "musl"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-linux-ppc64-gnu": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.3.tgz",
+            "integrity": "sha512-f3VpLB1vQ0Eo6ecr/6cekLnvYMFF4YBFoVGkfkvPLq1bAkbAwHYQPZKoAmG6OJyTcxxoC+AvezGx/S1obNC0Mw==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-linux-s390x-gnu": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.3.tgz",
+            "integrity": "sha512-AmurZ26Pqx/RI9N1gzEOCklkKXl927yjfXWUUS0O7Puh8ARM/Ob8qfrD3qnWksScdw6cSrW5PSHE9DyLu7+PtA==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-linux-x64-gnu": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.3.tgz",
+            "integrity": "sha512-JJpqs8bRGITDOdbkNKnlojzBabbOHrqjSvDr0IVsZObE1lBcPjxItUEY9eWIDbxaJ3cGrXPWGfGkIxFijg/URg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-linux-x64-musl": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.3.tgz",
+            "integrity": "sha512-rSJcdjPxzA/by/6/rYs+v+bXU7UjvnbUWz8MJb6kh6+knqB1dCrtHg0uu7C/4haqJvqdkYHQ5IGn+tCH9GLW/g==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "libc": [
+                "musl"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-openharmony-arm64": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.3.tgz",
+            "integrity": "sha512-hQ3/PYkDJICgevvyNcVrihVeqq7k1Pp3VZ9lY+dauAYUJKO+auqApvANhvR1An9BhmqYKvW2Mu1F9u4DXSMLxQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-wasm32-wasi": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.3.tgz",
+            "integrity": "sha512-Elcv/BtML9lXrV6JuKITc/grN2kYV9gjsQpW8Jfw4ioK0TOkjBjye0nnyqQNy9STNaI20lXNaQBRrD5gSgR0Yg==",
+            "cpu": [
+                "wasm32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "1.11.1",
+                "@emnapi/runtime": "1.11.1",
+                "@napi-rs/wasm-runtime": "^1.1.6"
+            },
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-win32-arm64-msvc": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.3.tgz",
+            "integrity": "sha512-2DrEfhluH9yhiaFApmsjsjwrSYbNcY1oFTzYSP1a535jDbV98zCFanA/96TBUd0iDFcxGmw9QRExwGCXz3U+/g==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/binding-win32-x64-msvc": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.3.tgz",
+            "integrity": "sha512-OL4OMk7UPXOeVGGd3qo5zJyPIljf4AFgk5QAkPPS+OoLuOOozhuaQGC18MxVTnw/06q93gShAJzlwnSCY9YtqA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "node_modules/@rolldown/pluginutils": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
+            "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@rollup/rollup-android-arm-eabi": {
             "version": "4.59.0",
             "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz",
@@ -1150,6 +1496,42 @@
                 "win32"
             ]
         },
+        "node_modules/@standard-schema/spec": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+            "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@tybys/wasm-util": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
+            "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@types/chai": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
+            "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/deep-eql": "*",
+                "assertion-error": "^2.0.1"
+            }
+        },
+        "node_modules/@types/deep-eql": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+            "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/estree": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -1357,6 +1739,92 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
+        "node_modules/@vitest/expect": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.9.tgz",
+            "integrity": "sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@standard-schema/spec": "^1.1.0",
+                "@types/chai": "^5.2.2",
+                "@vitest/spy": "4.1.9",
+                "@vitest/utils": "4.1.9",
+                "chai": "^6.2.2",
+                "tinyrainbow": "^3.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            }
+        },
+        "node_modules/@vitest/pretty-format": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.9.tgz",
+            "integrity": "sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tinyrainbow": "^3.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            }
+        },
+        "node_modules/@vitest/runner": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.9.tgz",
+            "integrity": "sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vitest/utils": "4.1.9",
+                "pathe": "^2.0.3"
+            },
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            }
+        },
+        "node_modules/@vitest/snapshot": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.9.tgz",
+            "integrity": "sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vitest/pretty-format": "4.1.9",
+                "@vitest/utils": "4.1.9",
+                "magic-string": "^0.30.21",
+                "pathe": "^2.0.3"
+            },
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            }
+        },
+        "node_modules/@vitest/spy": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.9.tgz",
+            "integrity": "sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            }
+        },
+        "node_modules/@vitest/utils": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.9.tgz",
+            "integrity": "sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vitest/pretty-format": "4.1.9",
+                "convert-source-map": "^2.0.0",
+                "tinyrainbow": "^3.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            }
+        },
         "node_modules/acorn": {
             "version": "8.14.1",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
@@ -1440,6 +1908,16 @@
             "dev": true,
             "license": "Python-2.0"
         },
+        "node_modules/assertion-error": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+            "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/balanced-match": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1506,6 +1984,16 @@
                 "node": ">=6"
             }
         },
+        "node_modules/chai": {
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
+            "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/chalk": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1586,6 +2074,13 @@
                 "node": "^14.18.0 || >=16.10.0"
             }
         },
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -1626,6 +2121,16 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/detect-libc": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+            "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/eastasianwidth": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -1640,6 +2145,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/es-module-lexer": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
+            "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/esbuild": {
             "version": "0.25.3",
             "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz",
@@ -1889,6 +2401,16 @@
                 "node": ">=4.0"
             }
         },
+        "node_modules/estree-walker": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+            "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "^1.0.0"
+            }
+        },
         "node_modules/esutils": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -1899,6 +2421,16 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/expect-type": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz",
+            "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
         "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2301,6 +2833,279 @@
                 "node": ">= 0.8.0"
             }
         },
+        "node_modules/lightningcss": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
+            "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+            "dev": true,
+            "license": "MPL-2.0",
+            "dependencies": {
+                "detect-libc": "^2.0.3"
+            },
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            },
+            "optionalDependencies": {
+                "lightningcss-android-arm64": "1.32.0",
+                "lightningcss-darwin-arm64": "1.32.0",
+                "lightningcss-darwin-x64": "1.32.0",
+                "lightningcss-freebsd-x64": "1.32.0",
+                "lightningcss-linux-arm-gnueabihf": "1.32.0",
+                "lightningcss-linux-arm64-gnu": "1.32.0",
+                "lightningcss-linux-arm64-musl": "1.32.0",
+                "lightningcss-linux-x64-gnu": "1.32.0",
+                "lightningcss-linux-x64-musl": "1.32.0",
+                "lightningcss-win32-arm64-msvc": "1.32.0",
+                "lightningcss-win32-x64-msvc": "1.32.0"
+            }
+        },
+        "node_modules/lightningcss-android-arm64": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
+            "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-arm64": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
+            "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-x64": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
+            "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-freebsd-x64": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
+            "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm-gnueabihf": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
+            "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-gnu": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
+            "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-musl": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
+            "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "libc": [
+                "musl"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-x64-gnu": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
+            "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-x64-musl": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
+            "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "libc": [
+                "musl"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-arm64-msvc": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
+            "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-x64-msvc": {
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
+            "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
         "node_modules/lilconfig": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
@@ -2368,6 +3173,16 @@
             "dev": true,
             "license": "ISC"
         },
+        "node_modules/magic-string": {
+            "version": "0.30.21",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.5.5"
+            }
+        },
         "node_modules/merge2": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -2437,6 +3252,25 @@
                 "thenify-all": "^1.0.0"
             }
         },
+        "node_modules/nanoid": {
+            "version": "3.3.15",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz",
+            "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
         "node_modules/natural-compare": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -2454,6 +3288,20 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/obug": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz",
+            "integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==",
+            "dev": true,
+            "funding": [
+                "https://github.com/sponsors/sxzz",
+                "https://opencollective.com/debug"
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.20.0"
+            }
+        },
         "node_modules/optionator": {
             "version": "0.9.4",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -2561,6 +3409,13 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
+        "node_modules/pathe": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+            "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/picocolors": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -2591,6 +3446,35 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/postcss": {
+            "version": "8.5.16",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.16.tgz",
+            "integrity": "sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "nanoid": "^3.3.12",
+                "picocolors": "^1.1.1",
+                "source-map-js": "^1.2.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
         "node_modules/postcss-load-config": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz",
@@ -2710,6 +3594,40 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/rolldown": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.3.tgz",
+            "integrity": "sha512-1F1eEtUBtFvcGm1HQ9TiUIUHPQG7mSAODrhIzjxoUEFuo8OcbrGLiVLkevNgj84TE4lnHvnumwFjhJO5Eu135g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@oxc-project/types": "=0.137.0",
+                "@rolldown/pluginutils": "^1.0.0"
+            },
+            "bin": {
+                "rolldown": "bin/cli.mjs"
+            },
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            },
+            "optionalDependencies": {
+                "@rolldown/binding-android-arm64": "1.1.3",
+                "@rolldown/binding-darwin-arm64": "1.1.3",
+                "@rolldown/binding-darwin-x64": "1.1.3",
+                "@rolldown/binding-freebsd-x64": "1.1.3",
+                "@rolldown/binding-linux-arm-gnueabihf": "1.1.3",
+                "@rolldown/binding-linux-arm64-gnu": "1.1.3",
+                "@rolldown/binding-linux-arm64-musl": "1.1.3",
+                "@rolldown/binding-linux-ppc64-gnu": "1.1.3",
+                "@rolldown/binding-linux-s390x-gnu": "1.1.3",
+                "@rolldown/binding-linux-x64-gnu": "1.1.3",
+                "@rolldown/binding-linux-x64-musl": "1.1.3",
+                "@rolldown/binding-openharmony-arm64": "1.1.3",
+                "@rolldown/binding-wasm32-wasi": "1.1.3",
+                "@rolldown/binding-win32-arm64-msvc": "1.1.3",
+                "@rolldown/binding-win32-x64-msvc": "1.1.3"
+            }
+        },
         "node_modules/rollup": {
             "version": "4.59.0",
             "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
@@ -2815,6 +3733,13 @@
                 "node": ">=8"
             }
         },
+        "node_modules/siginfo": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+            "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/signal-exit": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
@@ -2841,6 +3766,30 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/source-map-js": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/stackback": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+            "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/std-env": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz",
+            "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/string-width": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -3017,6 +3966,13 @@
                 "node": ">=0.8"
             }
         },
+        "node_modules/tinybench": {
+            "version": "2.9.0",
+            "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+            "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/tinyexec": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
@@ -3025,14 +3981,14 @@
             "license": "MIT"
         },
         "node_modules/tinyglobby": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-            "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+            "version": "0.2.17",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
+            "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "fdir": "^6.4.4",
-                "picomatch": "^4.0.2"
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.4"
             },
             "engines": {
                 "node": ">=12.0.0"
@@ -3042,11 +3998,14 @@
             }
         },
         "node_modules/tinyglobby/node_modules/fdir": {
-            "version": "6.4.4",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
             "dev": true,
             "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
             "peerDependencies": {
                 "picomatch": "^3 || ^4"
             },
@@ -3069,6 +4028,16 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
+        "node_modules/tinyrainbow": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
+            "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -3122,6 +4091,14 @@
             "dev": true,
             "license": "Apache-2.0"
         },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "dev": true,
+            "license": "0BSD",
+            "optional": true
+        },
         "node_modules/tsup": {
             "version": "8.4.0",
             "resolved": "https://registry.npmjs.org/tsup/-/tsup-8.4.0.tgz",
@@ -3221,6 +4198,224 @@
                 "punycode": "^2.1.0"
             }
         },
+        "node_modules/vitest": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.9.tgz",
+            "integrity": "sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vitest/expect": "4.1.9",
+                "@vitest/mocker": "4.1.9",
+                "@vitest/pretty-format": "4.1.9",
+                "@vitest/runner": "4.1.9",
+                "@vitest/snapshot": "4.1.9",
+                "@vitest/spy": "4.1.9",
+                "@vitest/utils": "4.1.9",
+                "es-module-lexer": "^2.0.0",
+                "expect-type": "^1.3.0",
+                "magic-string": "^0.30.21",
+                "obug": "^2.1.1",
+                "pathe": "^2.0.3",
+                "picomatch": "^4.0.3",
+                "std-env": "^4.0.0-rc.1",
+                "tinybench": "^2.9.0",
+                "tinyexec": "^1.0.2",
+                "tinyglobby": "^0.2.15",
+                "tinyrainbow": "^3.1.0",
+                "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
+                "why-is-node-running": "^2.3.0"
+            },
+            "bin": {
+                "vitest": "vitest.mjs"
+            },
+            "engines": {
+                "node": "^20.0.0 || ^22.0.0 || >=24.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            },
+            "peerDependencies": {
+                "@edge-runtime/vm": "*",
+                "@opentelemetry/api": "^1.9.0",
+                "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
+                "@vitest/browser-playwright": "4.1.9",
+                "@vitest/browser-preview": "4.1.9",
+                "@vitest/browser-webdriverio": "4.1.9",
+                "@vitest/coverage-istanbul": "4.1.9",
+                "@vitest/coverage-v8": "4.1.9",
+                "@vitest/ui": "4.1.9",
+                "happy-dom": "*",
+                "jsdom": "*",
+                "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@edge-runtime/vm": {
+                    "optional": true
+                },
+                "@opentelemetry/api": {
+                    "optional": true
+                },
+                "@types/node": {
+                    "optional": true
+                },
+                "@vitest/browser-playwright": {
+                    "optional": true
+                },
+                "@vitest/browser-preview": {
+                    "optional": true
+                },
+                "@vitest/browser-webdriverio": {
+                    "optional": true
+                },
+                "@vitest/coverage-istanbul": {
+                    "optional": true
+                },
+                "@vitest/coverage-v8": {
+                    "optional": true
+                },
+                "@vitest/ui": {
+                    "optional": true
+                },
+                "happy-dom": {
+                    "optional": true
+                },
+                "jsdom": {
+                    "optional": true
+                },
+                "vite": {
+                    "optional": false
+                }
+            }
+        },
+        "node_modules/vitest/node_modules/@vitest/mocker": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.9.tgz",
+            "integrity": "sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vitest/spy": "4.1.9",
+                "estree-walker": "^3.0.3",
+                "magic-string": "^0.30.21"
+            },
+            "funding": {
+                "url": "https://opencollective.com/vitest"
+            },
+            "peerDependencies": {
+                "msw": "^2.4.9",
+                "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "msw": {
+                    "optional": true
+                },
+                "vite": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vitest/node_modules/picomatch": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/vitest/node_modules/tinyexec": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
+            "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/vitest/node_modules/vite": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.0.tgz",
+            "integrity": "sha512-BuJcQK/56NQTWDGn4ABea3q4SSBdNPWwNZKTkkUpcMPnLoquSYH8llRtSUIgoL1KSCpHt5eghLShn50mH36y7Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "lightningcss": "^1.32.0",
+                "picomatch": "^4.0.4",
+                "postcss": "^8.5.15",
+                "rolldown": "~1.1.2",
+                "tinyglobby": "^0.2.17"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.3"
+            },
+            "peerDependencies": {
+                "@types/node": "^20.19.0 || >=22.12.0",
+                "@vitejs/devtools": "^0.3.0",
+                "esbuild": "^0.27.0 || ^0.28.0",
+                "jiti": ">=1.21.0",
+                "less": "^4.0.0",
+                "sass": "^1.70.0",
+                "sass-embedded": "^1.70.0",
+                "stylus": ">=0.54.8",
+                "sugarss": "^5.0.0",
+                "terser": "^5.16.0",
+                "tsx": "^4.8.1",
+                "yaml": "^2.4.2"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "@vitejs/devtools": {
+                    "optional": true
+                },
+                "esbuild": {
+                    "optional": true
+                },
+                "jiti": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                },
+                "tsx": {
+                    "optional": true
+                },
+                "yaml": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/webidl-conversions": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -3256,6 +4451,23 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/why-is-node-running": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+            "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "siginfo": "^2.0.0",
+                "stackback": "0.0.2"
+            },
+            "bin": {
+                "why-is-node-running": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/word-wrap": {
             "version": "1.2.5",
             "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
diff --git a/core/models/package.json b/core/models/package.json
index 04e537cbd..d8a318e85 100644
--- a/core/models/package.json
+++ b/core/models/package.json
@@ -8,7 +8,8 @@
         "build": "tsup",
         "clean": "rm -rf dist",
         "lint": "eslint src",
-        "lint:fix": "eslint src --fix"
+        "lint:fix": "eslint src --fix",
+        "test": "vitest run"
     },
     "files": [
         "dist"
@@ -19,6 +20,7 @@
         "@typescript-eslint/parser": "^8.21.0",
         "eslint": "^9.19.0",
         "tsup": "^8.4.0",
-        "typescript": "^5.3.3"
+        "typescript": "^5.3.3",
+        "vitest": "^4.1.8"
     }
 }
diff --git a/core/models/scripts/generate-languages.cjs b/core/models/scripts/generate-languages.cjs
index 8e059c5e2..f54a3b6b3 100644
--- a/core/models/scripts/generate-languages.cjs
+++ b/core/models/scripts/generate-languages.cjs
@@ -25,7 +25,10 @@ function csString(value) {
 
 function generateCSharp(languages, defaultCode) {
   const tuples = languages
-    .map((l) => `        ("${csString(l.code)}", "${l.flag}", "${csString(l.label)}"),`)
+    .map((l) => {
+      const alts = (l.alternativeCodes ?? []).map((c) => `"${csString(c)}"`).join(', ');
+      return `        ("${csString(l.code)}", "${l.flag}", "${csString(l.label)}", [${alts}]),`;
+    })
     .join('\n');
 
   return `// <auto-generated />
@@ -39,7 +42,7 @@ namespace AliasVault.Client.Main.Models;
 
 /// <summary>
 /// Generic language reference shared across all AliasVault clients: maps a two-letter ISO 639-1
-/// code to a flag and native label.
+/// code to a flag, native label, and the region-variant locale codes that map onto it.
 /// </summary>
 public static class Languages
 {
@@ -49,9 +52,10 @@ public static class Languages
     public const string DefaultLanguageCode = "${csString(defaultCode)}";
 
     /// <summary>
-    /// Known languages keyed by ISO 639-1 code, with a flag and native label.
+    /// Known languages keyed by ISO 639-1 code, with a flag, native label, and the BCP-47
+    /// region-variant locale codes (e.g. "en-US", "en-GB") that resolve onto the code.
     /// </summary>
-    private static readonly (string Code, string Flag, string Label)[] Meta =
+    private static readonly (string Code, string Flag, string Label, string[] AlternativeCodes)[] Meta =
     [
 ${tuples}
     ];
@@ -76,7 +80,7 @@ ${tuples}
     public static string GetDisplayLabel(string code)
     {
         var iso = Normalize(code);
-        foreach (var (metaCode, flag, label) in Meta)
+        foreach (var (metaCode, flag, label, _) in Meta)
         {
             if (metaCode == iso)
             {
@@ -95,7 +99,7 @@ ${tuples}
     public static string GetFlag(string code)
     {
         var iso = Normalize(code);
-        foreach (var (metaCode, flag, _) in Meta)
+        foreach (var (metaCode, flag, _, _) in Meta)
         {
             if (metaCode == iso)
             {
@@ -115,7 +119,7 @@ ${tuples}
     public static string GetLabel(string code)
     {
         var iso = Normalize(code);
-        foreach (var (metaCode, _, label) in Meta)
+        foreach (var (metaCode, _, label, _) in Meta)
         {
             if (metaCode == iso)
             {
@@ -126,26 +130,84 @@ ${tuples}
         return code;
     }
 
+    /// <summary>
+    /// Match an app/UI/browser locale to one of a feature's available ISO codes, using the
+    /// region-variant alternative codes (e.g. "en-GB" -> "en", "de-CH" -> "de"). Matching order:
+    /// exact match against an available code, then the alternative-code table, then the base
+    /// language code. Returns null when nothing matches, so callers can decide their own fallback.
+    /// </summary>
+    /// <param name="appLanguage">The app/UI/browser language tag (e.g. "en", "en-US", "nl-BE").</param>
+    /// <param name="availableCodes">The codes the feature actually supports.</param>
+    /// <returns>The matching available code or null if none matched.</returns>
+    public static string? MatchAvailableLanguage(string? appLanguage, System.Collections.Generic.IReadOnlyList<string> availableCodes)
+    {
+        if (string.IsNullOrEmpty(appLanguage))
+        {
+            return null;
+        }
+
+        var lower = appLanguage.ToLowerInvariant();
+
+        // 1. Exact match against an available code.
+        foreach (var code in availableCodes)
+        {
+            if (string.Equals(code, lower, System.StringComparison.OrdinalIgnoreCase))
+            {
+                return code;
+            }
+        }
+
+        // 2. Alternative-code match: find the language whose region variants include this tag, then
+        //    return its base code if the feature supports it.
+        foreach (var (metaCode, _, _, alternativeCodes) in Meta)
+        {
+            var isAlternative = false;
+            foreach (var alt in alternativeCodes)
+            {
+                if (string.Equals(alt, lower, System.StringComparison.OrdinalIgnoreCase))
+                {
+                    isAlternative = true;
+                    break;
+                }
+            }
+
+            if (isAlternative)
+            {
+                foreach (var code in availableCodes)
+                {
+                    if (string.Equals(code, metaCode, System.StringComparison.OrdinalIgnoreCase))
+                    {
+                        return code;
+                    }
+                }
+            }
+        }
+
+        // 3. Base language code match (e.g. an unlisted "en-ZZ" still resolves to "en").
+        var baseCode = Normalize(appLanguage);
+        foreach (var code in availableCodes)
+        {
+            if (string.Equals(code, baseCode, System.StringComparison.OrdinalIgnoreCase))
+            {
+                return code;
+            }
+        }
+
+        return null;
+    }
+
     /// <summary>
     /// Resolve a default language code for an app/UI language, restricted to a set of available
-    /// codes. Returns the app language when available, otherwise the first available code,
-    /// otherwise English.
+    /// codes. Uses <see cref="MatchAvailableLanguage"/> (region-variant aware), then falls back to
+    /// the first available code, otherwise English.
     /// </summary>
     /// <param name="appLanguage">The app/UI language tag.</param>
     /// <param name="availableCodes">The codes the feature actually supports.</param>
     /// <returns>The resolved ISO code.</returns>
     public static string ResolveDefaultLanguage(string? appLanguage, System.Collections.Generic.IReadOnlyList<string> availableCodes)
     {
-        var iso = Normalize(appLanguage);
-        foreach (var code in availableCodes)
-        {
-            if (string.Equals(code, iso, System.StringComparison.OrdinalIgnoreCase))
-            {
-                return iso;
-            }
-        }
-
-        return availableCodes.Count > 0 ? availableCodes[0] : DefaultLanguageCode;
+        return MatchAvailableLanguage(appLanguage, availableCodes)
+            ?? (availableCodes.Count > 0 ? availableCodes[0] : DefaultLanguageCode);
     }
 }
 `;
diff --git a/core/models/src/defaults/Languages.ts b/core/models/src/defaults/Languages.ts
index 411e99dcf..1e5f03a99 100644
--- a/core/models/src/defaults/Languages.ts
+++ b/core/models/src/defaults/Languages.ts
@@ -1,6 +1,6 @@
 /**
- * Generic, cross-platform language reference: maps a two-letter ISO 639-1 code to a flag and a
- * native display label.
+ * Generic, cross-platform language reference: maps a two-letter ISO 639-1 code to a flag, a native
+ * display label, and the alternative locale codes (BCP-47 region variants) that map onto it
  */
 
 /**
@@ -13,34 +13,36 @@ export interface ILanguageInfo {
   flag: string;
   /** Native display label. */
   label: string;
+  /** Alternative locale codes (BCP-47 language-region tags) that map onto this language. */
+  alternativeCodes?: string[];
 }
 
 /** Default ISO language code used as the universal fallback. */
 export const DEFAULT_LANGUAGE_CODE = 'en';
 
 /**
- * Known languages keyed by ISO 639-1 code, with a flag and native label.
- * Covers the AliasVault app UI languages so this list can be reused beyond a single feature.
+ * Known languages keyed by ISO 639-1 code, with a flag, native label, and the region-variant locale
+ * codes that map onto each.
  */
 export const LANGUAGES: ILanguageInfo[] = [
-  { code: 'en', flag: '🇺🇸', label: 'English' },
-  { code: 'nl', flag: '🇳🇱', label: 'Nederlands' },
-  { code: 'de', flag: '🇩🇪', label: 'Deutsch' },
-  { code: 'fr', flag: '🇫🇷', label: 'Français' },
-  { code: 'es', flag: '🇪🇸', label: 'Español' },
-  { code: 'it', flag: '🇮🇹', label: 'Italiano' },
-  { code: 'da', flag: '🇩🇰', label: 'Dansk' },
-  { code: 'fi', flag: '🇫🇮', label: 'Suomi' },
-  { code: 'he', flag: '🇮🇱', label: 'עברית' },
-  { code: 'pl', flag: '🇵🇱', label: 'Polski' },
-  { code: 'pt', flag: '🇧🇷', label: 'Português Brasileiro' },
-  { code: 'ro', flag: '🇷🇴', label: 'Română' },
-  { code: 'ru', flag: '🇷🇺', label: 'Русский' },
-  { code: 'sv', flag: '🇸🇪', label: 'Svenska' },
-  { code: 'uk', flag: '🇺🇦', label: 'Українська' },
-  { code: 'zh', flag: '🇨🇳', label: '简体中文' },
-  { code: 'ur', flag: '🇵🇰', label: 'اردو' },
-  { code: 'fa', flag: '🇮🇷', label: 'فارسی' },
+  { code: 'en', flag: '🇺🇸', label: 'English', alternativeCodes: ['en-US', 'en-GB', 'en-CA', 'en-AU', 'en-NZ', 'en-IE', 'en-ZA', 'en-SG', 'en-IN'] },
+  { code: 'nl', flag: '🇳🇱', label: 'Nederlands', alternativeCodes: ['nl-NL', 'nl-BE'] },
+  { code: 'de', flag: '🇩🇪', label: 'Deutsch', alternativeCodes: ['de-DE', 'de-AT', 'de-CH', 'de-LU', 'de-LI'] },
+  { code: 'fr', flag: '🇫🇷', label: 'Français', alternativeCodes: ['fr-FR', 'fr-CA', 'fr-BE', 'fr-CH', 'fr-LU', 'fr-MC'] },
+  { code: 'es', flag: '🇪🇸', label: 'Español', alternativeCodes: ['es-ES', 'es-MX', 'es-AR', 'es-CO', 'es-CL', 'es-PE', 'es-VE', 'es-EC', 'es-GT', 'es-CU', 'es-BO', 'es-DO', 'es-HN', 'es-PY', 'es-SV', 'es-NI', 'es-CR', 'es-PA', 'es-UY', 'es-PR'] },
+  { code: 'it', flag: '🇮🇹', label: 'Italiano', alternativeCodes: ['it-IT', 'it-CH', 'it-SM', 'it-VA'] },
+  { code: 'da', flag: '🇩🇰', label: 'Dansk', alternativeCodes: ['da-DK'] },
+  { code: 'fi', flag: '🇫🇮', label: 'Suomi', alternativeCodes: ['fi-FI'] },
+  { code: 'he', flag: '🇮🇱', label: 'עברית', alternativeCodes: ['he-IL'] },
+  { code: 'pl', flag: '🇵🇱', label: 'Polski', alternativeCodes: ['pl-PL'] },
+  { code: 'pt', flag: '🇧🇷', label: 'Português Brasileiro', alternativeCodes: ['pt-BR', 'pt-PT'] },
+  { code: 'ro', flag: '🇷🇴', label: 'Română', alternativeCodes: ['ro-RO', 'ro-MD'] },
+  { code: 'ru', flag: '🇷🇺', label: 'Русский', alternativeCodes: ['ru-RU', 'ru-BY', 'ru-KZ', 'ru-UA'] },
+  { code: 'sv', flag: '🇸🇪', label: 'Svenska', alternativeCodes: ['sv-SE', 'sv-FI'] },
+  { code: 'uk', flag: '🇺🇦', label: 'Українська', alternativeCodes: ['uk-UA'] },
+  { code: 'zh', flag: '🇨🇳', label: '简体中文', alternativeCodes: ['zh-CN', 'zh-SG', 'zh-Hans', 'zh-TW', 'zh-HK', 'zh-MO', 'zh-Hant'] },
+  { code: 'ur', flag: '🇵🇰', label: 'اردو', alternativeCodes: ['ur-PK', 'ur-IN'] },
+  { code: 'fa', flag: '🇮🇷', label: 'فارسی', alternativeCodes: ['fa-IR', 'fa-AF'] },
 ];
 
 /**
@@ -64,18 +66,69 @@ export function getLanguageInfo(code: string): ILanguageInfo {
   return match ?? { code, flag: '🌐', label: code };
 }
 
+/**
+ * Match an app/UI/browser locale to one of a feature's available ISO codes, using the region-variant
+ * alternative codes from {@link LANGUAGES} (e.g. 'en-GB' -> 'en', 'de-CH' -> 'de'). Matching order:
+ * exact match against an available code, then the alternative-code table, then the base language code
+ * (the part before the '-'). Returns null when nothing matches, so callers can decide their own
+ * fallback (e.g. "no preference" vs. a concrete default).
+ *
+ * @param appLanguage The app/UI/browser language tag (e.g. 'en', 'en-US', 'nl-BE').
+ * @param availableCodes The codes the feature actually supports.
+ * @returns The matching available code (in its original casing) or null if none matched.
+ *
+ * @example
+ * matchAvailableLanguage('en-US', ['en', 'nl']) // 'en'
+ * matchAvailableLanguage('de-CH', ['de', 'en']) // 'de'
+ * matchAvailableLanguage('ja', ['en', 'nl'])    // null
+ */
+export function matchAvailableLanguage(
+  appLanguage: string | null | undefined,
+  availableCodes: string[]
+): string | null {
+  if (!appLanguage) {
+    return null;
+  }
+
+  const lower = appLanguage.toLowerCase();
+
+  // 1. Exact match against an available code (e.g. 'nl' or even a full tag the feature lists).
+  const exact = availableCodes.find((c) => c.toLowerCase() === lower);
+  if (exact) {
+    return exact;
+  }
+
+  /*
+   * 2. Alternative-code match: find the language whose region variants include this tag, then return
+   *    its base code if the feature supports it (e.g. 'en-GB' -> 'en').
+   */
+  const altEntry = LANGUAGES.find((l) => l.alternativeCodes?.some((ac) => ac.toLowerCase() === lower));
+  if (altEntry) {
+    const altMatch = availableCodes.find((c) => c.toLowerCase() === altEntry.code.toLowerCase());
+    if (altMatch) {
+      return altMatch;
+    }
+  }
+
+  // 3. Base language code match (e.g. an unlisted 'en-ZZ' still resolves to 'en').
+  const base = normalizeLanguageCode(appLanguage);
+  const baseMatch = availableCodes.find((c) => c.toLowerCase() === base);
+  if (baseMatch) {
+    return baseMatch;
+  }
+
+  return null;
+}
+
 /**
  * Resolve a default language code for an app/UI language, restricted to a set of available codes
- * (e.g. the Diceware wordlist languages returned by the Rust core). Returns the app language when it
- * is available, otherwise the first available code, otherwise English.
- * @param appLanguage The app/UI language tag.
+ * (e.g. the Diceware wordlist languages returned by the Rust core, or the identity generator's
+ * supported languages). Uses {@link matchAvailableLanguage} (region-variant aware), then falls back
+ * to the first available code, otherwise English.
+ * @param appLanguage The app/UI/browser language tag.
  * @param availableCodes The codes the feature actually supports.
  * @returns The resolved ISO code.
  */
 export function resolveDefaultLanguage(appLanguage: string | null | undefined, availableCodes: string[]): string {
-  const iso = normalizeLanguageCode(appLanguage);
-  if (availableCodes.some((c) => c.toLowerCase() === iso)) {
-    return iso;
-  }
-  return availableCodes[0] ?? DEFAULT_LANGUAGE_CODE;
+  return matchAvailableLanguage(appLanguage, availableCodes) ?? availableCodes[0] ?? DEFAULT_LANGUAGE_CODE;
 }
diff --git a/core/models/src/defaults/__tests__/Languages.test.ts b/core/models/src/defaults/__tests__/Languages.test.ts
new file mode 100644
index 000000000..2a8b2dbbf
--- /dev/null
+++ b/core/models/src/defaults/__tests__/Languages.test.ts
@@ -0,0 +1,112 @@
+import { describe, it, expect } from 'vitest';
+
+import {
+  DEFAULT_LANGUAGE_CODE,
+  LANGUAGES,
+  getLanguageInfo,
+  matchAvailableLanguage,
+  normalizeLanguageCode,
+  resolveDefaultLanguage,
+} from '../Languages';
+
+/** The identity generator's supported subset, used to exercise restricted matching. */
+const IDENTITY_CODES = ['da', 'de', 'en', 'es', 'fr', 'it', 'nl', 'ro', 'sv', 'ur', 'fa'];
+/** The Diceware passphrase wordlist subset (owned by the Rust core). */
+const DICEWARE_CODES = ['en', 'nl', 'de', 'fr', 'es', 'it'];
+
+describe('Languages', () => {
+  describe('normalizeLanguageCode', () => {
+    it('takes the first two characters, lowercased', () => {
+      expect(normalizeLanguageCode('nl-NL')).toBe('nl');
+      expect(normalizeLanguageCode('EN')).toBe('en');
+      expect(normalizeLanguageCode('de-CH')).toBe('de');
+    });
+
+    it('handles null/undefined/empty', () => {
+      expect(normalizeLanguageCode(null)).toBe('');
+      expect(normalizeLanguageCode(undefined)).toBe('');
+      expect(normalizeLanguageCode('')).toBe('');
+    });
+  });
+
+  describe('getLanguageInfo', () => {
+    it('returns the metadata for a known code', () => {
+      const nl = getLanguageInfo('nl');
+      expect(nl.code).toBe('nl');
+      expect(nl.label).toBe('Nederlands');
+      expect(nl.alternativeCodes).toContain('nl-BE');
+    });
+
+    it('falls back to a globe + raw code for unknown languages', () => {
+      const unknown = getLanguageInfo('xx');
+      expect(unknown.flag).toBe('🌐');
+      expect(unknown.label).toBe('xx');
+    });
+  });
+
+  describe('alternativeCodes data', () => {
+    it('defines unique, region-tagged alternatives for every language', () => {
+      const seen = new Set<string>();
+      for (const lang of LANGUAGES) {
+        for (const alt of lang.alternativeCodes ?? []) {
+          expect(alt.toLowerCase()).not.toBe(lang.code.toLowerCase());
+          expect(seen.has(alt.toLowerCase())).toBe(false);
+          seen.add(alt.toLowerCase());
+        }
+      }
+    });
+  });
+
+  describe('matchAvailableLanguage', () => {
+    it('matches an exact available code', () => {
+      expect(matchAvailableLanguage('nl', IDENTITY_CODES)).toBe('nl');
+    });
+
+    it('maps a region variant via alternativeCodes', () => {
+      expect(matchAvailableLanguage('nl-BE', IDENTITY_CODES)).toBe('nl');
+      expect(matchAvailableLanguage('de-CH', IDENTITY_CODES)).toBe('de');
+      expect(matchAvailableLanguage('en-US', DICEWARE_CODES)).toBe('en');
+    });
+
+    it('is case-insensitive', () => {
+      expect(matchAvailableLanguage('NL-BE', IDENTITY_CODES)).toBe('nl');
+      expect(matchAvailableLanguage('En-Us', IDENTITY_CODES)).toBe('en');
+    });
+
+    it('falls back to the base language for unlisted region variants', () => {
+      expect(matchAvailableLanguage('en-ZZ', IDENTITY_CODES)).toBe('en');
+      expect(matchAvailableLanguage('nl-ZZ', IDENTITY_CODES)).toBe('nl');
+    });
+
+    it('returns null when the language is not available', () => {
+      // Japanese has no identity generator.
+      expect(matchAvailableLanguage('ja', IDENTITY_CODES)).toBeNull();
+      // Polish is a known UI language but not a Diceware wordlist.
+      expect(matchAvailableLanguage('pl-PL', DICEWARE_CODES)).toBeNull();
+    });
+
+    it('returns null for empty/invalid input', () => {
+      expect(matchAvailableLanguage(null, IDENTITY_CODES)).toBeNull();
+      expect(matchAvailableLanguage(undefined, IDENTITY_CODES)).toBeNull();
+      expect(matchAvailableLanguage('', IDENTITY_CODES)).toBeNull();
+      expect(matchAvailableLanguage('invalid', IDENTITY_CODES)).toBeNull();
+      expect(matchAvailableLanguage('123', IDENTITY_CODES)).toBeNull();
+    });
+  });
+
+  describe('resolveDefaultLanguage', () => {
+    it('returns the matched code when available', () => {
+      expect(resolveDefaultLanguage('de-AT', DICEWARE_CODES)).toBe('de');
+      expect(resolveDefaultLanguage('nl', DICEWARE_CODES)).toBe('nl');
+    });
+
+    it('falls back to the first available code when nothing matches', () => {
+      expect(resolveDefaultLanguage('ja', DICEWARE_CODES)).toBe('en');
+      expect(resolveDefaultLanguage('pl-PL', DICEWARE_CODES)).toBe('en');
+    });
+
+    it('falls back to English when there are no available codes', () => {
+      expect(resolveDefaultLanguage('nl', [])).toBe(DEFAULT_LANGUAGE_CODE);
+    });
+  });
+});
diff --git a/core/typescript/identity-generator/src/__tests__/LanguageProvider.test.ts b/core/typescript/identity-generator/src/__tests__/LanguageProvider.test.ts
index 67ce4305a..e206646bc 100644
--- a/core/typescript/identity-generator/src/__tests__/LanguageProvider.test.ts
+++ b/core/typescript/identity-generator/src/__tests__/LanguageProvider.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { getAvailableLanguages, mapUiLanguageToIdentityLanguage } from '../utils/LanguageProvider';
+import { getAvailableLanguages } from '../utils/LanguageProvider';
 
 describe('LanguageProvider', () => {
   describe('getAvailableLanguages', () => {
@@ -8,82 +8,9 @@ describe('LanguageProvider', () => {
 
       expect(languages).toBeDefined();
       expect(languages.length).toBeGreaterThan(0);
-      // Returns ISO codes only; display metadata (flag/label) is resolved by clients from core/models.
       expect(languages.every(code => typeof code === 'string')).toBe(true);
       expect(languages).toContain('en');
       expect(languages).toContain('nl');
     });
   });
-
-  describe('mapUiLanguageToIdentityLanguage', () => {
-    describe('Dutch mappings', () => {
-      it('should map "nl" to "nl"', () => {
-        expect(mapUiLanguageToIdentityLanguage('nl')).toBe('nl');
-      });
-
-      it('should map "nl-NL" to "nl"', () => {
-        expect(mapUiLanguageToIdentityLanguage('nl-NL')).toBe('nl');
-      });
-
-      it('should map "nl-BE" to "nl" (Belgian Dutch)', () => {
-        expect(mapUiLanguageToIdentityLanguage('nl-BE')).toBe('nl');
-      });
-
-      it('should be case-insensitive for "NL"', () => {
-        expect(mapUiLanguageToIdentityLanguage('NL')).toBe('nl');
-      });
-
-      it('should be case-insensitive for "NL-NL"', () => {
-        expect(mapUiLanguageToIdentityLanguage('NL-NL')).toBe('nl');
-      });
-
-      it('should be case-insensitive for "NL-BE"', () => {
-        expect(mapUiLanguageToIdentityLanguage('NL-BE')).toBe('nl');
-      });
-    });
-
-    describe('Edge cases', () => {
-      it('should return null for null input', () => {
-        expect(mapUiLanguageToIdentityLanguage(null)).toBe(null);
-      });
-
-      it('should return null for undefined input', () => {
-        expect(mapUiLanguageToIdentityLanguage(undefined)).toBe(null);
-      });
-
-      it('should return null for empty string', () => {
-        expect(mapUiLanguageToIdentityLanguage('')).toBe(null);
-      });
-
-      it('should return null for whitespace', () => {
-        expect(mapUiLanguageToIdentityLanguage('   ')).toBe(null);
-      });
-
-      it('should return null for invalid format', () => {
-        expect(mapUiLanguageToIdentityLanguage('invalid')).toBe(null);
-      });
-
-      it('should return null for numbers', () => {
-        expect(mapUiLanguageToIdentityLanguage('123')).toBe(null);
-      });
-    });
-
-    describe('Mixed case and locale variants', () => {
-      it('should handle mixed case "En-Us"', () => {
-        expect(mapUiLanguageToIdentityLanguage('En-Us')).toBe('en');
-      });
-
-      it('should handle mixed case "nL-Nl"', () => {
-        expect(mapUiLanguageToIdentityLanguage('nL-Nl')).toBe('nl');
-      });
-
-      it('should extract base language from unknown locale "en-ZZ"', () => {
-        expect(mapUiLanguageToIdentityLanguage('en-ZZ')).toBe('en');
-      });
-
-      it('should extract base language from unknown locale "nl-ZZ"', () => {
-        expect(mapUiLanguageToIdentityLanguage('nl-ZZ')).toBe('nl');
-      });
-    });
-  });
 });
diff --git a/core/typescript/identity-generator/src/utils/LanguageProvider.ts b/core/typescript/identity-generator/src/utils/LanguageProvider.ts
index 31eff5462..af0c65298 100644
--- a/core/typescript/identity-generator/src/utils/LanguageProvider.ts
+++ b/core/typescript/identity-generator/src/utils/LanguageProvider.ts
@@ -1,39 +1,18 @@
 /**
- * Internal definition of an identity-generator language: its ISO code plus the alternative locale
- * codes that map onto it. Display metadata (flag, native label) is intentionally NOT stored here —
- * clients look that up from the shared `core/models` language reference so it lives in one place.
+ * The set of languages the identity generator can produce identities for.
  */
-interface ILanguageDef {
-  /**
-   * The language code (e.g., "en", "nl", "de").
-   */
-  value: string;
-
-  /**
-   * Alternative language codes that map to this identity generator language.
-   * Used for matching UI locale codes to identity generator languages.
-   * For example, "en-US", "en-GB", "en-CA" all map to "en".
-   */
-  alternativeCodes?: string[];
-}
-
-/**
- * The languages supported by the identity generator. Only ISO codes and their alternative locale
- * codes are defined here; flag emojis and native labels come from the shared `core/models` language
- * reference (`getLanguageInfo`).
- */
-const LANGUAGE_DEFS: ILanguageDef[] = [
-  { value: 'da', alternativeCodes: ['da-DK'] },
-  { value: 'de', alternativeCodes: ['de-DE', 'de-AT', 'de-CH', 'de-LU', 'de-LI'] },
-  { value: 'en', alternativeCodes: ['en-US', 'en-GB', 'en-CA', 'en-AU', 'en-NZ', 'en-IE', 'en-ZA', 'en-SG', 'en-IN'] },
-  { value: 'es', alternativeCodes: ['es-ES', 'es-MX', 'es-AR', 'es-CO', 'es-CL', 'es-PE', 'es-VE', 'es-EC', 'es-GT', 'es-CU', 'es-BO', 'es-DO', 'es-HN', 'es-PY', 'es-SV', 'es-NI', 'es-CR', 'es-PA', 'es-UY', 'es-PR'] },
-  { value: 'fr', alternativeCodes: ['fr-FR', 'fr-CA', 'fr-BE', 'fr-CH', 'fr-LU', 'fr-MC'] },
-  { value: 'it', alternativeCodes: ['it-IT', 'it-CH', 'it-SM', 'it-VA'] },
-  { value: 'nl', alternativeCodes: ['nl-NL', 'nl-BE'] },
-  { value: 'ro', alternativeCodes: ['ro-RO', 'ro-MD'] },
-  { value: 'sv', alternativeCodes: ['sv-SE', 'sv-FI'] },
-  { value: 'ur', alternativeCodes: ['ur-PK', 'ur-IN'] },
-  { value: 'fa', alternativeCodes: ['fa-IR', 'fa-AF'] },
+const SUPPORTED_LANGUAGE_CODES: string[] = [
+  'da',
+  'de',
+  'en',
+  'es',
+  'fr',
+  'it',
+  'nl',
+  'ro',
+  'sv',
+  'ur',
+  'fa',
 ];
 
 /**
@@ -41,50 +20,5 @@ const LANGUAGE_DEFS: ILanguageDef[] = [
  * @returns Array of ISO language codes (e.g. ["da", "de", "en", ...]).
  */
 export function getAvailableLanguages(): string[] {
-  return LANGUAGE_DEFS.map(lang => lang.value);
-}
-
-/**
- * Maps a UI language code to an identity generator language code.
- * If no explicit match is found, returns null to indicate no preference.
- *
- * @param uiLanguageCode - The UI language code (e.g., "en", "en-US", "nl-NL", "de-DE", "fr")
- * @returns The matching identity generator language code or null if no match
- *
- * @example
- * mapUiLanguageToIdentityLanguage("en-US") // returns "en"
- * mapUiLanguageToIdentityLanguage("nl") // returns "nl"
- * mapUiLanguageToIdentityLanguage("de-CH") // returns "de"
- * mapUiLanguageToIdentityLanguage("ja") // returns null (no Japanese identity generator)
- */
-export function mapUiLanguageToIdentityLanguage(uiLanguageCode: string | null | undefined): string | null {
-  if (!uiLanguageCode) {
-    return null;
-  }
-
-  const normalizedCode = uiLanguageCode.toLowerCase();
-
-  // First, try exact match with the primary value
-  const exactMatch = LANGUAGE_DEFS.find(lang => lang.value.toLowerCase() === normalizedCode);
-  if (exactMatch) {
-    return exactMatch.value;
-  }
-
-  // Then, try matching with alternative codes
-  const alternativeMatch = LANGUAGE_DEFS.find(lang =>
-    lang.alternativeCodes?.some(code => code.toLowerCase() === normalizedCode)
-  );
-  if (alternativeMatch) {
-    return alternativeMatch.value;
-  }
-
-  // Finally, try matching the base language code (e.g., "en" from "en-US")
-  const baseCode = normalizedCode.split('-')[0];
-  const baseMatch = LANGUAGE_DEFS.find(lang => lang.value.toLowerCase() === baseCode);
-  if (baseMatch) {
-    return baseMatch.value;
-  }
-
-  // No match found
-  return null;
+  return [...SUPPORTED_LANGUAGE_CODES];
 }