myagent-ai 1.15.18 → 1.15.19

package/package.json

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

package/web/api_server.py

@@ -5253,14 +5253,62 @@ class ApiServer:
                 model_chain = self._build_model_chain(agent_cfg, agent_path)
                 session_id = f"group_{gid}_{agent_path}"
 
+                # [v1.15.18] 构建 Agent 专属系统提示词（与1:1聊天一致）
+                _, agent_system_prompt = self._build_agent_chat_context(agent_path, agent_cfg, content)
+
+                # [v1.15.18] 构建群聊上下文：群信息 + 成员列表 + 发言者身份
+                member_lines = []
+                for m in group.members:
+                    mc = self._read_agent_config(m.agent_path)
+                    m_name = mc.get("name", m.agent_path) if mc else m.agent_path
+                    m_desc = mc.get("description", "") if mc else ""
+                    role_label = {"owner": "群主", "admin": "管理员"}.get(m.role, "成员")
+                    nick = f"（昵称: {m.nickname}）" if m.nickname else ""
+                    line = f"  - {m_name} [{m.agent_path}] ({role_label})"
+                    if m_desc:
+                        line += f" — {m_desc}"
+                    line += nick
+                    if m.muted:
+                        line += "（已禁言）"
+                    member_lines.append(line)
+
+                my_name = agent_cfg.get("name", agent_path) if agent_cfg else agent_path
+                my_role = {"owner": "群主", "admin": "管理员"}.get(member.role, "成员")
+                my_desc = agent_cfg.get("description", "") if agent_cfg else ""
+
+                group_context = (
+                    f"## 群聊上下文\n"
+                    f"- 群名称: {group.name}\n"
+                    f"- 群ID: {group.id}\n"
+                    f"- 群描述: {group.description}\n"
+                    f"- 当前发言者: 用户\n"
+                    f"- 你的身份: {my_name} ({my_role})"
+                    + (f" — {my_desc}" if my_desc else "")
+                    + f"\n- 群成员 ({len(group.members)}人):\n"
+                    + "\n".join(member_lines)
+                    + "\n\n注意：你只代表自己发言，回复时使用第一人称。"
+                    "如果消息不是跟你相关的，可以简短回复或不回复。"
+                )
+
+                # 将群聊上下文追加到 agent_system_prompt
+                if agent_system_prompt:
+                    agent_system_prompt += "\n\n" + group_context
+                else:
+                    agent_system_prompt = group_context
+
                 # 构建部门上下文（如果此群属于某个部门）
-                agent_content = content
                 dept_context = self._build_dept_context(gid, agent_path)
                 if dept_context:
-                    agent_content = dept_context + "\n\n---\n\n" + content
+                    agent_system_prompt += "\n\n" + dept_context
+
+                # 构建最终消息（用户原文不包含任何注入内容）
+                agent_content = content
 
                 if model_chain and self.core.llm:
-                    response = await self._try_model_chain(model_chain, agent_content, session_id)
+                    response = await self._try_model_chain(
+                        model_chain, agent_content, session_id,
+                        agent_path=agent_path, agent_system_prompt=agent_system_prompt,
+                    )
                 else:
                     response = await self.core.process_message(agent_content, session_id)
 
@@ -5446,14 +5494,55 @@ class ApiServer:
                     model_chain = self._build_model_chain(agent_cfg, agent_path)
                     session_id = f"group_{group_id}_{agent_path}"
 
-                    # 构建部门上下文
-                    agent_content = description
+                    # [v1.15.18] 构建 Agent 专属系统提示词 + 群聊上下文（与发送群消息一致）
+                    _, agent_system_prompt = self._build_agent_chat_context(agent_path, agent_cfg, description)
+
+                    # 构建群聊上下文
+                    member_lines = []
+                    for m in group.members:
+                        mc = self._read_agent_config(m.agent_path)
+                        m_name = mc.get("name", m.agent_path) if mc else m.agent_path
+                        m_desc = mc.get("description", "") if mc else ""
+                        role_label = {"owner": "群主", "admin": "管理员"}.get(m.role, "成员")
+                        line = f"  - {m_name} [{m.agent_path}] ({role_label})"
+                        if m_desc:
+                            line += f" — {m_desc}"
+                        member_lines.append(line)
+
+                    my_name = agent_cfg.get("name", agent_path) if agent_cfg else agent_path
+                    my_role = {"owner": "群主", "admin": "管理员"}.get(member.role, "成员")
+                    my_desc = agent_cfg.get("description", "") if agent_cfg else ""
+
+                    group_context = (
+                        f"## 群聊上下文\n"
+                        f"- 群名称: {group.name}\n"
+                        f"- 群ID: {group.id}\n"
+                        f"- 群描述: {group.description}\n"
+                        f"- 当前发言者: 用户（重试任务）\n"
+                        f"- 你的身份: {my_name} ({my_role})"
+                        + (f" — {my_desc}" if my_desc else "")
+                        + f"\n- 群成员 ({len(group.members)}人):\n"
+                        + "\n".join(member_lines)
+                        + "\n\n注意：你只代表自己发言，回复时使用第一人称。"
+                        "如果消息不是跟你相关的，可以简短回复或不回复。"
+                    )
+
+                    if agent_system_prompt:
+                        agent_system_prompt += "\n\n" + group_context
+                    else:
+                        agent_system_prompt = group_context
+
                     dept_context = self._build_dept_context(group_id, agent_path)
                     if dept_context:
-                        agent_content = dept_context + "\n\n---\n\n" + description
+                        agent_system_prompt += "\n\n" + dept_context
+
+                    agent_content = description
 
                     if model_chain and self.core.llm:
-                        response = await self._try_model_chain(model_chain, agent_content, session_id)
+                        response = await self._try_model_chain(
+                            model_chain, agent_content, session_id,
+                            agent_path=agent_path, agent_system_prompt=agent_system_prompt,
+                        )
                     else:
                         response = await self.core.process_message(agent_content, session_id)