myagent-ai 1.24.3 → 1.24.6

package/README.md

@@ -130,7 +130,7 @@ curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install
 myagent-ai update
 ```
 
-该命令会自动完成：npm 升级全局包 → 重建虚拟环境 → 重装所有依赖。
+该命令会自动完成：npm 升级全局包 → 检查新增依赖 → 自动启动。
 
 ---
 
@@ -207,8 +207,11 @@ myagent-ai install
 # 重装依赖（删除 venv 重建）
 myagent-ai reinstall
 
-# 卸载
+# 卸载（清除所有数据）
 myagent-ai uninstall
+
+# 卸载但保留数据（配置、记忆等）
+myagent-ai uninstall --keep-data
 ```
 
 > 首次运行会自动安装所有依赖，后续启动秒开。

package/core/agent_storage.py

@@ -393,6 +393,7 @@ class AgentStorage:
     def migrate_from_json(self, agents_dir: Path, force: bool = False) -> dict:
         """
         从文件系统迁移 agent 配置到数据库。
+        迁移完成后删除 config.json 防止重复迁移。
 
         Args:
             agents_dir: agents 数据目录路径（~/.myagent/data/agents/）
@@ -408,6 +409,13 @@ class AgentStorage:
             logger.info(f"Agent 数据目录不存在，跳过迁移: {agents_dir}")
             return result
 
+        # [v1.24.5] 检查迁移标记文件，如果已迁移过则跳过
+        _migrated_flag = agents_dir.parent / ".migrated_to_db"
+        if _migrated_flag.exists() and self.count() > 0 and not force:
+            logger.info(f"数据库已有 {self.count()} 个 agent，且迁移标记存在，跳过迁移")
+            result["skipped"] = self.count()
+            return result
+
         if self.count() > 0 and not force:
             logger.info(f"数据库已有 {self.count()} 个 agent，跳过迁移（使用 force 强制重新迁移）")
             result["skipped"] = self.count()
@@ -457,6 +465,13 @@ class AgentStorage:
         with self._lock:
             conn.commit()
 
+        # [v1.24.5] 迁移完成后写入标记文件，防止卸载重装后重复迁移
+        if result["migrated"] > 0:
+            try:
+                _migrated_flag.write_text(now, encoding="utf-8")
+            except Exception as e:
+                logger.warning(f"写入迁移标记失败: {e}")
+
         logger.info(f"Agent 配置迁移完成: {result['migrated']} 迁移, {result['skipped']} 跳过, {result['errors']} 错误")
         return result
 

package/package.json

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

package/web/api_server.py

@@ -484,6 +484,8 @@ class ApiServer:
         r.add_get("/api/agent-chat/pairs", self.handle_get_agent_chat_pairs)
         r.add_get("/api/agent-chat/messages", self.handle_get_agent_chat_messages)
         r.add_delete("/api/agent-chat/messages", self.handle_clear_agent_chat_messages)
+        # [v1.24.5] 所有用户-Agent私聊会话查看
+        r.add_get("/api/private-chats/sessions", self.handle_get_private_chat_sessions)
         # ── 部门管理 ──
         r.add_get("/api/departments", self.handle_dept_tree)
         r.add_post("/api/departments", self.handle_create_dept)
@@ -8411,6 +8413,103 @@ window.addEventListener('beforeunload', function() {{
         deleted = mgr.clear_agent_chats(group_id=gid)
         return web.json_response({"ok": True, "deleted": deleted})
 
+    # ── [v1.24.5] 所有用户-Agent 私聊会话 API ──
+
+    async def handle_get_private_chat_sessions(self, request):
+        """GET /api/private-chats/sessions - 获取所有用户与 Agent 的私聊会话列表
+        支持 ?agent=xxx 按指定 agent 筛选
+        """
+        if not self.core.memory:
+            return web.json_response([])
+        agent = request.query.get("agent", "")
+        conn = self.core.memory._get_conn()
+        _hidden = ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight')
+
+        if agent:
+            # 按 agent 路径筛选：旧格式 session_id LIKE '{agent}_%' 或新格式 metadata 包含 agent_path
+            metadata_pattern = '%"agent_path":"' + agent + '"%'
+            rows = conn.execute(
+                "SELECT m.session_id, COUNT(*) as msg_count, MAX(m.created_at) as last_active "
+                "FROM memories m "
+                "WHERE m.category = 'session' AND m.role != '' "
+                "AND m.key NOT IN (?,?,?,?) "
+                "AND (m.session_id LIKE ? OR (m.session_id LIKE 'sess_%' AND m.metadata LIKE ?)) "
+                "GROUP BY m.session_id ORDER BY last_active DESC LIMIT 200",
+                (*_hidden, agent + "_%", metadata_pattern)
+            ).fetchall()
+        else:
+            # 所有非群聊会话（session_id 不以 'grp_' 开头）
+            rows = conn.execute(
+                "SELECT m.session_id, COUNT(*) as msg_count, MAX(m.created_at) as last_active "
+                "FROM memories m "
+                "WHERE m.category = 'session' AND m.role != '' "
+                "AND m.key NOT IN (?,?,?,?) "
+                "AND m.session_id NOT LIKE 'grp_%' "
+                "GROUP BY m.session_id ORDER BY last_active DESC LIMIT 200",
+                (*_hidden,)
+            ).fetchall()
+
+        # 获取每个 agent 的名称映射
+        agents_db = self._agent_store.list_all() if hasattr(self, '_agent_store') else []
+        agent_map = {}
+        for ac in agents_db:
+            agent_map[ac.path] = ac.name or ac.path
+
+        sessions = []
+        sids = [r["session_id"] for r in rows]
+        # 批量获取会话名称
+        name_map = self.core.memory.list_session_names(sids) if sids else {}
+
+        for r in rows:
+            sid = r["session_id"]
+            # 推断 agent 路径
+            agent_path = ''
+            agent_name = ''
+            if sid.startswith('grp_'):
+                continue
+            # 从新格式 metadata 中提取 agent_path
+            meta_row = conn.execute(
+                "SELECT metadata FROM memories WHERE session_id = ? AND metadata LIKE '%agent_path%' LIMIT 1",
+                (sid,)
+            ).fetchone()
+            if meta_row and meta_row["metadata"]:
+                try:
+                    meta = json.loads(meta_row["metadata"])
+                    agent_path = meta.get("agent_path", "")
+                except:
+                    pass
+            # 旧格式 fallback: 从 session_id 前缀提取
+            if not agent_path:
+                if '_web_' in sid:
+                    agent_path = sid.split('_web_')[0]
+                elif '_cli_' in sid:
+                    agent_path = sid.split('_cli_')[0]
+                else:
+                    agent_path = sid.split('_')[0] if '_' in sid else 'default'
+
+            agent_name = agent_map.get(agent_path, agent_path)
+            # 获取最后一条用户消息作为预览
+            preview = ''
+            preview_row = conn.execute(
+                "SELECT content FROM memories WHERE session_id = ? AND role = 'user' AND category = 'session' "
+                "ORDER BY created_at DESC LIMIT 1",
+                (sid,)
+            ).fetchone()
+            if preview_row:
+                preview = (preview_row["content"] or "")[:100]
+
+            sessions.append({
+                "id": sid,
+                "agent_path": agent_path,
+                "agent_name": agent_name,
+                "messages": r["msg_count"],
+                "last": r["last_active"],
+                "display_name": name_map.get(sid, ""),
+                "preview": preview,
+            })
+
+        return web.json_response(sessions)
+
     async def start(self, port: int = 8767, host: str = "127.0.0.1"):
         # 加载禁用技能列表
         self._load_disabled_skills()

package/web/ui/admin/admin-agentchat.js

@@ -1,30 +1,36 @@
 /**
- * [v1.23.37] Agent间私聊记录查看模块
- * 路径: /api/agent-chat/pairs, /api/agent-chat/messages
+ * [v1.24.5] 私聊记录查看模块
+ * 支持查看所有用户-Agent私聊会话 + Agent间群聊私聊记录
+ * 路径:
+ *   /api/private-chats/sessions      - 所有用户-Agent私聊（支持 ?agent=xxx 筛选）
+ *   /api/agent-chat/pairs            - Agent间私聊对
+ *   /api/agent-chat/messages         - Agent间私聊详情
  */
 async function renderAgentChat() {
   const content = $('content');
   if (!content) return;
 
-  let currentFilter = { group_id: '', from_agent: '', to_agent: '' };
+  let currentTab = 'user-agent'; // 'user-agent' | 'agent-agent'
+  let currentFilter = { group_id: '', agent: '' };
 
   function esc(s) { return (s || '').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'); }
 
-  async function loadGroups() {
-    try {
-      const data = await api('/api/groups');
-      return Array.isArray(data) ? data : (data.groups || data.data || []);
-    } catch { return []; }
+  // ── 数据加载 ──
+  async function loadPrivateSessions() {
+    const q = new URLSearchParams();
+    if (currentFilter.agent) q.set('agent', currentFilter.agent);
+    const data = await api('/api/private-chats/sessions?' + q.toString());
+    return Array.isArray(data) ? data : [];
   }
 
-  async function loadPairs() {
+  async function loadAgentPairs() {
     const q = new URLSearchParams();
     if (currentFilter.group_id) q.set('group_id', currentFilter.group_id);
     const data = await api('/api/agent-chat/pairs?' + q.toString());
     return Array.isArray(data) ? data : [];
   }
 
-  async function loadMessages(fromAgent, toAgent) {
+  async function loadAgentMessages(fromAgent, toAgent) {
     const q = new URLSearchParams();
     if (currentFilter.group_id) q.set('group_id', currentFilter.group_id);
     if (fromAgent) q.set('from_agent', fromAgent);
@@ -34,79 +40,187 @@ async function renderAgentChat() {
     return Array.isArray(data) ? data : [];
   }
 
+  async function loadGroups() {
+    try {
+      const data = await api('/api/groups');
+      return Array.isArray(data) ? data : (data.groups || data.data || []);
+    } catch { return []; }
+  }
+
+  async function loadAgents() {
+    if (allAgentsCache.length) return allAgentsCache;
+    const data = await api('/api/agents');
+    allAgentsCache = Array.isArray(data) ? data : [];
+    return allAgentsCache;
+  }
+
   function formatTime(ts) {
     if (!ts) return '';
-    const d = new Date(ts * 1000);
+    const d = new Date(ts * 1000 || ts);
     const pad = n => String(n).padStart(2, '0');
-    return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
-  }
-
-  function truncate(s, len) {
-    if (!s) return '';
-    return s.length > len ? s.slice(0, len) + '...' : s;
+    if (isNaN(d.getTime())) return String(ts);
+    return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
   }
 
   // ── 主界面 ──
   content.innerHTML = `
     <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:20px">
       <div>
-        <h2 style="font-size:20px;font-weight:600;color:var(--text)">Agent 私聊记录</h2>
-        <p style="font-size:13px;color:var(--text3);margin-top:4px">查看群聊中 Agent 之间的私下沟通记录</p>
-      </div>
-      <div style="display:flex;gap:8px">
-        <button id="acRefreshBtn" onclick="window._acRefresh()" style="padding:6px 14px;background:var(--bg3);color:var(--text);border:1px solid var(--border);border-radius:var(--radius);cursor:pointer;font-size:13px">
-          刷新
-        </button>
-        <button id="acClearBtn" onclick="window._acClearAll()" style="padding:6px 14px;background:var(--danger);color:#fff;border:none;border-radius:var(--radius);cursor:pointer;font-size:13px">
-          清空全部
-        </button>
+        <h2 style="font-size:20px;font-weight:600;color:var(--text)">私聊记录</h2>
+        <p style="font-size:13px;color:var(--text3);margin-top:4px">查看用户与 Agent 的私聊会话，以及群聊中 Agent 间私下沟通</p>
       </div>
+      <button id="acRefreshBtn" onclick="window._acRefresh()" style="padding:6px 14px;background:var(--bg3);color:var(--text);border:1px solid var(--border);border-radius:var(--radius);cursor:pointer;font-size:13px">
+        刷新
+      </button>
+    </div>
+    <!-- Tab 切换 -->
+    <div style="display:flex;gap:0;margin-bottom:16px;border:1px solid var(--border);border-radius:var(--radius);overflow:hidden;width:fit-content">
+      <div id="acTabUA" onclick="window._acSwitchTab('user-agent')" style="padding:8px 20px;cursor:pointer;font-size:13px;font-weight:600;background:var(--accent);color:#fff">👤 用户-Agent 私聊</div>
+      <div id="acTabAA" onclick="window._acSwitchTab('agent-agent')" style="padding:8px 20px;cursor:pointer;font-size:13px;font-weight:600;background:var(--bg3);color:var(--text2)">🤖 Agent间私聊</div>
     </div>
-    <div style="display:flex;gap:12px;margin-bottom:16px;flex-wrap:wrap">
-      <select id="acGroupFilter" onchange="window._acFilterChange()" style="padding:6px 10px;background:var(--bg3);color:var(--text);border:1px solid var(--border);border-radius:var(--radius);font-size:13px;min-width:160px">
+    <!-- 筛选区 -->
+    <div id="acFilters" style="display:flex;gap:12px;margin-bottom:16px;flex-wrap:wrap">
+      <select id="acAgentFilter" onchange="window._acFilterChange()" style="padding:6px 10px;background:var(--bg3);color:var(--text);border:1px solid var(--border);border-radius:var(--radius);font-size:13px;min-width:180px">
+        <option value="">全部 Agent</option>
+      </select>
+      <select id="acGroupFilter" onchange="window._acFilterChange()" style="display:none;padding:6px 10px;background:var(--bg3);color:var(--text);border:1px solid var(--border);border-radius:var(--radius);font-size:13px;min-width:160px">
         <option value="">全部群聊</option>
       </select>
     </div>
-    <div style="display:grid;grid-template-columns:340px 1fr;gap:16px;min-height:500px" id="acLayout">
-      <div id="acPairsPanel" style="background:var(--bg2);border:1px solid var(--border);border-radius:var(--radius);overflow:hidden;display:flex;flex-direction:column">
-        <div style="padding:12px 16px;border-bottom:1px solid var(--border);font-weight:600;font-size:14px;color:var(--text2)">聊天对象</div>
-        <div id="acPairsList" style="flex:1;overflow-y:auto;padding:8px">
-          <div style="text-align:center;color:var(--text3);padding:40px;font-size:13px">加载中...</div>
-        </div>
-      </div>
-      <div id="acChatPanel" style="background:var(--bg2);border:1px solid var(--border);border-radius:var(--radius);overflow:hidden;display:flex;flex-direction:column">
-        <div id="acChatHeader" style="padding:12px 16px;border-bottom:1px solid var(--border);font-weight:600;font-size:14px;color:var(--text2)">选择左侧聊天对象查看详情</div>
-        <div id="acChatMessages" style="flex:1;overflow-y:auto;padding:16px">
-          <div style="text-align:center;color:var(--text3);padding:60px;font-size:13px">暂无聊天记录</div>
-        </div>
-      </div>
-    </div>
+    <!-- 内容区 -->
+    <div id="acContent"></div>
   `;
 
-  // ── 加载群列表 ──
+  // ── 加载 Agent 列表（用于筛选下拉） ──
+  const agents = await loadAgents();
+  const agentSel = $('acAgentFilter');
+  agents.forEach(a => {
+    const opt = document.createElement('option');
+    opt.value = a.path || '';
+    opt.textContent = (a.avatar_emoji || '') + ' ' + escHtml(a.name || a.path);
+    agentSel.appendChild(opt);
+  });
+
+  // ── 加载群列表（Agent间私聊 tab 使用） ──
   const groups = await loadGroups();
-  const sel = $('acGroupFilter');
+  const groupSel = $('acGroupFilter');
   groups.forEach(g => {
     const opt = document.createElement('option');
     opt.value = g.id || g.group_id || '';
     opt.textContent = g.name || g.group_name || g.id || '未命名';
-    sel.appendChild(opt);
+    groupSel.appendChild(opt);
   });
 
-  // ── 渲染聊天对列表 ──
-  async function renderPairs() {
-    const pairs = await loadPairs();
-    const list = $('acPairsList');
+  // ── Tab 切换 ──
+  window._acSwitchTab = (tab) => {
+    currentTab = tab;
+    const tabUA = $('acTabUA');
+    const tabAA = $('acTabAA');
+    const agentFilter = $('acAgentFilter');
+    const groupFilter = $('acGroupFilter');
+    if (tab === 'user-agent') {
+      tabUA.style.background = 'var(--accent)'; tabUA.style.color = '#fff';
+      tabAA.style.background = 'var(--bg3)'; tabAA.style.color = 'var(--text2)';
+      agentFilter.style.display = '';
+      groupFilter.style.display = 'none';
+    } else {
+      tabAA.style.background = 'var(--accent)'; tabAA.style.color = '#fff';
+      tabUA.style.background = 'var(--bg3)'; tabUA.style.color = 'var(--text2)';
+      agentFilter.style.display = 'none';
+      groupFilter.style.display = '';
+    }
+    renderContent();
+  };
+
+  window._acFilterChange = () => {
+    currentFilter.agent = $('acAgentFilter').value;
+    currentFilter.group_id = $('acGroupFilter').value;
+    renderContent();
+  };
+
+  // ── 用户-Agent 私聊列表渲染 ──
+  async function renderUserAgentSessions() {
+    const sessions = await loadPrivateSessions();
+    const container = $('acContent');
+
+    if (!sessions.length) {
+      container.innerHTML = '<div class="empty">暂无用户-Agent私聊会话</div>';
+      return;
+    }
+
+    // 按 agent 分组
+    const grouped = {};
+    for (const s of sessions) {
+      const key = s.agent_path || 'default';
+      if (!grouped[key]) grouped[key] = { name: s.agent_name || key, sessions: [] };
+      grouped[key].sessions.push(s);
+    }
+
+    let html = `<div style="font-size:13px;color:var(--text3);margin-bottom:12px">共 ${sessions.length} 个私聊会话，${Object.keys(grouped).length} 个 Agent</div>`;
+
+    for (const [agentPath, group] of Object.entries(grouped)) {
+      html += `<div style="margin-bottom:20px">
+        <div style="display:flex;align-items:center;gap:8px;margin-bottom:8px;cursor:pointer" onclick="this.parentElement.querySelector('.ac-group-sessions').classList.toggle('hidden')">
+          <span style="font-size:16px;transition:transform .2s">📂</span>
+          <span style="font-size:14px;font-weight:600;color:var(--text)">${esc(group.name)}</span>
+          <span style="font-size:11px;color:var(--text3);background:var(--bg3);padding:2px 8px;border-radius:10px">${group.sessions.length} 个会话</span>
+        </div>
+        <div class="ac-group-sessions" style="margin-left:24px">`;
+
+      for (const s of group.sessions) {
+        const displayName = s.display_name || s.id;
+        const truncated = displayName.length > 40 ? displayName.slice(0, 40) + '...' : displayName;
+        const preview = s.preview ? esc(s.preview) : '<span style="color:var(--text3)">无预览</span>';
+        const lastTime = formatTime(s.last);
+        const agentPathSafe = esc(s.agent_path).replace(/'/g, "\\'");
+        html += `<div style="display:flex;justify-content:space-between;align-items:center;padding:10px 12px;border-radius:6px;margin-bottom:4px;cursor:pointer;transition:background .15s;border:1px solid var(--border)"
+          onmouseover="this.style.background='var(--bg3)'" onmouseout="this.style.background='transparent'"
+          onclick="window._acViewSession('${esc(s.id)}','${agentPathSafe}')">
+          <div style="flex:1;min-width:0">
+            <div style="font-size:13px;font-weight:500;color:var(--text);overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${esc(s.id)}">${esc(truncated)}</div>
+            <div style="font-size:11px;color:var(--text3);margin-top:2px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">${preview}</div>
+          </div>
+          <div style="flex-shrink:0;text-align:right;margin-left:12px">
+            <div style="font-size:11px;color:var(--text3)">${lastTime}</div>
+            <div style="font-size:11px;color:var(--text3)">${s.messages} 条消息</div>
+          </div>
+        </div>`;
+      }
+      html += '</div></div>';
+    }
+    container.innerHTML = html;
+  }
+
+  // ── 查看私聊会话消息 ──
+  window._acViewSession = async (sid, agentPath) => {
+    // 复用 admin-sessions.js 的 viewSession 逻辑
+    window._viewSessionSid = sid;
+    window._viewSessionOffset = 0;
+    _navSubState = 'view:' + sid;
+    navigateTo('agentchat', 'view:' + sid, _loadSessionMessages);
+  };
+
+  // ── Agent间私聊渲染 ──
+  async function renderAgentAgentChats() {
+    const pairs = await loadAgentPairs();
+    const container = $('acContent');
+
     if (!pairs.length) {
-      list.innerHTML = '<div style="text-align:center;color:var(--text3);padding:40px;font-size:13px">暂无私聊记录</div>';
+      container.innerHTML = '<div class="empty">暂无Agent间私聊记录</div>';
       return;
     }
-    list.innerHTML = pairs.map(p => {
+
+    let html = `<div style="display:grid;grid-template-columns:340px 1fr;gap:16px;min-height:500px">
+      <div style="background:var(--bg2);border:1px solid var(--border);border-radius:var(--radius);overflow:hidden;display:flex;flex-direction:column">
+        <div style="padding:12px 16px;border-bottom:1px solid var(--border);font-weight:600;font-size:14px;color:var(--text2)">聊天对象</div>
+        <div id="acPairsList" style="flex:1;overflow-y:auto;padding:8px">`;
+
+    for (const p of pairs) {
       const a = esc(p.from_name || p.from_agent);
       const b = esc(p.to_name || p.to_agent);
       const last = formatTime(p.last_ts);
       const count = p.cnt || p.count || 0;
-      return `<div onclick="window._acSelectPair('${esc(p.from_agent)}','${esc(p.to_agent)}','${a}','${b}')"
+      html += `<div onclick="window._acSelectPair('${esc(p.from_agent)}','${esc(p.to_agent)}','${a}','${b}')"
         style="padding:10px 12px;border-radius:6px;cursor:pointer;margin-bottom:4px;transition:background .15s"
         onmouseover="this.style.background='var(--bg3)'" onmouseout="this.style.background='transparent'">
         <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:4px">
@@ -115,21 +229,36 @@ async function renderAgentChat() {
         </div>
         <div style="font-size:11px;color:var(--text3)">最后沟通: ${last}</div>
       </div>`;
-    }).join('');
+    }
+
+    html += `</div></div>
+      <div style="background:var(--bg2);border:1px solid var(--border);border-radius:var(--radius);overflow:hidden;display:flex;flex-direction:column">
+        <div id="acChatHeader" style="padding:12px 16px;border-bottom:1px solid var(--border);font-weight:600;font-size:14px;color:var(--text2)">选择左侧聊天对象查看详情</div>
+        <div id="acChatMessages" style="flex:1;overflow-y:auto;padding:16px">
+          <div style="text-align:center;color:var(--text3);padding:60px;font-size:13px">暂无聊天记录</div>
+        </div>
+      </div>
+    </div>`;
+
+    container.innerHTML = html;
+
+    // Agent间私聊清空按钮
+    const clearBtnHtml = `<button onclick="window._acClearAgentChats()" style="margin-top:12px;padding:6px 14px;background:var(--danger);color:#fff;border:none;border-radius:var(--radius);cursor:pointer;font-size:13px">清空Agent间私聊</button>`;
+    container.insertAdjacentHTML('beforeend', clearBtnHtml);
   }
 
-  // ── 渲染聊天记录 ──
-  async function renderMessages(fromAgent, toAgent, fromName, toName) {
+  // ── Agent间私聊消息查看 ──
+  window._acSelectPair = async (fromAgent, toAgent, fromName, toName) => {
     const header = $('acChatHeader');
-    header.innerHTML = `<span style="color:var(--accent)">${esc(fromName)}</span> ↔ <span style="color:var(--accent)">${esc(toName)}</span> 的私聊记录`;
+    if (header) header.innerHTML = `<span style="color:var(--accent)">${esc(fromName)}</span> ↔ <span style="color:var(--accent)">${esc(toName)}</span> 的私聊记录`;
 
-    const msgs = await loadMessages(fromAgent, toAgent);
+    const msgs = await loadAgentMessages(fromAgent, toAgent);
     const container = $('acChatMessages');
+    if (!container) return;
     if (!msgs.length) {
       container.innerHTML = '<div style="text-align:center;color:var(--text3);padding:60px;font-size:13px">暂无记录</div>';
       return;
     }
-    // 按 time 正序显示
     const sorted = [...msgs].sort((a, b) => (a.timestamp || 0) - (b.timestamp || 0));
     container.innerHTML = sorted.map(m => {
       const isFrom = m.from_agent === fromAgent;
@@ -145,30 +274,33 @@ async function renderAgentChat() {
       </div>`;
     }).join('');
     container.scrollTop = container.scrollHeight;
-  }
-
-  // ── 全局方法 ──
-  window._acRefresh = async () => { await renderPairs(); };
-  window._acFilterChange = () => {
-    currentFilter.group_id = $('acGroupFilter').value;
-    renderPairs();
   };
-  window._acSelectPair = (fa, ta, fn, tn) => { renderMessages(fa, ta, fn, tn); };
-  window._acClearAll = async () => {
-    if (!confirm('确定要清空所有私聊记录吗？此操作不可恢复。')) return;
+
+  window._acClearAgentChats = async () => {
+    if (!confirm('确定要清空所有Agent间私聊记录吗？此操作不可恢复。')) return;
     const q = new URLSearchParams();
     if (currentFilter.group_id) q.set('group_id', currentFilter.group_id);
     try {
       const data = await api('/api/agent-chat/messages?' + q.toString(), { method: 'DELETE' });
-      toast('已清空 ' + (data.deleted || 0) + ' 条记录');
-      await renderPairs();
-      $('acChatMessages').innerHTML = '<div style="text-align:center;color:var(--text3);padding:60px;font-size:13px">暂无聊天记录</div>';
-      $('acChatHeader').textContent = '选择左侧聊天对象查看详情';
-    } catch (e) { toast('清空失败: ' + (e.message || e), 'error'); }
+      showToast('已清空 ' + (data.deleted || 0) + ' 条记录', 'success');
+      renderContent();
+    } catch (e) { showToast('清空失败: ' + (e.message || e), 'danger'); }
   };
 
+  // ── 渲染主内容 ──
+  async function renderContent() {
+    if (currentTab === 'user-agent') {
+      await renderUserAgentSessions();
+    } else {
+      await renderAgentAgentChats();
+    }
+  }
+
+  // ── 全局刷新 ──
+  window._acRefresh = async () => { await renderContent(); };
+
   // 初始加载
-  await renderPairs();
+  await renderContent();
 }
 
 if (typeof window._adminRenderers === 'undefined') window._adminRenderers = {};

package/web/ui/admin/admin-core.js

@@ -1,7 +1,7 @@
 /* ── admin-core.js — Shared infrastructure (loaded FIRST) ── */
 
 const API='';
-const pages={dashboard:'📊 仪表盘',agents:'🤖 Agent 管理',platforms:'🌐 聊天平台',organization:'🏢 组织管理',departments:'🏛 部门管理',agentchat:'🔒 Agent私聊',sessions:'💬 会话管理',memory:'🧠 记忆管理',permissions:'🔑 权限管理',llm:'🧬 大模型设置',system:'⚙️ 系统配置',executor:'🔧 执行引擎',skills:'🛠 技能管理',files:'📁 工作目录',logs:'📜 查看日志',tasks:'📌 任务记录'};
+const pages={dashboard:'📊 仪表盘',agents:'🤖 Agent 管理',platforms:'🌐 聊天平台',organization:'🏢 组织管理',departments:'🏛 部门管理',agentchat:'💬 私聊记录',sessions:'📋 会话管理',memory:'🧠 记忆管理',permissions:'🔑 权限管理',llm:'🧬 大模型设置',system:'⚙️ 系统配置',executor:'🔧 执行引擎',skills:'🛠 技能管理',files:'📁 工作目录',logs:'📜 查看日志',tasks:'📌 任务记录'};
 let currentPage='dashboard';
 let allAgentsCache=[];
 let allModelsCache=[];

package/web/ui/chat/groupchat.js

@@ -444,10 +444,23 @@ function renderGroupSidebar(groupData) {
   list.innerHTML = html;
 }
 
-// [v1.23.79] 从群聊成员列表点击，直接发起私聊
+// [v1.23.79] 从群聊成员列表/消息头像点击，直接发起私聊
 function startPrivateChatFromGroup(agentPath) {
   if (typeof selectAgent === 'function') {
-    exitGroupChat();
+    // 仅做群聊清理（停轮询、清 URL/localStorage），不加载旧 agent 的 sessions
+    _stopGroupPolling(currentGroupId);
+    currentView = 'chat';
+    currentGroupId = null;
+    groupMessages = [];
+    StatePersistence.remove('currentView');
+    StatePersistence.remove('currentGroupId');
+    // 清除群聊 URL 中的 ?g= 参数
+    var cleanUrl = '/ui/chat/chat_container.html';
+    if (typeof state !== 'undefined' && agentPath && agentPath !== 'default') {
+      cleanUrl += '?a=' + encodeURIComponent(agentPath);
+    }
+    window.history.replaceState({}, '', cleanUrl);
+    // 让 selectAgent 处理完整的私聊切换
     selectAgent(agentPath);
   }
 }
@@ -500,7 +513,7 @@ function _renderGroupMessagesInner() {
       var agentColor = msg.agent_color || msg.color || 'var(--accent)';
       var agentRole = msg.agent_role || msg.role_detail || '';
       var agentPath = msg.agent || '';
-      var _clickAvatar = agentPath ? ' onclick="showAgentProfile(\'' + escapeHtml(agentPath) + '\')" style="background:' + agentColor + ';color:#fff;cursor:pointer" title="点击查看简介"' : ' style="background:' + agentColor + ';color:#fff"';
+      var _clickAvatar = agentPath ? ' onclick="startPrivateChatFromGroup(\'' + escapeHtml(agentPath) + '\')" style="background:' + agentColor + ';color:#fff;cursor:pointer" title="点击私聊 ' + escapeHtml(agentName) + '"' : ' style="background:' + agentColor + ';color:#fff"';
       // [v1.23.82] 流式输出时显示闪烁光标
       var _streamingCursor = msg._streaming ? '<span class="streaming-cursor" style="display:inline-block;width:2px;height:1em;background:var(--accent);margin-left:2px;animation:blink 1s step-end infinite;vertical-align:text-bottom"></span>' : '';
       html += '<div class="group-msg-row">'
@@ -520,7 +533,7 @@ function _renderGroupMessagesInner() {
         var rEmoji = r.agent_emoji || r.sender_avatar || r.avatar || '🤖';
         var rColor = r.agent_color || r.color || 'var(--accent)';
         var rPath = r.agent_path || '';
-        var _rClickAvatar = rPath ? ' onclick="showAgentProfile(\'' + escapeHtml(rPath) + '\')" style="background:' + rColor + ';color:#fff;cursor:pointer" title="点击查看简介"' : ' style="background:' + rColor + ';color:#fff"';
+        var _rClickAvatar = rPath ? ' onclick="startPrivateChatFromGroup(\'' + escapeHtml(rPath) + '\')" style="background:' + rColor + ';color:#fff;cursor:pointer" title="点击私聊 ' + escapeHtml(rName) + '"' : ' style="background:' + rColor + ';color:#fff"';
         html += '<div class="group-msg-row">'
           + '<div class="group-msg-avatar"' + _rClickAvatar + '>' + rEmoji + '</div>'
           + '<div>'