myagent-ai 1.20.1 → 1.20.3

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

@@ -55,10 +55,12 @@ class ChatBotManager:
             try:
                 bot = self._create_bot(cfg, message_handler)
                 if bot:
-                    self._bots[cfg.platform] = bot
-                    logger.info(f"聊天平台已配置: {cfg.platform}")
+                    # 使用唯一 id 作为 key，支持多实例
+                    key = cfg.id or cfg.platform
+                    self._bots[key] = bot
+                    logger.info(f"聊天平台已配置: {cfg.display_name or key}")
             except Exception as e:
-                logger.error(f"平台 {cfg.platform} 初始化失败: {e}")
+                logger.error(f"平台 {cfg.display_name or cfg.platform} 初始化失败: {e}")
 
     def _create_bot(
         self,
@@ -115,6 +117,17 @@ class ChatBotManager:
                 **config.extra,
             )
 
+        elif platform == "whatsapp":
+            from chatbot.whatsapp_bot import WhatsAppBot
+            return WhatsAppBot(
+                token=config.token,
+                app_id=config.app_id,
+                app_secret=config.app_secret,
+                allowed_users=config.allowed_users,
+                message_handler=message_handler,
+                **config.extra,
+            )
+
         else:
             logger.warning(f"不支持的平台: {platform}")
             return None

package/chatbot/whatsapp_bot.py

@@ -0,0 +1,179 @@
+"""
+chatbot/whatsapp_bot.py - WhatsApp 机器人
+===========================================
+使用 whatsapp-web.js 或 Baileys 库接入 WhatsApp。
+支持二维码绑定。
+纯 Python 实现，异步运行。
+"""
+from __future__ import annotations
+
+import asyncio
+import json
+import time
+from typing import Optional, List
+
+from chatbot.base import BaseChatBot, ChatMessage, ChatResponse
+
+try:
+    import aiohttp
+    HAS_AIOHTTP = True
+except ImportError:
+    HAS_AIOHTTP = False
+
+
+class WhatsAppBot(BaseChatBot):
+    """
+    WhatsApp 机器人适配器。
+
+    配置要求:
+      - 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 (自动生成)
+
+    支持两种模式:
+      1. Cloud API 模式: 使用 Meta WhatsApp Business API
+      2. 二维码绑定模式: 通过 QR Code 绑定（需要 Baileys 库）
+    """
+
+    platform_name = "whatsapp"
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self._app_id = kwargs.get("app_id", "")
+        self._app_secret = kwargs.get("app_secret", "")
+        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
+
+    async def start(self):
+        """启动 WhatsApp 机器人"""
+        if not self.token:
+            self.logger.error("WhatsApp Access Token 未配置")
+            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._connected = False
+
+    async def stop(self):
+        """停止 WhatsApp 机器人"""
+        self._running = False
+        self._connected = False
+        self.logger.info("WhatsApp 机器人已停止")
+
+    async def send_message(self, response: ChatResponse) -> bool:
+        """发送消息到 WhatsApp"""
+        if not self._connected or not response.chat_id:
+            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]},
+            }
+
+            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}")
+                    return False
+        except Exception as e:
+            self.logger.error(f"发送消息失败: {e}")
+            return False
+
+    # ==========================================================================
+    # Webhook 处理
+    # ==========================================================================
+
+    def verify_webhook(self, mode: str, token: str, challenge: str) -> Optional[str]:
+        """验证 Webhook"""
+        if mode == "subscribe" and token == self._verify_token:
+            return challenge
+        return None
+
+    async def handle_webhook_event(self, event_data: dict):
+        """处理 Webhook 事件"""
+        try:
+            for entry in event_data.get("entry", []):
+                for change in entry.get("changes", []):
+                    value = change.get("value", {})
+                    messages = value.get("messages", [])
+                    contacts = value.get("contacts", [])
+
+                    # 构建联系人映射
+                    contact_map = {}
+                    for c in contacts:
+                        wa_id = c.get("wa_id", "")
+                        name = c.get("profile", {}).get("name", "")
+                        contact_map[wa_id] = name
+
+                    for msg in messages:
+                        msg_type = msg.get("type", "")
+                        if msg_type != "text":
+                            continue
+
+                        from_id = msg.get("from", "")
+                        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(
+                            platform=self.platform_name,
+                            chat_id=from_id,
+                            user_id=from_id,
+                            username=username,
+                            text=text_body,
+                            is_group=False,
+                            reply_to=msg_id,
+                            raw_data={"timestamp": timestamp, "msg_id": msg_id},
+                        )
+                        await self._handle_message(message)
+        except Exception as e:
+            self.logger.error(f"处理 Webhook 事件失败: {e}")
+
+    # ==========================================================================
+    # 二维码绑定
+    # ==========================================================================
+
+    def get_qr_code(self) -> str:
+        """获取当前 QR Code（用于绑定模式）"""
+        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 接收消息")
+        return ""

package/config.py

@@ -105,15 +105,19 @@ class ModelEntry:
 
 @dataclass
 class ChatPlatformConfig:
-    """单个聊天平台配置"""
+    """单个聊天平台配置（支持多实例，每个实例有唯一 id）"""
+    id: str = ""                       # 唯一标识符，如 "telegram_8616478723" 或自动生成
     enabled: bool = False
-    platform: str = ""                 # telegram | discord | feishu | qq | wechat
+    platform: str = ""                 # telegram | discord | feishu | qq | wechat | whatsapp
     token: str = ""                    # Bot Token
     app_id: str = ""                   # App ID (某些平台需要)
     app_secret: str = ""               # App Secret
     webhook_url: str = ""              # Webhook URL
     allowed_users: List[str] = field(default_factory=list)  # 允许的用户白名单(空=全部)
     extra: Dict[str, Any] = field(default_factory=dict)     # 平台特有配置
+    bind_agent: str = ""               # 绑定的 Agent path（空=不绑定/使用默认）
+    bind_agents: List[str] = field(default_factory=list)    # 绑定的多个 Agent path（v1.20.2: 支持多 agent 绑定）
+    display_name: str = ""             # 显示名称，如 "Telegram:8616478723"
 
 
 @dataclass
@@ -263,6 +267,7 @@ class ConfigManager:
             "MYAGENT_FEISHU_APP_SECRET": "feishu",
             "MYAGENT_QQ_TOKEN": "qq",
             "MYAGENT_WECHAT_TOKEN": "wechat",
+            "MYAGENT_WHATSAPP_TOKEN": "whatsapp",
         }
         for env_key, platform_name in platform_env.items():
             token = os.environ.get(env_key)
@@ -277,10 +282,39 @@ class ConfigManager:
                 cp.enabled = True
                 return
         cp = ChatPlatformConfig(platform=platform, token=token, enabled=True)
+        self._auto_platform_id(cp)
         self._config.chat_platforms.append(cp)
 
+    def _auto_platform_id(self, cp: ChatPlatformConfig):
+        """为平台配置自动生成唯一 ID 和显示名称"""
+        import re
+        if not cp.id:
+            if cp.platform == 'telegram' and cp.token:
+                # 从 token 提取 bot_id: 8616478723:AAFKir8DQ4nzYUiddhifLCKUc5K2MfHcv9U
+                match = re.match(r'^(\d+):', cp.token)
+                bot_id = match.group(1) if match else str(len(self._config.chat_platforms))
+                cp.id = f"telegram_{bot_id}"
+                cp.display_name = f"Telegram:{bot_id}"
+            elif cp.platform == 'whatsapp' and cp.token:
+                match = re.match(r'^(\d+)', cp.token)
+                phone_id = match.group(1) if match else str(len(self._config.chat_platforms))
+                cp.id = f"whatsapp_{phone_id}"
+                cp.display_name = f"WhatsApp:{phone_id}"
+            elif cp.token:
+                cp.id = f"{cp.platform}_{cp.token[:8]}"
+                cp.display_name = f"{cp.platform.capitalize()}:{cp.token[:8]}"
+            else:
+                idx = sum(1 for p in self._config.chat_platforms if p.platform == cp.platform)
+                cp.id = f"{cp.platform}_{idx}"
+                cp.display_name = f"{cp.platform.capitalize()} {idx + 1}"
+        if not cp.display_name:
+            cp.display_name = cp.id or cp.platform
+
     def _apply_defaults(self):
         """应用平台相关的默认值"""
+        # [v1.20.2] 为旧配置自动填充平台 id 和 display_name
+        for cp in self._config.chat_platforms:
+            self._auto_platform_id(cp)
         if not self._config.memory.db_path:
             self._config.memory.db_path = str(self.data_dir / "memory.db")
         # data_dir 由 property 自动计算为 _data_dir / "data"，无需在此设置
@@ -341,12 +375,19 @@ class ConfigManager:
                 setattr(target, key, value)
 
     def get_chat_platform(self, platform: str) -> Optional[ChatPlatformConfig]:
-        """获取指定聊天平台配置"""
+        """获取指定聊天平台配置（兼容旧接口，返回第一个匹配的）"""
         for cp in self._config.chat_platforms:
             if cp.platform == platform:
                 return cp
         return None
 
+    def get_chat_platform_by_id(self, platform_id: str) -> Optional[ChatPlatformConfig]:
+        """通过唯一 ID 获取聊天平台配置"""
+        for cp in self._config.chat_platforms:
+            if cp.id == platform_id:
+                return cp
+        return None
+
     def get_enabled_platforms(self) -> List[ChatPlatformConfig]:
         """获取所有启用的聊天平台"""
         return [cp for cp in self._config.chat_platforms if cp.enabled]

package/memory/manager.py

@@ -306,10 +306,11 @@ class MemoryManager:
         """
         conn = self._get_conn()
         # 只排除纯内部审计条目，保留 tool_call/tool_result 供前端展示
+        # [v1.20.2] 使用 rowid 作为二级排序，防止同一秒内的消息顺序不确定
         sql = """SELECT * FROM memories
                  WHERE session_id = ? AND category = 'session' AND role != ''
                  AND key NOT IN ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight')
-                 ORDER BY created_at ASC LIMIT ?"""
+                 ORDER BY created_at ASC, rowid ASC LIMIT ?"""
         rows = conn.execute(sql, (session_id, limit)).fetchall()
         entries = [MemoryEntry.from_row(row) for row in rows]
         if include_roles:
@@ -319,9 +320,9 @@ class MemoryManager:
     def get_conversation_all(self, session_id, limit=5000) -> List[MemoryEntry]:
         """获取全量对话历史（包含所有内部条目），用于完整回溯。"""
         conn = self._get_conn()
-        sql = """SELECT * FROM memories 
+        sql = """SELECT * FROM memories
                  WHERE session_id = ? AND category = 'session' AND role != ''
-                 ORDER BY created_at ASC LIMIT ?"""
+                 ORDER BY created_at ASC, rowid ASC LIMIT ?"""
         rows = conn.execute(sql, (session_id, limit)).fetchall()
         return [MemoryEntry.from_row(row) for row in rows]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.20.1",
+  "version": "1.20.3",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {
@@ -43,4 +43,4 @@
     "python": ">=3.10",
     "node": ">=18"
   }
-}
+}