myagent-ai 1.23.36 → 1.23.37

package/groups/manager.py

@@ -275,6 +275,27 @@ class GroupManager:
             CREATE INDEX IF NOT EXISTS idx_group_messages_group_id
             ON group_messages(group_id, timestamp)
         """)
+        # [v1.23.37] Agent间私聊记录表（独立于群聊消息，便于查询和管理）
+        self._db_conn.execute("""
+            CREATE TABLE IF NOT EXISTS agent_chat (
+                id TEXT PRIMARY KEY,
+                group_id TEXT NOT NULL DEFAULT '',
+                from_agent TEXT NOT NULL,
+                from_name TEXT DEFAULT '',
+                to_agent TEXT NOT NULL,
+                to_name TEXT DEFAULT '',
+                content TEXT NOT NULL,
+                timestamp REAL NOT NULL
+            )
+        """)
+        self._db_conn.execute("""
+            CREATE INDEX IF NOT EXISTS idx_agent_chat_group
+            ON agent_chat(group_id, timestamp)
+        """)
+        self._db_conn.execute("""
+            CREATE INDEX IF NOT EXISTS idx_agent_chat_pair
+            ON agent_chat(from_agent, to_agent, timestamp)
+        """)
         self._db_conn.commit()
 
     def close(self):
@@ -697,6 +718,75 @@ class GroupManager:
         self._db_conn.commit()
         return True
 
+    # ==================================================================
+    # [v1.23.37] Agent间私聊记录
+    # ==================================================================
+
+    def add_agent_chat(self, group_id: str, from_agent: str, from_name: str,
+                       to_agent: str, to_name: str, content: str) -> str:
+        """添加一条Agent间私聊记录，返回消息ID"""
+        if not self._db_conn:
+            return ""
+        msg_id = uuid.uuid4().hex[:16]
+        self._db_conn.execute(
+            "INSERT INTO agent_chat (id, group_id, from_agent, from_name, to_agent, to_name, content, timestamp) "
+            "VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+            (msg_id, group_id, from_agent, from_name, to_agent, to_name, content, time.time()),
+        )
+        self._db_conn.commit()
+        return msg_id
+
+    def get_agent_chats(self, group_id: str = "", from_agent: str = "",
+                        to_agent: str = "", limit: int = 200) -> list:
+        """查询Agent间私聊记录，支持按群、发送方、接收方筛选"""
+        if not self._db_conn:
+            return []
+        conditions = []
+        params = []
+        if group_id:
+            conditions.append("group_id = ?")
+            params.append(group_id)
+        if from_agent:
+            conditions.append("(from_agent = ? OR to_agent = ?)")
+            params.extend([from_agent, from_agent])
+        if to_agent:
+            conditions.append("(from_agent = ? OR to_agent = ?)")
+            params.extend([to_agent, to_agent])
+        where = (" WHERE " + " AND ".join(conditions)) if conditions else ""
+        rows = self._db_conn.execute(
+            f"SELECT * FROM agent_chat{where} ORDER BY timestamp DESC LIMIT ?",
+            params + [limit],
+        ).fetchall()
+        return [dict(r) for r in rows]
+
+    def get_agent_chat_pairs(self, group_id: str = "") -> list:
+        """获取所有有私聊记录的Agent对（去重），返回 [{from_agent, from_name, to_agent, to_name, count, last_time}]"""
+        if not self._db_conn:
+            return []
+        where = " WHERE group_id = ?" if group_id else ""
+        params = [group_id] if group_id else []
+        rows = self._db_conn.execute(
+            f"""SELECT from_agent, from_name, to_agent, to_name,
+                       COUNT(*) as cnt, MAX(timestamp) as last_ts
+                FROM agent_chat{where}
+                GROUP BY CASE WHEN from_agent < to_agent THEN from_agent ELSE to_agent END,
+                         CASE WHEN from_agent < to_agent THEN to_agent ELSE from_agent END
+                ORDER BY last_ts DESC""",
+            params,
+        ).fetchall()
+        return [dict(r) for r in rows]
+
+    def clear_agent_chats(self, group_id: str = "") -> int:
+        """清空私聊记录，返回删除数量"""
+        if not self._db_conn:
+            return 0
+        if group_id:
+            cur = self._db_conn.execute("DELETE FROM agent_chat WHERE group_id = ?", (group_id,))
+        else:
+            cur = self._db_conn.execute("DELETE FROM agent_chat")
+        self._db_conn.commit()
+        return cur.rowcount
+
     # ==================================================================
     # 群消息统计
     # ==================================================================

package/package.json

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

package/web/api_server.py

@@ -464,6 +464,10 @@ class ApiServer:
         r.add_get("/api/groups/{gid}/messages", self.handle_get_group_messages)
         r.add_post("/api/groups/{gid}/messages", self.handle_send_group_message)
         r.add_delete("/api/groups/{gid}/messages", self.handle_clear_group_messages)
+        # [v1.23.37] Agent间私聊记录查询
+        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)
         # ── 部门管理 ──
         r.add_get("/api/departments", self.handle_dept_tree)
         r.add_post("/api/departments", self.handle_create_dept)
@@ -7779,11 +7783,15 @@ window.addEventListener('beforeunload', function() {{
    - @某个Agent: 只有被@的Agent需要回复
    - @所有人 / @all: 所有成员都需要回复
    - 不@任何人（广播）: 你自行判断是否需要回复
-2. **跨Agent沟通**: 你可以使用 `myagent-ai chat --agent <路径> --message "消息"` 命令向群内其他Agent发送消息。消息会出现在群聊中，对方下次被@时会看到。
-3. **回复方式**:
-   - 直接回复用户的消息
-   - 需要其他Agent协助时，使用 chat 命令沟通，不要假装代替其他Agent回答
-   - 如需协调多个Agent，建议用户使用 @所有人
+2. **跨Agent私下沟通**: 你可以使用 `myagent-ai chat --agent <路径> --message "消息"` 命令向群内其他Agent发送私下消息。对方会在自己下次处理消息时收到。
+   - 私下沟通的内容不会直接显示给用户，适合讨论细节、交换数据、协调方案
+   - 当任务需要多个Agent协作时，应该先在群里讨论分工，然后私下沟通具体细节
+3. **协作分工模式**（复杂任务）:
+   - 部长/管理员应主动分析任务，在群里提出分工方案（谁负责什么）
+   - 其他成员应积极响应，认领自己擅长的部分
+   - 分工确定后，各自私下沟通需要协调的细节
+   - 部长/管理员负责在群里汇总进展，向用户汇报阶段性成果和最终结果
+   - 私下沟通的详细过程不需要在群里展示，只汇报关键进展和最终结论
 {at_info}
 ### 近期群聊记录（最近10条）
 {chat_history if chat_history else '（暂无历史消息）'}
@@ -7792,7 +7800,7 @@ window.addEventListener('beforeunload', function() {{
 - 你只代表你自己发言，使用第一人称
 - 不要假装是其他Agent或代替其他Agent回答
 - 如果问题超出你的能力范围，建议用户@相关专家Agent
-- 如果需要其他Agent的信息，使用 `myagent-ai chat` 命令沟通
+- 如果需要其他Agent的信息，使用 `myagent-ai chat` 命令私下沟通
 
 ### 能力提醒（关键）
 - 你拥有完整的工具调用能力（搜索、文件操作、代码执行、图片生成等）
@@ -7872,6 +7880,7 @@ window.addEventListener('beforeunload', function() {{
         )
 
         # [v1.23.29] 从 Agent 响应中提取 __CHAT_AGENT__ 标记，清理并保存跨Agent通信消息
+        # [v1.23.37] 同时写入独立的 agent_chat 私聊记录表，便于管理后台查看
         _chat_msg_pattern = _re.compile(r'__CHAT_AGENT__(.+?)\|(.+?)\|(.+?)__END__')
         for resp in final_responses:
             resp_text = resp.get("response", "")
@@ -7879,17 +7888,31 @@ window.addEventListener('beforeunload', function() {{
             if chat_matches:
                 # 清理标记文本
                 resp["response"] = _chat_msg_pattern.sub('', resp_text).strip()
-                # 保存跨Agent通信消息到群聊
+                # 保存跨Agent通信消息
                 for c_path, c_name, c_msg in chat_matches:
+                    c_path_s, c_name_s, c_msg_s = c_path.strip(), c_name.strip(), c_msg.strip()
+                    # 群聊中显示简要提示
                     chat_sys_msg = GroupMessage(
                         group_id=gid,
                         sender=resp.get("agent_path", ""),
                         sender_name=resp.get("name", ""),
                         sender_avatar=resp.get("avatar", "🤖"),
-                        content=f"💬 对 {c_name.strip()} 说: {c_msg.strip()}",
+                        content=f"💬 私下与 {c_name_s} 沟通中...",
                         msg_type="text",
                     )
                     mgr.add_message(chat_sys_msg)
+                    # [v1.23.37] 写入独立的私聊记录表
+                    try:
+                        mgr.add_agent_chat(
+                            group_id=gid,
+                            from_agent=resp.get("agent_path", ""),
+                            from_name=resp.get("name", ""),
+                            to_agent=c_path_s,
+                            to_name=c_name_s,
+                            content=c_msg_s,
+                        )
+                    except Exception as ce:
+                        logger.debug(f"保存私聊记录失败: {ce}")
 
         # Save agent messages sequentially in sorted order
         for resp in final_responses:
@@ -7926,6 +7949,34 @@ window.addEventListener('beforeunload', function() {{
         ok = mgr.clear_messages(gid)
         return web.json_response({"ok": ok})
 
+    # ── [v1.23.37] Agent间私聊记录 API ──
+
+    async def handle_get_agent_chat_pairs(self, request):
+        """GET /api/agent-chat/pairs - 获取所有私聊Agent对"""
+        gid = request.query.get("group_id", "")
+        mgr = self._get_group_manager()
+        pairs = mgr.get_agent_chat_pairs(group_id=gid)
+        return web.json_response(pairs)
+
+    async def handle_get_agent_chat_messages(self, request):
+        """GET /api/agent-chat/messages - 查询私聊记录详情"""
+        gid = request.query.get("group_id", "")
+        from_agent = request.query.get("from_agent", "")
+        to_agent = request.query.get("to_agent", "")
+        limit = min(int(request.query.get("limit", "200")), 500)
+        mgr = self._get_group_manager()
+        messages = mgr.get_agent_chats(
+            group_id=gid, from_agent=from_agent, to_agent=to_agent, limit=limit
+        )
+        return web.json_response(messages)
+
+    async def handle_clear_agent_chat_messages(self, request):
+        """DELETE /api/agent-chat/messages - 清空私聊记录"""
+        gid = request.query.get("group_id", "")
+        mgr = self._get_group_manager()
+        deleted = mgr.clear_agent_chats(group_id=gid)
+        return web.json_response({"ok": True, "deleted": deleted})
+
     async def start(self, port: int = 8767, host: str = "127.0.0.1"):
         # 加载禁用技能列表
         self._load_disabled_skills()

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

@@ -0,0 +1,175 @@
+/**
+ * [v1.23.37] Agent间私聊记录查看模块
+ * 路径: /api/agent-chat/pairs, /api/agent-chat/messages
+ */
+async function renderAgentChat() {
+  const content = $('content');
+  if (!content) return;
+
+  let currentFilter = { group_id: '', from_agent: '', to_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 loadPairs() {
+    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) {
+    const q = new URLSearchParams();
+    if (currentFilter.group_id) q.set('group_id', currentFilter.group_id);
+    if (fromAgent) q.set('from_agent', fromAgent);
+    if (toAgent) q.set('to_agent', toAgent);
+    q.set('limit', '500');
+    const data = await api('/api/agent-chat/messages?' + q.toString());
+    return Array.isArray(data) ? data : [];
+  }
+
+  function formatTime(ts) {
+    if (!ts) return '';
+    const d = new Date(ts * 1000);
+    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;
+  }
+
+  // ── 主界面 ──
+  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>
+      </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">
+        <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>
+  `;
+
+  // ── 加载群列表 ──
+  const groups = await loadGroups();
+  const sel = $('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);
+  });
+
+  // ── 渲染聊天对列表 ──
+  async function renderPairs() {
+    const pairs = await loadPairs();
+    const list = $('acPairsList');
+    if (!pairs.length) {
+      list.innerHTML = '<div style="text-align:center;color:var(--text3);padding:40px;font-size:13px">暂无私聊记录</div>';
+      return;
+    }
+    list.innerHTML = pairs.map(p => {
+      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}')"
+        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">
+          <span style="font-size:13px;font-weight:600;color:var(--text)">${a} ↔ ${b}</span>
+          <span style="font-size:11px;color:var(--text3)">${count}条</span>
+        </div>
+        <div style="font-size:11px;color:var(--text3)">最后沟通: ${last}</div>
+      </div>`;
+    }).join('');
+  }
+
+  // ── 渲染聊天记录 ──
+  async function renderMessages(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> 的私聊记录`;
+
+    const msgs = await loadMessages(fromAgent, toAgent);
+    const container = $('acChatMessages');
+    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;
+      const sender = isFrom ? esc(m.from_name || m.from_agent) : esc(m.to_name || m.to_agent);
+      const bubbleBg = isFrom ? 'var(--accent-light)' : 'var(--bg3)';
+      const align = isFrom ? 'flex-end' : 'flex-start';
+      const labelColor = isFrom ? 'var(--accent)' : 'var(--text3)';
+      const content = esc(m.content || '').replace(/\n/g, '<br>');
+      const time = formatTime(m.timestamp);
+      return `<div style="display:flex;flex-direction:column;align-items:${align};margin-bottom:12px">
+        <div style="font-size:11px;color:${labelColor};margin-bottom:3px;padding:0 4px">${sender} · ${time}</div>
+        <div style="max-width:75%;padding:10px 14px;background:${bubbleBg};border-radius:12px;font-size:13px;line-height:1.6;color:var(--text);word-break:break-word">${content}</div>
+      </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;
+    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'); }
+  };
+
+  // 初始加载
+  await renderPairs();
+}
+
+if (typeof window._adminRenderers === 'undefined') window._adminRenderers = {};
+window._adminRenderers['agentchat'] = renderAgentChat;

package/web/ui/index.html

@@ -327,6 +327,7 @@ tr:hover{background:var(--surface2)}
     <div class="nav-item" data-tooltip="聊天平台" onclick="showPage('platforms')"><span class="icon">🌐</span><span class="icon-text">聊天平台</span></div>
     <div class="nav-item" data-tooltip="组织管理" onclick="showPage('organization')"><span class="icon">🏢</span><span class="icon-text">组织管理</span></div>
     <div class="nav-item" data-tooltip="部门管理" onclick="showPage('departments')"><span class="icon">🏛</span><span class="icon-text">部门管理</span></div>
+    <div class="nav-item" data-tooltip="Agent私聊" onclick="showPage('agentchat')"><span class="icon">🔒</span><span class="icon-text">Agent私聊</span></div>
     <div class="nav-item" data-tooltip="会话管理" onclick="showPage('sessions')"><span class="icon">💬</span><span class="icon-text">会话管理</span></div>
     <div class="nav-item" data-tooltip="记忆管理" onclick="showPage('memory')"><span class="icon">🧠</span><span class="icon-text">记忆管理</span></div>
     <div class="nav-item" data-tooltip="权限管理" onclick="showPage('permissions')"><span class="icon">🔑</span><span class="icon-text">权限管理</span></div>
@@ -368,6 +369,7 @@ tr:hover{background:var(--surface2)}
 <script src="admin/admin-logs.js"></script>
 <script src="admin/admin-tasks.js"></script>
 <script src="admin/admin-org.js"></script>
+<script src="admin/admin-agentchat.js"></script>
 <script src="admin/admin-system.js"></script>
 </body>
 </html>