myagent-ai 1.31.0 → 1.31.1

package/aiskills/browser_stealth.py

@@ -165,7 +165,8 @@ class StealthBrowser:
                 logger.debug(f"反检测 JS 注入提示: {e}")
 
             # 等待浏览器完全就绪
-            time.sleep(1)
+            # Bug Fix: 使用 asyncio.sleep 而非 time.sleep，避免阻塞事件循环
+            await asyncio.sleep(1)
 
             self._started = True
             logger.info(
@@ -576,17 +577,45 @@ class StealthBrowser:
             if found:
                 return found
 
-        # 3. Linux 常见路径
-        for p in (
-            "/usr/bin/google-chrome", "/usr/bin/google-chrome-stable",
-            "/usr/bin/chromium-browser", "/usr/bin/chromium",
-            "/snap/bin/chromium",
-        ):
-            if os.path.isfile(p) and os.access(p, os.X_OK):
-                return p
-
-        # 4. Puppeteer 缓存
+        # 3. 操作系统特定路径
+        import platform
+        system = platform.system()
         home = os.path.expanduser("~")
+
+        if system == "Darwin":
+            # macOS 常见路径
+            for p in (
+                "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+                "/Applications/Chromium.app/Contents/MacOS/Chromium",
+                "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
+                "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+            ):
+                if os.path.isfile(p) and os.access(p, os.X_OK):
+                    return p
+        elif system == "Windows":
+            # Windows 常见路径
+            for p in (
+                os.path.join(os.environ.get("PROGRAMFILES", "C:\\Program Files"), "Google", "Chrome", "Application", "chrome.exe"),
+                os.path.join(os.environ.get("PROGRAMFILES(X86)", "C:\\Program Files (x86)"), "Google", "Chrome", "Application", "chrome.exe"),
+                os.path.join(os.environ.get("LOCALAPPDATA", ""), "Google", "Chrome", "Application", "chrome.exe"),
+                os.path.join(os.environ.get("PROGRAMFILES", "C:\\Program Files"), "Microsoft", "Edge", "Application", "msedge.exe"),
+                os.path.join(os.environ.get("LOCALAPPDATA", ""), "BraveSoftware", "Brave-Browser", "Application", "brave.exe"),
+            ):
+                if os.path.isfile(p):
+                    return p
+        else:
+            # Linux 常见路径
+            for p in (
+                "/usr/bin/google-chrome", "/usr/bin/google-chrome-stable",
+                "/usr/bin/chromium-browser", "/usr/bin/chromium",
+                "/snap/bin/chromium",
+                "/usr/bin/brave-browser",
+                "/usr/bin/microsoft-edge",
+            ):
+                if os.path.isfile(p) and os.access(p, os.X_OK):
+                    return p
+
+        # 4. Puppeteer / Playwright 缓存
         for cache in (
             os.path.join(home, ".cache", "puppeteer", "chrome"),
             os.path.join(home, ".cache", "ms-playwright"),
@@ -621,8 +650,18 @@ def get_stealth_browser(
     with _browser_lock:
         if profile_name in _browsers:
             browser = _browsers[profile_name]
+            # Bug Fix: 检测浏览器是否已崩溃，如果崩溃则清理并重建
             if browser._started and browser._ensure_page():
                 return browser
+            else:
+                # 浏览器已崩溃或未启动，清理旧实例
+                logger.info(f"浏览器实例失效 (profile={profile_name})，正在重建...")
+                try:
+                    if browser._browser:
+                        browser._browser.quit()
+                except Exception:
+                    pass
+                del _browsers[profile_name]
 
         browser = StealthBrowser(profile_name=profile_name, headless=headless)
         _browsers[profile_name] = browser

package/main.py

@@ -68,9 +68,11 @@ def _get_screen_resolution() -> tuple[int, int]:
             if "dimensions:" in line:
                 parts = line.split()
                 for p in parts:
-                    if "x" in p:
-                        w, h = p.split("x")
-                        return int(w), int(h)
+                    # Bug Fix: 使用更严格的正则匹配分辨率格式 (数字x数字)
+                    import re as _re
+                    m = _re.match(r"^(\d+)x(\d+)$", p)
+                    if m:
+                        return int(m.group(1)), int(m.group(2))
     except Exception:
         pass
     return 1920, 1080
@@ -145,6 +147,9 @@ class MyAgentApp:
         # 权限管理器
         self.permission_manager: PermissionManager | None = None
 
+        # Bug Fix: _running_service 必须在 __init__ 初始化，否则托盘菜单访问时 AttributeError
+        self._running_service = False
+
         # 交互式会话
         self._session_id = "cli_default"
 
@@ -583,11 +588,15 @@ class MyAgentApp:
 
         # 处理消息
         # [v1.20.13] 使用会话级锁防止并发处理同一会话
+        # Bug Fix: 使用 try_acquire 模式避免 locked() + acquire 的 TOCTOU 竞争
         session_lock = await self._get_session_lock(session_id)
-        if session_lock.locked():
+        if not session_lock.acquire(blocking=False):
             return  # 同一会话正在处理中，跳过（聊天平台消息有去重机制）
-        async with session_lock:
+        try:
             response_text = await self.process_message(message.text, session_id)
+        finally:
+            session_lock.release()
+            self._cleanup_session_locks()
 
         # [v1.20.8] 将回复中的相对路径文件链接替换为绝对 URL
         # (file_send 生成的 /api/file/xxx 链接在 Telegram/Discord 等外部平台无法访问)
@@ -799,7 +808,8 @@ class MyAgentApp:
         for perm in config.get("all_permissions", []):
             label = labels.get(perm, perm)
             status = "✅ 开启" if defaults.get(perm, False) else "❌ 关闭"
-            print(f"    {label:　<8} ({perm}): {status}")
+            # Bug Fix: 使用 ASCII 空格而非 Unicode Ideographic Space (U+3000) 进行填充
+            print(f"    {label:<8} ({perm}): {status}")
         print()
 
         # Per-agent 覆盖
@@ -828,11 +838,27 @@ class MyAgentApp:
         print("  (提示: 使用 'session <名称>' 切换会话)")
         print()
 
+    def _cleanup_session_locks(self):
+        """清理过期的会话锁，防止内存泄漏。保留最近 100 个会话锁。"""
+        if len(self._session_locks) > 100:
+            # 按 FIFO 顺序移除最旧的锁
+            keys = list(self._session_locks.keys())
+            for k in keys[:len(keys) - 100]:
+                del self._session_locks[k]
+
     async def shutdown(self):
         """关闭所有组件"""
         self.logger.info("MyAgent 正在关闭...")
         self._running = False
 
+        # Bug Fix: 关闭所有反检测浏览器实例，避免 Chrome 进程残留
+        try:
+            from aiskills.browser_stealth import close_stealth_browser
+            close_stealth_browser(profile_name="")
+            self.logger.info("已关闭所有反检测浏览器实例")
+        except Exception as e:
+            self.logger.debug(f"关闭反检测浏览器时出错: {e}")
+
         if self.communication_manager:
             await self.communication_manager.stop()
 
@@ -848,6 +874,9 @@ class MyAgentApp:
         if self.memory:
             self.memory.close()
 
+        # 清理会话锁
+        self._session_locks.clear()
+
         self.logger.info("MyAgent 已关闭")
 
 

package/package.json

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