myagent-ai 1.15.0 → 1.15.2

package/agents/main_agent.py

@@ -835,6 +835,7 @@ class MainAgent(BaseAgent):
                     "v2_tool_start",
                     {"tool": {
                         "toolname": tool_name,
+                        "beforecalltext": before_call,
                         "parms": truncate_str(parms, 500),
                         "timeout": timeout,
                         "callback": should_callback,
@@ -1028,10 +1029,12 @@ class MainAgent(BaseAgent):
 
                 # 保存工具调用到会话记忆
                 if self.memory:
+                    # 构建工具调用记录，包含 beforecalltext 作为标题
+                    tool_call_title = before_call if before_call else f"调用工具: {tool_name}"
                     self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
-                        content=f"调用工具: {tool_name}\n参数: {truncate_str(parms, 1000)}",
+                        content=f"{tool_call_title}\n调用工具: {tool_name}\n参数: {truncate_str(parms, 1000)}",
                         key="tool_call",
                         importance=0.4,
                     )

package/memory/manager.py

@@ -290,12 +290,16 @@ class MemoryManager:
         return self._insert(entry)
 
     def get_conversation(self, session_id, limit=500, include_roles=None) -> List[MemoryEntry]:
-        """获取对话历史（session 分类中 role 非空的条目），按时间正序排列。"""
+        """获取对话历史（session 分类中 role 非空的条目），按时间正序排列。
+
+        只排除纯内部审计条目（llm_output 原始LLM输出、conversation_insight 记忆提炼）。
+        tool_call 和 tool_result 会返回给前端以展示完整的工具调用过程。
+        """
         conn = self._get_conn()
-        # 排除内部系统条目（llm_output, tool_call, tool_result, conversation_insight）
-        sql = """SELECT * FROM memories 
+        # 只排除纯内部审计条目，保留 tool_call/tool_result 供前端展示
+        sql = """SELECT * FROM memories
                  WHERE session_id = ? AND category = 'session' AND role != ''
-                 AND key NOT IN ('llm_output', 'tool_call', 'tool_result', 'conversation_insight')
+                 AND key NOT IN ('llm_output', 'conversation_insight')
                  ORDER BY created_at ASC LIMIT ?"""
         rows = conn.execute(sql, (session_id, limit)).fetchall()
         entries = [MemoryEntry.from_row(row) for row in rows]

package/package.json

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

package/web/api_server.py

@@ -2443,16 +2443,21 @@ class ApiServer:
     async def handle_list_sessions(self, request):
         if not self.core.memory: return web.json_response([])
         agent = request.query.get("agent", "")
+        # 只统计用户可见的消息数（排除 llm_output 和 conversation_insight）
         if agent:
             prefix = f"{agent}_"
             rows = self.core.memory._get_conn().execute(
                 "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
-                "WHERE category = 'session' AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
+                "WHERE category = 'session' AND role != '' "
+                "AND key NOT IN ('llm_output', 'conversation_insight') "
+                "AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
                 (prefix + "%",)).fetchall()
         else:
             rows = self.core.memory._get_conn().execute(
                 "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
-                "WHERE category = 'session' GROUP BY session_id ORDER BY last DESC LIMIT 100").fetchall()
+                "WHERE category = 'session' AND role != '' "
+                "AND key NOT IN ('llm_output', 'conversation_insight') "
+                "GROUP BY session_id ORDER BY last DESC LIMIT 100").fetchall()
         sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in rows]
         # 批量获取自定义会话名称
         sids = [s["id"] for s in sessions]
@@ -2513,7 +2518,7 @@ class ApiServer:
         offset = int(request.query.get("offset", 0))
         entries = self.core.memory.get_conversation(sid, limit=limit + offset)
         entries = entries[offset:]
-        # Filter out internal entries (LLM raw output, tool calls/results)
+        # Filter out internal entries (LLM raw output only)
         entries = [e for e in entries if (e.key or "") not in self._HIDDEN_KEYS]
         return web.json_response([{"role": e.role, "content": e.content, "time": e.created_at, "key": e.key or ""} for e in entries])
 
@@ -2527,7 +2532,7 @@ class ApiServer:
         offset = int(request.query.get("offset", 0))
         entries = self.core.memory.get_conversation(sid, limit=limit + offset)
         entries = entries[offset:]
-        # Filter out internal entries (LLM raw output, tool calls/results)
+        # Filter out internal entries (LLM raw output only)
         entries = [e for e in entries if (e.key or "") not in self._HIDDEN_KEYS]
         return web.json_response([{"role": e.role, "content": e.content, "time": e.created_at, "key": e.key or ""} for e in entries])
 

package/web/ui/chat/chat_main.js

@@ -1854,8 +1854,10 @@ async function selectSession(id) {
       return m && (m.role === 'user' || m.role === 'assistant' || m.role === 'tool');
     }).map(function(m) {
       var content = (m.content != null) ? String(m.content) : '';
-      // Strip XML tags from assistant messages (backend may store raw LLM XML output)
-      if (m.role === 'assistant' && content && content.trim().startsWith('<')) {
+      // Strip XML tags from assistant messages that are raw LLM output (key is empty or llm_output)
+      // Do NOT strip tool_call messages — their content has a specific format (beforecalltext\n调用工具:...) 
+      var mkey = (m.key || '').toLowerCase();
+      if (m.role === 'assistant' && mkey !== 'tool_call' && content && content.trim().startsWith('<')) {
         content = (typeof _stripXmlTags === 'function') ? _stripXmlTags(content) : content;
       }
       return {
@@ -1923,8 +1925,8 @@ async function loadMoreMessages() {
       return m && (m.role === 'user' || m.role === 'assistant' || m.role === 'tool');
     }).map(function(m) {
       var content = (m.content != null) ? String(m.content) : '';
-      // Strip XML tags from assistant messages (backend may store raw LLM XML output)
-      if (m.role === 'assistant' && content && content.trim().startsWith('<')) {
+      var mkey = (m.key || '').toLowerCase();
+      if (m.role === 'assistant' && mkey !== 'tool_call' && content && content.trim().startsWith('<')) {
         content = (typeof _stripXmlTags === 'function') ? _stripXmlTags(content) : content;
       }
       return {
@@ -1937,8 +1939,8 @@ async function loadMoreMessages() {
 
     // Group consecutive non-user messages for the loaded batch
     const grouped = groupHistoryMessages(loaded);
-    // 追加到现有消息前面（保持滚动位置）
-    state.messages = grouped.concat(state.messages);
+    // Prepend to existing messages, then RE-GROUP the boundary to merge split groups
+    state.messages = groupHistoryMessages(grouped.concat(state.messages));
     state._msgLoadOffset += loaded.length;
     state._msgLoadTotal = state.messages.length;
 
@@ -2102,6 +2104,43 @@ async function clearCurrentChat() {
 //   tool_result→ role="tool",     key="tool_result"
 //
 // Result: user → [assistant { text → tool_call → tool_result → text → ... }] → user
+
+// 解析 tool_call 消息内容，兼容新旧格式
+// 新格式: "beforecalltext\n调用工具: xxx\n参数: yyy"
+// 旧格式: "调用工具: xxx\n参数: yyy"
+function parseToolCallContent(content) {
+  if (!content) return { title: '调用工具', toolName: '', params: '' };
+  var lines = content.split('\n');
+  var title = '';
+  var toolName = '';
+  var params = '';
+  // 查找 "调用工具:" 行
+  for (var li = 0; li < lines.length; li++) {
+    var line = lines[li].trim();
+    var m = line.match(/^调用工具:\s*(\S+)/);
+    if (m) {
+      toolName = m[1];
+      break;
+    }
+  }
+  // 查找 "参数:" 行
+  for (var li2 = 0; li2 < lines.length; li2++) {
+    var line2 = lines[li2].trim();
+    var m2 = line2.match(/^参数:\s*([\s\S]*)/);
+    if (m2) {
+      params = m2[1].trim();
+      break;
+    }
+  }
+  // 标题: 如果第一行不是"调用工具:"，则使用第一行作为 beforecalltext 标题
+  if (lines[0] && !lines[0].trim().startsWith('调用工具:')) {
+    title = lines[0].trim();
+  } else {
+    title = toolName ? ('调用工具: ' + toolName) : content.substring(0, 100);
+  }
+  return { title: title, toolName: toolName, params: params };
+}
+
 function groupHistoryMessages(messages) {
   if (!Array.isArray(messages) || messages.length === 0) return messages;
 
@@ -2122,14 +2161,18 @@ function groupHistoryMessages(messages) {
 
       // Process the first assistant message
       if (msg.key === 'tool_call') {
-        const toolName = (msg.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
+        // 新格式: beforecalltext\n调用工具: xxx\n参数: yyy
+        // 旧格式: 调用工具: xxx\n参数: yyy
+        var _tcParts = msg._parsedToolCall || parseToolCallContent(msg.content);
+        msg._parsedToolCall = _tcParts; // 缓存
         parts.push({
           type: 'exec',
           data: {
             id: _evtId++,
             type: 'tool_call',
-            title: toolName ? ('调用工具: ' + toolName) : msg.content.substring(0, 100),
-            tool_name: toolName,
+            title: _tcParts.title,
+            tool_name: _tcParts.toolName,
+            params: _tcParts.params || undefined,
             status: 'done',
           }
         });
@@ -2168,18 +2211,17 @@ function groupHistoryMessages(messages) {
           });
           i++;
         } else if (next.role === 'assistant' && next.key === 'tool_call') {
-          // Parse tool_call content: format is "调用工具: {name}\n参数: {parms}"
-          const toolName = (next.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
-          const paramsMatch = next.content.match(/参数:\s*([\s\S]*)/);
-          const toolParams = paramsMatch ? paramsMatch[1].trim() : '';
+          // 新格式: beforecalltext\n调用工具: xxx\n参数: yyy
+          var _tcParts2 = next._parsedToolCall || parseToolCallContent(next.content);
+          next._parsedToolCall = _tcParts2;
           parts.push({
             type: 'exec',
             data: {
               id: _evtId++,
               type: 'tool_call',
-              title: toolName ? ('调用工具: ' + toolName) : next.content.substring(0, 100),
-              tool_name: toolName,
-              params: toolParams || undefined,
+              title: _tcParts2.title,
+              tool_name: _tcParts2.toolName,
+              params: _tcParts2.params || undefined,
               status: 'done',
             }
           });
@@ -2215,17 +2257,16 @@ function groupHistoryMessages(messages) {
       const isCall = msg.key === 'tool_call';
 
       if (isCall) {
-        const toolName = (msg.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
-        const paramsMatch = msg.content.match(/参数:\s*([\s\S]*)/);
-        const toolParams = paramsMatch ? paramsMatch[1].trim() : '';
+        var _tcParts3 = msg._parsedToolCall || parseToolCallContent(msg.content);
+        msg._parsedToolCall = _tcParts3;
         parts.push({
           type: 'exec',
           data: {
             id: _evtId++,
             type: 'tool_call',
-            title: toolName ? ('调用工具: ' + toolName) : msg.content.substring(0, 100),
-            tool_name: toolName,
-            params: toolParams || undefined,
+            title: _tcParts3.title,
+            tool_name: _tcParts3.toolName,
+            params: _tcParts3.params || undefined,
             status: 'done',
           }
         });
@@ -2254,17 +2295,16 @@ function groupHistoryMessages(messages) {
       while (i < messages.length) {
         const next = messages[i];
         if (next.role === 'assistant' && next.key === 'tool_call') {
-          const toolName = (next.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
-          const paramsMatch = next.content.match(/参数:\s*([\s\S]*)/);
-          const toolParams = paramsMatch ? paramsMatch[1].trim() : '';
+          var _tcParts4 = next._parsedToolCall || parseToolCallContent(next.content);
+          next._parsedToolCall = _tcParts4;
           parts.push({
             type: 'exec',
             data: {
               id: _evtId++,
               type: 'tool_call',
-              title: toolName ? ('调用工具: ' + toolName) : next.content.substring(0, 100),
-              tool_name: toolName,
-              params: toolParams || undefined,
+              title: _tcParts4.title,
+              tool_name: _tcParts4.toolName,
+              params: _tcParts4.params || undefined,
               status: 'done',
             }
           });