myagent-ai 1.20.7 → 1.20.9

package/chatbot/manager.py

@@ -35,7 +35,9 @@ class ChatBotManager:
 
     def __init__(self):
         self._bots: Dict[str, BaseChatBot] = {}
+        self._bot_tasks: Dict[str, asyncio.Task] = {}  # key -> asyncio.Task
         self._session_map: Dict[str, str] = {}  # session_id -> last_message
+        self._message_handler: Optional[Callable] = None
 
     def get_bot(self, key: str):
         """根据 key (id 或 platform 名) 获取 bot 实例"""
@@ -49,20 +51,62 @@ class ChatBotManager:
         """
         初始化所有聊天平台。
 
+        [v1.20.7] 修复: 先停止并移除已不存在的/被禁用的 bot，
+        再创建新启用的 bot。之前只做添加不做移除，导致禁用平台后
+        bot 仍在后台运行。
+
         Args:
             platform_configs: 平台配置列表
             message_handler: 统一消息处理回调
         """
+        self._message_handler = message_handler
+
+        # 计算当前应该启用的平台 key 集合
+        new_keys = set()
+        for cfg in platform_configs:
+            if cfg.enabled:
+                key = cfg.id or cfg.platform
+                new_keys.add(key)
+
+        # 找出需要移除的（旧的 key 不在新的 key 集合中）
+        removed_keys = [k for k in self._bots if k not in new_keys]
+        for key in removed_keys:
+            bot = self._bots.pop(key, None)
+            task = self._bot_tasks.pop(key, None)
+            if bot:
+                logger.info(f"聊天平台已移除(禁用/删除): {key}")
+                # 尝试停止 bot（同步包装异步）
+                try:
+                    loop = asyncio.get_event_loop()
+                    if loop.is_running():
+                        asyncio.ensure_future(self._safe_stop(key, bot))
+                    else:
+                        loop.run_until_complete(bot.stop())
+                except RuntimeError:
+                    pass
+            if task and not task.done():
+                task.cancel()
+                logger.info(f"聊天平台 {key} 后台任务已取消")
+
+        # 创建或更新启用的平台
         for cfg in platform_configs:
             if not cfg.enabled:
                 continue
+            key = cfg.id or cfg.platform
+            # 如果已经存在且配置没变，跳过重建
+            if key in self._bots:
+                continue
             try:
                 bot = self._create_bot(cfg, message_handler)
                 if bot:
-                    # 使用唯一 id 作为 key，支持多实例
-                    key = cfg.id or cfg.platform
                     self._bots[key] = bot
                     logger.info(f"聊天平台已配置: {cfg.display_name or key}")
+                    # 如果已经在运行中（start_all 已调用），自动启动新 bot
+                    loop = asyncio.get_event_loop()
+                    if loop.is_running() and not any(
+                        t for t in asyncio.all_tasks(loop) if t.get_name() == f"bot_{key}"
+                    ):
+                        asyncio.ensure_future(self._run_bot(key, bot))
             except Exception as e:
                 logger.error(f"平台 {cfg.display_name or cfg.platform} 初始化失败: {e}")
 
@@ -143,7 +187,8 @@ class ChatBotManager:
         tasks = []
         for name, bot in self._bots.items():
             logger.info(f"启动聊天平台: {name}")
-            task = asyncio.create_task(self._run_bot(name, bot))
+            task = asyncio.create_task(self._run_bot(name, bot), name=f"bot_{name}")
+            self._bot_tasks[name] = task
             tasks.append(task)
         await asyncio.gather(*tasks, return_exceptions=True)
 
@@ -151,16 +196,39 @@ class ChatBotManager:
         """安全运行单个聊天平台"""
         try:
             await bot.start()
+        except asyncio.CancelledError:
+            logger.info(f"聊天平台 {name} 已取消")
         except Exception as e:
             logger.error(f"聊天平台 {name} 运行异常: {e}")
 
+    async def _safe_stop(self, name: str, bot: BaseChatBot):
+        """安全停止单个 bot（不抛异常）"""
+        try:
+            await bot.stop()
+            logger.info(f"聊天平台 {name} 已停止")
+        except Exception as e:
+            logger.warning(f"停止聊天平台 {name} 异常: {e}")
+
+    async def stop_platform(self, key: str) -> bool:
+        """[v1.20.7] 停止并移除单个聊天平台"""
+        bot = self._bots.pop(key, None)
+        task = self._bot_tasks.pop(key, None)
+        if not bot:
+            return False
+        await self._safe_stop(key, bot)
+        if task and not task.done():
+            task.cancel()
+        return True
+
     async def stop_all(self):
         """停止所有聊天平台"""
-        for name, bot in self._bots.items():
+        for name, bot in list(self._bots.items()):
             try:
                 await bot.stop()
             except Exception as e:
                 logger.error(f"停止 {name} 失败: {e}")
+        self._bots.clear()
+        self._bot_tasks.clear()
         logger.info("所有聊天平台已停止")
 
     async def send_to_all(self, text: str):

package/config.py

@@ -155,6 +155,7 @@ class AppConfig:
     data_dir: str = ""                 # 数据目录，默认 ~/.myagent/
     language: str = "zh-CN"
     timezone: str = "Asia/Shanghai"     # 时区，用于生成时间戳和提示词中的当前时间
+    public_url: str = ""               # [v1.20.8] 公开访问 URL（用于生成文件下载链接），如 http://your-server.com:8767
 
 
 # ==============================================================================

package/core/context_builder.py

@@ -238,12 +238,29 @@ class ContextBuilder:
             f"描述: {safe_desc}",
         ]
 
+        # [v1.20.8] 注入工作目录信息，让 Agent 知道文件应保存到哪里
+        work_dir = self._get_workspace_dir()
+        if work_dir:
+            parts.append(f"工作目录: {_xml_escape(str(work_dir))}")
+            parts.append(f"文件保存说明: 通过 file_write 或代码生成的文件请保存到工作目录下的 userfiles 子目录。发送文件给用户请使用 file_send 工具。")
+
         if agent_override_prompt:
             parts.append(f"附加指令: {_xml_escape(agent_override_prompt)}")
 
         parts.append("</whomi>")
         return "\n".join(parts)
 
+    def _get_workspace_dir(self) -> Optional[str]:
+        """[v1.20.8] 获取工作目录路径（~/.myagent/data/workspace）"""
+        try:
+            from config import ConfigManager
+            cm = ConfigManager()
+            wd = cm.data_dir / "workspace"
+            wd.mkdir(parents=True, exist_ok=True)
+            return str(wd)
+        except Exception:
+            return None
+
     def _build_memory(self, query: str, session_id: str, recall: str = "", memory_context_prompt: str = "") -> str:
         """
         构建 <automemory> 和 <recall_memory> 段落 —— 双层记忆检索结果。

package/core/deps_checker.py

@@ -126,6 +126,17 @@ DEPENDENCIES: List[DepInfo] = [
     # ── 远程桌面 (VNC) [v1.17.0] ──
     # VNC 依赖通过 apt 安装 (xvfb, x11vnc)，websockify 通过 pip 安装
     # 实际检测和安装在 VNCManager.ensure_dependencies() 中完成
+
+    # ── 系统工具 [v1.20.9] ──
+    # ffmpeg: SenseVoice 音频解码必需 (WAV→16kHz转换)
+]
+
+# [v1.20.9] 系统级工具依赖列表（非 Python 包，需通过系统包管理器安装）
+SYSTEM_TOOLS = [
+    {"name": "ffmpeg", "note": "FFmpeg 多媒体处理工具 (SenseVoice STT 必需, 用于音频格式转换)",
+     "install": {"linux": "sudo apt install ffmpeg", "macos": "brew install ffmpeg"}},
+    {"name": "convert", "note": "ImageMagick 图像处理工具 (VNC 截图备用)",
+     "install": {"linux": "sudo apt install imagemagick", "macos": "brew install imagemagick"}},
 ]
 
 

package/core/web_control.py

@@ -415,12 +415,30 @@ class WebControlManager:
         """
         向客户端下发命令并等待结果。
         Agent 工具调用线程阻塞在此, 直到客户端返回结果或超时。
+        
+        [v1.20.9] 修复: 如果面板尚未打开（刚执行了 open 但客户端还没加载完成），
+        会等待最多 15 秒让面板打开，而不是立即报错。
         """
         session = self.get_session(session_id)
         if not session:
             return {"success": False, "error": f"Session {session_id} not found or expired"}
+        
+        # [v1.20.9] 等待面板打开（最多 15 秒）
         if not session.is_panel_open:
-            return {"success": False, "error": "Panel is not open. Use 'open' action first."}
+            logger.info(f"[WebControl] 等待面板打开 (session: {session_id}, action: {action})")
+            waited = 0
+            while waited < 15:
+                await asyncio.sleep(1)
+                waited += 1
+                if session.is_panel_open:
+                    logger.info(f"[WebControl] 面板已打开 (等待了 {waited}s)")
+                    break
+                # 检查会话是否已关闭
+                if session._closed:
+                    return {"success": False, "error": "Session closed while waiting for panel"}
+            
+            if not session.is_panel_open:
+                return {"success": False, "error": "Panel is not open. Use 'open' action first. (waited 15s)"}
 
         cmd_id = uuid.uuid4().hex[:10]
         command = {

package/main.py

@@ -183,6 +183,9 @@ class MyAgentApp:
 
         # 4. 执行引擎
         exe_cfg = self.config.executor
+        # [v1.20.8] 设置工作目录为 workspace，Agent 生成的文件默认保存到这里
+        workspace_dir = str(self.config_mgr.data_dir / "workspace")
+        os.makedirs(workspace_dir, exist_ok=True)
         self.executor = ExecutionEngine(
             timeout=exe_cfg.timeout,
             max_retries=exe_cfg.max_retries,
@@ -192,8 +195,9 @@ class MyAgentApp:
             sandbox_image=exe_cfg.sandbox_image,
             sandbox_network=exe_cfg.sandbox_network,
             sandbox_memory=exe_cfg.sandbox_memory,
+            work_dir=workspace_dir,
         )
-        self.logger.info(f"执行引擎: timeout={exe_cfg.timeout}s, auto_fix={exe_cfg.auto_fix}")
+        self.logger.info(f"执行引擎: timeout={exe_cfg.timeout}s, auto_fix={exe_cfg.auto_fix}, work_dir={workspace_dir}")
 
         # 5. 技能系统
         self.skill_registry = SkillRegistry()
@@ -443,6 +447,8 @@ class MyAgentApp:
         """
         处理来自聊天平台的消息。
 
+        [v1.20.8] 修复: 发送到平台前，将相对路径的文件链接替换为绝对 URL。
+
         Args:
             message: 聊天消息
             bot: 发送消息的机器人实例
@@ -463,6 +469,10 @@ class MyAgentApp:
         # 处理消息
         response_text = await self.process_message(message.text, session_id)
 
+        # [v1.20.8] 将回复中的相对路径文件链接替换为绝对 URL
+        # (file_send 生成的 /api/file/xxx 链接在 Telegram/Discord 等外部平台无法访问)
+        response_text = self._fix_file_urls_for_platform(response_text)
+
         # 发送回复
         await bot.send_message(ChatResponse(
             chat_id=message.chat_id,
@@ -470,6 +480,42 @@ class MyAgentApp:
             text=response_text,
         ))
 
+    def _fix_file_urls_for_platform(self, text: str) -> str:
+        """[v1.20.8] 将文本中相对路径的文件下载链接替换为绝对 URL。
+
+        匹配模式:
+        - /api/file/{file_id}           → {public_url}/api/file/{file_id}
+        - /api/file/{file_id}/download  → {public_url}/api/file/{file_id}/download
+        - (href="|src=")(/api/file/...) → 加上 public_url 前缀
+        """
+        import re
+        from skills.file_send import get_public_base_url
+
+        base_url = get_public_base_url()
+        if not base_url:
+            return text  # 没有配置 public_url，不做替换
+
+        # 匹配 markdown 链接: [text](/api/file/...)
+        text = re.sub(
+            r'(\[([^\]]*)\]\()(/api/file/[^\)]+)(\))',
+            lambda m: f'{m.group(1)}{base_url}{m.group(3)}{m.group(4)}',
+            text,
+        )
+        # 匹配 HTML 属性: href="/api/file/..." 或 src="/api/file/..."
+        text = re.sub(
+            r'((?:href|src)=["\'])(/api/file/[^"\']*)(["\'])',
+            lambda m: f'{m.group(1)}{base_url}{m.group(2)}{m.group(3)}',
+            text,
+        )
+        # 匹配裸链接: /api/file/{12位ID}（可能后面有 /download）
+        text = re.sub(
+            r'(?<!["\(/a-zA-Z])(/api/file/[a-f0-9]{12}(?:/download)?)',
+            lambda m: f'{base_url}{m.group(1)}',
+            text,
+        )
+
+        return text
+
     async def run_cli(self):
         """运行交互式命令行"""
         if not self.main_agent:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.20.7",
+  "version": "1.20.9",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/skills/file_send.py

@@ -2,6 +2,11 @@
 skills/file_send.py - Agent 文件发送工具
 ========================================
 让 Agent 可以向用户发送文件（图片、PDF、文档等）。
+
+[v1.20.8] 修复:
+- 新增 get_public_base_url() 函数，生成文件下载的绝对 URL
+- 支持 MYAGENT_PUBLIC_URL 环境变量和 config.json 中 public_url 字段
+- 平台消息中的文件链接可正确访问
 """
 import os
 import json
@@ -17,6 +22,42 @@ UPLOADS_DIR = Path(__file__).parent.parent / "data" / "uploads"
 UPLOADS_DIR.mkdir(parents=True, exist_ok=True)
 
 
+def get_public_base_url() -> str:
+    """[v1.20.8] 获取公开访问的基础 URL（带协议头）。
+
+    优先级: 环境变量 MYAGENT_PUBLIC_URL > config.json public_url 字段 > 空（仅返回相对路径）
+    用法示例: http://your-server.com:8767 或 https://your-domain.com
+
+    结果会被缓存，避免重复读取配置文件。
+    """
+    # 缓存: 同一进程生命周期内只读取一次配置
+    if get_public_base_url._cached is not None:
+        return get_public_base_url._cached
+
+    # 1. 环境变量
+    env_url = os.environ.get("MYAGENT_PUBLIC_URL", "").strip().rstrip("/")
+    if env_url:
+        get_public_base_url._cached = env_url
+        return env_url
+
+    # 2. config.json
+    try:
+        from config import ConfigManager
+        cm = ConfigManager()
+        cfg = cm.config
+        public_url = getattr(cfg, "public_url", "").strip().rstrip("/")
+        if public_url:
+            get_public_base_url._cached = public_url
+            return public_url
+    except Exception:
+        pass
+
+    get_public_base_url._cached = ""
+    return ""
+
+get_public_base_url._cached = None  # type: ignore
+
+
 class FileSendSkill:
     """文件发送技能 — Agent 可通过此技能向用户发送文件"""
 
@@ -68,6 +109,7 @@ class FileSendSkill:
             mime = mime_map.get(fpath.suffix.lower(), "application/octet-stream")
             size = stored_path.stat().st_size
 
+            base_url = get_public_base_url()
             result = {
                 "success": True,
                 "file_id": file_id,
@@ -75,8 +117,8 @@ class FileSendSkill:
                 "type": mime,
                 "size": size,
                 "description": description or f"文件: {fpath.name}",
-                "url": f"/api/file/{file_id}",
-                "download_url": f"/api/file/{file_id}/download",
+                "url": f"{base_url}/api/file/{file_id}",
+                "download_url": f"{base_url}/api/file/{file_id}/download",
             }
 
             # Send v2_file SSE event so frontend can display it

package/web/api_server.py

@@ -280,16 +280,22 @@ class ApiServer:
         logger.info("通信管理器已热更新")
 
     def _hot_reload_chat_platforms(self):
-        """热更新聊天平台：重新加载所有平台配置到 ChatBotManager"""
+        """热更新聊天平台：重新加载所有平台配置到 ChatBotManager
+        
+        [v1.20.7] 修复: 调用 setup_platforms 时会自动停止已禁用的平台并启动新启用的平台。
+        [v1.20.9] 修复: chat_manager 为 None 时懒创建，修复首次启用平台不生效的问题。
+        """
+        if not self.core.chat_manager:
+            from chatbot.manager import ChatBotManager
+            self.core.chat_manager = ChatBotManager()
+            logger.info("聊天平台管理器已懒创建")
         mgr = self.core.chat_manager
-        if not mgr:
-            return
-        # 重新设置平台（会重建bot实例）
         platform_configs = self.core.config_mgr.config.chat_platforms
-        # 停止旧的平台
-        # 注意：这里不直接调用 async stop_all，仅更新配置引用
-        # 实际的平台重启需要异步操作，在 handle_restart_platform 中处理
-        mgr.setup_platforms(platform_configs, mgr._message_handler if hasattr(mgr, '_message_handler') else None)
+        # setup_platforms 会自动对比新旧配置，停止被移除/禁用的 bot，启动新启用的 bot
+        handler = mgr._message_handler if hasattr(mgr, '_message_handler') else None
+        if not handler and hasattr(self.core, '_handle_chat_message'):
+            handler = self.core._handle_chat_message
+        mgr.setup_platforms(platform_configs, handler)
         logger.info("聊天平台配置已热更新")
 
     def _setup_routes(self):
@@ -486,6 +492,8 @@ class ApiServer:
         r.add_post("/api/vnc/restart", self.handle_vnc_restart)
         r.add_get("/api/vnc/screenshot", self.handle_vnc_screenshot)
         r.add_get("/vnc/{path:.*}", self.handle_novnc_proxy)  # noVNC 客户端页面代理
+        # [v1.20.8] VNC WebSocket 代理 — 通过主服务器转发 VNC WebSocket，解决 HTTPS/WSS 问题
+        r.add_get("/api/vnc/ws", self.handle_vnc_websocket)
         # [v1.21.0] Web Control API
         r.add_get("/api/web_control/status", self.handle_wc_status)
         r.add_post("/api/web_control/create", self.handle_wc_create_session)
@@ -806,20 +814,85 @@ class ApiServer:
 
         # 方法3: 对于 WebSocket 连接，代理到 websockify
         if path == 'websockify' or 'ws' in path:
-            # WebSocket 代理由 websockify 处理，告诉客户端连接地址
+            # [v1.20.8] 返回代理 WebSocket URL（通过主服务器转发）
+            ws_scheme = 'wss' if request.scheme == 'https' else 'ws'
             return web.json_response({
-                "ws_url": f"ws://{request.host.split(':')[0]}:{mgr.novnc_port}"
+                "ws_url": f"{ws_scheme}://{request.host}/api/vnc/ws"
             })
 
         return web.Response(status=404, text="Not found")
 
+    async def handle_vnc_websocket(self, request):
+        """[v1.20.8] GET /api/vnc/ws - VNC WebSocket 代理
+        
+        通过主服务器的 HTTP/HTTPS 通道代理 VNC WebSocket 连接。
+        解决 HTTPS 页面无法连接 ws://localhost:6080 的问题。
+        
+        浏览器 ←(wss://host/api/vnc/ws)→ aiohttp代理 ←(ws://localhost:6080)→ websockify ←(VNC)→ x11vnc
+        """
+        import aiohttp
+
+        mgr = self._get_vnc_manager()
+        if not mgr.is_running:
+            return web.Response(status=503, text="VNC 服务未运行")
+
+        # 准备 WebSocket upgrade
+        ws_server = web.WebSocketResponse()
+        await ws_server.prepare(request)
+
+        # 连接到后端 websockify
+        target_url = f"ws://127.0.0.1:{mgr.novnc_port}"
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.ws_connect(target_url) as ws_backend:
+                    # 双向转发: 客户端 ↔ 后端 websockify
+                    async def client_to_backend():
+                        async for msg in ws_server:
+                            if msg.type == aiohttp.WSMsgType.TEXT:
+                                await ws_backend.send_str(msg.data)
+                            elif msg.type == aiohttp.WSMsgType.BINARY:
+                                await ws_backend.send_bytes(msg.data)
+                            elif msg.type in (aiohttp.WSMsgType.CLOSE, aiohttp.WSMsgType.CLOSING, aiohttp.WSMsgType.CLOSED):
+                                await ws_backend.close()
+                                break
+                            elif msg.type == aiohttp.WSMsgType.ERROR:
+                                break
+
+                    async def backend_to_client():
+                        async for msg in ws_backend:
+                            if msg.type == aiohttp.WSMsgType.TEXT:
+                                await ws_server.send_str(msg.data)
+                            elif msg.type == aiohttp.WSMsgType.BINARY:
+                                await ws_server.send_bytes(msg.data)
+                            elif msg.type in (aiohttp.WSMsgType.CLOSE, aiohttp.WSMsgType.CLOSING, aiohttp.WSMsgType.CLOSED):
+                                await ws_server.close()
+                                break
+                            elif msg.type == aiohttp.WSMsgType.ERROR:
+                                break
+
+                    await asyncio.gather(
+                        client_to_backend(),
+                        backend_to_client(),
+                        return_exceptions=True,
+                    )
+        except Exception as e:
+            logger.warning(f"VNC WebSocket 代理错误: {e}")
+        finally:
+            try:
+                await ws_server.close()
+            except Exception:
+                pass
+
+        return ws_server
+
     def _get_builtin_novnc_page(self, request):
         """生成内置的轻量 noVNC 客户端页面
         
         使用 noVNC 的 CDN 版本，连接到本地 websockify 代理。
+        [v1.20.8] 通过 /api/vnc/ws 代理连接，解决 HTTPS/WSS 兼容问题。
+        [v1.20.9] 添加 CDN 加载超时检测，加载失败时提示用户。
         """
-        # 获取 WebSocket URL
-        host = request.host.split(':')[0]
+        # 获取 WebSocket URL — [v1.20.8] 优先使用代理路径
         ws_port = self._get_vnc_manager().novnc_port
 
         return f"""<!DOCTYPE html>
@@ -837,11 +910,14 @@ class ApiServer:
   .toolbar-btn {{ padding: 4px 12px; border-radius: 4px; border: 1px solid #0f3460; background: #0f3460; color: #eee; cursor: pointer; font-size: 12px; }}
   .toolbar-btn:hover {{ background: #1a1a5e; }}
   #screen {{ width: 100%; height: calc(100% - 44px); }}
-  .status {{ position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; }}
+  .status {{ position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; max-width: 500px; }}
   .status h2 {{ margin-bottom: 12px; color: #e94560; }}
-  .status p {{ color: #888; margin-bottom: 16px; font-size: 14px; }}
+  .status p {{ color: #888; margin-bottom: 16px; font-size: 14px; line-height: 1.6; }}
   .connecting {{ color: #ffd700; }}
   .connected {{ color: #00ff88; }}
+  .error {{ color: #ff4444; }}
+  .spinner {{ display: inline-block; width: 24px; height: 24px; border: 3px solid #333; border-top-color: #ffd700; border-radius: 50%; animation: spin 1s linear infinite; margin-bottom: 12px; }}
+  @keyframes spin {{ to {{ transform: rotate(360deg); }} }}
 </style>
 </head>
 <body>
@@ -859,113 +935,215 @@ class ApiServer:
 </div>
 <div id="screen">
   <div class="status" id="statusOverlay">
+    <div class="spinner" id="statusSpinner"></div>
     <h2 id="statusTitle" class="connecting">正在连接远程桌面...</h2>
-    <p id="statusMsg">请稍候</p>
-    <button class="toolbar-btn" onclick="location.reload()">重新连接</button>
+    <p id="statusMsg">正在加载 VNC 客户端组件...</p>
+    <div id="statusActions" style="display:none">
+      <button class="toolbar-btn" onclick="location.reload()" style="margin-right:8px">重新连接</button>
+      <button class="toolbar-btn" onclick="tryDirectConnect()" style="margin-right:8px">尝试直连</button>
+    </div>
   </div>
 </div>
 
-<!-- noVNC from CDN -->
+<!-- [v1.20.9] CDN 加载超时检测 -->
+<script>
+var _vncLoaded = false;
+var _vncLoadTimeout = setTimeout(function() {{
+    if (!_vncLoaded) {{
+        document.getElementById('statusSpinner').style.display = 'none';
+        document.getElementById('statusTitle').className = 'error';
+        document.getElementById('statusTitle').textContent = 'VNC 组件加载超时';
+        document.getElementById('statusMsg').innerHTML =
+            '无法从 CDN 加载 noVNC 组件（可能网络不通）。<br>' +
+            '请检查网络连接，或尝试直连模式。';
+        document.getElementById('statusActions').style.display = '';
+    }}
+}}, 15000); // 15秒超时
+</script>
+
+<!-- noVNC from CDN — 多源回退 -->
 <script type="module">
-import RFB from 'https://cdn.jsdelivr.net/npm/@novnc/novnc@1.5.0/core/rfb.js';
-
-const host = window.location.hostname;
-const wsPort = {ws_port};
-const url = 'ws://' + host + ':' + wsPort;
-
-let rfb = null;
-let isConnected = false;
-
-function updateStatus(connected, title, msg) {{
-    const titleEl = document.getElementById('statusTitle');
-    const msgEl = document.getElementById('statusMsg');
-    const overlay = document.getElementById('statusOverlay');
-    const textEl = document.getElementById('statusText');
-
-    if (connected) {{
-        overlay.style.display = 'none';
-        titleEl.className = 'connected';
-        textEl.textContent = '已连接';
-        isConnected = true;
-    }} else {{
-        overlay.style.display = '';
-        titleEl.className = 'connecting';
-        titleEl.textContent = title || '连接中断';
-        msgEl.textContent = msg || '';
-        textEl.textContent = '已断开';
-        isConnected = false;
+try {{
+    // 尝试多个 CDN 源
+    const CDN_SOURCES = [
+        'https://cdn.jsdelivr.net/npm/@novnc/novnc@1.5.0/core/rfb.js',
+        'https://unpkg.com/@novnc/novnc@1.5.0/core/rfb.js',
+        'https://esm.sh/@novnc/novnc@1.5.0/core/rfb.js',
+    ];
+    let RFB = null;
+    let lastError = '';
+
+    for (const src of CDN_SOURCES) {{
+        try {{
+            const mod = await import(src);
+            RFB = mod.default || mod.RFB;
+            if (RFB) break;
+        }} catch (e) {{
+            lastError = e.message;
+            continue;
+        }}
+    }}
+
+    if (!RFB) {{
+        throw new Error('所有 CDN 源均加载失败: ' + lastError);
     }}
+
+    _vncLoaded = true;
+    clearTimeout(_vncLoadTimeout);
+    initVNC(RFB);
+}} catch (e) {{
+    clearTimeout(_vncLoadTimeout);
+    document.getElementById('statusSpinner').style.display = 'none';
+    document.getElementById('statusTitle').className = 'error';
+    document.getElementById('statusTitle').textContent = 'VNC 组件加载失败';
+    document.getElementById('statusMsg').innerHTML =
+        'noVNC 组件加载失败: ' + e.message + '<br>' +
+        '请检查网络连接后刷新页面重试。';
+    document.getElementById('statusActions').style.display = '';
+    console.error('[VNC] 组件加载失败:', e);
 }}
 
-function connect() {{
-    try {{
-        rfb = new RFB(document.getElementById('screen'), url, {{
-            credentials: {{ password: '' }},
-            shared: true,
-            wsProtocols: ['binary'],
-        }});
-
-        rfb.scaleViewport = true;
-        rfb.resizeSession = false;
-        rfb.background = '#1a1a2e';
-        rfb.qualityLevel = 6;
-        rfb.compressionLevel = 2;
-
-        rfb.addEventListener('connect', function() {{
-            updateStatus(true, '', '');
-        }});
-
-        rfb.addEventListener('disconnect', function(e) {{
-            const clean = e.detail.clean;
-            if (clean) {{
-                updateStatus(false, '连接已关闭', '远程桌面服务已停止');
-            }} else {{
-                updateStatus(false, '连接中断', '正在尝试重新连接...');
-                setTimeout(connect, 3000);
-            }}
-        }});
-
-        rfb.addEventListener('credentialsrequired', function() {{
-            // 无需密码
-        }});
-
-        rfb.addEventListener('desktopname', function(e) {{
-            document.title = e.detail.name + ' - MyAgent';
-        }});
-
-    }} catch (e) {{
-        updateStatus(false, '连接失败', '无法连接到 ' + url + '<br>错误: ' + e.message);
+function initVNC(RFBClass) {{
+    const host = window.location.hostname;
+    const wsPort = {ws_port};
+    const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+    const proxyUrl = wsProtocol + '//' + window.location.host + '/api/vnc/ws';
+    const directUrl = 'ws://' + host + ':' + wsPort;
+
+    let rfb = null;
+    let isConnected = false;
+    let useProxy = true;
+
+    function updateStatus(connected, title, msg) {{
+        const titleEl = document.getElementById('statusTitle');
+        const msgEl = document.getElementById('statusMsg');
+        const overlay = document.getElementById('statusOverlay');
+        const spinner = document.getElementById('statusSpinner');
+        const actions = document.getElementById('statusActions');
+        const textEl = document.getElementById('statusText');
+
+        if (connected) {{
+            overlay.style.display = 'none';
+            titleEl.className = 'connected';
+            textEl.textContent = '已连接';
+            isConnected = true;
+        }} else {{
+            overlay.style.display = '';
+            spinner.style.display = '';
+            actions.style.display = 'none';
+            titleEl.className = 'connecting';
+            titleEl.textContent = title || '连接中断';
+            msgEl.textContent = msg || '';
+            textEl.textContent = '已断开';
+            isConnected = false;
+        }}
     }}
+
+    function getConnectUrl() {{
+        return useProxy ? proxyUrl : directUrl;
+    }}
+
+    function connect() {{
+        const connUrl = getConnectUrl();
+        try {{
+            document.getElementById('statusMsg').textContent =
+                (useProxy ? '通过代理连接: ' + connUrl : '直连: ' + connUrl);
+            rfb = new RFBClass(document.getElementById('screen'), connUrl, {{
+                credentials: {{ password: '' }},
+                shared: true,
+                wsProtocols: ['binary'],
+            }});
+
+            rfb.scaleViewport = true;
+            rfb.resizeSession = false;
+            rfb.background = '#1a1a2e';
+            rfb.qualityLevel = 6;
+            rfb.compressionLevel = 2;
+
+            rfb.addEventListener('connect', function() {{
+                updateStatus(true, '', '');
+            }});
+
+            rfb.addEventListener('disconnect', function(e) {{
+                const clean = e.detail.clean;
+                if (clean) {{
+                    updateStatus(false, '连接已关闭', '远程桌面服务已停止');
+                    document.getElementById('statusSpinner').style.display = 'none';
+                    document.getElementById('statusActions').style.display = '';
+                }} else {{
+                    if (useProxy) {{
+                        useProxy = false;
+                        updateStatus(false, '代理连接失败，尝试直连...', '');
+                        setTimeout(connect, 1000);
+                    }} else {{
+                        updateStatus(false, '连接中断', '5秒后重新连接...');
+                        setTimeout(connect, 5000);
+                    }}
+                }}
+            }});
+
+            rfb.addEventListener('credentialsrequired', function() {{}});
+
+            rfb.addEventListener('desktopname', function(e) {{
+                document.title = e.detail.name + ' - MyAgent';
+            }});
+
+            // [v1.20.9] 连接建立超时检测（30秒）
+            setTimeout(function() {{
+                if (!isConnected && rfb) {{
+                    if (useProxy) {{
+                        useProxy = false;
+                        rfb.disconnect();
+                        updateStatus(false, '代理超时，切换直连...', '');
+                        setTimeout(connect, 500);
+                    }}
+                }}
+            }}, 30000);
+
+        }} catch (e) {{
+            updateStatus(false, '连接失败', '无法连接到 ' + connUrl + ' 错误: ' + e.message);
+            document.getElementById('statusSpinner').style.display = 'none';
+            document.getElementById('statusActions').style.display = '';
+        }}
+    }}
+
+    // 暴露给全局
+    window.rfb = rfb;
+    window._vncConnect = connect;
+    window.sendCtrlAltDel = function() {{
+        if (rfb) rfb.sendCtrlAltDel();
+    }};
+    window.takeScreenshot = function() {{
+        fetch('/api/vnc/screenshot').then(r => {{
+            if (r.ok) return r.blob();
+            throw new Error('截图失败');
+        }}).then(blob => {{
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement('a');
+            a.href = url;
+            a.download = 'desktop_' + new Date().toISOString().replace(/[:.]/g, '-') + '.png';
+            a.click();
+            URL.revokeObjectURL(url);
+        }}).catch(e => alert('截图失败: ' + e.message));
+    }};
+    window.toggleFullscreen = function() {{
+        if (!document.fullscreenElement) {{
+            document.documentElement.requestFullscreen();
+        }} else {{
+            document.exitFullscreen();
+        }}
+    }};
+
+    connect();
 }}
 
-connect();
-
-// 暴露给全局
-window.rfb = rfb;
-window.sendCtrlAltDel = function() {{
-    if (rfb) rfb.sendCtrlAltDel();
-}};
-window.takeScreenshot = function() {{
-    // 下载当前屏幕截图
-    fetch('/api/vnc/screenshot').then(r => {{
-        if (r.ok) return r.blob();
-        throw new Error('截图失败');
-    }}).then(blob => {{
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = 'desktop_' + new Date().toISOString().replace(/[:.]/g, '-') + '.png';
-        a.click();
-        URL.revokeObjectURL(url);
-    }}).catch(e => alert('截图失败: ' + e.message));
-}};
-window.toggleFullscreen = function() {{
-    if (!document.fullscreenElement) {{
-        document.documentElement.requestFullscreen();
-    }} else {{
-        document.exitFullscreen();
+// 直连按钮
+function tryDirectConnect() {{
+    if (window._vncConnect) {{
+        window._vncUseProxy = false;
+        location.reload();
     }}
-}};
+}}
 </script>
 </body>
 </html>"""
@@ -2134,7 +2312,15 @@ window.addEventListener('beforeunload', function() {{
             except ImportError:
                 logger.debug("SenseVoice (funasr) 未安装，跳过。安装: pip install funasr torch torchaudio")
             except Exception as e:
-                logger.warning(f"SenseVoice 转录失败: {e}")
+                err_str = str(e)
+                if "ffmpeg" in err_str.lower() or "No such file" in err_str:
+                    logger.warning(f"SenseVoice 转录失败 (缺少 ffmpeg): {e}")
+                    # [v1.20.9] 检测 ffmpeg 并给出安装提示
+                    import shutil
+                    if not shutil.which("ffmpeg"):
+                        logger.warning("⚠ 系统缺少 ffmpeg，SenseVoice 无法转换音频格式。安装: sudo apt install ffmpeg 或 brew install ffmpeg")
+                else:
+                    logger.warning(f"SenseVoice 转录失败: {e}")
 
             # ── 尝试 vosk ──
             try:
@@ -3639,7 +3825,7 @@ window.addEventListener('beforeunload', function() {{
         status = "unknown"
 
         # 从 bot 实例获取 QR 码
-        bot = self.core.chatbot_manager.get_bot(cp.id or cp.platform)
+        bot = self.core.chat_manager.get_bot(cp.id or cp.platform) if self.core.chat_manager else None
         if bot and hasattr(bot, 'get_qr_code'):
             qr_code = bot.get_qr_code() or ""
         if bot and hasattr(bot, '_connected'):
@@ -3676,7 +3862,7 @@ window.addEventListener('beforeunload', function() {{
         if cp.platform not in ("whatsapp", "wechat"):
             return web.json_response({"error": f"{cp.platform} 不支持 QR 码绑定"}, status=400)
 
-        bot = self.core.chatbot_manager.get_bot(cp.id or cp.platform)
+        bot = self.core.chat_manager.get_bot(cp.id or cp.platform) if self.core.chat_manager else None
         if not bot:
             return web.json_response({"error": "Bot 实例未创建"}, status=400)
 

package/web/ui/chat/chat_main.js

@@ -1258,7 +1258,8 @@ function renderMasterAgentCard() {
   var color = agent ? (agent.avatar_color || 'linear-gradient(135deg,#6366f1,#8b5cf6)') : 'linear-gradient(135deg,#6366f1,#8b5cf6)';
   var bgStyle = color.includes('gradient') ? 'background:' + color : '';
   var bgClass = color.includes('gradient') ? '' : getAgentColorClass('default');
-  var avatarContent = (agent && agent.avatar_image) ? '<img src="' + escapeHtml(agent.avatar_image) + '" style="width:100%;height:100%;object-fit:cover;border-radius:12px">' : emoji;
+  // [v1.20.9] 修复: avatar_image 不为空时显示图片，onerror 回退到 emoji
+  var avatarContent = (agent && agent.avatar_image) ? '<img src="' + escapeHtml(agent.avatar_image) + '" style="width:100%;height:100%;object-fit:cover;border-radius:12px" onerror="this.outerHTML=\'' + escapeHtml(emoji) + '\'">' : emoji;
 
   el.innerHTML = '<div class="rp-master-card ' + (isActive ? 'active' : '') + '" onclick="selectAgent(\'default\')">'
     + '<div class="rp-master-avatar ' + bgClass + '" style="' + bgStyle + '">' + avatarContent + '</div>'
@@ -1559,9 +1560,15 @@ function updateSidebarAgentIndicator() {
     return;
   }
   indicator.style.display = 'flex';
-  var emoji = agent.avatar_emoji || '';
-  avatar.textContent = emoji || getAgentInitials(agent.name);
-  avatar.style.background = agent.avatar_color || getAgentGradient(agent.name);
+  // [v1.20.9] 优先显示上传的头像图片
+  if (agent.avatar_image) {
+    avatar.innerHTML = '<img src="' + escapeHtml(agent.avatar_image) + '" style="width:100%;height:100%;object-fit:cover;border-radius:6px" onerror="this.outerHTML=\'' + escapeHtml(agent.avatar_emoji || getAgentInitials(agent.name)) + '\'">';
+    avatar.style.background = 'transparent';
+  } else {
+    var emoji = agent.avatar_emoji || '';
+    avatar.textContent = emoji || getAgentInitials(agent.name);
+    avatar.style.background = agent.avatar_color || getAgentGradient(agent.name);
+  }
   nameEl.textContent = agent.name || agent.path;
   hintEl.textContent = '的对话列表 (' + state.sessions.length + ')';
 }
@@ -1572,18 +1579,24 @@ function updateActiveAgentBadge() {
   var nameEl = document.getElementById('badgeName');
   var agent = findAgentByPath(state.activeAgent);
   if (agent) {
-    var emoji = agent.avatar_emoji || '';
-    avatar.textContent = emoji || getAgentInitials(agent.name);
-    // Use gradient for consistency with sidebar agent avatars
-    if (agent.avatar_color && !agent.avatar_color.includes('gradient')) {
-      avatar.style.background = agent.avatar_color;
-      avatar.className = 'badge-avatar';
-    } else if (agent.avatar_color) {
-      avatar.style.background = '';
+    // [v1.20.9] 优先显示上传的头像图片
+    if (agent.avatar_image) {
+      avatar.innerHTML = '<img src="' + escapeHtml(agent.avatar_image) + '" style="width:100%;height:100%;object-fit:cover;border-radius:50%" onerror="this.outerHTML=\'' + escapeHtml(agent.avatar_emoji || getAgentInitials(agent.name)) + '\'">';
+      avatar.style.background = 'transparent';
       avatar.className = 'badge-avatar';
     } else {
-      avatar.style.background = '';
-      avatar.className = 'badge-avatar ' + getAgentColorClass(agent.name);
+      var emoji = agent.avatar_emoji || '';
+      avatar.textContent = emoji || getAgentInitials(agent.name);
+      if (agent.avatar_color && !agent.avatar_color.includes('gradient')) {
+        avatar.style.background = agent.avatar_color;
+        avatar.className = 'badge-avatar';
+      } else if (agent.avatar_color) {
+        avatar.style.background = '';
+        avatar.className = 'badge-avatar';
+      } else {
+        avatar.style.background = '';
+        avatar.className = 'badge-avatar ' + getAgentColorClass(agent.name);
+      }
     }
     avatar.style.borderRadius = '50%';
     nameEl.textContent = agent.name || agent.path;