myagent-ai 1.25.7 → 1.25.9

package/core/version.py

@@ -14,17 +14,43 @@ from pathlib import Path
 
 
 def _version_from_package_json() -> str:
-    """从 package.json 读取版本号（单一数据源）"""
+    """从 package.json 读取版本号（单一数据源）
+    
+    npm 全局安装时，包结构为:
+      /usr/lib/node_modules/myagent-ai/        ← 根 package.json (npm bin 入口)
+      /usr/lib/node_modules/myagent-ai/myagent/  ← 子目录 package.json (代码)
+    
+    Python 代码运行时 sys.path 包含 myagent/ 子目录，
+    Path(__file__).parent.parent 找到的是 myagent/package.json。
+    但根 package.json 才是 npm 管理的版本号（single source of truth）。
+    
+    策略: 同时查找两层 package.json，优先取有更高版本号的。
+    """
+    candidates = [
+        Path(__file__).parent.parent / "package.json",       # myagent/package.json
+        Path(__file__).parent.parent.parent / "package.json", # 根 package.json
+    ]
+    best = ""
+    for pkg_path in candidates:
+        try:
+            if pkg_path.exists():
+                data = json.loads(pkg_path.read_text(encoding="utf-8"))
+                ver = data.get("version", "")
+                if ver:
+                    # 取较高的版本号
+                    if not best or _ver_tuple(ver) > _ver_tuple(best):
+                        best = ver
+        except Exception:
+            pass
+    return best
+
+
+def _ver_tuple(v: str) -> tuple:
+    """将版本字符串转为可比较的 tuple，如 '1.25.7' → (1, 25, 7)"""
     try:
-        pkg_path = Path(__file__).parent.parent / "package.json"
-        if pkg_path.exists():
-            data = json.loads(pkg_path.read_text(encoding="utf-8"))
-            ver = data.get("version", "")
-            if ver:
-                return ver
-    except Exception:
-        pass
-    return ""
+        return tuple(int(x) for x in v.split(".")[:3])
+    except (ValueError, AttributeError):
+        return (0, 0, 0)
 
 
 def _version_from_git() -> str:

package/myagent/core/version.py

@@ -14,17 +14,43 @@ from pathlib import Path
 
 
 def _version_from_package_json() -> str:
-    """从 package.json 读取版本号（单一数据源）"""
+    """从 package.json 读取版本号（单一数据源）
+    
+    npm 全局安装时，包结构为:
+      /usr/lib/node_modules/myagent-ai/        ← 根 package.json (npm bin 入口)
+      /usr/lib/node_modules/myagent-ai/myagent/  ← 子目录 package.json (代码)
+    
+    Python 代码运行时 sys.path 包含 myagent/ 子目录，
+    Path(__file__).parent.parent 找到的是 myagent/package.json。
+    但根 package.json 才是 npm 管理的版本号（single source of truth）。
+    
+    策略: 同时查找两层 package.json，优先取有更高版本号的。
+    """
+    candidates = [
+        Path(__file__).parent.parent / "package.json",       # myagent/package.json
+        Path(__file__).parent.parent.parent / "package.json", # 根 package.json
+    ]
+    best = ""
+    for pkg_path in candidates:
+        try:
+            if pkg_path.exists():
+                data = json.loads(pkg_path.read_text(encoding="utf-8"))
+                ver = data.get("version", "")
+                if ver:
+                    # 取较高的版本号
+                    if not best or _ver_tuple(ver) > _ver_tuple(best):
+                        best = ver
+        except Exception:
+            pass
+    return best
+
+
+def _ver_tuple(v: str) -> tuple:
+    """将版本字符串转为可比较的 tuple，如 '1.25.7' → (1, 25, 7)"""
     try:
-        pkg_path = Path(__file__).parent.parent / "package.json"
-        if pkg_path.exists():
-            data = json.loads(pkg_path.read_text(encoding="utf-8"))
-            ver = data.get("version", "")
-            if ver:
-                return ver
-    except Exception:
-        pass
-    return ""
+        return tuple(int(x) for x in v.split(".")[:3])
+    except (ValueError, AttributeError):
+        return (0, 0, 0)
 
 
 def _version_from_git() -> str:

package/myagent/main.py

@@ -17,10 +17,11 @@ import signal
 import threading
 from pathlib import Path
 
-# 确保项目根目录在 Python 路径中
+# 确保项目根目录在 Python 路径中（实际代码在 myagent/ 子目录）
 PROJECT_ROOT = Path(__file__).parent.resolve()
-if str(PROJECT_ROOT) not in sys.path:
-    sys.path.insert(0, str(PROJECT_ROOT))
+MYAGENT_DIR = PROJECT_ROOT / 'myagent'
+if str(MYAGENT_DIR) not in sys.path:
+    sys.path.insert(0, str(MYAGENT_DIR))
 
 from config import get_config, ConfigManager
 from core.logger import setup_logger, get_logger

package/myagent/package.json

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

package/myagent/web/api_server.py

@@ -595,8 +595,6 @@ class ApiServer:
         r.add_get("/api/web_control/proxy", self.handle_wc_proxy)
         r.add_post("/api/web_control/proxy", self.handle_wc_proxy_post)
         r.add_get("/api/web_control/panel", self.handle_wc_panel)
-        # [v1.25.3] 人机交互 API
-        r.add_post("/api/web_control/human_done", self.handle_wc_human_done)
         ui_dir = Path(__file__).parent / "ui"
         if ui_dir.exists():
             r.add_static("/ui", str(ui_dir), append_version=True)
@@ -1437,45 +1435,6 @@ function tryDirectConnect() {{
         ok = await self._get_wc_manager().submit_result(sid, cmd_id, result)
         return web.json_response({"success": ok})
 
-    async def handle_wc_human_done(self, request):
-        """[v1.25.3] POST /api/web_control/human_done - 用户完成人机交互, 唤醒等待的 Agent"""
-        try:
-            data = await request.json()
-        except:
-            return web.json_response({"success": False, "error": "Invalid JSON"}, status=400)
-        sid = data.get('session_id', '')
-        if not sid:
-            return web.json_response({"success": False, "error": "Missing session_id"}, status=400)
-        mgr = self._get_wc_manager()
-        session = mgr.get_session(sid)
-        if not session:
-            return web.json_response({"success": False, "error": "Session not found"}, status=404)
-        # 存储用户的结果（备注等）
-        session.human_result = {
-            "note": data.get("note", ""),
-            "current_url": data.get("current_url", ""),
-            "timestamp": time.time(),
-        }
-        # 捕获 iframe 报告的 cookies
-        iframe_cookies = data.get("cookies", "")
-        if iframe_cookies:
-            parsed_url = urlparse(session.current_url)
-            hostname = parsed_url.hostname or ""
-            for part in iframe_cookies.split(';'):
-                part = part.strip()
-                if '=' in part:
-                    name, _, value = part.partition('=')
-                    name = name.strip()
-                    value = value.strip()
-                    if name and value:
-                        session.cookies[f"{hostname}::{name}"] = value
-        # 唤醒等待的 Agent
-        if session.human_event and not session.human_event.is_set():
-            session.human_event.set()
-            logger.info(f"[WebControl] 人机交互完成 (session: {sid})")
-            return web.json_response({"success": True})
-        return web.json_response({"success": False, "error": "No pending human_interact"})
-
     async def handle_wc_proxy(self, request):
         """GET /api/web_control/proxy?url=xxx&sid=xxx - 代理网页请求"""
         url = request.query.get('url', '')
@@ -1670,17 +1629,6 @@ body {{ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans
 .wc-modal h3 {{ margin-bottom:10px; font-size:14px; }}
 .wc-modal textarea {{ width:100%; min-height:120px; padding:8px; border-radius:4px; border:1px solid {input_border}; background:{input_bg}; color:{text_color}; font-size:12px; font-family:monospace; resize:vertical; }}
 .wc-modal-actions {{ display:flex; gap:8px; margin-top:10px; justify-content:flex-end; }}
-/* [v1.25.4] 人机交互模式 (增强版) */
-.wc-human-bar {{ display:none; align-items:center; gap:8px; padding:6px 12px; background:linear-gradient(135deg,#667eea 0%,#764ba2 100%); color:#fff; font-size:12px; font-weight:600; flex-shrink:0; }}
-.wc-human-bar.show {{ display:flex; }}
-.wc-human-bar .wc-human-prompt {{ flex:1; }}
-.wc-human-timer {{ font-size:13px; font-weight:700; min-width:40px; text-align:right; }}
-.wc-btn-human-done {{ background:#00c853; color:#fff; padding:4px 14px; border-radius:4px; border:none; cursor:pointer; font-size:12px; font-weight:700; white-space:nowrap; animation:pulse-btn 1.5s infinite; }}
-.wc-btn-human-done:hover {{ background:#00e676; }}
-.wc-btn-human-cancel {{ background:rgba(255,255,255,0.2); color:#fff; padding:4px 10px; border-radius:4px; border:1px solid rgba(255,255,255,0.4); cursor:pointer; font-size:11px; }}
-.wc-btn-human-refresh {{ background:rgba(255,255,255,0.15); color:#fff; padding:4px 10px; border-radius:4px; border:1px solid rgba(255,255,255,0.3); cursor:pointer; font-size:11px; white-space:nowrap; }}
-.wc-btn-human-refresh:hover {{ background:rgba(255,255,255,0.3); }}
-@keyframes pulse-btn {{ 0%,100% {{ box-shadow:0 0 0 0 rgba(0,200,83,0.4); }} 50% {{ box-shadow:0 0 0 6px rgba(0,200,83,0); }} }}
 </style>
 </head>
 <body>
@@ -1713,27 +1661,6 @@ body {{ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans
   <span id="wcPageInfo" class="wc-toolbar-info"></span>
 </div>
 
-<!-- [v1.25.4] 人机交互横栏 (增强版: 倒计时 + 备注 + 刷新QR码) -->
-<div class="wc-human-bar" id="wcHumanBar">
-  <span id="wcHumanPrompt" class="wc-human-prompt">&#x1F3AF; 请在上方页面完成登录或验证操作...</span>
-  <span id="wcHumanTimer" class="wc-human-timer" style="color:#ffd54f;margin-right:4px;font-variant-numeric:tabular-nums;"></span>
-  <button class="wc-btn-human-refresh" onclick="wcHumanRefresh()" title="刷新页面(重新获取二维码)">&#x1F504; 刷新</button>
-  <button class="wc-btn-human-cancel" onclick="wcHumanCancel()">&#x274C; 取消</button>
-  <button class="wc-btn-human-done" onclick="wcHumanDone()">&#x2705; 完成登录</button>
-</div>
-
-<!-- [v1.25.4] 人机交互备注弹窗 -->
-<div class="wc-overlay" id="wcNoteOverlay">
-  <div class="wc-modal">
-    <h3>&#x1F4DD; 操作备注 (可选)</h3>
-    <textarea id="wcNoteInput" placeholder="记录你做了什么（如：已扫码登录、输入了用户名密码等）..."></textarea>
-    <div class="wc-modal-actions">
-      <button class="wc-btn" onclick="wcCloseNote()">跳过</button>
-      <button class="wc-btn wc-btn-primary" onclick="wcSubmitNote()">确认完成</button>
-    </div>
-  </div>
-</div>
-
 <!-- JS Console Modal -->
 <div class="wc-overlay" id="wcConsoleOverlay">
   <div class="wc-modal">
@@ -1833,20 +1760,6 @@ function wcExecuteCommand(cmd) {{
     wcSubmitResult({{ cmdId: cmd.id, success: true, closed: true }});
     return;
   }}
-  // [v1.25.4] 人机交互命令 — 显示人机模式横栏 (增强版: 带倒计时)
-  if (cmd.action === 'human_interact') {{
-    var prompt = (cmd.params && cmd.params.prompt) ? cmd.params.prompt : '';
-    var timeout = (cmd.params && cmd.params.timeout) ? parseInt(cmd.params.timeout) : 300;
-    wcShowHumanBar(prompt, timeout);
-    wcSubmitResult({{ cmdId: cmd.id, success: true, human_mode: true }});
-    return;
-  }}
-  // [v1.25.3] 恢复 Agent 模式命令
-  if (cmd.action === 'agent_mode') {{
-    wcHideHumanBar();
-    wcSubmitResult({{ cmdId: cmd.id, success: true, human_mode: false }});
-    return;
-  }}
 
   // 其他命令通过 postMessage 发送到 iframe 中的控制脚本
   try {{
@@ -1911,146 +1824,6 @@ function wcToggleFullscreen() {{
   }}
 }}
 
-// ── [v1.25.4] 人机交互模式 (增强版) ──
-var wcHumanMode = false;
-var wcHumanTimer = null;
-var wcHumanStartTime = 0;
-var wcHumanTimeout = 300; // 默认5分钟
-var wcHumanLoginUrl = ''; // [v1.25.4] 记录登录URL，用于刷新
-
-function wcShowHumanBar(prompt, timeout) {{
-  wcHumanMode = true;
-  var bar = document.getElementById('wcHumanBar');
-  var promptEl = document.getElementById('wcHumanPrompt');
-  if (bar) bar.classList.add('show');
-  if (promptEl && prompt) promptEl.textContent = '\U0001f3af ' + prompt;
-  document.getElementById('wcStatus').textContent = '人机交互模式';
-  document.getElementById('wcStatus').className = 'wc-status connected';
-  document.getElementById('wcStatus').style.color = '#667eea';
-  // 记录当前URL用于刷新
-  wcHumanLoginUrl = document.getElementById('wcUrlInput').value || '';
-  // 启动倒计时
-  wcHumanTimeout = timeout || 300;
-  wcHumanStartTime = Date.now();
-  if (wcHumanTimer) clearInterval(wcHumanTimer);
-  wcHumanTimer = setInterval(wcUpdateTimer, 1000);
-  wcUpdateTimer();
-  // 通知父窗口进入人机模式
-  window.parent.postMessage({{ __webControlPanel: true, action: 'human_interact', session_id: WC_SESSION_ID }}, '*');
-}}
-
-function wcHideHumanBar() {{
-  wcHumanMode = false;
-  var bar = document.getElementById('wcHumanBar');
-  if (bar) bar.classList.remove('show');
-  document.getElementById('wcStatus').textContent = '已连接';
-  document.getElementById('wcStatus').style.color = '';
-  // 停止倒计时
-  if (wcHumanTimer) {{ clearInterval(wcHumanTimer); wcHumanTimer = null; }}
-  document.getElementById('wcHumanTimer').textContent = '';
-  // 通知父窗口退出人机模式
-  window.parent.postMessage({{ __webControlPanel: true, action: 'human_done', session_id: WC_SESSION_ID }}, '*');
-}}
-
-// [v1.25.4] 倒计时显示
-function wcUpdateTimer() {{
-  var elapsed = Math.floor((Date.now() - wcHumanStartTime) / 1000);
-  var remaining = wcHumanTimeout - elapsed;
-  if (remaining < 0) remaining = 0;
-  var minutes = Math.floor(remaining / 60);
-  var seconds = remaining % 60;
-  var timerEl = document.getElementById('wcHumanTimer');
-  if (timerEl) {{
-    timerEl.textContent = String(minutes).padStart(2, '0') + ':' + String(seconds).padStart(2, '0');
-    // 最后30秒变红
-    timerEl.style.color = remaining <= 30 ? '#ff5252' : '#ffd54f';
-  }}
-  if (remaining <= 0 && wcHumanTimer) {{
-    clearInterval(wcHumanTimer);
-    wcHumanTimer = null;
-  }}
-}}
-
-// [v1.25.4] 刷新页面 (重新获取QR码)
-function wcHumanRefresh() {{
-  var url = wcHumanLoginUrl || document.getElementById('wcUrlInput').value || '';
-  if (url) {{
-    wcNavigate(url);
-    wcShowLoading('刷新页面...');
-  }}
-}}
-
-// [v1.25.4] 人机完成 -> 先弹出备注框
-function wcHumanDone() {{
-  document.getElementById('wcNoteOverlay').classList.add('show');
-  document.getElementById('wcNoteInput').value = '';
-  document.getElementById('wcNoteInput').focus();
-}}
-function wcCloseNote() {{
-  document.getElementById('wcNoteOverlay').classList.remove('show');
-  // 无备注直接完成
-  wcDoHumanDone('');
-}}
-function wcSubmitNote() {{
-  var note = document.getElementById('wcNoteInput').value.trim();
-  document.getElementById('wcNoteOverlay').classList.remove('show');
-  wcDoHumanDone(note);
-}}
-
-async function wcDoHumanDone(userNote) {{
-  // 从 iframe 捕获 cookies
-  var iframeCookies = '';
-  try {{
-    var iframe = document.getElementById('wcIframe');
-    if (iframe && iframe.contentWindow && iframe.contentWindow.document) {{
-      iframeCookies = iframe.contentWindow.document.cookie || '';
-    }}
-  }} catch(e) {{}}
-  // 获取当前 URL
-  var currentUrl = document.getElementById('wcUrlInput').value || '';
-
-  wcHideHumanBar();
-
-  // 通知服务端用户已完成
-  try {{
-    var resp = await fetch('/api/web_control/human_done', {{
-      method: 'POST',
-      headers: {{ 'Content-Type': 'application/json' }},
-      body: JSON.stringify({{
-        session_id: WC_SESSION_ID,
-        current_url: currentUrl,
-        cookies: iframeCookies,
-        note: userNote || ''
-      }})
-    }});
-    var result = await resp.json();
-    if (result.success) {{
-      console.log('[WebControl] 人机交互完成, Agent 已恢复');
-    }} else {{
-      console.warn('[WebControl] human_done 失败:', result.error);
-    }}
-  }} catch(e) {{
-    console.error('[WebControl] human_done error:', e);
-  }}
-}}
-
-async function wcHumanCancel() {{
-  wcHideHumanBar();
-  // 取消时也通知服务端
-  try {{
-    await fetch('/api/web_control/human_done', {{
-      method: 'POST',
-      headers: {{ 'Content-Type': 'application/json' }},
-      body: JSON.stringify({{
-        session_id: WC_SESSION_ID,
-        current_url: document.getElementById('wcUrlInput').value || '',
-        cookies: '',
-        note: '用户取消'
-      }})
-    }});
-  }} catch(e) {{}}
-}}
-
 // ── 辅助 ──
 function wcShowLoading(text) {{
   var el = document.getElementById('wcLoading');

package/myagent/web/ui/chat/chat_main.js

@@ -1603,26 +1603,6 @@ window.addEventListener('message', function(event) {
       api('/api/web_control/poll?sid=' + wcCurrentSessionId).catch(function(){});
     } else if (action === 'close' || action === 'closed') {
       closeWCOverlay();
-    } else if (action === 'human_interact') {
-      // [v1.25.3] 面板进入人机模式 - 在聊天中显示提示
-      wcCurrentSessionId = event.data.session_id || wcCurrentSessionId;
-      var wcPlatform = lastEvent.platform || '';
-      var wcPrompt = lastEvent.prompt || '等待你在网页面板中完成操作...';
-      appendMessage('system', '🎯 Agent 已暂停，' + wcPrompt + (wcPlatform ? ' (' + wcPlatform + ')' : ''));
-    } else if (action === 'human_done') {
-      // [v1.25.3] 人机操作完成
-      appendMessage('system', '✅ 人机交互完成，Agent 已恢复控制');
-    } else if (action === 'login') {
-      // [v1.25.4] 登录流程开始
-      wcCurrentSessionId = event.data.session_id || wcCurrentSessionId;
-      var loginPlatform = lastEvent.platform || '';
-      var loginPrompt = lastEvent.prompt || '请在网页面板中完成登录...';
-      appendMessage('system', '🔐 ' + loginPrompt + (loginPlatform ? ' [' + loginPlatform + ']' : ''));
-    } else if (action === 'login_done') {
-      // [v1.25.4] 登录完成
-      var loginOk = lastEvent.login_success;
-      var loginPlat = lastEvent.platform || '';
-      appendMessage('system', (loginOk ? '✅ ' : '⚠️ ') + (loginPlat ? loginPlat + ' ' : '') + '登录操作完成' + (loginOk ? ' (已登录成功)' : ''));
     }
   }
 });
@@ -3419,22 +3399,6 @@ window.buildMessageHtml = function(msg, idx, agent) {
     } else if (wcAction === 'close') {
       wcDesc = '已关闭控制面板';
       wcIcon = '⏹';
-    } else if (wcAction === 'human_interact') {
-      wcDesc = lastEvent.prompt || '等待用户手动操作...';
-      wcTitle = '人机交互模式';
-      wcIcon = '🎯';
-    } else if (wcAction === 'human_done') {
-      wcDesc = lastEvent.timed_out ? '人机交互超时' : '用户已完成操作';
-      wcTitle = '人机交互完成';
-      wcIcon = '✅';
-    } else if (wcAction === 'login') {
-      wcDesc = (lastEvent.platform || '登录') + ' — ' + (lastEvent.prompt || '请在网页面板中完成登录');
-      wcTitle = '登录 ' + (lastEvent.platform || '');
-      wcIcon = '🔐';
-    } else if (wcAction === 'login_done') {
-      wcDesc = lastEvent.login_success ? '登录成功' : '登录操作完成';
-      wcTitle = (lastEvent.platform || '') + ' 登录完成';
-      wcIcon = lastEvent.login_success ? '✅' : '⚠️';
     }
     return '<div class="msg-wc-card" onclick="if(typeof openWCOverlay===\'function\')openWCOverlay(\'' + escapeHtml(wcSessionId) + '\',\'' + escapeHtml(wcUrl) + '\')" title="点击重新打开">' +
       '<span class="msg-wc-icon">' + wcIcon + '</span>' +
@@ -4740,8 +4704,7 @@ document.addEventListener('keydown', (e) => {
 // ══════════════════════════════════════════════════════
 // ── Setup Wizard ──
 // ══════════════════════════════════════════════════════
-let setupStep = 0; // 0: welcome, 1: provider, 2: config, 3: platforms, 4: done
-let setupPlatforms = {}; // { platform: { enabled, token, ... } }
+let setupStep = 0; // 0: welcome, 1: provider, 2: config, 3: done
 let setupProvider = 'modelscope';
 
 const SETUP_PROVIDERS = {
@@ -4858,7 +4821,7 @@ function skipSetup() {
 
 function renderSetupDots() {
   let html = '<div class="setup-steps">';
-  for (let i = 0; i < 5; i++) {
+  for (let i = 0; i < 4; i++) {
     let cls = 'setup-step-dot';
     if (i < setupStep) cls += ' done';
     else if (i === setupStep) cls += ' active';
@@ -4975,65 +4938,19 @@ function renderSetupStep() {
       <div class="setup-status" id="setupStatus"></div>
       <div class="setup-actions">
         <button class="setup-btn setup-btn-secondary" onclick="setupStep=1;renderSetupStep()">← 上一步</button>
-        <button class="setup-btn setup-btn-skip" onclick="setupStep=4;renderSetupStep()">跳过，稍后配置</button>
+        <button class="setup-btn setup-btn-skip" onclick="setupStep=3;renderSetupStep()">跳过，稍后配置</button>
         <button class="setup-btn setup-btn-secondary" onclick="setupTestConnection()">🔗 测试连接</button>
-        <button class="setup-btn setup-btn-primary" onclick="setupSaveLLMAndNext()">下一步 →</button>
+        <button class="setup-btn setup-btn-primary" onclick="setupSaveAndComplete()">✅ 保存并完成</button>
       </div>`;
   } else if (setupStep === 3) {
-    // Platform integration
-    const platformList = [
-      { key: 'telegram', icon: '📱', name: 'Telegram', desc: '通过 Bot Token 接入', tokenLabel: 'Bot Token', hasAppId: false },
-      { key: 'discord', icon: '🎮', name: 'Discord', desc: '通过 Bot Token 接入', tokenLabel: 'Bot Token', hasAppId: false },
-      { key: 'feishu', icon: '🐦', name: '飞书', desc: '通过 App ID + App Secret 接入', tokenLabel: 'App Secret', hasAppId: true },
-      { key: 'qq', icon: '🐧', name: 'QQ', desc: '通过 Bot Token 接入', tokenLabel: 'Bot Token', hasAppId: false },
-      { key: 'wechat', icon: '💚', name: '微信', desc: '通过 Token 接入', tokenLabel: 'Token', hasAppId: false }
-    ];
-    let cardsHtml = '';
-    for (const pl of platformList) {
-      const enabled = setupPlatforms[pl.key] && setupPlatforms[pl.key].enabled;
-      const selCls = enabled ? ' selected' : '';
-      cardsHtml += `
-        <div class="provider-card${selCls}" id="platCard_${pl.key}" onclick="toggleSetupPlatform('${pl.key}')">
-          <div class="provider-icon">${pl.icon}</div>
-          <div class="provider-name">${pl.name} ${enabled ? '<span style="color:var(--success);font-size:11px">✓ 已启用</span>' : ''}</div>
-          <div class="provider-desc">${pl.desc}</div>
-        </div>`;
-    }
-    // Platform detail form area
-    let detailHtml = '';
-    for (const pl of platformList) {
-      const cfg = setupPlatforms[pl.key] || { enabled: false, token: '', app_id: '' };
-      const display = cfg.enabled ? '' : 'display:none';
-      detailHtml += `
-        <div class="platform-detail" id="platDetail_${pl.key}" style="${display};margin-bottom:16px;padding:16px;border-radius:var(--radius-sm);background:var(--bg2);border:1px solid var(--border)">
-          <h4 style="margin:0 0 12px;font-size:14px">${pl.icon} 配置 ${pl.name}</h4>
-          ${pl.hasAppId ? `<div class="form-group"><label>App ID</label><input type="text" id="platAppId_${pl.key}" placeholder="填写 App ID" value="${escapeHtml(cfg.app_id || '')}"><div class="form-hint">在 ${pl.name} 开放平台获取</div></div>` : ''}
-          <div class="form-group"><label>${pl.tokenLabel}</label><input type="password" id="platToken_${pl.key}" placeholder="填写 ${pl.tokenLabel}" value="${escapeHtml(cfg.token || '')}" autocomplete="off"><div class="form-hint">在 ${pl.name} 开放平台获取</div></div>
-          <button class="setup-btn setup-btn-secondary" style="padding:6px 14px;font-size:12px" onclick="setupSavePlatform('${pl.key}')">💾 保存 ${pl.name} 配置</button>
-        </div>`;
-    }
-    wizard.innerHTML = `
-      ${renderSetupDots()}
-      <h2>🌐 聊天平台接入（可选）</h2>
-      <p class="setup-subtitle">将 Agent 接入聊天平台，随时随地与 AI 对话</p>
-      <div style="max-height:200px;overflow-y:auto;margin-bottom:16px">${cardsHtml}</div>
-      <div id="platformDetailArea">${detailHtml}</div>
-      <div class="setup-desc" style="margin-top:8px">
-        <p style="font-size:12px;color:var(--text3);line-height:1.7">
-          💡 点击上方平台卡片启用，填写 Token 后保存。可随时在管理后台的「平台配置」中管理。<br>
-          不需要接入平台可跳过此步骤，直接使用 Web 聊天界面。
-        </p>
-      </div>
-      <div class="setup-actions">
-        <button class="setup-btn setup-btn-secondary" onclick="setupStep=2;renderSetupStep()">← 上一步</button>
-        <button class="setup-btn setup-btn-skip" onclick="setupStep=4;renderSetupStep()">跳过</button>
-        <button class="setup-btn setup-btn-primary" onclick="setupStep=4;renderSetupStep()">下一步 →</button>
-      </div>`;
-  } else if (setupStep === 4) {
     // Done
     const p = SETUP_PROVIDERS[setupProvider];
+    const apiKeyEl = document.getElementById('setupApiKey');
+    const baseUrlEl = document.getElementById('setupBaseUrl');
+    const modelEl = document.getElementById('setupModel');
+    const hasConfig = apiKeyEl && apiKeyEl.value;
     let summaryHtml = '';
-    if (p) {
+    if (hasConfig) {
       summaryHtml = `
         <div class="setup-summary">
           <div class="summary-row">
@@ -5041,20 +4958,12 @@ function renderSetupStep() {
             <span class="summary-value">${p.icon} ${p.name}</span>
           </div>
           <div class="summary-row">
-            <span class="summary-label">模型</span>
-            <span class="summary-value">${escapeHtml(p.model)}</span>
+            <span class="summary-label">Base URL</span>
+            <span class="summary-value">${escapeHtml(baseUrlEl ? baseUrlEl.value : p.base_url)}</span>
           </div>
-        </div>`;
-    }
-    const enabledPlatforms = Object.keys(setupPlatforms).filter(k => setupPlatforms[k].enabled);
-    let platformSummary = '';
-    if (enabledPlatforms.length > 0) {
-      const platformNames = { telegram: '📱 Telegram', discord: '🎮 Discord', feishu: '🐦 飞书', qq: '🐧 QQ', wechat: '💚 微信' };
-      platformSummary = `
-        <div class="setup-summary" style="margin-top:8px">
           <div class="summary-row">
-            <span class="summary-label">已接入平台</span>
-            <span class="summary-value">${enabledPlatforms.map(k => platformNames[k] || k).join(', ')}</span>
+            <span class="summary-label">模型</span>
+            <span class="summary-value">${escapeHtml(modelEl ? modelEl.value : p.model)}</span>
           </div>
         </div>`;
     }
@@ -5063,18 +4972,15 @@ function renderSetupStep() {
       <h2>🎉 配置完成！</h2>
       <p class="setup-subtitle">你已准备好开始使用 MyAgent</p>
       ${summaryHtml}
-      ${platformSummary}
       <div class="setup-desc">
         <p>💡 <strong>提示：</strong></p>
         <ul style="margin:8px 0 0 20px;line-height:2">
-          <li>随时可以在管理后台的「模型设置」中修改 API 配置</li>
-          <li>随时可以在管理后台的「平台配置」中管理聊天平台</li>
-          <li>点击右侧 Agent 面板中的 🛡️ 配置助手获取更多帮助</li>
+          <li>随时可以在「配置管理」中修改 API 设置</li>
+          <li>点击右侧 Agent 面板中的 🛡️ 配置助手获取帮助</li>
           <li>使用 <kbd style="padding:2px 6px;background:var(--bg3);border-radius:3px;font-size:11px">Ctrl+N</kbd> 快速创建新对话</li>
         </ul>
       </div>
       <div class="setup-actions">
-        <button class="setup-btn setup-btn-secondary" onclick="setupStep=3;renderSetupStep()">← 上一步</button>
         <button class="setup-btn setup-btn-primary" onclick="skipSetup()">🚀 开始使用</button>
       </div>`;
   }
@@ -5089,121 +4995,6 @@ function selectSetupProvider(key) {
   event.currentTarget.classList.add('selected');
 }
 
-function toggleSetupPlatform(key) {
-  if (!setupPlatforms[key]) {
-    setupPlatforms[key] = { enabled: false, token: '', app_id: '' };
-  }
-  setupPlatforms[key].enabled = !setupPlatforms[key].enabled;
-  // Toggle card style and detail area
-  const card = document.getElementById('platCard_' + key);
-  const detail = document.getElementById('platDetail_' + key);
-  if (card) {
-    card.classList.toggle('selected', setupPlatforms[key].enabled);
-    // Update name to show checkmark
-    const nameEl = card.querySelector('.provider-name');
-    if (nameEl) {
-      const baseName = nameEl.textContent.replace(/ ✓ 已启用| ✓ 已启用/, '').replace(/[✓ 已启用]/g, '').trim();
-      nameEl.innerHTML = baseName + (setupPlatforms[key].enabled ? ' <span style="color:var(--success);font-size:11px">✓ 已启用</span>' : '');
-    }
-  }
-  if (detail) {
-    detail.style.display = setupPlatforms[key].enabled ? '' : 'none';
-  }
-}
-
-async function setupSavePlatform(key) {
-  const tokenEl = document.getElementById('platToken_' + key);
-  const appIdEl = document.getElementById('platAppId_' + key);
-  const token = tokenEl ? tokenEl.value.trim() : '';
-  const appId = appIdEl ? appIdEl.value.trim() : '';
-
-  if (!token && !appId) {
-    showToast('请至少填写 Token 或 App ID', 'warning');
-    return;
-  }
-
-  try {
-    const body = { platform: key, token: token, enabled: true };
-    if (appId) body.app_id = appId;
-    const r = await api('/api/platforms', { method: 'POST', body: JSON.stringify(body) });
-    if (r.error) {
-      showToast('保存失败：' + r.error, 'danger');
-      return;
-    }
-    // Update local state
-    setupPlatforms[key].token = token;
-    setupPlatforms[key].app_id = appId;
-    showToast('已保存 ' + key + ' 平台配置', 'success');
-  } catch (e) {
-    showToast('保存失败：' + (e.message || '网络错误'), 'danger');
-  }
-}
-
-async function setupSaveLLMAndNext() {
-  // Same logic as setupSaveAndComplete, but goes to platform step instead of done
-  const statusEl = document.getElementById('setupStatus');
-  const apiKey = document.getElementById('setupApiKey').value;
-  const baseUrl = document.getElementById('setupBaseUrl').value;
-  const model = document.getElementById('setupModel').value;
-  const customNameEl = document.getElementById('setupCustomName');
-  const customName = customNameEl ? customNameEl.value.trim() : '';
-  const p = SETUP_PROVIDERS[setupProvider];
-  const isCustom = !!p.is_custom;
-
-  if (isCustom && (!baseUrl || !model)) {
-    if (statusEl) {
-      statusEl.className = 'setup-status show error';
-      statusEl.innerHTML = '❌ 自定义模型必须填写 Base URL 和模型名称';
-    }
-    return;
-  }
-
-  try {
-    const provider = isCustom ? 'custom' : setupProvider;
-    await api('/api/llm', {
-      method: 'PUT',
-      body: JSON.stringify({ api_key: apiKey, base_url: baseUrl, model: model, provider: provider })
-    });
-
-    // Also add to model library
-    const modelId = 'custom-' + model.replace(/[^a-zA-Z0-9._-]/g, '-').toLowerCase();
-    const modelDisplayName = isCustom && customName
-      ? customName
-      : (p.name + ' - ' + model);
-    try {
-      await api('/api/models', {
-        method: 'POST',
-        body: JSON.stringify({
-          id: modelId,
-          name: modelDisplayName,
-          provider: provider,
-          model: model,
-          base_url: baseUrl,
-          api_key: apiKey,
-          max_tokens: 4096,
-          temperature: 0.1,
-          enabled: true
-        })
-      });
-    } catch (modelErr) {
-      console.warn('Failed to add model to library:', modelErr);
-    }
-
-    await api('/api/setup/complete', { method: 'POST' });
-    StatePersistence.markSetupDone();
-    loadStatus();
-    loadModels();
-    // Go to platform step instead of done
-    setupStep = 3;
-    renderSetupStep();
-  } catch (e) {
-    if (statusEl) {
-      statusEl.className = 'setup-status show error';
-      statusEl.innerHTML = '❌ 保存失败：' + escapeHtml(e.message || '未知错误');
-    }
-  }
-}
-
 async function setupTestConnection() {
   const statusEl = document.getElementById('setupStatus');
   if (!statusEl) return;

package/myagent/worklog-v1.22.md

@@ -0,0 +1,12 @@
+---
+Task ID: 2
+Agent: main
+Task: 创建 ToolDispatcher + 重构工具分发 + Skill Prompt 按需加载
+
+Stage Summary:
+- 新文件: myagent/core/tool_dispatcher.py (438行)
+- main_agent.py: 1895→1557行 (-338行), 替换 _execute_v2_tool 为 dispatcher.dispatch()
+- main.py: 初始化 ToolDispatcher, 添加 _sync_skill_guides_to_knowledge()
+- context_builder.py: _build_skill_prompts() 返回空字符串
+- SYSTEM_PROMPT: 移除 code/command_run, 添加专业技能指令 get_knowledge 说明
+- 修复 _safe_sse NameError bug

package/myagent/worklog.md

@@ -102,3 +102,47 @@ Stage Summary:
 - 版本: 1.25.1 → 1.25.2
 - npm: myagent-ai@1.25.2 已发布
 - GitHub: 已推送到 ctz168/myagent main 分支 (commit 9f7409a, 49de298)
+---
+Task ID: 1
+Agent: main
+Task: 完善 webcontrol 工具 - 人机交互登录增强 (v1.25.4)
+
+Work Log:
+- 调查现有 webcontrol 实现（myagent/core/web_control.py, tool_dispatcher.py, api_server.py, chat_main.js）
+- 设计增强方案：login 一站式登录流程 + 凭证管理 + UI 优化
+- 修改 myagent/core/web_control.py：新增 LOGIN_URLS 平台模板(18个平台)，增强 CONTROL_SCRIPT 人机模式(URL变化检测/平台名显示)，新增 save_credentials_to_file/list_credentials/delete_credentials 方法
+- 修改 myagent/core/tool_dispatcher.py：新增 login action(一站式登录流程)，新增 save_credentials/list_credentials/delete_credentials action
+- 修改 myagent/skills/registry.py：更新 web_control 工具 schema，新增4个action + platform参数
+- 修改 myagent/web/api_server.py：面板UI增强(倒计时/备注弹窗/刷新QR码按钮/login事件处理)
+- 修改 myagent/web/ui/chat/chat_main.js：新增 login/login_done SSE 事件处理 + 历史消息渲染
+- 同步 root/core/ 文件
+- 更新版本号到 1.25.4
+- 推送 GitHub + 发布 npm
+
+Stage Summary:
+- 已发布 v1.25.4
+- 新增 4 个 web_control action: login, save_credentials, list_credentials, delete_credentials
+- 18 个预置平台登录 URL (QQ/微信/Telegram/Discord/飞书/钉钉/GitHub/Google/B站/淘宝/知乎/微博等)
+- 凭证管理: 自动保存 cookies 到 ~/.myagent/data/credentials/
+- 面板增强: 倒计时显示(最后30秒变红)、备注弹窗、刷新QR码按钮
+- 登录检测: URL 变化自动通知(登录成功判断)
+---
+Task ID: 1
+Agent: main
+Task: 修复严重事故 - v1.25.2/v1.25.4 升级导致版本降级
+
+Work Log:
+- 检查 npm registry 确认最新版本为 1.25.4
+- 克隆 GitHub 仓库，对比 v1.25.1 和 v1.25.4 的包内容
+- 发现 v1.25.4 npm 包根目录缺少 start.js、start.sh、web/ 目录
+- 定位根因: commit 9f7409a (v1.25.2 准备) 意外删除了根目录的 start.js、start.sh、web/ 等关键文件
+- 这些文件仅存在于 myagent/ 子目录下（npm 包内），但 package.json 的 bin 入口指向根目录
+- 从 v1.25.1 恢复 start.js/start.sh，从 v1.25.4 npm 包的 myagent/ 子目录恢复 web/（含 setup wizard 平台接入改动）
+- 更新版本号到 1.25.5，提交并推送到 GitHub
+- 成功发布 v1.25.5 到 npm registry
+
+Stage Summary:
+- 根因: commit 9f7409a 意外删除了根目录的 start.js、start.sh、web/ 目录
+- 影响: v1.25.2-v1.25.4 的 npm 包 bin 入口断裂，升级后回退到旧版本
+- 修复: v1.25.5 已发布到 npm，恢复所有关键文件
+- 用户可通过 `npm install -g myagent-ai@latest --force` 修复

package/package.json

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