myagent-ai 1.31.2 → 1.31.3

package/package.json

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

package/web/api_server.py

@@ -505,6 +505,8 @@ class ApiServer:
         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)
@@ -4957,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} - 获取单个技能/工具详情
@@ -4969,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 - 启用/禁用技能
@@ -5015,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):
         """将禁用技能列表持久化到配置文件"""
@@ -5200,6 +5214,58 @@ window.addEventListener('beforeunload', function() {{
             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")})

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

@@ -85,7 +85,14 @@ function siteRowHtml(s) {
     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>';
@@ -312,6 +319,23 @@ async function deleteSiteProfile(name) {
   });
 }
 
+// ── 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;