myagent-ai 1.23.51 → 1.23.54

package/agents/main_agent.py

@@ -298,6 +298,7 @@ class MainAgent(BaseAgent):
                 agent_name=_injected_name or self.name,
                 agent_description=_injected_desc or self.description,
                 agent_override_prompt=_override_prompt,
+                agent_path=getattr(self, '_agent_override_path', None),
             )
         finally:
             # 移除活跃上下文
@@ -598,6 +599,7 @@ class MainAgent(BaseAgent):
         stream_callback: Optional[Callable] = None,
         stream_response=None,
         text_delta_callback=None,
+        agent_path: Optional[str] = None,
     ) -> AgentContext:
         """
         V2 主处理循环 — 使用结构化输出格式。
@@ -619,6 +621,7 @@ class MainAgent(BaseAgent):
             stream_callback: 可选的 SSE 事件回调 (callable 或 async callable)
             stream_response: 可选的流式响应对象（用于 LLM 流式输出）
             text_delta_callback: 可选的文本增量回调
+            agent_path: Agent 路径（用于独立工作目录）
         """
         task_id = context.task_id or generate_id("task")
         context.task_id = task_id
@@ -631,7 +634,8 @@ class MainAgent(BaseAgent):
         try:
             return await self._process_v2_inner(
                 context, task_id, agent_name, agent_description,
-                agent_override_prompt, stream_callback, stream_response, text_delta_callback
+                agent_override_prompt, stream_callback, stream_response, text_delta_callback,
+                agent_path=agent_path,
             )
         except Exception as e:
             logger.error(f"[{task_id}] V2 执行循环异常: {e}", exc_info=True)
@@ -649,6 +653,7 @@ class MainAgent(BaseAgent):
         stream_callback: Optional[Callable] = None,
         stream_response=None,
         text_delta_callback=None,
+        agent_path: Optional[str] = None,
     ) -> AgentContext:
         """V2 内部循环逻辑 — 结构化输出 + 工具调度 + SSE 事件推送"""
 
@@ -778,6 +783,7 @@ class MainAgent(BaseAgent):
                 get_knowledge=get_knowledge_content,
                 recall=recall_content,
                 memory_context_prompt=_memory_ctx_prompt,
+                agent_path=agent_path,
             )
 
             await self._emit_v2_event(

package/chatbot/manager.py

@@ -82,7 +82,7 @@ class ChatBotManager:
                         asyncio.ensure_future(self._safe_stop(key, bot))
                     else:
                         loop.run_until_complete(bot.stop())
-                except RuntimeError:
+                except Exception:
                     pass
             if task and not task.done():
                 task.cancel()

package/core/context_builder.py

@@ -126,6 +126,7 @@ class ContextBuilder:
         get_knowledge: str = "",
         recall: str = "",
         memory_context_prompt: str = "",
+        agent_path: Optional[str] = None,
     ) -> str:
         """
         构建完整的 <context> XML 字符串。
@@ -143,6 +144,7 @@ class ContextBuilder:
                 用于 RAG 搜索知识库。为空时使用用户消息作为查询。
             recall: 上一轮 LLM 输出的 <recall> 内容，
                 用于定向检索长期记忆。为空时仅用用户消息搜索。
+            agent_path: Agent 路径（如 "default"），用于定位独立工作目录。
 
         Returns:
             完整的 <context>...</context> XML 字符串
@@ -162,7 +164,7 @@ class ContextBuilder:
 
         sections: List[str] = [
             self._build_datetime(),
-            self._build_whomi(agent_name, agent_description, agent_override_prompt),
+            self._build_whomi(agent_name, agent_description, agent_override_prompt, agent_path=agent_path),
             self._build_memory(query, session_id, recall, memory_context_prompt),
             self._build_knowledge(kb_query),
             # 轻量近期对话兜底：最近 3 轮对话摘要，补充 automemory 搜索的盲区
@@ -216,6 +218,7 @@ class ContextBuilder:
         agent_name: str,
         agent_description: str,
         agent_override_prompt: Optional[str] = None,
+        agent_path: Optional[str] = None,
     ) -> str:
         """
         构建 <whomi> 段落 —— Agent 身份信息。
@@ -226,6 +229,7 @@ class ContextBuilder:
             agent_name: Agent 名称
             agent_description: Agent 描述
             agent_override_prompt: 可选的覆盖提示词
+            agent_path: Agent 路径（用于定位独立工作目录）
 
         Returns:
             <whomi> XML 段落字符串
@@ -239,8 +243,8 @@ class ContextBuilder:
             f"描述: {safe_desc}",
         ]
 
-        # [v1.20.8] 注入工作目录信息，让 Agent 知道文件应保存到哪里
-        work_dir = self._get_workspace_dir()
+        # [v1.20.8] [v1.23.52] 注入工作目录信息，每个 Agent 使用独立工作目录
+        work_dir = self._get_workspace_dir(agent_path=agent_path)
         if work_dir:
             parts.append(f"工作目录: {_xml_escape(str(work_dir))}")
             parts.append(f"文件保存说明: 通过 file_write 或代码生成的文件请保存到工作目录下的 userfiles 子目录。发送文件给用户请使用 file_send 工具。")
@@ -251,14 +255,31 @@ class ContextBuilder:
         parts.append("</whomi>")
         return "\n".join(parts)
 
-    def _get_workspace_dir(self) -> Optional[str]:
-        """[v1.20.8] 获取工作目录路径（~/.myagent/data/workspace）"""
+    def _get_workspace_dir(self, agent_path: Optional[str] = None) -> Optional[str]:
+        """[v1.20.8] [v1.23.52] 获取工作目录路径
+
+        如果指定了 agent_path 且非默认 agent，则返回该 Agent 独立的工作目录：
+          ~/.myagent/data/agents/{agent_path}/workspace/
+        否则返回全局工作目录：
+          ~/.myagent/data/workspace/
+        独立目录下自动创建 userfiles 子目录。
+        """
         try:
             from config import ConfigManager
+            import os
             cm = ConfigManager()
-            wd = cm.data_dir / "workspace"
-            wd.mkdir(parents=True, exist_ok=True)
-            return str(wd)
+            if agent_path and agent_path != "default":
+                # 使用 Agent 独立工作目录
+                wd = cm.data_dir / "agents" / agent_path / "workspace"
+                wd.mkdir(parents=True, exist_ok=True)
+                userfiles = wd / "userfiles"
+                userfiles.mkdir(parents=True, exist_ok=True)
+                return str(wd)
+            else:
+                # 默认 agent 或无 agent_path 时使用全局工作目录
+                wd = cm.data_dir / "workspace"
+                wd.mkdir(parents=True, exist_ok=True)
+                return str(wd)
         except Exception:
             return None
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.23.51",
+  "version": "1.23.54",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {
@@ -43,4 +43,4 @@
     "python": ">=3.10",
     "node": ">=18"
   }
-}
+}

package/start.js

@@ -793,6 +793,8 @@ function main() {
     "memory",
     // 媒体播放
     "playaudio", "playvideo",
+    // Agent 通信
+    "chat",
     // 帮助
     "help", "-h", "--help",
   ];

package/web/api_server.py

@@ -4083,8 +4083,11 @@ window.addEventListener('beforeunload', function() {{
         data = await request.json()
         cp.enabled = data.get("enabled", not cp.enabled)
         self.core.config_mgr.save()
-        # 热更新聊天平台
-        await self._hot_reload_chat_platforms()
+        # [v1.23.53] 热更新聊天平台（加异常保护，防止热更新失败导致配置无法保存）
+        try:
+            await self._hot_reload_chat_platforms()
+        except Exception as e:
+            logger.error(f"热更新聊天平台失败: {e}", exc_info=True)
         logger.info(f"聊天平台 {cp.display_name} 已{'启用' if cp.enabled else '禁用'}")
         return web.json_response({"ok": True, "enabled": cp.enabled, "id": cp.id, "hot_reload": True})
 
@@ -5532,6 +5535,16 @@ window.addEventListener('beforeunload', function() {{
                 if agent_system_prompt and self.core.main_agent:
                     self.core.main_agent._agent_override_prompt = agent_system_prompt
                     self.core.main_agent._agent_override_path = agent_path
+                # [v1.23.52] 为非默认 Agent 设置独立工作目录（executor 层面）
+                _original_exec_work_dir = None
+                if agent_path and agent_path != "default" and self.core.main_agent and self.core.main_agent.executor:
+                    from config import ConfigManager
+                    _cm = ConfigManager()
+                    _agent_wd = _cm.data_dir / "agents" / agent_path / "workspace"
+                    _agent_wd.mkdir(parents=True, exist_ok=True)
+                    (_agent_wd / "userfiles").mkdir(parents=True, exist_ok=True)
+                    _original_exec_work_dir = self.core.main_agent.executor.work_dir
+                    self.core.main_agent.executor.work_dir = str(_agent_wd)
                 # [v1.23.35] 注入 Agent 名称和描述（群聊路径需要传递给 process_v2）
                 # 确保 process() → process_v2() 拿到正确的 agent_name/agent_description
                 if agent_path and self.core.main_agent:
@@ -5563,6 +5576,9 @@ window.addEventListener('beforeunload', function() {{
                         self.core.main_agent._agent_override_name = None
                         self.core.main_agent._agent_override_description = None
                         self.core.main_agent._chat_mode = ""
+                        # [v1.23.52] 恢复执行引擎原始工作目录
+                        if _original_exec_work_dir is not None and self.core.main_agent.executor:
+                            self.core.main_agent.executor.work_dir = _original_exec_work_dir
                         if self.core.main_agent.context_builder:
                             self.core.main_agent.context_builder.agent_knowledge_dir = None
 
@@ -5840,14 +5856,25 @@ window.addEventListener('beforeunload', function() {{
                 context.metadata["user_file_paths"] = _file_paths
             logger.info(f"[{session_id}] 用户发送了 {len(user_files)} 个文件，提取文本 {len(file_context) if _file_texts else 0} 字符")
 
-        # ── 根据 Agent 配置设置执行引擎参数（execution_mode 等）──
+        # ── 根据 Agent 配置设置执行引擎参数（execution_mode、work_dir 等）──
         agent_cfg_for_exec = self._read_agent_config(agent_path)
         _original_exec_mode = None
+        _original_work_dir = None
         if agent_cfg_for_exec and agent.executor:
             _exec_mode = agent_cfg_for_exec.get("execution_mode")
             if _exec_mode:
                 _original_exec_mode = agent.executor.execution_mode
                 agent.executor.set_execution_mode(_exec_mode)
+        # [v1.23.52] 为非默认 Agent 设置独立工作目录
+        if agent_path and agent_path != "default" and agent.executor:
+            from config import ConfigManager
+            cm = ConfigManager()
+            agent_work_dir = cm.data_dir / "agents" / agent_path / "workspace"
+            agent_work_dir.mkdir(parents=True, exist_ok=True)
+            (agent_work_dir / "userfiles").mkdir(parents=True, exist_ok=True)
+            _original_work_dir = agent.executor.work_dir
+            agent.executor.work_dir = str(agent_work_dir)
+            logger.info(f"[{session_id}] Agent [{agent_path}] 使用独立工作目录: {agent_work_dir}")
 
         # ── 设置 Agent 专属知识库目录（优先于组织知识库）──
         if agent_path and agent.context_builder:
@@ -5940,6 +5967,7 @@ window.addEventListener('beforeunload', function() {{
                     agent_override_prompt=agent_system_prompt,
                     stream_callback=_v2_collecting_callback,
                     stream_response=stream_response,
+                    agent_path=agent_path,
                 )
             finally:
                 # 无论成功或异常，都清理 active_contexts
@@ -5947,6 +5975,9 @@ window.addEventListener('beforeunload', function() {{
                 # 恢复执行引擎原始模式（防止影响后续 Agent 请求）
                 if _original_exec_mode is not None and agent.executor:
                     agent.executor.set_execution_mode(_original_exec_mode)
+                # [v1.23.52] 恢复执行引擎原始工作目录
+                if _original_work_dir is not None and agent.executor:
+                    agent.executor.work_dir = _original_work_dir
                 # 清理 Agent 专属知识库目录设置（防止影响其他 Agent 请求）
                 if agent.context_builder:
                     agent.context_builder.agent_knowledge_dir = None

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

@@ -27,10 +27,12 @@ async function renderPlatforms(){
   html+='</div>';$('content').innerHTML=html;
 }
 async function togglePlatform(id,enable){
-  const r=await api(`/api/platforms/${id}`,{method:'PUT',body:JSON.stringify({enabled})});
-  if(r.error){showToast('操作失败: '+r.error,'danger');return}
-  showToast(enable?'平台已启用':'平台已停用',enable?'success':'info');
-  renderPlatforms();
+  try{
+    var r=await api('/api/platforms/'+encodeURIComponent(id)+'/toggle',{method:'POST',body:JSON.stringify({enabled})});
+    if(r.error){showToast('操作失败: '+r.error,'danger');return}
+    showToast(enable?'平台已启用':'平台已停用',enable?'success':'info');
+    renderPlatforms();
+  }catch(e){showToast('请求异常: '+e.message,'danger')}
 }
 function showAddPlatformModal(){
   $('modalContainer').innerHTML=`<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:520px">

package/web/ui/chat/chat.css

@@ -1218,6 +1218,15 @@ input,textarea,select{font:inherit}
   font-size:12px;color:#fff;flex-shrink:0;
 }
 
+/* [v1.23.51] Department group chat button */
+.rp-dept-group-btn{
+  margin-left:auto;flex-shrink:0;padding:2px 6px;border-radius:10px;
+  font-size:11px;line-height:1;border:1px solid var(--border);
+  background:var(--bg2);cursor:pointer;color:var(--text2);
+  transition:var(--transition);
+}
+.rp-dept-group-btn:hover{background:var(--accent);color:#fff;border-color:var(--accent)}
+
 /* Agent list */
 .agent-list{flex:1;overflow-y:auto;padding:0}
 

package/web/ui/chat/chat_main.js

@@ -1424,10 +1424,12 @@ function renderRpDeptNode(dept, depth) {
   }
   var indent = depth * 20;
   var agentCount = dept.agent_count || 0;
+  var chatGroupId = dept.chat_group_id || '';
+  var hasGroupChat = !!chatGroupId;
 
   // Department node itself — clicking anywhere on the item expands/collapses to show agents
   var deptOnclick = hasChildren ? ' onclick="toggleRpDept(\'' + escapeHtml(dept.path) + '\')"' : '';
-  html += '<div class="rp-dept-item" style="padding-left:' + (12 + indent) + 'px"' + deptOnclick + '>';
+  html += '<div class="rp-dept-item" style="padding-left:' + (12 + indent) + 'px;display:flex;align-items:center;gap:4px"' + deptOnclick + '>';
   if (hasChildren) {
     html += '<span class="rp-section-toggle ' + (isExpanded ? 'expanded' : '') + '" onclick="event.stopPropagation();toggleRpDept(\'' + escapeHtml(dept.path) + '\')">▶</span>';
   } else {
@@ -1437,6 +1439,10 @@ function renderRpDeptNode(dept, depth) {
   html += '<span style="font-weight:500">' + escapeHtml(dept.name) + '</span>';
   html += ' <span style="font-size:10px;color:var(--text3)">(' + agentCount + '成员)</span>';
   if (dept.head) html += ' <span style="font-size:10px;color:var(--accent)">👑</span>';
+  // [v1.23.51] 部门节点直接显示群聊入口按钮
+  if (hasGroupChat) {
+    html += ' <button class="rp-dept-group-btn" onclick="event.stopPropagation();openDeptGroupChat(\'' + escapeHtml(chatGroupId) + '\')" title="进入部门群聊">💬</button>';
+  }
   html += '</div>';
 
   // Children (sub-departments + agents) - if expanded
@@ -1555,6 +1561,11 @@ async function selectAgent(agentPath) {
     if (dot) dot.style.display = '';
     document.getElementById('userInput').placeholder = '输入消息... (Enter 发送, Shift+Enter 换行)';
   }
+  // [v1.23.51] 恢复侧边栏 UI（从群聊切回个人聊天）
+  var _newChatBtn = document.querySelector('.new-chat-btn');
+  if (_newChatBtn) _newChatBtn.style.display = '';
+  var _searchInput = document.getElementById('searchInput');
+  if (_searchInput) { _searchInput.placeholder = '搜索对话...'; _searchInput.value = ''; }
   // 移动端：立即关闭右侧栏，不要等异步操作完成
   if (isMobile()) closeMobileAgentPanel();
   // Always reload sessions even if clicking the same agent
@@ -2089,6 +2100,30 @@ function formatSessionName(id) {
 
 function renderSessions(filter = '') {
   const list = document.getElementById('sessionList');
+  // [v1.23.51] 群聊模式下，左侧显示群聊列表而非个人会话
+  if (currentView === 'group' && typeof groups !== 'undefined' && groups.length > 0) {
+    var html = '';
+    for (var i = 0; i < groups.length; i++) {
+      var g = groups[i];
+      var isActive = g.id === currentGroupId;
+      var memberCount = (g.members || []).length;
+      html += '<div class="session-item ' + (isActive ? 'active' : '') + '" onclick="selectGroup(\'' + escapeHtml(g.id) + '\')" title="' + escapeHtml(g.name) + '">'
+        + '<div class="session-icon" style="font-size:16px">' + escapeHtml(g.avatar_emoji || g.emoji || '👥') + '</div>'
+        + '<div class="session-info">'
+        + '<div class="session-name">' + escapeHtml(g.name) + '</div>'
+        + '<div class="session-preview">' + escapeHtml(g.description || (memberCount + ' 位成员')) + '</div>'
+        + '</div>'
+        + '</div>';
+    }
+    // 在列表顶部添加"返回个人聊天"按钮
+    html = '<div class="session-item" onclick="exitGroupChat()" title="返回个人聊天" style="border-bottom:1px solid var(--border);margin-bottom:4px">'
+      + '<div class="session-icon" style="font-size:16px">🔙</div>'
+      + '<div class="session-info"><div class="session-name">返回个人聊天</div><div class="session-preview">退出群聊视图</div></div>'
+      + '</div>' + html;
+    list.innerHTML = html;
+    return;
+  }
+
   const fl = filter.toLowerCase();
   const filtered = state.sessions.filter(s =>
     s.id !== '__new__' && (!fl || s.name.toLowerCase().includes(fl) || s.id.toLowerCase().includes(fl))

package/web/ui/chat/groupchat.js

@@ -173,6 +173,12 @@ async function selectGroup(gid) {
     StatePersistence.save('currentGroupId', gid);
   }
 
+  // [v1.23.51] 群聊模式：隐藏"新对话"按钮，搜索框改为搜索群聊
+  var newChatBtn = document.querySelector('.new-chat-btn');
+  if (newChatBtn) newChatBtn.style.display = 'none';
+  var searchInput = document.getElementById('searchInput');
+  if (searchInput) { searchInput.placeholder = '搜索群聊...'; searchInput.value = ''; }
+
   // Update sidebar
   renderSessions();
   renderGroups();
@@ -237,6 +243,12 @@ function exitGroupChat() {
   state.messages = [];
   state.activeSessionId = null;
 
+  // [v1.23.51] 恢复侧边栏 UI
+  var newChatBtn = document.querySelector('.new-chat-btn');
+  if (newChatBtn) newChatBtn.style.display = '';
+  var searchInput = document.getElementById('searchInput');
+  if (searchInput) { searchInput.placeholder = '搜索对话...'; searchInput.value = ''; }
+
   // Restore header
   document.getElementById('headerTitle').textContent = '新对话';
   document.getElementById('activeAgentBadge').style.display = '';