myagent-ai 1.31.1 → 1.31.3

package/package.json

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

package/web/api_server.py

@@ -224,6 +224,9 @@ class ApiServer:
         self._model_chain_lock = asyncio.Lock()
         self._setup_routes()
         self._runner: Optional[web.AppRunner] = None
+        # [v1.31.1] Agent 初始化锁：防止并发请求重复创建全权Agent和配置助手
+        self._agents_initialized = False
+        self._agents_init_lock = asyncio.Lock()
 
     # ── 统一热更新辅助方法 ──
     def _hot_reload_llm(self):
@@ -492,6 +495,18 @@ class ApiServer:
         r.add_get(r"/api/departments/{path:[\w%/-]+}", self.handle_get_dept)
         r.add_put(r"/api/departments/{path:[\w%/-]+}", self.handle_update_dept)
         r.add_delete(r"/api/departments/{path:[\w%/-]+}", self.handle_delete_dept)
+        # ── 网站管理 (SiteRegistry) ──
+        r.add_get("/api/sites", self.handle_list_sites)
+        r.add_get("/api/sites/categories", self.handle_site_categories)
+        r.add_get("/api/sites/{name}", self.handle_get_site)
+        r.add_post("/api/sites", self.handle_add_site)
+        r.add_put("/api/sites/{name}", self.handle_update_site)
+        r.add_delete("/api/sites/{name}", self.handle_remove_site)
+        r.add_post("/api/sites/{name}/init-profile", self.handle_init_site_profile)
+        r.add_get("/api/sites/profiles", self.handle_list_profiles)
+        r.add_delete("/api/sites/profiles/{name}", self.handle_delete_profile)
+        r.add_post("/api/sites/{name}/open-browser", self.handle_open_site_browser)
+        r.add_post("/api/sites/{name}/close-browser", self.handle_close_site_browser)
         # ── 任务持久化 ──
         r.add_get("/api/tasks", self.handle_list_tasks)
         r.add_post("/api/tasks/{task_id}/retry", self.handle_retry_task)
@@ -3169,8 +3184,26 @@ window.addEventListener('beforeunload', function() {{
         """根据 agent ID 返回目录 (aid 如 '1', '2')"""
         return self._agents_dir() / aid
 
+    async def _ensure_agents_initialized(self):
+        """[v1.31.1] 异步安全地确保系统 Agent 只创建一次。
+        
+        使用 asyncio.Lock 防止并发请求导致重复创建。
+        """
+        if self._agents_initialized:
+            return
+        async with self._agents_init_lock:
+            if self._agents_initialized:
+                return
+            self._ensure_default_agent()
+            self._agents_initialized = True
+            logger.info("系统 Agent 初始化完成（全权Agent + 配置助手）")
+
     def _ensure_default_agent(self):
-        """确保默认 agent 存在（ID=1，名为「全权Agent」，目录名=1）"""
+        """确保默认 agent 存在（ID=1，名为「全权Agent」，目录名=1）
+        
+        [v1.31.1] 改为内部方法，由 _ensure_agents_initialized 统一调用。
+        不再由各个 API handler 单独调用，防止并发重复创建。
+        """
         aid = "1"
         ad = self._agent_dir(aid)
         if not (ad / "config.json").exists():
@@ -3417,7 +3450,7 @@ window.addEventListener('beforeunload', function() {{
 
     async def handle_list_agents(self, request):
         """GET /api/agents - 返回扁平 agent 列表（系统 agent 排在最前）"""
-        self._ensure_default_agent()
+        await self._ensure_agents_initialized()
         agents = self._scan_agents_flat()
         # 统计会话数
         if self.core.memory:
@@ -3437,7 +3470,7 @@ window.addEventListener('beforeunload', function() {{
 
     async def handle_agents_tree(self, request):
         """GET /api/agents/tree - 返回树形结构（系统 agent 排在最前）"""
-        self._ensure_default_agent()
+        await self._ensure_agents_initialized()
         agents_flat = self._scan_agents_flat()
         # 统计会话数
         if self.core.memory:
@@ -3461,7 +3494,7 @@ window.addEventListener('beforeunload', function() {{
 
     async def handle_create_agent(self, request):
         """POST /api/agents - 创建顶级 agent"""
-        self._ensure_default_agent()
+        await self._ensure_agents_initialized()
         data = await request.json()
         name = data.get("name", "").strip()
         if not name:
@@ -3534,7 +3567,7 @@ window.addEventListener('beforeunload', function() {{
     async def handle_create_child(self, request):
         """POST /api/agents/{parent}/children - 创建子 agent"""
         parent_path = request.match_info["name"]
-        self._ensure_default_agent()
+        await self._ensure_agents_initialized()
 
         parent_cfg = self._read_agent_config(parent_path)
         if not parent_cfg:
@@ -4926,10 +4959,14 @@ window.addEventListener('beforeunload', function() {{
             return web.json_response({"builtin_tools": [], "cli_commands": [], "python_skills": [], "skill_guides": []})
 
         view = request.query.get("view", "")
-        if view == "categorized":
-            return web.json_response(self.core.skill_registry.list_skills_by_category())
-        # 默认：向后兼容的扁平列表
-        return web.json_response(self.core.skill_registry.list_skills_info())
+        try:
+            if view == "categorized":
+                return web.json_response(self.core.skill_registry.list_skills_by_category())
+            # 默认：向后兼容的扁平列表
+            return web.json_response(self.core.skill_registry.list_skills_info())
+        except Exception as e:
+            logger.error(f"list_skills 失败: {e}", exc_info=True)
+            return web.json_response({"error": f"获取技能列表失败: {e}"}, status=500)
 
     async def handle_get_skill(self, request):
         """GET /api/skills/{name} - 获取单个技能/工具详情
@@ -4938,44 +4975,48 @@ window.addEventListener('beforeunload', function() {{
         """
         name = request.match_info["name"]
 
-        # 1. 从 SkillRegistry 查找（Python 技能 + Markdown 技能指南 + 旧版存根）
-        if self.core.skill_registry:
-            s = self.core.skill_registry._skills.get(name)
-            if s:
-                info = s.to_openclaw_format()
-                info["disabled"] = self.core.skill_registry._is_disabled(name)
-                return web.json_response(info)
-
-        # 2. 从 BUILTIN_TOOLS 元数据查找（内置平台工具）
-        from aiskills.registry import BUILTIN_TOOLS, CLI_COMMANDS
-        for bt in BUILTIN_TOOLS:
-            if bt["name"] == name:
-                return web.json_response({
-                    "name": bt["name"],
-                    "description": bt["description"],
-                    "category": bt["category"],
-                    "parameters": bt["parameters"],
-                    "dangerous": False,
-                    "disabled": False,
-                    "skill_type": "builtin_platform",
-                    "note": f"由 {bt['handler']} 处理，不可禁用",
-                })
+        try:
+            # 1. 从 SkillRegistry 查找（Python 技能 + Markdown 技能指南 + 旧版存根）
+            if self.core.skill_registry:
+                s = self.core.skill_registry._skills.get(name)
+                if s:
+                    info = s.to_openclaw_format()
+                    info["disabled"] = self.core.skill_registry._is_disabled(name)
+                    return web.json_response(info)
+
+            # 2. 从 BUILTIN_TOOLS 元数据查找（内置平台工具）
+            from aiskills.registry import BUILTIN_TOOLS, CLI_COMMANDS
+            for bt in BUILTIN_TOOLS:
+                if bt["name"] == name:
+                    return web.json_response({
+                        "name": bt["name"],
+                        "description": bt["description"],
+                        "category": bt["category"],
+                        "parameters": bt["parameters"],
+                        "dangerous": False,
+                        "disabled": False,
+                        "skill_type": "builtin_platform",
+                        "note": f"由 {bt['handler']} 处理，不可禁用",
+                    })
 
-        # 3. [v1.23.0] 从 CLI_COMMANDS 查找
-        for cmd in CLI_COMMANDS:
-            if cmd["name"] == name or name in cmd.get("aliases", []):
-                return web.json_response({
-                    "name": cmd["name"],
-                    "description": cmd["description"],
-                    "category": cmd["category"],
-                    "cli": cmd.get("cli", ""),
-                    "aliases": cmd.get("aliases", []),
-                    "disabled": False,
-                    "skill_type": "cli_command",
-                    "note": "通过 command 工具调用: myagent-ai <name>",
-                })
+            # 3. [v1.23.0] 从 CLI_COMMANDS 查找
+            for cmd in CLI_COMMANDS:
+                if cmd["name"] == name or name in cmd.get("aliases", []):
+                    return web.json_response({
+                        "name": cmd["name"],
+                        "description": cmd["description"],
+                        "category": cmd["category"],
+                        "cli": cmd.get("cli", ""),
+                        "aliases": cmd.get("aliases", []),
+                        "disabled": False,
+                        "skill_type": "cli_command",
+                        "note": "通过 command 工具调用: myagent-ai <name>",
+                    })
 
-        return web.json_response({"error": "not found"}, status=404)
+            return web.json_response({"error": "not found"}, status=404)
+        except Exception as e:
+            logger.error(f"get_skill 失败 ({name}): {e}", exc_info=True)
+            return web.json_response({"error": f"获取技能 '{name}' 失败: {e}"}, status=500)
 
     async def handle_toggle_skill(self, request):
         """POST /api/skills/{name}/toggle - 启用/禁用技能
@@ -4984,25 +5025,29 @@ window.addEventListener('beforeunload', function() {{
         """
         name = request.match_info["name"]
         try:
-            data = await request.json()
-        except Exception:
-            data = {}
-        enabled = data.get("enabled", True)
-
-        # [v1.23.0] 内置平台工具和 CLI 命令不可禁用
-        from aiskills.registry import BUILTIN_TOOLS, CLI_COMMANDS
-        builtin_names = {bt["name"] for bt in BUILTIN_TOOLS}
-        cli_names = {c["name"] for c in CLI_COMMANDS}
-        if name in builtin_names:
-            return web.json_response({"error": f"内置平台工具 '{name}' 不可禁用"}, status=400)
-        if name in cli_names:
-            return web.json_response({"error": f"CLI 命令 '{name}' 不可禁用（由 command 工具统一管理）"}, status=400)
-
-        if self.core.skill_registry:
-            self.core.skill_registry.toggle(name, enabled)
-            # 持久化到配置文件
-            self._save_disabled_skills()
-        return web.json_response({"ok": True, "name": name, "enabled": enabled})
+            try:
+                data = await request.json()
+            except Exception:
+                data = {}
+            enabled = data.get("enabled", True)
+
+            # [v1.23.0] 内置平台工具和 CLI 命令不可禁用
+            from aiskills.registry import BUILTIN_TOOLS, CLI_COMMANDS
+            builtin_names = {bt["name"] for bt in BUILTIN_TOOLS}
+            cli_names = {c["name"] for c in CLI_COMMANDS}
+            if name in builtin_names:
+                return web.json_response({"error": f"内置平台工具 '{name}' 不可禁用"}, status=400)
+            if name in cli_names:
+                return web.json_response({"error": f"CLI 命令 '{name}' 不可禁用（由 command 工具统一管理）"}, status=400)
+
+            if self.core.skill_registry:
+                self.core.skill_registry.toggle(name, enabled)
+                # 持久化到配置文件
+                self._save_disabled_skills()
+            return web.json_response({"ok": True, "name": name, "enabled": enabled})
+        except Exception as e:
+            logger.error(f"toggle_skill 失败 ({name}): {e}", exc_info=True)
+            return web.json_response({"error": f"切换技能 '{name}' 状态失败: {e}"}, status=500)
 
     def _save_disabled_skills(self):
         """将禁用技能列表持久化到配置文件"""
@@ -5025,6 +5070,202 @@ window.addEventListener('beforeunload', function() {{
             if isinstance(disabled, list):
                 self.core.skill_registry.disabled_skills = set(disabled)
 
+    # --- Site Management (v1.31.1) ---
+
+    def _get_site_registry(self):
+        """获取 SiteRegistry 单例（懒加载）"""
+        if not hasattr(self, '_site_registry'):
+            from core.site_registry import get_site_registry
+            self._site_registry = get_site_registry()
+        return self._site_registry
+
+    def _get_browser_profile_manager(self):
+        """获取 BrowserProfileManager 单例（懒加载）"""
+        if not hasattr(self, '_browser_profile_mgr'):
+            from core.browser_profile import get_browser_profile_manager
+            self._browser_profile_mgr = get_browser_profile_manager()
+        return self._browser_profile_mgr
+
+    async def handle_list_sites(self, request):
+        """GET /api/sites - 列出所有网站（支持 ?category=xxx 筛选）"""
+        reg = self._get_site_registry()
+        category = request.query.get("category", "")
+        sites = reg.list_sites(category=category)
+        summary = reg.to_summary()
+        return web.json_response({
+            "sites": sites,
+            "summary": {
+                "total": summary["total"],
+                "builtin_count": summary["builtin_count"],
+                "custom_count": summary["custom_count"],
+            },
+        })
+
+    async def handle_site_categories(self, request):
+        """GET /api/sites/categories - 获取分类统计"""
+        reg = self._get_site_registry()
+        cats = reg.get_categories()
+        return web.json_response(cats)
+
+    async def handle_get_site(self, request):
+        """GET /api/sites/{name} - 获取单个网站详情"""
+        name = request.match_info["name"]
+        reg = self._get_site_registry()
+        site = reg.get_site(name)
+        if not site:
+            return web.json_response({"error": f"网站 '{name}' 不存在"}, status=404)
+        # 附加 Profile 信息
+        from core.browser_profile import get_browser_profile_manager
+        mgr = get_browser_profile_manager()
+        profile = mgr.get_profile(name)
+        site["profile"] = profile.to_dict()
+        return web.json_response(site)
+
+    async def handle_add_site(self, request):
+        """POST /api/sites - 添加自定义网站"""
+        try:
+            data = await request.json()
+        except Exception:
+            return web.json_response({"error": "无效的 JSON 请求体"}, status=400)
+
+        name = data.get("name", "").strip().lower().replace(" ", "_")
+        if not name:
+            return web.json_response({"error": "网站名称不能为空"}, status=400)
+        if not all(c.isalnum() or c in "_-" for c in name):
+            return web.json_response({"error": "网站名称只能包含字母、数字、下划线和连字符"}, status=400)
+
+        reg = self._get_site_registry()
+        try:
+            site = reg.add_site(data)
+            return web.json_response({"ok": True, "site": site})
+        except ValueError as e:
+            return web.json_response({"error": str(e)}, status=400)
+        except Exception as e:
+            logger.error(f"添加网站失败: {e}")
+            return web.json_response({"error": f"添加网站失败: {e}"}, status=500)
+
+    async def handle_update_site(self, request):
+        """PUT /api/sites/{name} - 更新网站配置"""
+        name = request.match_info["name"]
+        try:
+            data = await request.json()
+        except Exception:
+            return web.json_response({"error": "无效的 JSON 请求体"}, status=400)
+
+        reg = self._get_site_registry()
+        # 只允许更新部分字段
+        allowed = {"display_name", "category", "login_url", "detect_url", "home_url",
+                    "urls", "tips", "enabled"}
+        updates = {k: v for k, v in data.items() if k in allowed}
+
+        if not updates:
+            return web.json_response({"error": "没有可更新的字段"}, status=400)
+
+        site = reg.update_site(name, updates)
+        if not site:
+            return web.json_response({"error": f"网站 '{name}' 不存在"}, status=404)
+        return web.json_response({"ok": True, "site": site})
+
+    async def handle_remove_site(self, request):
+        """DELETE /api/sites/{name} - 删除自定义网站"""
+        name = request.match_info["name"]
+        reg = self._get_site_registry()
+        ok = reg.remove_site(name)
+        if not ok:
+            return web.json_response({"error": f"无法删除网站 '{name}'（内置网站不可删除）"}, status=400)
+        # 同时删除 Profile
+        from core.browser_profile import get_browser_profile_manager
+        mgr = get_browser_profile_manager()
+        mgr.delete_profile(name)
+        return web.json_response({"ok": True})
+
+    async def handle_init_site_profile(self, request):
+        """POST /api/sites/{name}/init-profile - 初始化网站浏览器 Profile"""
+        name = request.match_info["name"]
+        reg = self._get_site_registry()
+        site = reg.get_site(name)
+        if not site:
+            return web.json_response({"error": f"网站 '{name}' 不存在"}, status=404)
+        try:
+            initialized = reg.init_profiles([name])
+            return web.json_response({"ok": True, "initialized": initialized})
+        except Exception as e:
+            logger.error(f"初始化 Profile 失败 ({name}): {e}")
+            return web.json_response({"error": f"初始化失败: {e}"}, status=500)
+
+    async def handle_list_profiles(self, request):
+        """GET /api/sites/profiles - 列出所有已初始化的浏览器 Profile"""
+        from core.browser_profile import get_browser_profile_manager
+        mgr = get_browser_profile_manager()
+        profiles = mgr.list_profiles()
+        total_size = mgr.get_total_size_mb()
+        return web.json_response({
+            "profiles": profiles,
+            "total_size_mb": round(total_size, 2),
+        })
+
+    async def handle_delete_profile(self, request):
+        """DELETE /api/sites/profiles/{name} - 删除浏览器 Profile"""
+        name = request.match_info["name"]
+        from core.browser_profile import get_browser_profile_manager
+        mgr = get_browser_profile_manager()
+        ok = mgr.delete_profile(name)
+        if not ok:
+            return web.json_response({"error": f"Profile '{name}' 不存在或删除失败"}, status=404)
+        return web.json_response({"ok": True})
+
+    async def handle_open_site_browser(self, request):
+        """POST /api/sites/{name}/open-browser - 打开浏览器登录网站"""
+        name = request.match_info["name"]
+        reg = self._get_site_registry()
+        site = reg.get_site(name)
+        if not site:
+            return web.json_response({"error": f"网站 '{name}' 不存在"}, status=404)
+
+        # Ensure profile is initialized
+        from core.browser_profile import get_browser_profile_manager
+        mgr = get_browser_profile_manager()
+        profile = mgr.get_profile(name)
+        if not profile.is_initialized():
+            profile.ensure_dirs()
+
+        login_url = site.get("login_url", "")
+
+        try:
+            from aiskills.browser_stealth import get_stealth_browser
+            browser = get_stealth_browser(profile_name=name, headless=False)
+            result = await browser.start()
+            if not result.success:
+                return web.json_response({"error": f"启动浏览器失败: {result.error}"}, status=500)
+
+            # Navigate to login URL
+            if login_url:
+                page = browser._page
+                if page:
+                    page.get(login_url)
+
+            return web.json_response({
+                "ok": True,
+                "site": name,
+                "login_url": login_url,
+                "message": f"浏览器已打开，请在浏览器中完成 {site.get('display_name', name)} 的登录",
+            })
+        except Exception as e:
+            logger.error(f"打开浏览器失败 ({name}): {e}")
+            return web.json_response({"error": f"打开浏览器失败: {e}"}, status=500)
+
+    async def handle_close_site_browser(self, request):
+        """POST /api/sites/{name}/close-browser - 关闭网站浏览器"""
+        name = request.match_info["name"]
+
+        try:
+            from aiskills.browser_stealth import close_stealth_browser
+            close_stealth_browser(profile_name=name)
+            return web.json_response({"ok": True, "site": name, "message": f"浏览器已关闭 ({name})"})
+        except Exception as e:
+            logger.error(f"关闭浏览器失败 ({name}): {e}")
+            return web.json_response({"error": f"关闭浏览器失败: {e}"}, status=500)
+
     # --- Workdir ---
     async def handle_get_workdir(self, request):
         return web.json_response({"path": str(self.core.config_mgr.data_dir / "workspace")})
@@ -7059,8 +7300,8 @@ window.addEventListener('beforeunload', function() {{
         config = self.core.config
         # 检查是否已配置有效的 LLM API Key
         needs_setup = not config.llm.api_key
-        # 确保配置助手存在
-        self._ensure_config_helper()
+        # 确保系统 Agent 已初始化（使用异步锁防重复）
+        await self._ensure_agents_initialized()
         helper_exists = (self._agent_dir("2") / "config.json").exists()
         return web.json_response({
             "needs_setup": needs_setup,
@@ -7073,8 +7314,8 @@ window.addEventListener('beforeunload', function() {{
 
     async def handle_setup_complete(self, request):
         """POST /api/setup/complete - 标记首次设置完成"""
-        # 确保配置助手存在
-        self._ensure_config_helper()
+        # 确保系统 Agent 已初始化
+        await self._ensure_agents_initialized()
         return web.json_response({"ok": True})
 
     # ── 自动更新管理 ──

package/web/ui/admin/admin-core.js

@@ -1,7 +1,7 @@
 /* ── admin-core.js — Shared infrastructure (loaded FIRST) ── */
 
 const API='';
-const pages={dashboard:'📊 仪表盘',agents:'🤖 Agent 管理',platforms:'🌐 聊天平台',organization:'🏢 组织管理',departments:'🏛 部门管理',agentchat:'💬 私聊记录',sessions:'📋 会话管理',memory:'🧠 记忆管理',permissions:'🔑 权限管理',llm:'🧬 大模型设置',system:'⚙️ 系统配置',executor:'🔧 执行引擎',skills:'🛠 技能管理',files:'📁 工作目录',logs:'📜 查看日志',tasks:'📌 任务记录'};
+const pages={dashboard:'📊 仪表盘',agents:'🤖 Agent 管理',platforms:'🌐 聊天平台',organization:'🏢 组织管理',departments:'🏛 部门管理',agentchat:'💬 私聊记录',sessions:'📋 会话管理',memory:'🧠 记忆管理',permissions:'🔑 权限管理',llm:'🧬 大模型设置',system:'⚙️ 系统配置',executor:'🔧 执行引擎',sites:'🌐 网站管理',skills:'🛠 技能管理',files:'📁 工作目录',logs:'📜 查看日志',tasks:'📌 任务记录'};
 let currentPage='dashboard';
 let allAgentsCache=[];
 let allModelsCache=[];

package/web/ui/admin/admin-sites.js

@@ -0,0 +1,341 @@
+// ========== Site Management ==========
+// [v1.31.1] 网站注册/浏览器Profile统一管理
+
+const SITE_CAT_ICONS = {
+  email: '\u{1F4E7}', social: '\u{1F4AC}', cloud: '\u2601\uFE0F',
+  ai_chat: '\u{1F916}', dev: '\u{1F6E0}\uFE0F', content: '\u{1F3AC}', custom: '\u2699\uFE0F'
+};
+const SITE_CAT_LABELS = {
+  email: '\u90AE\u7BB1\u670D\u52A1', social: '\u793E\u4EA4\u5A92\u4F53', cloud: '\u4E91\u670D\u52A1',
+  ai_chat: 'AI \u5BF9\u8BDD', dev: '\u5F00\u53D1\u5DE5\u5177', content: '\u5185\u5BB9\u5E73\u53F0', custom: '\u81EA\u5B9A\u4E49'
+};
+
+let _sitesFilter = '';
+let _sitesProfileView = false;
+
+async function renderSites() {
+  _sitesProfileView = false;
+  $('content').setAttribute('data-page', 'sites');
+  const r = await api('/api/sites');
+  if (r.error) {
+    $('content').innerHTML = '<div class="empty" style="color:var(--danger)">加载失败: ' + escHtml(r.error) + '</div>';
+    return;
+  }
+
+  const sites = r.sites || [];
+  const summary = r.summary || {};
+  const profiles = await api('/api/sites/profiles').catch(function() { return { profiles: [], total_size_mb: 0 }; });
+
+  // Group by category
+  const groups = {};
+  for (const s of sites) {
+    const cat = s.category || 'custom';
+    if (!groups[cat]) groups[cat] = [];
+    groups[cat].push(s);
+  }
+
+  let html = '<div class="flex justify-between items-center mb-16 flex-wrap gap-8">' +
+    '<div style="color:var(--text2);font-size:13px">' +
+    '共 <strong>' + sites.length + '</strong> 个网站' +
+    ' (内置' + (summary.builtin_count || 0) +
+    ' · 自定义' + (summary.custom_count || 0) + ')' +
+    ' · Profile ' + (profiles.profiles || []).length + ' 个' +
+    ' (' + (profiles.total_size_mb || 0) + ' MB)' +
+    '</div>' +
+    '<div class="flex gap-8">' +
+    '<input id="siteSearch" placeholder="搜索网站..." style="width:200px" oninput="filterSites()">' +
+    '<button class="btn btn-primary btn-sm" onclick="showAddSiteModal()">+ 添加网站</button>' +
+    '<button class="btn btn-ghost btn-sm" onclick="initAllProfiles()">初始化所有 Profile</button>' +
+    '</div></div>';
+
+  // Render each category group
+  for (const [cat, catSites] of Object.entries(groups)) {
+    const icon = SITE_CAT_ICONS[cat] || '\u{1F310}';
+    const label = SITE_CAT_LABELS[cat] || cat;
+    html += '<div class="card" style="padding:0;overflow:hidden;margin-bottom:16px">' +
+      '<h3 style="padding:12px 16px;margin:0;display:flex;align-items:center;gap:8px">' +
+      '<span>' + icon + '</span> ' + label +
+      ' <span class="badge badge-blue">' + catSites.length + '</span></h3>';
+    for (const s of catSites) {
+      html += siteRowHtml(s);
+    }
+    html += '</div>';
+  }
+
+  if (!sites.length) html += '<div class="empty">暂无网站，点击"添加网站"开始配置</div>';
+
+  $('content').innerHTML = html;
+}
+
+function siteRowHtml(s) {
+  const isBuiltin = s.is_builtin;
+  const isCustom = s.is_custom;
+  const hasProfile = s.has_profile;
+  const name = escHtml(s.name || '');
+  const displayName = escHtml(s.display_name || s.name || '');
+  const loginUrl = escHtml(s.login_url || '');
+  const typeTag = isBuiltin ? '<span class="badge badge-blue">内置</span>' :
+                 isCustom ? '<span class="badge badge-green">自定义</span>' : '';
+  const profileTag = hasProfile ? '<span class="badge badge-green">已登录</span>' :
+                     '<span class="badge badge-yellow">未登录</span>';
+
+  let actions = '';
+  actions += '<button class="btn btn-sm btn-ghost" onclick="viewSiteDetail(\'' + name + '\')">详情</button>';
+  if (!isBuiltin) {
+    actions += '<button class="btn btn-sm btn-ghost" onclick="editSiteModal(\'' + name + '\')">编辑</button>';
+    actions += '<button class="btn btn-sm btn-ghost" style="color:var(--danger)" onclick="removeSite(\'' + name + '\')">删除</button>';
+  }
+  // 登录按钮 - 始终显示（有 login_url 时突出显示）
+  if (s.login_url) {
+    actions += '<button class="btn btn-sm btn-primary" onclick="openSiteBrowser(\'' + name + '\')">登录</button>';
+  } else {
+    actions += '<button class="btn btn-sm btn-ghost" onclick="openSiteBrowser(\'' + name + '\')">登录</button>';
+  }
+  if (hasProfile) {
+    actions += '<button class="btn btn-sm btn-ghost" style="color:var(--warn)" onclick="closeSiteBrowser(\'' + name + '\')">关闭浏览器</button>';
+    actions += '<button class="btn btn-sm btn-ghost" style="color:var(--warn)" onclick="deleteSiteProfile(\'' + name + '\')">清除登录</button>';
+  } else {
+    actions += '<button class="btn btn-sm btn-ghost" onclick="initSiteProfile(\'' + name + '\')">Profile</button>';
+  }
+
+  return '<div class="skill-row" data-name="' + name + '" data-desc="' + escHtml(s.display_name || '') + '">' +
+    '<div style="flex-shrink:0;width:36px;text-align:center;font-size:18px">' +
+    (SITE_CAT_ICONS[s.category] || '\u{1F310}') + '</div>' +
+    '<div class="skill-info">' +
+    '<div class="skill-name">' + displayName + ' ' + typeTag + ' ' + profileTag + '</div>' +
+    '<div class="skill-desc">' + (loginUrl ? '<code style="font-size:11px;color:var(--accent)">' + loginUrl + '</code> ' : '') +
+    escHtml(s.home_url || '') + '</div>' +
+    '</div>' +
+    '<div class="flex gap-8 items-center" style="flex-shrink:0">' + actions + '</div></div>';
+}
+
+function filterSites() {
+  const q = ($('siteSearch')?.value || '').toLowerCase();
+  document.querySelectorAll('#content .skill-row').forEach(function(el) {
+    var n = (el.dataset.name || '').toLowerCase();
+    var d = (el.dataset.desc || '').toLowerCase();
+    el.style.display = (n.includes(q) || d.includes(q)) ? '' : 'none';
+  });
+}
+
+// ── View Site Detail ──
+async function viewSiteDetail(name) {
+  var s = await api('/api/sites/' + encodeURIComponent(name));
+  if (s.error) { showToast(s.error, 'danger'); return; }
+
+  var tipsHtml = '';
+  if (s.tips && s.tips.length) {
+    tipsHtml = '<div class="form-group"><label>使用提示</label><ul style="font-size:12px;color:var(--text2);padding-left:20px">';
+    for (var t of s.tips) tipsHtml += '<li style="margin-bottom:4px">' + escHtml(t) + '</li>';
+    tipsHtml += '</ul></div>';
+  }
+
+  var urlsHtml = '';
+  if (s.urls && Object.keys(s.urls).length) {
+    urlsHtml = '<div class="form-group"><label>常用链接</label><div class="table-wrap"><table>' +
+      '<tr><th>名称</th><th>URL</th></tr>';
+    for (var k in s.urls) {
+      urlsHtml += '<tr><td>' + escHtml(k) + '</td><td><code style="font-size:12px;word-break:break-all">' + escHtml(s.urls[k]) + '</code></td></tr>';
+    }
+    urlsHtml += '</table></div></div>';
+  }
+
+  var profileInfo = '';
+  if (s.profile) {
+    var p = s.profile;
+    profileInfo = '<div class="form-group"><label>浏览器 Profile</label>' +
+      '<div style="font-size:13px;color:var(--text)">' +
+      '状态: ' + (p.initialized ? '<span class="badge badge-green">已初始化</span>' : '<span class="badge badge-yellow">未初始化</span>') +
+      ' · 大小: ' + (p.size_mb || 0) + ' MB' +
+      ' · Cookie: ' + (p.has_cookies ? '<span class="badge badge-green">有</span>' : '<span class="badge badge-red">无</span>') +
+      '</div></div>';
+  }
+
+  var html = '<h3>' + escHtml(s.display_name || s.name) + '</h3>' +
+    '<div class="form-row">' +
+    '<div class="form-group"><label>网站名称</label><div><code>' + escHtml(s.name) + '</code></div></div>' +
+    '<div class="form-group"><label>分类</label><div>' + escHtml(SITE_CAT_LABELS[s.category] || s.category) + '</div></div>' +
+    '</div>' +
+    '<div class="form-row">' +
+    '<div class="form-group"><label>类型</label><div>' + (s.is_builtin ? '<span class="badge badge-blue">内置</span>' : '<span class="badge badge-green">自定义</span>') + '</div></div>' +
+    '</div>' +
+    '<div class="form-group"><label>登录页</label><div><a href="' + escHtml(s.login_url || '') + '" target="_blank" style="color:var(--accent)">' + escHtml(s.login_url || '-') + '</a></div></div>' +
+    '<div class="form-group"><label>首页</label><div><a href="' + escHtml(s.home_url || '') + '" target="_blank" style="color:var(--accent)">' + escHtml(s.home_url || '-') + '</a></div></div>' +
+    '<div class="form-group"><label>登录检测</label><div><code style="font-size:12px">' + escHtml(s.detect_url || '-') + '</code></div></div>' +
+    urlsHtml + tipsHtml + profileInfo +
+    '<div class="flex gap-8 mt-16">' +
+    '<button class="btn btn-ghost" onclick="closeModal()">关闭</button>' +
+    (!s.is_builtin ? '<button class="btn btn-primary" onclick="closeModal();editSiteModal(\'' + escHtml(s.name) + '\')">编辑</button>' : '') +
+    '<button class="btn btn-ghost" onclick="initSiteProfile(\'' + escHtml(s.name) + '\');closeModal()">初始化 Profile</button>' +
+    '</div>';
+
+  $('modalContainer').innerHTML = '<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:600px">' + html + '</div></div>';
+}
+
+// ── Add Site Modal ──
+function showAddSiteModal() {
+  var html = '<h3>添加自定义网站</h3>' +
+    '<div class="form-group"><label>网站名称 (英文标识)</label>' +
+    '<input id="siteFormName" placeholder="例如: my_website"></div>' +
+    '<div class="form-group"><label>显示名称</label>' +
+    '<input id="siteFormDisplay" placeholder="例如: 我的网站"></div>' +
+    '<div class="form-group"><label>分类</label>' +
+    '<select id="siteFormCategory">' +
+    '<option value="custom">自定义</option>' +
+    '<option value="email">邮箱服务</option>' +
+    '<option value="social">社交媒体</option>' +
+    '<option value="cloud">云服务</option>' +
+    '<option value="ai_chat">AI 对话</option>' +
+    '<option value="dev">开发工具</option>' +
+    '<option value="content">内容平台</option>' +
+    '</select></div>' +
+    '<div class="form-group"><label>登录页 URL</label>' +
+    '<input id="siteFormLoginUrl" placeholder="https://example.com/login"></div>' +
+    '<div class="form-group"><label>首页 URL</label>' +
+    '<input id="siteFormHomeUrl" placeholder="https://example.com/dashboard"></div>' +
+    '<div class="form-group"><label>登录检测 URL</label>' +
+    '<input id="siteFormDetectUrl" placeholder="https://example.com/dashboard"></div>' +
+    '<div class="flex gap-8 mt-16">' +
+    '<button class="btn btn-primary" onclick="doAddSite()">添加</button>' +
+    '<button class="btn btn-ghost" onclick="closeModal()">取消</button>' +
+    '</div>';
+
+  $('modalContainer').innerHTML = '<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:500px">' + html + '</div></div>';
+}
+
+async function doAddSite() {
+  var name = ($('siteFormName')?.value || '').trim().toLowerCase().replace(/\s+/g, '_');
+  if (!name) { showToast('网站名称不能为空', 'danger'); return; }
+  if (!/^[a-z0-9_-]+$/.test(name)) { showToast('网站名称只能包含小写字母、数字、下划线和连字符', 'danger'); return; }
+
+  var data = {
+    name: name,
+    display_name: $('siteFormDisplay')?.value || name,
+    category: $('siteFormCategory')?.value || 'custom',
+    login_url: $('siteFormLoginUrl')?.value || '',
+    home_url: $('siteFormHomeUrl')?.value || '',
+    detect_url: $('siteFormDetectUrl')?.value || '',
+  };
+
+  var r = await api('/api/sites', { method: 'POST', body: JSON.stringify(data) });
+  if (r.error) { showToast(r.error, 'danger'); return; }
+  showToast('已添加网站: ' + name, 'success');
+  closeModal();
+  renderSites();
+}
+
+// ── Edit Site Modal ──
+async function editSiteModal(name) {
+  var s = await api('/api/sites/' + encodeURIComponent(name));
+  if (s.error) { showToast(s.error, 'danger'); return; }
+
+  var html = '<h3>编辑网站: ' + escHtml(s.display_name || s.name) + '</h3>' +
+    '<div class="form-group"><label>网站名称</label>' +
+    '<input value="' + escHtml(s.name) + '" disabled style="opacity:0.6"></div>' +
+    '<div class="form-group"><label>显示名称</label>' +
+    '<input id="editSiteDisplay" value="' + escHtml(s.display_name || '') + '"></div>' +
+    '<div class="form-group"><label>分类</label>' +
+    '<select id="editSiteCategory">' +
+    '<option value="custom"' + (s.category === 'custom' ? ' selected' : '') + '>自定义</option>' +
+    '<option value="email"' + (s.category === 'email' ? ' selected' : '') + '>邮箱服务</option>' +
+    '<option value="social"' + (s.category === 'social' ? ' selected' : '') + '>社交媒体</option>' +
+    '<option value="cloud"' + (s.category === 'cloud' ? ' selected' : '') + '>云服务</option>' +
+    '<option value="ai_chat"' + (s.category === 'ai_chat' ? ' selected' : '') + '>AI 对话</option>' +
+    '<option value="dev"' + (s.category === 'dev' ? ' selected' : '') + '>开发工具</option>' +
+    '<option value="content"' + (s.category === 'content' ? ' selected' : '') + '>内容平台</option>' +
+    '</select></div>' +
+    '<div class="form-group"><label>登录页 URL</label>' +
+    '<input id="editSiteLoginUrl" value="' + escHtml(s.login_url || '') + '"></div>' +
+    '<div class="form-group"><label>首页 URL</label>' +
+    '<input id="editSiteHomeUrl" value="' + escHtml(s.home_url || '') + '"></div>' +
+    '<div class="form-group"><label>登录检测 URL</label>' +
+    '<input id="editSiteDetectUrl" value="' + escHtml(s.detect_url || '') + '"></div>' +
+    '<div class="flex gap-8 mt-16">' +
+    '<button class="btn btn-primary" onclick="doUpdateSite(\'' + escHtml(s.name) + '\')">保存</button>' +
+    '<button class="btn btn-ghost" onclick="closeModal()">取消</button>' +
+    '</div>';
+
+  $('modalContainer').innerHTML = '<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:500px">' + html + '</div></div>';
+}
+
+async function doUpdateSite(name) {
+  var data = {
+    display_name: $('editSiteDisplay')?.value || '',
+    category: $('editSiteCategory')?.value || 'custom',
+    login_url: $('editSiteLoginUrl')?.value || '',
+    home_url: $('editSiteHomeUrl')?.value || '',
+    detect_url: $('editSiteDetectUrl')?.value || '',
+  };
+
+  var r = await api('/api/sites/' + encodeURIComponent(name), { method: 'PUT', body: JSON.stringify(data) });
+  if (r.error) { showToast(r.error, 'danger'); return; }
+  showToast('已更新网站: ' + name, 'success');
+  closeModal();
+  renderSites();
+}
+
+// ── Remove Site ──
+function removeSite(name) {
+  showConfirm('删除网站', '确定要删除网站 "' + name + '" 吗？将同时删除浏览器 Profile。', function() {
+    return api('/api/sites/' + encodeURIComponent(name), { method: 'DELETE' }).then(function(r) {
+      if (r.error) { showToast(r.error, 'danger'); return; }
+      showToast('已删除: ' + name, 'success');
+      renderSites();
+    });
+  });
+}
+
+// ── Profile Management ──
+async function initSiteProfile(name) {
+  var r = await api('/api/sites/' + encodeURIComponent(name) + '/init-profile', { method: 'POST' });
+  if (r.error) { showToast(r.error, 'danger'); return; }
+  showToast('Profile 已初始化: ' + name, 'success');
+  renderSites();
+}
+
+async function initAllProfiles() {
+  showToast('正在初始化所有 Profile...', 'info');
+  var r = await api('/api/sites');
+  if (r.error) { showToast(r.error, 'danger'); return; }
+  var names = (r.sites || []).map(function(s) { return s.name; });
+  var count = 0;
+  for (var i = 0; i < names.length; i++) {
+    try {
+      var pr = await api('/api/sites/' + encodeURIComponent(names[i]) + '/init-profile', { method: 'POST' });
+      if (pr.ok) count++;
+    } catch (e) { /* skip */ }
+  }
+  showToast('已初始化 ' + count + ' 个 Profile', 'success');
+  renderSites();
+}
+
+async function deleteSiteProfile(name) {
+  showConfirm('清除登录状态', '确定要删除 "' + name + '" 的浏览器 Profile 吗？这将清除登录状态和 Cookie。', function() {
+    return api('/api/sites/profiles/' + encodeURIComponent(name), { method: 'DELETE' }).then(function(r) {
+      if (r.error) { showToast(r.error, 'danger'); return; }
+      showToast('Profile 已删除: ' + name, 'success');
+      renderSites();
+    });
+  });
+}
+
+// ── Browser Login ──
+async function openSiteBrowser(name) {
+  showToast('正在启动浏览器...', 'info');
+  var r = await api('/api/sites/' + encodeURIComponent(name) + '/open-browser', { method: 'POST' });
+  if (r.error) { showToast(r.error, 'danger'); return; }
+  showToast(r.message || '浏览器已打开', 'success', 5000);
+  // Refresh to update profile status
+  setTimeout(function() { renderSites(); }, 2000);
+}
+
+async function closeSiteBrowser(name) {
+  var r = await api('/api/sites/' + encodeURIComponent(name) + '/close-browser', { method: 'POST' });
+  if (r.error) { showToast(r.error, 'danger'); return; }
+  showToast('浏览器已关闭', 'success');
+  setTimeout(function() { renderSites(); }, 1000);
+}
+
+// Register renderer
+if (typeof window._adminRenderers === 'undefined') window._adminRenderers = {};
+window._adminRenderers['sites'] = renderSites;

package/web/ui/admin/admin-skills.js

@@ -5,6 +5,10 @@ const CLI_CAT_LABELS={perception:'感知',search:'搜索',file:'文件操作',do
 
 async function renderSkills(){
   const cats=await api('/api/skills?view=categorized');
+  if(cats.error){
+    $('content').innerHTML='<div class="empty" style="color:var(--danger)">加载失败: '+escHtml(cats.error)+'</div>';
+    return;
+  }
   const bt=cats.builtin_tools||[];
   const cc=cats.cli_commands||[];
   const ps=cats.python_skills||[];

package/web/ui/index.html

@@ -328,6 +328,7 @@ tr:hover{background:var(--surface2)}
     <div class="nav-item" data-tooltip="大模型设置" data-page="llm"><span class="icon">🧬</span><span class="icon-text">大模型设置</span></div>
     <div class="nav-item" data-tooltip="系统配置" data-page="system"><span class="icon">⚙️</span><span class="icon-text">系统配置</span></div>
     <div class="nav-item" data-tooltip="执行引擎" data-page="executor"><span class="icon">🔧</span><span class="icon-text">执行引擎</span></div>
+    <div class="nav-item" data-tooltip="网站管理" data-page="sites"><span class="icon">🌐</span><span class="icon-text">网站管理</span></div>
     <div class="nav-item" data-tooltip="技能管理" data-page="skills"><span class="icon">🛠</span><span class="icon-text">技能管理</span></div>
     <div class="nav-item" data-tooltip="工作目录" data-page="files"><span class="icon">📁</span><span class="icon-text">工作目录</span></div>
     <div class="nav-item" data-tooltip="查看日志" data-page="logs"><span class="icon">📜</span><span class="icon-text">查看日志</span></div>
@@ -358,6 +359,7 @@ tr:hover{background:var(--surface2)}
 <script src="admin/admin-permissions.js"></script>
 <script src="admin/admin-llm.js"></script>
 <script src="admin/admin-executor.js"></script>
+<script src="admin/admin-sites.js"></script>
 <script src="admin/admin-skills.js"></script>
 <script src="admin/admin-files.js"></script>
 <script src="admin/admin-logs.js"></script>

package/worklog.md

@@ -396,3 +396,27 @@ Work Log:
   - 查询优化：将LIKE前缀查询改为=精确匹配agent_id
   - 向后兼容：同时支持新旧两种格式的session_id
 
+---
+Task ID: 1
+Agent: main
+Task: 修复 myagent-ai v1.31.0 中的多个关键漏洞
+
+Work Log:
+- 全面审计 browser_stealth.py、main.py、core/browser_profile.py、core/site_registry.py
+- 发现 8 个漏洞（3 个高危、3 个中危、2 个低危）
+- 修复 browser_stealth.py: time.sleep(1) → await asyncio.sleep(1)
+- 修复 browser_stealth.py: _detect_browser 增加 macOS/Windows 路径
+- 修复 browser_stealth.py: get_stealth_browser 清理崩溃实例并重建
+- 修复 main.py: _running_service 在 __init__ 初始化
+- 修复 main.py: shutdown() 关闭所有 stealth 浏览器
+- 修复 main.py: 会话锁 TOCTOU 竞争条件
+- 修复 main.py: 会话锁内存泄漏（_cleanup_session_locks）
+- 修复 main.py: Unicode Ideographic Space 填充问题
+- 修复 main.py: xdpyinfo 分辨率解析过于宽松
+- 版本升级 v1.31.0 → v1.31.1
+- GitHub 推送成功，npm 发布成功
+
+Stage Summary:
+- 修复了 8 个漏洞，涵盖事件循环阻塞、属性未初始化、资源泄漏、竞态条件、跨平台兼容性等
+- 已发布 myagent-ai@1.31.1 到 npm 和 GitHub
+