myagent-ai 1.30.0 → 1.30.1

package/aiskills/browser_stealth.py

@@ -33,6 +33,7 @@ import asyncio
 import json
 import os
 import shutil
+import threading
 import time
 from pathlib import Path
 from typing import Any, Dict, List, Optional
@@ -89,7 +90,9 @@ class StealthBrowser:
         mgr = get_browser_profile_manager()
         profile = mgr.get_profile(self.profile_name)
         profile.ensure_dirs()
-        self._user_data_dir = str(profile.user_data_dir)
+        # DrissionPage 的 set_user_data_path 会自动在路径下创建 Default 目录
+        # 我们直接用 profile_dir 作为 user-data-dir，避免嵌套
+        self._user_data_dir = str(profile.profile_dir)
         return self._user_data_dir
 
     async def start(self) -> SkillResult:
@@ -107,8 +110,9 @@ class StealthBrowser:
             co = ChromiumOptions()
 
             # 设置用户数据目录（Profile 持久化）
+            # 注意：只用 set_argument，不用 set_user_data_path，因为后者会
+            # 在路径下再套一层 Default/ 子目录，导致路径混乱
             if user_data:
-                co.set_user_data_path(user_data)
                 co.set_argument(f"--user-data-dir={user_data}")
 
             # 反检测核心参数
@@ -120,20 +124,16 @@ class StealthBrowser:
             co.set_argument("--disable-infobars")
             co.set_argument("--disable-extensions")
 
-            # VNC/容器环境适配
-            if os.environ.get("DISPLAY"):
-                co.set_argument(f"--display={os.environ['DISPLAY']}")
+            # 容器环境（无论有无 DISPLAY 都加上，避免切换环境后出错）
+            co.set_argument("--no-sandbox")
+            co.set_argument("--disable-setuid-sandbox")
+            co.set_argument("--disable-dev-shm-usage")
+            co.set_argument("--disable-gpu")
 
             # 无头模式
             if self._headless:
                 co.headless()
 
-            # 容器环境
-            if not os.environ.get("DISPLAY"):
-                co.set_argument("--no-sandbox")
-                co.set_argument("--disable-setuid-sandbox")
-                co.set_argument("--disable-gpu")
-
             # 自动检测浏览器路径
             browser_path = self._detect_browser()
             if browser_path:
@@ -146,17 +146,27 @@ class StealthBrowser:
             self._browser = Chromium(co)
             self._page = self._browser.latest_tab
 
+            # 如果浏览器已崩溃或无法获取 tab
+            if not self._page:
+                return SkillResult(
+                    success=False,
+                    error="启动浏览器后无法获取页面标签（Chrome 可能未正确启动）",
+                )
+
             # 隐藏 webdriver 标志（额外注入）
             try:
-                self._page.run_js("""
-                    Object.defineProperty(navigator, 'webdriver', {get: () => undefined});
-                    Object.defineProperty(navigator, 'plugins', {get: () => [1, 2, 3, 4, 5]});
-                    Object.defineProperty(navigator, 'languages', {get: () => ['zh-CN', 'zh', 'en']});
-                    window.chrome = {runtime: {}};
-                """)
+                self._page.run_js(
+                    "Object.defineProperty(navigator,'webdriver',{get:()=>undefined});"
+                    "Object.defineProperty(navigator,'plugins',{get:()=>[1,2,3,4,5]});"
+                    "Object.defineProperty(navigator,'languages',{get:()=>['zh-CN','zh','en']});"
+                    "window.chrome={runtime:{}};"
+                )
             except Exception as e:
                 logger.debug(f"反检测 JS 注入提示: {e}")
 
+            # 等待浏览器完全就绪
+            time.sleep(1)
+
             self._started = True
             logger.info(
                 f"反检测浏览器已启动 (profile={self.profile_name}, "
@@ -177,17 +187,18 @@ class StealthBrowser:
 
     async def close(self) -> SkillResult:
         """关闭浏览器"""
+        self._started = False
         try:
             if self._browser:
                 self._browser.quit()
                 self._browser = None
                 self._page = None
-                self._started = False
                 logger.info("反检测浏览器已关闭")
                 return SkillResult(success=True, message="浏览器已关闭")
         except Exception as e:
             logger.error(f"关闭浏览器异常: {e}")
-        self._started = False
+            self._browser = None
+            self._page = None
         return SkillResult(success=True, message="浏览器已关闭")
 
     async def navigate(self, url: str, wait: float = 2.0) -> SkillResult:
@@ -198,7 +209,7 @@ class StealthBrowser:
         try:
             self._page.get(url)
             if wait > 0:
-                time.sleep(wait)
+                await asyncio.sleep(wait)
 
             title = self._page.title or ""
             current_url = self._page.url or ""
@@ -225,7 +236,7 @@ class StealthBrowser:
                 )
             ele.click()
             if wait > 0:
-                time.sleep(wait)
+                await asyncio.sleep(wait)
             return SkillResult(success=True, message=f"已点击: {selector}")
         except Exception as e:
             return SkillResult(success=False, error=f"点击失败: {e}")
@@ -248,7 +259,7 @@ class StealthBrowser:
                 ele.clear()
             ele.input(value)
             if wait > 0:
-                time.sleep(wait)
+                await asyncio.sleep(wait)
             return SkillResult(
                 success=True,
                 message=f"已填写 {selector}: {value[:50]}{'...' if len(value) > 50 else ''}",
@@ -303,7 +314,17 @@ class StealthBrowser:
             return SkillResult(success=False, error="浏览器未启动")
 
         try:
-            text = self._page.text or ""
+            # Bug Fix: DrissionPage 没有 page.text 属性
+            # 需要通过 page.ele('tag:html').text 获取页面文本
+            try:
+                text = self._page.ele('tag:html').text or ""
+            except Exception:
+                # 降级：用 BS4 从 html 提取文本
+                try:
+                    from bs4 import BeautifulSoup
+                    text = BeautifulSoup(self._page.html or "", "html.parser").get_text(strip=True, separator="\n")
+                except Exception:
+                    text = ""
             title = self._page.title or ""
             url = self._page.url or ""
 
@@ -375,16 +396,21 @@ class StealthBrowser:
             return SkillResult(success=False, error="浏览器未启动")
 
         try:
+            # DrissionPage cookies() 返回 CookiesList（list 子类），每项是 dict
             cookies = self._page.cookies()
             cookie_list = []
             if cookies:
                 for c in cookies:
-                    cookie_list.append({
-                        "name": c.get("name", ""),
-                        "value": c.get("value", ""),
-                        "domain": c.get("domain", ""),
-                        "path": c.get("path", "/"),
-                    })
+                    # CookiesList 中的每项是 dict，但 key 可能不全
+                    if isinstance(c, dict):
+                        cookie_list.append({
+                            "name": c.get("name", ""),
+                            "value": c.get("value", ""),
+                            "domain": c.get("domain", ""),
+                            "path": c.get("path", "/"),
+                        })
+                    else:
+                        cookie_list.append(str(c))
 
             return SkillResult(
                 success=True,
@@ -404,10 +430,15 @@ class StealthBrowser:
             cookie_list = []
             if cookies:
                 for c in cookies:
-                    cookie_list.append(dict(c))
+                    # CookiesList 中每项是 dict，确保可序列化
+                    if isinstance(c, dict):
+                        cookie_list.append(dict(c))
+                    else:
+                        cookie_list.append(str(c))
 
             from core.browser_profile import get_browser_profile_manager
             mgr = get_browser_profile_manager()
+            # 保存时用 profile_name 对应的原始 BrowserProfile（不加 user_data 子路径）
             profile = mgr.get_profile(self.profile_name)
             profile.save_cookies(cookie_list)
 
@@ -430,6 +461,8 @@ class StealthBrowser:
             cookies = profile.load_cookies()
 
             if cookies:
+                # Bug Fix: page.set.cookies 是 CookiesSetter 对象（可调用）
+                # 直接调用 page.set.cookies(cookies_list) 即可
                 self._page.set.cookies(cookies)
                 return SkillResult(
                     success=True,
@@ -449,7 +482,13 @@ class StealthBrowser:
             return SkillResult(success=False, error="浏览器未启动")
 
         try:
-            self._page.clear_cookies()
+            # Bug Fix: DrissionPage 没有 page.clear_cookies() 方法
+            # 正确方式是 page.set.cookies.clear() 或 page.clear_cache()
+            try:
+                self._page.set.cookies.clear()
+            except Exception:
+                self._page.clear_cache(cookies=True)
+
             from core.browser_profile import get_browser_profile_manager
             mgr = get_browser_profile_manager()
             profile = mgr.get_profile(self.profile_name)
@@ -479,13 +518,17 @@ class StealthBrowser:
         )
         logger.info(f"[{self.profile_name}] 等待用户手动操作: {reason}")
 
-        # 简单的等待机制：轮询页面变化
+        # Bug Fix: 使用 asyncio.sleep 避免阻塞事件循环
         start = time.time()
         last_url = self._page.url if self._page else ""
+        poll_interval = 3
         while time.time() - start < timeout:
-            time.sleep(3)
+            await asyncio.sleep(poll_interval)
             if self._page:
-                current_url = self._page.url or ""
+                try:
+                    current_url = self._page.url or ""
+                except Exception:
+                    break  # 浏览器已关闭
                 # 如果 URL 发生变化，说明用户完成了操作
                 if current_url != last_url and current_url:
                     elapsed = int(time.time() - start)
@@ -506,11 +549,13 @@ class StealthBrowser:
         if not self._started or not self._page:
             return False
         try:
-            # 检查页面是否仍然有效
+            # 检查页面是否仍然有效（try 访问 url，如果浏览器已崩溃会抛异常）
             _ = self._page.url
             return True
         except Exception:
-            self._started = False
+            # 不要在这里重置 _started，由 close() 方法负责
+            # 避免在异步上下文中误判
+            logger.debug(f"页面检查失败 (profile={self.profile_name})，浏览器可能已关闭")
             return False
 
     @staticmethod
@@ -560,10 +605,10 @@ class StealthBrowser:
 # ── 全局浏览器实例管理 ──────────────────────────────────────
 
 _browsers: Dict[str, StealthBrowser] = {}
-_browser_lock = asyncio.Lock()
+_browser_lock = threading.Lock()
 
 
-async def get_stealth_browser(
+def get_stealth_browser(
     profile_name: str = "default",
     headless: bool = False,
 ) -> StealthBrowser:
@@ -571,8 +616,9 @@ async def get_stealth_browser(
     获取反检测浏览器实例（按 profile_name 复用）。
 
     同一 profile 名称返回相同实例，避免重复启动。
+    Bug Fix: 改用同步锁 + 同步返回，避免在非 async 上下文中死锁。
     """
-    async with _browser_lock:
+    with _browser_lock:
         if profile_name in _browsers:
             browser = _browsers[profile_name]
             if browser._started and browser._ensure_page():
@@ -583,21 +629,37 @@ async def get_stealth_browser(
         return browser
 
 
-async def close_stealth_browser(profile_name: str = "") -> None:
-    """关闭浏览器实例"""
-    async with _browser_lock:
+def close_stealth_browser(profile_name: str = "") -> None:
+    """关闭浏览器实例（同步版本）"""
+    with _browser_lock:
         if profile_name and profile_name in _browsers:
-            await _browsers[profile_name].close()
+            browser = _browsers[profile_name]
+            # 同步调用内部关闭逻辑
+            browser._started = False
+            try:
+                if browser._browser:
+                    browser._browser.quit()
+            except Exception:
+                pass
+            browser._browser = None
+            browser._page = None
             del _browsers[profile_name]
         elif not profile_name:
             for name, browser in _browsers.items():
                 try:
-                    await browser.close()
+                    browser._started = False
+                    if browser._browser:
+                        browser._browser.quit()
                 except Exception:
                     pass
             _browsers.clear()
 
 
+async def close_stealth_browser_async(profile_name: str = "") -> None:
+    """关闭浏览器实例（异步版本，供 async 上下文调用）"""
+    close_stealth_browser(profile_name)
+
+
 # ── 技能类（供 SkillRegistry 自动发现）─────────────────────
 
 
@@ -783,7 +845,8 @@ class StealthBrowserCloseSkill(Skill):
     ]
 
     async def execute(self, profile: str = "", **kw) -> SkillResult:
-        await close_stealth_browser(profile_name=profile)
+        # close_stealth_browser 现在是同步函数，直接调用
+        close_stealth_browser(profile_name=profile)
         return SkillResult(success=True, message="浏览器已关闭")
 
 

package/core/browser_profile.py

@@ -141,8 +141,14 @@ class BrowserProfile:
         self.profile_dir.mkdir(parents=True, exist_ok=True)
 
     def is_initialized(self) -> bool:
-        """检查 Profile 是否已初始化（有 user_data 目录）"""
-        return self.user_data_dir.is_dir()
+        """检查 Profile 是否已初始化（有 profile 目录且包含浏览器数据）"""
+        if not self.profile_dir.is_dir():
+            return False
+        # 检查目录下是否有实际内容（不空）
+        try:
+            return any(self.profile_dir.iterdir())
+        except OSError:
+            return False
 
     def get_size_mb(self) -> float:
         """获取 Profile 占用空间（MB）"""

package/main.py

@@ -427,25 +427,28 @@ class MyAgentApp:
             self.skill_registry.register(skill_cls())
 
         # ── 反检测浏览器技能 (DrissionPage — v1.30.0) ──
-        from aiskills.browser_stealth import (
-            StealthBrowserStartSkill, StealthBrowserNavigateSkill,
-            StealthBrowserClickSkill, StealthBrowserFillSkill,
-            StealthBrowserScreenshotSkill, StealthBrowserEvalSkill,
-            StealthBrowserGetContentSkill, StealthBrowserCookieSkill,
-            StealthBrowserCloseSkill, StealthBrowserWaitManualSkill,
-            StealthBrowserWaitSkill,
-            BrowserProfileListSkill, BrowserProfileCreateSkill, BrowserProfileDeleteSkill,
-        )
-        for skill_cls in [
-            StealthBrowserStartSkill, StealthBrowserNavigateSkill,
-            StealthBrowserClickSkill, StealthBrowserFillSkill,
-            StealthBrowserScreenshotSkill, StealthBrowserEvalSkill,
-            StealthBrowserGetContentSkill, StealthBrowserCookieSkill,
-            StealthBrowserCloseSkill, StealthBrowserWaitManualSkill,
-            StealthBrowserWaitSkill,
-            BrowserProfileListSkill, BrowserProfileCreateSkill, BrowserProfileDeleteSkill,
-        ]:
-            self.skill_registry.register(skill_cls())
+        try:
+            from aiskills.browser_stealth import (
+                StealthBrowserStartSkill, StealthBrowserNavigateSkill,
+                StealthBrowserClickSkill, StealthBrowserFillSkill,
+                StealthBrowserScreenshotSkill, StealthBrowserEvalSkill,
+                StealthBrowserGetContentSkill, StealthBrowserCookieSkill,
+                StealthBrowserCloseSkill, StealthBrowserWaitManualSkill,
+                StealthBrowserWaitSkill,
+                BrowserProfileListSkill, BrowserProfileCreateSkill, BrowserProfileDeleteSkill,
+            )
+            for skill_cls in [
+                StealthBrowserStartSkill, StealthBrowserNavigateSkill,
+                StealthBrowserClickSkill, StealthBrowserFillSkill,
+                StealthBrowserScreenshotSkill, StealthBrowserEvalSkill,
+                StealthBrowserGetContentSkill, StealthBrowserCookieSkill,
+                StealthBrowserCloseSkill, StealthBrowserWaitManualSkill,
+                StealthBrowserWaitSkill,
+                BrowserProfileListSkill, BrowserProfileCreateSkill, BrowserProfileDeleteSkill,
+            ]:
+                self.skill_registry.register(skill_cls())
+        except ImportError as e:
+            self.logger.warning(f"反检测浏览器技能注册跳过（DrissionPage 未安装）: {e}")
 
         # ── [v1.22.0] 内置平台工具不再注册存根 ──
         # command, recall_memory, file_send, playaudio, playvideo, web_control

package/package.json

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

package/scripts/cli.py

@@ -859,7 +859,8 @@ async def cmd_stealth_close(args):
     a = p.parse_args(args)
 
     from aiskills.browser_stealth import close_stealth_browser
-    await close_stealth_browser(profile_name=a.profile)
+    # close_stealth_browser 现在是同步函数
+    close_stealth_browser(profile_name=a.profile)
     print("反检测浏览器已关闭")
 
 

package/worklog.md

@@ -1,4 +1,29 @@
 ---
+Task ID: [20260421-01]
+Agent: Main Agent
+Task: 反检测浏览器集成 - Phase 2 网站专用技能 (v1.30.0)
+
+Work Log:
+- 检查现有实现状态：browser_stealth.py + browser_profile.py + CLI + SKILL.md 已在之前的会话中完成
+- 修复 main.py _register_builtin_skills()：添加 13 个 stealth browser 技能类注册
+- 创建 6 个网站专用 SKILL.md 操作指南：
+  * aiskills/site-gmail/SKILL.md — Gmail 收发邮件、搜索、附件
+  * aiskills/site-x-com/SKILL.md — X.com 发推、回复、搜索、点赞
+  * aiskills/site-weibo/SKILL.md — 微博发帖、转发、评论、搜索
+  * aiskills/site-wechat-mp/SKILL.md — 微信公众号扫码登录、图文发布
+  * aiskills/site-douyin/SKILL.md — 抖音浏览、搜索、发布视频、评论
+  * aiskills/site-mail139/SKILL.md — 139邮箱收发邮件、搜索
+- 更新版本号 1.29.0 → 1.30.0
+- Git commit + push + npm publish
+
+Stage Summary:
+- 修复: stealth browser 技能类注册到 SkillRegistry
+- 新增: 6 个网站操作 SKILL.md 指南 (约 20KB 内容)
+- 发布: myagent-ai@1.30.0 (npm + GitHub)
+- 架构: LLM → command 工具 → stealth-* CLI → DrissionPage → 各网站
+
+---
+
 Task ID: [20260420-04]
 Agent: Main Agent
 Task: 发布 npm 包 myagent-ai v1.26.0