myagent-ai 1.18.5 → 1.18.7

package/agents/main_agent.py

@@ -518,6 +518,8 @@ class MainAgent(BaseAgent):
         get_knowledge_content = ""
         # 追踪流式推送的 reasoning 文本（用于构建有意义的最终回复）
         _v2_reasoning_collected: List[str] = []
+        # [v1.18.5] 追踪本轮 file_send 发送的文件，用于持久化到会话记忆
+        _sent_files: List[Dict[str, Any]] = []
         # [v1.15.73] 追踪上一轮保存到 memory 的位置，避免重复保存
         _last_saved_len: int = 0
         # XML 解析失败时的 LLM 修正重试计数
@@ -1192,7 +1194,8 @@ class MainAgent(BaseAgent):
                 })
 
                 tool_result = await self._execute_v2_tool(
-                    tool_name, parms, timeout, context, task_id
+                    tool_name, parms, timeout, context, task_id,
+                    stream_callback=stream_callback,
                 )
 
                 # 发送工具结果事件
@@ -1446,10 +1449,15 @@ class MainAgent(BaseAgent):
                 if not _emitted_reasoning_this_iter:
                     await self._emit_v2_event("v2_reasoning", {"content": truncate_str(final_text, 3000)}, stream_callback)
                 if self.memory:
+                    # [v1.18.5] 附加本轮发送的文件列表到助手消息 metadata
+                    _asst_meta = {}
+                    if _sent_files:
+                        _asst_meta["files"] = _sent_files
                     self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
                         content=final_text,
+                        metadata=_asst_meta if _asst_meta else None,
                     )
                 break
 
@@ -1497,6 +1505,7 @@ class MainAgent(BaseAgent):
         timeout: int,
         context: AgentContext,
         task_id: str,
+        stream_callback: Optional[Callable] = None,
     ) -> Dict[str, Any]:
         """V2 工具执行"""
         result = {"success": False, "output": "", "error": ""}
@@ -1579,6 +1588,14 @@ class MainAgent(BaseAgent):
                     # [v1.16.18] 使用当前作用域的 stream_callback（而非 context._stream_callback）
                     _fresult = await _fskill.execute(_fpath, _fdesc, stream_callback=stream_callback)
                     result = {"success": True, "output": json.dumps(_fresult, ensure_ascii=False, indent=2), "data": _fresult}
+                    # [v1.18.5] 追踪发送的文件，用于持久化到会话记忆
+                    if _fresult.get("success") and _fresult.get("file_id"):
+                        _sent_files.append({
+                            "id": _fresult["file_id"],
+                            "name": _fresult.get("name", ""),
+                            "type": _fresult.get("type", ""),
+                            "size": _fresult.get("size", 0),
+                        })
                 except Exception as _fse:
                     result = {"success": False, "error": f"文件发送失败: {_fse}"}
                     logger.warning(f"[{task_id}] file_send 工具异常: {_fse}")

package/config.py

@@ -178,6 +178,9 @@ class ConfigManager:
         self._config_dir.mkdir(parents=True, exist_ok=True)
         (self._config_dir / "data").mkdir(exist_ok=True)
         (self._config_dir / "logs").mkdir(exist_ok=True)
+        (self._config_dir / "data" / "workspace").mkdir(exist_ok=True)
+        (self._config_dir / "data" / "workspace" / "userfiles").mkdir(exist_ok=True)
+        (self._config_dir / "data" / "uploads").mkdir(exist_ok=True)
 
     @property
     def config(self) -> AppConfig:

package/core/vnc_manager.py

@@ -692,11 +692,13 @@ class VNCManager:
                 "-nowf",         # 禁用 wireframe
                 "-nowcr",        # 禁用 cursor shape updates
                 "-nocursorshape",
-                "-threads",      # 多线程
                 "-deferupdate", "5",   # 延迟更新（降低带宽）
                 "-scale", "2/3",       # 缩小 2/3（降低带宽）
             ]
 
+            # [v1.18.5] 不使用 -threads 模式：与 -scale 和 -no-shm 组合在 0.9.17 中
+            # 会导致父进程 fork 后立即退出，端口延迟监听
+
             # 处理 shm-helper: 找到就传绝对路径，找不到就用 -no-shm 禁用
             if shm_helper:
                 cmd.extend(["-shm-helper", shm_helper])
@@ -709,7 +711,6 @@ class VNCManager:
 
             # [v1.18.0] proot/Termux 兼容: 可能需要额外的安全参数
             cmd.append("-nobell")
-            cmd.append("-noxdamage")
             # 跳过 Xinerama 检查（proot 环境下可能失败）
             env["X11VNC_NO_UNIXPW"] = "1"
 
@@ -723,13 +724,20 @@ class VNCManager:
                 preexec_fn=os.setpgrp,
             )
 
-            # 等待 VNC 端口就绪
-            await asyncio.sleep(1.5)
+            # [v1.18.5] x11vnc 0.9.17 可能 fork 到后台，需要更长等待
+            await asyncio.sleep(2.5)
             if self._x11vnc_process.poll() is not None:
                 # [v1.18.4] x11vnc 可能 fork 到后台运行，父进程退出但子进程仍在监听端口
+                # 等待更长时间让 fork 的子进程完成端口绑定
                 if self._is_port_listening(self.x11vnc_port):
                     logger.warning(f"x11vnc 父进程已退出但端口 {self.x11vnc_port} 仍在监听（fork 到后台），视为启动成功")
                     return True
+                # 端口未监听，再等几秒（某些系统 fork 后子进程初始化慢）
+                logger.info("x11vnc 端口尚未就绪，额外等待 3 秒...")
+                await asyncio.sleep(3)
+                if self._is_port_listening(self.x11vnc_port):
+                    logger.warning(f"x11vnc fork 延迟启动成功 (port={self.x11vnc_port})")
+                    return True
                 # 端口未监听 = 真正的启动失败
                 stderr = ""
                 try:

package/package.json

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

package/skills/chromedev_mcp.py

@@ -588,36 +588,63 @@ class MCPClient:
 
         查找并杀死由 chrome-devtools-mcp 启动的 Chrome 进程。
         这些进程可能导致下次启动时 'Target closed' 错误。
+        
+        [v1.18.5] 扩展匹配模式，覆盖 chrome/chromium/chromium-browser/headless_shell
         """
         import signal as _sig
         try:
-            # 查找 chrome-devtools-mcp 启动的 Chrome 进程
-            # 特征: 父进程是 node/npx (chrome-devtools-mcp)
-            result = subprocess.run(
-                ["pgrep", "-f", "chromium-browser.*--remote-debugging-port"],
-                capture_output=True, text=True, timeout=5,
-            )
-            if result.returncode == 0 and result.stdout.strip():
-                pids = result.stdout.strip().split("\n")
-                for pid_str in pids:
-                    try:
-                        pid = int(pid_str)
-                        os.kill(pid, _sig.SIGTERM)
-                        logger.debug(f"清理残留 Chrome 进程: PID={pid}")
-                    except (ProcessLookupError, PermissionError, ValueError):
-                        pass
-
-                # 等一小会让 Chrome 优雅退出
-                import time
-                time.sleep(0.5)
-
-                # 还没退就强杀
-                for pid_str in pids:
-                    try:
-                        pid = int(pid_str)
-                        os.kill(pid, _sig.SIGKILL)
-                    except (ProcessLookupError, PermissionError, ValueError):
-                        pass
+            # [v1.18.5] 更宽泛的匹配模式，覆盖各种 Chrome 变体
+            # 匹配所有带 --remote-debugging-port 的 Chrome 相关进程
+            patterns = [
+                "chromium-browser.*--remote-debugging-port",
+                "chromium.*--remote-debugging-port",
+                "chrome.*--remote-debugging-port",
+                "google-chrome.*--remote-debugging-port",
+                "headless_shell.*--remote-debugging-port",
+            ]
+            all_pids = set()
+            for pattern in patterns:
+                try:
+                    result = subprocess.run(
+                        ["pgrep", "-f", pattern],
+                        capture_output=True, text=True, timeout=5,
+                    )
+                    if result.returncode == 0 and result.stdout.strip():
+                        for pid_str in result.stdout.strip().split("\n"):
+                            # 排除 pgrep 自身和 npx/node 进程
+                            try:
+                                pid = int(pid_str.strip())
+                                if pid != os.getpid():
+                                    all_pids.add(pid)
+                            except ValueError:
+                                pass
+                except Exception:
+                    pass
+
+            if not all_pids:
+                return
+
+            logger.info(f"清理 {len(all_pids)} 个残留 Chrome 进程: {all_pids}")
+            for pid in all_pids:
+                try:
+                    os.kill(pid, _sig.SIGTERM)
+                    logger.debug(f"发送 SIGTERM to Chrome PID={pid}")
+                except (ProcessLookupError, PermissionError, ValueError):
+                    pass
+
+            # 等一小会让 Chrome 优雅退出
+            import time
+            time.sleep(1.0)
+
+            # 还没退就强杀
+            for pid in all_pids:
+                try:
+                    os.kill(pid, _sig.SIGKILL)
+                except (ProcessLookupError, PermissionError, ValueError):
+                    pass
+
+            # 额外等待，确保端口释放
+            time.sleep(0.5)
         except Exception as e:
             logger.debug(f"清理 Chrome 进程异常: {e}")
 

package/web/api_server.py

@@ -373,11 +373,13 @@ 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)
         r.add_put("/api/workdir", self.handle_set_workdir)
         r.add_get("/api/workdir/files", self.handle_list_workdir)
+        r.add_get(r"/api/workdir/download/{path:.*}", self.handle_workdir_download)
         r.add_get("/api/logs", self.handle_get_logs)
         r.add_get("/api/logs/stream", self.handle_log_stream)
         r.add_post("/api/chat", self.handle_chat)
@@ -2102,6 +2104,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())
@@ -2829,13 +2861,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
@@ -3771,49 +3821,145 @@ window.toggleFullscreen = function() {{
         return web.json_response({"ok": True})
 
     async def handle_list_workdir(self, request):
+        """GET /api/workdir/files?path=xxx&recursive=1 - 列出工作目录文件
+
+        [v1.18.5] 支持:
+        - path: 子目录相对路径（如 'userfiles/2026-04'）
+        - recursive: 递归列出子目录
+        """
         wd = self.core.config_mgr.data_dir / "workspace"
-        if not wd.exists(): return web.json_response([])
+        sub_path = request.query.get("path", "").strip("/")
+        if sub_path:
+            target = wd / sub_path
+        else:
+            target = wd
+        # 安全检查：防止路径遍历
+        try:
+            target = target.resolve()
+            wd_resolved = wd.resolve()
+            if not str(target).startswith(str(wd_resolved)):
+                return web.json_response({"error": "非法路径"}, status=403)
+        except Exception:
+            return web.json_response({"error": "路径错误"}, status=400)
+
+        if not target.exists(): return web.json_response([])
+        recursive = request.query.get("recursive", "") in ("1", "true")
         items = []
-        for f in sorted(wd.iterdir())[:200]:
-            try: items.append({"name": f.name, "type": "dir" if f.is_dir() else "file", "size": f.stat().st_size if f.is_file() else 0})
-            except: pass
+        max_items = 500
+        if recursive:
+            for f in sorted(target.rglob("*")):
+                if len(items) >= max_items: break
+                try:
+                    if f.is_file():
+                        rel = str(f.relative_to(target))
+                        items.append({"name": f.name, "path": sub_path + "/" + rel if sub_path else rel, "type": "file", "size": f.stat().st_size})
+                except Exception:
+                    pass
+        else:
+            for f in sorted(target.iterdir()):
+                if len(items) >= max_items: break
+                try:
+                    items.append({
+                        "name": f.name,
+                        "path": (sub_path + "/" + f.name) if sub_path else f.name,
+                        "type": "dir" if f.is_dir() else "file",
+                        "size": f.stat().st_size if f.is_file() else 0,
+                    })
+                except Exception:
+                    pass
         return web.json_response(items)
 
+    async def handle_workdir_download(self, request):
+        """GET /api/workdir/download/{path} - 下载工作目录文件"""
+        import urllib.parse
+        rel_path = urllib.parse.unquote(request.match_info["path"]).strip("/")
+        if not rel_path:
+            return web.json_response({"error": "未指定文件"}, status=400)
+        wd = self.core.config_mgr.data_dir / "workspace"
+        target = wd / rel_path
+        # 安全检查
+        try:
+            target = target.resolve()
+            wd_resolved = wd.resolve()
+            if not str(target).startswith(str(wd_resolved)):
+                return web.json_response({"error": "非法路径"}, status=403)
+        except Exception:
+            return web.json_response({"error": "路径错误"}, status=400)
+        if not target.exists() or not target.is_file():
+            return web.json_response({"error": "文件不存在"}, status=404)
+        import mimetypes
+        ctype = mimetypes.guess_type(str(target))[0] or "application/octet-stream"
+        return web.Response(
+            body=target.read_bytes(),
+            content_type=ctype,
+            headers={"Content-Disposition": f'attachment; filename="{target.name}"'},
+        )
+
     # --- Logs ---
     async def handle_get_logs(self, request):
         log_dir = self.core.config_mgr.logs_dir
         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
 
     # ── 配置管理 (热重载 / 导入 / 导出) ──
@@ -5861,6 +6007,8 @@ window.toggleFullscreen = function() {{
 
     async def handle_list_org_knowledge(self, request):
         """GET /api/organization/knowledge - 列出组织知识库文件"""
+        if not self.core.config.organization.enabled:
+            return web.json_response([])
         org_mgr = self._get_org_manager()
         files = org_mgr.list_knowledge_files()
         return web.json_response(files)
@@ -6058,11 +6206,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>
@@ -2688,9 +2698,10 @@ function _renderMessagesInner() {
             '</div>');
         }
       }
-      // Agent files (v2_file events)
-      if (!isUser && msg._files && msg._files.length > 0) {
-        for (const f of msg._files) {
+      // Agent files (v2_file events) — 支持实时流式 _files 和历史加载的 files
+      const agentFiles = (msg._files || (msg.files && !isUser ? msg.files : []));
+      if (agentFiles.length > 0) {
+        for (const f of agentFiles) {
           const fileId = f.id;
           const sizeStr = f.size ? formatFileSize(f.size) : '';
           const icon = _getFileIcon(f.name || f.type || '');

package/web/ui/index.html

@@ -77,6 +77,16 @@ tr:hover{background:var(--surface2)}
 .badge-yellow{background:#f59e0b22;color:var(--warn)}
 .badge-blue{background:#3b82f622;color:var(--info)}
 .badge-purple{background:#8b5cf622;color:#a78bfa}
+.tag{display:inline-block;padding:2px 8px;border-radius:12px;font-size:11px;background:var(--surface2);color:var(--text2);white-space:nowrap}
+.tag-imp{background:#f59e0b22;color:#f59e0b}
+.mem-list{display:flex;flex-direction:column;gap:8px}
+.mem-card{border:1px solid var(--border);border-radius:var(--radius);padding:12px 16px;background:var(--surface)}
+.mem-card-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;flex-wrap:wrap;gap:4px}
+.mem-key{font-weight:600;font-size:13px;max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.mem-meta{display:flex;gap:4px;align-items:center;flex-wrap:wrap}
+.mem-session{font-size:11px;color:var(--text3);max-width:120px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.mem-content{font-size:13px;line-height:1.5;color:var(--text);word-break:break-word;max-height:120px;overflow:hidden}
+.mem-actions{margin-top:8px;text-align:right}
 .form-group{margin-bottom:14px}
 .form-group label{display:block;font-size:13px;color:var(--text2);margin-bottom:4px}
 .form-row{display:grid;grid-template-columns:1fr 1fr;gap:12px}
@@ -487,6 +497,7 @@ function agentCardHtml(a,deptMap){
     </div>
     <div class="flex flex-col gap-8" style="flex-shrink:0">
       <button class="btn btn-sm" style="background:var(--success);color:#fff" onclick="event.stopPropagation();chatWithAgent('${escHtml(a.path)}')">对话</button>
+      <button class="btn btn-sm btn-ghost" onclick="event.stopPropagation();showWorkdirModal('${escHtml(a.path)}')">📁 工作目录</button>
       <button class="btn btn-sm btn-primary" onclick="event.stopPropagation();openEditAgentModal('${escHtml(a.path)}')">编辑</button>
       ${!isSys?`<button class="btn btn-sm btn-danger" onclick="event.stopPropagation();confirmDeleteAgent('${escHtml(a.path).replace(/'/g,"\\'")}','${escHtml(a.name||a.path).replace(/'/g,"\\'")}')">删除</button>`:''}
     </div>
@@ -501,6 +512,65 @@ function filterAgents(){
   });
 }
 
+// [v1.18.5] 工作目录文件浏览
+let _workdirCurrentPath='';
+async function showWorkdirModal(agentPath){
+  _workdirCurrentPath='';
+  const title='📁 工作目录'+(agentPath?' ('+escHtml(agentPath)+')':'');
+  $('modalContainer').innerHTML=`<div class="modal-overlay" onclick="closeModal()"><div class="modal modal-wide" onclick="event.stopPropagation()" style="max-width:600px">
+    <div class="flex justify-between items-center mb-16">
+      <h3>${title}</h3>
+      <div class="flex gap-8"><button class="btn btn-sm btn-ghost" onclick="loadWorkdirFiles('')">根目录</button><button class="btn btn-sm btn-ghost" onclick="loadWorkdirFiles(_workdirCurrentPath,true)">刷新</button></div>
+    </div>
+    <div id="workdirBreadcrumb" style="font-size:12px;color:var(--text3);margin-bottom:8px"></div>
+    <div id="workdirContent"><div class="empty">加载中...</div></div>
+    <div class="flex gap-8 mt-16"><button class="btn btn-ghost" onclick="closeModal()">关闭</button></div>
+  </div></div>`;
+  loadWorkdirFiles('');
+}
+async function loadWorkdirFiles(subPath,recursive){
+  _workdirCurrentPath=subPath||'';
+  const params=new URLSearchParams();
+  if(subPath)params.set('path',subPath);
+  if(recursive)params.set('recursive','1');
+  const files=await api('/api/workdir/files?'+params.toString());
+  const bc=document.getElementById('workdirBreadcrumb');
+  const el=document.getElementById('workdirContent');
+  if(!el)return;
+  // 面包屑导航
+  if(subPath){
+    const parts=subPath.split('/');let crumbs=['<span style="cursor:pointer" onclick="loadWorkdirFiles(\'\')">根目录</span>'];
+    let acc='';
+    for(let i=0;i<parts.length;i++){acc+=(acc?'/':'')+parts[i];crumbs.push(' / <span style="cursor:pointer" onclick="loadWorkdirFiles(\''+acc+'\')">'+escHtml(parts[i])+'</span>')}
+    if(bc)bc.innerHTML=crumbs.join('');
+  }else{if(bc)bc.innerHTML='根目录'}
+  if(!files||!files.length){el.innerHTML='<div class="empty">暂无文件</div>';return}
+  // 排序：目录在前，文件在后
+  const dirs=files.filter(f=>f.type==='dir').sort((a,b)=>a.name.localeCompare(b.name));
+  const fils=files.filter(f=>f.type==='file').sort((a,b)=>a.name.localeCompare(b.name));
+  let html='<div class="table-wrap"><table><tr><th>名称</th><th>大小</th><th></th></tr>';
+  for(const d of dirs){
+    const dp=d.path||d.name;
+    html+=`<tr style="cursor:pointer" onclick="loadWorkdirFiles('${escHtml(dp)}')"><td>📂 ${escHtml(d.name)}</td><td>-</td><td></td></tr>`;
+  }
+  for(const f of fils){
+    const fp=f.path||f.name;
+    const 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 style="cursor:pointer" onclick="downloadWorkdirFile('${escHtml(fp)}')">📄 ${escHtml(f.name)}</td><td>${sizeStr}</td>
+      <td><button class="btn btn-sm btn-ghost" onclick="downloadWorkdirFile('${escHtml(fp)}')">下载</button></td></tr>`;
+  }
+  html+='</table></div>';
+  el.innerHTML=html;
+}
+function downloadWorkdirFile(relPath){
+  const link=document.createElement('a');
+  link.href=API+'/api/workdir/download/'+encodeURIComponent(relPath);
+  link.download='';
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+}
+
 // Create Agent Modal
 function _flattenDepts(list,pfx,result){
   result=result||[];
@@ -565,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();
@@ -694,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();
@@ -1177,26 +1249,25 @@ async function renderMemory(){
   html+='<div class="flex gap-8 mb-16"><input id="memSearch" placeholder="搜索记忆..." onkeydown="if(event.key===\'Enter\')searchMemory()" style="max-width:400px"><button class="btn btn-primary" onclick="searchMemory()">搜索</button><button class="btn btn-ghost" onclick="cleanupMemory()">清理过期</button></div>';
   if(lt&&lt.length){
     const isSession=_memCategory==='session';
-    let thHtml='<tr>';
-    thHtml+='<th>Key</th><th>内容</th>';
-    thHtml+='<th>角色</th>';
-    thHtml+='<th>会话</th>';
-    if(!isSession)thHtml+='<th>重要性</th>';
-    thHtml+='<th></th></tr>';
-    html+='<div class="table-wrap"><table>'+thHtml;
+    html+='<div class="mem-list">';
     for(const e of lt){
       const content=(e.content||e.summary||'')||(e.role==='user'?'[用户消息]':e.role==='assistant'?'[助手回复]':'[系统]');
-
       let contentPreview=escHtml(content.slice(0,300));
       if(content.length>300)contentPreview+=`<span style="color:var(--text3)">... (${content.length}字)</span>`;
-      html+='<tr><td style="white-space:nowrap;max-width:120px;overflow:hidden;text-overflow:ellipsis">'+escHtml(e.key||e.role||'-')+'</td>';
-      html+='<td style="max-width:600px;word-break:break-word;font-size:13px">'+contentPreview+'</td>';
-      html+='<td style="white-space:nowrap">'+escHtml(e.role||'')+'</td>';
-      html+='<td style="white-space:nowrap;max-width:140px;overflow:hidden;text-overflow:ellipsis;font-size:12px;color:var(--text3)" title="'+escHtml(e.session_id||'')+'">'+escHtml((e.session_id||'').split('_web_')[0])+'</td>';
-      if(!isSession)html+='<td>'+(e.importance!=null?e.importance.toFixed(2):'')+'</td>';
-      html+='<td><button class="btn btn-sm btn-danger" onclick="deleteMemory(\''+e.id+'\')">删除</button></td></tr>';
+      html+=`<div class="mem-card">
+        <div class="mem-card-header">
+          <span class="mem-key">${escHtml(e.key||e.role||'-')}</span>
+          <div class="mem-meta">
+            <span class="tag">${escHtml(e.role||'')}</span>
+            ${!isSession&&e.importance!=null?'<span class="tag tag-imp">'+e.importance.toFixed(2)+'</span>':''}
+            ${e.session_id?'<span class="mem-session" title="'+escHtml(e.session_id)+'">'+escHtml((e.session_id||'').split('_web_')[0])+'</span>':''}
+          </div>
+        </div>
+        <div class="mem-content">${contentPreview}</div>
+        <div class="mem-actions"><button class="btn btn-sm btn-danger" onclick="deleteMemory('${e.id}')">删除</button></div>
+      </div>`;
     }
-    html+='</table></div>';
+    html+='</div>';
   }else{
     html+='<div class="empty">暂无'+(_memCategory==='session'?'会话':'全局')+'记忆</div>';
   }
@@ -1207,12 +1278,22 @@ async function searchMemory(){
   const r=await api('/api/memory/search?q='+encodeURIComponent(q));
   let html='<h3>搜索结果: '+(r.length||0)+' 条</h3>';
   if(r&&r.length){
-    html+='<div class="table-wrap"><table><tr><th>Key</th><th>内容</th><th>分类</th><th>角色</th><th>会话</th></tr>';
+    html+='<div class="mem-list">';
     for(const e of r){
       const content=(e.content||'').slice(0,300);
-      html+=`<tr><td style="white-space:nowrap">${escHtml(e.key||'')}</td><td style="max-width:600px;word-break:break-word;font-size:13px">${escHtml(content)}</td><td>${e.category||''}</td><td>${escHtml(e.role||'')}</td><td style="font-size:12px;color:var(--text3)">${escHtml((e.session_id||'').split('_web_')[0])}</td></tr>`;
+      html+=`<div class="mem-card">
+        <div class="mem-card-header">
+          <span class="mem-key">${escHtml(e.key||'')}</span>
+          <div class="mem-meta">
+            <span class="tag">${e.category||''}</span>
+            <span class="tag">${escHtml(e.role||'')}</span>
+            <span class="mem-session">${escHtml((e.session_id||'').split('_web_')[0])}</span>
+          </div>
+        </div>
+        <div class="mem-content">${escHtml(content)}</div>
+      </div>`;
     }
-    html+='</table></div>';
+    html+='</div>';
   }else{
     html+='<div class="empty">未找到匹配的记忆</div>';
   }
@@ -1546,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(){
@@ -1640,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=>{
@@ -1752,7 +2010,8 @@ async function deleteTask(taskId){
   });
 }
 
-function closeModal(){$('modalContainer').innerHTML=''}
+let _deptTreeNeedsRefresh=false;
+function closeModal(){$('modalContainer').innerHTML='';if(_deptTreeNeedsRefresh){_deptTreeNeedsRefresh=false;renderDepartments()}}
 
 // ========== Organization ==========
 async function renderOrganization(){
@@ -1774,17 +2033,18 @@ async function renderOrganization(){
       <div class="form-group"><label>网站</label><input id="orgWebsite" value="${escHtml(inf.website||'')}" placeholder="https://..."></div>
     </div>
     <div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="saveOrgInfo()">保存信息</button></div></div>`;
-  // 知识库
-  html+=`<div class="card"><div class="flex justify-between items-center mb-16">
+  // 知识库 — 未启用组织时隐藏
+  const orgEnabled=cfg.enabled;
+  html+=`<div class="card" id="orgKBCard"><div class="flex justify-between items-center mb-16">
     <h3 style="margin:0">组织知识库</h3>
-    <button class="btn btn-sm btn-primary" onclick="uploadOrgKnowledge(false)">上传文件</button> <button class="btn btn-sm btn-secondary" onclick="uploadOrgKnowledge(true)">📁 上传文件夹</button></div>
-    <div id="orgKBList"><div class="empty">加载中...</div></div></div>`;
+    <div id="orgKBActions">${orgEnabled?'<button class="btn btn-sm btn-primary" onclick="uploadOrgKnowledge(false)">上传文件</button> <button class="btn btn-sm btn-secondary" onclick="uploadOrgKnowledge(true)">📁 上传文件夹</button>':''}</div></div>
+    <div id="orgKBList"><div class="empty">${orgEnabled?'加载中...':'组织管理未启用，请先启用后再使用知识库'}</div></div></div>`;
   $('content').innerHTML=html;
-  loadOrgKnowledge();
+  if(orgEnabled)loadOrgKnowledge();
 }
 async function saveOrgConfig(){
   const r=await api('/api/organization',{method:'PUT',body:JSON.stringify({enabled:$('orgEnabled').checked,knowledge_admin:$('orgAdmin').value})});
-  if(r.error){showToast(r.error,'danger');return}showToast('已保存','success');
+  if(r.error){showToast(r.error,'danger');return}showToast('已保存','success');renderOrganization();
 }
 async function saveOrgInfo(){
   const r=await api('/api/organization/info',{method:'PUT',body:JSON.stringify({name:$('orgName').value,description:$('orgDesc').value,contact:$('orgContact').value,website:$('orgWebsite').value})});
@@ -1967,14 +2227,14 @@ async function addDeptAgent(path){
   if(sel)sel.disabled=true;if(btn)btn.disabled=true;
   try{
   const r=await api(`/api/departments/${encodeURIComponent(path)}/agents`,{method:'PUT',body:JSON.stringify({agents:[sel.value],action:'add'})});
-  if(r.error){showToast(r.error,'danger');return}
-  showToast('已添加','success');showDeptDetail(path);
+  if(r.error||r.ok===false){showToast(r.error||r.message||'添加失败','danger');return}
+  showToast('已添加','success');_deptTreeNeedsRefresh=true;showDeptDetail(path);
   }finally{if(sel)sel.disabled=false;if(btn)btn.disabled=false}
 }
 async function removeDeptAgent(path,agentName){
   const r=await api(`/api/departments/${encodeURIComponent(path)}/agents`,{method:'PUT',body:JSON.stringify({agents:[agentName],action:'remove'})});
-  if(r.error){showToast(r.error,'danger');return}
-  showToast('已移除','success');showDeptDetail(path);
+  if(r.error||r.ok===false){showToast(r.error||r.message||'移除失败','danger');return}
+  showToast('已移除','success');_deptTreeNeedsRefresh=true;showDeptDetail(path);
 }
 async function saveDeptInfo(path){
   // 同时保存名称、emoji 和元数据（描述、负责人）
@@ -2225,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
@@ -2239,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:''})});