myagent-ai 1.18.1 → 1.18.2

package/core/vnc_manager.py

@@ -79,6 +79,8 @@ class VNCManager:
 
         # 状态标记
         self._running = False
+        self._xvfb_attached = False  # 是否附加到已有的 Xvfb 实例
+        self._xvfb_attached_pid: Optional[int] = None  # 附加的 Xvfb PID
         self._lock = asyncio.Lock()
 
         # noVNC web 文件路径（用于 aiohttp 静态文件服务）
@@ -88,10 +90,27 @@ class VNCManager:
     def is_running(self) -> bool:
         """VNC 服务是否正在运行"""
         if not self._running:
-            return False
+            # 即使内部标记为未运行，也检查系统上是否有 VNC 服务
+            # (myagent 重启后 _running 会重置为 False)
+            if self._detect_existing_services():
+                self._running = True
+                logger.info("检测到已有的 VNC 服务正在运行")
+            else:
+                return False
+
         # 检查各进程是否存活
+        # Xvfb: 如果是附加的实例，通过 PID 检查
+        if self._xvfb_attached:
+            if self._xvfb_attached_pid and not self._is_pid_alive(self._xvfb_attached_pid):
+                logger.warning("附加的 Xvfb 进程已退出")
+                self._running = False
+                return False
+        elif self._xvfb_process and self._xvfb_process.poll() is not None:
+            logger.warning(f"Xvfb 进程已退出 (exit code: {self._xvfb_process.returncode})")
+            self._running = False
+            return False
+
         for proc, name in [
-            (self._xvfb_process, "Xvfb"),
             (self._x11vnc_process, "x11vnc"),
             (self._websockify_process, "websockify"),
         ]:
@@ -101,6 +120,72 @@ class VNCManager:
                 return False
         return True
 
+    def _is_pid_alive(self, pid: int) -> bool:
+        """检查进程是否存活"""
+        try:
+            os.kill(pid, 0)  # 发送信号 0，不实际杀死进程
+            return True
+        except (OSError, ProcessLookupError):
+            return False
+
+    def _detect_existing_services(self) -> bool:
+        """检测系统上是否已有 VNC 相关服务在运行（用于 myagent 重启后恢复状态）"""
+        display_num = self.display.replace(":", "")
+        socket_path = f"/tmp/.X11-unix/X{display_num}"
+
+        # 检查 Xvfb socket 和进程
+        xvfb_ok = False
+        if os.path.exists(socket_path):
+            try:
+                result = subprocess.run(
+                    ["pgrep", "-f", f"Xvfb {self.display}"],
+                    capture_output=True, text=True, timeout=5,
+                )
+                if result.returncode == 0 and result.stdout.strip():
+                    xvfb_ok = True
+            except Exception:
+                pass
+
+        if not xvfb_ok:
+            return False
+
+        # 检查 x11vnc 是否在监听端口
+        x11vnc_ok = self._is_port_listening(self.x11vnc_port)
+        if not x11vnc_ok:
+            return False
+
+        # 检查 websockify 是否在监听端口
+        websockify_ok = self._is_port_listening(self.novnc_port)
+
+        if xvfb_ok and x11vnc_ok and websockify_ok:
+            # 恢复附加状态
+            self._xvfb_attached = True
+            try:
+                result = subprocess.run(
+                    ["pgrep", "-f", f"Xvfb {self.display}"],
+                    capture_output=True, text=True, timeout=5,
+                )
+                if result.returncode == 0:
+                    self._xvfb_attached_pid = int(result.stdout.strip().split()[0])
+            except Exception:
+                pass
+            return True
+
+        return False
+
+    @staticmethod
+    def _is_port_listening(port: int) -> bool:
+        """检查端口是否在监听"""
+        try:
+            import socket
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            s.settimeout(0.5)
+            s.connect(("127.0.0.1", port))
+            s.close()
+            return True
+        except (OSError, ConnectionRefusedError):
+            return False
+
     @property
     def display_env(self) -> Dict[str, str]:
         """返回 DISPLAY 环境变量字典，供子进程使用"""
@@ -109,29 +194,39 @@ class VNCManager:
     @property
     def status(self) -> Dict[str, Any]:
         """获取当前状态信息"""
-        xvfb_alive = self._xvfb_process is not None and self._xvfb_process.poll() is None
+        running = self.is_running
+
+        # Xvfb: 附加模式 vs 自启动模式
+        if self._xvfb_attached:
+            xvfb_alive = self._xvfb_attached_pid is not None and self._is_pid_alive(self._xvfb_attached_pid)
+            xvfb_pid = self._xvfb_attached_pid if xvfb_alive else None
+        else:
+            xvfb_alive = self._xvfb_process is not None and self._xvfb_process.poll() is None
+            xvfb_pid = self._xvfb_process.pid if xvfb_alive else None
+
         vnc_alive = self._x11vnc_process is not None and self._x11vnc_process.poll() is None
         ws_alive = self._websockify_process is not None and self._websockify_process.poll() is None
 
         return {
-            "running": self.is_running,
+            "running": running,
             "display": self.display,
             "resolution": self.resolution,
             "xvfb": {
-                "alive": xvfb_alive,
-                "pid": self._xvfb_process.pid if xvfb_alive else None,
+                "alive": xvfb_alive or running,  # 如果整体在运行，Xvfb 肯定是活的
+                "pid": xvfb_pid,
+                "attached": self._xvfb_attached,
             },
             "x11vnc": {
-                "alive": vnc_alive,
+                "alive": vnc_alive or running,
                 "port": self.x11vnc_port,
                 "pid": self._x11vnc_process.pid if vnc_alive else None,
             },
             "websockify": {
-                "alive": ws_alive,
+                "alive": ws_alive or running,
                 "port": self.novnc_port,
                 "pid": self._websockify_process.pid if ws_alive else None,
             },
-            "novnc_url": f"/vnc/vnc.html?autoconnect=true&resize=scale" if self.is_running else None,
+            "novnc_url": f"/vnc/vnc.html?autoconnect=true&resize=scale" if running else None,
         }
 
     def get_novnc_url(self, base_url: str = "") -> Optional[str]:
@@ -280,7 +375,7 @@ class VNCManager:
         """启动 VNC 远程桌面服务。
         
         启动顺序:
-          1. Xvfb (虚拟显示)
+          1. Xvfb (虚拟显示) — 如果已在运行则附加
           2. x11vnc (VNC 服务器)
           3. websockify (WebSocket 代理)
         
@@ -288,7 +383,9 @@ class VNCManager:
             {"success": bool, "message": str, "status": dict}
         """
         async with self._lock:
-            if self._running:
+            # 检查是否已在运行（包括检测系统上已有的服务）
+            if self._running or self._detect_existing_services():
+                self._running = True
                 return {
                     "success": True,
                     "message": "VNC 服务已在运行中",
@@ -300,31 +397,7 @@ class VNCManager:
             if not ok:
                 return {"success": False, "message": f"依赖检查失败: {dep_msg}"}
 
-            # Step 2: 检查显示号是否已被占用
-            display_num = self.display.replace(":", "")
-            lock_file = f"/tmp/.X{display_num}-lock"
-            if os.path.exists(lock_file):
-                # 检查是否有 Xvfb 进程在运行
-                try:
-                    result = subprocess.run(
-                        ["pgrep", "-f", f"Xvfb {self.display}"],
-                        capture_output=True, text=True, timeout=5,
-                    )
-                    if result.returncode == 0 and result.stdout.strip():
-                        logger.info(f"Xvfb {self.display} 已在运行，跳过启动")
-                    else:
-                        # 锁文件存在但进程不在，清理锁文件
-                        try:
-                            os.remove(lock_file)
-                            socket_file = f"/tmp/.X11-unix/X{display_num}"
-                            if os.path.exists(socket_file):
-                                os.remove(socket_file)
-                        except OSError:
-                            pass
-                except Exception:
-                    pass
-
-            # Step 3: 启动 Xvfb
+            # Step 2: 启动或附加 Xvfb
             xvfb_ok = await self._start_xvfb()
             if not xvfb_ok:
                 await self.stop()
@@ -333,7 +406,7 @@ class VNCManager:
             # 等待 Xvfb 就绪
             await asyncio.sleep(1)
 
-            # Step 4: 启动 x11vnc
+            # Step 3: 启动 x11vnc
             vnc_ok = await self._start_x11vnc()
             if not vnc_ok:
                 await self.stop()
@@ -342,13 +415,13 @@ class VNCManager:
             # 等待 x11vnc 就绪
             await asyncio.sleep(1)
 
-            # Step 5: 启动 websockify
+            # Step 4: 启动 websockify
             ws_ok = await self._start_websockify()
             if not ws_ok:
                 await self.stop()
                 return {"success": False, "message": "websockify 启动失败", "status": self.status}
 
-            # Step 6: 查找 noVNC web 文件
+            # Step 5: 查找 noVNC web 文件
             self._novnc_web_dir = self._find_novnc_dir()
             if self._novnc_web_dir:
                 logger.info(f"noVNC web 文件: {self._novnc_web_dir}")
@@ -383,20 +456,27 @@ class VNCManager:
                 errors.extend(await self._kill_process(self._x11vnc_process, "x11vnc"))
                 self._x11vnc_process = None
 
+            # Xvfb: 只有自己启动的才杀，附加的不杀
             if self._xvfb_process:
                 errors.extend(await self._kill_process(self._xvfb_process, "Xvfb"))
                 self._xvfb_process = None
-
-            # 清理锁文件和 socket
-            display_num = self.display.replace(":", "")
-            for f in [f"/tmp/.X{display_num}-lock", f"/tmp/.X11-unix/X{display_num}"]:
-                try:
-                    if os.path.exists(f):
-                        os.remove(f)
-                except OSError:
-                    pass
+            elif self._xvfb_attached:
+                logger.info(f"Xvfb {self.display} 是附加到已有实例，不停止 (PID={self._xvfb_attached_pid})")
+                self._xvfb_attached = False
+                self._xvfb_attached_pid = None
+
+            # 清理锁文件和 socket (只清理自己启动的)
+            if not self._xvfb_attached:
+                display_num = self.display.replace(":", "")
+                for f in [f"/tmp/.X{display_num}-lock", f"/tmp/.X11-unix/X{display_num}"]:
+                    try:
+                        if os.path.exists(f):
+                            os.remove(f)
+                    except OSError:
+                        pass
 
             self._running = False
+            self._xvfb_attached = False
 
             if errors:
                 return {"success": True, "message": f"VNC 已停止 (部分警告: {'; '.join(errors)})"}
@@ -489,8 +569,40 @@ class VNCManager:
     # ── 内部方法 ──────────────────────────────────────────
 
     async def _start_xvfb(self) -> bool:
-        """启动 Xvfb 虚拟显示服务器"""
+        """启动或附加到 Xvfb 虚拟显示服务器"""
         try:
+            display_num = self.display.replace(":", "")
+            socket_path = f"/tmp/.X11-unix/X{display_num}"
+
+            # 检查 Xvfb 是否已在运行
+            if os.path.exists(socket_path):
+                try:
+                    result = subprocess.run(
+                        ["pgrep", "-f", f"Xvfb {self.display}"],
+                        capture_output=True, text=True, timeout=5,
+                    )
+                    if result.returncode == 0 and result.stdout.strip():
+                        # Xvfb 已在运行，附加到它
+                        pid = int(result.stdout.strip().split()[0])
+                        self._xvfb_attached = True
+                        self._xvfb_attached_pid = pid
+                        logger.info(f"Xvfb {self.display} 已在运行 (PID={pid})，附加到现有实例")
+                        return True
+                    else:
+                        # 锁文件/socket 存在但进程不在，清理
+                        logger.info(f"Xvfb {self.display} socket 存在但进程不在，清理残留文件")
+                        lock_file = f"/tmp/.X{display_num}-lock"
+                        try:
+                            os.remove(lock_file)
+                        except OSError:
+                            pass
+                        try:
+                            os.remove(socket_path)
+                        except OSError:
+                            pass
+                except Exception as e:
+                    logger.warning(f"检查 Xvfb 状态异常: {e}")
+
             cmd = [
                 "Xvfb",
                 self.display,
@@ -529,8 +641,6 @@ class VNCManager:
                 return False
 
             # 验证 X socket 是否已创建
-            display_num = self.display.replace(":", "")
-            socket_path = f"/tmp/.X11-unix/X{display_num}"
             for _ in range(10):
                 if os.path.exists(socket_path):
                     break

package/package.json

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

package/web/ui/chat/chat_main.js

@@ -942,8 +942,18 @@ function updateVNCButton() {
 }
 
 async function toggleVNC() {
+  // 先刷新一次状态（避免因轮询间隔导致状态过期）
+  try {
+    var latest = await api('/api/vnc/status');
+    if (latest && latest.running) {
+      vncStatus = latest;
+      updateVNCButton();
+      openVNCWindow();
+      return;
+    }
+  } catch (e) {}
+
   if (vncStatus.running) {
-    // VNC 正在运行，打开远程桌面窗口
     openVNCWindow();
     return;
   }
@@ -957,12 +967,18 @@ async function toggleVNC() {
   try {
     var result = await api('/api/vnc/start', { method: 'POST' });
     if (result.success) {
-      toast('远程桌面已启动', 'success');
       await refreshVNCStatus();
-      // 延迟打开远程桌面窗口（等待服务完全就绪）
-      setTimeout(function() {
+      // 如果是"已在运行"（附加到已有实例），立刻打开窗口
+      if (result.message && result.message.indexOf('已在运行') > -1) {
+        toast('远程桌面已连接', 'success');
         openVNCWindow();
-      }, 2000);
+      } else {
+        toast('远程桌面已启动', 'success');
+        // 新启动的需要等服务完全就绪
+        setTimeout(function() {
+          openVNCWindow();
+        }, 2000);
+      }
     } else {
       toast('启动失败: ' + (result.message || '未知错误'), 'error');
     }