myagent-ai 1.20.12 → 1.21.0

package/main.py

@@ -122,6 +122,10 @@ class MyAgentApp:
         # 聊天平台
         self.chat_manager: ChatBotManager | None = None
 
+        # [v1.20.13] 会话级锁：防止聊天平台消息与 Web 请求并发覆盖 MainAgent 共享状态
+        self._session_locks: dict[str, asyncio.Lock] = {}
+        self._session_locks_mutex = asyncio.Lock()
+
         # 配置热加载广播器
         self.config_broadcaster: ConfigBroadcaster | None = None
 
@@ -449,6 +453,13 @@ class MyAgentApp:
             self.logger.error(f"处理消息异常: {e}", exc_info=True)
             return f"❌ 处理失败: {str(e)}"
 
+    async def _get_session_lock(self, session_id: str) -> asyncio.Lock:
+        """获取或创建会话级锁"""
+        async with self._session_locks_mutex:
+            if session_id not in self._session_locks:
+                self._session_locks[session_id] = asyncio.Lock()
+            return self._session_locks[session_id]
+
     async def _handle_chat_message(self, message: ChatMessage, bot):
         """
         处理来自聊天平台的消息。
@@ -473,7 +484,12 @@ class MyAgentApp:
             return
 
         # 处理消息
-        response_text = await self.process_message(message.text, session_id)
+        # [v1.20.13] 使用会话级锁防止并发处理同一会话
+        session_lock = await self._get_session_lock(session_id)
+        if session_lock.locked():
+            return  # 同一会话正在处理中，跳过（聊天平台消息有去重机制）
+        async with session_lock:
+            response_text = await self.process_message(message.text, session_id)
 
         # [v1.20.8] 将回复中的相对路径文件链接替换为绝对 URL
         # (file_send 生成的 /api/file/xxx 链接在 Telegram/Discord 等外部平台无法访问)

package/package.json

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

package/requirements.txt

@@ -70,6 +70,8 @@ chardet>=5.0.0
 xlrd>=2.0.0
 # tzdata: Windows 上 ZoneInfo 所需的时区数据
 tzdata>=2024.1
+# pyyaml: SKILL.md 格式技能加载（技能系统必需）
+pyyaml>=6.0.0
 
 # ============================================================
 # Anthropic Claude (可选)

package/web/api_server.py

@@ -212,6 +212,9 @@ class ApiServer:
         self._executor_wrapped = False
         # 全局执行锁：同一时间只有一个 agent 可运行 local 模式
         self._execution_lock = {"locked": False, "locked_by": None, "locked_at": None}
+        # [v1.20.13] 会话级锁：防止同一会话并发请求导致 MainAgent 共享状态被覆盖
+        self._session_locks: Dict[str, asyncio.Lock] = {}
+        self._session_locks_mutex = asyncio.Lock()
         # 消息队列（用于存放待执行的消息，key: session_id）
         self._msg_queues: Dict[str, List[Dict]] = {}
         # 任务列表内存存储（exec 模式，替代 task.md）
@@ -279,11 +282,12 @@ class ApiServer:
         mgr.config.auto_accept = cfg.auto_accept
         logger.info("通信管理器已热更新")
 
-    def _hot_reload_chat_platforms(self):
+    async def _hot_reload_chat_platforms(self):
         """热更新聊天平台：重新加载所有平台配置到 ChatBotManager
         
-        [v1.20.7] 修复: 调用 setup_platforms 时会自动停止已禁用的平台并启动新启用的平台。
+        [v1.20.7] 修复: 调用 setup_platforms 时会自动停止被禁用的平台并启动新启用的平台。
         [v1.20.9] 修复: chat_manager 为 None 时懒创建，修复首次启用平台不生效的问题。
+        [v1.20.12] 改为 async 并补启未运行的 bot，修复首次启用平台后 bot 不启动的问题。
         """
         if not self.core.chat_manager:
             from chatbot.manager import ChatBotManager
@@ -291,11 +295,20 @@ class ApiServer:
             logger.info("聊天平台管理器已懒创建")
         mgr = self.core.chat_manager
         platform_configs = self.core.config_mgr.config.chat_platforms
-        # 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
+        if not handler:
+            logger.warning("聊天平台消息处理器为 None，平台可能无法处理消息")
         mgr.setup_platforms(platform_configs, handler)
+        # [v1.20.12] 补启未运行的 bot
+        enabled_keys = [cfg.id or cfg.platform for cfg in platform_configs if cfg.enabled]
+        for key in enabled_keys:
+            if key in mgr._bots and key not in mgr._bot_tasks:
+                bot = mgr._bots.get(key)
+                if bot:
+                    logger.info(f"补启动聊天平台: {key}")
+                    asyncio.create_task(mgr._run_bot(key, bot), name=f"bot_{key}")
         logger.info("聊天平台配置已热更新")
 
     def _setup_routes(self):
@@ -697,13 +710,28 @@ class ApiServer:
         if not file_id or len(file_id) < 8:
             return web.Response(status=404, text="File not found")
         fpath, mime = _find_upload_file(file_id)
+        if not fpath or not fpath.exists():
+            # [v1.20.13] 回退：尝试在工作目录中查找
+            try:
+                from urllib.parse import unquote
+                wd = self.core.config_mgr.data_dir / "workspace"
+                if wd.exists():
+                    for f in wd.rglob("*"):
+                        if f.is_file() and f.name.startswith(file_id + "_"):
+                            fpath = f
+                            break
+            except Exception:
+                pass
         if not fpath or not fpath.exists():
             return web.Response(status=404, text="File not found")
         # [fix] aiohttp FileResponse 不支持 content_type 参数，改用属性赋值
         resp = web.FileResponse(fpath)
         if mime:
             resp.content_type = mime
-        resp.headers["Content-Disposition"] = f"inline; filename=\"{fpath.name}\""
+        # [v1.20.13] 修复非 ASCII 文件名编码
+        from urllib.parse import quote as _url_quote
+        _safe_name = _url_quote(fpath.name)
+        resp.headers["Content-Disposition"] = f"inline; filename=\"{_safe_name}\"; filename*=UTF-8''{_safe_name}"
         return resp
 
     async def handle_download_file(self, request):
@@ -712,13 +740,28 @@ class ApiServer:
         if not file_id or len(file_id) < 8:
             return web.Response(status=404, text="File not found")
         fpath, mime = _find_upload_file(file_id)
+        if not fpath or not fpath.exists():
+            # [v1.20.13] 回退：尝试在工作目录中查找
+            try:
+                from urllib.parse import unquote
+                wd = self.core.config_mgr.data_dir / "workspace"
+                if wd.exists():
+                    for f in wd.rglob("*"):
+                        if f.is_file() and f.name.startswith(file_id + "_"):
+                            fpath = f
+                            break
+            except Exception:
+                pass
         if not fpath or not fpath.exists():
             return web.Response(status=404, text="File not found")
         # [fix] aiohttp FileResponse 不支持 content_type 参数，改用属性赋值
         resp = web.FileResponse(fpath)
         if mime:
             resp.content_type = mime
-        resp.headers["Content-Disposition"] = f"attachment; filename=\"{fpath.name}\""
+        # [v1.20.13] 修复非 ASCII 文件名编码
+        from urllib.parse import quote as _url_quote
+        _safe_name = _url_quote(fpath.name)
+        resp.headers["Content-Disposition"] = f"attachment; filename=\"{_safe_name}\"; filename*=UTF-8''{_safe_name}"
         return resp
 
     # --- [v1.17.0] Remote Desktop (VNC) ---
@@ -783,7 +826,8 @@ class ApiServer:
         """GET /vnc/{path} - 代理 noVNC 客户端页面
         
         如果 websockify 已配置 --web 目录，代理到该目录；
-        否则返回内置的轻量 VNC 客户端页面。
+        否则尝试从 data/novnc/lib/ 目录提供本地 noVNC 库文件；
+        最后返回内置的轻量 VNC 客户端页面。
         """
         mgr = self._get_vnc_manager()
         path = request.match_info.get('path', 'vnc.html')
@@ -807,6 +851,25 @@ class ApiServer:
                     resp.content_type = content_type
                 return resp
 
+        # [v1.20.11] 方法1.5: 从本地 data/novnc/lib/ 目录提供 noVNC 库文件
+        _novnc_lib_dir = Path(__file__).parent.parent / "data" / "novnc" / "lib"
+        if _novnc_lib_dir.exists() and path.startswith("lib/"):
+            _lib_path = _novnc_lib_dir / path[4:]  # strip "lib/" prefix
+            if _lib_path.is_file():
+                ext = _lib_path.suffix.lower()
+                mime_map = {
+                    '.html': 'text/html', '.htm': 'text/html',
+                    '.js': 'application/javascript', '.css': 'text/css',
+                    '.json': 'application/json', '.png': 'image/png',
+                    '.svg': 'image/svg+xml', '.woff': 'font/woff',
+                    '.woff2': 'font/woff2', '.wasm': 'application/wasm',
+                }
+                content_type = mime_map.get(ext, 'application/octet-stream')
+                resp = web.FileResponse(str(_lib_path))
+                if content_type:
+                    resp.content_type = content_type
+                return resp
+
         # 方法2: 返回内置的轻量 noVNC 客户端
         if path in ('vnc.html', 'vnc_lite.html', ''):
             html = self._get_builtin_novnc_page(request)
@@ -945,22 +1008,139 @@ class ApiServer:
   </div>
 </div>
 
-<!-- [v1.20.9] 本地加载 noVNC 组件，不依赖外部 CDN -->
+<!-- [v1.20.11] noVNC 组件加载：本地优先，CDN 回退 -->
+<script>
+// [v1.20.11] 本地 noVNC 加载器：通过动态 <script> 标签加载 CommonJS 模块
+// 本地 data/novnc/lib/ 中的文件是 CommonJS 格式，不能直接用 import()
+async function loadLocalNoVNC() {{
+    const basePath = '/vnc/lib/';
+    // 加载 noVNC 依赖模块（按依赖顺序）
+    const depFiles = [
+        'vendor/pako/lib/inflate.js',
+        'vendor/pako/lib/deflate.js',
+        'base64.js',
+        'websock.js',
+        'display.js',
+        'inflator.js',
+        'deflator.js',
+        'decoders/copyrect.js',
+        'decoders/raw.js',
+        'decoders/rre.js',
+        'decoders/hextile.js',
+        'decoders/tight.js',
+        'decoders/tightpng.js',
+        'decoders/zrle.js',
+        'decoders/jpeg.js',
+        'util/events.js',
+        'util/eventtarget.js',
+        'util/logging.js',
+        'util/strings.js',
+        'util/browser.js',
+        'util/int.js',
+        'util/element.js',
+        'util/cursor.js',
+        'input/keysym.js',
+        'input/xtscancodes.js',
+        'input/util.js',
+        'input/domkeytable.js',
+        'input/vkeys.js',
+        'input/keyboard.js',
+        'input/gesturehandler.js',
+        'encodings.js',
+    ];
+    // 加载所有依赖文件为全局变量
+    for (const file of depFiles) {{
+        const resp = await fetch(basePath + file);
+        if (!resp.ok) throw new Error('Failed to fetch ' + file + ': ' + resp.status);
+        const code = await resp.text();
+        // 使用 Function 构造器执行 CommonJS 代码，注入 require 和 exports
+        const _modules = window.__novnc_modules = window.__novnc_modules || {{}};
+        const modId = file.replace('.js', '');
+        const modExports = {{}};
+        _modules[modId] = modExports;
+        try {{
+            const fn = new Function('exports', 'require', 'module', code);
+            fn(modExports, function(depId) {{
+                // 解析相对路径
+                let resolved = depId;
+                if (depId.startsWith('./')) {{
+                    resolved = (modId.substring(0, modId.lastIndexOf('/') + 1) || '') + depId.substring(2);
+                }}
+                return _modules[resolved] || {{}};
+            }}, {{ exports: modExports }});
+        }} catch(e) {{
+            console.warn('[noVNC] Failed to load module:', file, e);
+        }}
+    }}
+    // 最后加载 rfb.js
+    const resp = await fetch(basePath + 'rfb.js');
+    if (!resp.ok) throw new Error('Failed to fetch rfb.js: ' + resp.status);
+    const code = await resp.text();
+    const _modules = window.__novnc_modules || {{}};
+    const rfbExports = {{}};
+    _modules['rfb'] = rfbExports;
+    const fn = new Function('exports', 'require', 'module', code);
+    fn(rfbExports, function(depId) {{
+        let resolved = depId;
+        if (depId.startsWith('./')) {{
+            resolved = 'rfb/' + depId.substring(2);
+            // 映射到实际模块路径
+            const pathMap = {{
+                './util/int': 'util/int',
+                './util/logging': 'util/logging',
+                './util/strings': 'util/strings',
+                './util/browser': 'util/browser',
+                './util/element': 'util/element',
+                './util/events': 'util/events',
+                './util/eventtarget': 'util/eventtarget',
+                './display': 'display',
+                './inflator': 'inflator',
+                './deflator': 'deflator',
+                './websock': 'websock',
+                './decoders/copyrect': 'decoders/copyrect',
+                './decoders/raw': 'decoders/raw',
+                './decoders/rre': 'decoders/rre',
+                './decoders/hextile': 'decoders/hextile',
+                './decoders/tight': 'decoders/tight',
+                './decoders/tightpng': 'decoders/tightpng',
+                './decoders/zrle': 'decoders/zrle',
+                './decoders/jpeg': 'decoders/jpeg',
+                './encodings': 'encodings',
+                './input/keysym': 'input/keysym',
+                './input/keyboard': 'input/keyboard',
+                './input/xtscancodes': 'input/xtscancodes',
+                './input/util': 'input/util',
+                './input/domkeytable': 'input/domkeytable',
+                './input/vkeys': 'input/vkeys',
+                './input/gesturehandler': 'input/gesturehandler',
+                './base64': 'base64',
+            }};
+            if (depId.startsWith('./')) {{
+                const mapped = pathMap[depId];
+                if (mapped) resolved = mapped;
+            }}
+        }}
+        return _modules[resolved] || {{}};
+    }}, {{ exports: rfbExports }});
+    return rfbExports.default || rfbExports;
+}}
+</script>
 <script type="module">
 try {{
-    // 优先从本地服务器加载 noVNC（/vnc/lib/rfb.js），无需外网
     let RFB = null;
     let loadError = '';
 
+    // [v1.20.11] 优先从本地服务器加载 noVNC（data/novnc/lib/）
     try {{
-        const mod = await import('/vnc/lib/rfb.js');
-        RFB = mod.default || mod.RFB;
+        RFB = await loadLocalNoVNC();
     }} catch (localErr) {{
         loadError = localErr.message;
-        // 本地加载失败，尝试 CDN 回退
+        console.warn('[VNC] 本地加载失败，尝试 CDN:', localErr.message);
+        // 本地加载失败，尝试 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://registry.npmmirror.com/@novnc/novnc/1.5.0/files/core/rfb.js',
         ];
         for (const src of CDN_SOURCES) {{
             try {{
@@ -1659,6 +1839,16 @@ window.addEventListener('beforeunload', function() {{
         chat_mode = data.get("mode", "")  # "exec" = 执行模式
         escalated = data.get("escalated", False)  # 临时提权到 local
 
+        # ── [v1.20.13] 会话级锁：防止同一会话并发请求 ──
+        session_lock = await self._get_session_lock(session_id)
+        if session_lock.locked():
+            try:
+                await asyncio.wait_for(session_lock.acquire(), timeout=2.0)
+                session_lock.release()
+            except asyncio.TimeoutError:
+                return web.json_response({"error": "该会话正忙，请稍后重试"}, status=429)
+        await session_lock.acquire()
+
         # ── 全局执行锁检查 + 获取（原子操作，check+set 之间无 await）──
         agent_cfg_early = self._read_agent_config(agent_path)
         execution_mode = agent_cfg_early.get("execution_mode", "sandbox") if agent_cfg_early else "sandbox"
@@ -1730,10 +1920,39 @@ window.addEventListener('beforeunload', function() {{
                 self._execution_lock["locked"] = False
                 self._execution_lock["locked_by"] = None
                 self._execution_lock["locked_at"] = None
+            # [v1.20.13] 释放会话级锁
+            try:
+                session_lock.release()
+            except RuntimeError:
+                pass
 
     # ── 会话运行状态追踪 (用于断线重连) ──
     # {session_id: {running: bool, started_at: float, result: str, done: bool, error: str}}
     _running_sessions: Dict[str, Dict] = {}
+    _running_sessions_ttl = 300  # 过期时间（秒），用于自动清理已完成会话
+
+    async def _get_session_lock(self, session_id: str) -> asyncio.Lock:
+        """获取或创建会话级锁（每个 session_id 一个锁，防并发覆盖 MainAgent 共享状态）"""
+        async with self._session_locks_mutex:
+            if session_id not in self._session_locks:
+                self._session_locks[session_id] = asyncio.Lock()
+            return self._session_locks[session_id]
+
+    def _cleanup_stale_sessions(self):
+        """清理已完成的过期会话状态，防止 _running_sessions 无限增长"""
+        import time as _time
+        now = _time.time()
+        stale = []
+        for sid, info in self._running_sessions.items():
+            if info.get("done") and now - info.get("completed_at", now) > self._running_sessions_ttl:
+                stale.append(sid)
+        for sid in stale:
+            del self._running_sessions[sid]
+            logger.debug(f"清理过期会话状态: {sid}")
+        # 同步清理对应的 session lock
+        if stale:
+            for sid in stale:
+                self._session_locks.pop(sid, None)
 
     async def handle_chat_stream(self, request):
         """POST /api/chat/stream - SSE 流式聊天
@@ -1781,14 +2000,26 @@ window.addEventListener('beforeunload', function() {{
         escalated = data.get("escalated", False)
         voice_text = data.get("voice_text", "").strip()  # 语音转文字原始文本（用于 usersays_correct）
 
-        # ── 检查是否有正在运行的同一会话任务 ──
-        running_info = self._running_sessions.get(session_id)
-        if running_info and running_info.get("running") and not running_info.get("done"):
-            # 返回当前运行状态，让前端恢复
-            return web.Response(
-                text="data: " + json.dumps({"type": "resume", "session_id": session_id, "running": True, "started_at": running_info.get("started_at")}) + "\n\n",
-                content_type="text/event-stream",
-            )
+        # ── [v1.20.13] 清理过期的会话状态，防止内存泄漏 ──
+        self._cleanup_stale_sessions()
+
+        # ── [v1.20.13] 获取会话级锁：防止同一会话并发请求导致 MainAgent 共享状态被覆盖 ──
+        session_lock = await self._get_session_lock(session_id)
+        if session_lock.locked():
+            # 同一会话已有请求在处理
+            running_info = self._running_sessions.get(session_id)
+            if running_info and running_info.get("running") and not running_info.get("done"):
+                return web.Response(
+                    text="data: " + json.dumps({"type": "resume", "session_id": session_id, "running": True, "started_at": running_info.get("started_at")}) + "\n\n",
+                    content_type="text/event-stream",
+                )
+            # 锁被持有但无 running 记录（异常残留），等待后继续
+            try:
+                await asyncio.wait_for(session_lock.acquire(), timeout=2.0)
+                session_lock.release()
+            except asyncio.TimeoutError:
+                return web.Response(text="data: " + json.dumps({"error": "会话正忙，请稍后重试"}) + "\n\n", content_type="text/event-stream")
+        await session_lock.acquire()
 
         # Lock check
         agent_cfg_early = self._read_agent_config(agent_path)
@@ -1997,6 +2228,11 @@ window.addEventListener('beforeunload', function() {{
                     self._execution_lock["locked"] = False
                     self._execution_lock["locked_by"] = None
                     self._execution_lock["locked_at"] = None
+                # [v1.20.13] 释放会话级锁
+                try:
+                    session_lock.release()
+                except RuntimeError:
+                    pass
 
         # ── 启动后台任务（不等它完成，前端断开也不影响） ──
         logger.info(f"[{session_id}] 准备创建后台任务")
@@ -3093,6 +3329,9 @@ window.addEventListener('beforeunload', function() {{
             agent = {"path": agent_path, "name": d.name, **cfg}
             agent["avatar_color"] = cfg.get("avatar_color") or _agent_color(d.name)
             agent["depth"] = agent_path.count("/")
+            # [v1.20.13] 自动检测 avatar.png 文件，补全 avatar_image 字段
+            if not agent.get("avatar_image") and (d / "avatar.png").exists():
+                agent["avatar_image"] = f"/api/agents/{agent_path}/avatar.png"
             agents.append(agent)
             # 递归子目录
             agents.extend(self._scan_agents_flat(d, agent_path))
@@ -3711,7 +3950,7 @@ window.addEventListener('beforeunload', function() {{
         self.core.config_mgr.config.chat_platforms.append(cp)
         self.core.config_mgr.save()
         # 热更新聊天平台
-        self._hot_reload_chat_platforms()
+        await self._hot_reload_chat_platforms()
         logger.info(f"新增聊天平台: {cp.display_name} (id={cp.id})")
         return web.json_response({"ok": True, "id": cp.id, "platform": platform_name, "display_name": cp.display_name, "hot_reload": True})
 
@@ -3753,7 +3992,7 @@ window.addEventListener('beforeunload', function() {{
                 logger.info(f"平台 ID 变更: {old_id} -> {cp.id}")
         self.core.config_mgr.save()
         # 热更新聊天平台
-        self._hot_reload_chat_platforms()
+        await self._hot_reload_chat_platforms()
         logger.info(f"聊天平台配置已更新: {cp.display_name} (id={cp.id})")
         return web.json_response({"ok": True, "id": cp.id, "hot_reload": True})
 
@@ -3766,7 +4005,7 @@ window.addEventListener('beforeunload', function() {{
                 platforms.pop(i)
                 self.core.config_mgr.save()
                 # 热更新聊天平台
-                self._hot_reload_chat_platforms()
+                await self._hot_reload_chat_platforms()
                 logger.info(f"已删除聊天平台: {cp.display_name} (id={cp.id})")
                 return web.json_response({"ok": True, "hot_reload": True})
         return web.json_response({"error": f"平台 {name} 不存在"}, status=404)
@@ -3783,7 +4022,7 @@ window.addEventListener('beforeunload', function() {{
         cp.enabled = data.get("enabled", not cp.enabled)
         self.core.config_mgr.save()
         # 热更新聊天平台
-        self._hot_reload_chat_platforms()
+        await self._hot_reload_chat_platforms()
         logger.info(f"聊天平台 {cp.display_name} 已{'启用' if cp.enabled else '禁用'}")
         return web.json_response({"ok": True, "enabled": cp.enabled, "id": cp.id, "hot_reload": True})
 
@@ -6566,7 +6805,7 @@ window.addEventListener('beforeunload', function() {{
             self._hot_reload_llm()
             self._hot_reload_executor()
             self._hot_reload_communication()
-            self._hot_reload_chat_platforms()
+            await self._hot_reload_chat_platforms()
 
         logger.info(f"安全保存配置: ok={result.get('ok')}")
         return web.json_response(result)

package/web/ui/chat/chat.css

@@ -2031,7 +2031,8 @@ input,textarea,select{font:inherit}
   margin-top:4px;opacity:0;
   transition:opacity .2s ease;
 }
-.message-row.assistant:hover .msg-actions{opacity:1}
+.message-row.assistant:hover .msg-actions,
+.message-row.user:hover .msg-actions{opacity:1}
 .msg-action-btn{
   width:28px;height:28px;border-radius:var(--radius-xs);
   display:grid;place-items:center;

package/web/ui/chat/chat_main.js

@@ -1277,9 +1277,17 @@ function renderHelperAgentCard() {
   var name = agent ? agent.name : '配置助手';
   var emoji = agent ? (agent.avatar_emoji || '🛡️') : '🛡️';
   var desc = agent ? (agent.description || '智能配置助手') : '智能配置助手';
+  var avatarImage = agent ? (agent.avatar_image || '') : '';
+  // [v1.20.13] 优先使用上传的头像图片
+  var avatarContent;
+  if (avatarImage) {
+    avatarContent = '<img src="' + escapeHtml(avatarImage) + '" style="width:100%;height:100%;object-fit:cover;border-radius:10px" onerror="this.outerHTML=\'' + escapeHtml(emoji) + '\'">';
+  } else {
+    avatarContent = emoji;
+  }
 
   el.innerHTML = '<div class="rp-helper-card ' + (isActive ? 'active' : '') + '" onclick="selectAgent(\'配置助手\')">'
-    + '<div class="rp-helper-avatar">' + emoji + '</div>'
+    + '<div class="rp-helper-avatar" style="' + (avatarImage ? 'background:transparent' : '') + '">' + avatarContent + '</div>'
     + '<div class="rp-master-info">'
     + '<div class="rp-master-name" style="font-size:13px">' + escapeHtml(name) + '</div>'
     + '<div class="rp-master-desc">' + escapeHtml(desc) + '</div>'
@@ -1306,6 +1314,7 @@ async function renderRecentAgents() {
           emoji: agent.avatar_emoji || '',
           color: agent.avatar_color || '',
           colorClass: agent.avatar_color ? '' : getAgentColorClass(agent.name),
+          avatarImage: agent.avatar_image || '',
           lastTime: sessions[0].last || '',
           count: sessions.length
         });
@@ -1326,10 +1335,16 @@ async function renderRecentAgents() {
   var html = '';
   recentAgents.forEach(function(a) {
     var isActive = state.activeAgent === a.path;
-    var bgStyle = a.color && !a.color.includes('gradient') ? 'background:' + a.color : '';
-    var bgClass = a.color ? '' : a.colorClass;
+    var avatarContent;
+    if (a.avatarImage) {
+      avatarContent = '<img src="' + escapeHtml(a.avatarImage) + '" style="width:100%;height:100%;object-fit:cover;border-radius:50%" onerror="this.outerHTML=\'' + escapeHtml(a.emoji || getAgentInitials(a.name)) + '\'">';
+    } else {
+      avatarContent = a.emoji || getAgentInitials(a.name);
+    }
+    var bgStyle = a.avatarImage ? '' : (a.color && !a.color.includes('gradient') ? 'background:' + a.color : '');
+    var bgClass = a.avatarImage ? '' : (a.color ? '' : a.colorClass);
     html += '<div class="rp-recent-chip ' + (isActive ? 'active' : '') + '" onclick="selectAgent(\'' + escapeHtml(a.path) + '\')" title="' + escapeHtml(a.name) + '">'
-      + '<div class="rp-recent-chip-avatar ' + bgClass + '" style="' + bgStyle + '">' + (a.emoji || getAgentInitials(a.name)) + '</div>'
+      + '<div class="rp-recent-chip-avatar ' + bgClass + '" style="' + bgStyle + '">' + avatarContent + '</div>'
       + '<span class="rp-recent-chip-name">' + escapeHtml(a.name) + '</span>'
       + '</div>';
   });
@@ -1399,18 +1414,27 @@ function renderRpDeptNode(dept, depth) {
         var agentName = typeof a === 'string' ? a : (a.name || a.path || agentPath);
         var agentEmoji = typeof a === 'object' ? (a.avatar_emoji || '') : '';
         var agentColor = typeof a === 'object' ? (a.avatar_color || '') : '';
+        var agentImage = typeof a === 'object' ? (a.avatar_image || '') : '';
         var agentInfo = findAgentByPath(agentPath);
         if (agentInfo) {
           agentEmoji = agentInfo.avatar_emoji || agentEmoji;
           agentColor = agentInfo.avatar_color || agentColor;
+          agentImage = agentInfo.avatar_image || agentImage;
           agentName = agentInfo.name || agentName;
         }
         var isActive = state.activeAgent === agentPath;
-        var bgStyle = agentColor ? 'background:' + agentColor : '';
-        var bgClass = agentColor ? '' : getAgentColorClass(agentName);
+        // [v1.20.13] 优先使用上传的头像图片
+        var avatarHtmlContent;
+        if (agentImage) {
+          avatarHtmlContent = '<img src="' + escapeHtml(agentImage) + '" style="width:24px;height:24px;border-radius:6px;object-fit:cover;display:block" onerror="this.style.display=\'none\';this.parentNode.innerHTML=\'' + escapeHtml(agentEmoji || getAgentInitials(agentName)) + '\'">';
+        } else {
+          avatarHtmlContent = (agentEmoji || getAgentInitials(agentName));
+        }
+        var bgStyle = agentImage ? '' : (agentColor ? 'background:' + agentColor : '');
+        var bgClass = agentImage ? '' : (agentColor ? '' : getAgentColorClass(agentName));
 
         html += '<div class="rp-dept-agent-item ' + (isActive ? 'active' : '') + '" style="--depth:' + (depth + 1) + '" onclick="selectAgent(\'' + escapeHtml(agentPath) + '\')">'
-          + '<div class="rp-dept-agent-avatar ' + bgClass + '" style="' + bgStyle + '">' + (agentEmoji || getAgentInitials(agentName)) + '</div>'
+          + '<div class="rp-dept-agent-avatar ' + bgClass + '" style="' + bgStyle + '">' + avatarHtmlContent + '</div>'
           + '<span>' + escapeHtml(agentName) + '</span>'
           + '</div>';
       });
@@ -2849,10 +2873,25 @@ function _renderMessagesInner() {
           if (ymMatch) { embedUrl = 'https://music.youtube.com/embed?list=' + ymMatch[1] + '&layout=full'; }
         }
         if (isAudio) {
+          // [v1.20.11] 音频播放器：优先使用已知可嵌入平台的 iframe，否则使用原生 <audio> 标签
+          // 避免 iframe 加载失败时显示断裂图片图标
+          var _knownAudioEmbed = embedUrl && (
+            embedUrl.indexOf('music.163.com/outchain') >= 0 ||
+            embedUrl.indexOf('music.youtube.com/embed') >= 0 ||
+            embedUrl.indexOf('player.bilibili.com') >= 0
+          );
+          var _audioPlayerHtml;
+          if (_knownAudioEmbed) {
+            _audioPlayerHtml = '<iframe src="' + escapeHtml(embedUrl) + '" style="width:100%;max-width:480px;height:80px;border:none;border-radius:8px" loading="lazy" allow="autoplay" sandbox="allow-scripts allow-same-origin allow-presentation"></iframe>';
+          } else {
+            // 不可嵌入的音频链接：使用原生 audio 播放器，避免 iframe 断裂图标
+            _audioPlayerHtml = '<audio controls src="' + escapeHtml(origUrl) + '" style="width:100%;max-width:480px;border-radius:8px" preload="metadata" onplay="if(typeof muteTTS===\'function\')muteTTS()" onended="if(typeof unmuteTTS===\'function\')unmuteTTS()"></audio>' +
+              '<div style="font-size:11px;color:var(--text3);margin-top:4px">部分平台可能因跨域限制无法直接播放，可点击右上角 ↗ 在新窗口打开</div>';
+          }
           parts.push('<div class="msg-media-embed msg-media-audio">' +
             '<div class="msg-media-header"><span class="msg-media-icon">🎵</span><span class="msg-media-label">' + escapeHtml(title) + '</span>' +
             '<a class="msg-media-link" href="' + escapeHtml(origUrl) + '" target="_blank" rel="noopener" title="在新窗口打开">↗</a></div>' +
-            '<iframe src="' + escapeHtml(embedUrl) + '" style="width:100%;max-width:480px;height:80px;border:none;border-radius:8px" loading="lazy" allow="autoplay" sandbox="allow-scripts allow-same-origin allow-presentation"></iframe>' +
+            _audioPlayerHtml +
             '</div>');
         } else {
           parts.push('<div class="msg-media-embed msg-media-video">' +
@@ -3148,11 +3187,15 @@ function renderMarkdown(text) {
   // 6c. 有序列表
   text = text.replace(/^\d+\.\s+(.+)$/gm, '<li>$1</li>');
   // 6d. 连续 <li> 包装为 <ul>
-  text = text.replace(/(<li class="task-item">[\s\S]*?<\/li>\n?)+/g, '<ul class="task-list">$&</ul>');
+  text = text.replace(/(<li class="task-item">[\s\S]*?<\/li>\n?)+/g, function(match) {
+    // 去除 <li> 之间的换行，避免后续被转换为 <br> 导致行间距过大
+    return '<ul class="task-list">' + match.replace(/<\/li>\n+/g, '</li>') + '</ul>';
+  });
   text = text.replace(/(<li>[\s\S]*?<\/li>\n?)+/g, function(match) {
     // 避免重复包装已含 class 的 li
     if (match.indexOf('class=') >= 0) return match;
-    return '<ul>' + match + '</ul>';
+    // 去除 <li> 之间的换行
+    return '<ul>' + match.replace(/<\/li>\n+/g, '</li>') + '</ul>';
   });
   // 6e. 流式保护：检测末尾不完整的列表行（以 <li> 开头但后面紧接 <br> 或截断的行）
   // 如果文本末尾的最后一个 <li> 后面紧跟 <br> 且没有闭合内容，将其拆出恢复为纯文本

package/web/ui/chat/flow_engine.js

@@ -1853,10 +1853,20 @@ async function sendMessage(opts) {
               (evt.content ? evt.content.substring(0, 100) : '');
           } else if (evt.type === 'v2_file') {
             // [v1.16.17] Agent is sending a file to the user
+            // [v1.20.12] 修复: 后端发送 file_id，前端渲染代码期望 id
+            // [v1.20.13] 修复: 去重，避免同一文件重复添加
             if (evt.data) {
               if (!state.messages[msgIdx]._files) state.messages[msgIdx]._files = [];
-              state.messages[msgIdx]._files.push(evt.data);
-              throttledStreamUpdate(msgIdx);
+              var fd = evt.data;
+              // 归一化: 后端用 file_id，渲染代码用 id
+              if (fd.file_id && !fd.id) fd.id = fd.file_id;
+              // 去重: 检查是否已存在相同 file_id 的文件
+              var _fid = fd.id || fd.file_id;
+              var _dup = _fid && state.messages[msgIdx]._files.some(function(f) { return (f.id || f.file_id) === _fid; });
+              if (!_dup) {
+                state.messages[msgIdx]._files.push(fd);
+                throttledStreamUpdate(msgIdx);
+              }
             }
           } else if (evt.type === 'v2_media') {
             // [v1.20.3] Agent is embedding a media player (audio/video)