myagent-ai 1.23.30 → 1.23.32

package/agents/main_agent.py

@@ -281,8 +281,15 @@ class MainAgent(BaseAgent):
 
         logger.info(f"[{task_id}] 开始处理用户请求: {context.user_message[:100]}")
 
+        # [v1.23.30] 读取外部注入的 Agent 专属提示词（群聊、多Agent 场景使用）
+        # _try_model_chain_inner 通过此属性注入 group_context 等自定义提示词
+        _override_prompt = getattr(self, '_agent_override_prompt', None)
+
         try:
-            return await self.process_v2(context)
+            return await self.process_v2(
+                context,
+                agent_override_prompt=_override_prompt,
+            )
         finally:
             # 移除活跃上下文
             self.active_contexts.pop(context.session_id, None)

package/core/tool_dispatcher.py

@@ -182,7 +182,7 @@ class ToolDispatcher:
         )
         result = exec_result.to_dict()
 
-        output = result.get("output", "")
+        output = result.get("stdout", "") or result.get("output", "")
         import re as _re
 
         # [v1.23.0] 检测 __SEND_FILE__ 标记 — CLI send-file 命令输出此标记
@@ -225,7 +225,8 @@ class ToolDispatcher:
                 if not media_result.get("success"):
                     result["output"] += f"\n[音频播放失败: {media_result.get('error', '')}]"
         if video_markers:
-            clean_output = result.get("output", "")
+            # [v1.23.32] 修复: result 可能没有 output key（来自 to_dict 的 stdout）
+            clean_output = result.get("output", "") or clean_output
             clean_output = _re.sub(r'__EMBED_VIDEO__.+?__END__\n?', '', clean_output).strip()
             result["output"] = clean_output
             for media_url, media_title in video_markers:
@@ -261,6 +262,10 @@ class ToolDispatcher:
                 except Exception:
                     pass
 
+        # [v1.23.32] 确保 result 始终有 output 字段（to_dict 返回 stdout，V2 循环依赖 output）
+        if "output" not in result:
+            result["output"] = clean_output
+
         return result
 
     async def _exec_recall_memory(self, params: Dict, task_id: str) -> Dict:

package/package.json

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

package/web/ui/chat/flow_engine.js

@@ -811,6 +811,114 @@ function updateStreamingMessage(msgIdx) {
         }
       }
     }
+
+    // [v1.23.30] 文件卡片渲染（backward compat 路径 — 确保无 parts 时也能显示文件）
+    if (msg._files && msg._files.length > 0) {
+      var bcImageContainer = contentArea.querySelector(':scope > .msg-attachments-images');
+      var bcExistingFiles = contentArea.querySelectorAll(':scope > .msg-attachments-files');
+      var bcFileContainer = bcExistingFiles.length > 0 ? bcExistingFiles[0] : null;
+      var bcRenderedIds = (bcFileContainer ? bcFileContainer._renderedFileIds : []) || [];
+      var bcRenderedImageIds = (bcImageContainer ? bcImageContainer._renderedImageIds : []) || [];
+      for (var _bcFi = 0; _bcFi < msg._files.length; _bcFi++) {
+        var _bcF = msg._files[_bcFi];
+        var _bcFId = _bcF.id || _bcF.file_id || '';
+        if (bcRenderedIds.indexOf(_bcFId) >= 0 || bcRenderedImageIds.indexOf(_bcFId) >= 0) continue;
+        var _bcIsImg = _bcF.type && _bcF.type.indexOf('image/') === 0;
+        var _bcIsAud = _bcF.type && _bcF.type.indexOf('audio/') === 0;
+        var _bcIsVid = _bcF.type && _bcF.type.indexOf('video/') === 0;
+        if (_bcIsImg || _bcIsAud || _bcIsVid) {
+          if (!bcImageContainer) {
+            bcImageContainer = document.createElement('div');
+            bcImageContainer.className = 'msg-attachments msg-attachments-images';
+            bcImageContainer._renderedImageIds = [];
+            var bcBubble = contentArea.querySelector('.message-bubble');
+            if (bcBubble) {
+              contentArea.insertBefore(bcImageContainer, bcBubble);
+            } else {
+              contentArea.appendChild(bcImageContainer);
+            }
+          }
+          if (_bcIsImg && _bcFId) {
+            var _bcImgDiv = document.createElement('div');
+            _bcImgDiv.className = 'msg-image-wrapper agent-image';
+            _bcImgDiv.innerHTML = '<img src="/api/file/' + _bcFId + '" class="msg-image" loading="lazy" alt="' + escapeHtml(_bcF.name || 'image') + '" onclick="openFileViewer(\'' + _bcFId + '\', this.src, \'' + escapeHtml(_bcF.name) + '\')" />';
+            bcImageContainer.appendChild(_bcImgDiv);
+          } else if (_bcIsAud && _bcFId) {
+            var _bcAudDiv = document.createElement('div');
+            _bcAudDiv.className = 'msg-media-player';
+            _bcAudDiv.innerHTML = '<audio controls src="/api/file/' + _bcFId + '" style="width:100%;max-width:480px" preload="metadata"></audio><div class="msg-media-title">' + escapeHtml(_bcF.name || '音频') + '</div>';
+            bcImageContainer.appendChild(_bcAudDiv);
+          } else if (_bcIsVid && _bcFId) {
+            var _bcVidDiv = document.createElement('div');
+            _bcVidDiv.className = 'msg-media-player';
+            _bcVidDiv.innerHTML = '<video controls src="/api/file/' + _bcFId + '" style="width:100%;max-width:640px;border-radius:8px" preload="metadata"></video><div class="msg-media-title">' + escapeHtml(_bcF.name || '视频') + '</div>';
+            bcImageContainer.appendChild(_bcVidDiv);
+          }
+          bcImageContainer._renderedImageIds.push(_bcFId);
+          continue;
+        }
+        if (!bcFileContainer) {
+          bcFileContainer = document.createElement('div');
+          bcFileContainer.className = 'msg-attachments msg-attachments-files';
+          bcFileContainer._renderedFileIds = [];
+          var bcBubble2 = contentArea.querySelector('.message-bubble');
+          if (bcBubble2) {
+            bcBubble2.parentNode.insertBefore(bcFileContainer, bcBubble2.nextSibling);
+          } else {
+            contentArea.appendChild(bcFileContainer);
+          }
+        }
+        var _bcIcon = _getFileIcon(_bcF.name || _bcF.type || '');
+        var _bcSizeStr = _bcF.size ? formatFileSize(_bcF.size) : '';
+        var _bcFDiv = document.createElement('div');
+        _bcFDiv.className = 'msg-file-item agent-file';
+        _bcFDiv.title = '点击预览';
+        _bcFDiv.innerHTML = '<span class="msg-file-icon">' + _bcIcon + '</span>' +
+          '<span class="msg-file-info"><span class="msg-file-name">' + escapeHtml(_bcF.name) + '</span>' +
+          (_bcSizeStr ? '<span class="msg-file-size">' + _bcSizeStr + '</span>' : '') +
+          '</span>' +
+          '<span class="msg-file-actions">' +
+          '<a class="msg-file-download" href="/api/file/' + (_bcFId || '') + '?name=' + encodeURIComponent(_bcF.name || 'file') + '" download="' + escapeHtml(_bcF.name) + '" title="下载" onclick="event.stopPropagation()">⬇</a>' +
+          '</span>';
+        bcFileContainer.appendChild(_bcFDiv);
+        bcFileContainer._renderedFileIds.push(_bcFId);
+      }
+    }
+
+    // [v1.23.30] 在线媒体嵌入渲染（backward compat 路径）
+    if (msg._media && msg._media.length > 0) {
+      var bcExistingMedia = contentArea.querySelectorAll(':scope > .msg-attachments-media');
+      var bcMediaContainer = bcExistingMedia.length > 0 ? bcExistingMedia[0] : null;
+      if (!bcMediaContainer) {
+        bcMediaContainer = document.createElement('div');
+        bcMediaContainer.className = 'msg-attachments msg-attachments-media';
+        var bcBubble3 = contentArea.querySelector('.message-bubble');
+        if (bcBubble3) {
+          contentArea.insertBefore(bcMediaContainer, bcBubble3);
+        } else {
+          contentArea.appendChild(bcMediaContainer);
+        }
+      }
+      var bcRenderedMediaUrls = bcMediaContainer._renderedMediaUrls || [];
+      for (var _bcMi = 0; _bcMi < msg._media.length; _bcMi++) {
+        var _bcM = msg._media[_bcMi];
+        var _bcMUrl = _bcM.embed_url || _bcM.original_url || '';
+        if (!_bcMUrl || bcRenderedMediaUrls.indexOf(_bcMUrl) >= 0) continue;
+        var _bcMIsAud = _bcM.media_type === 'audio';
+        var _bcMTitle = _bcM.title || (_bcMIsAud ? '在线音乐' : '在线视频');
+        var _bcMDiv = document.createElement('div');
+        _bcMDiv.className = 'msg-media-embed' + (_bcMIsAud ? ' msg-media-audio' : ' msg-media-video');
+        if (_bcM.embed_url) {
+          _bcMDiv.innerHTML = '<div class="msg-media-header"><span class="msg-media-icon">' + (_bcMIsAud ? '🎵' : '🎬') + '</span><span class="msg-media-label">' + escapeHtml(_bcMTitle) + '</span></div><iframe src="' + escapeHtml(_bcMUrl) + '" style="width:100%;max-width:' + (_bcMIsAud ? '480' : '640') + 'px;height:' + (_bcMIsAud ? '80' : '360') + 'px;border:none;border-radius:8px" loading="lazy" allow="autoplay;encrypted-media;picture-in-picture" allowfullscreen></iframe>';
+        } else {
+          _bcMDiv.style.cssText = 'padding:10px 14px;border-radius:8px;background:rgba(255,255,255,0.06);border:1px solid rgba(255,255,255,0.1);cursor:pointer';
+          _bcMDiv.innerHTML = '<div class="msg-media-header"><span class="msg-media-icon">' + (_bcMIsAud ? '🎵' : '🎬') + '</span><span class="msg-media-label">' + escapeHtml(_bcMTitle) + '</span></div>';
+        }
+        bcMediaContainer.appendChild(_bcMDiv);
+        bcRenderedMediaUrls.push(_bcMUrl);
+      }
+      bcMediaContainer._renderedMediaUrls = bcRenderedMediaUrls;
+    }
   }
 
   // Update streaming indicator