myagent-ai 1.16.7 → 1.16.8

package/package.json

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

package/skills/chromedev_mcp.py

@@ -227,56 +227,102 @@ class MCPClient:
 
         # 4. [v1.16.7] Puppeteer 缓存目录（npx puppeteer install 安装的 Chromium）
         home = os.path.expanduser("~")
+        # Puppeteer 标准缓存路径
         puppeteer_cache_dirs = [
             os.path.join(home, ".cache", "puppeteer", "chrome"),
             os.path.join(home, ".cache", "puppeteer"),
+            os.path.join(home, ".cache", "ms-playwright"),
         ]
         for cache_dir in puppeteer_cache_dirs:
             if os.path.isdir(cache_dir):
                 # 查找 chrome / chromium 可执行文件
                 for root, dirs, files in os.walk(cache_dir):
                     for fname in files:
-                        if fname in ("chrome", "chromium"):
+                        if fname in ("chrome", "chromium", "headless_shell"):
                             full = os.path.join(root, fname)
                             if os.access(full, os.X_OK):
                                 return full
 
+        # 5. [v1.16.8] puppeteer browsers install 的标准路径
+        # ~/.cache/puppeteer/chrome/{platform-{arch}}/chrome-linux64/chrome
+        puppeteer_browsers_dir = os.path.join(
+            home, ".cache", "puppeteer", "chrome"
+        )
+        if os.path.isdir(puppeteer_browsers_dir):
+            for entry in os.listdir(puppeteer_browsers_dir):
+                entry_path = os.path.join(puppeteer_browsers_dir, entry)
+                if os.path.isdir(entry_path):
+                    # 进入 platform 目录
+                    for sub in os.listdir(entry_path):
+                        sub_path = os.path.join(entry_path, sub)
+                        if os.path.isdir(sub_path):
+                            for fname in ["chrome", "headless_shell"]:
+                                full = os.path.join(sub_path, fname)
+                                if os.path.isfile(full) and os.access(full, os.X_OK):
+                                    return full
+
         return None
 
     @staticmethod
     def _try_install_chromium() -> bool:
-        """[v1.16.7] 尝试自动安装 Chromium。
-
-        依次尝试: apt install chromium-browser → apt install chromium
-        需要当前用户有 sudo 权限（容器环境通常有 root 权限）。
-        """
-        import stat
+        """[v1.16.8] 尝试自动安装 Chrome/Chromium。
 
-        # 检查是否有 apt
-        if not shutil.which("apt"):
-            logger.debug("apt 不可用，跳过自动安装 Chromium")
-            return False
+        安装策略（按优先级）:
+          1. npx puppeteer install chrome — 下载官方 Chrome，自带所有依赖，最可靠
+          2. apt install chromium-browser — 系统包
+          3. apt install chromium — 备用包名
 
-        # 尝试不同的包名
-        packages = ["chromium-browser", "chromium"]
-        for pkg in packages:
+        容器环境缺少 libnss3/libatk 等共享库时，apt 安装的 Chromium 会崩溃，
+        而 puppeteer 下载的 Chrome 是自包含的，不受影响。
+        """
+        # 方法1: puppeteer install chrome（推荐，容器环境最可靠）
+        if shutil.which("npx"):
             try:
-                logger.info(f"正在自动安装 {pkg}...")
+                logger.info("正在通过 puppeteer 下载 Chrome...")
                 result = subprocess.run(
-                    ["apt", "install", "-y", pkg],
-                    capture_output=True, text=True, timeout=120,
+                    ["npx", "-y", "puppeteer", "browsers", "install", "chrome@stable"],
+                    capture_output=True, text=True, timeout=300,
                 )
                 if result.returncode == 0:
-                    logger.info(f"成功安装 {pkg}")
+                    logger.info("puppeteer install chrome 成功")
                     return True
-                else:
-                    logger.warning(
-                        f"安装 {pkg} 失败: {result.stderr[-300:] if result.stderr else result.stdout[-300:]}"
-                    )
+                # 也尝试旧版命令格式
+                result2 = subprocess.run(
+                    ["npx", "-y", "puppeteer", "install"],
+                    capture_output=True, text=True, timeout=300,
+                )
+                if result2.returncode == 0:
+                    logger.info("puppeteer install 成功")
+                    return True
+                logger.warning(
+                    f"puppeteer install 失败: "
+                    f"{result.stderr[-300:] if result.stderr else result.stdout[-300:]}"
+                )
             except subprocess.TimeoutExpired:
-                logger.warning(f"安装 {pkg} 超时")
+                logger.warning("puppeteer install 超时 (5分钟)")
             except Exception as e:
-                logger.warning(f"安装 {pkg} 异常: {e}")
+                logger.warning(f"puppeteer install 异常: {e}")
+
+        # 方法2: apt install（后备）
+        if shutil.which("apt"):
+            packages = ["chromium-browser", "chromium"]
+            for pkg in packages:
+                try:
+                    logger.info(f"正在 apt install {pkg}...")
+                    result = subprocess.run(
+                        ["apt", "install", "-y", pkg],
+                        capture_output=True, text=True, timeout=120,
+                    )
+                    if result.returncode == 0:
+                        logger.info(f"成功安装 {pkg}")
+                        return True
+                    else:
+                        logger.warning(
+                            f"apt install {pkg} 失败: "
+                            f"{result.stderr[-300:] if result.stderr else result.stdout[-300:]}"
+                        )
+                except Exception as e:
+                    logger.warning(f"apt install {pkg} 异常: {e}")
 
         return False