myagent-ai 1.47.36 → 1.47.38

package/agents/main_agent.py

@@ -1274,34 +1274,56 @@ class MainAgent(BaseAgent):
 
                 # 将 chat_agent 条目写入 agent_chat 表（私聊记录）
                 if _chat_entries:
+                    logger.info(f"[{task_id}] [私聊保存] main_agent 发现 {len(_chat_entries)} 条私聊条目")
                     try:
                         from groups.manager import GroupManager
+                        logger.info(f"[{task_id}] [私聊保存] 正在创建 GroupManager")
                         _gm = GroupManager()
                         _gm.initialize()
-                        for _ce in _chat_entries:
+                        logger.info(f"[{task_id}] [私聊保存] GroupManager 初始化完成")
+                        
+                        for _idx, _ce in enumerate(_chat_entries):
                             _from_agent = agent_path or str(_effective_agent_id)
                             _from_name = ""
+                            logger.info(f"[{task_id}] [私聊保存] 处理第 {_idx+1} 条私聊: from_agent={_from_agent}, target_agent={_ce.get('target_agent', '')}")
+                            
                             try:
                                 import sqlite3
-                                _db = sqlite3.connect(str(Path.home() / ".myagent" / "data" / "agents.db"))
+                                _db_path = str(Path.home() / ".myagent" / "data" / "agents.db")
+                                logger.info(f"[{task_id}] [私聊保存] 查询 agents.db: {_db_path}")
+                                _db = sqlite3.connect(_db_path)
                                 _db.row_factory = sqlite3.Row
                                 _row = _db.execute("SELECT name FROM agents WHERE path = ? OR id = ?", (_from_agent, _from_agent)).fetchone()
                                 if _row and _row["name"]:
                                     _from_name = _row["name"]
+                                    logger.info(f"[{task_id}] [私聊保存] 查询到 from_name: {_from_name}")
+                                else:
+                                    logger.info(f"[{task_id}] [私聊保存] 未查询到 from_name")
                                 _db.close()
-                            except Exception:
-                                pass
-                            _gm.add_agent_chat(
+                            except Exception as _e:
+                                logger.warning(f"[{task_id}] [私聊保存] 查询 from_name 失败: {_e}")
+                            
+                            _to_agent = _ce.get("target_agent", "")
+                            _to_name = _ce.get("target_name", "")
+                            _content = _ce.get("message", "")
+                            
+                            logger.info(f"[{task_id}] [私聊保存] 调用 add_agent_chat: from_agent={_from_agent}, from_name={_from_name}, to_agent={_to_agent}, to_name={_to_name}")
+                            _msg_id = _gm.add_agent_chat(
                                 group_id="",
                                 from_agent=_from_agent,
                                 from_name=_from_name,
-                                to_agent=_ce.get("target_agent", ""),
-                                to_name=_ce.get("target_name", ""),
-                                content=_ce.get("message", ""),
+                                to_agent=_to_agent,
+                                to_name=_to_name,
+                                content=_content,
                             )
-                            logger.info(f"[{task_id}] Agent私聊已保存: {_from_name} → {_ce.get('target_name', '')}: {_ce.get('message', '')[:80]}")
+                            logger.info(f"[{task_id}] [私聊保存] add_agent_chat 返回 msg_id={_msg_id}")
+                            logger.info(f"[{task_id}] Agent私聊已保存: {_from_name} → {_to_name}: {_content[:80]}")
+                        
+                        _gm.close()
+                        logger.info(f"[{task_id}] [私聊保存] GroupManager 已关闭，处理完成")
                     except Exception as _ce_err:
-                        logger.warning(f"[{task_id}] 保存Agent私聊记录失败: {_ce_err}")
+                        logger.warning(f"[{task_id}] [私聊保存] 保存Agent私聊记录失败: {_ce_err}")
+                        logger.exception(f"[{task_id}] [私聊保存] 异常详情")
 
                 # 普通文件列表照常持久化到 session memory
                 if _file_entries:
@@ -1362,6 +1384,7 @@ class MainAgent(BaseAgent):
                     stream_callback=stream_callback,
                     sent_files=sent_files,
                     agent_path=agent_path,
+                    agent_id=agent_path,  # agent_path 就是 agent_id
                 )
 
             # 兼容回退: dispatcher 未初始化时使用基础 fallback

package/core/tool_dispatcher.py

@@ -102,6 +102,7 @@ class ToolDispatcher:
         stream_callback: Optional[Callable] = None,
         sent_files: Optional[List[Dict[str, Any]]] = None,
         agent_path: Optional[str] = None,
+        agent_id: Optional[str] = None,
     ) -> Dict[str, Any]:
         """
         统一工具分发入口。
@@ -120,7 +121,7 @@ class ToolDispatcher:
         """
         # ── 内置平台工具 (LLM 直接调用) ──
         if tool_name == "command":
-            return await self._exec_command(params, timeout, task_id, stream_callback, sent_files, agent_path)
+            return await self._exec_command(params, timeout, task_id, stream_callback, sent_files, agent_id)
         elif tool_name == "web_control":
             return await self._exec_web_control(params, task_id, stream_callback)
 
@@ -184,7 +185,7 @@ class ToolDispatcher:
     async def _exec_command(self, params: Dict, timeout: int, task_id: str,
                               stream_callback: Optional[Callable] = None,
                               sent_files: Optional[List[Dict[str, Any]]] = None,
-                              agent_path: Optional[str] = None) -> Dict:
+                              agent_id: Optional[str] = None) -> Dict:
         """执行 shell 命令"""
         code_text = params.get("command", "")
         if not code_text:
@@ -217,38 +218,42 @@ class ToolDispatcher:
         # 如果有私聊标记，保存到数据库
         if _chat_markers:
             try:
+                logger.info(f"[{task_id}] [私聊保存] 开始处理，找到 {len(_chat_markers)} 条私聊标记")
                 # 延迟导入避免循环依赖
                 from groups.manager import GroupManager
                 # 获取数据目录
                 _data_dir = _P.home() / ".myagent" / "data"
+                logger.info(f"[{task_id}] [私聊保存] 数据目录: {_data_dir}")
                 _gm = GroupManager(_data_dir)
+                logger.info(f"[{task_id}] [私聊保存] GroupManager 初始化完成")
                 
-                for _match in _chat_markers:
+                for _idx, _match in enumerate(_chat_markers):
                     _to_path = _match[0].strip()
                     _to_name = _match[1].strip()
                     _content = _match[2].strip()
                     
-                    # 获取当前 agent 的路径和名称
-                    _from_path = agent_path if agent_path else "unknown"
-                    # 从 agent_path 解析 agent 名称
-                    if _from_path and _from_path.startswith("agents/"):
-                        _from_name = _from_path.replace("agents/", "").split("/")[-1]
-                    else:
-                        _from_name = _from_path if _from_path else "未知"
+                    # 获取当前 agent 的 ID
+                    _from_id = agent_id if agent_id else "unknown"
+                    _from_name = _from_id if _from_id else "未知"
                     
-                    _gm.add_agent_chat(
+                    logger.info(f"[{task_id}] [私聊保存] 处理第 {_idx+1} 条: from_id={_from_id}, from_name={_from_name}, to_path={_to_path}, to_name={_to_name}")
+                    
+                    _result = _gm.add_agent_chat(
                         group_id="",
-                        from_agent=_from_path,
+                        from_agent=_from_id,
                         from_name=_from_name,
                         to_agent=_to_path,
                         to_name=_to_name,
                         content=_content,
                     )
+                    logger.info(f"[{task_id}] [私聊保存] 第 {_idx+1} 条保存结果: msg_id={_result}")
                     logger.info(f"[{task_id}] 私聊记录已保存: {_from_name} → {_to_name}: {_content[:50]}...")
                 
                 _gm.close()
+                logger.info(f"[{task_id}] [私聊保存] GroupManager 已关闭，处理完成")
             except Exception as _ce:
-                logger.warning(f"[{task_id}] 保存私聊记录失败: {_ce}")
+                logger.warning(f"[{task_id}] [私聊保存] 保存私聊记录失败: {_ce}")
+                logger.exception(f"[{task_id}] [私聊保存] 异常详情")
 
         # 注入权限检查器
         if self._permission_checker:
@@ -290,17 +295,13 @@ class ToolDispatcher:
                     _to_name = _match[1].strip()
                     _content = _match[2].strip()
                     
-                    # 获取当前 agent 的路径和名称
-                    _from_path = agent_path if agent_path else "unknown"
-                    # 从 agent_path 解析 agent 名称
-                    if _from_path and _from_path.startswith("agents/"):
-                        _from_name = _from_path.replace("agents/", "").split("/")[-1]
-                    else:
-                        _from_name = _from_path if _from_path else "未知"
+                    # 获取当前 agent 的 ID
+                    _from_id = agent_id if agent_id else "unknown"
+                    _from_name = _from_id if _from_id else "未知"
                     
                     _gm.add_agent_chat(
                         group_id="",
-                        from_agent=_from_path,
+                        from_agent=_from_id,
                         from_name=_from_name,
                         to_agent=_to_path,
                         to_name=_to_name,

package/groups/manager.py

@@ -258,8 +258,10 @@ class GroupManager:
     def _init_message_db(self):
         """初始化群消息 SQLite 数据库"""
         db_path = self._data_dir / "groups" / "messages.db"
+        logger.info(f"[私聊保存] 初始化消息数据库: {db_path}")
         self._db_conn = sqlite3.connect(str(db_path), check_same_thread=False)
         self._db_conn.row_factory = sqlite3.Row
+        logger.info(f"[私聊保存] 数据库连接已创建")
         # [v1.23.81] 群聊 session 映射表（每个群一个纯数字 session ID）
         self._db_conn.execute("""
             CREATE TABLE IF NOT EXISTS group_sessions (
@@ -805,16 +807,30 @@ class GroupManager:
     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"""
+        logger.info(f"[私聊保存] add_agent_chat 被调用: group_id={group_id}, from_agent={from_agent}, from_name={from_name}, to_agent={to_agent}, to_name={to_name}, content={content[:50]}...")
+        
         if not self._db_conn:
+            logger.warning(f"[私聊保存] 数据库连接未初始化，无法保存")
             return ""
+        
         msg_id = uuid.uuid4().hex[:16]
-        with self._db_lock:
-            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()
+        logger.info(f"[私聊保存] 生成的消息ID: {msg_id}")
+        
+        try:
+            with self._db_lock:
+                logger.info(f"[私聊保存] 开始执行 INSERT 语句")
+                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()
+                logger.info(f"[私聊保存] INSERT 成功，已提交事务，msg_id={msg_id}")
+        except Exception as e:
+            logger.error(f"[私聊保存] INSERT 失败: {e}")
+            logger.exception(f"[私聊保存] 异常详情")
+            return ""
+        
         return msg_id
 
     def get_agent_chats(self, group_id: str = "", from_agent: str = "",

package/package.json

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