myagent-ai 1.20.2 → 1.20.4

package/agents/main_agent.py

@@ -74,6 +74,8 @@ class MainAgent(BaseAgent):
 - **执行命令**: 用 `command` 或 `command_run` 工具
 - **文件操作**: 用 `file_read` / `file_write` / `file_list` 等文件工具
 - **发送文件给用户**: 用 `file_send` 工具（参数: file_path=文件路径, description=说明），当你生成或处理了文件需要返回给用户时使用
+- **播放音频**: 用 `playaudio` 工具（参数: url=音乐链接或file_path=本地文件路径），在聊天中内嵌播放音频（支持QQ音乐、YouTube音乐、本地MP3/WAV等），播放时自动关闭语音合成
+- **播放视频**: 用 `playvideo` 工具（参数: url=视频链接或file_path=本地文件路径），在聊天中内嵌播放视频（支持抖音、YouTube、B站、本地MP4等），播放时自动关闭语音合成
 - **主动召回记忆**: 用 `recall_memory` 工具（参数: keyword=关键字, time_point=可选时间点如"2025-01", limit=数量默认5），根据关键字和时间搜索历史记忆
 4. 准备好内容后，最后，再检查输出格式，确保满足以下要求:
 <output>
@@ -1648,6 +1650,103 @@ class MainAgent(BaseAgent):
                     result = {"success": False, "error": f"文件发送失败: {_fse}"}
                     logger.warning(f"[{task_id}] file_send 工具异常: {_fse}")
 
+            elif tool_name in ("playaudio", "playvideo"):
+                # [v1.20.3] 音视频播放工具 — 在聊天中内嵌播放器
+                try:
+                    _media_url = params.get("url", "").strip()
+                    _media_file = params.get("file_path", "").strip()
+                    _media_type = "audio" if tool_name == "playaudio" else "video"
+                    _embed_url = None
+                    _embed_title = params.get("title", "")
+
+                    if _media_url:
+                        # 在线链接 — 提取嵌入式播放 URL
+                        import re
+                        _url_lower = _media_url.lower()
+                        # YouTube: https://www.youtube.com/watch?v=xxx 或 youtu.be/xxx
+                        _yt_match = re.search(r'(?:youtube\.com/watch\?v=|youtu\.be/|youtube\.com/embed/)([\w-]+)', _media_url)
+                        if _yt_match:
+                            _embed_url = f"https://www.youtube.com/embed/{_yt_match.group(1)}"
+                            _embed_title = _embed_title or "YouTube 视频"
+                        # 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)
+                            if _bv_match:
+                                _embed_url = f"https://player.bilibili.com/player.html?bvid={_bv_match.group(1)}&autoplay=0"
+                                _embed_title = _embed_title or "B站视频"
+                            else:
+                                _embed_url = _media_url  # b23.tv 短链接直接使用
+                                _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音乐"
+                        # 网易云音乐: 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)
+                            if _song_match:
+                                _embed_url = f"https://music.163.com/outchain/player?type=2&id={_song_match.group(1)}&auto=0&height=66"
+                                _embed_title = _embed_title or "网易云音乐"
+                            else:
+                                _embed_url = _media_url
+                                _embed_title = _embed_title or "网易云音乐"
+                        # 抖音: https://www.douyin.com/video/xxx
+                        elif 'douyin.com' in _url_lower:
+                            _embed_url = _media_url
+                            _embed_title = _embed_title or "抖音视频"
+                        else:
+                            # 其他 URL，尝试直接嵌入
+                            _embed_url = _media_url
+                            _embed_title = _embed_title or ("在线音乐" if _media_type == "audio" else "在线视频")
+
+                    if _embed_url and stream_callback:
+                        # 在线播放 — 发送 v2_media 事件让前端渲染嵌入播放器
+                        stream_callback({
+                            "type": "v2_media",
+                            "data": {
+                                "media_type": _media_type,
+                                "embed_url": _embed_url,
+                                "title": _embed_title,
+                                "original_url": _media_url,
+                            }
+                        })
+                        result = {"success": True, "output": f"已嵌入{_embed_title}播放器: {_media_url}"}
+
+                    elif _media_file:
+                        # 本地文件 — 使用 file_send 发送文件，前端渲染内嵌播放器
+                        from pathlib import Path as _P
+                        _fpath = _P(_media_file).expanduser().resolve()
+                        if not _fpath.exists():
+                            result = {"success": False, "error": f"文件不存在: {_media_file}"}
+                        else:
+                            from skills.file_send import FileSendSkill
+                            _fskill = FileSendSkill()
+                            _desc = f"{'音频' if _media_type == 'audio' else '视频'}播放: {_fpath.name}"
+                            _fresult = await _fskill.execute(str(_fpath), _desc, stream_callback=stream_callback)
+                            if _fresult.get("success"):
+                                # 标记为媒体文件，前端渲染内嵌播放器
+                                _fresult["_media_type"] = _media_type
+                                result = {"success": True, "output": f"已发送{_media_type}文件: {_fpath.name}", "data": _fresult}
+                                try:
+                                    if _fresult.get("file_id"):
+                                        _sent_files.append({
+                                            "id": _fresult["file_id"],
+                                            "name": _fresult.get("name", ""),
+                                            "type": _fresult.get("type", ""),
+                                            "size": _fresult.get("size", 0),
+                                            "_media_type": _media_type,
+                                        })
+                                except NameError:
+                                    pass
+                            else:
+                                result = {"success": False, "error": _fresult.get("error", "文件发送失败")}
+                    else:
+                        result = {"success": False, "error": f"请提供 url（在线链接）或 file_path（本地文件路径）参数"}
+
+                except Exception as _me:
+                    result = {"success": False, "error": f"播放工具异常: {_me}"}
+                    logger.warning(f"[{task_id}] {tool_name} 工具异常: {_me}")
+
             elif self.skills:
                 exec_result = await self.skills.execute(tool_name, **params)
                 if exec_result is None:

package/chatbot/manager.py

@@ -37,6 +37,10 @@ class ChatBotManager:
         self._bots: Dict[str, BaseChatBot] = {}
         self._session_map: Dict[str, str] = {}  # session_id -> last_message
 
+    def get_bot(self, key: str):
+        """根据 key (id 或 platform 名) 获取 bot 实例"""
+        return self._bots.get(key)
+
     def setup_platforms(
         self,
         platform_configs: List[ChatPlatformConfig],
@@ -111,6 +115,8 @@ class ChatBotManager:
         elif platform == "wechat":
             from chatbot.wechat_bot import WeChatBot
             return WeChatBot(
+                app_id=config.app_id,
+                app_secret=config.app_secret,
                 token=config.token,
                 allowed_users=config.allowed_users,
                 message_handler=message_handler,

package/chatbot/whatsapp_bot.py

@@ -2,7 +2,7 @@
 chatbot/whatsapp_bot.py - WhatsApp 机器人
 ===========================================
 使用 whatsapp-web.js 或 Baileys 库接入 WhatsApp。
-支持二维码绑定。
+支持二维码绑定（通过 Node.js Baileys bridge）。
 纯 Python 实现，异步运行。
 """
 from __future__ import annotations
@@ -10,6 +10,9 @@ from __future__ import annotations
 import asyncio
 import json
 import time
+import os
+import subprocess
+from pathlib import Path
 from typing import Optional, List
 
 from chatbot.base import BaseChatBot, ChatMessage, ChatResponse
@@ -25,17 +28,19 @@ class WhatsAppBot(BaseChatBot):
     """
     WhatsApp 机器人适配器。
 
-    配置要求:
+    配置要求 (Cloud API 模式):
       - token: Access Token (从 Meta Developer Portal 获取)
-      - app_id: App ID
-      - app_secret: App Secret
-      - webhook_url: Webhook URL (可选，用于接收消息)
       - phone_number_id: Phone Number ID (从 Meta 获取)
       - verify_token: Webhook 验证 Token (自动生成)
 
+    配置要求 (QR 码绑定模式):
+      - 无需 token / phone_number_id
+      - 需要 Node.js 环境 + Baileys 依赖
+      - 首次运行会生成 QR 码，扫码后自动保存会话
+
     支持两种模式:
       1. Cloud API 模式: 使用 Meta WhatsApp Business API
-      2. 二维码绑定模式: 通过 QR Code 绑定（需要 Baileys 库）
+      2. Baileys 模式: 通过 QR Code 绑定 (推荐个人使用)
     """
 
     platform_name = "whatsapp"
@@ -47,35 +52,161 @@ class WhatsAppBot(BaseChatBot):
         self._phone_number_id = self.config.get("phone_number_id", "")
         self._verify_token = self.config.get("verify_token", "")
         self._webhook_base = self.config.get("webhook_base", "")
-        self._qrcode_callback = self.config.get("qrcode_callback", None)
         self._qr_code = ""
         self._connected = False
+        self._bridge_process: Optional[subprocess.Popen] = None
+        self._bridge_mode = not self._phone_number_id  # 没有 phone_number_id 则使用 bridge
+        self._session_dir = str(Path(__file__).parent / "whatsapp_bridge" / "session")
 
     async def start(self):
         """启动 WhatsApp 机器人"""
+        if self._bridge_mode:
+            await self._start_bridge_mode()
+        else:
+            await self._start_cloud_mode()
+
+    async def _start_cloud_mode(self):
+        """Meta Cloud API 模式"""
         if not self.token:
             self.logger.error("WhatsApp Access Token 未配置")
             return
+        if not self._phone_number_id:
+            self.logger.error("Cloud API 模式需要配置 phone_number_id")
+            return
 
-        # Meta Cloud API 模式
-        if self._phone_number_id:
-            self.logger.info("WhatsApp Cloud API 模式启动")
-            self._connected = True
-            # Cloud API 模式通过 Webhook 接收消息，不需要主动轮询
-            # 保持运行
-            while self._running:
-                await asyncio.sleep(1)
-        else:
-            self.logger.warning(
-                "WhatsApp 需要配置 phone_number_id 才能使用 Cloud API 模式。"
-                "请访问 Meta Developer Portal 获取 WhatsApp Business API 凭据。"
+        self.logger.info("WhatsApp Cloud API 模式启动")
+        self._connected = True
+        while self._running:
+            await asyncio.sleep(1)
+
+    async def _start_bridge_mode(self):
+        """Baileys Bridge 模式 (QR 码绑定)"""
+        bridge_dir = Path(__file__).parent / "whatsapp_bridge"
+        bridge_script = bridge_dir / "bridge.mjs"
+
+        if not bridge_script.exists():
+            self.logger.error(f"Bridge 脚本不存在: {bridge_script}")
+            self.logger.error("请运行: cd chatbot/whatsapp_bridge && npm install @whiskeysockets/baileys qrcode-terminal")
+            return
+
+        # 检查是否已安装依赖
+        node_modules = bridge_dir / "node_modules"
+        if not node_modules.exists():
+            self.logger.info("正在安装 Baileys 依赖...")
+            try:
+                proc = await asyncio.create_subprocess_exec(
+                    "npm", "install", "--production",
+                    cwd=str(bridge_dir),
+                    stdout=asyncio.subprocess.PIPE,
+                    stderr=asyncio.subprocess.PIPE,
+                )
+                stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=120)
+                if proc.returncode != 0:
+                    self.logger.error(f"Baileys 安装失败: {stderr.decode()[:500]}")
+                    return
+                self.logger.info("Baileys 依赖安装完成")
+            except Exception as e:
+                self.logger.error(f"Baileys 安装异常: {e}")
+                return
+
+        env = os.environ.copy()
+        env["SESSION_DIR"] = self._session_dir
+
+        try:
+            self._bridge_process = await asyncio.create_subprocess_exec(
+                "node", str(bridge_script),
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+                env=env,
+                cwd=str(bridge_dir),
             )
-            self._connected = False
+            self.logger.info("WhatsApp Bridge 进程已启动")
+
+            # 启动消息读取循环
+            asyncio.create_task(self._read_bridge_output())
+        except Exception as e:
+            self.logger.error(f"Bridge 启动失败: {e}")
+
+        while self._running:
+            await asyncio.sleep(1)
+
+    async def _read_bridge_output(self):
+        """读取 Bridge 进程的 stdout (JSON 协议)"""
+        if not self._bridge_process or not self._bridge_process.stdout:
+            return
+
+        try:
+            reader = self._bridge_process.stdout
+            while self._running and self._bridge_process.returncode is None:
+                line = await reader.readline()
+                if not line:
+                    break
+                line = line.decode('utf-8', errors='replace').strip()
+                if not line:
+                    continue
+                try:
+                    msg = json.loads(line)
+                    msg_type = msg.get("type", "")
+
+                    if msg_type == "qr":
+                        self._qr_code = msg.get("qr", "")
+                        self.logger.info("QR 码已生成，等待扫码...")
+
+                    elif msg_type == "connected":
+                        self._connected = True
+                        phone = msg.get("phone", "")
+                        name = msg.get("name", "")
+                        self.logger.info(f"WhatsApp 已连接: {name} ({phone})")
+                        # 更新配置中的连接状态
+                        self.config["connection_status"] = "connected"
+                        self.config["connected_phone"] = phone
+
+                    elif msg_type == "disconnected":
+                        self._connected = False
+                        reason = msg.get("reason", "unknown")
+                        self.logger.warning(f"WhatsApp 已断开: {reason}")
+                        self.config["connection_status"] = "disconnected"
+
+                    elif msg_type == "message":
+                        from_id = msg.get("from", "")
+                        text = msg.get("text", "")
+                        push_name = msg.get("pushName", "")
+                        if from_id and text:
+                            chat_msg = ChatMessage(
+                                platform=self.platform_name,
+                                chat_id=from_id,
+                                user_id=from_id,
+                                username=push_name or from_id.split('@')[0],
+                                text=text,
+                                is_group='@g.us' in from_id,
+                                raw_data=msg,
+                            )
+                            await self._handle_message(chat_msg)
+
+                    elif msg_type == "error":
+                        error = msg.get("error", "")
+                        self.logger.error(f"Bridge 错误: {error}")
+
+                except json.JSONDecodeError:
+                    self.logger.debug(f"非 JSON 输出: {line[:100]}")
+        except Exception as e:
+            self.logger.error(f"Bridge 输出读取异常: {e}")
 
     async def stop(self):
         """停止 WhatsApp 机器人"""
         self._running = False
         self._connected = False
+
+        if self._bridge_process:
+            try:
+                self._bridge_process.terminate()
+                await asyncio.sleep(1)
+                if self._bridge_process.returncode is None:
+                    self._bridge_process.kill()
+            except Exception:
+                pass
+            self._bridge_process = None
+
         self.logger.info("WhatsApp 机器人已停止")
 
     async def send_message(self, response: ChatResponse) -> bool:
@@ -83,36 +214,56 @@ class WhatsAppBot(BaseChatBot):
         if not self._connected or not response.chat_id:
             return False
 
+        if self._bridge_mode:
+            return await self._send_via_bridge(response.chat_id, response.text)
+        else:
+            return await self._send_via_cloud_api(response.chat_id, response.text)
+
+    async def _send_via_bridge(self, chat_id: str, text: str) -> bool:
+        """通过 Bridge 发送消息"""
+        if not self._bridge_process or not self._bridge_process.stdin:
+            return False
         try:
-            if not HAS_AIOHTTP:
-                self.logger.error("请安装 aiohttp: pip install aiohttp")
-                return False
-
-            url = f"https://graph.facebook.com/v18.0/{self._phone_number_id}/messages"
-            headers = {
-                "Authorization": f"Bearer {self.token}",
-                "Content-Type": "application/json",
-            }
-            payload = {
-                "messaging_product": "whatsapp",
-                "to": response.chat_id,
-                "type": "text",
-                "text": {"body": response.text[:4096]},
-            }
+            msg = json.dumps({"action": "send", "to": chat_id, "text": text}) + "\n"
+            self._bridge_process.stdin.write(msg.encode('utf-8'))
+            await self._bridge_process.stdin.drain()
+            return True
+        except Exception as e:
+            self.logger.error(f"Bridge 发送失败: {e}")
+            return False
+
+    async def _send_via_cloud_api(self, chat_id: str, text: str) -> bool:
+        """通过 Cloud API 发送消息"""
+        if not HAS_AIOHTTP:
+            self.logger.error("请安装 aiohttp: pip install aiohttp")
+            return False
+
+        url = f"https://graph.facebook.com/v18.0/{self._phone_number_id}/messages"
+        headers = {
+            "Authorization": f"Bearer {self.token}",
+            "Content-Type": "application/json",
+        }
+        payload = {
+            "messaging_product": "whatsapp",
+            "to": chat_id,
+            "type": "text",
+            "text": {"body": text[:4096]},
+        }
 
+        try:
             async with aiohttp.ClientSession() as session:
                 async with session.post(url, headers=headers, json=payload) as resp:
                     if resp.status == 200:
                         return True
                     error_text = await resp.text()
-                    self.logger.error(f"WhatsApp 发送失败 ({resp.status}): {error_text}")
+                    self.logger.error(f"WhatsApp 发送失败 ({resp.status}): {error_text[:200]}")
                     return False
         except Exception as e:
-            self.logger.error(f"发送消息失败: {e}")
+            self.logger.error(f"Cloud API 发送失败: {e}")
             return False
 
     # ==========================================================================
-    # Webhook 处理
+    # Webhook 处理 (Cloud API 模式)
     # ==========================================================================
 
     def verify_webhook(self, mode: str, token: str, challenge: str) -> Optional[str]:
@@ -122,7 +273,7 @@ class WhatsAppBot(BaseChatBot):
         return None
 
     async def handle_webhook_event(self, event_data: dict):
-        """处理 Webhook 事件"""
+        """处理 Webhook 事件 (Cloud API 模式)"""
         try:
             for entry in event_data.get("entry", []):
                 for change in entry.get("changes", []):
@@ -130,7 +281,6 @@ class WhatsAppBot(BaseChatBot):
                     messages = value.get("messages", [])
                     contacts = value.get("contacts", [])
 
-                    # 构建联系人映射
                     contact_map = {}
                     for c in contacts:
                         wa_id = c.get("wa_id", "")
@@ -146,7 +296,6 @@ class WhatsAppBot(BaseChatBot):
                         text_body = msg.get("text", {}).get("body", "")
                         msg_id = msg.get("id", "")
                         timestamp = msg.get("timestamp", "")
-
                         username = contact_map.get(from_id, from_id)
 
                         message = ChatMessage(
@@ -164,16 +313,31 @@ class WhatsAppBot(BaseChatBot):
             self.logger.error(f"处理 Webhook 事件失败: {e}")
 
     # ==========================================================================
-    # 二维码绑定
+    # QR 码绑定
     # ==========================================================================
 
     def get_qr_code(self) -> str:
-        """获取当前 QR Code（用于绑定模式）"""
+        """获取当前 QR Code（base64 PNG 图片）"""
         return self._qr_code
 
     async def generate_qr_code(self) -> str:
-        """生成绑定二维码"""
-        # Cloud API 模式不需要 QR Code
-        # 如需 Baileys 模式，需额外安装 node.js 依赖
-        self.logger.info("WhatsApp Cloud API 模式不需要 QR Code 绑定，使用 Webhook 接收消息")
+        """请求生成 QR 码。Bridge 模式下，首次启动会自动生成。"""
+        if self._bridge_mode:
+            # 如果 bridge 已在运行且有 QR 码，直接返回
+            if self._qr_code:
+                return self._qr_code
+            # 如果 bridge 未运行，尝试启动
+            if not self._bridge_process or self._bridge_process.returncode is not None:
+                asyncio.create_task(self._start_bridge_mode())
+                # 等待 QR 码生成（最多 30 秒）
+                for _ in range(60):
+                    await asyncio.sleep(0.5)
+                    if self._qr_code:
+                        return self._qr_code
+                    if self._connected:
+                        return ""  # 已连接，不需要 QR
+            return self._qr_code
+
+        # Cloud API 模式不需要 QR
+        self.logger.info("Cloud API 模式不需要 QR Code")
         return ""

package/chatbot/whatsapp_bridge/bridge.mjs

@@ -0,0 +1,192 @@
+/**
+ * WhatsApp Baileys Bridge
+ * ======================
+ * Provides QR code generation for WhatsApp Web binding.
+ * Communicates with Python via stdin/stdout JSON messages.
+ *
+ * Protocol:
+ *   Python → Node: {"action": "start"} or {"action": "send", "to": "xxx", "text": "yyy"}
+ *   Node → Python: {"type": "qr", "qr": "base64..."} | {"type": "connected", "phone": "xxx"} | {"type": "message", "from": "xxx", "text": "yyy"} | {"type": "error", "error": "..."}
+ */
+
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+let makeWASocket, useMultiFileAuthState, fetchLatestBaileysVersion, DisconnectReason;
+let qrCodeToString;
+
+// Try to load Baileys
+try {
+  const baileys = require('@whiskeysockets/baileys');
+  makeWASocket = baileks.default.makeWASocket;
+  useMultiFileAuthState = baileks.default.useMultiFileAuthState;
+  fetchLatestBaileysVersion = baileks.default.fetchLatestBaileysVersion;
+  DisconnectReason = baileks.default.DisconnectReason;
+  qrCodeToString = require('qrcode-terminal').default;
+} catch (e) {
+  // Try alternative import
+  try {
+    const baileys = require('@adiwajshing/baileys');
+    makeWASocket = baileys.makeWASocket;
+    useMultiFileAuthState = baileys.useMultiFileAuthState;
+    fetchLatestBaileysVersion = baileys.fetchLatestBaileysVersion;
+    DisconnectReason = baileys.DisconnectReason;
+  } catch (e2) {
+    console.error(JSON.stringify({type: 'error', error: 'Baileys not installed. Run: cd chatbot/whatsapp_bridge && npm install @whiskeysockets/baileys qrcode-terminal'}));
+    process.exit(1);
+  }
+}
+
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const SESSION_DIR = process.env.SESSION_DIR || join(__dirname, 'session');
+
+let sock = null;
+let isConnected = false;
+let currentQR = '';
+
+function send(msg) {
+  try {
+    process.stdout.write(JSON.stringify(msg) + '\n');
+  } catch (e) {
+    // ignore
+  }
+}
+
+async function startWhatsApp() {
+  if (!existsSync(SESSION_DIR)) {
+    mkdirSync(SESSION_DIR, { recursive: true });
+  }
+
+  const { state, saveCreds } = await useMultiFileAuthState(SESSION_DIR);
+
+  const { version } = await fetchLatestBaileysVersion();
+
+  sock = makeWASocket({
+    version,
+    auth: {
+      creds: state,
+      keys: state,
+    },
+    printQRInTerminal: false,
+    logger: { level: 'silent' },
+    shouldIgnoreJid: () => false,
+  });
+
+  sock.ev.on('creds.update', saveCreds);
+
+  sock.ev.on('connection.update', (update) => {
+    const { connection, lastDisconnect, qr } = update;
+
+    if (qr) {
+      // Convert QR to base64 image
+      currentQR = qr.toString('base64');
+      send({ type: 'qr', qr: currentQR });
+      // Also log to stderr (not stdout, which is for JSON protocol)
+      process.stderr.write('[WhatsApp] QR Code generated, waiting for scan...\n');
+    }
+
+    if (connection === 'open') {
+      isConnected = true;
+      const me = sock.user;
+      send({ type: 'connected', phone: me?.id?.replace(/:.*@/, '') || '', name: me?.name || '' });
+      process.stderr.write(`[WhatsApp] Connected as ${me?.name || me?.id}\n`);
+    }
+
+    if (connection === 'close') {
+      isConnected = false;
+      const statusCode = lastDisconnect?.error?.output?.statusCode;
+      if (statusCode === DisconnectReason.loggedOut) {
+        send({ type: 'disconnected', reason: 'logged_out' });
+        process.stderr.write('[WhatsApp] Logged out, need to re-scan QR\n');
+      } else if (statusCode === DisconnectReason.connectionClosed) {
+        send({ type: 'disconnected', reason: 'connection_closed' });
+        process.stderr.write('[WhatsApp] Connection closed\n');
+      } else {
+        send({ type: 'disconnected', reason: 'unknown', code: statusCode });
+        process.stderr.write(`[WhatsApp] Disconnected: ${statusCode}\n`);
+      }
+      // Auto-reconnect after 5 seconds (except logged out)
+      if (statusCode !== DisconnectReason.loggedOut) {
+        setTimeout(() => startWhatsApp(), 5000);
+      }
+    }
+  });
+
+  sock.ev.on('messages.upsert', async ({ messages }) => {
+    for (const msg of messages) {
+      if (msg.key.fromMe) continue;
+      if (msg.message?.conversation) {
+        send({
+          type: 'message',
+          from: msg.key.remoteJid,
+          fromMe: msg.key.fromMe,
+          text: msg.message.conversation,
+          id: msg.key.id,
+          pushName: msg.pushName || '',
+        });
+      } else if (msg.message?.extendedTextMessage) {
+        send({
+          type: 'message',
+          from: msg.key.remoteJid,
+          fromMe: msg.key.fromMe,
+          text: msg.message.extendedTextMessage.text,
+          id: msg.key.id,
+          pushName: msg.pushName || '',
+        });
+      }
+    }
+  });
+}
+
+async function sendMessage(to, text) {
+  if (!sock || !isConnected) {
+    return { success: false, error: 'Not connected' };
+  }
+  try {
+    const jid = to.includes('@') ? to : to + '@s.whatsapp.net';
+    await sock.sendMessage(jid, { text: text.substring(0, 4096) });
+    return { success: true };
+  } catch (e) {
+    return { success: false, error: e.message };
+  }
+}
+
+// Handle stdin messages from Python
+process.stdin.setEncoding('utf8');
+let buffer = '';
+process.stdin.on('data', (chunk) => {
+  buffer += chunk;
+  const lines = buffer.split('\n');
+  buffer = lines.pop(); // keep incomplete line in buffer
+  for (const line of lines) {
+    if (!line.trim()) continue;
+    try {
+      const msg = JSON.parse(line);
+      if (msg.action === 'start') {
+        startWhatsApp().catch(e => {
+          send({ type: 'error', error: e.message });
+        });
+      } else if (msg.action === 'send') {
+        sendMessage(msg.to, msg.text).then(result => {
+          send({ type: 'send_result', ...result });
+        });
+      } else if (msg.action === 'status') {
+        send({ type: 'status', connected: isConnected, hasQR: !!currentQR });
+      } else if (msg.action === 'get_qr') {
+        if (currentQR) {
+          send({ type: 'qr', qr: currentQR });
+        } else {
+          send({ type: 'qr', qr: '' });
+        }
+      }
+    } catch (e) {
+      process.stderr.write(`[Bridge] Failed to parse message: ${e.message}\n`);
+    }
+  }
+});
+
+process.stderr.write('[WhatsApp Bridge] Ready, waiting for commands...\n');

package/chatbot/whatsapp_bridge/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "myagent-whatsapp-bridge",
+  "version": "1.0.0",
+  "private": true,
+  "description": "WhatsApp Baileys bridge for MyAgent QR code binding",
+  "main": "bridge.mjs",
+  "type": "module",
+  "scripts": {
+    "start": "node bridge.mjs"
+  }
+}

package/package.json

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

package/web/api_server.py

@@ -332,6 +332,8 @@ class ApiServer:
         r.add_post("/api/platforms/{name}/toggle", self.handle_toggle_platform)
         r.add_post("/api/platforms/{name}/restart", self.handle_restart_platform)
         r.add_get("/api/platforms/{name}/agents", self.handle_platform_agents)
+        r.add_get("/api/platforms/{name}/qr", self.handle_get_platform_qr)
+        r.add_post("/api/platforms/{name}/qr", self.handle_start_platform_qr)
         # ── 模型库 CRUD ──
         r.add_get("/api/models", self.handle_list_models)
         r.add_post("/api/models", self.handle_add_model)
@@ -3126,6 +3128,87 @@ window.toggleFullscreen = function() {{
         # TODO: 实现平台 Bot 热重启
         return web.json_response({"ok": True, "message": f"平台 {display} 重启请求已发送（重启需服务端支持）"})
 
+    # [v1.20.3] QR 码绑定相关
+    async def handle_get_platform_qr(self, request):
+        """GET /api/platforms/{name}/qr - 获取平台当前 QR 码和连接状态"""
+        name = request.match_info["name"]
+        cp = self.core.config_mgr.get_chat_platform_by_id(name)
+        if not cp:
+            cp = self.core.config_mgr.get_chat_platform(name)
+        if not cp:
+            return web.json_response({"error": "平台不存在"}, status=404)
+
+        qr_code = ""
+        connected = False
+        status = "unknown"
+
+        # 从 bot 实例获取 QR 码
+        bot = self.core.chatbot_manager.get_bot(cp.id or cp.platform)
+        if bot and hasattr(bot, 'get_qr_code'):
+            qr_code = bot.get_qr_code() or ""
+        if bot and hasattr(bot, '_connected'):
+            connected = bot._connected
+
+        # 从 extra 读取持久化的连接状态
+        conn_status = cp.extra.get("connection_status", "")
+        if connected:
+            status = "connected"
+        elif qr_code:
+            status = "waiting_scan"
+        elif conn_status:
+            status = conn_status
+        else:
+            status = "not_started"
+
+        return web.json_response({
+            "platform": cp.platform,
+            "id": cp.id,
+            "status": status,
+            "connected": connected,
+            "qr_code": qr_code,
+        })
+
+    async def handle_start_platform_qr(self, request):
+        """POST /api/platforms/{name}/qr - 请求生成 QR 码（开始绑定流程）"""
+        name = request.match_info["name"]
+        cp = self.core.config_mgr.get_chat_platform_by_id(name)
+        if not cp:
+            cp = self.core.config_mgr.get_chat_platform(name)
+        if not cp:
+            return web.json_response({"error": "平台不存在"}, status=404)
+
+        if cp.platform not in ("whatsapp", "wechat"):
+            return web.json_response({"error": f"{cp.platform} 不支持 QR 码绑定"}, status=400)
+
+        bot = self.core.chatbot_manager.get_bot(cp.id or cp.platform)
+        if not bot:
+            return web.json_response({"error": "Bot 实例未创建"}, status=400)
+
+        if not hasattr(bot, 'generate_qr_code'):
+            return web.json_response({"error": "该 Bot 不支持 QR 码绑定"}, status=400)
+
+        try:
+            qr_code = await bot.generate_qr_code()
+            if qr_code:
+                # 保存 QR 码到 extra
+                cp.extra["connection_status"] = "waiting_scan"
+                self.core.config_mgr.save()
+                return web.json_response({
+                    "ok": True,
+                    "qr_code": qr_code,
+                    "status": "waiting_scan",
+                    "message": "QR 码已生成，请使用手机扫码",
+                })
+            else:
+                return web.json_response({
+                    "ok": False,
+                    "status": "failed",
+                    "error": "QR 码生成失败，请检查配置",
+                })
+        except Exception as e:
+            logger.error(f"QR 码生成异常 ({name}): {e}")
+            return web.json_response({"error": f"QR 码生成异常: {e}"}, status=500)
+
     async def handle_platform_agents(self, request):
         """获取绑定到指定平台的所有 Agent"""
         name = request.match_info["name"]

package/web/ui/chat/chat.css

@@ -646,6 +646,40 @@ input,textarea,select{font:inherit}
 .msg-attachments-files {
   margin-top:6px; /* 文件在气泡内容下方 */
 }
+/* [v1.20.3] 媒体嵌入播放器（在线音视频） */
+.msg-attachments-media {
+  margin-bottom:10px;
+}
+.msg-media-embed {
+  background:var(--bg2);border:1px solid var(--bg4);border-radius:var(--radius-sm);
+  overflow:hidden;max-width:640px;
+}
+.msg-media-header {
+  display:flex;align-items:center;gap:6px;padding:6px 10px;
+  background:var(--bg3);font-size:12px;color:var(--text2);
+}
+.msg-media-icon {font-size:14px}
+.msg-media-label {flex:1;font-weight:500}
+.msg-media-link {
+  color:var(--accent);text-decoration:none;font-size:14px;padding:2px 4px;border-radius:4px;
+}
+.msg-media-link:hover {background:var(--accent-light)}
+/* [v1.20.3] 本地音视频播放器 */
+.msg-media-player {
+  margin-bottom:8px;
+}
+.msg-media-player audio,
+.msg-media-player video {
+  border-radius:8px;
+  box-shadow:0 1px 4px rgba(0,0,0,.1);
+}
+.msg-media-title {
+  font-size:12px;color:var(--text2);margin-top:4px;padding:0 4px;
+}
+@media(max-width:768px){
+  .msg-media-embed iframe { max-width:100%!important; }
+  .msg-media-player audio, .msg-media-player video { max-width:100%!important; }
+}
 .msg-image-wrapper {
   max-width:300px;border-radius:var(--radius-sm);overflow:hidden;
   border:1px solid var(--bg4);cursor:pointer;

package/web/ui/chat/chat_main.js

@@ -2571,6 +2571,22 @@ function groupHistoryMessages(messages) {
     if (execParts.length > 0) entry.exec_events = execParts.map(function(p) { return p.data; });
     // [v1.19.3] 设置收集到的所有 agent 文件
     if (allAgentFiles.length > 0) entry._files = allAgentFiles;
+    // [v1.20.3] 从 playaudio/playvideo 工具调用中重建 _media 数据（历史回放支持）
+    var mediaEmbeds = [];
+    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')) {
+        try {
+          var mparams = typeof ep.data.params === 'string' ? JSON.parse(ep.data.params) : (ep.data.params || {});
+          var murl = mparams.url || '';
+          if (murl) {
+            var mtype = ep.data.tool_name === 'playaudio' ? 'audio' : 'video';
+            mediaEmbeds.push({ media_type: mtype, embed_url: murl, title: mparams.title || '', original_url: murl });
+          }
+        } catch(mpe) { /* ignore parse errors */ }
+      }
+    }
+    if (mediaEmbeds.length > 0) entry._media = mediaEmbeds;
 
     grouped.push(entry);
   }
@@ -2691,13 +2707,59 @@ function _renderMessagesInner() {
       if (!isUser && agentFiles.length > 0) {
         for (const f of agentFiles) {
           const isImage = f.type && f.type.startsWith('image/');
+          const isAudio = f.type && f.type.startsWith('audio/');
+          const isVideo = f.type && f.type.startsWith('video/');
           if (isImage && f.id) {
             parts.push('<div class="msg-image-wrapper agent-image"><img src="/api/file/' + f.id + '" 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(\'' + f.id + '\', this.src, \'' + escapeHtml(f.name) + '\')" /></div>');
           }
+          // [v1.20.3] 音频文件渲染为内嵌播放器
+          if (isAudio && f.id) {
+            parts.push('<div class="msg-media-player"><audio controls src="/api/file/' + f.id + '" 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></div>');
+          }
+          // [v1.20.3] 视频文件渲染为内嵌播放器
+          if (isVideo && f.id) {
+            parts.push('<div class="msg-media-player"><video controls src="/api/file/' + f.id + '" 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></div>');
+          }
         }
       }
       return parts.length > 0 ? '<div class="msg-attachments msg-attachments-images">' + parts.join('') + '</div>' : '';
     })();
+    // [v1.20.3] 在线媒体嵌入播放器（YouTube/B站/抖音/QQ音乐/网易云等）
+    const mediaEmbedHtml = (() => {
+      const mediaList = (msg._media || []);
+      if (!mediaList || mediaList.length === 0) return '';
+      let parts = [];
+      for (const m of mediaList) {
+        const isAudio = m.media_type === 'audio';
+        let embedUrl = m.embed_url || '';
+        const title = m.title || (isAudio ? '在线音乐' : '在线视频');
+        const origUrl = m.original_url || embedUrl;
+        if (!embedUrl) continue;
+        // 前端 URL → 嵌入 URL 转换（历史回放时 embed_url 可能是原始 URL）
+        if (embedUrl && !embedUrl.includes('/embed/') && !embedUrl.includes('/player')) {
+          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'; }
+        }
+        if (isAudio) {
+          parts.push('<div class="msg-media-embed msg-media-audio">' +
+            '<div class="msg-media-header"><span class="msg-media-icon">🎵</span><span class="msg-media-label">' + escapeHtml(title) + '</span>' +
+            '<a class="msg-media-link" href="' + escapeHtml(origUrl) + '" target="_blank" rel="noopener" title="在新窗口打开">↗</a></div>' +
+            '<iframe src="' + escapeHtml(embedUrl) + '" 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>' +
+            '</div>');
+        } else {
+          parts.push('<div class="msg-media-embed msg-media-video">' +
+            '<div class="msg-media-header"><span class="msg-media-icon">🎬</span><span class="msg-media-label">' + escapeHtml(title) + '</span>' +
+            '<a class="msg-media-link" href="' + escapeHtml(origUrl) + '" target="_blank" rel="noopener" title="在新窗口打开">↗</a></div>' +
+            '<iframe src="' + escapeHtml(embedUrl) + '" style="width:100%;max-width:640px;height:360px;border:none;border-radius:8px" loading="lazy" allow="autoplay;encrypted-media;picture-in-picture" allowfullscreen></iframe>' +
+            '</div>');
+        }
+      }
+      return parts.length > 0 ? '<div class="msg-attachments msg-attachments-media">' + parts.join('') + '</div>' : '';
+    })();
     const fileAttachmentHtml = (() => {
       let parts = [];
       // User files（用户发送的非图片文件）
@@ -2717,12 +2779,14 @@ function _renderMessagesInner() {
             '</div>');
         }
       }
-      // Agent files (v2_file events) — 支持实时流式 _files 和历史加载的 files（只渲染非图片文件）
+      // Agent files (v2_file events) — 支持实时流式 _files 和历史加载的 files（只渲染非图片/音频/视频文件）
       const agentFiles = (msg._files || []);
       if (!isUser && agentFiles.length > 0) {
         for (const f of agentFiles) {
           const isImage = f.type && f.type.startsWith('image/');
-          if (isImage) continue; // 图片已在 imageAttachmentHtml 中渲染
+          const isAudio = f.type && f.type.startsWith('audio/');
+          const isVideo = f.type && f.type.startsWith('video/');
+          if (isImage || isAudio || isVideo) continue; // 图片/音视频已在上方渲染为内嵌播放器
           const fileId = f.id;
           const sizeStr = f.size ? formatFileSize(f.size) : '';
           const icon = _getFileIcon(f.name || f.type || '');
@@ -2845,6 +2909,7 @@ function _renderMessagesInner() {
           ${taskPlanHtml}
           ${finishReasonHtml}
           ${imageAttachmentHtml}
+          ${mediaEmbedHtml}
           ${bubbleHtml}
           ${fileAttachmentHtml}
           ${streamingIndicator}

package/web/ui/chat/flow_engine.js

@@ -1858,6 +1858,15 @@ async function sendMessage(opts) {
               state.messages[msgIdx]._files.push(evt.data);
               throttledStreamUpdate(msgIdx);
             }
+          } else if (evt.type === 'v2_media') {
+            // [v1.20.3] Agent is embedding a media player (audio/video)
+            if (evt.data) {
+              if (!state.messages[msgIdx]._media) state.messages[msgIdx]._media = [];
+              state.messages[msgIdx]._media.push(evt.data);
+              // 播放媒体时自动静音 TTS
+              if (typeof muteTTS === 'function') muteTTS();
+              throttledStreamUpdate(msgIdx);
+            }
           } else if (evt.type === 'v2_session_rename') {
             // [v1.15.8] 会话自动命名 — 后端通过 mainsubject 生成
             if (evt.data && evt.data.name) {

package/web/ui/index.html

@@ -1251,8 +1251,8 @@ async function renderPlatforms(){
     <div class="mt-8 flex gap-8">
       <button class="btn btn-sm ${p.enabled?'btn-danger':'btn-success'}" onclick="togglePlatform('${escHtml(pid)}',${!p.enabled})">${p.enabled?'停用':'启用'}</button>
       <button class="btn btn-sm btn-ghost" onclick="showEditPlatformModal('${escHtml(pid)}')">配置</button>
+      ${supportsQR?'<button class="btn btn-sm btn-primary" onclick="showPlatformQRModal(\''+escHtml(pid)+'\')">📱 QR绑定</button>':''}
     </div></div>`;
-  }
   html+='</div>';$('content').innerHTML=html;
 }
 async function togglePlatform(id,enable){await api(`/api/platforms/${id}`,{method:'PUT',body:JSON.stringify({enabled})});renderPlatforms()}
@@ -1336,6 +1336,52 @@ async function doDeletePlatform(id){
   });
 }
 
+// [v1.20.3] QR 码绑定模态框
+let _qrPollTimer=null;
+async function showPlatformQRModal(platformId){
+  if(_qrPollTimer){clearInterval(_qrPollTimer);_qrPollTimer=null}
+  $('modalContainer').innerHTML='<div class="modal-overlay" onclick="closeModal();if(_qrPollTimer){clearInterval(_qrPollTimer);_qrPollTimer=null}"><div class="modal" onclick="event.stopPropagation()" style="max-width:420px;text-align:center"><h3>📱 QR 码绑定</h3><p style="font-size:13px;color:var(--text2);margin:8px 0">使用手机扫描下方二维码以绑定账号</p><div id="qrStatus" style="margin:12px 0;padding:12px;border-radius:var(--radius-sm);background:var(--bg3);font-size:13px;color:var(--text2)">正在请求 QR 码...</div><div id="qrCodeContainer" style="display:flex;justify-content:center;padding:16px 0"><div id="qrCodeImg" style="width:256px;height:256px;border:1px solid var(--bg4);border-radius:8px;display:flex;align-items:center;justify-content:center;color:var(--text3);font-size:13px">加载中...</div></div><div id="qrActions" style="display:none;margin-top:12px"><button class="btn btn-sm btn-ghost" onclick="requestNewQR(\''+escHtml(platformId)+'\')">🔄 刷新 QR 码</button></div><div class="flex gap-8 mt-16"><button class="btn btn-ghost" onclick="closeModal();if(_qrPollTimer){clearInterval(_qrPollTimer);_qrPollTimer=null}">关闭</button></div></div></div>';
+  var r=await api('/api/platforms/'+encodeURIComponent(platformId)+'/qr',{method:'POST'});
+  if(r.error){$('qrStatus').textContent='错误: '+escHtml(r.error);return}
+  if(r.qr_code){
+    $('qrCodeImg').innerHTML='<img src="data:image/png;base64,'+r.qr_code+'" style="width:256px;height:256px;border-radius:8px" alt="QR Code">';
+    $('qrStatus').innerHTML='<span style="color:var(--warn)">⏳ 等待扫码...</span>';
+    $('qrActions').style.display='block';
+  }else if(r.status==='connected'){
+    $('qrStatus').innerHTML='<span style="color:var(--success)">✅ 已连接</span>';
+    $('qrCodeImg').innerHTML='<div style="color:var(--success);font-size:24px;padding:40px">✅<br><span style="font-size:14px">已成功连接</span></div>';
+  }else{$('qrStatus').textContent=r.error||'QR 码生成失败，请检查平台配置';}
+  _qrPollTimer=setInterval(async()=>{
+    try{
+      var s=await api('/api/platforms/'+encodeURIComponent(platformId)+'/qr');
+      if(s.status==='connected'){
+        $('qrStatus').innerHTML='<span style="color:var(--success)">✅ 已连接</span>';
+        $('qrCodeImg').innerHTML='<div style="color:var(--success);font-size:24px;padding:40px">✅<br><span style="font-size:14px">已成功连接</span></div>';
+        $('qrActions').style.display='none';
+        clearInterval(_qrPollTimer);_qrPollTimer=null;
+        showToast('QR 绑定成功！','success');renderPlatforms();
+      }else if(s.status==='waiting_scan'&&s.qr_code){
+        $('qrCodeImg').innerHTML='<img src="data:image/png;base64,'+s.qr_code+'" style="width:256px;height:256px;border-radius:8px" alt="QR Code">';
+        $('qrStatus').innerHTML='<span style="color:var(--warn)">⏳ 等待扫码...</span>';
+        $('qrActions').style.display='block';
+      }else if(s.status==='disconnected'){
+        $('qrStatus').innerHTML='<span style="color:var(--danger)">❌ 已断开</span>';
+        $('qrActions').style.display='block';
+      }
+    }catch(e){}
+  },3000);
+}
+async function requestNewQR(platformId){
+  $('qrStatus').textContent='正在刷新 QR 码...';
+  $('qrCodeImg').innerHTML='加载中...';
+  var r=await api('/api/platforms/'+encodeURIComponent(platformId)+'/qr',{method:'POST'});
+  if(r.error){$('qrStatus').textContent='错误: '+escHtml(r.error);return}
+  if(r.qr_code){
+    $('qrCodeImg').innerHTML='<img src="data:image/png;base64,'+r.qr_code+'" style="width:256px;height:256px;border-radius:8px" alt="QR Code">';
+    $('qrStatus').innerHTML='<span style="color:var(--warn)">⏳ 等待扫码...</span>';
+  }
+}
+
 // Agent 选择器（从部门树选择 Agent）
 async function showAgentSelectorForPlatform(inputId,containerId){
   try{