myagent-ai 1.47.26 → 1.47.27

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}")