myagent-ai 1.26.6 → 1.26.7

package/agents/main_agent.py

@@ -206,7 +206,7 @@ GUI桌面 (仅Windows/macOS):
         self._execution_events = []
         self._exec_event_counter = 0
 
-    async def process(self, context: AgentContext) -> AgentContext:
+    async def process(self, context: AgentContext, stream_callback=None) -> AgentContext:
         """
         主处理循环。
 
@@ -250,6 +250,7 @@ GUI桌面 (仅Windows/macOS):
                 agent_name=_injected_name or self.name,
                 agent_description=_injected_desc or self.description,
                 agent_override_prompt=_override_prompt,
+                stream_callback=stream_callback,
                 agent_path=getattr(self, '_agent_override_path', None),
             )
         finally:

package/main.py

@@ -488,6 +488,7 @@ class MyAgentApp:
         self,
         user_message: str,
         session_id: str = "",
+        stream_callback=None,
     ) -> str:
         """
         处理用户消息并返回回复。
@@ -495,6 +496,7 @@ class MyAgentApp:
         Args:
             user_message: 用户消息
             session_id: 会话 ID
+            stream_callback: SSE 流式回调（群聊等场景需要，用于推送 v2_file 等事件）
 
         Returns:
             助手回复文本
@@ -511,7 +513,7 @@ class MyAgentApp:
         )
 
         try:
-            result_context = await self.main_agent.process(context)
+            result_context = await self.main_agent.process(context, stream_callback=stream_callback)
             response = result_context.working_memory.get(
                 "final_response", "⚠️ 未能生成回复"
             )

package/package.json

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

package/web/api_server.py

@@ -5496,22 +5496,22 @@ window.addEventListener('beforeunload', function() {{
 
     async def _try_model_chain(self, model_chain: list[dict], message: str, session_id: str,
                                  agent_path: str = None, agent_system_prompt: str = None,
-                                 chat_mode: str = "") -> str:
+                                 chat_mode: str = "", stream_callback=None) -> str:
         """依次尝试模型链中的模型，直到成功或全部失败
-        
+
         使用 asyncio.Lock 保护共享的 self.core.llm，防止并发请求互相干扰。
         """
         if not model_chain:
-            return await self.core.process_message(message, session_id)
+            return await self.core.process_message(message, session_id, stream_callback=stream_callback)
 
         async with self._model_chain_lock:
             return await self._try_model_chain_inner(model_chain, message, session_id,
                 agent_path=agent_path, agent_system_prompt=agent_system_prompt,
-                chat_mode=chat_mode)
+                chat_mode=chat_mode, stream_callback=stream_callback)
 
     async def _try_model_chain_inner(self, model_chain: list[dict], message: str, session_id: str,
                                       agent_path: str = None, agent_system_prompt: str = None,
-                                      chat_mode: str = "") -> str:
+                                      chat_mode: str = "", stream_callback=None) -> str:
         """_try_model_chain 的实际执行体（已在 _model_chain_lock 保护下）"""
         llm = self.core.llm
         last_error = ""
@@ -5598,7 +5598,7 @@ window.addEventListener('beforeunload', function() {{
                     self.core.main_agent.context_builder.agent_knowledge_dir = str(agent_kb_dir)
 
                 try:
-                    response = await self.core.process_message(message, session_id)
+                    response = await self.core.process_message(message, session_id, stream_callback=stream_callback)
                 finally:
                     if self.core.main_agent:
                         self.core.main_agent._agent_override_prompt = None
@@ -8324,14 +8324,34 @@ window.addEventListener('beforeunload', function() {{
 
                 agent_content = content
 
+                # [v1.26.6] 创建群聊 stream_callback，让 file_send 等工具的 v2_file 事件
+                # 能推送到前端。群聊中 v2_file 需要携带 agent_path 标识发送者。
+                _group_sent_files = []
+                async def _group_stream_callback(event):
+                    evt_type = event.get("type", "")
+                    if evt_type == "v2_file" and event.get("data"):
+                        file_data = event["data"]
+                        # 转发为群聊格式的 v2_file 事件（附带 agent_path）
+                        await safe_write({
+                            "type": "v2_file",
+                            "data": file_data,
+                            "agent_path": agent_path,
+                            "agent_name": display_name,
+                            "agent_emoji": avatar,
+                        })
+                        # 追加到 sent_files 用于持久化
+                        if isinstance(file_data, dict) and file_data.get("file_id"):
+                            _group_sent_files.append(file_data)
+
                 # 调用 LLM 获取回复
                 if model_chain and self.core.llm:
                     response_text = await self._try_model_chain_inner(
                         model_chain, agent_content, session_id,
                         agent_path=agent_path, agent_system_prompt=agent_system_prompt,
+                        stream_callback=_group_stream_callback,
                     )
                 else:
-                    response_text = await self.core.process_message(agent_content, session_id)
+                    response_text = await self.core.process_message(agent_content, session_id, stream_callback=_group_stream_callback)
 
                 # 流式输出该 agent 的回复文本（逐块发送）
                 await self._stream_text_chunked(response_text, safe_write, chunk_size=6, delay=0.01)

package/web/ui/chat/groupchat.js

@@ -469,6 +469,16 @@ function startPrivateChatFromGroup(agentPath) {
 // ── Render Group Messages ──
 // ══════════════════════════════════════════════════════
 
+// [v1.26.6] formatFileSize polyfill（chat_main.js 中已有全局定义，此处作兜底）
+if (typeof formatFileSize !== 'function') {
+  function formatFileSize(bytes) {
+    if (!bytes || bytes < 0) return '';
+    if (bytes < 1024) return bytes + ' B';
+    if (bytes < 1048576) return (bytes / 1024).toFixed(1) + ' KB';
+    return (bytes / 1048576).toFixed(1) + ' MB';
+  }
+}
+
 function renderGroupMessages() {
   try {
   _renderGroupMessagesInner();
@@ -516,6 +526,33 @@ function _renderGroupMessagesInner() {
       var _clickAvatar = agentPath ? ' onclick="startPrivateChatFromGroup(\'' + escapeHtml(agentPath) + '\')" style="background:' + agentColor + ';color:#fff;cursor:pointer" title="点击私聊 ' + escapeHtml(agentName) + '"' : ' style="background:' + agentColor + ';color:#fff"';
       // [v1.23.82] 流式输出时显示闪烁光标
       var _streamingCursor = msg._streaming ? '<span class="streaming-cursor" style="display:inline-block;width:2px;height:1em;background:var(--accent);margin-left:2px;animation:blink 1s step-end infinite;vertical-align:text-bottom"></span>' : '';
+      // [v1.26.6] 文件附件（群聊 file_send）
+      var _filesHtml = '';
+      if (msg._files && msg._files.length > 0) {
+        for (var _fi2 = 0; _fi2 < msg._files.length; _fi2++) {
+          var _ff = msg._files[_fi2];
+          var _fId = _ff.id || _ff.file_id || '';
+          var _fName = _ff.name || '文件';
+          var _fSize = _ff.size ? formatFileSize(_ff.size) : '';
+          var _fIcon = _ff.type && _ff.type.startsWith('image/') ? '🖼' : (_ff.type && _ff.type.startsWith('audio/') ? '🎵' : (_ff.type && _ff.type.startsWith('video/') ? '🎬' : '📄'));
+          var _fUrl = '/api/file/' + _fId + '?name=' + encodeURIComponent(_fName);
+          // 图片类型显示缩略图
+          if (_ff.type && _ff.type.startsWith('image/')) {
+            _filesHtml += '<div class="group-msg-file-image" style="margin-top:6px">'
+              + '<img src="' + _fUrl + '" style="max-width:300px;max-height:200px;border-radius:8px;cursor:pointer" onclick="window.open(this.src)" onerror="this.style.display=\'none\'">'
+              + '</div>';
+          } else {
+            _filesHtml += '<div class="group-msg-file-item" style="margin-top:6px;padding:8px 12px;background:var(--bg-tertiary);border-radius:8px;display:flex;align-items:center;gap:8px;cursor:pointer" onclick="window.open(\'' + _fUrl + '\')">'
+              + '<span style="font-size:20px">' + _fIcon + '</span>'
+              + '<span style="flex:1;min-width:0"><span style="display:block;font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">' + escapeHtml(_fName) + '</span>'
+              + (_fSize ? '<span style="display:block;font-size:11px;color:var(--text-secondary)">' + _fSize + '</span>' : '')
+              + '</span>'
+              + '<a href="' + _fUrl + '" download="' + escapeHtml(_fName) + '" style="color:var(--text-secondary);text-decoration:none;font-size:16px" onclick="event.stopPropagation()" title="下载">⬇</a>'
+              + '</div>';
+          }
+        }
+      }
+
       html += '<div class="group-msg-row">'
         + '<div class="group-msg-avatar"' + _clickAvatar + '>' + agentEmoji + '</div>'
         + '<div>'
@@ -523,6 +560,7 @@ function _renderGroupMessagesInner() {
         + (agentRole ? ' <span class="role-badge">' + escapeHtml(agentRole) + '</span>' : '')
         + '</div>'
         + '<div class="group-msg-bubble" style="border-left-color:' + agentColor + '">' + renderMarkdown(msg.content || '') + _streamingCursor + '</div>'
+        + _filesHtml
         + (msg.time ? '<div class="group-msg-time">' + formatTime(msg.time) + '</div>' : '')
         + '</div></div>';
     } else if (msg.responses) {
@@ -1114,6 +1152,31 @@ async function sendGroupChat() {
           _streamingContent = '';
         } else if (evt.type === 'system_message') {
           groupMessages.push({type: 'system', content: evt.content, time: new Date().toISOString()});
+        } else if (evt.type === 'v2_file') {
+          // [v1.26.6] 群聊文件卡片 — Agent 通过 file_send 工具发送文件
+          if (evt.data) {
+            var fd = evt.data;
+            // 归一化: 后端用 file_id，渲染代码用 id
+            if (fd.file_id && !fd.id) fd.id = fd.file_id;
+            // 找到当前 agent 的消息（可能是正在流式输出的那条，或最后一条该 agent 的消息）
+            var _targetPath = evt.agent_path || _streamingAgentPath;
+            for (var fi = groupMessages.length - 1; fi >= 0; fi--) {
+              var fm = groupMessages[fi];
+              if (fm.agent === _targetPath || (fm._streaming && fm.agent === _streamingAgentPath)) {
+                if (!fm._files) fm._files = [];
+                // 去重
+                var _fid2 = fd.id || fd.file_id;
+                var _dup2 = _fid2 && fm._files.some(function(f) { return (f.id || f.file_id) === _fid2; });
+                if (!_dup2) {
+                  fm._files.push(fd);
+                }
+                break;
+              }
+            }
+            // 重新渲染以显示文件卡片
+            _renderGroupMessagesInner();
+            if (typeof scrollToBottom === 'function') scrollToBottom(true);
+          }
         } else if (evt.type === 'done') {
           // 全部完成
         } else if (evt.type === 'error') {