myagent-ai 1.33.0 → 1.33.1

package/aiskills/browser_stealth.py

@@ -33,6 +33,7 @@ import asyncio
 import json
 import os
 import shutil
+import subprocess
 import threading
 import time
 from pathlib import Path
@@ -44,6 +45,139 @@ from aiskills.base import Skill, SkillResult, SkillParameter
 logger = get_logger("myagent.skills.browser_stealth")
 
 
+# ── Xvfb 虚拟显示管理 ──────────────────────────────────────
+
+_xvfb_process: Optional[subprocess.Popen] = None
+_xvfb_display: Optional[str] = None
+_xvfb_lock = threading.Lock()
+
+
+def _has_display() -> bool:
+    """检查当前环境是否有可用的 X11 显示"""
+    display = os.environ.get("DISPLAY", "").strip()
+    if not display:
+        return False
+    # DISPLAY 已设置，尝试检测是否真的可用
+    # 方法1: xdpyinfo
+    try:
+        result = subprocess.run(
+            ["xdpyinfo"],
+            capture_output=True, timeout=3,
+            env={**os.environ},
+        )
+        if result.returncode == 0:
+            return True
+    except Exception:
+        pass
+    # 方法2: xdpyinfo 不可用时，尝试用 Xvfb 的 -displayfd 验证
+    # 如果 DISPLAY 变量指向一个活跃的 X server，即使 xdpyinfo 不可用，
+    # 我们也可以认为有可用显示（例如 Xvfb 已经启动过了）
+    try:
+        # 尝试连接 X server（使用 xdotool 或 xprop 等轻量工具）
+        for cmd in (["xprop", "-root", "_NET_SUPPORTING_WM_CHECK"],
+                    ["xdotool", "getdisplaywidth"]):
+            result = subprocess.run(
+                cmd, capture_output=True, timeout=3,
+                env={**os.environ},
+            )
+            if result.returncode == 0:
+                return True
+    except Exception:
+        pass
+    # 方法3: 如果 DISPLAY 格式正确且 /tmp/.X11-unix/ 下有对应 socket，认为可用
+    try:
+        if display.startswith(":"):
+            num = display[1:].split(".")[0]
+            socket_path = f"/tmp/.X11-unix/X{num}"
+            if os.path.exists(socket_path):
+                return True
+    except Exception:
+        pass
+    return False
+
+
+def _start_xvfb(display_num: int = 99) -> Optional[str]:
+    """
+    启动 Xvfb 虚拟显示服务器。
+
+    Returns:
+        DISPLAY 环境变量值（如 :99），失败返回 None
+    """
+    global _xvfb_process, _xvfb_display
+
+    with _xvfb_lock:
+        # 如果已经启动，直接返回
+        if _xvfb_process and _xvfb_process.poll() is None:
+            return _xvfb_display
+
+        # 清理旧的
+        if _xvfb_process:
+            try:
+                _xvfb_process.terminate()
+                _xvfb_process.wait(timeout=3)
+            except Exception:
+                try:
+                    _xvfb_process.kill()
+                except Exception:
+                    pass
+            _xvfb_process = None
+
+        xvfb_path = shutil.which("Xvfb")
+        if not xvfb_path:
+            logger.warning("Xvfb 未安装，无法启动虚拟显示")
+            return None
+
+        display_str = f":{display_num}"
+        try:
+            # 先清理可能残留的 X11 锁文件
+            for lock_file in (f"/tmp/.X{display_num}-lock", f"/tmp/.X11-unix/X{display_num}"):
+                if os.path.exists(lock_file):
+                    try:
+                        os.unlink(lock_file)
+                    except Exception:
+                        pass
+
+            _xvfb_process = subprocess.Popen(
+                [xvfb_path, display_str, "-screen", "0", "1920x1080x24", "-ac", "-nolisten", "tcp"],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+            # 等待 Xvfb 启动
+            time.sleep(0.5)
+            if _xvfb_process.poll() is not None:
+                logger.error(f"Xvfb 启动后立即退出 (returncode={_xvfb_process.returncode})")
+                _xvfb_process = None
+                return None
+
+            _xvfb_display = display_str
+            os.environ["DISPLAY"] = display_str
+            logger.info(f"Xvfb 虚拟显示已启动: {display_str}")
+            return display_str
+        except Exception as e:
+            logger.error(f"启动 Xvfb 失败: {e}")
+            _xvfb_process = None
+            return None
+
+
+def _stop_xvfb() -> None:
+    """停止 Xvfb 虚拟显示服务器"""
+    global _xvfb_process, _xvfb_display
+
+    with _xvfb_lock:
+        if _xvfb_process:
+            try:
+                _xvfb_process.terminate()
+                _xvfb_process.wait(timeout=5)
+            except Exception:
+                try:
+                    _xvfb_process.kill()
+                except Exception:
+                    pass
+            _xvfb_process = None
+            _xvfb_display = None
+            logger.info("Xvfb 虚拟显示已停止")
+
+
 # ── 反检测浏览器管理器 ──────────────────────────────────────
 
 
@@ -80,6 +214,7 @@ class StealthBrowser:
         self._browser = None  # DrissionPage Chromium 实例
         self._started = False
         self._user_data_dir = ""
+        self._xvfb_started_by_us = False  # 是否由本实例启动的 Xvfb
 
     def _get_user_data_dir(self) -> str:
         """获取用户数据目录路径"""
@@ -130,7 +265,21 @@ class StealthBrowser:
             co.set_argument("--disable-dev-shm-usage")
             co.set_argument("--disable-gpu")
 
-            # 无头模式
+            # ── 无 DISPLAY 环境处理 ──
+            # 当 headless=False 但没有可用显示时，尝试启动 Xvfb 虚拟显示；
+            # 如果 Xvfb 不可用则自动降级为 headless 模式
+            if not self._headless and not _has_display():
+                xvfb_display = _start_xvfb()
+                if xvfb_display:
+                    self._xvfb_started_by_us = True
+                    logger.info(f"无 DISPLAY 环境，已启动 Xvfb 虚拟显示 ({xvfb_display})")
+                else:
+                    self._headless = True
+                    logger.warning(
+                        "无 DISPLAY 环境且 Xvfb 不可用，自动降级为 headless 模式"
+                    )
+
+            # 无头模式（co.headless() 内部设置 --headless=new）
             if self._headless:
                 co.headless()
 
@@ -138,13 +287,33 @@ class StealthBrowser:
             browser_path = self._detect_browser()
             if browser_path:
                 co.set_browser_path(browser_path)
+            else:
+                return SkillResult(
+                    success=False,
+                    error=(
+                        "未找到 Chrome/Chromium 浏览器。"
+                        "请安装 Chrome 或设置 CHROME_PATH 环境变量。"
+                    ),
+                )
 
             # 设置窗口大小
             co.set_argument("--window-size=1920,1080")
 
-            # 创建浏览器实例
-            self._browser = Chromium(co)
-            self._page = self._browser.latest_tab
+            # 创建浏览器实例（增加重试逻辑）
+            last_error = None
+            for attempt in range(3):
+                try:
+                    self._browser = Chromium(co)
+                    self._page = self._browser.latest_tab
+                    break
+                except Exception as e:
+                    last_error = e
+                    logger.warning(f"浏览器启动第 {attempt + 1}/3 次尝试失败: {e}")
+                    # 清理可能残留的 Chrome 进程
+                    self._kill_stale_chrome(user_data)
+                    time.sleep(2 * (attempt + 1))
+            else:
+                raise last_error
 
             # 如果浏览器已崩溃或无法获取 tab
             if not self._page:
@@ -195,11 +364,23 @@ class StealthBrowser:
                 self._browser = None
                 self._page = None
                 logger.info("反检测浏览器已关闭")
-                return SkillResult(success=True, message="浏览器已关闭")
         except Exception as e:
             logger.error(f"关闭浏览器异常: {e}")
             self._browser = None
             self._page = None
+
+        # 如果由本实例启动了 Xvfb，关闭浏览器后停止虚拟显示
+        if self._xvfb_started_by_us:
+            self._xvfb_started_by_us = False
+            # 检查是否还有其他浏览器实例在使用 Xvfb
+            with _browser_lock:
+                other_active = any(
+                    b._started and b is not self
+                    for b in _browsers.values()
+                )
+            if not other_active:
+                _stop_xvfb()
+
         return SkillResult(success=True, message="浏览器已关闭")
 
     async def navigate(self, url: str, wait: float = 2.0) -> SkillResult:
@@ -559,6 +740,34 @@ class StealthBrowser:
             logger.debug(f"页面检查失败 (profile={self.profile_name})，浏览器可能已关闭")
             return False
 
+    @staticmethod
+    def _kill_stale_chrome(user_data_dir: str = "") -> None:
+        """清理可能残留的 Chrome/Chromium 进程"""
+        try:
+            # 查找使用相同 user-data-dir 的残留 Chrome 进程
+            patterns = [
+                "chromium-browser.*--remote-debugging-port",
+                "chromium.*--remote-debugging-port",
+                "chrome.*--remote-debugging-port",
+                "google-chrome.*--remote-debugging-port",
+                "headless_shell.*--remote-debugging-port",
+            ]
+            for pattern in patterns:
+                result = subprocess.run(
+                    ["pgrep", "-f", pattern],
+                    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, 9)  # SIGKILL
+                            logger.info(f"已清理残留 Chrome 进程: PID {pid}")
+                        except (ValueError, ProcessLookupError, PermissionError):
+                            pass
+        except Exception as e:
+            logger.debug(f"清理残留 Chrome 进程时出错: {e}")
+
     @staticmethod
     def _detect_browser() -> Optional[str]:
         """自动检测 Chromium/Chrome 浏览器路径"""
@@ -693,6 +902,9 @@ def close_stealth_browser(profile_name: str = "") -> None:
                     pass
             _browsers.clear()
 
+    # 所有浏览器关闭后，停止 Xvfb（如果有）
+    _stop_xvfb()
+
 
 async def close_stealth_browser_async(profile_name: str = "") -> None:
     """关闭浏览器实例（异步版本，供 async 上下文调用）"""

package/aiskills/chromedev_mcp.py

@@ -39,6 +39,132 @@ from aiskills.base import Skill, SkillResult, SkillParameter
 
 logger = get_logger("myagent.skills.chromedev_mcp")
 
+
+# ── Xvfb 虚拟显示管理 ──────────────────────────────────────
+
+_xvfb_process: Optional[subprocess.Popen] = None
+_xvfb_display: Optional[str] = None
+
+
+def _has_display() -> bool:
+    """检查当前环境是否有可用的 X11 显示"""
+    display = os.environ.get("DISPLAY", "").strip()
+    if not display:
+        return False
+    # DISPLAY 已设置，尝试检测是否真的可用
+    # 方法1: xdpyinfo
+    try:
+        result = subprocess.run(
+            ["xdpyinfo"], capture_output=True, timeout=3,
+            env={**os.environ},
+        )
+        if result.returncode == 0:
+            return True
+    except Exception:
+        pass
+    # 方法2: 用 xprop/xdotool 等轻量工具验证
+    try:
+        for cmd in (["xprop", "-root", "_NET_SUPPORTING_WM_CHECK"],
+                    ["xdotool", "getdisplaywidth"]):
+            result = subprocess.run(
+                cmd, capture_output=True, timeout=3,
+                env={**os.environ},
+            )
+            if result.returncode == 0:
+                return True
+    except Exception:
+        pass
+    # 方法3: 检查 /tmp/.X11-unix/ 下的 socket 文件
+    try:
+        if display.startswith(":"):
+            num = display[1:].split(".")[0]
+            socket_path = f"/tmp/.X11-unix/X{num}"
+            if os.path.exists(socket_path):
+                return True
+    except Exception:
+        pass
+    return False
+
+
+def _start_xvfb(display_num: int = 98) -> Optional[str]:
+    """
+    启动 Xvfb 虚拟显示服务器。
+
+    Returns:
+        DISPLAY 环境变量值（如 :98），失败返回 None
+    """
+    global _xvfb_process, _xvfb_display
+
+    # 如果已经启动，直接返回
+    if _xvfb_process and _xvfb_process.poll() is None:
+        return _xvfb_display
+
+    # 清理旧的
+    if _xvfb_process:
+        try:
+            _xvfb_process.terminate()
+            _xvfb_process.wait(timeout=3)
+        except Exception:
+            try:
+                _xvfb_process.kill()
+            except Exception:
+                pass
+        _xvfb_process = None
+
+    xvfb_path = shutil.which("Xvfb")
+    if not xvfb_path:
+        logger.warning("Xvfb 未安装，无法启动虚拟显示")
+        return None
+
+    display_str = f":{display_num}"
+    try:
+        # 清理可能残留的 X11 锁文件
+        for lock_file in (f"/tmp/.X{display_num}-lock", f"/tmp/.X11-unix/X{display_num}"):
+            if os.path.exists(lock_file):
+                try:
+                    os.unlink(lock_file)
+                except Exception:
+                    pass
+
+        _xvfb_process = subprocess.Popen(
+            [xvfb_path, display_str, "-screen", "0", "1920x1080x24", "-ac", "-nolisten", "tcp"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        time.sleep(0.5)
+        if _xvfb_process.poll() is not None:
+            logger.error(f"Xvfb 启动后立即退出 (returncode={_xvfb_process.returncode})")
+            _xvfb_process = None
+            return None
+
+        _xvfb_display = display_str
+        os.environ["DISPLAY"] = display_str
+        logger.info(f"Xvfb 虚拟显示已启动 (chromedev_mcp): {display_str}")
+        return display_str
+    except Exception as e:
+        logger.error(f"启动 Xvfb 失败: {e}")
+        _xvfb_process = None
+        return None
+
+
+def _stop_xvfb() -> None:
+    """停止 Xvfb 虚拟显示服务器"""
+    global _xvfb_process, _xvfb_display
+
+    if _xvfb_process:
+        try:
+            _xvfb_process.terminate()
+            _xvfb_process.wait(timeout=5)
+        except Exception:
+            try:
+                _xvfb_process.kill()
+            except Exception:
+                pass
+        _xvfb_process = None
+        _xvfb_display = None
+        logger.info("Xvfb 虚拟显示已停止 (chromedev_mcp)")
+
+
 # ── MCP 通信常量 ──────────────────────────────────────────────
 
 # chrome-devtools-mcp 支持的完整工具列表 (v0.21.0)
@@ -154,9 +280,22 @@ class MCPClient:
         args.extend(["--chromeArg", "--no-sandbox", "--chromeArg", "--disable-setuid-sandbox"])
 
         # [v1.17.0] 有头模式: 设置 DISPLAY 环境变量
-        if not self._headless and self._display_override:
-            env["DISPLAY"] = self._display_override
-            logger.info(f"有头模式: DISPLAY={self._display_override}")
+        if not self._headless:
+            # 优先使用用户指定的 DISPLAY
+            if self._display_override:
+                env["DISPLAY"] = self._display_override
+                logger.info(f"有头模式: DISPLAY={self._display_override}")
+            # 无可用显示时自动启动 Xvfb
+            elif not _has_display():
+                xvfb_display = _start_xvfb()
+                if xvfb_display:
+                    env["DISPLAY"] = xvfb_display
+                    logger.info(f"无 DISPLAY 环境，已启动 Xvfb: {xvfb_display}")
+                else:
+                    # Xvfb 不可用，降级为 headless 模式
+                    self._headless = True
+                    args.append("--headless")
+                    logger.warning("无 DISPLAY 环境且 Xvfb 不可用，自动降级为 headless 模式")
 
         logger.info(f"启动 chrome-devtools-mcp: {' '.join(args)}")
 
@@ -629,6 +768,9 @@ class MCPClient:
         # chrome-devtools-mcp 启动的 Chrome 可能不会随 MCP 进程一起退出
         self._kill_stale_chrome()
 
+        # 清理 Xvfb 虚拟显示
+        _stop_xvfb()
+
     def _kill_stale_chrome(self):
         """清理残留的 Chrome/Chromium 进程
 

package/package.json

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