myagent-ai 1.47.12 → 1.47.14

package/aiskills/browser_stealth.py

@@ -241,24 +241,63 @@ def _ensure_display() -> Optional[Dict[str, Any]]:
             logger.info(f"VNC 远程桌面已在运行，复用显示: {display}")
             return {"display": display, "vnc": True, "xvfb_standalone": False}
 
-        # VNC 未运行 → 尝试自动启动
+        # [v1.47.13] VNC 未运行 → 尝试自动启动
+        # 重要修复: 不能在 ThreadPoolExecutor + asyncio.run 中调用 vnc.start()！
+        # 因为 vnc.start() 内部用 asyncio.Lock()，跨 event loop 会导致死锁。
+        # 正确做法：在单独线程中用 asyncio.run 启动，然后轮询等待 VNC 就绪。
         try:
             import asyncio
-            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())
+            import concurrent.futures
+
+            # 在独立线程中启动 VNC（新的 event loop，避免冲突）
+            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)
+
+                # 轮询等待 VNC 就绪（同时等待 future 完成）
+                max_wait = 60  # 最多等60秒
+                check_interval = 2
+                elapsed = 0
+                while elapsed < max_wait:
+                    # 先检查 VNC 是否已就绪
+                    if vnc.is_running:
+                        display = vnc.display
+                        os.environ["DISPLAY"] = display
+                        logger.info(f"VNC 远程桌面已启动，复用显示: {display}")
+                        return {"display": display, "vnc": True, "xvfb_standalone": False}
+
+                    # 检查启动线程是否已完成（非阻塞）
+                    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": display, "vnc": True, "xvfb_standalone": False}
+                        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
+                    logger.info(f"VNC 远程桌面已启动（等待后），显示: {display}")
+                    return {"display": display, "vnc": True, "xvfb_standalone": False}
 
-            if result.get("success"):
-                display = vnc.display
-                os.environ["DISPLAY"] = display
-                logger.info(f"VNC 远程桌面已自动启动，显示: {display}，可在 VNC 中查看浏览器操作")
-                return {"display": display, "vnc": True, "xvfb_standalone": False}
-            else:
-                logger.warning(f"VNC 自动启动失败: {result.get('message', '')}")
         except Exception as e:
             logger.warning(f"VNC 自动启动异常: {e}")
 

package/aiskills/chromedev_mcp.py

@@ -189,27 +189,55 @@ def _ensure_display() -> Optional[str]:
             logger.info(f"VNC 远程桌面已在运行，复用显示: {display}")
             return display
 
-        # VNC 未运行 → 尝试自动启动
+        # [v1.47.13] VNC 未运行 → 尝试自动启动
+        # 修复: 不能在 ThreadPoolExecutor + asyncio.run 中直接调用 vnc.start()！
+        # 因为 vnc.start() 内部用 asyncio.Lock()，跨 event loop 会导致死锁。
+        # 正确做法：在单独线程中用 asyncio.run 启动，然后轮询等待 VNC 就绪。
         try:
             import asyncio
-            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', '')}")
+            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
+
         except Exception as e:
             logger.warning(f"VNC 自动启动异常: {e}")
 

package/core/vnc_manager.py

@@ -877,6 +877,12 @@ class VNCManager:
                     logger.warning(f"后台升级 icewm 异常: {e}")
 
         # 3. 启动 D-Bus 会话（Epiphany 等 GNOME 程序需要）
+        # [v1.47.12] 在启动 D-Bus 之前先修复 dbus-daemon-launch-helper
+        # 否则 D-Bus 激活服务时仍会触发 --shm-helper 错误
+        try:
+            self._fix_dbus_launch_helper()
+        except Exception:
+            pass
         self._ensure_dbus_session()
 
         # 3.5 如果 icewm 刚安装好，重新配置主题
@@ -1501,9 +1507,13 @@ class VNCManager:
         解决方法：创建包装脚本，去掉 --shm-helper 参数。
         """
         # 查找原始的 dbus-daemon-launch-helper
+        # [v1.47.12] 扩展搜索路径，覆盖 ARM64 Ubuntu (aarch64-linux-gnu)
         helper_paths = [
             "/usr/lib/dbus-1.0/dbus-daemon-launch-helper",
             "/usr/libexec/dbus-daemon-launch-helper",
+            "/usr/lib/aarch64-linux-gnu/dbus-1.0/dbus-daemon-launch-helper",
+            "/usr/lib/arm-linux-gnueabihf/dbus-1.0/dbus-daemon-launch-helper",
+            "/usr/lib/x86_64-linux-gnu/dbus-1.0/dbus-daemon-launch-helper",
         ]
         original_helper = None
         for hp in helper_paths:
@@ -1519,6 +1529,29 @@ class VNCManager:
                 original_helper = hp
                 break
 
+        # [v1.47.12] 兜底: 用 find 搜索所有 dbus-daemon-launch-helper
+        if not original_helper:
+            try:
+                result = subprocess.run(
+                    ["find", "/usr/lib", "-name", "dbus-daemon-launch-helper", "-type", "f"],
+                    capture_output=True, text=True, timeout=5,
+                )
+                if result.returncode == 0:
+                    for line in result.stdout.strip().split("\n"):
+                        path = line.strip()
+                        if path and os.path.isfile(path) and not os.path.islink(path):
+                            try:
+                                with open(path, "r", errors="replace") as f:
+                                    head = f.read(100)
+                                if "MYAGENT_WRAPPER" in head:
+                                    continue
+                            except Exception:
+                                pass
+                            original_helper = path
+                            break
+            except Exception:
+                pass
+
         if not original_helper:
             logger.debug("dbus-daemon-launch-helper 未找到或已是包装脚本，跳过修复")
             return
@@ -1782,6 +1815,9 @@ exec {backup_path} "${{args[@]}}"
             env["DBUS_SESSION_BUS_ADDRESS"] = os.environ["DBUS_SESSION_BUS_ADDRESS"]
         if not env.get("GSETTINGS_BACKEND"):
             env["GSETTINGS_BACKEND"] = "memory"
+        # [v1.47.12] proot 兼容: 避免浏览器启动时 dbus --shm-helper 错误
+        if not env.get("G_SLICE"):
+            env["G_SLICE"] = "always-malloc"
         xdg_runtime = env.get("XDG_RUNTIME_DIR") or f"/run/user/{os.getuid()}"
         env["XDG_RUNTIME_DIR"] = xdg_runtime
         try:
@@ -4778,6 +4814,13 @@ chmod 700 "$XDG_RUNTIME_DIR" 2>/dev/null
 export MOZ_DISABLE_CONTENT_SANDBOX=1
 export MOZ_DISABLE_GPU_SANDBOX=1
 
+# [v1.47.12] proot 兼容环境变量 — 避免 dbus --shm-helper 错误
+# G_SLICE=always-malloc — 禁用 glib2 共享内存分配器
+# 避免 "error: expected absolute path: --shm-helper" 错误
+export G_SLICE=always-malloc
+# GSettings 内存后端 — 不依赖 dconf/gsettings 守护进程
+export GSETTINGS_BACKEND=memory
+
 # [v1.46.8] PulseAudio 音频 — 确保Firefox输出音频到PulseAudio
 export PULSE_SERVER=unix:${{XDG_RUNTIME_DIR}}/pulse/native
 if [ -z "$PULSE_SERVER" ]; then
@@ -4830,6 +4873,9 @@ chmod 700 "$XDG_RUNTIME_DIR" 2>/dev/null
 # GSettings 内存后端
 export GSETTINGS_BACKEND=memory
 
+# [v1.47.12] proot 兼容环境变量 — 避免 dbus --shm-helper 错误
+export G_SLICE=always-malloc
+
 # 启动 D-Bus 会话（如果还没有）
 # [v1.43.3] proot 下跳过 dbus-launch，直接用 dbus-daemon
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then

package/package.json

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