myagent-ai 1.18.3 → 1.18.4

package/package.json

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

package/skills/chromedev_mcp.py

@@ -383,6 +383,11 @@ class MCPClient:
                     pass
         except Exception:
             pass
+        finally:
+            # [v1.18.3] stdout EOF = MCP Server 或 Chrome 已断开
+            # 标记为未初始化，下次 call_tool 会自动重建
+            self._initialized = False
+            logger.warning("MCP stdout 读取结束（Server 或 Chrome 已断开）")
 
     async def _handshake(self) -> bool:
         """执行 MCP 初始化握手"""
@@ -552,7 +557,12 @@ class MCPClient:
         self._cleanup()
 
     def _cleanup(self):
-        """清理子进程"""
+        """清理子进程（包括 Chrome/Chromium 浏览器）
+
+        [v1.18.3] 修复 'Target closed' 问题：
+        终止 MCP Server 后，额外杀死残留的 Chrome 进程，
+        避免下次启动时因锁文件冲突导致 'Target closed'。
+        """
         self._initialized = False
         if self._process:
             try:
@@ -569,6 +579,48 @@ class MCPClient:
                     pass
             self._process = None
 
+        # [v1.18.3] 清理残留的 Chrome/Chromium 进程
+        # chrome-devtools-mcp 启动的 Chrome 可能不会随 MCP 进程一起退出
+        self._kill_stale_chrome()
+
+    def _kill_stale_chrome(self):
+        """清理残留的 Chrome/Chromium 进程
+
+        查找并杀死由 chrome-devtools-mcp 启动的 Chrome 进程。
+        这些进程可能导致下次启动时 'Target closed' 错误。
+        """
+        import signal as _sig
+        try:
+            # 查找 chrome-devtools-mcp 启动的 Chrome 进程
+            # 特征: 父进程是 node/npx (chrome-devtools-mcp)
+            result = subprocess.run(
+                ["pgrep", "-f", "chromium-browser.*--remote-debugging-port"],
+                capture_output=True, text=True, timeout=5,
+            )
+            if result.returncode == 0 and result.stdout.strip():
+                pids = result.stdout.strip().split("\n")
+                for pid_str in pids:
+                    try:
+                        pid = int(pid_str)
+                        os.kill(pid, _sig.SIGTERM)
+                        logger.debug(f"清理残留 Chrome 进程: PID={pid}")
+                    except (ProcessLookupError, PermissionError, ValueError):
+                        pass
+
+                # 等一小会让 Chrome 优雅退出
+                import time
+                time.sleep(0.5)
+
+                # 还没退就强杀
+                for pid_str in pids:
+                    try:
+                        pid = int(pid_str)
+                        os.kill(pid, _sig.SIGKILL)
+                    except (ProcessLookupError, PermissionError, ValueError):
+                        pass
+        except Exception as e:
+            logger.debug(f"清理 Chrome 进程异常: {e}")
+
     def is_running(self) -> bool:
         """检查 MCP Server 是否正在运行"""
         return self._process is not None and self._process.poll() is None
@@ -849,17 +901,13 @@ class BrowserOpenSkill(Skill):
                                   f"请执行: apt install -y chromium-browser 或 apt install -y chromium，"
                                   f"安装后重试即可。"
                         )
-                    # [v1.16.18] 检测 Chrome 崩溃，尝试重建 MCP 客户端并重试
+                    # [v1.16.18→18.3] 检测 Chrome 崩溃，彻底清理后重建 MCP 客户端并重试
                     _crash_keywords = ["Target closed", "Target destroyed", "Protocol error",
                                       "Browser closed", "Connection closed", "Session closed"]
                     if any(kw in err_text for kw in _crash_keywords) and attempt < max_attempts - 1:
                         logger.warning(f"Chrome 连接丢失 ({err_text[:100]})，正在重建 MCP 客户端并重试...")
-                        try:
-                            if client:
-                                client._cleanup()
-                        except Exception:
-                            pass
-                        _mcp_client = None
+                        # [v1.18.3] 彻底清理所有 MCP 客户端（包括残留 Chrome 进程）
+                        await rebuild_mcp_client()
                         continue  # 重试
                     return SkillResult(success=False, error=f"导航失败: {err_text}")
 
@@ -921,18 +969,13 @@ class BrowserOpenSkill(Skill):
                     message=f"已打开: {page_title} (文本 {len(text)} 字符, {len(links)} 个链接)",
                 )
             except Exception as e:
-                # [v1.16.18] 异常时也检测 Chrome 崩溃并重试
+                # [v1.16.18→18.3] 异常时也检测 Chrome 崩溃并彻底重建
                 _err_str = str(e)
                 _crash_keywords = ["Target closed", "Target destroyed", "Protocol error",
                                   "Browser closed", "Connection closed", "Session closed"]
                 if any(kw in _err_str for kw in _crash_keywords) and attempt < max_attempts - 1:
                     logger.warning(f"Chrome 异常 ({_err_str[:100]})，正在重建 MCP 客户端并重试...")
-                    try:
-                        if _mcp_client:
-                            _mcp_client._cleanup()
-                    except Exception:
-                        pass
-                    _mcp_client = None
+                    await rebuild_mcp_client()
                     continue  # 重试
                 logger.error(f"浏览器打开失败: {e}")
                 return SkillResult(success=False, error=f"浏览器打开失败: {e}")