Project-N-E-K-O
diff --git a/‎config/api_providers.json‎
Lines changed: 15 additions & 2 deletions b/‎config/api_providers.json‎
Lines changed: 15 additions & 2 deletions
diff --git a/‎main_logic/core.py‎
Lines changed: 35 additions & 38 deletions b/‎main_logic/core.py‎
Lines changed: 35 additions & 38 deletions
diff --git a/‎main_logic/omni_realtime_client.py‎
Lines changed: 6 additions & 0 deletions b/‎main_logic/omni_realtime_client.py‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎main_logic/tts_client.py‎
Lines changed: 21 additions & 24 deletions b/‎main_logic/tts_client.py‎
Lines changed: 21 additions & 24 deletions
diff --git a/‎main_routers/characters_router.py‎
Lines changed: 64 additions & 3 deletions b/‎main_routers/characters_router.py‎
Lines changed: 64 additions & 3 deletions
@@ -367,6 +367,7 @@
   },
   "_comment_free_voices": "Shape: {voiceKey: voice_id}. Keys are i18n identifiers (e.g., playfulGirl, cuteGirl) that the frontend must localize for display. Do not treat keys as display names.",
   "free_voices": {
+    "yui_cn": "voice-tone-RcH2svtsrw",
     "playfulGirl": "voice-tone-PGLiTXeJCS",
     "cuteGirl": "voice-tone-PGLiyZt65w",
     "cuteMaiden": "voice-tone-PGLjbHIMbI",
@@ -376,8 +377,7 @@
     "gentleMaiden": "voice-tone-PGLlrd5SNM",
     "sweetLady": "voice-tone-PGLmTEeUOu",
     "frailMaiden": "voice-tone-PGLmzXEX44",
-    "childishMaiden": "voice-tone-PGLnVNQn7A",
-    "yui_cn": "voice-tone-RcH2svtsrw"
+    "childishMaiden": "voice-tone-PGLnVNQn7A"
   },
   "_comment_native_tts_voice_providers": "Shape: {providerKey: {catalog_prefix, default_voice, default_male_voice, catalog_value_is_display_name, voices, aliases, inherits}}. voices maps upstream voice_id to display label. Keep this list to voices available on realtime/free TTS paths; some HTTP-only or permission-gated official voices are intentionally omitted.",
   "native_tts_voice_providers": {
@@ -462,6 +462,19 @@
         "中文女": "Leda"
       }
     },
+    "free_intl": {
+      "inherits": "gemini",
+      "catalog_prefix": "Gemini",
+      "default_voice": "yui",
+      "default_male_voice": "Puck",
+      "voices": {
+        "yui": "Female"
+      },
+      "aliases": {
+        "default": "Leda",
+        "默认": "Leda"
+      }
+    },
     "grok": {
       "catalog_prefix": "Grok",
       "default_voice": "eve",
 
@@ -504,8 +504,6 @@ def _render_pending_extra_replies_by_origin(
 from utils.native_voice_registry import (
     is_free_preset_voice_id,
     resolve_native_voice_for_routing,
-    should_block_free_native_voice,
-    should_block_free_voice_for_route,
 )
 from utils.api_config_loader import (
     get_livestream_config,
@@ -761,7 +759,7 @@ def __init__(self, sync_message_queue, lanlan_name, lanlan_prompt):
         self.core_api_type = realtime_config.get('api_type', '') or self._config_manager.get_core_config().get('CORE_API_TYPE', '')
         self.memory_server_port = MEMORY_SERVER_PORT
         self.audio_api_key = self._config_manager.get_core_config()['AUDIO_API_KEY']  # 用于CosyVoice自定义音色
-        self._apply_voice_id_for_route(realtime_config.get('base_url', ''))
+        self._apply_voice_id_for_route()
         # 注意：use_tts 会在 start_session 中根据 input_mode 重新设置
         self.use_tts = False
         self.generation_config = {}  # Qwen暂时不用
@@ -3377,13 +3375,22 @@ async def _init_renew_status(self):
         # auto-start 不被误清），但 end_session 语义就是整轮收尾，必须强制清场。
         await self.state.reset(force=True)
 
+    def _realtime_base_url(self) -> str:
+        """读取 realtime 线路 base_url，供 native voice 路由的 host 重映射
+        （海外免费 free→free_intl）使用。读不到时返回空串，按非 lanlan.app 处理。"""
+        try:
+            return str((self._config_manager.get_model_api_config('realtime') or {}).get('base_url') or '')
+        except Exception:
+            return ''
+
     def _has_custom_tts(self) -> bool:
         """判断当前会话是否使用自定义 TTS（克隆音色或自定义 TTS URL）。"""
         core_config = self._config_manager.get_core_config()
         _, uses_provider_native_voice = resolve_native_voice_for_routing(
             self.core_api_type,
             self.voice_id,
             self._config_manager.voice_id_exists_in_any_storage,
+            realtime_base_url=self._realtime_base_url(),
         )
         if uses_provider_native_voice:
             return False
@@ -3722,17 +3729,12 @@ def _resolve_session_use_tts(
             logger.info(f"{log_prefix}🎙️ livestream 模式：使用服务端原生语音，跳过外部 TTS")
             return False
         base_url = realtime_config.get('base_url', '')
-        if should_block_free_native_voice(
-            self.core_api_type, self.voice_id, base_url,
+        _, uses_provider_native_voice = resolve_native_voice_for_routing(
+            self.core_api_type,
+            self.voice_id,
             self._config_manager.voice_id_exists_in_any_storage,
-        ):
-            uses_provider_native_voice = False
-        else:
-            _, uses_provider_native_voice = resolve_native_voice_for_routing(
-                self.core_api_type,
-                self.voice_id,
-                self._config_manager.voice_id_exists_in_any_storage,
-            )
+            realtime_base_url=base_url,
+        )
         if uses_provider_native_voice:
             logger.info(f"{log_prefix}🔊 {self.core_api_type} 原生音色 '{self.voice_id}' 将直接传入 RealtimeClient")
             return False
@@ -3760,24 +3762,23 @@ def _get_voice_id(self) -> str:
         # 比较 / route gating / is_free_preset_voice_id 之类的 callee 失配。
         return (raw or '').strip()
 
-    def _apply_voice_id_for_route(self, realtime_base_url: str) -> None:
+    def _apply_voice_id_for_route(self) -> None:
         """按当前 route 把角色卡里的 voice_id 解析进 self.voice_id /
         self._is_free_preset_voice。
 
         __init__ / start_session / _background_prepare_pending_session 三处
-        共用：读取 _get_voice_id() → 海外 free 路由屏蔽 → 校正 free preset
-        与 core_api_type 的匹配关系。集中在这里避免规则漂移。
+        共用：读取 _get_voice_id() → 校正 free preset 与 core_api_type 的匹配
+        关系。集中在这里避免规则漂移。
+
+        历史上这里还按"海外 lanlan.app 会硬覆盖成 Leda"屏蔽 voice 下发；
+        现在海外免费统一走 www.lanlan.app 透传 voice（Gemini 全量 + yui，由
+        free_intl provider 认领），不再屏蔽——stale 的阶跃/free 预设音色在海外
+        路由下不会命中 free_intl catalog，自然 fall through，不需要预清。
+
+        空 voice_id 保持空：海外免费下"空 → 默认音色"的映射交给服务端
+        （www.lanlan.app）处理，客户端不再注入兜底音色。
         """
         raw_voice_id = self._get_voice_id()
-        if should_block_free_voice_for_route(
-            self.core_api_type,
-            raw_voice_id,
-            realtime_base_url,
-            self._config_manager.voice_id_exists_in_any_storage,
-        ):
-            self.voice_id = ''
-            self._is_free_preset_voice = False
-            return
         self.voice_id = raw_voice_id
         self._is_free_preset_voice = is_free_preset_voice_id(raw_voice_id)
         # free preset 选了但当前非 free 模式 → 不下发，避免把 preset id 透给别的 provider。
@@ -3799,20 +3800,16 @@ def _resolve_realtime_voice(self, realtime_config: dict):
            （绕过 free_voices preset gate，base_url 已被派生不含 lanlan.tech）
         3. 否则保留原逻辑：仅在角色 voice 是 free preset、core_api_type='free'
            且 base_url 仍指向 lanlan.tech 域时下发，避免把 preset id 透给非
-           lanlan 服务（lanlan.app 的屏蔽由 should_block_free_voice_for_route 兜底）
+           lanlan 服务。海外免费（free + *.lanlan.app）的 yui / Gemini 音色由
+           resolve_native_voice_for_routing 经 free_intl 重映射在第 1 步直接命中。
         """
         base_url = realtime_config.get('base_url', '')
-        if should_block_free_native_voice(
-            self.core_api_type, self.voice_id, base_url,
+        voice_name, uses_provider_native_voice = resolve_native_voice_for_routing(
+            self.core_api_type,
+            self.voice_id,
             self._config_manager.voice_id_exists_in_any_storage,
-        ):
-            voice_name, uses_provider_native_voice = self.voice_id, False
-        else:
-            voice_name, uses_provider_native_voice = resolve_native_voice_for_routing(
-                self.core_api_type,
-                self.voice_id,
-                self._config_manager.voice_id_exists_in_any_storage,
-            )
+            realtime_base_url=base_url,
+        )
         if uses_provider_native_voice:
             return voice_name
         if self._is_livestream_active():
@@ -4177,7 +4174,7 @@ async def start_session(self, websocket: WebSocket, new=False, input_mode='audio
             # 重新读取角色配置以获取最新的voice_id（支持角色切换后的音色热更新）
             _, _, _, self.lanlan_basic_config, _, _, _, _, _ = await self._config_manager.aget_character_data()
             old_voice_id = self.voice_id
-            self._apply_voice_id_for_route(realtime_config.get('base_url', ''))
+            self._apply_voice_id_for_route()
 
             # 如果角色没有设置 voice_id，尝试使用自定义API配置的 TTS_VOICE_ID 作为回退
             if not self.voice_id:
@@ -4866,7 +4863,7 @@ async def _background_prepare_pending_session(self):
             # 重新读取角色配置以获取最新的voice_id（支持角色切换后的音色热更新）
             _, _, _, self.lanlan_basic_config, _, _, _, _, _ = await self._config_manager.aget_character_data()
             old_voice_id = self.voice_id
-            self._apply_voice_id_for_route(realtime_config.get('base_url', ''))
+            self._apply_voice_id_for_route()
 
             # 如果角色没有设置 voice_id，尝试使用自定义API配置的 TTS_VOICE_ID 作为回退
             if not self.voice_id:
 
@@ -983,6 +983,12 @@ async def connect(self, instructions: str, native_audio=True) -> None:
                     "type": "server_vad"
                 },
             }
+            # 海外免费（lanlan.app，Gemini 代理）建 session 时一次性指定
+            # language_code，与 TTS server 路对偶；lanlan.tech（StepFun）不发，
+            # 沿用其自动识别 / voice_label 语义。
+            if 'lanlan.app' in (self.base_url or ''):
+                from utils.language_utils import get_tts_language_code
+                free_session["language_code"] = get_tts_language_code()
             free_tools: List[Dict[str, Any]] = []
             if self.has_tools():
                 free_tools.extend(self._tools_for_step())
 
@@ -233,30 +233,14 @@ def _ws_is_open(ws_conn) -> bool:
     return not getattr(ws_conn, "closed", True)
 
 
-_TTS_LANGUAGE_CODE_MAP = {
-    'zh':    'cmn-CN',
-    'zh-CN': 'cmn-CN',
-    'zh-TW': 'cmn-tw',
-    'en':    'en-US',
-    'ja':    'ja-JP',
-    'ko':    'ko-KR',
-    'es':    'es-ES',
-    'fr':    'fr-FR',
-    'de':    'de-DE',
-    'it':    'it-IT',
-    'ru':    'ru-RU',
-    'tr':    'tr-TR'
-}
-
-
 def _get_tts_language_code() -> str:
-    """获取 lanlan.app TTS 服务器所需的 language_code。"""
-    try:
-        from utils.language_utils import get_global_language_full, normalize_language_code
-        lang = normalize_language_code(get_global_language_full(), format='full')
-    except Exception:
-        lang = 'zh-CN'
-    return _TTS_LANGUAGE_CODE_MAP.get(lang, 'cmn-CN')
+    """获取 lanlan.app TTS 服务器所需的 language_code。
+
+    实现收敛到 utils.language_utils.get_tts_language_code —— core/realtime 与
+    TTS server 两条路共用同一张 BCP-47 映射表，避免漂移。
+    """
+    from utils.language_utils import get_tts_language_code
+    return get_tts_language_code()
 
 
 def _build_step_tts_create_data(sid_: str, voice_id: str, lang_hint, is_lanlan_app: bool) -> dict:
@@ -268,7 +252,8 @@ def _build_step_tts_create_data(sid_: str, voice_id: str, lang_hint, is_lanlan_a
         "sample_rate": 24000,
     }
     if is_lanlan_app:
-        data["voice_id"] = "Leda"
+        # 发真实 voice_id（data 里已带传入值），由 www.lanlan.app 服务端透传给
+        # Gemini 并做映射；不再客户端硬覆盖成 Leda。
         data["language_code"] = "ja-JP" if lang_hint == "ja" else _get_tts_language_code()
     else:
         # lanlan.tech (free) 和自建 StepFun 协议对称，都用 voice_label。
@@ -1384,6 +1369,18 @@ async def receive_messages():
         worker_kwargs={'free_mode': True},
     ),
 )
+# free_intl（海外免费 *.lanlan.app）：上游 Gemini 代理走 www.lanlan.app/tts，
+# 协议同 free（StepFun-shape streaming，proxy 把 voice_id 透传给 Gemini），
+# 因此复用 free 的 worker。与 free 对偶，仅 provider key 不同（registry 按
+# host 把 free→free_intl 重映射，让 yui/Gemini 音色短路到这里而非外部 TTS）。
+register_tts_worker_resolver(
+    'free_intl',
+    make_native_tts_resolver(
+        step_realtime_tts_worker,
+        'tts_default_api_key',
+        worker_kwargs={'free_mode': True},
+    ),
+)
 
 
 # xAI 文档：'Individual deltas are capped at 15,000 characters'。
 
@@ -3809,6 +3809,39 @@ async def get_microphone():
         return {"microphone_id": None}
 
 
+def _build_free_intl_voice_pins(native_catalog: dict, voice_id_exists=None) -> list[dict]:
+    """海外免费（free_intl）列表顶部的两个置顶音色。
+
+    - yui：初始/默认角色音色，下发字面量 "yui"（服务端映射到 yui 专属声音）。
+    - default：与 Leda 同义，下发 "Leda"。仍以普通条目保留在 Gemini 长列表里
+      （不去重），这里只是把它再置顶一份并换成 "默认" 文案。
+
+    展示名交给前端按 i18n_key 本地化；这里只给 voice_id / i18n_key / 兜底 prefix。
+
+    voice_id_exists：若某 pin 的 voice_id 与用户已注册/克隆音色撞名（如本地 TTS
+    用户自建了一个 ID 叫 "yui"/"Leda" 的音色），runtime 路由会按撞名优先走克隆
+    路径、不再当 native（见 NativeVoiceProvider.resolve_for_routing 的 collision
+    分支），此时置顶 pin 点了也到不了 Gemini，故直接隐藏，避免误导。
+    """
+    def _pin(voice_id: str, i18n_key: str, fallback: str) -> dict | None:
+        if callable(voice_id_exists) and voice_id_exists(voice_id):
+            return None
+        meta = native_catalog.get(voice_id) or {}
+        return {
+            "voice_id": voice_id,
+            "i18n_key": i18n_key,
+            "prefix": meta.get("prefix") or fallback,
+            "provider": "free_intl",
+            "builtin": True,
+        }
+
+    pins = [
+        _pin("yui", "voice.freeVoice.yui", "Yui"),
+        _pin("Leda", "voice.freeVoice.default", "Default"),
+    ]
+    return [pin for pin in pins if pin is not None]
+
+
 @router.get('/voices')
 async def get_voices():
     """获取当前API key对应的所有已注册音色"""
@@ -3818,7 +3851,33 @@ async def get_voices():
     core_config = await _config_manager.aget_core_config()
     active_native_provider = get_active_realtime_native_provider_for_ui(_config_manager)
     if active_native_provider:
-        result["native_voices"] = get_native_voice_catalog_for_ui(active_native_provider)
+        native_catalog = get_native_voice_catalog_for_ui(active_native_provider) or {}
+        if active_native_provider == 'free_intl':
+            # 海外免费（lanlan.app/Gemini）：yui + default(=Leda) 两个置顶 pin，
+            # 其后是 Gemini 全量目录。yui 从长列表里挪到 pin（不重复展示）；
+            # Leda 不去重，仍作为普通条目留在长列表里（= default pin 的目标）。
+            # pin 的展示名由前端按 i18n_key 本地化。
+            voice_exists = getattr(_config_manager, "voice_id_exists_in_any_storage", None)
+            result["pinned_voices"] = _build_free_intl_voice_pins(
+                native_catalog,
+                voice_id_exists=voice_exists,
+            )
+            # 撞名（跨 api-key 桶存在同名克隆/自定义音色）的条目也从长列表里去掉：
+            # runtime 路由/preview 用 any-storage 撞名判定会拒绝当 native，展示了
+            # 点选也到不了 Gemini（与 pin 的撞名隐藏对偶）。前端只按当前 api 的
+            # voices 去重，跨桶撞名漏网，故在后端按同一谓词收口。
+            def _free_intl_keep(voice_id: str) -> bool:
+                if voice_id == 'yui':
+                    return False
+                if callable(voice_exists) and voice_exists(voice_id):
+                    return False
+                return True
+            native_catalog = {
+                voice_id: meta
+                for voice_id, meta in native_catalog.items()
+                if _free_intl_keep(voice_id)
+            }
+        result["native_voices"] = native_catalog
 
     # 免费预设音色只在 core=free 运行时可用（与 assist 无关）；core_url 仍须指向
     # lanlan.tech 免费端点，海外 lanlan.app 路由由 should_block_free_voice_for_route 兜底。
@@ -3904,11 +3963,13 @@ async def get_voice_preview(
         if native_preview_provider:
             native_voice_id, _ = normalize_native_voice(native_preview_provider, voice_id)
             try:
-                if native_preview_provider in ('step', 'free'):
+                if native_preview_provider in ('step', 'free', 'free_intl'):
                     # 只读 tts_default.api_key —— 跟 step_realtime_tts_worker 走的 key 对偶；
                     # 不能回退到 audio_api_key（顶上从 tts_custom / AUDIO_API_KEY 取的，都是
                     # GPT-SoVITS / CosyVoice 这种别家 provider 的 bearer，把它透给
                     # api.stepfun.com 一律 401，错误现象比明确缺 key 难排查。
+                    # free_intl（海外免费 Gemini 代理）预览同 free，走 www.lanlan.app/tts
+                    # 流式合成（StepFun-shape，proxy 把 voice_id 透传给 Gemini）。
                     try:
                         native_tts_config = _config_manager.get_model_api_config('tts_default')
                         native_audio_api_key = native_tts_config.get('api_key', '') or ''
@@ -3925,7 +3986,7 @@ async def get_voice_preview(
                         preview_line=text,
                         preview_language=preview_language,
                         audio_api_key=native_audio_api_key,
-                        free_mode=(native_preview_provider == 'free'),
+                        free_mode=(native_preview_provider in ('free', 'free_intl')),
                     )
                 elif native_preview_provider == 'gemini':
                     core_config = await _config_manager.aget_core_config()