myagent-ai 1.30.0 → 1.31.0

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 自动发现）─────────────────────
 
 
@@ -607,15 +669,15 @@ class StealthBrowserStartSkill(Skill):
     name = "stealth_browser_start"
     description = (
         "启动反检测浏览器 — 使用 DrissionPage 启动带有反检测能力的 Chromium 浏览器，"
-        "适合需要登录的网站操作（Google/X.com/微博/抖音等）。"
-        "每个网站使用独立 Profile，登录状态自动保持。"
+        "适合需要登录的网站操作。每个网站使用独立 Profile，登录状态自动保持。"
+        "使用 site-manage list 查看所有可用网站。"
     )
     category = "browser_stealth"
     parameters = [
         SkillParameter(
             name="profile",
             type="string",
-            description="Profile 名称（预置: google/gmail/x_com/weibo/wechat_mp/douyin/mail139/bilibili/github）",
+            description="Profile 名称（使用 site-manage list 查看可用网站）",
             required=False,
             default="default",
         ),
@@ -630,7 +692,8 @@ class StealthBrowserStartSkill(Skill):
     dangerous = False
 
     async def execute(self, profile: str = "default", headless: bool = False, **kw) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile, headless=headless)
+        # Bug Fix: get_stealth_browser 是同步函数，不能用 await
+        browser = get_stealth_browser(profile_name=profile, headless=headless)
         return await browser.start()
 
 
@@ -646,7 +709,7 @@ class StealthBrowserNavigateSkill(Skill):
     ]
 
     async def execute(self, url: str, profile: str = "default", **kw) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         if not browser._started:
             r = await browser.start()
             if not r.success:
@@ -666,7 +729,7 @@ class StealthBrowserClickSkill(Skill):
     ]
 
     async def execute(self, selector: str, profile: str = "default", **kw) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         return await browser.click(selector)
 
 
@@ -686,7 +749,7 @@ class StealthBrowserFillSkill(Skill):
     async def execute(
         self, selector: str, value: str, clear: bool = True, profile: str = "default", **kw
     ) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         return await browser.fill(selector, value, clear=clear)
 
 
@@ -702,7 +765,7 @@ class StealthBrowserScreenshotSkill(Skill):
     ]
 
     async def execute(self, save_path: str = "", profile: str = "default", **kw) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         return await browser.screenshot(save_path=save_path)
 
 
@@ -718,7 +781,7 @@ class StealthBrowserEvalSkill(Skill):
     ]
 
     async def execute(self, script: str, profile: str = "default", **kw) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         return await browser.evaluate(script)
 
 
@@ -733,7 +796,7 @@ class StealthBrowserGetContentSkill(Skill):
     ]
 
     async def execute(self, profile: str = "default", **kw) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         return await browser.get_content()
 
 
@@ -759,7 +822,7 @@ class StealthBrowserCookieSkill(Skill):
     ]
 
     async def execute(self, action: str, profile: str = "default", **kw) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         if action == "save":
             return await browser.save_cookies()
         elif action == "load":
@@ -783,7 +846,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="浏览器已关闭")
 
 
@@ -818,7 +882,7 @@ class StealthBrowserWaitManualSkill(Skill):
     async def execute(
         self, reason: str = "验证码", timeout: int = 300, profile: str = "default", **kw
     ) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         return await browser.wait_for_manual(reason=reason, timeout=float(timeout))
 
 
@@ -837,10 +901,149 @@ class StealthBrowserWaitSkill(Skill):
     async def execute(
         self, selector: str, timeout: int = 10, profile: str = "default", **kw
     ) -> SkillResult:
-        browser = await get_stealth_browser(profile_name=profile)
+        browser = get_stealth_browser(profile_name=profile)
         return await browser.wait_for(selector, timeout=float(timeout))
 
 
+# ── Site Registry 管理技能 (v1.31.0) ────────────────────
+
+
+class SiteManageListSkill(Skill):
+    """列出所有已注册网站"""
+
+    name = "site_manage_list"
+    description = "列出所有已注册网站 — 显示网站名称、分类、登录 URL 和 Profile 状态"
+    category = "browser_stealth"
+    parameters = [
+        SkillParameter(
+            name="category",
+            type="string",
+            description="按分类筛选（空=全部）",
+            required=False,
+            default="",
+        ),
+    ]
+
+    async def execute(self, category: str = "", **kw) -> SkillResult:
+        from core.site_registry import get_site_registry
+        reg = get_site_registry()
+        sites = reg.list_sites(category=category)
+        summary = reg.to_summary()
+
+        return SkillResult(
+            success=True,
+            message=f"共 {len(sites)} 个网站" + (f" (分类: {category})" if category else ""),
+            data={"sites": sites, "summary": {k: v for k, v in summary.items() if k != "sites"}},
+            output=json.dumps(sites, ensure_ascii=False, indent=2),
+        )
+
+
+class SiteManageShowSkill(Skill):
+    """显示网站详细配置"""
+
+    name = "site_manage_show"
+    description = "显示网站详细配置 — 查看网站的登录 URL、可用页面和操作提示"
+    category = "browser_stealth"
+    parameters = [
+        SkillParameter(name="name", type="string", description="网站名称", required=True),
+    ]
+
+    async def execute(self, name: str, **kw) -> SkillResult:
+        from core.site_registry import get_site_registry
+        reg = get_site_registry()
+        site = reg.get_site(name)
+        if not site:
+            return SkillResult(success=False, error=f"网站不存在: {name}")
+
+        return SkillResult(
+            success=True,
+            message=f"网站: {site.get('display_name', name)}",
+            data=site,
+            output=json.dumps(site, ensure_ascii=False, indent=2),
+        )
+
+
+class SiteManageAddSkill(Skill):
+    """添加自定义网站"""
+
+    name = "site_manage_add"
+    description = (
+        "添加自定义网站 — 为新网站创建配置，后续可用 stealth-open 登录。"
+        "需提供 name（英文标识）、login_url（登录页）和 display_name（显示名称）。"
+    )
+    category = "browser_stealth"
+    parameters = [
+        SkillParameter(name="name", type="string", description="网站名称（英文，如 my_site）", required=True),
+        SkillParameter(name="display_name", type="string", description="显示名称", required=False, default=""),
+        SkillParameter(name="login_url", type="string", description="登录页 URL", required=False, default=""),
+        SkillParameter(name="home_url", type="string", description="首页 URL", required=False, default=""),
+        SkillParameter(name="category", type="string", description="分类", required=False, default="custom"),
+    ]
+
+    async def execute(
+        self, name: str, display_name: str = "", login_url: str = "",
+        home_url: str = "", category: str = "custom", **kw
+    ) -> SkillResult:
+        from core.site_registry import get_site_registry
+        reg = get_site_registry()
+        try:
+            site = reg.add_site({
+                "name": name,
+                "display_name": display_name or name,
+                "login_url": login_url,
+                "home_url": home_url,
+                "category": category,
+            })
+            return SkillResult(
+                success=True,
+                message=f"已添加网站: {name}",
+                data=site,
+            )
+        except ValueError as e:
+            return SkillResult(success=False, error=str(e))
+
+
+class SiteManageRemoveSkill(Skill):
+    """删除自定义网站"""
+
+    name = "site_manage_remove"
+    description = "删除自定义网站（内置网站不可删除）"
+    category = "browser_stealth"
+    parameters = [
+        SkillParameter(name="name", type="string", description="网站名称", required=True),
+    ]
+
+    async def execute(self, name: str, **kw) -> SkillResult:
+        from core.site_registry import get_site_registry
+        reg = get_site_registry()
+        ok = reg.remove_site(name)
+        if ok:
+            return SkillResult(success=True, message=f"已删除网站: {name}")
+        return SkillResult(
+            success=False,
+            error=f"删除失败: {name}（内置网站不可删除，或网站不存在）",
+        )
+
+
+class SiteManageInitSkill(Skill):
+    """批量初始化网站 Profile"""
+
+    name = "site_manage_init"
+    description = "批量初始化所有网站的浏览器 Profile（仅创建目录，不自动登录）"
+    category = "browser_stealth"
+    parameters = []
+
+    async def execute(self, **kw) -> SkillResult:
+        from core.site_registry import get_site_registry
+        reg = get_site_registry()
+        initialized = reg.init_profiles()
+        return SkillResult(
+            success=True,
+            message=f"已初始化 {len(initialized)} 个网站的 Profile",
+            data={"initialized": initialized, "count": len(initialized)},
+        )
+
+
 # ── Profile 管理技能 ──────────────────────────────────────
 
 

package/aiskills/registry.py

@@ -206,6 +206,9 @@ CLI_COMMANDS: List[Dict[str, Any]] = [
      "description": "创建浏览器 Profile"},
     {"name": "profile-delete", "category": "stealth", "cli": "myagent-ai profile-delete <name>",
      "description": "删除浏览器 Profile"},
+    # ── Site 管理 (v1.31.0) ──
+    {"name": "site-manage", "category": "stealth", "cli": "myagent-ai site-manage <list|show|add|remove|init> [args]",
+     "description": "网站注册管理 — 列出/查看/添加/删除/初始化网站配置（支持 20+ 内置网站和动态扩展）"},
     # ── GUI 桌面 ──
     {"name": "screenshot", "category": "gui", "cli": "myagent-ai screenshot [region] [-m monitor]",
      "description": "屏幕截图（仅 Windows/macOS）"},