myagent-ai 1.18.6 → 1.18.8

package/core/deps_checker.py

@@ -100,8 +100,10 @@ DEPENDENCIES: List[DepInfo] = [
     DepInfo("edge_tts", "edge-tts", "6.1.0", "tts", "all"),
 
     # ── 语音识别 (STT) ──
+    DepInfo("funasr", "funasr", "1.1.0", "stt", "all",
+            note="[v1.18.7] SenseVoice 中文语音识别（推荐，需 torch+torchaudio）"),
     DepInfo("faster_whisper", "faster-whisper", "1.0.0", "stt", "all",
-            note="本地语音识别引擎 (需要 C++ 编译)"),
+            note="Whisper 本地语音识别引擎 (需要 C++ 编译)"),
     DepInfo("speech_recognition", "SpeechRecognition", "3.10.0", "stt", "all",
             note="在线语音识别 (Google API，纯 Python 无需编译，Termux 兼容)"),
 

package/package.json

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

package/skills/base.py

@@ -94,10 +94,14 @@ class Skill(ABC):
         pass
 
     def validate_params(self, params: Dict[str, Any]) -> tuple[bool, str]:
-        """校验参数是否合法"""
+        """校验参数是否合法。有默认值的必需参数在缺失时自动填充。"""
         for p in self.parameters:
-            if p.required and p.name not in params:
-                return False, f"缺少必需参数: {p.name}"
+            if p.name not in params:
+                # [v1.18.7] 有默认值的必需参数：自动填充而非报错
+                if p.default is not None:
+                    params[p.name] = p.default
+                elif p.required:
+                    return False, f"缺少必需参数: {p.name}"
             if p.name in params and p.enum and params[p.name] not in p.enum:
                 return False, f"参数 {p.name} 值无效，可选: {p.enum}"
         return True, ""

package/skills/xlsx_skill.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 
 import json
 import os
+import time
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -29,18 +30,19 @@ class XLSXCreateSkill(Skill):
     """
     name = "xlsx_create"
     description = (
-        "生成 Excel (XLSX) 电子表格。支持多工作表、表头、数据行、公式、"
+        "生成 Excel (XLSX) 电子表格文件。支持多工作表、表头、数据行、公式、"
         "冻结窗格、自动筛选、列宽设置。"
-        "sheets 为 JSON 对象，key 为工作表名。"
+        "参数 sheets 必须是 JSON 字符串，格式为 {\"工作表名\": {\"headers\":[...], \"rows\":[[...]]}}。"
+        "参数 output_path 指定输出文件路径，默认为工作目录下。"
     )
     category = "doc"
     dangerous = True
     parameters = [
         SkillParameter("sheets", "string",
-            "工作表数据 JSON 对象。key=工作表名, value={headers, rows, col_widths?, formulas?}。"
-            "示例: {\"Sheet1\":{\"headers\":[\"Name\",\"Score\"],\"rows\":[[\"Alice\",95]]}}",
+            "工作表数据，JSON 字符串。key=工作表名, value包含 headers(列名数组) 和 rows(数据行二维数组)。"
+            "示例: '{\"Sheet1\":{\"headers\":[\"姓名\",\"分数\"],\"rows\":[[\"Alice\",95]]}}'",
             required=True),
-        SkillParameter("output_path", "string", "输出 XLSX 文件路径", required=True),
+        SkillParameter("output_path", "string", "输出文件路径(如 /tmp/report.xlsx)", required=False, default=""),
         SkillParameter("title", "string", "文档标题", required=False, default=""),
     ]
 
@@ -62,6 +64,15 @@ class XLSXCreateSkill(Skill):
 
         try:
             out = Path(output_path).expanduser().resolve()
+            if not output_path.strip():
+                # [v1.18.7] 默认输出路径：工作目录/data/workspace下
+                from core.context_manager import get_active_context
+                try:
+                    ctx = get_active_context()
+                    work_dir = Path(ctx.work_dir) if ctx and ctx.work_dir else Path.cwd()
+                except Exception:
+                    work_dir = Path.cwd()
+                out = work_dir / f"report_{int(time.time())}.xlsx"
             out.parent.mkdir(parents=True, exist_ok=True)
 
             wb = openpyxl.Workbook()

package/web/api_server.py

@@ -373,6 +373,7 @@ class ApiServer:
         r.add_get("/api/workdir", self.handle_get_workdir)
         # ── Task Plan ──
         r.add_get("/api/task-plan", self.handle_get_task_plan)
+        r.add_get("/api/task-plan/all", self.handle_get_all_task_plans)
         r.add_put("/api/task-plan", self.handle_update_task_plan)
         r.add_post("/api/task-plan", self.handle_add_task_item)
         r.add_delete("/api/task-plan/{idx:int}", self.handle_delete_task_item)
@@ -1544,13 +1545,15 @@ window.toggleFullscreen = function() {{
             return web.json_response({"error": str(e)}, status=500)
 
     async def handle_voice_stt(self, request):
-        """POST /api/voice-stt - 轻量级本地语音转文字
+        """POST /api/voice-stt - 本地语音转文字
 
         接受音频文件（WAV/WEBM/OGG），使用本地 STT 引擎转录。
         支持的引擎（按优先级）：
-        1. faster-whisper（推荐，需安装：pip install faster-whisper）
-        2. vosk（备选，需安装：pip install vosk）
-        如果都未安装，返回错误提示。
+        1. [v1.18.7] SenseVoice（推荐，中文识别最佳，需：pip install funasr torch torchaudio）
+        2. faster-whisper（备选，需安装：pip install faster-whisper）
+        3. vosk（备选，需安装：pip install vosk）
+        4. LLM API Whisper 兼容端点
+        5. SpeechRecognition（Google，需外网）
         """
         try:
             reader = await request.multipart()
@@ -1583,6 +1586,59 @@ window.toggleFullscreen = function() {{
 
             import io
 
+            # ── [v1.18.7] 首选: SenseVoice（阿里达摩院，中文识别极佳） ──
+            try:
+                sv_model = getattr(self, '_sensevoice_model', None)
+                if sv_model is None:
+                    os.environ.setdefault("HF_HUB_DISABLE_TELEMETRY", "1")
+                    os.environ.setdefault("HF_HUB_DISABLE_PROGRESS_BARS", "1")
+                    from funasr import AutoModel
+                    model_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'models', 'sensevoice')
+                    sv_model = AutoModel(model="iic/SenseVoiceSmall", model_dir=model_dir,
+                                         device="cpu", disable_pbar=True, disable_update=True)
+                    self._sensevoice_model = sv_model
+                    logger.info("SenseVoice 模型已加载 (iic/SenseVoiceSmall, CPU)")
+
+                # SenseVoice 接受 16kHz WAV
+                wav_path = f"/tmp/myagent_stt_{id(audio_data) % 100000}.wav"
+                wav_buf = io.BytesIO()
+                try:
+                    from pydub import AudioSegment
+                    audio_buf = io.BytesIO(audio_data)
+                    seg = AudioSegment.from_file(audio_buf, format=audio_format or "webm")
+                    seg = seg.set_channels(1).set_frame_rate(16000).set_sample_width(2)
+                    seg.export(wav_buf, format="wav")
+                except Exception:
+                    wav_buf = io.BytesIO(audio_data)
+                wav_buf.seek(0)
+                with open(wav_path, 'wb') as f:
+                    f.write(wav_buf.read())
+
+                # SenseVoice 推理
+                res = sv_model.generate(input=wav_path, cache={},
+                                        language="auto",  # 自动检测语言
+                                        use_itn=True,     # 逆文本标准化（数字/日期等）
+                                        batch_size_s=300)
+                if res and len(res) > 0 and len(res[0]) > 0:
+                    text = res[0][0]["text"] if isinstance(res[0][0], dict) else str(res[0][0])
+                    # SenseVoice 可能输出带 <|zh|><|en|><|EMO|> 等特殊 token，清理掉
+                    import re
+                    text = re.sub(r'<\|[^|]+\|>', '', text).strip()
+                    if text:
+                        try:
+                            os.remove(wav_path)
+                        except Exception:
+                            pass
+                        return web.json_response({"text": text, "engine": "sensevoice"})
+                try:
+                    os.remove(wav_path)
+                except Exception:
+                    pass
+            except ImportError:
+                logger.debug("SenseVoice (funasr) 未安装，跳过。安装: pip install funasr torch torchaudio")
+            except Exception as e:
+                logger.warning(f"SenseVoice 转录失败: {e}")
+
             # ── 尝试 faster-whisper ──
             try:
                 whisper_model = self._whisper_model
@@ -1814,10 +1870,11 @@ window.toggleFullscreen = function() {{
             # ── 没有可用的 STT 引擎 ──
             return web.json_response({
                 "error": "未检测到可用的 STT 引擎。请尝试以下方案：\n"
-                         "  1. 配置支持 Whisper 的 LLM API（自动使用，推荐）\n"
-                         "  2. pip install faster-whisper  (离线本地，需 C++ 编译环境)\n"
-                         "  3. pip install vosk             (离线本地，需下载模型)\n"
-                         "  4. pip install SpeechRecognition (需外网，国内不可用)",
+                         "  1. pip install funasr torch torchaudio  (SenseVoice，中文最佳，推荐)\n"
+                         "  2. 配置支持 Whisper 的 LLM API（自动使用，无需安装）\n"
+                         "  3. pip install faster-whisper  (离线本地，需 C++ 编译环境)\n"
+                         "  4. pip install vosk             (离线本地，需下载模型)\n"
+                         "  5. pip install SpeechRecognition (需外网，国内不可用)",
                 "available": False,
             }, status=503)
 
@@ -2103,6 +2160,36 @@ window.toggleFullscreen = function() {{
         self._task_list_store[store_key] = tasks
         return web.json_response({"ok": True, "tasks": tasks, "session": session_id})
 
+    async def handle_get_all_task_plans(self, request):
+        """GET /api/task-plan/all - 获取所有活跃的 task plan（用于后台管理任务列表）。
+
+        返回所有 _task_list_store 中的非空任务列表，包含 session_id/agent_path 信息。
+        """
+        all_plans = []
+        for key, tasks in self._task_list_store.items():
+            if not tasks:
+                continue
+            # 统计状态
+            status_counts = {"pending": 0, "running": 0, "done": 0}
+            for t in tasks:
+                s = t.get("status", "pending")
+                status_counts[s] = status_counts.get(s, 0) + 1
+            # 判断 key 类型
+            is_session = key.startswith(("web_", "cli_", "group_", "tg_", "discord_", "feishu_"))
+            all_plans.append({
+                "key": key,
+                "type": "session" if is_session else "agent",
+                "total": len(tasks),
+                "pending": status_counts["pending"],
+                "running": status_counts["running"],
+                "done": status_counts["done"],
+                "tasks": tasks,
+                "label": key.split("_web_")[0][:30] if is_session else key,
+            })
+        # 按 total 降序
+        all_plans.sort(key=lambda x: x["total"], reverse=True)
+        return web.json_response({"plans": all_plans, "total_keys": len(self._task_list_store)})
+
     async def handle_shutdown(self, request):
         self.core._running = False
         asyncio.create_task(self.core.shutdown())
@@ -2830,13 +2917,31 @@ window.toggleFullscreen = function() {{
     async def handle_get_executor(self, request):
         info = self.core.executor.get_execution_info() if self.core.executor else {}
         cfg = self.core.config.executor if self.core.config else None
+        # [v1.18.7] 附加执行锁状态和沙盒说明
+        lock = self._execution_lock
         return web.json_response({
             **info,
             "timeout": cfg.timeout if cfg else 300,
             "auto_fix": cfg.auto_fix if cfg else True,
             "max_output_length": cfg.max_output_length if cfg else 50000,
+            # 执行锁信息
+            "lock": {
+                "locked": lock["locked"],
+                "locked_by": lock["locked_by"],
+                "locked_at": lock["locked_at"],
+            },
+            # 沙盒模式说明
+            "sandbox_desc": self._sandbox_description(info.get("mode"), info.get("sandbox_type"), info.get("docker_available")),
         })
 
+    def _sandbox_description(self, mode, sandbox_type, docker_available):
+        """生成沙盒模式说明文本"""
+        if mode != "sandbox":
+            return "本机模式: 代码直接在宿主机运行，拥有完整系统权限。多个 Agent 共享全局执行锁，同一时间只有一个 Agent 可以执行代码。"
+        if docker_available:
+            return "Docker 沙盒: 代码在 Docker 容器中运行，通过网络隔离保证安全性。容器使用指定镜像，执行完毕后自动销毁。不走全局锁，支持多 Agent 并发。"
+        return "轻量级进程沙盒: Docker 不可用时的降级方案。代码在临时工作目录中通过子进程执行，提供目录隔离。不走全局锁，支持多 Agent 并发。安全性低于 Docker 沙盒。"
+
     async def handle_update_executor(self, request):
         data = await request.json()
         cfg_path = self.core.config_mgr._config_file
@@ -3852,35 +3957,65 @@ window.toggleFullscreen = function() {{
         lines = int(request.query.get("lines", "200"))
         level = request.query.get("level", "").upper()
         logs = []
-        for lf in sorted(log_dir.glob("myagent*.log"), reverse=True):
+        # [v1.18.7] 遍历所有 .log 文件（不仅限于 myagent*.log），按修改时间倒序
+        try:
+            all_log_files = sorted(
+                [f for f in log_dir.glob("*.log") if f.is_file()],
+                key=lambda f: f.stat().st_mtime,
+                reverse=True,
+            )
+        except Exception:
+            all_log_files = []
+        for lf in all_log_files:
             try:
                 text = lf.read_text(encoding="utf-8", errors="ignore")
                 for line in text.strip().split("\n")[-lines:]:
-                    if level and level not in line: continue
+                    if level and level not in line:
+                        continue
                     logs.append(line)
-                if len(logs) >= lines: break
-            except: pass
+                if len(logs) >= lines:
+                    break
+            except Exception:
+                pass
         return web.json_response(logs[-lines:])
 
     async def handle_log_stream(self, request):
         resp = web.StreamResponse()
         resp.content_type = "text/event-stream"
         resp.headers["Cache-Control"] = "no-cache"
+        resp.headers["Connection"] = "keep-alive"
         await resp.prepare(request)
-        log_file = self.core.config_mgr.logs_dir / "myagent.log"
+        log_dir = self.core.config_mgr.logs_dir
+        # [v1.18.7] 自动发现最新的日志文件而非硬编码 myagent.log
         last_pos = 0
+        last_file = None
         try:
             while True:
                 try:
-                    if log_file.exists():
-                        size = log_file.stat().st_size
+                    # 每 5 秒重新扫描最新日志文件（应对日志轮转）
+                    current_file = None
+                    if log_dir.exists():
+                        candidates = [f for f in log_dir.glob("*.log") if f.is_file()]
+                        if candidates:
+                            current_file = max(candidates, key=lambda f: f.stat().st_mtime)
+                    if current_file:
+                        # 日志文件切换时重置位置
+                        if last_file and current_file.resolve() != last_file.resolve():
+                            last_pos = 0
+                        last_file = current_file
+                        size = current_file.stat().st_size
                         if size > last_pos:
-                            with open(log_file, "r", encoding="utf-8", errors="ignore") as f:
-                                f.seek(last_pos); new_data = f.read(); last_pos = size
-                            if new_data: await resp.write(f"data: {json.dumps(new_data.strip())}\n\n")
-                except: pass
+                            with open(current_file, "r", encoding="utf-8", errors="ignore") as f:
+                                f.seek(last_pos)
+                                new_data = f.read()
+                                last_pos = size
+                            if new_data:
+                                await resp.write(f"data: {json.dumps(new_data.strip())}\n\n")
+                except Exception:
+                    pass
                 await asyncio.sleep(0.5)
-        except asyncio.CancelledError: pass
+        except asyncio.CancelledError:
+            pass
         return resp
 
     # ── 配置管理 (热重载 / 导入 / 导出) ──
@@ -6127,11 +6262,14 @@ window.toggleFullscreen = function() {{
                     break
                 image_data.extend(chunk)
 
-            # 解析裁剪参数
-            crop_x = int(request.query.get("crop_x", 0))
-            crop_y = int(request.query.get("crop_y", 0))
-            crop_w = int(request.query.get("crop_w", 0))
-            crop_h = int(request.query.get("crop_h", 0))
+            # 解析裁剪参数（[v1.18.7] 防止 NaN 传入导致 ValueError）
+            try:
+                crop_x = int(float(request.query.get("crop_x", 0)))
+                crop_y = int(float(request.query.get("crop_y", 0)))
+                crop_w = int(float(request.query.get("crop_w", 0)))
+                crop_h = int(float(request.query.get("crop_h", 0)))
+            except (ValueError, TypeError):
+                crop_x = crop_y = crop_w = crop_h = 0
             out_size = min(int(request.query.get("size", 128)), 512)
 
             # 使用 Pillow 处理图片

package/web/ui/chat/chat_main.js

@@ -1871,14 +1871,24 @@ function renderSessions(filter = '') {
     s.id !== '__new__' && (!fl || s.name.toLowerCase().includes(fl) || s.id.toLowerCase().includes(fl))
   );
 
+  const agent = findAgentByPath(state.activeAgent);
   list.innerHTML = filtered.map(s => {
     const previewText = s.preview
       ? escapeHtml(s.preview.length > 40 ? s.preview.slice(0, 40) + '...' : s.preview)
       : (s.messages > 0 ? s.messages + ' 条消息' : '暂无消息');
+    // [v1.18.7] 用 agent 头像替代固定 💬 图标，头像在前、会话名在后
+    var _avatarContent = '';
+    if (s.id === '__new__') {
+      _avatarContent = '✨';
+    } else if (agent && agent.avatar_image) {
+      _avatarContent = '<img src="' + escapeHtml(agent.avatar_image) + '" style="width:100%;height:100%;object-fit:cover;border-radius:8px" onerror="this.outerHTML=\'' + escapeHtml(agent.avatar_emoji || '🤖') + '\'">';
+    } else {
+      _avatarContent = agent ? (agent.avatar_emoji || '🤖') : '💬';
+    }
     return `
     <div class="session-item ${s.id === state.activeSessionId ? 'active' : ''}"
          onclick="selectSession('${escapeHtml(s.id)}')" title="${escapeHtml(s.id)}">
-      <div class="session-icon">${s.id === '__new__' ? '✨' : '💬'}</div>
+      <div class="session-icon">${_avatarContent}</div>
       <div class="session-info">
         <div class="session-name">${escapeHtml(s.name)}</div>
         <div class="session-preview">${previewText}</div>

package/web/ui/index.html

@@ -635,7 +635,8 @@ async function doCreateAgent(){
     name,description:$('caDesc').value,avatar_emoji:$('caEmoji').value,
     avatar_color:$('caColorText').value,execution_mode:$('caExecMode').value,
     model_id:$('caModelId').value,system_prompt:$('caPrompt').value,
-    work_dir:$('caWorkDir').value,department:$('caDept').value
+    work_dir:$('caWorkDir').value,department:$('caDept').value,
+    avatar_image:$('caAvatarImage')?.value||''
   })});
   if(r.error){showToast(r.error,'danger');return}
   closeModal();showToast('Agent 创建成功','success');renderAgents();
@@ -764,7 +765,8 @@ async function doSaveAgent(path){
     description:$('eaDesc').value,avatar_emoji:$('eaEmoji').value,avatar_color:$('eaColorText').value,
     model_id:$('eaModelId').value,
     backup_model_ids:Array.from($('eaBackupModels').selectedOptions).map(o=>o.value),
-    work_dir:$('eaWorkDir').value,system_prompt:$('eaPrompt').value
+    work_dir:$('eaWorkDir').value,system_prompt:$('eaPrompt').value,
+    avatar_image:$('eaAvatarImage')?.value||''
   })});
   if(r.error){showToast(r.error,'danger');return}
   showToast('已保存','success');renderAgents();
@@ -1625,29 +1627,63 @@ async function deleteModel(id,name){
 
 // ========== Executor ==========
 async function renderExecutor(){
-  const e=await api('/api/executor');const isSandbox=e.mode==='sandbox';const dockerOk=e.docker_available;
+  const e=await api('/api/executor');if(!e)return;
+  const isSandbox=e.mode==='sandbox';const dockerOk=e.docker_available;
+  const lock=e.lock||{};
+  const sandboxType=e.sandbox_type||'';
+  const sandboxDesc=e.sandbox_desc||'';
   let html=`<div class="card"><h3>执行模式</h3>
-    <div style="display:flex;gap:12px;margin-bottom:16px">
-      <label style="display:flex;align-items:center;gap:6px;cursor:pointer;padding:16px 24px;border-radius:var(--radius);border:2px solid ${!isSandbox?'var(--primary)':'var(--border)'};background:${!isSandbox?'#6366f122':'transparent'};flex:1">
+    <div style="display:flex;gap:12px;margin-bottom:16px;flex-wrap:wrap">
+      <label style="display:flex;align-items:center;gap:6px;cursor:pointer;padding:16px 24px;border-radius:var(--radius);border:2px solid ${!isSandbox?'var(--primary)':'var(--border)'};background:${!isSandbox?'#6366f122':'transparent'};flex:1;min-width:200px">
         <input type="radio" name="execMode" value="local" ${!isSandbox?'checked':''} onchange="switchMode('local')">
         <div><strong>🖥️ 本机执行</strong><br><span style="font-size:12px;color:var(--text2)">直接在本机运行代码，功能完整，速度最快</span></div></label>
-      <label style="display:flex;align-items:center;gap:6px;cursor:pointer;padding:16px 24px;border-radius:var(--radius);border:2px solid ${isSandbox?'var(--primary)':'var(--border)'};background:${isSandbox?'#6366f122':'transparent'};flex:1">
+      <label style="display:flex;align-items:center;gap:6px;cursor:pointer;padding:16px 24px;border-radius:var(--radius);border:2px solid ${isSandbox?'var(--primary)':'var(--border)'};background:${isSandbox?'#6366f122':'transparent'};flex:1;min-width:200px">
         <input type="radio" name="execMode" value="sandbox" ${isSandbox?'checked':''} onchange="switchMode('sandbox')" ${!dockerOk?'disabled':''}>
-        <div><strong>📦 沙盒执行 (Docker)</strong><br><span style="font-size:12px;color:var(--text2)">在隔离容器中运行，更安全${!dockerOk?' (Docker 不可用)':''}</span></div></label></div>
-    <div style="font-size:13px;color:var(--text2)">当前模式: <span class="badge ${isSandbox?'badge-yellow':'badge-green'}">${isSandbox?'沙盒 (Docker)':'本机'}</span> Docker 状态: <span class="badge ${dockerOk?'badge-green':'badge-red'}">${dockerOk?'可用':'不可用'}</span> 累计执行: <span class="tag">${e.execution_count||0} 次</span></div></div>`;
+        <div><strong>📦 沙盒执行</strong><br><span style="font-size:12px;color:var(--text2)">${dockerOk?'Docker 隔离容器':'轻量级进程沙盒'}${!dockerOk?' (Docker 不可用)':''}</span></div></label></div>
+    <div style="font-size:13px;color:var(--text2);display:flex;flex-wrap:wrap;gap:8px">
+      <span>当前模式: <span class="badge ${isSandbox?'badge-yellow':'badge-green'}">${isSandbox?'沙盒':'本机'}</span></span>
+      ${isSandbox?`<span>沙盒类型: <span class="tag">${sandboxType==='docker'?'Docker':'轻量级进程'}</span></span>`:''}
+      <span>Docker: <span class="badge ${dockerOk?'badge-green':'badge-red'}">${dockerOk?'可用':'不可用'}</span></span>
+      <span>累计执行: <span class="tag">${e.execution_count||0} 次</span></span>
+    </div>
+    <div style="margin-top:8px;padding:10px 14px;border-radius:var(--radius);background:var(--surface);font-size:12px;color:var(--text2);line-height:1.6">${escHtml(sandboxDesc)}</div>
+    </div>`;
+  // 执行锁状态
+  html+=`<div class="card"><h3>🔒 全局执行锁</h3>
+    <div style="font-size:13px">
+      ${lock.locked?
+        `<span class="badge badge-red">已锁定</span> <strong>${escHtml(lock.locked_by||'')}</strong> — 锁定于 ${escHtml(lock.locked_at||'')}
+        <div style="margin-top:8px"><button class="btn btn-sm btn-danger" onclick="releaseLock()">🔓 释放锁</button></div>`:
+        `<span class="badge badge-green">未锁定</span> — 所有 Agent 可自由运行`
+      }
+      <div style="margin-top:6px;font-size:12px;color:var(--text3)">${isSandbox?'沙盒模式不走全局锁，支持多 Agent 并发执行':'本机模式下多个 Agent 共享此锁，同一时间只有一个 Agent 可以执行代码'}</div>
+    </div></div>`;
+  // 沙盒设置
   html+=`<div class="card"><h3>沙盒设置</h3><div class="form-row">
-    <div class="form-group"><label>Docker 镜像</label><input id="sbImage" value="${e.sandbox_image||'python:3.12-slim'}"></div>
-    <div class="form-group"><label>内存限制</label><input id="sbMemory" value="${e.sandbox_memory||'512m'}" placeholder="512m"></div>
+    <div class="form-group"><label>Docker 镜像</label><input id="sbImage" value="${escHtml(e.sandbox_image||'python:3.12-slim')}"></div>
+    <div class="form-group"><label>内存限制</label><input id="sbMemory" value="${escHtml(e.sandbox_memory||'512m')}" placeholder="512m"></div>
     <div class="form-group"><label>网络访问</label><select id="sbNetwork"><option ${!e.sandbox_network?'selected':''} value="false">禁止 (更安全)</option><option ${e.sandbox_network?'selected':''} value="true">允许</option></select></div></div>
     <div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="saveExecutor()">保存设置</button></div></div>`;
+  // 执行参数
   html+=`<div class="card"><h3>执行参数</h3><div class="form-row">
     <div class="form-group"><label>超时时间 (秒)</label><input id="exTimeout" type="number" value="${e.timeout||300}"></div>
-    <div class="form-group"><label>自动重试</label><input id="exRetries" type="number" value="2"></div>
-    <div class="form-group"><label>自动修复</label><select id="exAutoFix"><option ${e.auto_fix?'selected':''} value="true">开启</option><option ${!e.auto_fix?'selected':''} value="false">关闭</option></select></div></div></div>`;
+    <div class="form-group"><label>自动修复</label><select id="exAutoFix"><option ${e.auto_fix?'selected':''} value="true">开启</option><option ${!e.auto_fix?'selected':''} value="false">关闭</option></select></div>
+    <div class="form-group"><label>最大输出长度</label><input id="exMaxOutput" type="number" value="${e.max_output_length||50000}"></div></div>
+    <div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="saveExecutor()">保存参数</button></div></div>`;
   $('content').innerHTML=html;
 }
-async function switchMode(mode){const r=await api('/api/executor',{method:'PUT',body:JSON.stringify({execution_mode:mode})});if(!r.ok){showToast('切换失败: '+(r.error||''),'danger');renderExecutor();}else renderExecutor();}
-async function saveExecutor(){await api('/api/executor',{method:'PUT',body:JSON.stringify({sandbox_image:$('sbImage').value,sandbox_memory:$('sbMemory').value,sandbox_network:$('sbNetwork').value==='true',timeout:parseInt($('exTimeout').value),auto_fix:$('exAutoFix').value==='true'})});showToast('已保存','success');renderExecutor();}
+async function switchMode(mode){const r=await api('/api/executor',{method:'PUT',body:JSON.stringify({execution_mode:mode})});if(!r.ok){showToast('切换失败: '+(r.error||''),'danger');renderExecutor();}else{showToast('已切换','success');renderExecutor();}}
+async function saveExecutor(){
+  const body={sandbox_image:$('sbImage').value,sandbox_memory:$('sbMemory').value,sandbox_network:$('sbNetwork').value==='true',timeout:parseInt($('exTimeout').value),auto_fix:$('exAutoFix').value==='true',max_output_length:parseInt($('exMaxOutput').value)};
+  const r=await api('/api/executor',{method:'PUT',body:JSON.stringify(body)});
+  if(r.ok)showToast('已保存','success');else showToast('保存失败: '+(r.error||''),'danger');
+  renderExecutor();
+}
+async function releaseLock(){
+  const r=await api('/api/execution-lock',{method:'POST',body:JSON.stringify({action:'release'})});
+  if(r.ok)showToast('锁已释放','success');else showToast('释放失败: '+(r.error||''),'danger');
+  renderExecutor();
+}
 
 // ========== Skills ==========
 async function renderSkills(){
@@ -1719,95 +1755,238 @@ async function viewSkillDetail(name){
 }
 
 // ========== Files ==========
+var _workdirAgent=''; // 当前选中的 agent（空=全局工作目录）
 async function renderFiles(){
-  const wd=await api('/api/workdir');const files=await api('/api/workdir/files');
-  let html=`<div class="flex items-center gap-8 mb-16">
-    <span style="font-size:14px;color:var(--text2)">工作目录: ${wd.path}</span>
-    <button class="btn btn-sm btn-ghost" onclick="changeWorkdir()">更改</button>
-    <button class="btn btn-sm btn-ghost" onclick="renderFiles()">刷新</button></div>`;
-  html+='<div class="table-wrap"><table><tr><th>名称</th><th>类型</th><th>大小</th></tr>';
-  for(const f of (files||[])){
-    const icon=f.type==='dir'?'📁':'📄';const size=f.type==='file'?(f.size>1024?(f.size/1024).toFixed(1)+'KB':f.size+'B'):'-';
-    html+=`<tr><td>${icon} ${escHtml(f.name)}</td><td>${f.type}</td><td>${size}</td></tr>`;}
-  if(!files||!files.length)html+='<tr><td colspan="3" class="empty">目录为空</td></tr>';
-  html+='</table></div>';$('content').innerHTML=html;
-}
-async function changeWorkdir(){const p=prompt('新路径:');if(!p)return;await api('/api/workdir',{method:'PUT',body:JSON.stringify({path:p})});renderFiles();}
+  const [wd,agents]=await Promise.all([api('/api/workdir'),api('/api/agents').catch(()=>[])]);
+  const agentList=Array.isArray(agents)?agents.filter(a=>!a.system&&a.path!=='default'):[];
+  let html=`<div class="flex items-center gap-8 mb-16 flex-wrap">
+    <span style="font-size:14px;color:var(--text2)">📁 工作目录: <strong>${escHtml(wd.path||'')}</strong></span>
+    <select id="workdirAgentSelect" onchange="onWorkdirAgentChange()" style="width:auto">
+      <option value="">全局工作目录</option>
+      ${agentList.map(a=>`<option value="${escHtml(a.path)}">${escHtml((a.avatar_emoji||'🤖')+' '+a.name)} (${escHtml(a.path)})</option>`).join('')}
+    </select>
+    <button class="btn btn-sm btn-ghost" onclick="changeWorkdir()">更改全局</button>
+    <button class="btn btn-sm btn-ghost" onclick="renderFiles()">🔄 刷新</button></div>
+    <div id="workdirContent">加载中...</div>`;
+  $('content').innerHTML=html;
+  loadWorkdirContent('');
+}
+function onWorkdirAgentChange(){
+  _workdirAgent=$('workdirAgentSelect').value;
+  loadWorkdirContent('');
+}
+async function loadWorkdirContent(subPath){
+  const params=new URLSearchParams();
+  if(subPath)params.set('path',subPath);
+  const files=await api('/api/workdir/files?'+params.toString());
+  const el=document.getElementById('workdirContent');
+  if(!el)return;
+  // 面包屑
+  var bcHtml='';
+  if(subPath){
+    var parts=subPath.split('/');var crumbs=['<span style="cursor:pointer;color:var(--primary)" onclick="loadWorkdirContent(\'\')">根目录</span>'];var acc='';
+    for(var i=0;i<parts.length;i++){acc+=(acc?'/':'')+parts[i];crumbs.push(' / <span style="cursor:pointer;color:var(--primary)" onclick="loadWorkdirContent(\''+acc+'\')">'+escHtml(parts[i])+'</span>');}
+    bcHtml=crumbs.join('');
+  }else{bcHtml='<span style="color:var(--text3)">根目录</span>';}
+  // Agent 工作目录信息
+  if(_workdirAgent){
+    var agentCfg=await api('/api/agents/'+encodeURIComponent(_workdirAgent)).catch(()=>null);
+    if(agentCfg&&agentCfg.work_dir){
+      bcHtml+=` <span style="margin-left:12px;font-size:11px;color:var(--text3)">Agent 工作目录: ${escHtml(agentCfg.work_dir)}</span>`;
+    }
+  }
+  var html=`<div style="font-size:12px;margin-bottom:8px">${bcHtml}</div>`;
+  html+='<div class="table-wrap"><table><tr><th>名称</th><th>大小</th><th></th></tr>';
+  if(!files||!files.length){
+    html+='<tr><td colspan="3" class="empty">目录为空</td></tr>';
+  }else{
+    // 排序：目录在前
+    var dirs=files.filter(f=>f.type==='dir').sort((a,b)=>a.name.localeCompare(b.name));
+    var fils=files.filter(f=>f.type==='file').sort((a,b)=>a.name.localeCompare(b.name));
+    for(const d of dirs){
+      var dp=d.path||d.name;
+      html+=`<tr style="cursor:pointer" onclick="loadWorkdirContent('${escHtml(dp)}')"><td>📂 ${escHtml(d.name)}</td><td>-</td><td></td></tr>`;
+    }
+    for(const f of fils){
+      var fp=f.path||f.name;
+      var sizeStr=f.size>1048576?(f.size/1048576).toFixed(1)+' MB':f.size>1024?(f.size/1024).toFixed(1)+' KB':f.size+' B';
+      html+=`<tr><td>📄 ${escHtml(f.name)}</td><td>${sizeStr}</td>
+        <td><button class="btn btn-sm btn-ghost" onclick="downloadWorkdirFileGlobal('${escHtml(fp)}')">下载</button></td></tr>`;
+    }
+  }
+  html+='</table></div>';
+  el.innerHTML=html;
+}
+function downloadWorkdirFileGlobal(relPath){
+  var link=document.createElement('a');
+  link.href=API+'/api/workdir/download/'+encodeURIComponent(relPath);
+  link.download='';
+  document.body.appendChild(link);link.click();document.body.removeChild(link);
+}
+async function changeWorkdir(){const p=prompt('新路径:');if(!p)return;await api('/api/workdir',{method:'PUT',body:JSON.stringify({path:p})});showToast('已更新','success');renderFiles();}
 
 // ========== Logs ==========
 async function renderLogs(){
-  let html=`<div class="flex gap-8 mb-16">
-    <select id="logLines" style="width:auto"><option value="100">100 行</option><option value="500" selected>500 行</option><option value="1000">1000 行</option></select>
+  let html=`<div class="flex gap-8 mb-16 flex-wrap">
+    <select id="logLines" style="width:auto"><option value="100">100 行</option><option value="500" selected>500 行</option><option value="1000">1000 行</option><option value="2000">2000 行</option></select>
+    <select id="logLevel" style="width:auto"><option value="">全部级别</option><option value="ERROR">ERROR</option><option value="WARNING">WARNING</option><option value="INFO">INFO</option><option value="DEBUG">DEBUG</option></select>
     <button class="btn btn-primary" onclick="loadLogs()">刷新</button>
-    <button class="btn btn-ghost" onclick="toggleLogStream()" id="streamBtn">实时日志</button></div>
-  <div class="log-viewer" id="logViewer" style="height:calc(100vh - 220px)">加载中...</div>`;
+    <button class="btn btn-ghost" onclick="toggleLogStream()" id="streamBtn">▶ 实时日志</button>
+    <button class="btn btn-sm btn-ghost" onclick="clearLogViewer()" title="清空显示">🗑️ 清屏</button></div>
+  <div class="log-viewer" id="logViewer" style="height:calc(100vh - 240px);font-family:monospace;font-size:12px;line-height:1.6;overflow-y:auto;background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);padding:8px 12px">加载中...</div>`;
   $('content').innerHTML=html;loadLogs();
 }
 async function loadLogs(){
-  const lines=$('logLines').value;const logs=await api(`/api/logs?lines=${lines}`);
-  $('logViewer').innerHTML=(logs||[]).map(l=>`<div>${escHtml(l)}</div>`).join('');
-  $('logViewer').scrollTop=$('logViewer').scrollHeight;
-}
-let logStreamActive=false;
+  const lines=$('logLines').value;const level=$('logLevel').value;
+  const logs=await api(`/api/logs?lines=${lines}${level?'&level='+level:''}`);
+  const viewer=$('logViewer');
+  viewer.innerHTML='';
+  if(!logs||!logs.length){viewer.innerHTML='<div style="color:var(--text3)">暂无日志</div>';return;}
+  for(const l of logs){appendLogLine(viewer,l);}
+  viewer.scrollTop=viewer.scrollHeight;
+}
+function appendLogLine(viewer,line){
+  var div=document.createElement('div');
+  div.style.cssText='white-space:pre-wrap;word-break:break-all;padding:1px 0;border-bottom:1px solid var(--border)';
+  // 高亮 ERROR/WARNING
+  if(line.includes('ERROR')||line.includes('CRITICAL')){div.style.color='var(--danger)';div.style.fontWeight='600';}
+  else if(line.includes('WARNING')){div.style.color='#f59e0b';}
+  else if(line.includes('DEBUG')){div.style.color='var(--text3)';}
+  div.textContent=line;
+  viewer.appendChild(div);
+}
+function clearLogViewer(){if($('logViewer'))$('logViewer').innerHTML='';}
+let logStreamActive=false;let _logES=null;
 async function toggleLogStream(){
-  if(logStreamActive){logStreamActive=false;$('streamBtn').textContent='实时日志';return;}
-  logStreamActive=true;$('streamBtn').textContent='停止实时';
-  const es=new EventSource(API+'/api/logs/stream');
-  es.onmessage=function(e){try{const lines=JSON.parse(e.data).split('\n');for(const l of lines){$('logViewer').innerHTML+=`<div>${escHtml(l)}</div>`;}$('logViewer').scrollTop=$('logViewer').scrollHeight;while($('logViewer').children.length>2000)$('logViewer').removeChild($('logViewer').firstChild);}catch(ex){}};
-  es.onerror=function(){if(logStreamActive)setTimeout(()=>{},3000)};
+  if(logStreamActive){
+    logStreamActive=false;
+    if(_logES){_logES.close();_logES=null;}
+    $('streamBtn').textContent='▶ 实时日志';
+    $('streamBtn').style.background='';return;
+  }
+  logStreamActive=true;$('streamBtn').textContent='⏹ 停止实时';$('streamBtn').style.background='var(--danger)22';
+  _logES=new EventSource(API+'/api/logs/stream');
+  _logES.onmessage=function(e){
+    try{
+      var lines=JSON.parse(e.data).split('\n');
+      var viewer=$('logViewer');if(!viewer)return;
+      for(const l of lines){if(l.trim())appendLogLine(viewer,l);}
+      viewer.scrollTop=viewer.scrollHeight;
+      while(viewer.children.length>3000)viewer.removeChild(viewer.firstChild);
+    }catch(ex){}
+  };
+  // [v1.18.7] 断线自动重连
+  _logES.onerror=function(){
+    if(_logES){_logES.close();_logES=null;}
+    if(logStreamActive){
+      $('streamBtn').textContent='⟳ 重连中...';
+      setTimeout(function(){
+        if(logStreamActive){toggleLogStream();}// 重新连接
+      },3000);
+    }
+  };
 }
 
 // ========== Tasks ==========
 async function renderTasks(){
-  const r=await api('/api/tasks');
-  const tasks=r.tasks||[];
-  const statusCounts={pending:0,running:0,completed:0,failed:0};
-  for(const t of tasks){statusCounts[t.status]=(statusCounts[t.status]||0)+1;}
-  let html=`<div class="grid grid-4" style="margin-bottom:16px">
-    <div class="stat"><div class="label">待处理</div><div class="value">${statusCounts.pending}</div></div>
-    <div class="stat"><div class="label">运行中</div><div class="value">${statusCounts.running}</div></div>
-    <div class="stat"><div class="label">已完成</div><div class="value" style="color:var(--success)">${statusCounts.completed}</div></div>
-    <div class="stat"><div class="label">失败</div><div class="value" style="color:var(--danger)">${statusCounts.failed}</div></div></div>`;
+  // [v1.18.7] 同时获取实时 task plan 和持久化任务
+  const [planR,persistR]=await Promise.all([api('/api/task-plan/all').catch(()=>({plans:[],total_keys:0})),api('/api/tasks').catch(()=>({tasks:[],total:0}))]);
+  const plans=planR.plans||[];
+  const persistTasks=persistR.tasks||[];
+  // 统计
+  var totalPlans=0,totalDone=0,totalPending=0,totalRunning=0;
+  for(const p of plans){totalPlans+=p.total;totalDone+=p.done;totalPending+=p.pending;totalRunning+=p.running;}
+  // 持久化任务统计
+  var ptPending=0,ptRunning=0,ptCompleted=0,ptFailed=0;
+  for(const t of persistTasks){if(t.status==='pending')ptPending++;else if(t.status==='running')ptRunning++;else if(t.status==='completed')ptCompleted++;else if(t.status==='failed')ptFailed++;}
+  let html=`<div class="card" style="margin-bottom:16px"><h3>📊 概览</h3>
+    <div class="grid grid-4" style="margin-top:12px">
+      <div class="stat"><div class="label">活跃 Task Plan</div><div class="value">${plans.length}</div><div style="font-size:11px;color:var(--text3)">${totalPlans} 项任务</div></div>
+      <div class="stat"><div class="label">待执行</div><div class="value">${totalPending}</div><div style="font-size:11px;color:var(--text3)">pending</div></div>
+      <div class="stat"><div class="label">已完成</div><div class="value" style="color:var(--success)">${totalDone}</div><div style="font-size:11px;color:var(--text3)">done</div></div>
+      <div class="stat"><div class="label">执行中</div><div class="value" style="color:var(--info)">${totalRunning}</div><div style="font-size:11px;color:var(--text3)">running</div></div>
+    </div>
+    ${persistTasks.length?`<div style="margin-top:12px;padding-top:12px;border-top:1px solid var(--border);font-size:13px;color:var(--text2)">
+      持久化任务: ${ptPending} 待处理 · ${ptRunning} 运行中 · <span style="color:var(--success)">${ptCompleted} 已完成</span> · <span style="color:var(--danger)">${ptFailed} 失败</span>
+    </div>`:''}
+  </div>`;
   html+=`<div class="flex gap-8 mb-16 flex-wrap">
-    <div style="color:var(--text2);font-size:13px">共 ${tasks.length} 条任务记录</div>
-    <select id="taskStatusFilter" onchange="filterTasks()" style="width:auto">
-      <option value="">全部状态</option>
-      <option value="pending">待处理</option>
-      <option value="running">运行中</option>
-      <option value="completed">已完成</option>
-      <option value="failed">失败</option>
-    </select>
-    <button class="btn btn-sm btn-ghost" onclick="renderTasks()">刷新</button></div>`;
-  if(tasks.length===0){html+='<div class="empty">暂无任务记录</div>';}
-  else{
-    html+='<div style="max-height:calc(100vh - 340px);overflow-y:auto" id="taskList">';
-    html+='<div class="table-wrap"><table><tr><th>任务ID</th><th>描述</th><th>群聊</th><th>状态</th><th>时间</th><th>操作</th></tr>';
-    for(const t of tasks){
-      const statusBadge=t.status==='completed'?'<span class="badge badge-green">已完成</span>':
+    <button class="btn btn-sm btn-ghost" onclick="renderTasks()">🔄 刷新</button></div>`;
+  // 实时 Task Plan 列表
+  if(plans.length){
+    html+='<h3 style="margin-bottom:8px">📋 实时任务计划 ('+plans.length+' 个活跃)</h3>';
+    for(const p of plans){
+      html+=`<div class="card" style="margin-bottom:12px;padding:12px 16px">
+        <div class="flex justify-between items-center mb-8" style="flex-wrap:wrap;gap:8px">
+          <div><strong>${escHtml(p.label)}</strong> <span class="tag">${p.type==='session'?'会话':'Agent'}</span></div>
+          <div class="flex gap-4" style="font-size:12px">
+            <span class="badge badge-yellow">${p.pending} 待执行</span>
+            <span class="badge badge-blue">${p.running} 执行中</span>
+            <span class="badge badge-green">${p.done} 已完成</span>
+          </div>
+        </div>
+        <div style="margin-top:4px">`;
+      for(var i=0;i<p.tasks.length;i++){
+        var t=p.tasks[i];
+        var st=t.status||'pending';
+        var stBadge=st==='done'?'<span class="badge badge-green" style="font-size:10px">✓ done</span>':
+          st==='running'?'<span class="badge badge-blue" style="font-size:10px">⟳ running</span>':
+          '<span class="badge badge-yellow" style="font-size:10px">○ pending</span>';
+        var checked=st==='done'?'checked':'';
+        html+=`<div style="display:flex;align-items:center;gap:8px;padding:3px 0;font-size:13px;${st==='done'?'text-decoration:line-through;color:var(--text3)':''}">
+          <input type="checkbox" ${checked} style="flex-shrink:0" onclick="toggleTaskPlanItem('${escHtml(p.key)}',${i},this.checked)">
+          <span style="flex:1">${escHtml(t.text||'')}</span>${stBadge}
+        </div>`;
+      }
+      html+=`</div></div>`;
+    }
+  }
+  if(!plans.length){
+    html+='<div class="empty" style="margin-bottom:16px">暂无活跃的实时任务计划</div>';
+  }
+  // 持久化任务列表
+  if(persistTasks.length){
+    html+=`<h3 style="margin-bottom:8px;margin-top:16px">💾 持久化任务 (${persistTasks.length} 条)</h3>`;
+    html+='<div class="table-wrap"><table><tr><th>任务ID</th><th>描述</th><th>来源</th><th>状态</th><th>时间</th><th>操作</th></tr>';
+    for(const t of persistTasks){
+      var statusBadge=t.status==='completed'?'<span class="badge badge-green">已完成</span>':
         t.status==='running'?'<span class="badge badge-blue">运行中</span>':
         t.status==='failed'?'<span class="badge badge-red">失败</span>':
         '<span class="badge badge-yellow">待处理</span>';
-      const interrupted=t.metadata?.interrupted;
-      const interruptedTag=interrupted?'<span class="badge badge-red" title="进程中断">中断</span>':'';
-      const canRetry=t.status==='failed'||t.status==='pending';
-      const meta=t.metadata||{};
-      const source=meta.source==='group_chat'?'群聊':meta.source||'';
+      var meta=t.metadata||{};
+      var source=meta.source==='group_chat'?'群聊':meta.source||'';
       html+=`<tr data-status="${t.status}">
         <td style="font-family:monospace;font-size:11px;max-width:120px;overflow:hidden;text-overflow:ellipsis" title="${escHtml(t.task_id)}">${escHtml(t.task_id)}</td>
         <td style="max-width:300px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${escHtml(t.description)}">${escHtml((t.description||'').slice(0,100))}</td>
         <td>${source}${meta.group_name?' / '+escHtml(meta.group_name):''}</td>
-        <td>${statusBadge}${interruptedTag}</td>
+        <td>${statusBadge}</td>
         <td style="font-size:12px;white-space:nowrap">${fmtTimeAgo(t.updated_at)}</td>
         <td class="flex gap-8">
-          ${canRetry?`<button class="btn btn-sm btn-primary" onclick="retryTask('${escHtml(t.task_id)}')">重试</button>`:''}
+          ${t.status==='failed'||t.status==='pending'?`<button class="btn btn-sm btn-primary" onclick="retryTask('${escHtml(t.task_id)}')">重试</button>`:''}
           <button class="btn btn-sm btn-danger" onclick="deleteTask('${escHtml(t.task_id)}')">删除</button>
         </td></tr>`;
     }
-    html+='</table></div></div>';
+    html+='</table></div>';
+  }
+  if(!plans.length&&!persistTasks.length){
+    html+='<div class="empty">暂无任务记录</div>';
   }
   $('content').innerHTML=html;
 }
 
+async function toggleTaskPlanItem(key,idx,checked){
+  await api('/api/task-plan/all');
+  // 直接调用 task-plan API 修改状态
+  const r=await api('/api/task-plan?agent='+encodeURIComponent(key));
+  if(!r||!r.tasks)return;
+  var tasks=r.tasks;
+  if(idx>=0&&idx<tasks.length){
+    tasks[idx].status=checked?'done':'pending';
+    await api('/api/task-plan',{method:'PUT',body:JSON.stringify({agent:key,session:r.session,tasks:tasks})});
+    renderTasks();
+  }
+}
+
 function filterTasks(){
   const s=$('taskStatusFilter')?.value||'';
   document.querySelectorAll('#taskList tr').forEach(tr=>{
@@ -2306,12 +2485,23 @@ function endCrop(){_cropState.dragging=false;document.removeEventListener('mouse
 function cancelAvatarCrop(prefix){$(prefix+'CropArea').style.display='none';}
 function confirmAvatarCrop(prefix,agentPath){
   var img=$(prefix+'CropImg'),overlay=$(prefix+'CropOverlay');
-  var scale=img.naturalWidth/img.clientWidth;
-  var cx=Math.round(parseFloat(overlay.style.left)*scale),cy=Math.round(parseFloat(overlay.style.top)*scale);
-  var cw=Math.round(parseFloat(overlay.style.width)*scale),ch=Math.round(parseFloat(overlay.style.height)*scale);
-  if(cw<10||ch<10){showToast('请拖动选择裁剪区域','danger');return}
+  if(!img||!overlay){showToast('裁剪数据异常','danger');return}
+  // [v1.18.7] 防止 clientWidth=0 导致 NaN
+  var clientW=Math.max(img.clientWidth,1),clientH=Math.max(img.clientHeight,1);
+  var naturalW=img.naturalWidth||clientW,naturalH=img.naturalHeight||clientH;
+  var scale=naturalW/clientW;
+  if(!isFinite(scale)||scale<=0)scale=1;
+  var cx=Math.round(parseFloat(overlay.style.left||'0')*scale);
+  var cy=Math.round(parseFloat(overlay.style.top||'0')*scale);
+  var cw=Math.round(parseFloat(overlay.style.width||'0')*scale);
+  var ch=Math.round(parseFloat(overlay.style.height||'0')*scale);
+  if(cw<10||ch<10||isNaN(cx)||isNaN(cy)){showToast('请拖动选择裁剪区域','danger');return}
+  var src=$(prefix+'CropImg').src;
+  if(!src||!src.startsWith('data:image')){showToast('请先上传图片','danger');return}
+  var blob=dataURItoBlob(src);
+  if(!blob||blob.size===0){showToast('图片数据异常','danger');return}
   var formData=new FormData();
-  formData.append('file',$(prefix+'CropImg').src.split(',')[1]?dataURItoBlob($(prefix+'CropImg').src):'');
+  formData.append('file',blob,'avatar.png');
   showToast('正在上传裁剪...','info');
   fetch('/api/agents/'+encodeURIComponent(agentPath)+'/avatar?crop_x='+cx+'&crop_y='+cy+'&crop_w='+cw+'&crop_h='+ch+'&size=128',{
     method:'POST',body:formData
@@ -2320,7 +2510,15 @@ function confirmAvatarCrop(prefix,agentPath){
     else showToast(d.error||'上传失败','danger');
   }).catch(e=>showToast('上传失败: '+e,'danger'));
 }
-function dataURItoBlob(dataURI){var b=atob(dataURI.split(',')[1]),a=new Uint8Array(b.length);for(var i=0;i<b.length;i++)a[i]=b.charCodeAt(i);return new Blob([a],{type:'image/png'});}
+function dataURItoBlob(dataURI){
+  if(!dataURI||typeof dataURI!=='string')return null;
+  var parts=dataURI.split(',');
+  if(parts.length<2)return null;
+  var mimeMatch=parts[0].match(/:(.*?);/);
+  var mime=mimeMatch?mimeMatch[1]:'image/png';
+  try{var b=atob(parts[1]),a=new Uint8Array(b.length);for(var i=0;i<b.length;i++)a[i]=b.charCodeAt(i);return new Blob([a],{type:mime});}
+  catch(e){return null}
+}
 async function removeAvatarImage(agentPath){
   var ad=await api('/api/agents/'+encodeURIComponent(agentPath));if(!ad||!ad.avatar_image)return;
   await api('/api/agents/'+encodeURIComponent(agentPath),{method:'PUT',body:JSON.stringify({avatar_image:''})});