myagent-ai 1.25.2 → 1.25.4

package/core/tool_dispatcher.py

@@ -539,7 +539,7 @@ class ToolDispatcher:
     ) -> Dict:
         """网页控制器 — 浏览器面板"""
         try:
-            from core.web_control import get_web_control_manager
+            from core.web_control import get_web_control_manager, LOGIN_URLS
             wc_mgr = get_web_control_manager()
             action = params.get("action", "open")
             session_id = params.get("session_id", "").strip()
@@ -604,7 +604,7 @@ class ToolDispatcher:
 
             elif action in ("get_content", "click", "fill", "scroll", "evaluate", "wait", "screenshot"):
                 # 这些 action 通过命令队列由浏览器面板执行
-                cmd_result = await session.execute_command(action, params)
+                cmd_result = await wc_mgr.queue_command(session_id, action, params, timeout=30)
                 return {
                     "success": cmd_result.get("success", False),
                     "output": cmd_result.get("output", cmd_result.get("result", "")),
@@ -612,6 +612,314 @@ class ToolDispatcher:
                     "data": cmd_result.get("data"),
                 }
 
+            elif action == "human_interact":
+                # [v1.25.3] 人机交互模式 — Agent 暂停, 用户手动操作
+                prompt = params.get("prompt", "请在上方网页中完成登录或验证操作")
+                platform = params.get("platform", "")
+                timeout = int(params.get("timeout", 0)) or 300  # 默认5分钟
+                auto_save = params.get("auto_save_cookies", True)
+
+                # 1. 向面板发送 human_interact 命令（切换到人机模式）
+                session.human_mode = True
+                cmd_result = await wc_mgr.queue_command(
+                    session_id, "human_interact",
+                    {"prompt": prompt, "platform": platform},
+                    timeout=15
+                )
+
+                # 2. 通知前端显示人机交互 UI
+                if stream_callback:
+                    await self._emit_sse("v2_web_control", {
+                        "action": "human_interact",
+                        "session_id": session_id,
+                        "prompt": prompt,
+                        "platform": platform,
+                        "timeout": timeout,
+                    }, stream_callback)
+
+                # 3. 创建 human_event 并等待用户完成
+                loop = asyncio.get_event_loop()
+                session.human_event = asyncio.Event()
+                session.human_result = None
+
+                try:
+                    await asyncio.wait_for(session.human_event.wait(), timeout=timeout)
+                except asyncio.TimeoutError:
+                    session.human_mode = False
+                    # 恢复 agent 模式
+                    try:
+                        await wc_mgr.queue_command(session_id, "agent_mode", {}, timeout=5)
+                    except Exception:
+                        pass
+                    if stream_callback:
+                        await self._emit_sse("v2_web_control", {
+                            "action": "human_done",
+                            "session_id": session_id,
+                            "timed_out": True,
+                        }, stream_callback)
+                    return {"success": False, "error": f"人机交互超时 ({timeout}s)"}
+
+                # 4. 用户完成, 恢复 agent 模式
+                session.human_mode = False
+                try:
+                    await wc_mgr.queue_command(session_id, "agent_mode", {}, timeout=5)
+                except Exception:
+                    pass
+
+                # 5. 自动保存 cookies
+                cookie_file = ""
+                if auto_save:
+                    try:
+                        cookie_file = session.save_cookies_to_file()
+                    except Exception as e:
+                        cookie_file = f"(保存失败: {e})"
+
+                # 6. 获取当前页面信息
+                page_info = ""
+                try:
+                    info_result = await wc_mgr.queue_command(session_id, "get_content", {"what": "url,title"}, timeout=10)
+                    if info_result.get("success"):
+                        page_info = info_result.get("result", "")
+                except Exception:
+                    pass
+
+                result_data = session.human_result or {}
+                if stream_callback:
+                    await self._emit_sse("v2_web_control", {
+                        "action": "human_done",
+                        "session_id": session_id,
+                    }, stream_callback)
+
+                output_parts = [f"用户已完成人机交互操作"]
+                if page_info:
+                    output_parts.append(f"当前页面: {page_info}")
+                if cookie_file:
+                    output_parts.append(f"Cookies 已保存: {cookie_file}")
+                if result_data.get("note"):
+                    output_parts.append(f"用户备注: {result_data['note']}")
+
+                return {
+                    "success": True,
+                    "output": "\n".join(output_parts),
+                    "session_id": session_id,
+                    "cookies_saved": bool(cookie_file) and not cookie_file.startswith("("),
+                    "cookie_file": cookie_file,
+                    "data": result_data,
+                }
+
+            elif action == "login":
+                # [v1.25.4] 一站式登录流程: 导航 → 人机交互 → 自动保存凭证
+                platform = params.get("platform", "").strip().lower()
+                login_url = params.get("url", "").strip()
+                prompt = params.get("prompt", "")
+                timeout = int(params.get("timeout", 0)) or 300
+                label = params.get("label", "")
+
+                # 查找平台登录 URL
+                if not login_url and platform:
+                    login_url = LOGIN_URLS.get(platform, "")
+                    if not login_url:
+                        return {"success": False, "error": f"未知平台 '{platform}'，未找到预置登录 URL，请通过 url 参数指定登录页地址"}
+
+                if not login_url:
+                    return {"success": False, "error": "请提供 platform (平台名称) 或 url (登录页地址) 参数"}
+
+                # 构建默认提示
+                platform_names = {
+                    "qq": "QQ", "qq_mail": "QQ邮箱", "wechat_work": "企业微信",
+                    "wechat_mp": "微信公众号", "telegram": "Telegram", "telegram_web": "Telegram Web",
+                    "discord": "Discord", "feishu": "飞书", "feishu_admin": "飞书管理后台",
+                    "lark": "Lark", "dingtalk": "钉钉", "github": "GitHub",
+                    "google": "Google", "bilibili": "B站", "taobao": "淘宝",
+                    "zhihu": "知乎", "weibo": "微博",
+                }
+                display_name = platform_names.get(platform, platform) if platform else ""
+                if not prompt:
+                    prompt = f"请在上方页面完成 {display_name} 登录操作" if display_name else "请在上方页面完成登录操作"
+                    # 添加平台特定提示
+                    if platform in ("qq", "wechat_mp", "telegram", "discord", "dingtalk"):
+                        prompt += "（可能需要扫码或输入账号密码）"
+                    elif platform in ("wechat_work", "feishu", "feishu_admin", "lark"):
+                        prompt += "（请使用管理员账号扫码登录）"
+
+                # Step 1: 打开面板
+                session.current_url = login_url
+                if stream_callback:
+                    await self._emit_sse("v2_web_control", {
+                        "action": "login",
+                        "session_id": session_id,
+                        "url": login_url,
+                        "panel_url": f"/api/web_control/panel?sid={session_id}",
+                        "platform": platform,
+                        "prompt": prompt,
+                        "timeout": timeout,
+                    }, stream_callback)
+
+                # Step 2: 等待面板打开
+                if not session.is_panel_open:
+                    waited = 0
+                    while waited < 15:
+                        await asyncio.sleep(1)
+                        waited += 1
+                        if session.is_panel_open:
+                            break
+                        if session._closed:
+                            return {"success": False, "error": "会话已关闭"}
+
+                # Step 3: 切换人机交互模式
+                session.human_mode = True
+                try:
+                    await wc_mgr.queue_command(
+                        session_id, "human_interact",
+                        {"prompt": prompt, "platform": display_name},
+                        timeout=15
+                    )
+                except Exception as e:
+                    logger.warning(f"[WebControl] human_interact 命令发送失败: {e}")
+
+                # Step 4: 等待用户完成
+                loop = asyncio.get_event_loop()
+                session.human_event = asyncio.Event()
+                session.human_result = None
+
+                try:
+                    await asyncio.wait_for(session.human_event.wait(), timeout=timeout)
+                except asyncio.TimeoutError:
+                    session.human_mode = False
+                    try:
+                        await wc_mgr.queue_command(session_id, "agent_mode", {}, timeout=5)
+                    except Exception:
+                        pass
+                    if stream_callback:
+                        await self._emit_sse("v2_web_control", {
+                            "action": "human_done", "session_id": session_id, "timed_out": True,
+                        }, stream_callback)
+                    return {"success": False, "error": f"登录超时 ({timeout}s)，请重试"}
+
+                # Step 5: 用户完成，恢复 agent 模式
+                session.human_mode = False
+                try:
+                    await wc_mgr.queue_command(session_id, "agent_mode", {}, timeout=5)
+                except Exception:
+                    pass
+
+                # Step 6: 获取当前页面信息
+                page_info = ""
+                try:
+                    info_result = await wc_mgr.queue_command(session_id, "get_content", {"what": "url,title"}, timeout=10)
+                    if info_result.get("success"):
+                        page_info = info_result.get("result", "")
+                except Exception:
+                    pass
+
+                # Step 7: 自动保存 cookies + 凭证
+                cookie_file = ""
+                cred_file = ""
+                result_data = session.human_result or {}
+
+                try:
+                    cookie_file = session.save_cookies_to_file()
+                except Exception as e:
+                    cookie_file = f"(保存失败: {e})"
+
+                # 保存到凭证库
+                if platform:
+                    try:
+                        extra = {"note": result_data.get("note", ""), "login_url": login_url}
+                        cred_file = session.save_credentials_to_file(platform, label=label, extra=extra)
+                    except Exception as e:
+                        cred_file = f"(保存失败: {e})"
+
+                # 检测是否登录成功 (URL 发生了变化)
+                login_success = False
+                if page_info and login_url:
+                    current_url = page_info.split(",")[0].strip() if "," in page_info else page_info
+                    login_success = (current_url != login_url and "login" not in current_url.lower())
+
+                if stream_callback:
+                    await self._emit_sse("v2_web_control", {
+                        "action": "login_done",
+                        "session_id": session_id,
+                        "platform": platform,
+                        "login_success": login_success,
+                    }, stream_callback)
+
+                output_parts = []
+                if login_success:
+                    output_parts.append(f"{display_name} 登录成功")
+                else:
+                    output_parts.append(f"用户已完成 {display_name} 登录操作")
+                if page_info:
+                    output_parts.append(f"当前页面: {page_info}")
+                if cookie_file and not cookie_file.startswith("("):
+                    output_parts.append(f"Cookies 已保存: {cookie_file}")
+                if cred_file and not cred_file.startswith("("):
+                    output_parts.append(f"凭证已保存: {cred_file}")
+                if result_data.get("note"):
+                    output_parts.append(f"用户备注: {result_data['note']}")
+
+                return {
+                    "success": True,
+                    "output": "\n".join(output_parts),
+                    "session_id": session_id,
+                    "login_success": login_success,
+                    "platform": platform,
+                    "cookie_file": cookie_file,
+                    "credential_file": cred_file,
+                    "data": result_data,
+                }
+
+            elif action == "save_credentials":
+                # [v1.25.4] 保存凭证到凭证库
+                platform = params.get("platform", "").strip()
+                label = params.get("label", "").strip()
+                if not platform:
+                    return {"success": False, "error": "请提供 platform 参数 (平台名称)"}
+                try:
+                    filepath = session.save_credentials_to_file(platform, label=label)
+                    return {"success": True, "output": f"凭证已保存到: {filepath}", "credential_file": filepath}
+                except Exception as e:
+                    return {"success": False, "error": f"保存凭证失败: {e}"}
+
+            elif action == "list_credentials":
+                # [v1.25.4] 列出所有已保存的凭证
+                creds = WebControlSession.list_credentials()
+                if not creds:
+                    return {"success": True, "output": "暂无已保存的登录凭证", "data": []}
+                lines = [f"已保存 {len(creds)} 个凭证:"]
+                for c in creds:
+                    lines.append(f"  - {c['platform']} ({c.get('label', '无标签')}) | 保存时间: {c['saved_at']} | Cookies: {c['cookie_count']}个")
+                return {"success": True, "output": "\n".join(lines), "data": creds}
+
+            elif action == "delete_credentials":
+                # [v1.25.4] 删除凭证
+                platform = params.get("platform", "").strip()
+                if not platform:
+                    return {"success": False, "error": "请提供 platform 参数"}
+                deleted = WebControlSession.delete_credentials(platform)
+                if deleted:
+                    return {"success": True, "output": f"已删除 {platform} 的凭证"}
+                else:
+                    return {"success": False, "error": f"未找到 {platform} 的凭证"}
+
+            elif action == "save_cookies":
+                # [v1.25.3] 保存 cookies 到文件
+                label = params.get("label", "")
+                try:
+                    filepath = session.save_cookies_to_file(label)
+                    return {"success": True, "output": f"Cookies 已保存到: {filepath} ({len(session.cookies)} 个)", "cookie_file": filepath}
+                except Exception as e:
+                    return {"success": False, "error": f"保存 cookies 失败: {e}"}
+
+            elif action == "load_cookies":
+                # [v1.25.3] 从文件加载 cookies
+                label = params.get("label", "")
+                count = session.load_cookies_from_file(label)
+                if count > 0:
+                    return {"success": True, "output": f"已加载 {count} 个 Cookies"}
+                else:
+                    return {"success": False, "error": f"未找到匹配的 Cookie 文件 (label: {label or '自动'})"}
+
             else:
                 return {"success": False, "error": f"未知 web_control action: {action}"}
 

package/core/web_control.py

@@ -1,27 +1,57 @@
 """
-[v1.21.0] Web Control — 聊天内嵌网页控制器
+[v1.25.4] Web Control — 聊天内嵌网页控制器
 
 架构说明:
 - 服务端代理: 通过 /api/web_control/proxy 获取并改写网页内容, 注入控制脚本
 - 会话管理: 每个聊天会话可创建一个 web_control 会话, 维护 cookie/命令队列/结果 Future
 - 双向通信: Agent → 命令队列 → 客户端轮询 → 执行 → POST 结果 → Agent 阻塞等待
 - 前端面板: 基础JS框架 + 动态容器(iframe), 服务端下发控制脚本在容器内执行
+- [v1.25.3] 人机交互: human_interact action 允许 Agent 暂停控制, 用户手动登录后继续
+- [v1.25.4] 登录流程: login action 提供一站式登录编排 + 凭证管理
 
 工具 web_control 支持的 action:
-  open          — 打开 URL (发送 v2_web_control SSE 事件, 前端打开面板)
-  navigate      — 在已打开的面板中导航到新 URL
-  click         — 点击元素 (selector: CSS 选择器)
-  fill          — 填写输入框 (selector + value)
-  scroll        — 滚动页面 (direction: up/down/top/bottom, distance: px)
-  evaluate      — 执行 JavaScript (script: JS 代码)
-  get_content   — 获取页面内容 (what: text/html/url/title/cookies/links)
-  set_cookies   — 设置 cookie (cookies: [{name, value, domain, path}])
-  get_cookies   — 获取当前 cookie
-  wait          — 等待 (time: 毫秒 或 selector: CSS选择器, timeout: 秒)
-  screenshot    — 截图 (返回 base64 PNG)
-  close         — 关闭 web_control 面板
+  open            — 打开 URL (发送 v2_web_control SSE 事件, 前端打开面板)
+  navigate        — 在已打开的面板中导航到新 URL
+  click           — 点击元素 (selector: CSS 选择器)
+  fill            — 填写输入框 (selector + value)
+  scroll          — 滚动页面 (direction: up/down/top/bottom, distance: px)
+  evaluate        — 执行 JavaScript (script: JS 代码)
+  get_content     — 获取页面内容 (what: text/html/url/title/cookies/links)
+  set_cookies     — 设置 cookie (cookies: [{name, value, domain, path}])
+  get_cookies     — 获取当前 cookie
+  wait            — 等待 (time: 毫秒 或 selector: CSS选择器, timeout: 秒)
+  screenshot      — 截图 (返回 base64 PNG)
+  human_interact  — [v1.25.3] 切换为人机交互模式, 用户可手动操作页面 (登录/验证码等)
+  save_cookies    — [v1.25.3] 保存当前会话 cookies 到持久化文件
+  load_cookies    — [v1.25.3] 从持久化文件加载 cookies
+  login           — [v1.25.4] 一站式登录流程: 导航到登录页 → 人机交互 → 自动保存凭证
+  save_credentials — [v1.25.4] 保存登录凭证 (cookies + 元信息) 到凭证库
+  list_credentials — [v1.25.4] 列出已保存的凭证
+  delete_credentials — [v1.25.4] 删除指定凭证
+  close           — 关闭 web_control 面板
 """
 
+# [v1.25.4] 常用平台登录 URL 模板
+LOGIN_URLS = {
+    "qq": "https://qun.qq.com/",
+    "qq_mail": "https://mail.qq.com/",
+    "wechat_work": "https://work.weixin.qq.com/wework_admin/frame",
+    "wechat_mp": "https://mp.weixin.qq.com/",
+    "telegram": "https://web.telegram.org/",
+    "telegram_web": "https://web.telegram.org/",
+    "discord": "https://discord.com/login",
+    "feishu": "https://open.feishu.cn/",
+    "feishu_admin": "https://feishu.cn/admin",
+    "lark": "https://open.larksuite.com/",
+    "dingtalk": "https://login.dingtalk.com/",
+    "github": "https://github.com/login",
+    "google": "https://accounts.google.com/",
+    "bilibili": "https://passport.bilibili.com/login",
+    "taobao": "https://login.taobao.com/",
+    "zhihu": "https://www.zhihu.com/signin",
+    "weibo": "https://passport.weibo.com/sso/signin",
+}
+
 import asyncio
 import json
 import os
@@ -107,6 +137,19 @@ CONTROL_SCRIPT = """
         case 'screenshot':
           result = await doScreenshot(cmd.params || {});
           break;
+        case 'human_interact':
+          // [v1.25.3] 切换人机模式
+          window.__webControlHumanMode = true;
+          // 显示人机模式提示横幅
+          showHumanModeBanner(cmd.params || {});
+          result = { success: true, human_mode: true, message: '已切换到人机交互模式, 用户可自由操作页面' };
+          break;
+        case 'agent_mode':
+          // [v1.25.3] 恢复 Agent 控制模式
+          window.__webControlHumanMode = false;
+          hideHumanModeBanner();
+          result = { success: true, human_mode: false, message: '已恢复 Agent 控制模式' };
+          break;
         default:
           result = { success: false, error: 'Unknown action: ' + cmd.action };
       }
@@ -285,6 +328,40 @@ CONTROL_SCRIPT = """
     });
   }
 
+  // [v1.25.3] 人机模式横幅
+  function showHumanModeBanner(p) {
+    var banner = document.createElement('div');
+    banner.id = '__wcHumanBanner';
+    var promptText = (p && p.prompt) ? p.prompt : '人机交互模式 — 请在此页面完成登录或验证操作';
+    var platformText = (p && p.platform) ? ' (' + p.platform + ')' : '';
+    banner.style.cssText = 'position:fixed;top:0;left:0;right:0;z-index:999999;padding:10px 16px;' +
+      'background:linear-gradient(135deg,#667eea 0%,#764ba2 100%);color:#fff;font-size:14px;font-weight:600;' +
+      'display:flex;align-items:center;justify-content:space-between;box-shadow:0 2px 12px rgba(0,0,0,0.3);font-family:-apple-system,BlinkMacSystemFont,sans-serif;';
+    banner.innerHTML = '<span>\u{1F3AF} ' + promptText + platformText + '</span>';
+    document.body.appendChild(banner);
+    // 为页面内容添加顶部间距
+    document.body.style.paddingTop = '44px';
+    // [v1.25.4] 记录进入人机模式时的 URL, 用于检测登录成功
+    window.__webControlLoginStartUrl = window.location.href;
+    // [v1.25.4] 监听 URL 变化 (登录成功通常伴随跳转)
+    window.__webControlLastNotifiedUrl = window.location.href;
+    var _urlCheckInterval = setInterval(function() {
+      if (!window.__webControlHumanMode) { clearInterval(_urlCheckInterval); return; }
+      var currentUrl = window.location.href;
+      if (currentUrl !== window.__webControlLastNotifiedUrl) {
+        window.__webControlLastNotifiedUrl = currentUrl;
+        // 通知父窗口 URL 发生了变化 (可能登录成功)
+        notifyParent('url_change', { url: currentUrl, previous_url: window.__webControlLoginStartUrl });
+      }
+    }, 1000);
+  }
+  function hideHumanModeBanner() {
+    var banner = document.getElementById('__wcHumanBanner');
+    if (banner) banner.remove();
+    document.body.style.paddingTop = '';
+    window.__webControlLoginStartUrl = null;
+  }
+
   function doScreenshot(p) {
     // html2canvas 未加载时返回提示
     if (typeof html2canvas === 'undefined') {
@@ -296,8 +373,12 @@ CONTROL_SCRIPT = """
     });
   }
 
-  // 拦截链接点击, 重定向到代理
+  // [v1.25.3] 人机交互模式标志
+  window.__webControlHumanMode = false;
+
+  // 拦截链接点击, 重定向到代理（人机模式下跳过拦截）
   document.addEventListener('click', function(e) {
+    if (window.__webControlHumanMode) return; // 人机模式不拦截
     var link = e.target.closest('a');
     if (link && link.href) {
       // 允许 target=_blank 和特殊链接
@@ -312,8 +393,9 @@ CONTROL_SCRIPT = """
     }
   }, true);
 
-  // 拦截表单提交
+  // 拦截表单提交（人机模式下跳过拦截）
   document.addEventListener('submit', function(e) {
+    if (window.__webControlHumanMode) return; // 人机模式不拦截
     var form = e.target;
     if (form.method && form.method.toLowerCase() === 'post') {
       // POST 表单暂不代理, 仅阻止默认行为
@@ -354,6 +436,10 @@ class WebControlSession:
         self.pending_results: Dict[str, asyncio.Future] = {}
         self.is_panel_open = False
         self._closed = False
+        # [v1.25.3] 人机交互模式
+        self.human_mode = False
+        self.human_event: Optional[asyncio.Event] = None  # Agent 等待用户完成操作
+        self.human_result: Optional[Dict[str, Any]] = None
 
     def is_alive(self) -> bool:
         if self._closed:
@@ -371,6 +457,123 @@ class WebControlSession:
             if not future.done():
                 future.set_result({"success": False, "error": "Session closed"})
         self.pending_results.clear()
+        # 唤醒等待 human_event 的协程
+        if self.human_event and not self.human_event.is_set():
+            self.human_event.set()
+
+    # [v1.25.3] Cookie 持久化
+    def save_cookies_to_file(self, label: str = "") -> str:
+        """将当前 cookies 保存到文件, 返回文件路径"""
+        import json as _json
+        from pathlib import Path
+        cookie_dir = Path.home() / ".myagent" / "data" / "web_cookies"
+        cookie_dir.mkdir(parents=True, exist_ok=True)
+        if not label:
+            # 从 current_url 提取域名作为 label
+            parsed = urlparse(self.current_url)
+            label = parsed.hostname or "default"
+        label = re.sub(r'[^a-zA-Z0-9._-]', '_', label)
+        filepath = cookie_dir / f"{label}.json"
+        data = {
+            "url": self.current_url,
+            "saved_at": time.strftime("%Y-%m-%d %H:%M:%S"),
+            "cookies": [
+                {"key": k, "value": v} for k, v in self.cookies.items()
+            ]
+        }
+        filepath.write_text(_json.dumps(data, ensure_ascii=False, indent=2), encoding='utf-8')
+        logger.info(f"[WebControl] Cookies 已保存: {filepath} ({len(self.cookies)} 个)")
+        return str(filepath)
+
+    def load_cookies_from_file(self, label: str = "") -> int:
+        """从文件加载 cookies, 返回加载的数量"""
+        import json as _json
+        from pathlib import Path
+        cookie_dir = Path.home() / ".myagent" / "data" / "web_cookies"
+        if not label:
+            parsed = urlparse(self.current_url)
+            label = parsed.hostname or "default"
+        label = re.sub(r'[^a-zA-Z0-9._-]', '_', label)
+        filepath = cookie_dir / f"{label}.json"
+        if not filepath.exists():
+            return 0
+        try:
+            data = _json.loads(filepath.read_text(encoding='utf-8'))
+            count = 0
+            for item in data.get("cookies", []):
+                self.cookies[item["key"]] = item["value"]
+                count += 1
+            logger.info(f"[WebControl] Cookies 已加载: {filepath} ({count} 个)")
+            return count
+        except Exception as e:
+            logger.error(f"[WebControl] 加载 cookies 失败: {e}")
+            return 0
+
+    # [v1.25.4] 凭证管理 — 保存/列出/删除登录凭证
+    def save_credentials_to_file(self, platform: str, label: str = "", extra: Dict = None) -> str:
+        """保存完整登录凭证 (cookies + 元信息) 到凭证库, 返回文件路径"""
+        import json as _json
+        from pathlib import Path
+        cred_dir = Path.home() / ".myagent" / "data" / "credentials"
+        cred_dir.mkdir(parents=True, exist_ok=True)
+        # platform 作为文件名
+        safe_platform = re.sub(r'[^a-zA-Z0-9._-]', '_', platform).lower()
+        if not safe_platform:
+            safe_platform = "default"
+        filepath = cred_dir / f"{safe_platform}.json"
+        data = {
+            "platform": platform,
+            "url": self.current_url,
+            "saved_at": time.strftime("%Y-%m-%d %H:%M:%S"),
+            "cookie_count": len(self.cookies),
+            "cookies": [
+                {"key": k, "value": v} for k, v in self.cookies.items()
+            ],
+        }
+        if extra:
+            data["extra"] = extra
+        if label:
+            data["label"] = label
+        filepath.write_text(_json.dumps(data, ensure_ascii=False, indent=2), encoding='utf-8')
+        logger.info(f"[WebControl] 凭证已保存: {filepath} (平台: {platform}, cookies: {len(self.cookies)})")
+        return str(filepath)
+
+    @staticmethod
+    def list_credentials() -> List[Dict]:
+        """列出所有已保存的凭证"""
+        import json as _json
+        from pathlib import Path
+        cred_dir = Path.home() / ".myagent" / "data" / "credentials"
+        if not cred_dir.exists():
+            return []
+        results = []
+        for f in sorted(cred_dir.glob("*.json")):
+            try:
+                data = _json.loads(f.read_text(encoding='utf-8'))
+                results.append({
+                    "platform": data.get("platform", f.stem),
+                    "label": data.get("label", ""),
+                    "url": data.get("url", ""),
+                    "saved_at": data.get("saved_at", ""),
+                    "cookie_count": data.get("cookie_count", 0),
+                    "file": str(f),
+                })
+            except Exception:
+                pass
+        return results
+
+    @staticmethod
+    def delete_credentials(platform: str) -> bool:
+        """删除指定平台的凭证"""
+        from pathlib import Path
+        cred_dir = Path.home() / ".myagent" / "data" / "credentials"
+        safe_platform = re.sub(r'[^a-zA-Z0-9._-]', '_', platform).lower()
+        filepath = cred_dir / f"{safe_platform}.json"
+        if filepath.exists():
+            filepath.unlink()
+            logger.info(f"[WebControl] 凭证已删除: {filepath} (平台: {platform})")
+            return True
+        return False
 
 
 class WebControlManager:

package/myagent/agents/main_agent.py

@@ -192,7 +192,11 @@ class MainAgent(BaseAgent):
   - 截图: {"action": "screenshot", "session_id": "xxx"}
   - 等待: {"action": "wait", "time": 1000} 或 {"action": "wait", "selector": ".result", "timeout": 10}
   - Cookie: {"action": "set_cookies", "cookies": [...], "session_id": "xxx"} 或 {"action": "get_cookies", "session_id": "xxx"}
+  - 人机交互: {"action": "human_interact", "session_id": "xxx", "prompt": "请在页面完成登录", "timeout": 300} — 暂停Agent控制,让用户手动操作页面(登录/验证码/滑块等),完成后自动捕获Cookies
+  - 保存Cookie: {"action": "save_cookies", "session_id": "xxx"} — 将当前Cookies持久化到文件(自动以域名命名)
+  - 加载Cookie: {"action": "load_cookies", "session_id": "xxx", "label": "域名"} — 从文件加载已保存的Cookies
   - 关闭: {"action": "close", "session_id": "xxx"}
+  - 人机交互使用场景: 当网站需要扫码登录、短信验证码、图形验证码、滑块验证等人工操作时,使用 human_interact 让用户在浏览器面板中完成。完成后Cookies会自动保存,下次可直接load_cookies复用。
 
 专业技能指令: 系统内置了丰富的专业技能指南（PDF/DOCX/XLSX/PPT 生成、图表绘制、前端开发等），通过 <get_knowledge> 请求相关技能指令。
 """