Fix Linux desktop package missing default Live2D model assets (#1452)

yiyiyiyiGKY · web-flow · commit f970236029ce · 2026-05-21T00:07:05.000-07:00
* fix(linux): keep pet UI hidden during model manager changes

Preserve the model-manager hide state across model reloads and character-card switches so Linux pet overlays do not reveal the chat box, avatar, or floating buttons while the manager is still open.

Re-hide recreated model controls after reloads and skip chat/button restoration when model manager owns visibility.

* fix: include default Live2D model in Linux desktop builds

Use the existing build_frontend.sh entrypoint for Linux desktop workflows so assets/yui-origin.tar.gz is unpacked before packaging. This keeps Windows and macOS on their existing build paths while fixing the Linux package missing static/yui-origin.

Also guard page_config against null model_info responses so missing model resources do not crash the config endpoint.

* fix: preserve main UI hidden state during model reload

Treat preserveHiddenState as an alias for skipHiddenStateUpdate in handleHideMainUI so model reload and character-switch callers do not re-broadcast the model-manager hidden state.

* fix: surface default Live2D fallback failures

Return an explicit failure from current_live2d_model when the default Live2D fallback is unavailable instead of reporting success with a null model_info.

Show that failure in the model manager and assert the Linux desktop build contains the unpacked yui-origin model config before packaging.

* ci: share frontend build verification

Add a shared frontend build verifier that reports a clear error when the unpacked yui-origin model config is missing after build_frontend.sh.

Use the verifier from both Linux desktop build workflows instead of duplicating a bare test command.
diff --git a/.github/workflows/build-desktop-linux.yml b/.github/workflows/build-desktop-linux.yml
@@ -210,12 +210,8 @@ jobs:
       - name: Build all frontend projects
         shell: bash
         run: |
-          cd frontend/plugin-manager
-          npm ci
-          npm run build-only
-          cd ../react-neko-chat
-          npm ci
-          npm run build
+          ./build_frontend.sh
+          bash scripts/verify_frontend_build.sh
 
       # --- Build with Nuitka ---
       - name: Build with Nuitka
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -249,6 +249,11 @@ jobs:
       - name: Build all frontend projects
         shell: bash
         run: |
+          if [[ "$RUNNER_OS" == "Linux" ]]; then
+            ./build_frontend.sh
+            bash scripts/verify_frontend_build.sh
+            exit 0
+          fi
           cd frontend/plugin-manager
           npm ci
           npm run build-only
diff --git a/main_routers/characters_router.py b/main_routers/characters_router.py
@@ -1762,6 +1762,17 @@ async def get_current_live2d_model(catgirl_name: str = "", item_id: str = ""):
         if model_info and isinstance(model_info.get('path'), str):
             model_info['path'] = encode_url_path(model_info['path'])
 
+        if not model_info or not model_info.get('path'):
+            error_message = f"默认Live2D模型 {DEFAULT_LIVE2D_MODEL_NAME} 不可用"
+            logger.error(error_message)
+            return JSONResponse(content={
+                'success': False,
+                'catgirl_name': catgirl_name,
+                'model_name': live2d_model_name or DEFAULT_LIVE2D_MODEL_NAME,
+                'model_info': None,
+                'error': error_message,
+            })
+
         return JSONResponse(content={
             'success': True,
             'catgirl_name': catgirl_name,
diff --git a/main_routers/config_router.py b/main_routers/config_router.py
@@ -284,7 +284,7 @@ async def get_page_config(response: Response, lanlan_name: str = ""):
             # 提取JSONResponse中的内容
             model_data = model_response.body.decode('utf-8')
             model_json = json.loads(model_data)
-            model_info = model_json.get('model_info', {})
+            model_info = model_json.get('model_info') or {}
             model_path = model_info.get('path', '')
         
         result = {
diff --git a/scripts/verify_frontend_build.sh b/scripts/verify_frontend_build.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Verify frontend build outputs that are required by packaged desktop builds.
+set -euo pipefail
+
+REQUIRED_MODEL_FILE="static/yui-origin/yui-origin.model3.json"
+
+if [ ! -f "$REQUIRED_MODEL_FILE" ]; then
+  echo "ERROR: missing $REQUIRED_MODEL_FILE after build_frontend.sh" >&2
+  exit 1
+fi
diff --git a/static/app-character.js b/static/app-character.js
@@ -73,6 +73,30 @@
         }
     }
 
+    function isMainUIHiddenByModelManager() {
+        if (typeof window.isMainUIHiddenByModelManager === 'function') {
+            return window.isMainUIHiddenByModelManager();
+        }
+        return window.__NEKO_MAIN_UI_HIDDEN_BY_MODEL_MANAGER === true;
+    }
+
+    function rehideMainUIIfModelManagerOwnsVisibility(reason) {
+        if (!isMainUIHiddenByModelManager()) return false;
+        if (typeof window.handleHideMainUI === 'function') {
+            window.handleHideMainUI({ preserveHiddenState: true, reason: reason || 'character-switch' });
+        }
+        return true;
+    }
+
+    function restoreChatComposerUnlessModelManagerHidden(chatContainer, textInputArea) {
+        if (isMainUIHiddenByModelManager()) return;
+        if (chatContainer) chatContainer.classList.remove('minimized');
+        if (textInputArea) textInputArea.classList.remove('hidden');
+        if (typeof window.syncVoiceChatComposerHidden === 'function') {
+            window.syncVoiceChatComposerHidden(false);
+        }
+    }
+
     function supportsLocalModelRuntime() {
         return !/^\/chat(?:\/|$)/.test(window.location.pathname || '');
     }
@@ -744,7 +768,7 @@
             if (!supportsLocalModelRuntime()) {
                 console.log('[猫娘切换] 当前页面不加载本地模型，跳过模型热切换');
                 // chat.html 不走模型分支，在此显式恢复 composer（兜底 onclose 路径）
-                if (typeof window.syncVoiceChatComposerHidden === 'function') {
+                if (!isMainUIHiddenByModelManager() && typeof window.syncVoiceChatComposerHidden === 'function') {
                     window.syncVoiceChatComposerHidden(false);
                 }
             } else if (effectiveModelType === 'vrm') {
@@ -1135,17 +1159,14 @@
                 const chatContainerVrm = document.getElementById('chat-container');
                 const textInputArea = document.getElementById('text-input-area');
                 console.log('[猫娘切换] VRM - 恢复对话框 - chatContainer存在:', !!chatContainerVrm, '当前类:', chatContainerVrm ? chatContainerVrm.className : 'N/A');
-                if (chatContainerVrm) chatContainerVrm.classList.remove('minimized');
-                if (textInputArea) textInputArea.classList.remove('hidden');
-                if (typeof window.syncVoiceChatComposerHidden === 'function') {
-                    window.syncVoiceChatComposerHidden(false);
-                }
+                restoreChatComposerUnlessModelManagerHidden(chatContainerVrm, textInputArea);
                 console.log('[猫娘切换] VRM - 对话框已恢复，当前类:', chatContainerVrm ? chatContainerVrm.className : 'N/A');
 
                 // 确保 VRM 按钮和锁图标可见
                 setTimeout(() => {
                     // fire-and-forget 延迟回调：用户在 300ms 内切到别角色时旧回调会重建错类型按钮
                     if (!isStillActiveSwitchTarget()) return;
+                    if (rehideMainUIIfModelManagerOwnsVisibility('character-switch-vrm-delay')) return;
                     const vrmButtons = document.getElementById('vrm-floating-buttons');
                     console.log('[猫娘切换] VRM按钮检查 - 存在:', !!vrmButtons);
                     if (vrmButtons) {
@@ -1368,15 +1389,12 @@
 
                 const chatContainerMmd = document.getElementById('chat-container');
                 const textInputAreaMmd = document.getElementById('text-input-area');
-                if (chatContainerMmd) chatContainerMmd.classList.remove('minimized');
-                if (textInputAreaMmd) textInputAreaMmd.classList.remove('hidden');
-                if (typeof window.syncVoiceChatComposerHidden === 'function') {
-                    window.syncVoiceChatComposerHidden(false);
-                }
+                restoreChatComposerUnlessModelManagerHidden(chatContainerMmd, textInputAreaMmd);
 
                 // 延时显示 MMD 浮动按钮和锁图标
                 setTimeout(() => {
                     if (!isStillActiveSwitchTarget()) return;
+                    if (rehideMainUIIfModelManagerOwnsVisibility('character-switch-mmd-delay')) return;
                     const mmdButtons = document.getElementById('mmd-floating-buttons');
                     if (mmdButtons) {
                         mmdButtons.style.removeProperty('display');
@@ -1556,15 +1574,12 @@
 
                 const chatContainerL2d = document.getElementById('chat-container');
                 const textInputAreaL2d = document.getElementById('text-input-area');
-                if (chatContainerL2d) chatContainerL2d.classList.remove('minimized');
-                if (textInputAreaL2d) textInputAreaL2d.classList.remove('hidden');
-                if (typeof window.syncVoiceChatComposerHidden === 'function') {
-                    window.syncVoiceChatComposerHidden(false);
-                }
+                restoreChatComposerUnlessModelManagerHidden(chatContainerL2d, textInputAreaL2d);
 
                 // 延时重启 Ticker 和显示按钮（双重保险）
                 setTimeout(() => {
                     if (!isStillActiveSwitchTarget()) return;
+                    if (rehideMainUIIfModelManagerOwnsVisibility('character-switch-live2d-delay')) return;
 
                     window.dispatchEvent(new Event('resize'));
 
@@ -1645,6 +1660,7 @@
                 Promise.resolve(window.resetAgentUiForCharacterSwitch(newCatgirl))
                     .catch(err => console.warn('[猫娘切换] 刷新猫爪状态失败:', err));
             }
+            rehideMainUIIfModelManagerOwnsVisibility('character-switch-commit');
             showStatusToast(window.t ? window.t('app.switchedCatgirl', { name: newCatgirl }) : `已切换到 ${newCatgirl}`, 3000);
 
             // 【成就】解锁换肤成就
diff --git a/static/app-interpage.js b/static/app-interpage.js
@@ -24,6 +24,7 @@
     const mod = {};
     const S = window.appState;
     // const C = window.appConst;  // not used in this module currently
+    const MAIN_UI_HIDDEN_BY_MODEL_MANAGER_KEY = '__NEKO_MAIN_UI_HIDDEN_BY_MODEL_MANAGER';
 
     // =====================================================================
     // Message deduplication (BC + postMessage deliver the same message twice)
@@ -43,6 +44,51 @@
         return false;
     }
 
+    function isMainUIHiddenByModelManager() {
+        return window[MAIN_UI_HIDDEN_BY_MODEL_MANAGER_KEY] === true;
+    }
+
+    function ensureMainUIHiddenStyle() {
+        if (document.getElementById('neko-main-ui-hidden-by-model-manager-style')) return;
+        var style = document.createElement('style');
+        style.id = 'neko-main-ui-hidden-by-model-manager-style';
+        style.textContent = [
+            'body.neko-main-ui-hidden-by-model-manager #live2d-container,',
+            'body.neko-main-ui-hidden-by-model-manager #vrm-container,',
+            'body.neko-main-ui-hidden-by-model-manager #mmd-container,',
+            'body.neko-main-ui-hidden-by-model-manager #live2d-canvas,',
+            'body.neko-main-ui-hidden-by-model-manager #vrm-canvas,',
+            'body.neko-main-ui-hidden-by-model-manager #mmd-canvas,',
+            'body.neko-main-ui-hidden-by-model-manager #live2d-floating-buttons,',
+            'body.neko-main-ui-hidden-by-model-manager #vrm-floating-buttons,',
+            'body.neko-main-ui-hidden-by-model-manager #mmd-floating-buttons,',
+            'body.neko-main-ui-hidden-by-model-manager #live2d-lock-icon,',
+            'body.neko-main-ui-hidden-by-model-manager #vrm-lock-icon,',
+            'body.neko-main-ui-hidden-by-model-manager #mmd-lock-icon,',
+            'body.neko-main-ui-hidden-by-model-manager #live2d-return-button-container,',
+            'body.neko-main-ui-hidden-by-model-manager #vrm-return-button-container,',
+            'body.neko-main-ui-hidden-by-model-manager #mmd-return-button-container {',
+            '  display: none !important;',
+            '  visibility: hidden !important;',
+            '  pointer-events: none !important;',
+            '}'
+        ].join('\n');
+        (document.head || document.documentElement).appendChild(style);
+    }
+
+    function setMainUIHiddenByModelManager(hidden) {
+        window[MAIN_UI_HIDDEN_BY_MODEL_MANAGER_KEY] = !!hidden;
+        ensureMainUIHiddenStyle();
+        if (document.body) {
+            document.body.classList.toggle('neko-main-ui-hidden-by-model-manager', !!hidden);
+        }
+        try {
+            window.dispatchEvent(new CustomEvent('neko:main-ui-hidden-by-model-manager-changed', {
+                detail: { hidden: !!hidden }
+            }));
+        } catch (_) {}
+    }
+
     function applyTutorialChatIdentityOverride(payload) {
         var detail = payload || {};
         if (detail.active) {
@@ -892,6 +938,13 @@
             window._modelReloadInFlight = false;
             resolveReload();
 
+            // If the model manager is still open, keep the Pet UI hidden even
+            // though the reload path briefly re-created containers/buttons.
+            if (isMainUIHiddenByModelManager()) {
+                console.log('[Model] 主界面处于模型管理隐藏状态，模型重载完成后重新隐藏 UI');
+                handleHideMainUI({ preserveHiddenState: true });
+            }
+
             // Process any queued reload request
             if (window._pendingModelReload) {
                 console.log('[Model] 执行待处理的模型重载请求');
@@ -1131,8 +1184,13 @@
     /**
      * Hide main-page model rendering (entering model manager).
      */
-    function handleHideMainUI() {
+    function handleHideMainUI(options) {
         if (!_isModelHostPage()) return;
+        options = options || {};
+        var skipHiddenStateUpdate = options.skipHiddenStateUpdate || options.preserveHiddenState;
+        if (!skipHiddenStateUpdate) {
+            setMainUIHiddenByModelManager(true);
+        }
         console.log('[UI] 隐藏主界面并暂停渲染');
 
         try {
@@ -1206,13 +1264,15 @@
                 '#live2d-lock-icon, #vrm-lock-icon, #mmd-lock-icon, ' +
                 '#live2d-return-button-container, #vrm-return-button-container, #mmd-return-button-container'
             ).forEach(function (el) {
-                var computedDisplay = '';
-                try {
-                    computedDisplay = window.getComputedStyle(el).display || '';
-                } catch (_) {}
-                el.dataset.nekoPreHideDisplay = computedDisplay && computedDisplay !== 'none'
-                    ? computedDisplay
-                    : (el.style.display || 'none');
+                if (!el.dataset.nekoPreHideDisplay) {
+                    var computedDisplay = '';
+                    try {
+                        computedDisplay = window.getComputedStyle(el).display || '';
+                    } catch (_) {}
+                    el.dataset.nekoPreHideDisplay = computedDisplay && computedDisplay !== 'none'
+                        ? computedDisplay
+                        : (el.style.display || 'none');
+                }
                 el.style.display = 'none';
             });
         } catch (error) {
@@ -1225,6 +1285,7 @@
      */
     function handleShowMainUI() {
         if (!_isModelHostPage()) return;
+        setMainUIHiddenByModelManager(false);
         // 模型重载进行中时跳过：handleModelReload 自己会正确切换容器，
         // 此时 lanlan_config.model_type 尚未更新，handleShowMainUI 会
         // 错误地恢复旧模型类型的容器，导致需要切换两次才能成功。
@@ -2277,6 +2338,7 @@
     mod.resetToDefaultModel = resetToDefaultModel;
     mod.handleHideMainUI = handleHideMainUI;
     mod.handleShowMainUI = handleShowMainUI;
+    mod.isMainUIHiddenByModelManager = isMainUIHiddenByModelManager;
     mod.handleMemoryEdited = handleMemoryEdited;
     mod.cleanupLive2DOverlayUI = cleanupLive2DOverlayUI;
     mod.cleanupVRMOverlayUI = cleanupVRMOverlayUI;
@@ -2292,6 +2354,7 @@
     window.resetToDefaultModel = resetToDefaultModel;
     window.handleHideMainUI = handleHideMainUI;
     window.handleShowMainUI = handleShowMainUI;
+    window.isMainUIHiddenByModelManager = isMainUIHiddenByModelManager;
     window.cleanupLive2DOverlayUI = cleanupLive2DOverlayUI;
     window.cleanupVRMOverlayUI = cleanupVRMOverlayUI;
     window.cleanupMMDOverlayUI = cleanupMMDOverlayUI;
diff --git a/static/js/model_manager.js b/static/js/model_manager.js
@@ -9490,6 +9490,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                 const currentModelData = await RequestHelper.fetchJson(apiUrl);
 
                 if (!currentModelData.success) {
+                    showStatus(currentModelData.error || t('live2d.loadCurrentModelFailed', '加载当前角色模型失败'));
                     return;
                 }
 
diff --git a/tests/unit/test_characters_router_model_settings.py b/tests/unit/test_characters_router_model_settings.py
@@ -226,6 +226,37 @@ async def test_switching_self_created_character_to_workshop_model_marks_current_
     assert get_reserved(saved_catgirl, 'character_origin', 'source_id', default='') == ''
 
 
+@pytest.mark.asyncio
+async def test_current_live2d_model_reports_failure_when_default_fallback_is_missing(monkeypatch):
+    characters = {
+        '当前猫娘': '测试角色',
+        '猫娘': {
+            '测试角色': {
+                '_reserved': {
+                    'avatar': {
+                        'live2d': {
+                            'model_path': '',
+                        },
+                    },
+                },
+            },
+        },
+    }
+    config_manager = DummyConfigManager(characters)
+
+    monkeypatch.setattr(characters_router_module, 'get_config_manager', lambda: config_manager)
+    monkeypatch.setattr(characters_router_module, 'find_models', lambda: [])
+    monkeypatch.setattr(characters_router_module, 'find_model_directory', lambda _name: (None, ''))
+
+    response = await characters_router_module.get_current_live2d_model('测试角色')
+    body = json.loads(response.body)
+
+    assert body['success'] is False
+    assert body['model_name'] == characters_router_module.DEFAULT_LIVE2D_MODEL_NAME
+    assert body['model_info'] is None
+    assert '默认Live2D模型' in body['error']
+
+
 def test_live3d_sub_type_prefers_persisted_active_sub_type_when_both_paths_exist():
     catgirl = _build_characters_fixture()['猫娘']['测试角色']
 

Original file line number	Diff line number	Diff line change
`@@ -9490,6 +9490,7 @@ document.addEventListener('DOMContentLoaded', async () => {`
`9490`	`9490`	`const currentModelData = await RequestHelper.fetchJson(apiUrl);`
`9491`	`9491`
`9492`	`9492`	`if (!currentModelData.success) {`
	`9493`	`+ showStatus(currentModelData.error \|\| t('live2d.loadCurrentModelFailed', '加载当前角色模型失败'));`
`9493`	`9494`	`return;`
`9494`	`9495`	`}`
`9495`	`9496`