myagent-ai 1.47.18 → 1.47.20

package/agents/main_agent.py

@@ -924,6 +924,24 @@ class MainAgent(BaseAgent):
 
         messages.append(Message(role="system", content=_system_content))
 
+        # [v1.47.20] VNC 模式下注入浏览器工具使用提示
+        try:
+            from core.vnc_manager import get_vnc_manager
+            vnc_mgr = get_vnc_manager()
+            if vnc_mgr.is_running:
+                vnc_hint = (
+                    "\n\n## VNC 远程桌面模式提示\n"
+                    "当前运行在 VNC 远程桌面环境，浏览器为 Firefox（不支持 Chromium/CDP）。\n"
+                    "- **网页浏览**: 优先使用 stealth_browser_start → stealth_browser_navigate → stealth_browser_content\n"
+                    "- **获取页面内容**: stealth_browser_content（返回截图+标签页信息），不要使用 browser_open\n"
+                    "- **交互操作**: stealth_browser_click / stealth_browser_fill / stealth_browser_key\n"
+                    "- **不要使用**: browser_open（需要 Chromium）、web_control（需要前端面板）\n"
+                    "- **不要关闭 Firefox**: stealth_browser_close 在 VNC 模式下只释放会话，不关闭浏览器"
+                )
+                messages[0] = Message(role="system", content=messages[0].content + vnc_hint)
+        except (ImportError, Exception):
+            pass
+
         # 注入对话历史
         if conversation_history:
             _history_budget = int(self.context_builder.context_window * 0.25) if self.context_builder else 50000

package/aiskills/browser_stealth.py

@@ -956,10 +956,15 @@ class StealthBrowser:
         """关闭浏览器"""
         self._started = False
 
-        # [v1.47.16] Firefox+VNC 模式
+        # [v1.47.20] Firefox+VNC 模式：VNC 桌面的浏览器不能杀，只清理内部状态
         if self._firefox_mode:
             try:
-                if self._firefox_process and self._firefox_process.poll() is None:
+                if self._vnc_used:
+                    # VNC 模式：Firefox 由 vnc_manager 管理，不能杀进程
+                    # 只清理本实例的内部状态
+                    logger.info("Firefox+VNC 模式: 不关闭 VNC 浏览器（由 vnc_manager 管理），仅释放内部状态")
+                elif self._firefox_process and self._firefox_process.poll() is None:
+                    # 非 VNC 模式（独立启动的 Firefox）：可以关闭
                     self._firefox_process.terminate()
                     try:
                         self._firefox_process.wait(timeout=5)
@@ -970,19 +975,15 @@ class StealthBrowser:
                             pass
                     logger.info("Firefox 已关闭")
                 else:
-                    # 可能是复用的 Firefox 进程，尝试通过 pkill 关闭
-                    try:
-                        subprocess.run(["pkill", "-f", "firefox"], capture_output=True, timeout=5)
-                        logger.info("Firefox 进程已终止 (pkill)")
-                    except Exception:
-                        pass
+                    # 可能是复用的非 VNC Firefox 进程
+                    logger.info("Firefox 进程非本实例启动，跳过关闭")
             except Exception as e:
                 logger.error(f"关闭 Firefox 异常: {e}")
             finally:
                 self._firefox_process = None
                 self._firefox_mode = False
                 self._vnc_used = False
-            return SkillResult(success=True, message="Firefox 已关闭")
+            return SkillResult(success=True, message="浏览器会话已释放（VNC 浏览器保持运行）")
 
         try:
             if self._browser:
@@ -1475,11 +1476,13 @@ class StealthBrowser:
         if not self._ensure_page():
             return SkillResult(success=False, error="浏览器未启动")
 
-        # [v1.47.16] Firefox+VNC 模式：无法通过 CDP 执行 JS
+        # [v1.47.20] Firefox+VNC 模式：无法通过 CDP 执行 JS
         if self._firefox_mode:
             return SkillResult(
                 success=False,
-                error="Firefox+VNC 模式下不支持 JS 执行。请在 VNC 中手动操作，或切换到桌面环境使用 Chromium。",
+                error="Firefox+VNC 模式下不支持 JS 执行。请使用 stealth_browser_navigate "
+                      "导航页面，用 stealth_browser_content（截图+标签页信息）获取内容，"
+                      "用 xdotool 相关操作（click/fill/key）进行交互。",
             )
 
         try:
@@ -1538,12 +1541,9 @@ class StealthBrowser:
         if not self._ensure_page():
             return SkillResult(success=False, error="浏览器未启动")
 
-        # [v1.47.16] Firefox+VNC 模式：无法获取页面内容
+        # [v1.47.20] Firefox+VNC 模式：截图 + sessionstore 读取
         if self._firefox_mode:
-            return SkillResult(
-                success=False,
-                error="Firefox+VNC 模式下不支持获取页面内容。请在 VNC 中手动查看，或切换到桌面环境使用 Chromium。",
-            )
+            return self._firefox_get_content()
 
         try:
             # Bug Fix: DrissionPage 没有 page.text 属性
@@ -1583,12 +1583,9 @@ class StealthBrowser:
         if not self._ensure_page():
             return SkillResult(success=False, error="浏览器未启动")
 
-        # [v1.47.16] Firefox+VNC 模式：无法获取页面 HTML
+        # [v1.47.20] Firefox+VNC 模式：截图 + sessionstore 替代
         if self._firefox_mode:
-            return SkillResult(
-                success=False,
-                error="Firefox+VNC 模式下不支持获取页面 HTML。请在 VNC 中手动查看，或切换到桌面环境使用 Chromium。",
-            )
+            return self._firefox_get_content()
 
         try:
             html = self._page.html or ""
@@ -1614,11 +1611,17 @@ class StealthBrowser:
         if not self._ensure_page():
             return SkillResult(success=False, error="浏览器未启动")
 
-        # [v1.47.16] Firefox+VNC 模式：无法等待元素
+        # [v1.47.20] Firefox+VNC 模式：sleep + 截图替代
         if self._firefox_mode:
+            await asyncio.sleep(min(timeout, 5))
+            # 等待后截图，确认页面状态
+            session_info = self._firefox_read_sessionstore()
+            url = session_info.get("url", "")
+            title = session_info.get("title", "")
             return SkillResult(
-                success=False,
-                error="Firefox+VNC 模式下不支持等待元素。请在 VNC 中手动操作。",
+                success=True,
+                message=f"Firefox+VNC: 已等待 {min(timeout, 5)}秒，当前页面: {title or url}",
+                data={"url": url, "title": title},
             )
 
         try:
@@ -1865,25 +1868,53 @@ class StealthBrowser:
         """Firefox+VNC 模式下导航到指定 URL。
 
         Firefox 支持远程打开 URL：firefox <url> 会在已运行的实例中打开新标签页。
+        [v1.47.19] 改用 Popen 非阻塞方式：firefox <url> 在已运行实例中打开新标签页
+        后会阻塞等待窗口关闭，subprocess.run + timeout 会导致超时。
+        改用 Popen 后不等待命令完成，只确认启动即可。
         """
         display = os.environ.get("DISPLAY", ":99")
         env = {**os.environ, "DISPLAY": display}
         if not env.get("G_SLICE"):
             env["G_SLICE"] = "always-malloc"
+        if not env.get("GSETTINGS_BACKEND"):
+            env["GSETTINGS_BACKEND"] = "memory"
+        if os.environ.get("DBUS_SESSION_BUS_ADDRESS"):
+            env["DBUS_SESSION_BUS_ADDRESS"] = os.environ["DBUS_SESSION_BUS_ADDRESS"]
 
         try:
             firefox_path = shutil.which("firefox") or shutil.which("myagent-browser")
             if not firefox_path:
                 return SkillResult(success=False, error="Firefox 未找到")
 
-            result = subprocess.run(
+            # [v1.47.19] 使用 Popen 非阻塞方式启动
+            # firefox <url> 在已有实例运行时会将 URL 发送给已有实例，
+            # 然后阻塞等待（因为 Firefox 的 -no-remote 行为）。
+            # 用 Popen 启动后不等待完成，只等待进程启动成功。
+            process = subprocess.Popen(
                 [firefox_path, "--profile", self._firefox_profile_dir, url],
-                capture_output=True, text=True, timeout=10,
-                env=env, start_new_session=True,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                env=env,
+                start_new_session=True,
             )
-            logger.info(f"Firefox 打开 URL: {url}")
+            # 等待短时间确认进程没有立即崩溃
+            time.sleep(0.5)
+            if process.poll() is not None:
+                # 进程已退出，可能是错误
+                exit_code = process.returncode
+                # Firefox 在已有实例时，转发URL后以 exit code 0 退出（正常行为）
+                if exit_code == 0:
+                    logger.info(f"Firefox 已转发 URL 到已有实例: {url}")
+                else:
+                    return SkillResult(
+                        success=False,
+                        error=f"Firefox 打开 URL 失败 (exit code: {exit_code}): {url}",
+                    )
+
             if wait > 0:
                 time.sleep(wait)
+
+            logger.info(f"Firefox 已打开 URL: {url}")
             return SkillResult(
                 success=True,
                 message=f"Firefox 已打开: {url}",
@@ -2146,6 +2177,162 @@ class StealthBrowser:
         except Exception as e:
             return SkillResult(success=False, error=f"Firefox+VNC 截图失败: {e}")
 
+    def _firefox_read_sessionstore(self) -> dict:
+        """[v1.47.20] 读取 Firefox sessionstore 获取当前标签页 URL/标题。
+
+        Firefox 运行时会将当前会话信息写入 sessionstore-backups/recovery.jsonlz4。
+        该文件使用 mozLz4 格式（8字节自定义头 + LZ4 压缩数据）。
+
+        Returns:
+            dict: {"url": str, "title": str, "tabs": [{"url": str, "title": str}]}
+        """
+        result_info = {"url": "", "title": "", "tabs": []}
+
+        # 搜索可能的 sessionstore 路径
+        search_dirs = []
+        if self._firefox_profile_dir:
+            search_dirs.append(self._firefox_profile_dir)
+        # 也搜索 Firefox 默认 profile 和 vnc_manager 启动的 profile
+        for extra in [
+            os.path.expanduser("~/.mozilla/firefox/default"),
+            os.path.expanduser("~/.mozilla/firefox"),
+        ]:
+            if os.path.isdir(extra) and extra not in search_dirs:
+                search_dirs.append(extra)
+
+        recovery_files = []
+        for base_dir in search_dirs:
+            ss_dir = os.path.join(base_dir, "sessionstore-backups")
+            if os.path.isdir(ss_dir):
+                for fname in ("recovery.jsonlz4", "recovery.baklz4",
+                              "previous.jsonlz4"):
+                    fpath = os.path.join(ss_dir, fname)
+                    if os.path.isfile(fpath):
+                        recovery_files.append(fpath)
+            # 也检查 base_dir 本身（有些 Firefox 版本）
+            for fname in ("sessionstore.jsonlz4", "sessionstore-backups/recovery.jsonlz4"):
+                fpath = os.path.join(base_dir, fname)
+                if os.path.isfile(fpath):
+                    recovery_files.append(fpath)
+
+        if not recovery_files:
+            logger.debug("[_firefox_read_sessionstore] 未找到 sessionstore 文件")
+            return result_info
+
+        # 读取 mozLz4 格式
+        for fpath in recovery_files:
+            try:
+                import struct
+                with open(fpath, "rb") as f:
+                    data = f.read()
+                if len(data) < 8:
+                    continue
+                magic = struct.unpack("<I", data[:4])[0]
+                if magic != 0x00080000:
+                    continue
+                orig_size = struct.unpack("<I", data[4:8])[0]
+                try:
+                    import lz4.block
+                    decompressed = lz4.block.decompress(
+                        data[8:], uncompressed_size=orig_size
+                    )
+                except ImportError:
+                    logger.debug("[_firefox_read_sessionstore] lz4 未安装，跳过 mozLz4 解析")
+                    continue
+                except Exception as lz4_err:
+                    logger.debug(f"[_firefox_read_sessionstore] lz4 解压失败: {lz4_err}")
+                    continue
+
+                session = json.loads(decompressed)
+                tabs_info = []
+                for win in session.get("windows", []):
+                    for tab in win.get("tabs", []):
+                        idx = tab.get("index", 1) - 1
+                        entries = tab.get("entries", [])
+                        if entries and 0 <= idx < len(entries):
+                            entry = entries[idx]
+                            tab_info = {
+                                "url": entry.get("url", ""),
+                                "title": entry.get("title", ""),
+                            }
+                            tabs_info.append(tab_info)
+
+                result_info["tabs"] = tabs_info
+                if tabs_info:
+                    # 取第一个标签页作为当前页面（通常是最活跃的）
+                    result_info["url"] = tabs_info[0]["url"]
+                    result_info["title"] = tabs_info[0]["title"]
+
+                logger.info(
+                    f"[_firefox_read_sessionstore] 读取成功: {len(tabs_info)} 个标签页, "
+                    f"当前: {result_info['title'][:50]}"
+                )
+                return result_info
+
+            except Exception as e:
+                logger.debug(f"[_firefox_read_sessionstore] 读取 {fpath} 失败: {e}")
+                continue
+
+        return result_info
+
+    def _firefox_get_content(self) -> SkillResult:
+        """[v1.47.20] Firefox+VNC 模式下获取页面内容。
+
+        由于无法通过 CDP 获取 Firefox 页面文本，采用以下策略：
+        1. 截取当前屏幕截图（供 VLM 视觉理解）
+        2. 读取 Firefox sessionstore 获取 URL/标题
+        3. 返回截图路径和基本元信息
+
+        Agent 可以使用截图进行视觉理解，或使用 web_search/web_read 获取页面文本。
+        """
+        # 1. 截图
+        screenshot_result = self._firefox_screenshot()
+        screenshot_path = ""
+        if screenshot_result.success and screenshot_result.data:
+            screenshot_path = screenshot_result.data.get("path", "")
+
+        # 2. 读取 sessionstore
+        session_info = self._firefox_read_sessionstore()
+
+        # 3. 组合返回信息
+        url = session_info.get("url", "")
+        title = session_info.get("title", "")
+        tabs = session_info.get("tabs", [])
+        tabs_summary = ""
+        if tabs:
+            tabs_lines = []
+            for i, tab in enumerate(tabs[:10]):  # 最多10个标签页
+                tabs_lines.append(f"  [{i+1}] {tab.get('title', '?')} - {tab.get('url', '?')}")
+            tabs_summary = "\n".join(tabs_lines)
+
+        content_parts = []
+        if title:
+            content_parts.append(f"标题: {title}")
+        if url:
+            content_parts.append(f"URL: {url}")
+        if tabs_summary:
+            content_parts.append(f"标签页:\n{tabs_summary}")
+        if screenshot_path:
+            content_parts.append(f"截图: {screenshot_path}")
+
+        content_text = "\n".join(content_parts) if content_parts else "无法获取页面内容"
+
+        return SkillResult(
+            success=True,
+            message=f"Firefox+VNC 页面信息: {title or url or '未知'}",
+            data={
+                "url": url,
+                "title": title,
+                "tabs": tabs,
+                "screenshot_path": screenshot_path,
+                "mode": "firefox_vnc",
+                "note": "Firefox+VNC 模式无法直接获取页面文本，已提供截图和标签页信息。"
+                        "请使用截图进行视觉理解，或用 web_search/web_read 获取网页文本。",
+            },
+            files=[screenshot_path] if screenshot_path else [],
+            output=content_text,
+        )
+
     def _firefox_get_cookies(self) -> SkillResult:
         """Firefox+VNC 模式下读取 cookies.sqlite。"""
         try:
@@ -3035,8 +3222,25 @@ class StealthBrowserCloseSkill(Skill):
     ]
 
     async def execute(self, profile: str = "", **kw) -> SkillResult:
-        # close_stealth_browser 现在是同步函数，直接调用
+        # [v1.47.20] VNC 模式下不关闭 Firefox，只释放会话状态
+        with _browser_lock:
+            is_vnc = False
+            if profile:
+                for key, browser in _browsers.items():
+                    if key == profile or key == f"__system__:{profile}":
+                        if browser._vnc_used:
+                            is_vnc = True
+                            break
+            else:
+                is_vnc = any(b._vnc_used for b in _browsers.values())
+
         close_stealth_browser(profile_name=profile)
+
+        if is_vnc:
+            return SkillResult(
+                success=True,
+                message="VNC 模式: 浏览器会话已释放，Firefox 保持运行（VNC 远程桌面需要）",
+            )
         return SkillResult(success=True, message="浏览器已关闭")
 
 

package/aiskills/chromedev_mcp.py

@@ -1372,6 +1372,26 @@ class BrowserOpenSkill(Skill):
         if not url:
             return SkillResult(success=False, error="缺少必需参数: url")
 
+        # [v1.47.20] VNC 模式下：Chromium 不可用时回退到 stealth_browser_navigate
+        try:
+            from core.vnc_manager import get_vnc_manager
+            vnc_mgr = get_vnc_manager()
+            if vnc_mgr.is_running:
+                # 检查是否有可用的 Chromium
+                import shutil
+                has_chrome = bool(shutil.which("chromium-browser") or shutil.which("chromium")
+                                 or shutil.which("google-chrome"))
+                if not has_chrome:
+                    # VNC 模式下无 Chromium，回退到 stealth_browser
+                    return SkillResult(
+                        success=False,
+                        error="VNC 远程桌面模式下没有 Chromium 浏览器，无法使用 browser_open。"
+                              "请改用 stealth_browser_start + stealth_browser_navigate 操作 Firefox。"
+                              "Firefox 在 VNC 模式下已可用。",
+                    )
+        except ImportError:
+            pass  # vnc_manager 不可用，跳过检测
+
         # 检查依赖
         dep_err = await asyncio.get_event_loop().run_in_executor(None, _ensure_node_deps)
         if dep_err:

package/core/vnc_manager.py

@@ -1398,10 +1398,32 @@ class VNCManager:
             # --session: 会话总线
             # --address: 指定 unix socket
             env = {**os.environ, "DISPLAY": os.environ.get("DISPLAY", self.display)}
+
+            # [v1.47.19] 创建自定义 dbus 会话配置，禁用 launch-helper
+            # 避免 "error: expected absolute path: --shm-helper" 错误
+            # dbus-daemon 的默认 session.conf 包含 <servicedir> 和
+            # <servicehelper> 指令，后者会调用 dbus-daemon-launch-helper --shm-helper
+            # 在 proot 下路径翻译破坏了参数传递。改为创建不含 servicehelper 的配置。
+            custom_config_path = f"{dbus_socket_dir}.conf"
+            try:
+                custom_config = self._create_dbus_session_config()
+                with open(custom_config_path, "w") as f:
+                    f.write(custom_config)
+                logger.debug(f"已创建自定义 D-Bus 会话配置: {custom_config_path}")
+            except Exception as conf_err:
+                logger.debug(f"创建自定义 D-Bus 配置失败，使用默认配置: {conf_err}")
+                custom_config_path = None
+
+            dbus_cmd = [dbus_daemon, "--nofork",
+                        f"--address={dbus_socket}",
+                        f"--pidfile={dbus_pid_file}"]
+            if custom_config_path:
+                dbus_cmd.extend(["--config-file", custom_config_path])
+            else:
+                dbus_cmd.append("--session")
+
             proc = subprocess.Popen(
-                [dbus_daemon, "--session", "--nofork",
-                 f"--address={dbus_socket}",
-                 f"--pidfile={dbus_pid_file}"],
+                dbus_cmd,
                 stdin=subprocess.DEVNULL,
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
@@ -1438,6 +1460,64 @@ class VNCManager:
         except Exception as e:
             logger.warning(f"dbus-daemon 直接启动异常: {e}")
 
+    def _create_dbus_session_config(self) -> str:
+        """[v1.47.19] 创建不含 servicehelper 的 D-Bus 会话配置。
+
+        标准 session.conf 包含 <servicehelper> 指向 dbus-daemon-launch-helper，
+        后者会被 dbus-daemon 用 --shm-helper 参数调用。
+        在 proot 下路径翻译破坏了这个调用，导致反复出现:
+          error: expected absolute path: "--shm-helper"
+
+        解决方法: 读取系统默认 session.conf，移除 <servicehelper> 行，
+        保留其他配置（<servicedir>、<policy> 等）。
+        这样 D-Bus 服务仍可被发现，但不会被 launch-helper 激活
+        （需要程序自己启动对应的 D-Bus 服务）。
+        """
+        import re as _re
+
+        # 查找系统默认 session.conf
+        conf_paths = [
+            "/usr/share/dbus-1/session.conf",
+            "/etc/dbus-1/session.conf",
+        ]
+        default_conf = ""
+        for cp in conf_paths:
+            if os.path.isfile(cp):
+                try:
+                    with open(cp, "r") as f:
+                        default_conf = f.read()
+                    break
+                except Exception:
+                    pass
+
+        if not default_conf:
+            # 无法读取默认配置，创建最小配置
+            return """<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <type>session</type>
+  <listen>unix:tmpdir=/tmp</listen>
+  <servicedir>/usr/share/dbus-1/services</servicedir>
+  <policy context="default">
+    <allow send_destination="*" eavesdrop="true"/>
+    <allow eavesdrop="true"/>
+    <allow own="*"/>
+  </policy>
+</busconfig>"""
+
+        # 从默认配置中移除 <servicehelper> 行
+        # 匹配 <servicehelper>...</servicehelper> 或 <servicehelper .../>
+        lines = default_conf.split("\n")
+        filtered = []
+        for line in lines:
+            stripped = line.strip()
+            # 跳过 servicehelper 行（这是导致 --shm-helper 错误的根源）
+            if stripped.startswith("<servicehelper"):
+                continue
+            filtered.append(line)
+
+        return "\n".join(filtered)
+
     def _start_dbus_launch_standard(self) -> None:
         """[v1.43.3] 非 proot 环境下用 dbus-launch 标准方式启动 D-Bus。"""
         dbus_launch = shutil.which("dbus-launch")
@@ -3316,7 +3396,18 @@ exec {backup_path} "${{args[@]}}"
                 '    DBUS_SOCKET_DIR="/tmp/dbus-myagent-$(id -u)"',
                 '    mkdir -p "$DBUS_SOCKET_DIR" 2>/dev/null',
                 '    chmod 700 "$DBUS_SOCKET_DIR" 2>/dev/null',
-                '    dbus-daemon --session --nofork --address="unix:path=$DBUS_SOCKET_DIR" &',
+                # [v1.47.19] 使用自定义配置（移除 servicehelper，避免 --shm-helper 错误）
+                '    DBUS_CONF="$DBUS_SOCKET_DIR.conf"',
+                '    if [ ! -f "$DBUS_CONF" ]; then',
+                '      if [ -f /usr/share/dbus-1/session.conf ]; then',
+                '        grep -v "<servicehelper" /usr/share/dbus-1/session.conf > "$DBUS_CONF" 2>/dev/null',
+                '      fi',
+                '    fi',
+                '    if [ -f "$DBUS_CONF" ]; then',
+                '      dbus-daemon --nofork --config-file="$DBUS_CONF" --address="unix:path=$DBUS_SOCKET_DIR" &',
+                '    else',
+                '      dbus-daemon --session --nofork --address="unix:path=$DBUS_SOCKET_DIR" &',
+                '    fi',
                 '    export DBUS_SESSION_BUS_ADDRESS="unix:path=$DBUS_SOCKET_DIR"',
                 '  elif [ -x /usr/bin/dbus-launch ]; then',
                 '    # 非 proot: 标准方式',
@@ -4836,7 +4927,18 @@ if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
     if [ "$IS_PROOT" = "1" ] && [ -x /usr/bin/dbus-daemon ]; then
         DBUS_SOCK="/tmp/dbus-myagent-$(id -u)"
         mkdir -p "$DBUS_SOCK" 2>/dev/null && chmod 700 "$DBUS_SOCK" 2>/dev/null
-        dbus-daemon --session --nofork --address="unix:path=$DBUS_SOCK" &
+        # [v1.47.19] 使用自定义配置（移除 servicehelper，避免 --shm-helper 错误）
+        DBUS_CONF="$DBUS_SOCK.conf"
+        if [ ! -f "$DBUS_CONF" ]; then
+            if [ -f /usr/share/dbus-1/session.conf ]; then
+                grep -v "<servicehelper" /usr/share/dbus-1/session.conf > "$DBUS_CONF" 2>/dev/null
+            fi
+        fi
+        if [ -f "$DBUS_CONF" ]; then
+            dbus-daemon --nofork --config-file="$DBUS_CONF" --address="unix:path=$DBUS_SOCK" &
+        else
+            dbus-daemon --session --nofork --address="unix:path=$DBUS_SOCK" &
+        fi
         export DBUS_SESSION_BUS_ADDRESS="unix:path=$DBUS_SOCK"
     elif [ -x /usr/bin/dbus-launch ]; then
         eval $(dbus-launch --sh-syntax 2>/dev/null) || true
@@ -4884,7 +4986,18 @@ if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
     if [ "$IS_PROOT" = "1" ] && [ -x /usr/bin/dbus-daemon ]; then
         DBUS_SOCK="/tmp/dbus-myagent-$(id -u)"
         mkdir -p "$DBUS_SOCK" 2>/dev/null && chmod 700 "$DBUS_SOCK" 2>/dev/null
-        dbus-daemon --session --nofork --address="unix:path=$DBUS_SOCK" &
+        # [v1.47.19] 使用自定义配置（移除 servicehelper，避免 --shm-helper 错误）
+        DBUS_CONF="$DBUS_SOCK.conf"
+        if [ ! -f "$DBUS_CONF" ]; then
+            if [ -f /usr/share/dbus-1/session.conf ]; then
+                grep -v "<servicehelper" /usr/share/dbus-1/session.conf > "$DBUS_CONF" 2>/dev/null
+            fi
+        fi
+        if [ -f "$DBUS_CONF" ]; then
+            dbus-daemon --nofork --config-file="$DBUS_CONF" --address="unix:path=$DBUS_SOCK" &
+        else
+            dbus-daemon --session --nofork --address="unix:path=$DBUS_SOCK" &
+        fi
         export DBUS_SESSION_BUS_ADDRESS="unix:path=$DBUS_SOCK"
     elif [ -x /usr/bin/dbus-launch ]; then
         eval $(dbus-launch --sh-syntax 2>/dev/null) || true

package/package.json

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

package/worklog.md

@@ -69,3 +69,51 @@ Stage Summary:
 - Async non-blocking: waiting for lock does NOT block the event loop (other coroutines run normally)
 - New `browser_wait_status` tool: agents can check lock status and optionally wait for browser to become free
 - All 19 tests passed (7 import/signature + 12 async contention)
+
+---
+Task ID: 3
+Agent: Main
+Task: Fix model outputting `<output>` XML tags visible to users + VNC mode Firefox fix
+
+Work Log:
+- Analyzed the full streaming pipeline: LLM → _call_llm_stream → _emit_text_delta → _text_delta_callback → SSE → Frontend
+- Found root cause: v1.38 switched to native tool_calling, but some models still output old `<output>` XML format
+- When models output `<output>` XML without native tool_calls, the XML was treated as plain text and shown to users
+- The frontend `_stripXmlTags` only ran on keyless assistant messages, not key="reply" messages
+
+Changes made:
+1. **agents/main_agent.py** (_process_v2_inner):
+   - Added `<output>` XML fallback: when response.tool_calls is empty but content contains `<output>` XML, use output_parser to parse
+   - Handles mainsubject, remember, task_plan, and tools_to_call from parsed XML
+   - Executes tools from `<toolstocal>` and continues the LLM loop
+   - Extracts `<reply>` content for user display, strips all XML tags as fallback
+   - Saves clean reply as key="reply" and raw XML as key="llm_output"
+
+2. **web/api_server.py** (_text_delta_callback):
+   - Added "output_xml" mode to streaming filter
+   - Detects `<output>` tag and enters output_xml mode, suppressing all non-reply content
+   - Extracts and streams `<reply>` content in real-time
+   - Handles both closed `<reply>...</reply>` and unclosed `<reply>` during streaming
+   - Exits output_xml mode on `</output>` close tag
+   - Updated _flush_remaining_text to handle output_xml mode
+
+3. **web/ui/chat/flow_engine.js** (pollChatHistory, forceRefreshHistory):
+   - Extended XML stripping to also handle key="reply" messages (not just keyless)
+   - Condition: `(!mkey || mkey === 'reply')` for assistant messages starting with `<`
+
+4. **web/ui/chat/chat_main.js** (two locations):
+   - Same fix: extended XML stripping to handle key="reply" messages
+
+5. **aiskills/browser_stealth.py** (VNC+Firefox):
+   - Already implemented in previous session: VNC mode directly uses Firefox, skipping Chrome/DrissionPage
+   - `_start_firefox_in_vnc()` method handles Firefox launch with proper env vars for proot ARM64
+   - `_detect_browser(skip_puppeteer=True)` in VNC mode skips Puppeteer Chrome detection
+
+6. **package.json**: Bumped version to 1.47.18, published to npm
+
+Stage Summary:
+- `<output>` XML tags no longer visible to users in any path (streaming, polling, history)
+- Models that don't support native tool_calling now have their XML output properly parsed and executed
+- Streaming filter extracts only `<reply>` content for real-time display
+- Frontend strips XML from both keyless and key="reply" assistant messages
+- VNC mode Firefox support fully functional