myagent-ai 1.23.33 → 1.23.34

package/package.json

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

package/web/api_server.py

@@ -7807,8 +7807,10 @@ window.addEventListener('beforeunload', function() {{
                 # 构建最终消息（用户原文不包含任何注入内容）
                 agent_content = content
 
+                # [v1.23.34] 群聊场景直接调用 _try_model_chain_inner（绕过全局锁）
+                # 全局锁 _model_chain_lock 在并行场景下会导致死锁/阻塞
                 if model_chain and self.core.llm:
-                    response = await self._try_model_chain(
+                    response = await self._try_model_chain_inner(
                         model_chain, agent_content, session_id,
                         agent_path=agent_path, agent_system_prompt=agent_system_prompt,
                     )
@@ -7841,26 +7843,21 @@ window.addEventListener('beforeunload', function() {{
                     "response": f"处理失败: {str(e)}",
                 }
 
-        # 并行调用目标成员agent
-        tasks = [process_agent_member(m) for m in target_members]
-        try:
-            gather_results = await asyncio.gather(*tasks, return_exceptions=True)
-        except Exception as e:
-            logger.error(f"群消息广播异常: {e}")
-            tp.update_task_status(task_id, "failed", last_message=f"广播异常: {str(e)}")
-            return web.json_response({"error": f"群消息广播异常: {str(e)}"}, status=500)
-
-        # 处理异常结果并按原始成员顺序排序
+        # [v1.23.34] 串行调用目标成员agent（避免并行时 LLM 全局状态互相覆盖导致卡死）
+        # 原因: _try_model_chain_inner 会修改 self.core.llm 的 provider/model/api_key 等全局属性
+        # 并行执行会导致 Agent 之间互相覆盖模型配置，甚至死锁
         raw_responses = []
-        for r in gather_results:
-            if isinstance(r, Exception):
+        for member in target_members:
+            try:
+                result = await process_agent_member(member)
+                raw_responses.append(result)
+            except Exception as e:
+                logger.error(f"群消息处理异常 ({member.agent_path}): {e}")
                 raw_responses.append({
-                    "ok": False, "agent_path": "unknown",
-                    "name": "unknown", "avatar": "❌",
-                    "response": f"异常: {str(r)}",
+                    "ok": False, "agent_path": member.agent_path,
+                    "name": member.agent_path, "avatar": "❌",
+                    "response": f"异常: {str(e)}",
                 })
-            else:
-                raw_responses.append(r)
 
         # Sort by original member order to ensure deterministic message ordering
         final_responses = sorted(

package/web/ui/chat/chat.css

@@ -1797,6 +1797,7 @@ input,textarea,select{font:inherit}
   border:1px solid var(--border-light);border-bottom-left-radius:4px;
   border-left:3px solid var(--accent);
   overflow-wrap:break-word;overflow:hidden;position:relative;
+  user-select:text;-webkit-user-select:text;
 }
 .group-msg-bubble p{margin-bottom:8px}
 .group-msg-bubble p:last-child{margin-bottom:0}

package/web/ui/chat/chat_main.js

@@ -328,6 +328,14 @@ const StatePersistence = {
     if (savedSessionId) {
       state._pendingSessionRestore = savedSessionId;
     }
+    // [v1.23.34] 恢复群聊状态
+    var savedView = StatePersistence.load('currentView', 'chat');
+    var savedGroupId = StatePersistence.load('currentGroupId', null);
+    if (savedView === 'group' && savedGroupId) {
+      currentView = 'group';
+      currentGroupId = savedGroupId;
+      state._pendingGroupRestore = savedGroupId;
+    }
   },
   /** 标记 setup 已完成（避免每次刷新弹出向导） */
   markSetupDone() { StatePersistence.save('setupDone', true); },
@@ -465,6 +473,14 @@ async function initChat() {
     }
     // 如果 agent 一致，loadSessions() 内部已通过 _pendingSessionRestore 自动处理了
   }
+
+  // [v1.23.34] 恢复群聊视图（在所有初始化完成后）
+  if (state._pendingGroupRestore && typeof selectGroup === 'function') {
+    var _gid = state._pendingGroupRestore;
+    state._pendingGroupRestore = null;
+    // 等待 fetchGroups 完成（initChat 中已调用），延迟恢复
+    setTimeout(function() { selectGroup(_gid); }, 300);
+  }
 }
 
 // Run init: if DOMContentLoaded already fired (dynamic script load), run immediately

package/web/ui/chat/groupchat.js

@@ -138,6 +138,11 @@ async function selectGroup(gid) {
   }
   currentView = 'group';
   currentGroupId = gid;
+  // [v1.23.34] 持久化群聊状态，刷新页面后恢复
+  if (typeof StatePersistence !== 'undefined') {
+    StatePersistence.save('currentView', 'group');
+    StatePersistence.save('currentGroupId', gid);
+  }
 
   // Update sidebar
   renderSessions();
@@ -194,6 +199,11 @@ function exitGroupChat() {
   currentView = 'chat';
   currentGroupId = null;
   groupMessages = [];
+  // [v1.23.34] 清除持久化的群聊状态
+  if (typeof StatePersistence !== 'undefined') {
+    StatePersistence.save('currentView', 'chat');
+    StatePersistence.remove('currentGroupId');
+  }
   // 清空残留的聊天状态，避免切回个人聊天时显示群聊消息
   state.messages = [];
   state.activeSessionId = null;
@@ -267,8 +277,10 @@ function _renderGroupMessagesInner() {
       var agentEmoji = msg.agent_emoji || msg.sender_avatar || msg.avatar || '🤖';
       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"';
       html += '<div class="group-msg-row">'
-        + '<div class="group-msg-avatar" style="background:' + agentColor + ';color:#fff">' + agentEmoji + '</div>'
+        + '<div class="group-msg-avatar"' + _clickAvatar + '>' + agentEmoji + '</div>'
         + '<div>'
         + '<div class="group-msg-name">' + escapeHtml(agentName)
         + (agentRole ? ' <span class="role-badge">' + escapeHtml(agentRole) + '</span>' : '')
@@ -283,8 +295,10 @@ function _renderGroupMessagesInner() {
         var rName = r.agent_name || r.sender_name || r.name || r.agent || 'Agent';
         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"';
         html += '<div class="group-msg-row">'
-          + '<div class="group-msg-avatar" style="background:' + rColor + ';color:#fff">' + rEmoji + '</div>'
+          + '<div class="group-msg-avatar"' + _rClickAvatar + '>' + rEmoji + '</div>'
           + '<div>'
           + '<div class="group-msg-name">' + escapeHtml(rName) + '</div>'
           + '<div class="group-msg-bubble" style="border-left-color:' + rColor + '">' + renderMarkdown(r.content || r.response || '') + '</div>'
@@ -294,6 +308,17 @@ function _renderGroupMessagesInner() {
   }
 
   container.innerHTML = html;
+  // [v1.23.34] 为所有群聊气泡添加双击复制功能
+  container.querySelectorAll('.group-msg-bubble').forEach(function(bubble) {
+    bubble.addEventListener('dblclick', function() {
+      var text = bubble.innerText || bubble.textContent || '';
+      if (text) {
+        navigator.clipboard.writeText(text).then(function() {
+          if (typeof toast === 'function') toast('已复制消息', 'success');
+        }).catch(function() {});
+      }
+    });
+  });
   scrollToBottom();
 }
 
@@ -798,3 +823,33 @@ async function sendGroupChat() {
     input.focus();
   }
 }
+
+// ══════════════════════════════════════════════════════
+// ── Agent Profile Popup (点击头像显示简介) ──
+// ══════════════════════════════════════════════════════
+
+function showAgentProfile(agentPath) {
+  var agent = (state.agentsFlat || []).find(function(a) { return a.path === agentPath; });
+  if (!agent) {
+    if (typeof toast === 'function') toast('未找到 Agent 信息', 'error');
+    return;
+  }
+  var name = agent.name || agentPath;
+  var emoji = agent.avatar_emoji || '🤖';
+  var color = agent.avatar_color || getAgentGradient(name);
+  var desc = agent.description || '暂无描述';
+  var tools = agent.tools || [];
+  var toolsStr = tools.length > 0 ? tools.join(', ') : '默认工具集';
+
+  var container = document.getElementById('groupModalContainer');
+  container.innerHTML = '<div class="modal-overlay" onclick="if(event.target===this)closeGroupModal()"><div class="group-modal" style="max-width:380px">'
+    + '<div style="display:flex;align-items:center;gap:14px;margin-bottom:16px">'
+    + '<div class="group-msg-avatar" style="background:' + color + ';color:#fff;width:48px;height:48px;border-radius:12px;font-size:22px">' + emoji + '</div>'
+    + '<div><div style="font-size:18px;font-weight:700;color:var(--text)">' + escapeHtml(name) + '</div>'
+    + '<div style="font-size:12px;color:var(--text3)">' + escapeHtml(agentPath) + '</div></div></div>'
+    + '<div style="font-size:14px;color:var(--text2);line-height:1.6;margin-bottom:14px;padding:12px;background:var(--bg);border-radius:var(--radius-sm);border:1px solid var(--border-light)">' + escapeHtml(desc) + '</div>'
+    + (tools.length > 0 ? '<div style="font-size:12px;color:var(--text3);margin-bottom:14px"><span style="font-weight:600">工具:</span> ' + escapeHtml(toolsStr) + '</div>' : '')
+    + '<div class="agent-modal-actions">'
+    + '<button class="agent-modal-btn agent-modal-btn-cancel" onclick="closeGroupModal()">关闭</button>'
+    + '</div></div></div>';
+}