myagent-ai 1.23.18 → 1.23.19

package/core/tool_dispatcher.py

@@ -361,6 +361,17 @@ class ToolDispatcher:
                 embed_url = media_url
                 embed_title = embed_title or ("在线音乐" if media_type == "audio" else "在线视频")
 
+        # [v1.23.19] 构建媒体元数据，持久化到 sent_files 以支持历史消息恢复
+        _media_meta = {
+            "_type": "media",  # 标记为媒体类型（区别于文件）
+            "media_type": media_type,
+            "embed_url": embed_url or "",
+            "title": embed_title,
+            "original_url": media_url or fallback_link or "",
+        }
+        if sent_files is not None:
+            sent_files.append(_media_meta)
+
         if embed_url and stream_callback:
             await self._emit_sse("v2_media", {
                 "media_type": media_type,

package/package.json

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

package/web/api_server.py

@@ -4252,8 +4252,15 @@ window.addEventListener('beforeunload', function() {{
             meta = e.metadata or {}
             if meta.get("images"):
                 msg["images"] = meta["images"]
-            if meta.get("files"):
-                msg["files"] = meta["files"]
+            # [v1.23.19] 分离 _files 和 _media（前端用 msg._files 和 msg._media）
+            _raw_files = meta.get("files") or []
+            if _raw_files:
+                _file_items = [f for f in _raw_files if f.get("_type") != "media"]
+                _media_items = [f for f in _raw_files if f.get("_type") == "media"]
+                if _file_items:
+                    msg["_files"] = _file_items
+                if _media_items:
+                    msg["_media"] = _media_items
             result.append(msg)
         return web.json_response(result)
 
@@ -4306,8 +4313,15 @@ window.addEventListener('beforeunload', function() {{
             meta = e.metadata or {}
             if meta.get("images"):
                 msg["images"] = meta["images"]
-            if meta.get("files"):
-                msg["files"] = meta["files"]
+            # [v1.23.19] 分离 _files 和 _media（前端用 msg._files 和 msg._media）
+            _raw_files = meta.get("files") or []
+            if _raw_files:
+                _file_items = [f for f in _raw_files if f.get("_type") != "media"]
+                _media_items = [f for f in _raw_files if f.get("_type") == "media"]
+                if _file_items:
+                    msg["_files"] = _file_items
+                if _media_items:
+                    msg["_media"] = _media_items
             result.append(msg)
         return web.json_response(result)
 

package/web/ui/chat/chat_main.js

@@ -2246,10 +2246,15 @@ async function selectSession(id) {
       if (m.images && m.images.length > 0) {
         mapped.images = m.images;
       }
-      if (m.files && m.files.length > 0) {
-        mapped.files = m.files;
-        // [v1.23.13] 同时映射到 _files，使历史消息中的文件卡片可渲染
-        mapped._files = m.files;
+      // [v1.23.19] 兼容旧格式(m.files)和新格式(m._files / m._media)
+      var _rawFiles = m._files || m.files || [];
+      if (_rawFiles.length > 0) {
+        mapped.files = _rawFiles;
+        mapped._files = _rawFiles;
+      }
+      // [v1.23.19] 在线媒体嵌入
+      if (m._media && m._media.length > 0) {
+        mapped._media = m._media;
       }
       return mapped;
     });
@@ -2625,6 +2630,8 @@ function groupHistoryMessages(messages) {
     var firstMsg = msg;
     // [v1.19.3] 收集组内所有消息的文件（agent 通过 file_send 发送的文件存在 metadata.files 中）
     var allAgentFiles = [];
+    // [v1.23.19] 收集组内所有消息的在线媒体嵌入
+    var allAgentMedia = [];
 
     while (i < messages.length && messages[i].role !== 'user') {
       var m = messages[i];
@@ -2643,6 +2650,12 @@ function groupHistoryMessages(messages) {
           allAgentFiles.push(m._files[_fi]);
         }
       }
+      // [v1.23.19] 收集后端持久化的 _media 数据
+      if (m._media && Array.isArray(m._media) && m._media.length > 0) {
+        for (var _mi = 0; _mi < m._media.length; _mi++) {
+          allAgentMedia.push(m._media[_mi]);
+        }
+      }
 
       if (mkey === 'reasoning') {
         reasoningText = reasoningText ? (reasoningText + '\n\n' + (m.content || '')) : (m.content || '');
@@ -2677,6 +2690,10 @@ function groupHistoryMessages(messages) {
     if (allAgentFiles.length > 0) entry._files = allAgentFiles;
     // [v1.20.3] 从 playaudio/playvideo 工具调用中重建 _media 数据（历史回放支持）
     var mediaEmbeds = [];
+    // [v1.23.19] 先收集后端持久化的 _media 数据
+    for (var _pmi = 0; _pmi < allAgentMedia.length; _pmi++) {
+      mediaEmbeds.push(allAgentMedia[_pmi]);
+    }
     for (var ei = 0; ei < parts.length; ei++) {
       var ep = parts[ei];
       if (ep.type === 'exec' && ep.data.tool_name && (ep.data.tool_name === 'playaudio' || ep.data.tool_name === 'playvideo')) {

package/web/ui/chat/flow_engine.js

@@ -628,7 +628,31 @@ function updateStreamingMessage(msgIdx) {
         var _isImg = _f.type && _f.type.indexOf('image/') === 0;
         var _isAud = _f.type && _f.type.indexOf('audio/') === 0;
         var _isVid = _f.type && _f.type.indexOf('video/') === 0;
-        if (_isImg || _isAud || _isVid) { renderedIds.push(_fId); continue; }
+        // [v1.23.19] 图片/音频/视频也直接渲染（不再跳过等 renderMessages）
+        if (_isImg && _fId) {
+          var _imgDiv = document.createElement('div');
+          _imgDiv.className = 'msg-image-wrapper agent-image';
+          _imgDiv.innerHTML = '<img src="/api/file/' + _fId + '" class="msg-image" loading="lazy" alt="' + escapeHtml(_f.name || 'image') + '" onerror="this.onerror=null;this.style.background=\'var(--bg3)\';this.style.minHeight=\'60px\';this.alt=\'[图片加载失败]\'" onclick="openFileViewer(\'' + _fId + '\', this.src, \'' + escapeHtml(_f.name) + '\')" />';
+          fileContainer.appendChild(_imgDiv);
+          renderedIds.push(_fId);
+          continue;
+        }
+        if (_isAud && _fId) {
+          var _audDiv = document.createElement('div');
+          _audDiv.className = 'msg-media-player';
+          _audDiv.innerHTML = '<audio controls src="/api/file/' + _fId + '" style="width:100%;max-width:480px" preload="metadata" onplay="if(typeof muteTTS===\'function\')muteTTS()" onended="if(typeof unmuteTTS===\'function\')unmuteTTS()"></audio><div class="msg-media-title">' + escapeHtml(_f.name || '音频') + '</div>';
+          fileContainer.appendChild(_audDiv);
+          renderedIds.push(_fId);
+          continue;
+        }
+        if (_isVid && _fId) {
+          var _vidDiv = document.createElement('div');
+          _vidDiv.className = 'msg-media-player';
+          _vidDiv.innerHTML = '<video controls src="/api/file/' + _fId + '" style="width:100%;max-width:640px;border-radius:8px" preload="metadata" onplay="if(typeof muteTTS===\'function\')muteTTS()" onended="if(typeof unmuteTTS===\'function\')unmuteTTS()"></video><div class="msg-media-title">' + escapeHtml(_f.name || '视频') + '</div>';
+          fileContainer.appendChild(_vidDiv);
+          renderedIds.push(_fId);
+          continue;
+        }
         var _icon = _getFileIcon(_f.name || _f.type || '');
         var _sizeStr = _f.size ? formatFileSize(_f.size) : '';
         var _fDiv = document.createElement('div');
@@ -647,6 +671,48 @@ function updateStreamingMessage(msgIdx) {
       fileContainer._renderedFileIds = renderedIds;
     }
 
+    // ── [v1.23.19] 增量渲染在线媒体嵌入播放器（v2_media 事件） ──
+    if (msg._media && msg._media.length > 0) {
+      var existingMedia = bubbleWrapper ? bubbleWrapper.querySelectorAll(':scope > .msg-attachments-media') : contentArea.querySelectorAll(':scope > .msg-attachments-media');
+      var mediaContainer = existingMedia.length > 0 ? existingMedia[0] : null;
+      if (!mediaContainer) {
+        mediaContainer = document.createElement('div');
+        mediaContainer.className = 'msg-attachments msg-attachments-media';
+        if (bubbleWrapper) {
+          bubbleWrapper.appendChild(mediaContainer);
+        } else {
+          contentArea.appendChild(mediaContainer);
+        }
+      }
+      var renderedMediaUrls = mediaContainer._renderedMediaUrls || [];
+      for (var _mIdx = 0; _mIdx < msg._media.length; _mIdx++) {
+        var _m = msg._media[_mIdx];
+        var _mUrl = _m.embed_url || _m.original_url || '';
+        if (!_mUrl || renderedMediaUrls.indexOf(_mUrl) >= 0) continue;
+        var _isAud2 = _m.media_type === 'audio';
+        var _mTitle = _m.title || (_isAud2 ? '在线音乐' : '在线视频');
+        var _mOrig = _m.original_url || _mUrl;
+        var _mDiv = document.createElement('div');
+        _mDiv.className = 'msg-media-embed' + (_isAud2 ? ' msg-media-audio' : ' msg-media-video');
+        if (!_m.embed_url && _mOrig) {
+          // 无嵌入 URL，渲染链接卡片
+          _mDiv.className += ' msg-media-link-card';
+          _mDiv.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';
+          _mDiv.setAttribute('onclick', "window.open('" + _mOrig.replace(/'/g, "\\'") + "','_blank')");
+          _mDiv.innerHTML = '<div class="msg-media-header"><span class="msg-media-icon">' + (_isAud2 ? '🎵' : '🎬') + '</span><span class="msg-media-label">' + escapeHtml(_mTitle) + '</span><span style="margin-left:auto;font-size:12px;opacity:0.6">点击在新窗口打开 ↗</span></div><div style="font-size:12px;opacity:0.5;margin-top:4px;word-break:break-all">' + escapeHtml(_mOrig) + '</div>';
+        } else if (_isAud2) {
+          // 音频嵌入播放器
+          _mDiv.innerHTML = '<div class="msg-media-header"><span class="msg-media-icon">🎵</span><span class="msg-media-label">' + escapeHtml(_mTitle) + '</span><a class="msg-media-link" href="' + escapeHtml(_mOrig) + '" target="_blank" rel="noopener" title="在新窗口打开">↗</a></div><iframe src="' + escapeHtml(_mUrl) + '" style="width:100%;max-width:480px;height:80px;border:none;border-radius:8px" loading="lazy" allow="autoplay" sandbox="allow-scripts allow-same-origin allow-presentation"></iframe>';
+        } else {
+          // 视频嵌入播放器
+          _mDiv.innerHTML = '<div class="msg-media-header"><span class="msg-media-icon">🎬</span><span class="msg-media-label">' + escapeHtml(_mTitle) + '</span><a class="msg-media-link" href="' + escapeHtml(_mOrig) + '" target="_blank" rel="noopener" title="在新窗口打开">↗</a></div><iframe src="' + escapeHtml(_mUrl) + '" style="width:100%;max-width:640px;height:360px;border:none;border-radius:8px" loading="lazy" allow="autoplay;encrypted-media;picture-in-picture" allowfullscreen></iframe>';
+        }
+        mediaContainer.appendChild(_mDiv);
+        renderedMediaUrls.push(_mUrl);
+      }
+      mediaContainer._renderedMediaUrls = renderedMediaUrls;
+    }
+
     // Remove exec events panel if present (events are now inline in timeline)
     const execPanel = contentArea.querySelector('.exec-events-panel');
     if (execPanel) execPanel.remove();