myagent-ai 1.47.27 → 1.47.29

package/core/vnc_manager.py

@@ -357,7 +357,8 @@ class VNCManager:
             # [v1.47.27] 策略B: 尝试 apt-get -f install 修复依赖
             try:
                 result_fix = subprocess.run(
-                    sudo + ["apt-get", "-f", "install", "-y"],
+                    sudo + ["apt-get", "-f", "install", "-y",
+                             "-o", "Acquire::ForceIPv4=true"],
                     capture_output=True, text=True, timeout=30,
                     env=no_service_env,
                     start_new_session=True,
@@ -663,7 +664,7 @@ class VNCManager:
         # [v1.36.0] 窗口管理器 — 总是安装 icewm（即使已有 fluxbox），因为 icewm 是目标 WM
         _has_icewm = shutil.which("icewm-session") or shutil.which("icewm")
         if not _has_icewm:
-            packages_to_install.extend(["icewm", "icewm-themes"])
+            packages_to_install.append("icewm")  # [v1.47.28] 移除 icewm-themes — ARM64 无安装候选
 
         # [v1.36.0] 文件管理器 — 总是安装 thunar（即使已有 pcmanfm），thunar 在 proot 下更稳定
         if not shutil.which("thunar"):
@@ -721,7 +722,8 @@ class VNCManager:
 
         try:
             result = subprocess.run(
-                sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends"] + packages_to_install,
+                sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends",
+                         "-o", "Acquire::ForceIPv4=true"] + packages_to_install,
                 capture_output=True, text=True, timeout=180,
                 start_new_session=True,  # [v1.40.0] 进程隔离
             )
@@ -733,7 +735,8 @@ class VNCManager:
                     self._fix_dpkg_interrupted(sudo)
                     try:
                         result2 = subprocess.run(
-                            sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends"] + packages_to_install,
+                            sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends",
+                                     "-o", "Acquire::ForceIPv4=true"] + packages_to_install,
                             capture_output=True, text=True, timeout=180,
                             start_new_session=True,
                         )
@@ -797,7 +800,8 @@ class VNCManager:
         logger.info(f"快速安装核心依赖: {packages}")
         try:
             result = subprocess.run(
-                sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends"] + packages,
+                sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends",
+                         "-o", "Acquire::ForceIPv4=true"] + packages,
                 capture_output=True, text=True, timeout=60,
                 start_new_session=True,  # [v1.40.0] 进程隔离
             )
@@ -809,7 +813,8 @@ class VNCManager:
                     self._fix_dpkg_interrupted(sudo)
                     try:
                         result2 = subprocess.run(
-                            sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends"] + packages,
+                            sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends",
+                                     "-o", "Acquire::ForceIPv4=true"] + packages,
                             capture_output=True, text=True, timeout=60,
                             start_new_session=True,
                         )
@@ -877,7 +882,8 @@ class VNCManager:
             try:
                 logger.info(f"尝试单独安装: {pkg}")
                 result = subprocess.run(
-                    sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends", pkg],
+                    sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends",
+                             "-o", "Acquire::ForceIPv4=true", pkg],
                     capture_output=True, text=True, timeout=45,
                     start_new_session=True,
                 )
@@ -1088,14 +1094,19 @@ class VNCManager:
         logger.info("=== 后台组件安装完成 ===")
 
     def _install_browser_background(self) -> None:
-        """[v1.44.0] 后台安装浏览器。
+        """[v1.47.28] 后台安装浏览器 — 纯 apt 方式，不使用 FTP 下载。
 
         策略（按优先级）：
-          1. apt install firefox — 最简单，用户验证可用
-             Ubuntu 22.04/24.04 的 firefox 可能是 .deb 或 snap 包装器
-             如果是 snap 包装器则跳过（proot 不支持 snap）
-          2. apt install chromium — 备选，同样是 snap 包装器则跳过
-          3. 如果以上都失败，不安装（用户可手动 apt install）
+          1. apt update + apt install firefox — 标准方式
+             强制 IPv4 避免 proot 环境下 IPv6 连接失败
+          2. 手动添加 mozillateam PPA 源 + apt install firefox
+          3. apt install firefox-esr
+          4. apt install chromium
+
+        [v1.47.28] 关键变更：
+          - 删除 FTP 下载 Firefox 回退代码，只用 apt 方式
+          - 所有 apt 命令强制 IPv4（proot 下 IPv6 经常不可达）
+          - 安装前先 apt update 确保包索引最新
 
         安全措施：
           - start_new_session=True 进程隔离，安装崩溃不影响 VNC
@@ -1120,13 +1131,27 @@ class VNCManager:
                 logger.info(f"已有浏览器 {existing_browser} 是 snap 包装器，尝试安装真正的浏览器")
 
         sudo = [] if os.getuid() == 0 else ["sudo"]
+        # [v1.47.28] proot 环境下 IPv6 经常不可达，强制 IPv4
+        apt_ipv4_opts = ["-o", "Acquire::ForceIPv4=true"]
+
+        # ── 预备: apt update 确保包索引最新 ──
+        try:
+            logger.info("执行 apt update 确保包索引最新...")
+            subprocess.run(
+                sudo + ["apt-get", "update"] + apt_ipv4_opts,
+                capture_output=True, text=True, timeout=120,
+                env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
+                start_new_session=True,
+            )
+        except Exception as e:
+            logger.debug(f"apt update 异常（继续）: {e}")
 
         # ── 方案1: apt install firefox ──
         firefox_apt_ok = False
         try:
             logger.info("尝试 apt install firefox（约需 20 分钟）...")
             result = subprocess.run(
-                sudo + ["apt-get", "install", "-y", "--no-install-recommends", "firefox"],
+                sudo + ["apt-get", "install", "-y", "--no-install-recommends"] + apt_ipv4_opts + ["firefox"],
                 capture_output=True, text=True, timeout=1500,  # 25 分钟
                 env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
                 start_new_session=True,
@@ -1146,13 +1171,13 @@ class VNCManager:
             else:
                 stderr = (result.stderr or "")[-300:]
                 logger.warning(f"apt install firefox 失败: {stderr}")
-                # [v1.47.27] dpkg 中断时先修复再重试
+                # dpkg 中断时先修复再重试
                 if "dpkg was interrupted" in stderr:
                     logger.info("dpkg 中断，尝试修复后重试 firefox 安装...")
                     self._fix_dpkg_interrupted(sudo)
                     try:
                         result2 = subprocess.run(
-                            sudo + ["apt-get", "install", "-y", "--no-install-recommends", "firefox"],
+                            sudo + ["apt-get", "install", "-y", "--no-install-recommends"] + apt_ipv4_opts + ["firefox"],
                             capture_output=True, text=True, timeout=1500,
                             env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
                             start_new_session=True,
@@ -1173,12 +1198,62 @@ class VNCManager:
         if firefox_apt_ok:
             return
 
-        # ── 方案2: apt install chromium ──
+        # ── 方案2: 手动添加 mozillateam PPA 源 + apt install firefox ──
+        # [v1.47.28] Ubuntu 默认源可能没有 firefox .deb，需要 PPA
+        try:
+            logger.info("尝试手动添加 mozillateam PPA 安装 Firefox...")
+            ppa_installed = self._add_mozillateam_ppa_manual(sudo, "arm64")
+            if ppa_installed:
+                result = subprocess.run(
+                    sudo + ["apt-get", "install", "-y", "--fix-broken"] + apt_ipv4_opts + ["firefox"],
+                    capture_output=True, text=True, timeout=1500,
+                    env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
+                    start_new_session=True,
+                )
+                firefox_path = shutil.which("firefox")
+                if firefox_path and not self._is_snap_wrapper(firefox_path):
+                    logger.info(f"Firefox PPA 安装成功: {firefox_path}")
+                    self._create_browser_wrapper(firefox_path)
+                    return
+                else:
+                    logger.warning("PPA 安装后 Firefox 仍是 snap 或未找到")
+        except subprocess.TimeoutExpired:
+            logger.warning("mozillateam PPA 安装超时")
+        except Exception as e:
+            logger.debug(f"mozillateam PPA 安装异常: {e}")
+
+        # ── 方案3: apt install firefox-esr ──
+        try:
+            logger.info("尝试 apt install firefox-esr...")
+            result = subprocess.run(
+                sudo + ["apt-get", "install", "-y", "--no-install-recommends"] + apt_ipv4_opts + ["firefox-esr"],
+                capture_output=True, text=True, timeout=1500,
+                env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
+                start_new_session=True,
+            )
+            if result.returncode == 0:
+                firefox_path = shutil.which("firefox-esr") or shutil.which("firefox")
+                if firefox_path and not self._is_snap_wrapper(firefox_path):
+                    logger.info(f"Firefox ESR 安装成功: {firefox_path}")
+                    self._create_browser_wrapper(firefox_path)
+                    return
+                else:
+                    logger.warning("apt install firefox-esr 安装的是 snap 包装器，跳过")
+            else:
+                stderr = (result.stderr or "")[-200:]
+                logger.warning(f"apt install firefox-esr 失败: {stderr}")
+        except subprocess.TimeoutExpired:
+            logger.warning("apt install firefox-esr 超时")
+        except Exception as e:
+            logger.warning(f"apt install firefox-esr 异常: {e}")
+
+        # ── 方案4: apt install chromium ──
         try:
             logger.info("尝试 apt install chromium...")
             result = subprocess.run(
-                sudo + ["apt-get", "install", "-y", "--no-install-recommends", "chromium"],
+                sudo + ["apt-get", "install", "-y", "--no-install-recommends"] + apt_ipv4_opts + ["chromium"],
                 capture_output=True, text=True, timeout=600,
+                env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
                 start_new_session=True,
             )
             if result.returncode == 0:
@@ -1197,17 +1272,7 @@ class VNCManager:
         except Exception as e:
             logger.warning(f"apt install chromium 异常: {e}")
 
-        # ── 方案3: 旧的 proot 专用安装方式（二进制下载等）──
-        # 只在前两种方式都失败时尝试
-        if not shutil.which("firefox") and not shutil.which("chromium"):
-            logger.info("apt 安装浏览器均失败，尝试 proot 专用安装方式...")
-            try:
-                browser_binary = self._install_chromium_proot()
-                if browser_binary:
-                    self._create_browser_wrapper(browser_binary)
-            except Exception as e:
-                logger.warning(f"proot 专用浏览器安装异常: {e}")
-
+        logger.warning("所有 apt 安装浏览器方式均失败，请手动运行: sudo apt install firefox")
         logger.info("浏览器安装流程结束")
 
     def _create_titlebar_button_pixmaps(self, theme_dir: str) -> None:
@@ -3841,7 +3906,7 @@ exec {backup_path} "${{args[@]}}"
             return False
 
         # 安装 icewm（Windows风格） + thunar（文件管理器） + xterm
-        packages = ["icewm", "icewm-themes", "thunar", "xterm"]
+        packages = ["icewm", "thunar", "xterm"]  # [v1.47.28] 移除 icewm-themes — ARM64 无安装候选
         _apt_cmd = ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends"] + packages
         try:
             # 尝试直接执行（root 环境）
@@ -4243,13 +4308,13 @@ exec {backup_path} "${{args[@]}}"
                 try:
                     if downloader == "curl":
                         result = subprocess.run(
-                            sudo + ["curl", "-fsSL", "-o", gpg_path, keyserver_url],
+                            sudo + ["curl", "-fsSL", "-4", "-o", gpg_path, keyserver_url],
                             capture_output=True, text=True, timeout=30,
                             start_new_session=True,
                         )
                     else:
                         result = subprocess.run(
-                            sudo + ["wget", "-q", "-O", gpg_path, keyserver_url],
+                            sudo + ["wget", "-q", "-4", "-O", gpg_path, keyserver_url],
                             capture_output=True, text=True, timeout=30,
                             start_new_session=True,
                         )
@@ -4268,7 +4333,7 @@ exec {backup_path} "${{args[@]}}"
                             continue
                         if downloader == "curl":
                             subprocess.run(
-                                ["curl", "-fsSL", keyserver_url],
+                                ["curl", "-fsSL", "-4", keyserver_url],
                                 capture_output=True, text=True, timeout=30,
                                 start_new_session=True,
                             )
@@ -4276,7 +4341,7 @@ exec {backup_path} "${{args[@]}}"
                             if shutil.which("apt-key"):
                                 result = subprocess.run(
                                     sudo + ["bash", "-c",
-                                            f"curl -fsSL '{keyserver_url}' | apt-key add -"],
+                                            f"curl -fsSL -4 '{keyserver_url}' | apt-key add -"],
                                     capture_output=True, text=True, timeout=30,
                                     start_new_session=True,
                                 )
@@ -4346,10 +4411,10 @@ exec {backup_path} "${{args[@]}}"
                 except Exception:
                     pass
 
-            # 5. apt-get update
+            # 5. apt-get update（强制 IPv4）
             logger.info("执行 apt-get update（更新 PPA 源）...")
             result = subprocess.run(
-                sudo + ["apt-get", "update"],
+                sudo + ["apt-get", "update", "-o", "Acquire::ForceIPv4=true"],
                 capture_output=True, text=True, timeout=120,
                 env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
                 start_new_session=True,
@@ -4370,7 +4435,7 @@ exec {backup_path} "${{args[@]}}"
             logger.warning(f"手动添加 mozillateam PPA 异常: {e}")
             return False
 
-    def _is_snap_wrapper(binary_path: str) -> bool:
+    def _is_snap_wrapper(self, binary_path: str) -> bool:
         """[v1.23.50] 检测二进制是否为 snap 包装器脚本。
 
         Ubuntu 24.04+ 的 chromium-browser 只是一个 snap 引导脚本，
@@ -4450,6 +4515,7 @@ exec {backup_path} "${{args[@]}}"
                 # 先尝试 chromium 包（Debian 有真 .deb）
                 result = subprocess.run(
                     sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends",
+                             "-o", "Acquire::ForceIPv4=true",
                              "chromium", "chromium-common"],
                     capture_output=True, text=True, timeout=90,
                     start_new_session=True,
@@ -4608,20 +4674,16 @@ exec {backup_path} "${{args[@]}}"
         return None
 
     def _install_firefox_proot(self, sudo: list, arch: str = "arm64") -> Optional[str]:
-        """[v1.47.27] 在 proot/Termux 环境安装 Firefox。
+        """[v1.47.28] 在 proot/Termux 环境安装 Firefox — 纯 apt 方式。
 
         策略优先级：
           1. 检查已有非 snap 的 Firefox
-          2. apt install firefox（检测 snap 包装器）
+          2. apt install firefox/firefox-esr（强制 IPv4，检测 snap 包装器）
           3. mozillateam PPA 手动添加源文件（不走 add-apt-repository，proot 兼容）
-          4. apt install firefox-esr
-          5. [最后手段] 下载 Mozilla Firefox 二进制 tar.bz2
 
-        [v1.47.27] 关键变更：
-          - proot 下也先尝试 apt install firefox，不再无条件跳过
-          - 添加 mozillateam PPA 手动源文件方式（直接写 sources.list.d + gpg key）
-            绕过 add-apt-repository（proot 下 futex 崩溃）
-          - FTP 下载降级为最后手段
+        [v1.47.28] 关键变更：
+          - 删除 FTP 下载回退代码，只用 apt 方式
+          - 所有 apt 命令强制 IPv4（proot 下 IPv6 经常不可达）
 
         Returns:
             Firefox 二进制路径，失败返回 None
@@ -4633,14 +4695,16 @@ exec {backup_path} "${{args[@]}}"
                 logger.info(f"检测到已有非snap Firefox: {existing_path}")
                 return existing_path
 
-        # ── 策略2: apt install firefox（proot 下也尝试）──
+        # ── 策略2: apt install firefox（proot 下也尝试，强制 IPv4）──
         # [v1.47.27] 不再无条件跳过 apt install，而是先尝试再检测 snap
+        # [v1.47.28] 强制 IPv4，proot 环境下 IPv6 经常不可达
+        apt_ipv4 = ["-o", "Acquire::ForceIPv4=true"]
         # 如果 apt 的 Firefox 是 snap 包装器，才跳到下一策略
         for pkg in ["firefox", "firefox-esr"]:
             try:
                 logger.info(f"尝试 apt install {pkg}...")
                 result = subprocess.run(
-                    sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends", pkg],
+                    sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends"] + apt_ipv4 + [pkg],
                     capture_output=True, text=True, timeout=180,
                     env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
                     start_new_session=True,
@@ -4663,7 +4727,7 @@ exec {backup_path} "${{args[@]}}"
                         self._fix_dpkg_interrupted(sudo)
                         # 修复后重试
                         result2 = subprocess.run(
-                            sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends", pkg],
+                            sudo + ["apt-get", "install", "-y", "--fix-broken", "--no-install-recommends"] + apt_ipv4 + [pkg],
                             capture_output=True, text=True, timeout=180,
                             env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
                             start_new_session=True,
@@ -4687,7 +4751,7 @@ exec {backup_path} "${{args[@]}}"
             ppa_installed = self._add_mozillateam_ppa_manual(sudo, arch)
             if ppa_installed:
                 result = subprocess.run(
-                    sudo + ["apt-get", "install", "-y", "--fix-broken", "firefox"],
+                    sudo + ["apt-get", "install", "-y", "--fix-broken"] + apt_ipv4 + ["firefox"],
                     capture_output=True, text=True, timeout=300,
                     env={**os.environ, "DEBIAN_FRONTEND": "noninteractive"},
                     start_new_session=True,
@@ -4706,255 +4770,10 @@ exec {backup_path} "${{args[@]}}"
         except Exception as e:
             logger.debug(f"mozillateam PPA 安装异常: {e}")
 
-        # ── 策略4: 下载 Mozilla Firefox 二进制 tar.bz2 ──
-        # [v1.47.27] 降级为最后手段，仅当 apt 和 PPA 都失败时使用
-        try:
-            firefox_install_dir = "/opt/firefox"
-            firefox_bin = os.path.join(firefox_install_dir, "firefox")
-
-            # 如果已存在，直接使用
-            if os.path.isfile(firefox_bin) and os.access(firefox_bin, os.X_OK):
-                logger.info(f"Mozilla Firefox 二进制版已存在: {firefox_bin}")
-                link_path = "/usr/local/bin/firefox"
-                if not os.path.exists(link_path):
-                    try:
-                        os.symlink(firefox_bin, link_path)
-                    except Exception:
-                        pass
-                return firefox_bin
-
-            import tempfile
-            import re
-            tar_path = os.path.join(tempfile.gettempdir(), "firefox.tar.bz2")
-
-            # [v1.40.0] 动态构建 URL 列表 — 改进版
-            ftp_arch = "linux-aarch64" if arch in ("arm64", "aarch64") else "linux-x86_64"
-            download_urls = []
-
-            # 方法A: 动态查询 Mozilla FTP 获取最新可用版本
-            # 改进：先检查版本目录下是否真的有对应架构的文件
-            try:
-                logger.info("查询 Mozilla FTP 获取最新 Firefox 版本...")
-                ftp_index_url = "https://ftp.mozilla.org/pub/firefox/releases/"
-                ftp_index = ""
-                for dl in ["curl", "wget"]:
-                    if not shutil.which(dl):
-                        continue
-                    try:
-                        if dl == "curl":
-                            idx_result = subprocess.run(
-                                ["curl", "-sL", "--max-time", "15", ftp_index_url],
-                                capture_output=True, text=True, timeout=20,
-                                start_new_session=True,
-                            )
-                        else:
-                            idx_result = subprocess.run(
-                                ["wget", "-q", "-O", "-", ftp_index_url],
-                                capture_output=True, text=True, timeout=20,
-                                start_new_session=True,
-                            )
-                        if idx_result.returncode == 0 and idx_result.stdout:
-                            ftp_index = idx_result.stdout
-                            break
-                    except Exception:
-                        pass
-
-                if ftp_index:
-                    # 从 HTML 中提取版本目录名
-                    # 格式: <a href="137.0.2/">137.0.2/</a>
-                    # 匹配 ESR 和正式版版本号
-                    versions = re.findall(r'href="(\d+\.\d+(?:\.\d+)?(?:esr)?)/"', ftp_index)
-                    # 过滤无效版本（0.x, 太旧的）并排序
-                    valid_versions = []
-                    for v in versions:
-                        try:
-                            major = int(v.replace("esr", "").split(".")[0])
-                            if major >= 115:  # 115+ 是可用的
-                                valid_versions.append(v)
-                        except (ValueError, IndexError):
-                            pass
-
-                    # 去重并倒序（最新版本优先）
-                    seen = set()
-                    unique_versions = []
-                    for v in reversed(valid_versions):
-                        if v not in seen:
-                            seen.add(v)
-                            unique_versions.append(v)
-
-                    # 取最新的几个版本构建 URL（ESR 和正式版都尝试）
-                    esr_versions = [v for v in unique_versions if "esr" in v]
-                    regular_versions = [v for v in unique_versions if "esr" not in v]
-
-                    # 优先 ESR（ARM64 上更稳定），然后正式版
-                    # [v1.40.0] 只取最新的几个，避免过多无效下载尝试
-                    for v in (esr_versions[:2] + regular_versions[:2]):
-                        url = f"https://ftp.mozilla.org/pub/firefox/releases/{v}/{ftp_arch}/en-US/firefox-{v}.tar.bz2"
-                        download_urls.append(url)
-
-                    if download_urls:
-                        logger.info(f"FTP 发现 {len(unique_versions)} 个版本，尝试最新: "
-                                    f"{[v for v in (esr_versions[:2] + regular_versions[:2])]}")
-            except Exception as e:
-                logger.debug(f"FTP 版本查询异常: {e}")
-
-            # 方法B: download.mozilla.org 重定向器
-            # [v1.40.0] 注意：aarch64 重定向器有时返回 HTML 错误页而非 tar.bz2
-            # 已有魔术字节验证，但优先级放在 FTP 直接链接之后
-            if arch in ("arm64", "aarch64"):
-                download_urls.extend([
-                    "https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=linux64-aarch64&lang=en-US",
-                    "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64-aarch64&lang=en-US",
-                ])
-            else:
-                download_urls.extend([
-                    "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US",
-                    "https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=linux64&lang=en-US",
-                ])
-
-            # 方法C: 硬编码回退（以防动态查询和重定向器都失败）
-            if arch in ("arm64", "aarch64"):
-                hardcoded = [
-                    "https://ftp.mozilla.org/pub/firefox/releases/128.8.0esr/linux-aarch64/en-US/firefox-128.8.0esr.tar.bz2",
-                    "https://ftp.mozilla.org/pub/firefox/releases/115.24.0esr/linux-aarch64/en-US/firefox-115.24.0esr.tar.bz2",
-                ]
-            else:
-                hardcoded = [
-                    "https://ftp.mozilla.org/pub/firefox/releases/128.8.0esr/linux-x86_64/en-US/firefox-128.8.0esr.tar.bz2",
-                ]
-            # 只添加尚未在列表中的 URL
-            for url in hardcoded:
-                if url not in download_urls:
-                    download_urls.append(url)
-
-            download_ok = False
-            for url in download_urls:
-                if download_ok:
-                    break
-                # 清理之前的下载残留
-                if os.path.exists(tar_path):
-                    try:
-                        os.remove(tar_path)
-                    except Exception:
-                        pass
-
-                logger.info(f"尝试下载 Firefox: {url[:80]}...")
-
-                for downloader in ["curl", "wget"]:
-                    if not shutil.which(downloader):
-                        continue
-                    try:
-                        if downloader == "wget":
-                            dl_result = subprocess.run(
-                                ["wget", "-q", "-L", "--timeout=30", "--tries=2",
-                                 "-O", tar_path, url],
-                                capture_output=True, text=True, timeout=180,
-                                start_new_session=True,
-                            )
-                        else:
-                            dl_result = subprocess.run(
-                                ["curl", "-sL", "--max-time", "60", "--retry", "2",
-                                 "-o", tar_path, url],
-                                capture_output=True, text=True, timeout=180,
-                                start_new_session=True,
-                            )
-                        if dl_result.returncode != 0 or not os.path.exists(tar_path):
-                            logger.debug(f"{downloader} 下载返回 rc={dl_result.returncode if os.path.exists(tar_path) else 'no file'}")
-                            continue
-
-                        file_size = os.path.getsize(tar_path)
-                        # 验证文件是否为有效的 bzip2 格式
-                        # bzip2 文件以 'BZ' 魔术字节开头
-                        # download.mozilla.org 的 aarch64 重定向可能返回 HTML 错误页
-                        is_valid_bz2 = False
-                        try:
-                            with open(tar_path, "rb") as f:
-                                magic = f.read(3)
-                                is_valid_bz2 = (magic[:2] == b'BZ')
-                        except Exception:
-                            pass
-
-                        if file_size > 5000000 and is_valid_bz2:
-                            download_ok = True
-                            break
-                        else:
-                            # [v1.40.0] 输出文件头部内容帮助调试
-                            head_info = ""
-                            try:
-                                with open(tar_path, "rb") as f:
-                                    head_info = f.read(200).hex()[:100]
-                            except Exception:
-                                pass
-                            logger.info(
-                                f"下载的文件无效 (size={file_size}, "
-                                f"valid_bz2={is_valid_bz2}, head={head_info}, "
-                                f"url={url[:60]}...)"
-                            )
-                            try:
-                                os.remove(tar_path)
-                            except Exception:
-                                pass
-                    except subprocess.TimeoutExpired:
-                        logger.warning(f"{downloader} 下载超时")
-                    except Exception as e:
-                        logger.debug(f"{downloader} 下载异常: {e}")
-
-            if not download_ok:
-                logger.warning("Mozilla Firefox 二进制版下载失败，所有 URL 均无效")
-                return None
-
-            # 解压到 /opt
-            logger.info("解压 Firefox 到 /opt/...")
-            os.makedirs(firefox_install_dir, exist_ok=True)
-            result = subprocess.run(
-                ["tar", "xjf", tar_path, "-C", "/opt/"],
-                capture_output=True, text=True, timeout=60,
-                start_new_session=True,
-            )
-
-            # 清理
-            try:
-                os.remove(tar_path)
-            except Exception:
-                pass
-
-            if result.returncode != 0:
-                logger.warning(f"Firefox 解压失败: {result.stderr[:200]}")
-                return None
-
-            # 验证
-            if os.path.isfile(firefox_bin) and os.access(firefox_bin, os.X_OK):
-                # 创建符号链接
-                link_path = "/usr/local/bin/firefox"
-                try:
-                    if os.path.exists(link_path) or os.islink(link_path):
-                        os.remove(link_path)
-                    os.symlink(firefox_bin, link_path)
-                except Exception:
-                    pass
-                # 安装依赖库
-                # [v1.40.0] 使用 start_new_session 防止崩溃传播
-                try:
-                    subprocess.run(
-                        sudo + ["apt-get", "install", "-y", "--no-install-recommends",
-                                 "libgtk-3-0", "libdbus-glib-1-2", "libxt6",
-                                 "libasound2", "libatk1.0-0", "libatk-bridge2.0-0",
-                                 "libcups2", "libxdamage1", "libxrandr2",
-                                 "libxcomposite1", "libpango-1.0-0",
-                                 "libcairo2", "libx11-xcb1"],
-                        capture_output=True, text=True, timeout=60,
-                        start_new_session=True,
-                    )
-                except Exception:
-                    pass
-                logger.info(f"Mozilla Firefox 二进制版安装成功: {firefox_bin}")
-                return firefox_bin
-            else:
-                logger.warning("Firefox 解压后未找到可执行文件")
-
-        except Exception as e:
-            logger.warning(f"Mozilla Firefox 二进制版安装异常: {e}")
-
+        # [v1.47.28] 已删除 FTP 下载 Firefox 回退代码
+        # 用户要求只用 apt 方式安装，不使用 FTP 下载
+        # 如果以上所有 apt 方式都失败，返回 None
+        logger.warning("所有 apt 方式安装 Firefox 均失败，请手动运行: sudo apt install firefox")
         return None
 
     def _create_browser_wrapper(self, browser_binary: str) -> None:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.47.27",
+  "version": "1.47.29",
   "description": "\u672c\u5730\u684c\u9762\u7aef\u6267\u884c\u578bAI\u52a9\u624b - Open Interpreter \u98ce\u683c | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {