myagent-ai 1.47.23 → 1.47.25

package/aiskills/browser_stealth.py

@@ -2124,6 +2124,10 @@ class StealthBrowser:
                         message=f"Firefox+VNC 截图已保存",
                         data={"path": save_path},
                     )
+                logger.warning(
+                    f"[_firefox_screenshot] import 截图失败 (rc={result.returncode}): "
+                    f"{result.stderr.decode(errors='ignore')[:200]}"
+                )
 
             # 方法2: 使用 xdotool + scrot
             scrot_cmd = shutil.which("scrot")
@@ -2140,6 +2144,10 @@ class StealthBrowser:
                         message=f"Firefox+VNC 截图已保存 (scrot)",
                         data={"path": save_path},
                     )
+                logger.warning(
+                    f"[_firefox_screenshot] scrot 截图失败 (rc={result.returncode}): "
+                    f"{result.stderr.decode(errors='ignore')[:200]}"
+                )
 
             # 方法3: 使用 xwd + convert
             xwd_cmd = shutil.which("xwd")
@@ -2168,21 +2176,93 @@ class StealthBrowser:
                             message=f"Firefox+VNC 截图已保存",
                             data={"path": save_path},
                         )
+                logger.warning(
+                    f"[_firefox_screenshot] xwd+convert 截图失败 (rc={result.returncode}): "
+                    f"{result.stderr.decode(errors='ignore')[:200]}"
+                )
+
+            # 方法4: 使用 xwd + ffmpeg (proot 兼容)
+            ffmpeg_cmd = shutil.which("ffmpeg")
+            if xwd_cmd and ffmpeg_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):
+                    result2 = subprocess.run(
+                        [ffmpeg_cmd, "-y", "-i", xwd_tmp, save_path],
+                        capture_output=True, timeout=10,
+                        env=env, start_new_session=True,
+                    )
+                    try:
+                        os.unlink(xwd_tmp)
+                    except Exception:
+                        pass
+                    if result2.returncode == 0 and os.path.isfile(save_path):
+                        logger.info(f"Firefox 截图已保存 (xwd+ffmpeg): {save_path}")
+                        return SkillResult(
+                            success=True,
+                            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 xwd_cmd and ffmpeg_cmd: _available.append("xwd+ffmpeg")
+            _tried = ", ".join(_available) if _available else "无"
 
             return SkillResult(
                 success=False,
-                error="Firefox+VNC 截图失败: 没有可用的截图工具 "
-                      "(需要 ImageMagick import / scrot / xwd+convert)",
+                error=f"Firefox+VNC 截图失败 (尝试过: {_tried}) "
+                      f"— 需要 ImageMagick / scrot / xwd+convert/ffmpeg",
             )
         except Exception as e:
             return SkillResult(success=False, error=f"Firefox+VNC 截图失败: {e}")
 
-    def _firefox_read_sessionstore(self) -> dict:
+    def _firefox_read_sessionstore(self, max_wait: float = 5.0) -> dict:
         """[v1.47.20] 读取 Firefox sessionstore 获取当前标签页 URL/标题。
 
         Firefox 运行时会将当前会话信息写入 sessionstore-backups/recovery.jsonlz4。
         该文件使用 mozLz4 格式（8字节自定义头 + LZ4 压缩数据）。
 
+        Args:
+            max_wait: 最长等待时间（秒），给 Firefox 时间写入 sessionstore
+
         Returns:
             dict: {"url": str, "title": str, "tabs": [{"url": str, "title": str}]}
         """
@@ -2193,30 +2273,56 @@ class StealthBrowser:
         if self._firefox_profile_dir:
             search_dirs.append(self._firefox_profile_dir)
         # 也搜索 Firefox 默认 profile 和 vnc_manager 启动的 profile
+        ff_base = os.path.expanduser("~/.mozilla/firefox")
         for extra in [
-            os.path.expanduser("~/.mozilla/firefox/default"),
-            os.path.expanduser("~/.mozilla/firefox"),
+            os.path.join(ff_base, "default"),
+            ff_base,
         ]:
             if os.path.isdir(extra) and extra not in search_dirs:
                 search_dirs.append(extra)
+        # [v1.47.24] 搜索所有 Firefox profile 子目录（如 xxx.default-release）
+        try:
+            if os.path.isdir(ff_base):
+                for entry in os.listdir(ff_base):
+                    entry_path = os.path.join(ff_base, entry)
+                    if os.path.isdir(entry_path) and entry_path not in search_dirs:
+                        # Firefox profile 目录通常包含 user.js 或 prefs.js
+                        if os.path.isfile(os.path.join(entry_path, "prefs.js")) or \
+                           os.path.isfile(os.path.join(entry_path, "user.js")):
+                            search_dirs.append(entry_path)
+        except Exception:
+            pass
 
-        recovery_files = []
-        for base_dir in search_dirs:
-            ss_dir = os.path.join(base_dir, "sessionstore-backups")
-            if os.path.isdir(ss_dir):
-                for fname in ("recovery.jsonlz4", "recovery.baklz4",
-                              "previous.jsonlz4"):
-                    fpath = os.path.join(ss_dir, fname)
+        # [v1.47.24] 等待 Firefox 写入 sessionstore（刚导航完可能还没写入）
+        _start_time = time.time()
+        while True:
+            recovery_files = []
+            for base_dir in search_dirs:
+                ss_dir = os.path.join(base_dir, "sessionstore-backups")
+                if os.path.isdir(ss_dir):
+                    for fname in ("recovery.jsonlz4", "recovery.baklz4",
+                                  "previous.jsonlz4"):
+                        fpath = os.path.join(ss_dir, fname)
+                        if os.path.isfile(fpath):
+                            recovery_files.append(fpath)
+                # 也检查 base_dir 本身（有些 Firefox 版本）
+                for fname in ("sessionstore.jsonlz4", "sessionstore-backups/recovery.jsonlz4"):
+                    fpath = os.path.join(base_dir, fname)
                     if os.path.isfile(fpath):
                         recovery_files.append(fpath)
-            # 也检查 base_dir 本身（有些 Firefox 版本）
-            for fname in ("sessionstore.jsonlz4", "sessionstore-backups/recovery.jsonlz4"):
-                fpath = os.path.join(base_dir, fname)
-                if os.path.isfile(fpath):
-                    recovery_files.append(fpath)
+
+            # 如果找到了文件，或者超时了，就跳出
+            if recovery_files or (time.time() - _start_time) >= max_wait:
+                break
+
+            # 等 0.5 秒再试
+            time.sleep(0.5)
 
         if not recovery_files:
-            logger.debug("[_firefox_read_sessionstore] 未找到 sessionstore 文件")
+            logger.warning(
+                f"[_firefox_read_sessionstore] 未找到 sessionstore 文件 "
+                f"(搜索了 {len(search_dirs)} 个目录: {[d.replace(os.path.expanduser('~'), '~') for d in search_dirs]})"
+            )
             return result_info
 
         # 读取 mozLz4 格式
@@ -2290,9 +2396,19 @@ class StealthBrowser:
         screenshot_path = ""
         if screenshot_result.success and screenshot_result.data:
             screenshot_path = screenshot_result.data.get("path", "")
+            logger.info(f"[_firefox_get_content] 截图成功: {screenshot_path}")
+        else:
+            logger.warning(
+                f"[_firefox_get_content] 截图失败: "
+                f"{screenshot_result.error or '无数据'}"
+            )
 
         # 2. 读取 sessionstore
         session_info = self._firefox_read_sessionstore()
+        logger.info(
+            f"[_firefox_get_content] sessionstore: url={session_info.get('url', '')}, "
+            f"title={session_info.get('title', '')}, tabs={len(session_info.get('tabs', []))}"
+        )
 
         # 3. 组合返回信息
         url = session_info.get("url", "")
@@ -2315,7 +2431,17 @@ class StealthBrowser:
         if screenshot_path:
             content_parts.append(f"截图: {screenshot_path}")
 
-        content_text = "\n".join(content_parts) if content_parts else "无法获取页面内容"
+        if not content_parts:
+            # 全部失败 → 至少给截图失败原因
+            fallback_msg = "Firefox+VNC 无法获取页面内容"
+            if not screenshot_result.success:
+                fallback_msg += f" (截图失败: {screenshot_result.error})"
+            if not session_info.get("url"):
+                fallback_msg += " (sessionstore 未读取到 URL)"
+            logger.error(f"[_firefox_get_content] {fallback_msg}")
+            content_text = fallback_msg
+        else:
+            content_text = "\n".join(content_parts)
 
         return SkillResult(
             success=True,

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: