Merge remote-tracking branch 'origin/main' into feature/text-input

Author: linzhengyu

app/components/ui/BabylonViewer.tsx

@@ -315,6 +315,8 @@ const BabylonViewer = forwardRef<BabylonViewerRef, BabylonViewerProps>(
             1: 'KQ-default_420.glb',
             2: 'HT-default_214.glb',
             3: 'FNN-default_296.glb',
+            4: 'KL-default_214.glb',
+            5: 'NXD-default_321.glb',
           }
 
           const characterFile = character_index_file_name_mapping[characterIndex]

app/constants/index.ts

@@ -77,6 +77,16 @@ export const CHARACTER_MODELS = [
     name: 'FNN-default',
     preview: '/img/preview/character/FNN-default.png',
   },
+  {
+    id: 'character5',
+    name: 'KL-default',
+    preview: '/img/preview/character/KL-default.png',
+  },
+  {
+    id: 'character6',
+    name: 'NXD-default',
+    preview: '/img/preview/character/NXD-default.png',
+  },
 ]
 // TTS-specific voice options
 // NOTE: This is now used as fallback only. Voice options are fetched dynamically from API in useTTSVoices hook

app/i18n/locales/en/client.json

@@ -42,6 +42,9 @@
     "noRunningStreamingClientFound": "No running streaming client found",
     "noRunningAssetManagerFound": "No running asset manager found",
     "algorithmTimedOutDuringStreaming": "Algorithm timed out during streaming",
+    "algorithmTimedOutDuringHealthCheck": "Algorithm timed out during health check",
+    "algorithmTimedOutDuringHealthCheckStreamReady": "Algorithm timed out during health check waiting for stream ready",
+    "algorithmTimedOutDuringHealthCheckStreamEnd": "Algorithm timed out during health check waiting for stream end",
     "incorrectStreamNumber": "Algorithm streaming returned incorrect number of streams, expected 3 streams, actually returned",
     "streamingBufferEvaluationFailed": "Streaming buffer evaluation failed",
     "configurationUpdateFailed": "3DACConfiguration update failed",

app/i18n/locales/en/fronted.json

@@ -8,7 +8,8 @@
     "delete": "Delete",
     "edit": "Edit",
     "editKey": "Edit KEY",
-    "close": "Close"
+    "close": "Close",
+    "loading": "Loading"
   },
   "loading": {
     "title": "DIGITAL LIFE PROJECT",
@@ -166,7 +167,9 @@
     "Ani-default": "Ani-default",
     "KQ-default": "KQ-default",
     "HT-default": "HT-default",
-    "FNN-default": "FNN-default"
+    "FNN-default": "FNN-default",
+    "KL-default": "KL-default",
+    "NXD-default": "NXD-default"
   },
   "scenes": {
     "Seabed": "Seabed",

app/i18n/locales/zh/client.json

@@ -42,6 +42,9 @@
     "noRunningStreamingClientFound": "没有正在运行的流式客户端",
     "noRunningAssetManagerFound": "没有正在运行的资产管理器",
     "algorithmTimedOutDuringStreaming": "算法在流式传输期间超时",
+    "algorithmTimedOutDuringHealthCheck": "算法在健康检查期间超时",
+    "algorithmTimedOutDuringHealthCheckStreamReady": "算法在健康检查期间等待流就绪超时",
+    "algorithmTimedOutDuringHealthCheckStreamEnd": "算法在健康检查期间等待流结束超时",
     "incorrectStreamNumber": "算法流式传输返回的流数不正确，期望3个流，实际返回数量",
     "streamingBufferEvaluationFailed": "流式传输缓冲区评估失败",
     "configurationUpdateFailed": "3DAC配置同步失败",

app/i18n/locales/zh/fronted.json

@@ -8,7 +8,8 @@
     "delete": "删除",
     "edit": "编辑",
     "editKey": "编辑密钥",
-    "close": "关闭"
+    "close": "关闭",
+    "loading": "加载中"
   },
   "loading": {
     "title": "数字生命计划",
@@ -167,7 +168,9 @@
     "Ani-default": "Ani-默认",
     "KQ-default": "刻晴-默认",
     "HT-default": "胡桃-默认",
-    "FNN-default": "芙宁娜-默认"
+    "FNN-default": "芙宁娜-默认",
+    "KL-default": "可莉-默认",
+    "NXD-default": "纳西妲-默认"
   },
   "scenes": {
     "Seabed": "海底世界",

app/library/babylonjs/runtime/fsm/machine.ts

@@ -790,9 +790,11 @@ export class StateMachine {
         } else {
           if (currentTime - requestTime > orchestratorTimeout * 1000) {
             Logger.error(
-              i18n.t('fsm.algorithmTimedOutDuringStreaming', { ns: 'client' }),
+              i18n.t('fsm.algorithmTimedOutDuringHealthCheckStreamReady', {
+                ns: 'client',
+              }),
             )
-            await this._handleAlgorithmGenerationFailure()
+            await this._switchState(States.EXIT)
             return
           }
           await new Promise(resolve =>
@@ -809,9 +811,11 @@ export class StateMachine {
         } else {
           if (currentTime - readyTime > orchestratorTimeout * 1000) {
             Logger.error(
-              i18n.t('fsm.algorithmTimedOutDuringStreaming', { ns: 'client' }),
+              i18n.t('fsm.algorithmTimedOutDuringHealthCheckStreamEnd', {
+                ns: 'client',
+              }),
             )
-            await this._handleAlgorithmGenerationFailure()
+            await this._switchState(States.EXIT)
             return
           }
           await new Promise(resolve =>