myagent-ai 1.47.24 → 1.47.25

package/aiskills/browser_stealth.py

@@ -2181,19 +2181,16 @@ class StealthBrowser:
                     f"{result.stderr.decode(errors='ignore')[:200]}"
                 )
 
-            # 方法4: 使用 xdotool + xwd + ffmpeg (proot 兼容)
-            xdotool_cmd = shutil.which("xdotool")
+            # 方法4: 使用 xwd + ffmpeg (proot 兼容)
             ffmpeg_cmd = shutil.which("ffmpeg")
-            if xdotool_cmd and ffmpeg_cmd:
+            if xwd_cmd and ffmpeg_cmd:
                 xwd_tmp = save_path + ".xwd"
-                # 用 xdotool 获取活动窗口并截图
                 result = subprocess.run(
-                    [xwd_cmd or "xwd", "-root", "-display", display, "-out", xwd_tmp],
+                    [xwd_cmd, "-root", "-display", display, "-out", xwd_tmp],
                     capture_output=True, timeout=10,
                     env=env, start_new_session=True,
                 )
                 if result.returncode == 0 and os.path.isfile(xwd_tmp):
-                    # 用 ffmpeg 转换 xwd 到 png
                     result2 = subprocess.run(
                         [ffmpeg_cmd, "-y", "-i", xwd_tmp, save_path],
                         capture_output=True, timeout=10,
@@ -2210,18 +2207,49 @@ class StealthBrowser:
                             message=f"Firefox+VNC 截图已保存",
                             data={"path": save_path},
                         )
+                logger.warning(
+                    f"[_firefox_screenshot] xwd+ffmpeg 截图失败: xwd_rc={result.returncode}"
+                )
+
+            # 方法5: 使用 Python Pillow + xwd
+            try:
+                from PIL import Image
+                if xwd_cmd:
+                    xwd_tmp = save_path + ".xwd"
+                    result = subprocess.run(
+                        [xwd_cmd, "-root", "-display", display, "-out", xwd_tmp],
+                        capture_output=True, timeout=10,
+                        env=env, start_new_session=True,
+                    )
+                    if result.returncode == 0 and os.path.isfile(xwd_tmp):
+                        try:
+                            img = Image.open(xwd_tmp)
+                            img.save(save_path, "PNG")
+                            os.unlink(xwd_tmp)
+                            logger.info(f"Firefox 截图已保存 (xwd+Pillow): {save_path}")
+                            return SkillResult(
+                                success=True,
+                                message=f"Firefox+VNC 截图已保存",
+                                data={"path": save_path},
+                            )
+                        except Exception as pil_err:
+                            logger.warning(f"[_firefox_screenshot] Pillow 转换失败: {pil_err}")
+                            try: os.unlink(xwd_tmp)
+                            except Exception: pass
+            except ImportError:
+                pass
 
             _available = []
             if import_cmd: _available.append("import")
             if scrot_cmd: _available.append("scrot")
             if xwd_cmd and convert_cmd: _available.append("xwd+convert")
-            if xdotool_cmd and ffmpeg_cmd: _available.append("xdotool+ffmpeg")
+            if xwd_cmd and ffmpeg_cmd: _available.append("xwd+ffmpeg")
             _tried = ", ".join(_available) if _available else "无"
 
             return SkillResult(
                 success=False,
                 error=f"Firefox+VNC 截图失败 (尝试过: {_tried}) "
-                      f"— 需要 ImageMagick import / scrot / xwd+convert",
+                      f"— 需要 ImageMagick / scrot / xwd+convert/ffmpeg",
             )
         except Exception as e:
             return SkillResult(success=False, error=f"Firefox+VNC 截图失败: {e}")

package/aiskills/chromedev_mcp.py

@@ -189,55 +189,27 @@ def _ensure_display() -> Optional[str]:
             logger.info(f"VNC 远程桌面已在运行，复用显示: {display}")
             return display
 
-        # [v1.47.13] VNC 未运行 → 尝试自动启动
-        # 修复: 不能在 ThreadPoolExecutor + asyncio.run 中直接调用 vnc.start()！
-        # 因为 vnc.start() 内部用 asyncio.Lock()，跨 event loop 会导致死锁。
-        # 正确做法：在单独线程中用 asyncio.run 启动，然后轮询等待 VNC 就绪。
+        # VNC 未运行 → 尝试自动启动
         try:
             import asyncio
-            import concurrent.futures
-
-            def _start_vnc_in_thread():
-                try:
-                    return asyncio.run(vnc.start())
-                except Exception as e:
-                    return {"success": False, "message": str(e)}
-
-            with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
-                future = pool.submit(_start_vnc_in_thread)
-
-                max_wait = 60
-                check_interval = 2
-                elapsed = 0
-                while elapsed < max_wait:
-                    if vnc.is_running:
-                        display = vnc.display
-                        os.environ["DISPLAY"] = display
-                        logger.info(f"VNC 远程桌面已启动，复用显示: {display}")
-                        return display
-
-                    try:
-                        result = future.result(timeout=0.1)
-                        if result.get("success") or vnc.is_running:
-                            display = vnc.display
-                            os.environ["DISPLAY"] = display
-                            logger.info(f"VNC 远程桌面已启动，显示: {display}")
-                            return display
-                        else:
-                            logger.warning(f"VNC 启动失败: {result.get('message', '')}")
-                            break
-                    except concurrent.futures.TimeoutError:
-                        pass
-
-                    import time
-                    time.sleep(check_interval)
-                    elapsed += check_interval
-
-                if vnc.is_running:
-                    display = vnc.display
-                    os.environ["DISPLAY"] = display
-                    return display
-
+            try:
+                loop = asyncio.get_event_loop()
+                if loop.is_running():
+                    import concurrent.futures
+                    with concurrent.futures.ThreadPoolExecutor() as pool:
+                        result = pool.submit(asyncio.run, vnc.start()).result(timeout=30)
+                else:
+                    result = asyncio.run(vnc.start())
+            except RuntimeError:
+                result = asyncio.run(vnc.start())
+
+            if result.get("success"):
+                display = vnc.display
+                os.environ["DISPLAY"] = display
+                logger.info(f"VNC 远程桌面已自动启动，显示: {display}")
+                return display
+            else:
+                logger.warning(f"VNC 自动启动失败: {result.get('message', '')}")
         except Exception as e:
             logger.warning(f"VNC 自动启动异常: {e}")
 
@@ -1372,26 +1344,6 @@ class BrowserOpenSkill(Skill):
         if not url:
             return SkillResult(success=False, error="缺少必需参数: url")
 
-        # [v1.47.20] VNC 模式下：Chromium 不可用时回退到 stealth_browser_navigate
-        try:
-            from core.vnc_manager import get_vnc_manager
-            vnc_mgr = get_vnc_manager()
-            if vnc_mgr.is_running:
-                # 检查是否有可用的 Chromium
-                import shutil
-                has_chrome = bool(shutil.which("chromium-browser") or shutil.which("chromium")
-                                 or shutil.which("google-chrome"))
-                if not has_chrome:
-                    # VNC 模式下无 Chromium，回退到 stealth_browser
-                    return SkillResult(
-                        success=False,
-                        error="VNC 远程桌面模式下没有 Chromium 浏览器，无法使用 browser_open。"
-                              "请改用 stealth_browser_start + stealth_browser_navigate 操作 Firefox。"
-                              "Firefox 在 VNC 模式下已可用。",
-                    )
-        except ImportError:
-            pass  # vnc_manager 不可用，跳过检测
-
         # 检查依赖
         dep_err = await asyncio.get_event_loop().run_in_executor(None, _ensure_node_deps)
         if dep_err: