myagent-ai 1.18.9 → 1.19.1

package/agents/main_agent.py

@@ -1589,13 +1589,17 @@ class MainAgent(BaseAgent):
                     _fresult = await _fskill.execute(_fpath, _fdesc, stream_callback=stream_callback)
                     result = {"success": True, "output": json.dumps(_fresult, ensure_ascii=False, indent=2), "data": _fresult}
                     # [v1.18.5] 追踪发送的文件，用于持久化到会话记忆
-                    if _fresult.get("success") and _fresult.get("file_id"):
-                        _sent_files.append({
-                            "id": _fresult["file_id"],
-                            "name": _fresult.get("name", ""),
-                            "type": _fresult.get("type", ""),
-                            "size": _fresult.get("size", 0),
-                        })
+                    # [v1.18.9] 修复：_sent_files 可能不在作用域内，安全处理
+                    try:
+                        if _fresult.get("success") and _fresult.get("file_id"):
+                            _sent_files.append({
+                                "id": _fresult["file_id"],
+                                "name": _fresult.get("name", ""),
+                                "type": _fresult.get("type", ""),
+                                "size": _fresult.get("size", 0),
+                            })
+                    except NameError:
+                        pass  # _sent_files 不在当前作用域，跳过文件追踪
                 except Exception as _fse:
                     result = {"success": False, "error": f"文件发送失败: {_fse}"}
                     logger.warning(f"[{task_id}] file_send 工具异常: {_fse}")

package/core/vnc_manager.py

@@ -661,6 +661,38 @@ class VNCManager:
     async def _start_x11vnc(self) -> bool:
         """启动 x11vnc VNC 服务器"""
         try:
+            # [v1.18.9] 启动前检查端口是否被占用，清理残留进程
+            if self._is_port_listening(self.x11vnc_port):
+                logger.warning(f"端口 {self.x11vnc_port} 已被占用，尝试清理残留 x11vnc 进程...")
+                try:
+                    _result = subprocess.run(
+                        ["pgrep", "-f", f"x11vnc.*{self.display}"],
+                        capture_output=True, text=True, timeout=5,
+                    )
+                    if _result.returncode == 0 and _result.stdout.strip():
+                        for _pid_str in _result.stdout.strip().split("\n"):
+                            try:
+                                _pid = int(_pid_str.strip())
+                                os.kill(_pid, signal.SIGTERM)
+                                logger.info(f"杀死残留 x11vnc PID={_pid}")
+                            except (ValueError, ProcessLookupError):
+                                pass
+                        await asyncio.sleep(1.0)
+                        # SIGTERM 后仍占用则 SIGKILL
+                        if self._is_port_listening(self.x11vnc_port):
+                            for _pid_str in _result.stdout.strip().split("\n"):
+                                try:
+                                    os.kill(int(_pid_str.strip()), signal.SIGKILL)
+                                except (ValueError, ProcessLookupError):
+                                    pass
+                            await asyncio.sleep(0.5)
+                        if self._is_port_listening(self.x11vnc_port):
+                            logger.warning(f"端口 {self.x11vnc_port} 仍被占用，但可能是旧进程，继续尝试启动")
+                    else:
+                        logger.debug(f"端口 {self.x11vnc_port} 被占用但未找到 display={self.display} 的 x11vnc 进程")
+                except Exception as _e:
+                    logger.debug(f"清理残留 x11vnc 异常: {_e}")
+
             # [v1.17.2] 处理 x11vnc 0.9.17+ 的 shm-helper 兼容问题
             # 新版 x11vnc 编译时默认启用 shm-helper，但运行时需要绝对路径
             # 查找 shm-helper 绝对路径
@@ -694,6 +726,8 @@ class VNCManager:
                 "-nocursorshape",
                 "-deferupdate", "5",   # 延迟更新（降低带宽）
                 "-scale", "2/3",       # 缩小 2/3（降低带宽）
+                # [v1.18.10] 抑制 Xvfb 环境下不支持的扩展警告
+                "-noxfixes",     # 跳过 XFIXES 检查（Xvfb 可能不支持）
             ]
 
             # [v1.18.5] 不使用 -threads 模式：与 -scale 和 -no-shm 组合在 0.9.17 中
@@ -725,7 +759,8 @@ class VNCManager:
             )
 
             # [v1.18.5] x11vnc 0.9.17 可能 fork 到后台，需要更长等待
-            await asyncio.sleep(2.5)
+            # [v1.18.10] 增加首次等待时间和重试次数
+            await asyncio.sleep(3)
             if self._x11vnc_process.poll() is not None:
                 # [v1.18.4] x11vnc 可能 fork 到后台运行，父进程退出但子进程仍在监听端口
                 # 等待更长时间让 fork 的子进程完成端口绑定
@@ -733,19 +768,18 @@ class VNCManager:
                     logger.warning(f"x11vnc 父进程已退出但端口 {self.x11vnc_port} 仍在监听（fork 到后台），视为启动成功")
                     return True
                 # 端口未监听，再等几秒（某些系统 fork 后子进程初始化慢）
-                logger.info("x11vnc 端口尚未就绪，额外等待 3 秒...")
-                await asyncio.sleep(3)
+                logger.info("x11vnc 端口尚未就绪，额外等待 5 秒...")
+                await asyncio.sleep(5)
                 if self._is_port_listening(self.x11vnc_port):
                     logger.warning(f"x11vnc fork 延迟启动成功 (port={self.x11vnc_port})")
                     return True
-                # 端口未监听 = 真正的启动失败
-                stderr = ""
-                try:
-                    stderr = self._x11vnc_process.stderr.read().decode("utf-8", errors="replace")[:2000]
-                except Exception:
-                    pass
-                logger.error(f"x11vnc 启动失败: {stderr}")
-                return False
+                # [v1.18.10] 额外重试一次：彻底杀掉残留，重新启动 x11vnc
+                logger.warning("x11vnc 首次启动失败，尝试清理并重新启动...")
+                await self._kill_process(self._x11vnc_process, "x11vnc")
+                self._x11vnc_process = None
+                await asyncio.sleep(1)
+                # 第二次尝试启动
+                return await self._retry_x11vnc()
 
             # 验证端口是否在监听
             for _ in range(15):
@@ -775,6 +809,88 @@ class VNCManager:
             logger.error(f"x11vnc 启动异常: {e}")
             return False
 
+    async def _retry_x11vnc(self) -> bool:
+        """[v1.18.10] x11vnc 首次启动失败后重试（简化参数，增加兼容性）"""
+        try:
+            # 先杀掉所有残留的 x11vnc 进程
+            try:
+                _result = subprocess.run(
+                    ["pgrep", "-f", f"x11vnc.*{self.display}"],
+                    capture_output=True, text=True, timeout=5,
+                )
+                if _result.returncode == 0 and _result.stdout.strip():
+                    for _pid_str in _result.stdout.strip().split("\n"):
+                        try:
+                            os.kill(int(_pid_str.strip()), signal.SIGKILL)
+                        except (ValueError, ProcessLookupError):
+                            pass
+                    await asyncio.sleep(1)
+            except Exception:
+                pass
+
+            # 第二次尝试使用更保守的参数（去掉 -scale、-noxfixes 等可能的问题参数）
+            cmd = [
+                "x11vnc",
+                "-display", self.display,
+                "-forever",
+                "-shared",
+                "-nopw",
+                "-rfbport", str(self.x11vnc_port),
+                "-listen", "127.0.0.1",
+                "-xkb",
+                "-noxdamage",
+                "-nowf",
+                "-deferupdate", "5",
+                "-no-shm",
+                "-nobell",
+            ]
+            env = {**os.environ, "DISPLAY": self.display}
+            env["X11VNC_NO_UNIXPW"] = "1"
+
+            logger.info(f"x11vnc 重试启动: {' '.join(cmd)}")
+            self._x11vnc_process = subprocess.Popen(
+                cmd,
+                stdin=subprocess.DEVNULL,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.PIPE,
+                env=env,
+                preexec_fn=os.setpgrp,
+            )
+
+            await asyncio.sleep(5)
+            if self._is_port_listening(self.x11vnc_port):
+                logger.info(f"x11vnc 重试启动成功 (port={self.x11vnc_port})")
+                return True
+
+            if self._x11vnc_process.poll() is not None:
+                stderr = ""
+                try:
+                    stderr = self._x11vnc_process.stderr.read().decode("utf-8", errors="replace")[:3000]
+                except Exception:
+                    pass
+                logger.error(f"x11vnc 重试启动失败: {stderr}")
+                return False
+
+            # 进程还活着但端口未就绪，再等一轮
+            for _ in range(15):
+                try:
+                    import socket
+                    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                    s.settimeout(0.5)
+                    s.connect(("127.0.0.1", self.x11vnc_port))
+                    s.close()
+                    logger.info(f"x11vnc 重试后启动成功 (port={self.x11vnc_port})")
+                    return True
+                except (OSError, ConnectionRefusedError):
+                    await asyncio.sleep(0.3)
+
+            logger.error("x11vnc 重试后端口仍超时，放弃")
+            return False
+
+        except Exception as e:
+            logger.error(f"x11vnc 重试异常: {e}")
+            return False
+
     async def _start_websockify(self) -> bool:
         """启动 websockify WebSocket 代理（VNC → WebSocket）"""
         try:

package/package.json

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

package/skills/chromedev_mcp.py

@@ -987,6 +987,76 @@ def _ensure_node_deps() -> Optional[str]:
     return None
 
 
+# [v1.18.9] 共享的 MCP 工具调用函数，带自动重试（所有浏览器技能通用）
+_MCP_CRASH_KEYWORDS = [
+    "Target closed", "Target destroyed", "Protocol error",
+    "Browser closed", "Connection closed", "Session closed",
+    "Connection refused", "net::ERR_CONNECTION_REFUSED",
+]
+
+async def _call_mcp_with_retry(
+    tool_name: str,
+    arguments: dict,
+    timeout: float = 30,
+    max_retries: int = 1,
+) -> dict:
+    """调用 MCP 工具，遇到 Chrome 崩溃时自动重建客户端并重试。
+
+    Args:
+        tool_name: MCP 工具名 (navigate_page, click, fill, etc.)
+        arguments: 工具参数字典
+        timeout: 单次调用超时秒数
+        max_retries: 额外重试次数 (默认 1)
+
+    Returns:
+        MCP 工具返回的 dict
+    """
+    last_error = None
+    for attempt in range(max_retries + 1):
+        client = await get_mcp_client()
+        if not client or not client.is_running() or not client._initialized:
+            if attempt < max_retries:
+                logger.warning("[MCP] 客户端不可用，正在重建...")
+                try:
+                    await rebuild_mcp_client()
+                except Exception:
+                    pass
+                await asyncio.sleep(0.5)
+                continue
+            return {"error": "MCP 客户端不可用，请重试"}
+
+        try:
+            result = await client.call_tool(tool_name, arguments, timeout=timeout)
+            # 检查返回值中是否有崩溃指示
+            result_str = str(result.get("error", "")) if isinstance(result, dict) else str(result)
+            if any(kw in result_str for kw in _MCP_CRASH_KEYWORDS):
+                if attempt < max_retries:
+                    logger.warning(f"[MCP] Chrome 连接丢失 ({result_str[:120]})，正在重建 MCP 客户端并重试 ({attempt+1}/{max_retries})...")
+                    try:
+                        await rebuild_mcp_client()
+                    except Exception:
+                        pass
+                    await asyncio.sleep(1.0)
+                    continue
+            return result
+        except Exception as e:
+            err_str = str(e)
+            last_error = err_str
+            if any(kw in err_str for kw in _MCP_CRASH_KEYWORDS):
+                if attempt < max_retries:
+                    logger.warning(f"[MCP] Chrome 异常 ({err_str[:120]})，正在重建 MCP 客户端并重试 ({attempt+1}/{max_retries})...")
+                    try:
+                        await rebuild_mcp_client()
+                    except Exception:
+                        pass
+                    await asyncio.sleep(1.0)
+                    continue
+            # 非崩溃类错误，直接抛出
+            raise
+
+    return {"error": f"MCP 调用失败: {last_error or '重试耗尽'}"}
+
+
 def _parse_json_response(text: str) -> Any:
     """尝试从 MCP 工具返回的文本中解析 JSON"""
     if not text:
@@ -1244,7 +1314,7 @@ class BrowserClickSkill(Skill):
             elif text:
                 params["ref"] = text  # MCP click 支持 ref 参数
 
-            click_result = await client.call_tool("click", params, timeout=30)
+            click_result = await _call_mcp_with_retry("click", params, timeout=30)
             if click_result.get("isError") or click_result.get("error"):
                 error_msg = click_result.get("error") or click_result.get("text", "点击失败")
                 return SkillResult(success=False, error=f"点击元素失败: {error_msg}")
@@ -1254,7 +1324,7 @@ class BrowserClickSkill(Skill):
                 await asyncio.sleep(wait_after / 1000)
 
             # 获取点击后页面状态
-            eval_result = await client.call_tool("evaluate_script", {
+            eval_result = await _call_mcp_with_retry("evaluate_script", {
                 "script": "() => ({ title: document.title, url: window.location.href, text: document.body.innerText.substring(0, 3000) })"
             }, timeout=10)
 
@@ -1317,14 +1387,14 @@ class BrowserFillSkill(Skill):
             elif selector:
                 params["selector"] = selector
 
-            fill_result = await client.call_tool("fill", params, timeout=30)
+            fill_result = await _call_mcp_with_retry("fill", params, timeout=30)
             if fill_result.get("isError") or fill_result.get("error"):
                 error_msg = fill_result.get("error") or fill_result.get("text", "填写失败")
                 return SkillResult(success=False, error=f"填写输入框失败: {error_msg}")
 
             # 按回车（可选）
             if press_enter:
-                await client.call_tool("press_key", {"key": "Enter"}, timeout=10)
+                await _call_mcp_with_retry("press_key", {"key": "Enter"}, timeout=10)
                 await asyncio.sleep(1)
 
             loc_desc = f"ref '{ref}'" if ref else f"选择器 '{selector}'"
@@ -1372,7 +1442,7 @@ class BrowserScreenshotSkill(Skill):
             if selector:
                 params["selector"] = selector
 
-            shot_result = await client.call_tool("take_screenshot", params, timeout=30)
+            shot_result = await _call_mcp_with_retry("take_screenshot", params, timeout=30)
             if shot_result.get("isError") or shot_result.get("error"):
                 error_msg = shot_result.get("error") or shot_result.get("text", "截图失败")
                 return SkillResult(success=False, error=f"截图失败: {error_msg}")
@@ -1432,7 +1502,7 @@ class BrowserEvalSkill(Skill):
         try:
             client = await get_mcp_client()
 
-            eval_result = await client.call_tool("evaluate_script", {"script": code}, timeout=30)
+            eval_result = await _call_mcp_with_retry("evaluate_script", {"script": code}, timeout=30)
             if eval_result.get("isError") or eval_result.get("error"):
                 error_msg = eval_result.get("error") or eval_result.get("text", "执行失败")
                 return SkillResult(success=False, error=f"JavaScript 执行失败: {error_msg}")
@@ -1483,7 +1553,7 @@ class BrowserNavigateSkill(Skill):
             client = await get_mcp_client()
 
             if action == "list_tabs":
-                result = await client.call_tool("list_pages", {}, timeout=15)
+                result = await _call_mcp_with_retry("list_pages", {}, timeout=15)
                 text = result.get("text", "")
                 return SkillResult(
                     success=True,
@@ -1492,12 +1562,12 @@ class BrowserNavigateSkill(Skill):
                 )
 
             elif action == "new_tab":
-                result = await client.call_tool("new_page", {}, timeout=15)
+                result = await _call_mcp_with_retry("new_page", {}, timeout=15)
                 if result.get("error"):
                     return SkillResult(success=False, error=f"打开新标签页失败: {result['error']}")
                 text = result.get("text", "")
                 if url:
-                    nav_result = await client.call_tool("navigate_page", {"url": url}, timeout=30)
+                    nav_result = await _call_mcp_with_retry("navigate_page", {"url": url}, timeout=30)
                     if nav_result.get("error"):
                         return SkillResult(success=False, error=f"导航失败: {nav_result['error']}")
                     text += f" → {url}"
@@ -1510,7 +1580,7 @@ class BrowserNavigateSkill(Skill):
             elif action == "switch_tab":
                 if not page_id:
                     return SkillResult(success=False, error="switch_tab 需要指定 page_id 参数")
-                result = await client.call_tool("select_page", {"pageId": page_id}, timeout=15)
+                result = await _call_mcp_with_retry("select_page", {"pageId": page_id}, timeout=15)
                 if result.get("error"):
                     return SkillResult(success=False, error=f"切换标签页失败: {result['error']}")
                 return SkillResult(
@@ -1520,7 +1590,7 @@ class BrowserNavigateSkill(Skill):
                 )
 
             elif action == "close_tab":
-                result = await client.call_tool("close_page", {}, timeout=15)
+                result = await _call_mcp_with_retry("close_page", {}, timeout=15)
                 return SkillResult(
                     success=True,
                     data={},
@@ -1529,7 +1599,7 @@ class BrowserNavigateSkill(Skill):
 
             elif action == "back":
                 # 通过 JS 实现后退
-                result = await client.call_tool("evaluate_script", {
+                result = await _call_mcp_with_retry("evaluate_script", {
                     "script": "() => { window.history.back(); return document.title; }"
                 }, timeout=15)
                 await asyncio.sleep(1)
@@ -1541,7 +1611,7 @@ class BrowserNavigateSkill(Skill):
                 )
 
             elif action == "forward":
-                result = await client.call_tool("evaluate_script", {
+                result = await _call_mcp_with_retry("evaluate_script", {
                     "script": "() => { window.history.forward(); return document.title; }"
                 }, timeout=15)
                 await asyncio.sleep(1)
@@ -1588,7 +1658,7 @@ class BrowserCloseSkill(Skill):
                 )
             else:
                 client = await get_mcp_client()
-                result = await client.call_tool("close_page", {}, timeout=15)
+                result = await _call_mcp_with_retry("close_page", {}, timeout=15)
                 return SkillResult(
                     success=True,
                     data={},

package/web/api_server.py

@@ -4422,10 +4422,9 @@ window.toggleFullscreen = function() {{
                 # 确保不会残留上次请求的知识库路径
                 if agent_path and self.core.main_agent and self.core.main_agent.context_builder:
                     agent_kb_dir = self._get_agent_knowledge_dir(agent_path)
-                    if agent_kb_dir.exists() and any(agent_kb_dir.iterdir()):
-                        self.core.main_agent.context_builder.agent_knowledge_dir = str(agent_kb_dir)
-                    else:
-                        self.core.main_agent.context_builder.agent_knowledge_dir = None
+                    # [v1.18.9] 始终设置 agent_knowledge_dir（即使目录为空），确保写入 Agent 专属目录
+                    agent_kb_dir.mkdir(parents=True, exist_ok=True)
+                    self.core.main_agent.context_builder.agent_knowledge_dir = str(agent_kb_dir)
 
                 try:
                     response = await self.core.process_message(message, session_id)
@@ -4723,11 +4722,10 @@ window.toggleFullscreen = function() {{
         # ── 设置 Agent 专属知识库目录（优先于组织知识库）──
         if agent_path and agent.context_builder:
             agent_kb_dir = self._get_agent_knowledge_dir(agent_path)
-            if agent_kb_dir.exists() and any(agent_kb_dir.iterdir()):
-                agent.context_builder.agent_knowledge_dir = str(agent_kb_dir)
-                logger.debug(f"[{session_id}] 使用 Agent 专属知识库: {agent_kb_dir}")
-            else:
-                agent.context_builder.agent_knowledge_dir = None
+            # [v1.18.9] 始终设置 agent_knowledge_dir（即使目录为空），确保写入 Agent 专属目录
+            agent_kb_dir.mkdir(parents=True, exist_ok=True)
+            agent.context_builder.agent_knowledge_dir = str(agent_kb_dir)
+            logger.debug(f"[{session_id}] 使用 Agent 专属知识库: {agent_kb_dir}")
 
         # Clear execution events from previous runs
         agent.clear_execution_events()

package/web/ui/chat/chat.css

@@ -2253,7 +2253,19 @@ body.popout-mode #popoutBtn{display:none !important}
     display:flex;
   }
 
-  /* ── Show sidebar footer/version on mobile (even when collapsed from desktop) ── */
+  /* ── Override desktop collapsed state on mobile: always full-width overlay, never icon-only ── */
+  .sidebar.collapsed{
+    width:85vw;min-width:0;max-width:320px;
+  }
+  .sidebar.collapsed .sidebar-header .sidebar-title,
+  .sidebar.collapsed .sidebar-header .sidebar-subtitle,
+  .sidebar.collapsed .new-chat-btn span,
+  .sidebar.collapsed .sidebar-header .sidebar-logo + div,
+  .sidebar.collapsed #sidebarAgentIndicator{display:flex!important}
+  .sidebar.collapsed .sidebar-header{justify-content:flex-start;padding:16px 20px}
+  .sidebar.collapsed .new-chat-btn{padding:12px 16px;justify-content:center}
+
+  /* ── Show sidebar content on mobile (even when collapsed from desktop) ── */
   .sidebar.collapsed .sidebar-footer,
   .sidebar.collapsed .sidebar-search,
   .sidebar.collapsed .session-list{
@@ -2264,6 +2276,11 @@ body.popout-mode #popoutBtn{display:none !important}
   .sidebar.collapsed .sidebar-footer{flex-direction:column}
   .sidebar-footer{padding-bottom:max(16px, calc(env(safe-area-inset-bottom) + 8px))}
 
+  /* [v1.18.9] 确保移动端 sidebar 不影响主内容区域布局 */
+  .app{display:flex;flex-direction:column;width:100%;height:100vh;height:100dvh}
+  .chat-main{flex:1;overflow:hidden;display:flex;flex-direction:column;width:100%}
+  .content-area{flex:1;display:flex;flex-direction:column;overflow:hidden}
+
   /* ── Header ── */
   .main-header{
     height:50px;min-height:50px;

package/web/ui/chat/chat_main.js

@@ -34,7 +34,9 @@ function toggleSidebar() {
   const sidebar = document.getElementById('sidebar');
   const toggleBtn = document.getElementById('sidebarToggle');
   if (!sidebar) return;
+  // [v1.18.9] 移动端始终移除 collapsed 状态，确保不会残留桌面端的折叠样式
   if (isMobile()) {
+    sidebar.classList.remove('collapsed');
     // Mobile: toggle as overlay
     const overlay = document.getElementById('chatMobileOverlay');
     const isOpen = sidebar.classList.contains('mobile-open');
@@ -169,6 +171,15 @@ setTimeout(function() {
     if (sidebar) sidebar.classList.add('collapsed');
     if (toggleBtn) toggleBtn.textContent = '▶';
   }
+  // [v1.18.9] 窗口大小变化时清理 collapsed 状态：移动端不应用桌面折叠
+  window.addEventListener('resize', function() {
+    const sidebar = document.getElementById('sidebar');
+    if (!sidebar) return;
+    if (isMobile()) {
+      sidebar.classList.remove('collapsed');
+      closeMobileSidebar();
+    }
+  });
 })();
 
 // ── State ──
@@ -186,6 +197,7 @@ const state = {
   execTimerInterval: null,    // polling interval ID for execution progress
   systemStatus: null,
   _sessionLoadSeq: 0,      // 防止 selectSession 并发竞态的序号
+  _selectedSessionLabel: null, // [v1.18.9] 保存选中的会话名称，防止竞态覆盖
   // ── Execution mode escalation ──
   escalated: false,      // 当前会话是否临时提权到 local
   execLockInfo: null,     // 全局锁信息 {locked, locked_by, locked_at}
@@ -1410,7 +1422,9 @@ async function selectAgent(agentPath) {
 
   // loadSessions 内部会 auto-select 最新 session；
   // 如果没有 session，则保持 "新对话" 空窗状态
+  // [v1.18.9] 如果 loadSessions 已成功选中了 session，不要覆盖其标题
   if (!state.activeSessionId || state.activeSessionId === '__new__') {
+    state._selectedSessionLabel = null;
     var selAgent = findAgentByPath(agentPath);
     var agentLabel = selAgent ? (selAgent.avatar_emoji + ' ' + selAgent.name) : agentPath;
     document.getElementById('headerTitle').textContent = '新对话';
@@ -1908,6 +1922,7 @@ function filterSessions() {
 
 function newChat() {
   state.activeSessionId = '__new__';
+  state._selectedSessionLabel = null;  // [v1.18.9] 清除选中的会话名称
   // ── 更新 URL（新对话移除 session 参数） ──
   try {
     const url = new URL(window.location.href);
@@ -2015,6 +2030,8 @@ async function selectSession(id) {
   var selAgent = findAgentByPath(state.activeAgent);
   var agentLabel = selAgent ? (selAgent.avatar_emoji + ' ' + selAgent.name) : '';
   var sessionLabel = session ? session.name : formatSessionName(id);
+  // [v1.18.9] 保存选中的会话名称，防止后续竞态覆盖
+  state._selectedSessionLabel = sessionLabel;
   document.getElementById('headerTitle').textContent = sessionLabel;
   renderSessions();
 
@@ -2064,8 +2081,13 @@ async function selectSession(id) {
   } catch (e) {
     if (mySeq !== state._sessionLoadSeq) return;
     state.messages = [];
+    console.error('[selectSession] 加载消息失败:', e);
     toast('加载消息失败', 'error');
   }
+  // [v1.18.9] 最终确认：如果当前仍是该会话，确保标题正确（防止竞态覆盖）
+  if (state.activeSessionId === id && state._selectedSessionLabel) {
+    document.getElementById('headerTitle').textContent = state._selectedSessionLabel;
+  }
   renderMessages();
   // 恢复滚动位置（刷新后保持用户之前的阅读位置）
   restoreScrollPosition();
@@ -3019,7 +3041,8 @@ function openFileViewer(fileId, src, fileName) {
     '</style></head><body>' +
     '<div class="toolbar">' +
     '<span class="fname">' + escapeHtml(fileName || '文件') + '</span>' +
-    (fileId ? '<button onclick="location.href=\'/api/file/' + fileId + '/download\'">&#11015; 下载</button>' : '') +
+    // [v1.18.9] 下载按钮：优先使用 fileId，其次尝试从 src 提取
+    (function() { var _dl = '', _fid = fileId; if (!_fid && src && src.indexOf('/api/file/') === 0) { _fid = src.replace('/api/file/', '').split('/')[0]; } if (_fid) { _dl = '<button onclick="location.href=\'/api/file/' + _fid + '/download\'">&#11015; 下载</button>'; } return _dl; })() +
     '<button class="close-btn" onclick="window.close()">&#10005; 关闭</button>' +
     '</div><div class="viewer">';
   

package/web/ui/index.html

@@ -177,23 +177,38 @@ tr:hover{background:var(--surface2)}
 [data-theme="claude"] .badge-blue{background:#4a7fc922}
 /* ── Mobile Responsive ── */
 @media(max-width:768px){
-  body{flex-direction:column}
-  .sidebar{position:fixed;left:0;top:0;height:100vh;width:260px;max-width:80vw;z-index:50;transform:translateX(-100%);transition:transform .3s ease;flex-shrink:0}
-  .sidebar.mobile-open{transform:translateX(0)}
-  .sidebar.collapsed{width:260px;transform:translateX(-100%)}
-  .sidebar.collapsed.mobile-open{transform:translateX(0)}
-  .sidebar-toggle{display:none!important}
-  /* 移动端：即使桌面端折叠了侧边栏，打开时也要显示底部版本信息 */
-  .sidebar.collapsed.mobile-open .sidebar-footer-text{display:block!important}
-  /* 移动端：打开侧边栏时，即使桌面端折叠了，也要显示图标文字 */
+  /* [v1.18.10] 移动端侧边栏：收起时与内容同平面(flex行布局)，展开时才浮层覆盖 */
+  body{flex-direction:row;height:100vh;overflow:hidden}
+  /* 默认收起状态：同一平面，56px窄栏，不浮动，不溢出 */
+  .sidebar{position:relative;left:auto;top:auto;height:auto;width:56px;z-index:auto;flex-shrink:0;transition:width .3s ease;overflow:hidden}
+  .sidebar .nav-item{justify-content:center;padding:10px 0;position:relative}
+  .sidebar .nav-item .icon-text{display:none}
+  .sidebar .logo .logo-text{display:none}
+  .sidebar .logo{justify-content:center;padding:20px 8px}
+  .sidebar .sidebar-footer-text{display:none}
+  /* 收起时显示 tooltip */
+  .sidebar .nav-item::after{
+    content:attr(data-tooltip);position:absolute;left:calc(100% + 8px);top:50%;transform:translateY(-50%);
+    padding:5px 10px;border-radius:6px;background:var(--text);color:var(--bg);font-size:12px;font-weight:500;
+    white-space:nowrap;opacity:0;visibility:hidden;pointer-events:none;transition:opacity .15s,visibility .15s;z-index:100;box-shadow:0 2px 8px rgba(0,0,0,.15);
+  }
+  .sidebar .nav-item:hover::after{opacity:1;visibility:visible}
+  /* 展开状态：浮层覆盖 + 遮罩 */
+  .sidebar.mobile-open{position:fixed;left:0;top:0;height:100vh;width:260px;max-width:80vw;z-index:50}
+  .sidebar.mobile-open .nav-item{justify-content:flex-start;padding:8px 12px}
   .sidebar.mobile-open .nav-item .icon-text{display:inline!important}
+  .sidebar.mobile-open .nav-item::after{display:none}
   .sidebar.mobile-open .logo .logo-text{display:inline!important}
-  .sidebar.mobile-open.collapsed .nav-item{justify-content:flex-start;padding:8px 12px}
-  .sidebar.mobile-open.collapsed .logo{justify-content:flex-start;padding:16px 12px}
+  .sidebar.mobile-open .logo{justify-content:flex-start;padding:16px 12px}
+  .sidebar.mobile-open .sidebar-footer-text{display:block!important}
+  .sidebar.collapsed{width:56px;position:relative;left:auto;top:auto;z-index:auto;transform:none}
+  .sidebar.collapsed.mobile-open{width:260px;max-width:80vw;position:fixed;left:0;top:0;z-index:50;transform:none}
+  .sidebar-toggle{display:none!important}
   .sidebar-footer-text{padding-bottom:max(12px, calc(env(safe-area-inset-bottom) + 8px))}
   .mobile-overlay{position:fixed;inset:0;background:rgba(0,0,0,.4);z-index:45;display:none}
   .mobile-overlay.active{display:block}
-  .header{padding:12px 16px}
+  .main{flex:1;min-width:0;min-height:0;overflow:hidden}
+  .header{padding:12px 16px;padding-left:12px}
   .header h2{font-size:16px}
   .content{padding:16px}
   .grid{grid-template-columns:1fr}
@@ -215,6 +230,12 @@ tr:hover{background:var(--surface2)}
   .toast{left:16px;right:16px;bottom:16px}
   .agent-card{flex-direction:column;align-items:flex-start}
   .agent-card .flex.flex-col{flex-direction:row;gap:4px}
+  /* 技能行移动端允许换行 */
+  .skill-row{flex-wrap:wrap}
+  .skill-row .flex{flex-wrap:wrap;gap:4px}
+  /* 任务表格优化 */
+  .table-wrap table{min-width:auto}
+  .table-wrap td[style*="max-width:300px"]{max-width:150px!important;white-space:normal!important;word-break:break-all}
 }
 @media(max-width:480px){
   .content{padding:12px}
@@ -343,17 +364,29 @@ if(localStorage.getItem('myagent-admin-sidebar-collapsed')==='true'){document.ge
 function toggleMobileSidebar(){
   const s=document.getElementById('adminSidebar');
   const o=document.getElementById('adminMobileOverlay');
-  s.classList.toggle('mobile-open');
-  o.classList.toggle('active');
+  const isOpen=s.classList.contains('mobile-open');
+  if(isOpen){closeMobileSidebar();}else{s.classList.add('mobile-open');o.classList.add('active');}
 }
 function closeMobileSidebar(){
   document.getElementById('adminSidebar').classList.remove('mobile-open');
   document.getElementById('adminMobileOverlay').classList.remove('active');
 }
-// Show hamburger on mobile
-function checkMobile(){const btn=document.getElementById('mobileMenuBtn');if(btn)btn.style.display=window.innerWidth<=768?'grid':'none'}
+// Show hamburger on mobile + tap sidebar to expand on mobile
+function checkMobile(){
+  const btn=document.getElementById('mobileMenuBtn');
+  if(btn)btn.style.display=window.innerWidth<=768?'grid':'none';
+}
 window.addEventListener('resize',checkMobile);
 checkMobile();
+// [v1.18.10] 移动端点击侧滑栏窄栏区域也可展开
+document.getElementById('adminSidebar')?.addEventListener('click',function(e){
+  if(window.innerWidth>768)return;
+  // 如果已经是展开状态，不处理（让 nav-item 的 onclick 正常执行）
+  if(this.classList.contains('mobile-open'))return;
+  // 只在点击侧滑栏本身（非具体按钮/链接）时展开
+  if(e.target.closest('.nav-item')||e.target.closest('a')||e.target.closest('button'))return;
+  toggleMobileSidebar();
+});
 
 loadVersion();
 setTimeout(()=>checkUpdate(false),30000);
@@ -1228,13 +1261,21 @@ function enterSession(sid,agentName){
 
 // ========== Memory ==========
 let _memCategory='global';
+let _memAgentFilter='';  // [v1.18.9] agent筛选
 async function renderMemory(){
+  // [v1.18.9] 加载 agent 列表供筛选
+  let agentOpts='<option value="">全部 Agent</option>';
+  try{const ags=await api('/api/agents');
+    if(ags&&ags.length){for(const a of ags){agentOpts+=`<option value="${escHtml(a.path||a.name)}" ${_memAgentFilter===(a.path||a.name)?'selected':''}>${escHtml(a.name||a.path)}</option>`;}
+  }}catch(e){}
   let stats={},lt=[];
   try{stats=await api('/api/memory/stats')}catch(e){stats={error:e.message}}
   try{lt=await api('/api/memory/list?category='+encodeURIComponent(_memCategory))}catch(e){lt=[]}
   if(stats.error){$('content').innerHTML='<div class="empty" style="color:var(--danger)">记忆系统异常: '+escHtml(stats.error)+'</div>';return}
+  // [v1.18.9] 按 agent 筛选
+  if(_memAgentFilter){lt=lt.filter(e=>(e.agent_id||e.session_id||'').includes(_memAgentFilter));}
   const cats=[{k:'global',l:'全局记忆'},{k:'session',l:'会话记忆'}];
-  let tabHtml='<div class="flex gap-8 mb-8">';
+  let tabHtml='<div class="flex gap-8 mb-8" style="flex-wrap:wrap">';
   for(const c of cats){
     const active=c.k===_memCategory?'btn-primary':'btn-ghost';
     const count=stats[c.k+'_count']||0;
@@ -1246,7 +1287,7 @@ async function renderMemory(){
     <div class="stat"><div class="label">全局记忆</div><div class="value">${stats.global_count||0}</div></div>
     <div class="stat"><div class="label">会话记忆</div><div class="value">${stats.session_count||0}</div></div></div>`;
   html+=tabHtml;
-  html+='<div class="flex gap-8 mb-16"><input id="memSearch" placeholder="搜索记忆..." onkeydown="if(event.key===\'Enter\')searchMemory()" style="max-width:400px"><button class="btn btn-primary" onclick="searchMemory()">搜索</button><button class="btn btn-ghost" onclick="cleanupMemory()">清理过期</button></div>';
+  html+='<div class="flex gap-8 mb-16" style="flex-wrap:wrap"><select id="memAgentFilter" onchange="_memAgentFilter=this.value;renderMemory()" style="width:auto;min-width:140px">'+agentOpts+'</select><input id="memSearch" placeholder="搜索记忆..." onkeydown="if(event.key===\'Enter\')searchMemory()" style="max-width:300px"><button class="btn btn-primary" onclick="searchMemory()">搜索</button><button class="btn btn-ghost" onclick="cleanupMemory()">清理过期</button></div>';
   if(lt&&lt.length){
     const isSession=_memCategory==='session';
     html+='<div class="mem-list">';