myagent-ai 1.18.5 → 1.18.6

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.6",
   "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

@@ -378,6 +378,7 @@ class ApiServer:
         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)
@@ -3771,14 +3772,80 @@ 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
@@ -5861,6 +5928,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)

package/web/ui/chat/chat_main.js

@@ -2688,9 +2688,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||[];
@@ -1177,26 +1247,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 +1276,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>';
   }
@@ -1752,7 +1831,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 +1854,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 +2048,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 和元数据（描述、负责人）