myagent-ai 1.20.10 → 1.20.12

package/agents/main_agent.py

@@ -544,6 +544,18 @@ class MainAgent(BaseAgent):
         text_delta_callback=None,
     ) -> AgentContext:
         """V2 内部循环逻辑 — 结构化输出 + 工具调度 + SSE 事件推送"""
+
+        # [v1.20.11] 安全发送 SSE 事件 — 兼容 sync/async 回调
+        async def _safe_sse(cb, event: dict):
+            """安全调用 stream_callback，兼容同步和异步回调。"""
+            try:
+                if asyncio.iscoroutinefunction(cb):
+                    await cb(event)
+                else:
+                    cb(event)
+            except Exception as e:
+                logger.debug(f"SSE 事件发送失败: {e}")
+
         max_iter = self.config.agent.max_iterations
         current_task_plan = ""
         all_tool_outputs = ""
@@ -1669,6 +1681,7 @@ class MainAgent(BaseAgent):
                     _media_type = "audio" if tool_name == "playaudio" else "video"
                     _embed_url = None
                     _embed_title = params.get("title", "")
+                    _fallback_link = None  # [v1.20.10] 无法嵌入时提供外部链接
 
                     if _media_url:
                         # 在线链接 — 提取嵌入式播放 URL
@@ -1679,6 +1692,21 @@ class MainAgent(BaseAgent):
                         if _yt_match:
                             _embed_url = f"https://www.youtube.com/embed/{_yt_match.group(1)}"
                             _embed_title = _embed_title or "YouTube 视频"
+                        # YouTube Music 播放列表: https://music.youtube.com/playlist?list=xxx
+                        elif 'music.youtube.com' in _url_lower:
+                            _ym_match = re.search(r'list=([\w-]+)', _media_url)
+                            if _ym_match:
+                                _embed_url = f"https://music.youtube.com/embed?list={_ym_match.group(1)}&layout=full"
+                                _embed_title = _embed_title or "YouTube Music"
+                            else:
+                                # 单曲: https://music.youtube.com/watch?v=xxx
+                                _ymv_match = re.search(r'watch\?v=([\w-]+)', _media_url)
+                                if _ymv_match:
+                                    _embed_url = f"https://music.youtube.com/embed/{_ymv_match.group(1)}"
+                                    _embed_title = _embed_title or "YouTube Music"
+                                else:
+                                    _fallback_link = _media_url
+                                    _embed_title = _embed_title or "YouTube Music"
                         # Bilibili: https://www.bilibili.com/video/BVxxx 或 b23.tv/xxx
                         elif 'bilibili.com' in _url_lower or 'b23.tv' in _url_lower:
                             _bv_match = re.search(r'bilibili\.com/video/(BV[\w]+)', _media_url)
@@ -1690,8 +1718,14 @@ class MainAgent(BaseAgent):
                                 _embed_title = _embed_title or "B站视频"
                         # QQ音乐: https://y.qq.com/n/ryqq/songDetail/xxx
                         elif 'y.qq.com' in _url_lower:
-                            _embed_url = _media_url
-                            _embed_title = _embed_title or "QQ音乐"
+                            # QQ音乐支持 outchain player
+                            _qq_match = re.search(r'songDetail/(\w+)', _media_url)
+                            if _qq_match:
+                                _embed_url = f"https://y.qq.com/n/ryqq/songDetail/{_qq_match.group(1)}"
+                                _embed_title = _embed_title or "QQ音乐"
+                            else:
+                                _embed_url = _media_url
+                                _embed_title = _embed_title or "QQ音乐"
                         # 网易云音乐: https://music.163.com/song?id=xxx
                         elif 'music.163.com' in _url_lower:
                             _song_match = re.search(r'music\.163\.com.*[?&]id=(\d+)', _media_url)
@@ -1712,7 +1746,7 @@ class MainAgent(BaseAgent):
 
                     if _embed_url and stream_callback:
                         # 在线播放 — 发送 v2_media 事件让前端渲染嵌入播放器
-                        stream_callback({
+                        await _safe_sse(stream_callback, {
                             "type": "v2_media",
                             "data": {
                                 "media_type": _media_type,
@@ -1723,6 +1757,19 @@ class MainAgent(BaseAgent):
                         })
                         result = {"success": True, "output": f"已嵌入{_embed_title}播放器: {_media_url}"}
 
+                    elif _fallback_link and stream_callback:
+                        # [v1.20.10] 无法嵌入但提供外部链接 — 发送链接卡片
+                        await _safe_sse(stream_callback, {
+                            "type": "v2_media",
+                            "data": {
+                                "media_type": _media_type,
+                                "embed_url": "",  # 空 embed_url 告诉前端渲染链接
+                                "title": _embed_title,
+                                "original_url": _fallback_link,
+                            }
+                        })
+                        result = {"success": True, "output": f"已提供{_embed_title}链接（不支持嵌入播放）: {_fallback_link}"}
+
                     elif _media_file:
                         # 本地文件 — 使用 file_send 发送文件，前端渲染内嵌播放器
                         from pathlib import Path as _P
@@ -1777,7 +1824,7 @@ class MainAgent(BaseAgent):
                         if _wc_url:
                             _wc_session.current_url = _wc_url
                         if stream_callback:
-                            stream_callback({
+                            await _safe_sse(stream_callback, {
                                 "type": "v2_web_control",
                                 "data": {
                                     "action": "open",
@@ -1795,7 +1842,7 @@ class MainAgent(BaseAgent):
                     elif _wc_action == "close":
                         _wc_mgr.close_session(_wc_session_id)
                         if stream_callback:
-                            stream_callback({
+                            await _safe_sse(stream_callback, {
                                 "type": "v2_web_control",
                                 "data": {"action": "close", "session_id": _wc_session_id}
                             })
@@ -1808,7 +1855,7 @@ class MainAgent(BaseAgent):
                         else:
                             _wc_session.current_url = _wc_url
                             if stream_callback:
-                                stream_callback({
+                                await _safe_sse(stream_callback, {
                                     "type": "v2_web_control",
                                     "data": {"action": "navigate", "session_id": _wc_session_id, "url": _wc_url}
                                 })

package/package.json

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

package/web/ui/chat/chat_main.js

@@ -2825,15 +2825,28 @@ function _renderMessagesInner() {
         let embedUrl = m.embed_url || '';
         const title = m.title || (isAudio ? '在线音乐' : '在线视频');
         const origUrl = m.original_url || embedUrl;
-        if (!embedUrl) continue;
+        if (!embedUrl && !origUrl) continue;
+        // [v1.20.10] 如果 embed_url 为空，渲染链接卡片而非 iframe
+        if (!embedUrl) {
+          const icon = isAudio ? '🎵' : '🎬';
+          parts.push('<div class="msg-media-embed msg-media-link-card" style="padding:10px 14px;border-radius:8px;background:rgba(255,255,255,0.06);border:1px solid rgba(255,255,255,0.1);cursor:pointer" onclick="window.open(\'' + escapeHtml(origUrl) + '\',\'_blank\')">' +
+            '<div class="msg-media-header"><span class="msg-media-icon">' + icon + '</span><span class="msg-media-label">' + escapeHtml(title) + '</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(origUrl) + '</div>' +
+            '</div>');
+          continue;
+        }
         // 前端 URL → 嵌入 URL 转换（历史回放时 embed_url 可能是原始 URL）
-        if (embedUrl && !embedUrl.includes('/embed/') && !embedUrl.includes('/player')) {
+        if (embedUrl && !embedUrl.includes('/embed/') && !embedUrl.includes('/player') && !embedUrl.includes('/outchain/')) {
           const ytMatch = embedUrl.match(/(?:youtube\.com\/watch\?v=|youtu\.be\/)([\w-]+)/);
           if (ytMatch) { embedUrl = 'https://www.youtube.com/embed/' + ytMatch[1]; }
           const biliMatch = embedUrl.match(/bilibili\.com\/video\/(BV[\w]+)/);
           if (biliMatch) { embedUrl = 'https://player.bilibili.com/player.html?bvid=' + biliMatch[1] + '&autoplay=0'; }
           const neteaseMatch = embedUrl.match(/music\.163\.com.*[?&]id=(\d+)/);
           if (neteaseMatch) { embedUrl = 'https://music.163.com/outchain/player?type=2&id=' + neteaseMatch[1] + '&auto=0&height=66'; }
+          // [v1.20.10] YouTube Music 播放列表 → embed
+          const ymMatch = embedUrl.match(/music\.youtube\.com.*list=([\w-]+)/);
+          if (ymMatch) { embedUrl = 'https://music.youtube.com/embed?list=' + ymMatch[1] + '&layout=full'; }
         }
         if (isAudio) {
           parts.push('<div class="msg-media-embed msg-media-audio">' +