myagent-ai 1.47.18 → 1.47.19

package/aiskills/browser_stealth.py

@@ -1865,25 +1865,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}",

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.19",
   "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