myagent-ai 1.47.11 → 1.47.13

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/main.py

@@ -83,11 +83,23 @@ def _open_browser_kiosk(url: str):
     """打开浏览器窗口，使用系统已安装的 Chrome 或默认浏览器。
     
     [v1.34.0] 优先使用系统已安装的 Chrome/Edge，而非 DrissionPage 控制的浏览器。
+    [v1.47.12] Termux 环境: 优先使用 termux-open-url（调用 Android 系统浏览器）。
     """
     import shutil
     import subprocess
     import platform
 
+    # [v1.47.12] Termux 环境: 优先使用 termux-open-url 打开 Android 系统浏览器
+    # 在 Termux proot 环境下，xdg-open 无法工作（Permission denied），
+    # 但 termux-open-url 可以跨 proot 边界调用 Android 系统浏览器
+    termux_open = shutil.which("termux-open-url")
+    if termux_open:
+        try:
+            subprocess.Popen([termux_open, url], start_new_session=True)
+            return
+        except Exception:
+            pass
+
     chrome_path = None
     system = platform.system()
 
@@ -1056,6 +1068,7 @@ def create_tray_icon(app: MyAgentApp, web_port: int = 8767):
             app.logger.warning(f"无法打开不存在的路径: {path}")
             return
         import subprocess
+        import shutil
         import platform as pf
         system = pf.system()
         try:
@@ -1064,7 +1077,12 @@ def create_tray_icon(app: MyAgentApp, web_port: int = 8767):
             elif system == "Darwin":
                 subprocess.Popen(["open", path])
             else:
-                subprocess.Popen(["xdg-open", path])
+                # [v1.47.12] Termux 环境: 优先使用 termux-open-url
+                termux_open = shutil.which("termux-open-url")
+                if termux_open:
+                    subprocess.Popen([termux_open, path], start_new_session=True)
+                else:
+                    subprocess.Popen(["xdg-open", path])
         except Exception as e:
             app.logger.warning(f"无法打开路径 {path}: {e}")
 

package/package.json

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

package/start.js

@@ -754,7 +754,11 @@ function cmdRun(pkgDir, userArgs) {
           try {
             if (IS_WIN) execSync(`start "" "${url}"`);
             else if (process.platform === "darwin") execSync(`open "${url}"`);
-            else execSync(`xdg-open "${url}"`);
+            else {
+              // [v1.47.12] Termux 环境: 优先使用 termux-open-url（Android 系统浏览器）
+              try { execSync(`termux-open-url "${url}"`); }
+              catch (_) { execSync(`xdg-open "${url}"`); }
+            }
           } catch (_) {}
         }
       });

package/tray_manager.py

@@ -347,19 +347,37 @@ def restart_server() -> bool:
 
 def open_dashboard():
     """Open chat dashboard in default browser"""
-    import webbrowser
+    import shutil, subprocess
     port = _read_port_from_env()
     url = f"http://localhost:{port}"
     log(f"Opening dashboard: {url}")
+    # [v1.47.12] Termux 环境: 优先使用 termux-open-url
+    termux_open = shutil.which("termux-open-url")
+    if termux_open:
+        try:
+            subprocess.Popen([termux_open, url], start_new_session=True)
+            return
+        except Exception:
+            pass
+    import webbrowser
     webbrowser.open(url)
 
 
 def open_admin():
     """Open admin dashboard in default browser"""
-    import webbrowser
+    import shutil, subprocess
     port = _read_port_from_env()
     url = f"http://localhost:{port}/admin"
     log(f"Opening admin panel: {url}")
+    # [v1.47.12] Termux 环境: 优先使用 termux-open-url
+    termux_open = shutil.which("termux-open-url")
+    if termux_open:
+        try:
+            subprocess.Popen([termux_open, url], start_new_session=True)
+            return
+        except Exception:
+            pass
+    import webbrowser
     webbrowser.open(url)
 
 

package/web/api_server.py

@@ -6424,10 +6424,21 @@ window.addEventListener('beforeunload', function() {{
                         "message": message,
                     })
                 else:
-                    # 找不到 Chrome，降级使用 webbrowser.open
-                    import webbrowser
-                    if login_url:
-                        webbrowser.open(login_url)
+                    # 找不到 Chrome，降级使用系统浏览器
+                    import shutil, subprocess as _sp
+                    _opened = False
+                    # [v1.47.12] Termux 环境: 优先使用 termux-open-url
+                    termux_open = shutil.which("termux-open-url")
+                    if termux_open and login_url:
+                        try:
+                            _sp.Popen([termux_open, login_url], start_new_session=True)
+                            _opened = True
+                        except Exception:
+                            pass
+                    if not _opened:
+                        import webbrowser
+                        if login_url:
+                            webbrowser.open(login_url)
                     logger.info(f"桌面环境: 未找到 Chrome，使用系统默认浏览器打开 {login_url}")
 
                     display_name = site.get('display_name', name)