myagent-ai 1.20.1 → 1.20.2

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.2",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {
@@ -43,4 +43,4 @@
     "python": ">=3.10",
     "node": ">=18"
   }
-}
+}

package/web/api_server.py

@@ -2743,16 +2743,28 @@ window.toggleFullscreen = function() {{
         if "user" in data: (ad / "user.md").write_text(data["user"], encoding="utf-8")
         # 如果 name 改变，需要重命名目录
         new_name = data.get("name")
+        renamed_to = None
         if new_name and new_name != path and not is_system:
             agents_dir = self._agents_dir()
             new_ad = agents_dir / new_name
             if not new_ad.exists():
                 ad.rename(new_ad)
                 logger.info(f"Agent 目录已重命名: {path} -> {new_name}")
+                renamed_to = new_name
+                # [v1.20.2] 重命名后更新 avatar_image URL 中的路径
+                old_avatar = cfg.get("avatar_image", "")
+                if old_avatar and f"/api/agents/{path}/" in old_avatar:
+                    cfg["avatar_image"] = old_avatar.replace(f"/api/agents/{path}/", f"/api/agents/{new_name}/")
+                    (new_ad / "config.json").write_text(
+                        json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8"
+                    )
             else:
                 logger.warning(f"目标目录已存在，无法重命名: {new_name}")
         logger.info(f"更新 Agent: {path}")
-        return web.json_response({"ok": True, "hot_reload": True})
+        result = {"ok": True, "hot_reload": True}
+        if renamed_to:
+            result["renamed_to"] = renamed_to
+        return web.json_response(result)
 
     async def handle_delete_agent(self, request):
         """DELETE /api/agents/{path} - 删除 agent 及其所有子 agent"""
@@ -2961,7 +2973,9 @@ window.toggleFullscreen = function() {{
         platforms = []
         for cp in self.core.config_mgr.config.chat_platforms:
             platforms.append({
+                "id": cp.id,
                 "platform": cp.platform,
+                "display_name": cp.display_name,
                 "enabled": cp.enabled,
                 "token": cp.token[:8] + "****" if cp.token else "",
                 "app_id": cp.app_id,
@@ -2969,58 +2983,75 @@ window.toggleFullscreen = function() {{
                 "webhook_url": cp.webhook_url,
                 "allowed_users": cp.allowed_users,
                 "extra": cp.extra,
+                "bind_agent": cp.bind_agent,
+                "bind_agents": cp.bind_agents,
             })
         return web.json_response(platforms)
 
     async def handle_get_platform(self, request):
-        """获取单个平台配置详情"""
+        """获取单个平台配置详情（支持按 id 或 platform 查找）"""
         name = request.match_info["name"]
-        for cp in self.core.config_mgr.config.chat_platforms:
-            if cp.platform == name:
-                return web.json_response({
-                    "platform": cp.platform,
-                    "enabled": cp.enabled,
-                    "token": cp.token,
-                    "app_id": cp.app_id,
-                    "app_secret": cp.app_secret,
-                    "webhook_url": cp.webhook_url,
-                    "allowed_users": cp.allowed_users,
-                    "extra": cp.extra,
-                })
-        return web.json_response({"error": f"平台 {name} 不存在"}, status=404)
+        # 优先按 id 查找，兼容按 platform 查找
+        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": f"平台 {name} 不存在"}, status=404)
+        return web.json_response({
+            "id": cp.id,
+            "platform": cp.platform,
+            "display_name": cp.display_name,
+            "enabled": cp.enabled,
+            "token": cp.token,
+            "app_id": cp.app_id,
+            "app_secret": cp.app_secret,
+            "webhook_url": cp.webhook_url,
+            "allowed_users": cp.allowed_users,
+            "extra": cp.extra,
+            "bind_agent": cp.bind_agent,
+            "bind_agents": cp.bind_agents,
+        })
 
     async def handle_add_platform(self, request):
-        """新增聊天平台配置"""
+        """新增聊天平台配置（支持多实例）"""
         data = await request.json()
         platform_name = data.get("platform", "")
         if not platform_name:
             return web.json_response({"error": "缺少 platform 字段"}, status=400)
-        # 检查是否已存在
-        existing = self.core.config_mgr.get_chat_platform(platform_name)
-        if existing:
-            return web.json_response({"error": f"平台 {platform_name} 已存在"}, status=409)
+        # 不再限制同类型只能有一个，支持多 token 实例
         cp = ChatPlatformConfig(
             platform=platform_name,
-            enabled=data.get("enabled", False),
+            enabled=data.get("enabled", True),
             token=data.get("token", ""),
             app_id=data.get("app_id", ""),
             app_secret=data.get("app_secret", ""),
             webhook_url=data.get("webhook_url", ""),
             allowed_users=data.get("allowed_users", []),
             extra=data.get("extra", {}),
+            bind_agent=data.get("bind_agent", ""),
+            bind_agents=data.get("bind_agents", []),
         )
+        # 自动生成唯一 id 和 display_name
+        self.core.config_mgr._auto_platform_id(cp)
+        # 检查 id 唯一性
+        existing_ids = {p.id for p in self.core.config_mgr.config.chat_platforms}
+        if cp.id in existing_ids:
+            return web.json_response({"error": f"平台实例 {cp.display_name} 已存在（ID: {cp.id}）"}, status=409)
         self.core.config_mgr.config.chat_platforms.append(cp)
         self.core.config_mgr.save()
         # 热更新聊天平台
         self._hot_reload_chat_platforms()
-        logger.info(f"新增聊天平台: {platform_name}")
-        return web.json_response({"ok": True, "platform": platform_name, "hot_reload": True})
+        logger.info(f"新增聊天平台: {cp.display_name} (id={cp.id})")
+        return web.json_response({"ok": True, "id": cp.id, "platform": platform_name, "display_name": cp.display_name, "hot_reload": True})
 
     async def handle_update_platform(self, request):
         """更新聊天平台配置"""
         name = request.match_info["name"]
         data = await request.json()
-        cp = self.core.config_mgr.get_chat_platform(name)
+        # 优先按 id 查找
+        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": f"平台 {name} 不存在"}, status=404)
         if "enabled" in data:
@@ -3037,30 +3068,44 @@ window.toggleFullscreen = function() {{
             cp.allowed_users = data["allowed_users"]
         if "extra" in data:
             cp.extra = data["extra"]
+        if "bind_agent" in data:
+            cp.bind_agent = data["bind_agent"]
+        if "bind_agents" in data:
+            cp.bind_agents = data["bind_agents"]
+        if "display_name" in data:
+            cp.display_name = data["display_name"]
+        # 如果 token 变了，重新生成 id/display_name
+        if "token" in data and data["token"]:
+            old_id = cp.id
+            self.core.config_mgr._auto_platform_id(cp)
+            if cp.id != old_id:
+                logger.info(f"平台 ID 变更: {old_id} -> {cp.id}")
         self.core.config_mgr.save()
         # 热更新聊天平台
         self._hot_reload_chat_platforms()
-        logger.info(f"聊天平台配置已更新: {name}")
-        return web.json_response({"ok": True, "hot_reload": True})
+        logger.info(f"聊天平台配置已更新: {cp.display_name} (id={cp.id})")
+        return web.json_response({"ok": True, "id": cp.id, "hot_reload": True})
 
     async def handle_delete_platform(self, request):
         """删除聊天平台配置"""
         name = request.match_info["name"]
         platforms = self.core.config_mgr.config.chat_platforms
         for i, cp in enumerate(platforms):
-            if cp.platform == name:
+            if cp.id == name or cp.platform == name:
                 platforms.pop(i)
                 self.core.config_mgr.save()
                 # 热更新聊天平台
                 self._hot_reload_chat_platforms()
-                logger.info(f"已删除聊天平台: {name}")
+                logger.info(f"已删除聊天平台: {cp.display_name} (id={cp.id})")
                 return web.json_response({"ok": True, "hot_reload": True})
         return web.json_response({"error": f"平台 {name} 不存在"}, status=404)
 
     async def handle_toggle_platform(self, request):
         """切换平台启用/禁用"""
         name = request.match_info["name"]
-        cp = self.core.config_mgr.get_chat_platform(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": f"平台 {name} 不存在"}, status=404)
         data = await request.json()
@@ -3068,14 +3113,18 @@ window.toggleFullscreen = function() {{
         self.core.config_mgr.save()
         # 热更新聊天平台
         self._hot_reload_chat_platforms()
-        logger.info(f"聊天平台 {name} 已{'启用' if cp.enabled else '禁用'}")
-        return web.json_response({"ok": True, "enabled": cp.enabled, "hot_reload": True})
+        logger.info(f"聊天平台 {cp.display_name} 已{'启用' if cp.enabled else '禁用'}")
+        return web.json_response({"ok": True, "enabled": cp.enabled, "id": cp.id, "hot_reload": True})
 
     async def handle_restart_platform(self, request):
         """重启指定平台Bot"""
         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)
+        display = cp.display_name if cp else name
         # TODO: 实现平台 Bot 热重启
-        return web.json_response({"ok": True, "message": f"平台 {name} 重启请求已发送（重启需服务端支持）"})
+        return web.json_response({"ok": True, "message": f"平台 {display} 重启请求已发送（重启需服务端支持）"})
 
     async def handle_platform_agents(self, request):
         """获取绑定到指定平台的所有 Agent"""
@@ -6271,7 +6320,10 @@ window.toggleFullscreen = function() {{
         avatar_file = ad / "avatar.png"
         if not avatar_file.exists():
             return web.json_response({"error": "头像不存在"}, status=404)
-        return web.FileResponse(str(avatar_file))
+        # [v1.20.2] 添加缓存控制，防止浏览器缓存旧的 404 响应
+        resp = web.FileResponse(str(avatar_file))
+        resp.headers["Cache-Control"] = "no-cache"
+        return resp
 
     # ── 知识库 RAG 搜索 ──
 

package/web/ui/chat/chat.css

@@ -2138,6 +2138,15 @@ input,textarea,select{font:inherit}
 .inline-exec-result-btn{background:none;border:1px solid var(--border);color:var(--text2);font-size:11px;padding:2px 8px;border-radius:4px;cursor:pointer;transition:var(--transition);flex-shrink:0}
 .inline-exec-result-btn:hover{background:var(--bg2);border-color:var(--accent);color:var(--accent)}
 
+/* ── Tool Result Collapsible (合并卡片折叠区域) ── */
+.tool-result-collapsible{border-top:1px dashed var(--border);margin-top:2px;padding-top:2px}
+.tool-collapsible-toggle{font-size:11px;color:var(--text3);cursor:pointer;padding:2px 0;user-select:none;transition:var(--transition)}
+.tool-collapsible-toggle:hover{color:var(--accent)}
+.tool-collapsible-body{overflow:hidden;max-height:0;transition:max-height .25s ease}
+.tool-result-collapsible:not(.collapsed) .tool-collapsible-body{max-height:300px;overflow-y:auto}
+.tool-result-collapsible.collapsed .tool-collapsible-toggle::after{content:' ▸'}
+.tool-result-collapsible:not(.collapsed) .tool-collapsible-toggle::after{content:' ▾'}
+
 /* ── Execution Result Modal ── */
 .exec-result-modal-overlay{position:fixed;inset:0;background:rgba(0,0,0,.5);z-index:1000;display:flex;align-items:center;justify-content:center;animation:fadeIn .15s ease}
 .exec-result-modal{background:var(--bg);border:1px solid var(--border);border-radius:12px;width:min(680px,90vw);max-height:80vh;display:flex;flex-direction:column;box-shadow:0 20px 60px rgba(0,0,0,.25);animation:slideUp .2s ease}

package/web/ui/chat/chat_main.js

@@ -225,10 +225,10 @@ var rpSections = {
 
 // ── 平台图标映射 ──
 const PLATFORM_ICONS = {
-  telegram: '✈️', discord: '🎮', feishu: '🐦', qq: '🐧', wechat: '💬',
+  telegram: '✈️', discord: '🎮', feishu: '🐦', qq: '🐧', wechat: '💬', whatsapp: '📱',
 };
 const PLATFORM_LABELS = {
-  telegram: 'Telegram', discord: 'Discord', feishu: '飞书', qq: 'QQ', wechat: '微信',
+  telegram: 'Telegram', discord: 'Discord', feishu: '飞书', qq: 'QQ', wechat: '微信', whatsapp: 'WhatsApp',
 };
 
 // ── Utility: deterministic color from agent name ──
@@ -1638,19 +1638,20 @@ function showAgentModal(editPath, parentPath, data) {
     + '<option value="feishu"' + (platform === 'feishu' ? ' selected' : '') + '>🐦 飞书</option>'
     + '<option value="qq"' + (platform === 'qq' ? ' selected' : '') + '>🐧 QQ</option>'
     + '<option value="wechat"' + (platform === 'wechat' ? ' selected' : '') + '>💬 微信</option>'
+    + '<option value="whatsapp"' + (platform === 'whatsapp' ? ' selected' : '') + '>📱 WhatsApp</option>'
     + '</select>'
     + '<button class="config-action-btn" style="padding:6px 10px;font-size:11px" onclick="window.location.href=\'/ui/index.html?page=platforms\'" title="管理聊天平台">管理平台</button>'
     + '</div>'
-    + '<div class="hint">选择 Agent 对接的聊天平台，或点击"管理平台"新增接入</div></div>'
+    + '<div class="hint">选择 Agent 对接的聊天平台。多实例绑定和 Agent 选择请在"管理平台"中配置。</div></div>'
     + '<div class="agent-form-group" id="platformTokenGroup" style="display:' + (platform ? '' : 'none') + '"><label>平台 Token</label>'
     + '<input type="text" id="agentFormPlatformToken" placeholder="Bot Token" value="' + escapeHtml(platform_token) + '">'
-    + '<div class="hint">聊天平台的 Bot Token</div></div>'
-    + '<div class="agent-form-group" id="platformAppIdGroup" style="display:' + (platform === 'feishu' ? '' : 'none') + '"><label>App ID</label>'
-    + '<input type="text" id="agentFormPlatformAppId" placeholder="飞书 App ID" value="' + escapeHtml(platform_app_id) + '">'
-    + '<div class="hint">飞书应用的 App ID</div></div>'
-    + '<div class="agent-form-group" id="platformAppSecretGroup" style="display:' + (platform === 'feishu' ? '' : 'none') + '"><label>App Secret</label>'
-    + '<input type="text" id="agentFormPlatformAppSecret" placeholder="飞书 App Secret" value="' + escapeHtml(platform_app_secret) + '">'
-    + '<div class="hint">飞书应用的 App Secret</div></div>'
+    + '<div class="hint">聊天平台的 Bot Token（也可在"管理平台"中配置）</div></div>'
+    + '<div class="agent-form-group" id="platformAppIdGroup" style="display:' + ((platform === 'feishu' || platform === 'whatsapp') ? '' : 'none') + '"><label>App ID</label>'
+    + '<input type="text" id="agentFormPlatformAppId" placeholder="App ID" value="' + escapeHtml(platform_app_id) + '">'
+    + '<div class="hint">应用 App ID</div></div>'
+    + '<div class="agent-form-group" id="platformAppSecretGroup" style="display:' + ((platform === 'feishu' || platform === 'whatsapp') ? '' : 'none') + '"><label>App Secret</label>'
+    + '<input type="text" id="agentFormPlatformAppSecret" placeholder="App Secret" value="' + escapeHtml(platform_app_secret) + '">'
+    + '<div class="hint">应用 App Secret</div></div>'
     + '</div>'
     + '<div class="agent-form-group"><label>Identity (身份)</label>'
     + '<textarea id="agentFormIdentity" placeholder="你是一个... 你擅长... 你的风格是..." rows="3">' + escapeHtml(identity) + '</textarea>'
@@ -2446,11 +2447,11 @@ function groupHistoryMessages(messages) {
     if (key === 'tool_call') {
       var tc = m._parsedToolCall || parseToolCallContent(m.content);
       m._parsedToolCall = tc;
-      return { type: 'exec', data: { id: evtId++, type: 'tool_call', title: tc.title, tool_name: tc.toolName, params: tc.params || undefined, status: 'done' } };
+      return { type: 'exec', data: { id: evtId, type: 'tool_call', title: tc.title, tool_name: tc.toolName, params: tc.params || undefined, status: 'done' } };
     }
     if (m.role === 'tool') {
       var tr = parseToolResultContent(m.content);
-      return { type: 'exec', data: { id: evtId++, type: 'tool_result', title: tr.title, tool_name: tr.toolName, success: tr.success, summary: tr.body.substring(0, 500).trim(), result: { output: tr.body.substring(0, 2000) } } };
+      return { type: 'exec_result', data: { id: evtId, type: 'tool_result', title: tr.title, tool_name: tr.toolName, success: tr.success, summary: tr.body.substring(0, 500).trim(), result: { output: tr.body.substring(0, 2000) } } };
     }
     if (m.content && m.content.trim() && m.content !== '(无回复)') {
       return { type: 'text', content: m.content };
@@ -2458,6 +2459,47 @@ function groupHistoryMessages(messages) {
     return null;
   }
 
+  // 合并连续的 tool_call + tool_result 为单个 exec 卡片（一个工具一个框）
+  // [v1.20.2] 修复：向前搜索匹配的 tool_result，不再仅检查紧邻的下一个 part
+  function mergeToolParts(parts) {
+    var merged = [];
+    var consumed = {}; // 记录已被 tool_call 消费的 exec_result 索引
+    for (var pi = 0; pi < parts.length; pi++) {
+      if (consumed[pi]) continue; // 已被前面的 tool_call 消费
+      var p = parts[pi];
+      if (p.type === 'exec' && p.data.type === 'tool_call') {
+        var callData = p.data;
+        var mergedPart = { type: 'exec', data: Object.assign({}, callData, { has_result: false, result_data: null }) };
+        // 向前搜索匹配的 tool_result（允许中间有 text 等其他 part）
+        for (var ri = pi + 1; ri < parts.length; ri++) {
+          if (parts[ri].type === 'exec_result') {
+            var nextData = parts[ri].data;
+            if (nextData.tool_name === callData.tool_name || nextData.tool_call_id === callData.id) {
+              mergedPart.data.has_result = true;
+              mergedPart.data.success = nextData.success;
+              mergedPart.data.summary = nextData.summary;
+              mergedPart.data.result = nextData.result;
+              if (nextData.title) mergedPart.data.title = nextData.title;
+              consumed[ri] = true; // 标记为已消费
+              break;
+            }
+          }
+          // 遇到下一个 tool_call 就停止搜索（tool_result 不会跨越 tool_call）
+          if (parts[ri].type === 'exec' && parts[ri].data.type === 'tool_call') break;
+        }
+        evtId++;
+        merged.push(mergedPart);
+      } else if (p.type === 'exec_result') {
+        // 孤立的 tool_result（没有对应的 tool_call），保留为失败卡片
+        evtId++;
+        merged.push({ type: 'exec', data: Object.assign({}, p.data, { type: 'tool_result', has_result: true }) });
+      } else {
+        merged.push(p);
+      }
+    }
+    return merged;
+  }
+
   var i = 0;
   while (i < messages.length) {
     var msg = messages[i];
@@ -2507,6 +2549,9 @@ function groupHistoryMessages(messages) {
       i++;
     }
 
+    // [v1.20.2] 合并连续 tool_call + tool_result 为单个卡片
+    parts = mergeToolParts(parts);
+
     // 组装: content 取最后一段文本（用于搜索/纯文本回退），parts 展示完整时间线
     var textParts = parts.filter(function(p) { return p.type === 'text'; });
     var hasExecParts = parts.some(function(p) { return p.type === 'exec'; });

package/web/ui/chat/flow_engine.js

@@ -925,7 +925,12 @@ function renderInlineExecEvent(data, msgIdx) {
 
   // Determine event state class for legacy events
   let stateClass = '';
-  if (data.type === 'tool_call' || data.type === 'skill_call') stateClass = 'tool-call-pending';
+  // [v1.20.2] 合并卡片：tool_call + has_result → 显示完成状态
+  if (data.has_result) {
+    stateClass = data.success === false ? 'tool-failed' : 'tool-success';
+  } else if (data.type === 'tool_call' || data.type === 'skill_call') {
+    stateClass = 'tool-call-pending';
+  }
   if (data.type === 'tool_result') stateClass = data.success === false ? 'tool-failed' : 'tool-success';
   if (data.type === 'code_result') stateClass = data.timed_out ? 'tool-failed' : (data.success ? 'tool-success' : 'tool-failed');
 
@@ -942,8 +947,8 @@ function renderInlineExecEvent(data, msgIdx) {
 
   // Build body content
   let bodyHtml = '';
-  // Params for tool_call/skill_call
-  if (data.params && (data.type === 'tool_call' || data.type === 'skill_call')) {
+  // Params for tool_call/skill_call (合并卡片中 params 在折叠区域显示)
+  if (data.params && (data.type === 'tool_call' || data.type === 'skill_call') && !data.has_result) {
     let paramPreview = typeof data.params === 'string' ? data.params : JSON.stringify(data.params);
     if (paramPreview.length > 300) paramPreview = paramPreview.substring(0, 300) + '...';
     bodyHtml += '<div class="inline-exec-code">' + escapeHtml(paramPreview) + '</div>';
@@ -952,16 +957,33 @@ function renderInlineExecEvent(data, msgIdx) {
   if (data.code_preview && (data.type === 'code_exec' || data.type === 'code_result')) {
     bodyHtml += '<div class="inline-exec-code" onclick="showExecResultModal(' + msgIdx + ', \'' + data.id + '\')" title="点击查看完整结果">' + escapeHtml(data.code_preview) + '</div>';
   }
-  // Summary for tool_result/skill_result
-  if (data.summary && (data.type === 'tool_result' || data.type === 'skill_result')) {
+  // [v1.20.2] 合并卡片：显示折叠的参数 + 结果摘要 + 查看详情按钮
+  if (data.has_result) {
+    // 折叠的参数区域
+    if (data.params) {
+      let paramPreview = typeof data.params === 'string' ? data.params : JSON.stringify(data.params);
+      if (paramPreview.length > 300) paramPreview = paramPreview.substring(0, 300) + '...';
+      bodyHtml += '<div class="tool-result-collapsible"><div class="tool-collapsible-toggle" onclick="this.parentElement.classList.toggle(\'collapsed\')">📋 参数</div><div class="tool-collapsible-body"><div class="inline-exec-code">' + escapeHtml(paramPreview) + '</div></div></div>';
+    }
+    // 结果摘要
+    if (data.summary) {
+      bodyHtml += '<div class="inline-exec-summary">' + escapeHtml(data.summary) + '</div>';
+    }
+    // 查看详情按钮
+    if (data.result) {
+      bodyHtml += '<button class="inline-exec-result-btn" onclick="showToolResultModal(' + msgIdx + ', \'' + data.id + '\')">查看详情</button>';
+    }
+  }
+  // Summary for standalone tool_result/skill_result (非合并的孤立结果)
+  if (!data.has_result && data.summary && (data.type === 'tool_result' || data.type === 'skill_result')) {
     bodyHtml += '<div class="inline-exec-summary">' + escapeHtml(data.summary) + '</div>';
   }
   // Result button for code_result
   if (data.type === 'code_result' && (data.stdout || data.stderr || data.error)) {
     bodyHtml += '<button class="inline-exec-result-btn" onclick="showExecResultModal(' + msgIdx + ', \'' + data.id + '\')">查看详情</button>';
   }
-  // Result button for tool_result/skill_result
-  if ((data.type === 'tool_result' || data.type === 'skill_result') && data.result) {
+  // Result button for standalone tool_result/skill_result
+  if (!data.has_result && (data.type === 'tool_result' || data.type === 'skill_result') && data.result) {
     bodyHtml += '<button class="inline-exec-result-btn" onclick="showToolResultModal(' + msgIdx + ', \'' + data.id + '\')">查看详情</button>';
   }
 

package/web/ui/index.html

@@ -373,7 +373,9 @@ async function api(url,opts={}){
   }catch(e){showToast('请求失败: '+e.message,'danger');return {error:e.message}}
 }
 function $(id){return document.getElementById(id)}
-function escHtml(s){return String(s||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;')}
+function escHtml(s){return String(s||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;').replace(/'/g,'&#39;')}
+/* [v1.20.2] 安全地将任意文本插入 JS 模板字符串中 textarea 元素：转义反引号、${ 和 </textarea */
+function escTpl(s){return String(s||'').replace(/\\/g,'\\\\').replace(/`/g,'\\`').replace(/\$\{/g,'\\${').replace(/<\/textarea/gi,'<\\/textarea')}
 function fmtDate(d){if(!d)return'-';try{return new Date(d).toLocaleString('zh-CN',{month:'2-digit',day:'2-digit',hour:'2-digit',minute:'2-digit'})}catch(e){return d.slice(0,16)}}
 function fmtTimeAgo(d){if(!d)return'-';const s=Math.floor((Date.now()-new Date(d))/1000);if(s<60)return s+'秒前';if(s<3600)return Math.floor(s/60)+'分钟前';if(s<86400)return Math.floor(s/3600)+'小时前';return Math.floor(s/86400)+'天前'}
 function showToast(msg,type='info',duration=3000){
@@ -752,7 +754,7 @@ async function showWorkdirModal(agentPath){
   $('modalContainer').innerHTML=`<div class="modal-overlay" onclick="closeModal()"><div class="modal modal-wide" onclick="event.stopPropagation()" style="max-width:600px">
     <div class="flex justify-between items-center mb-16">
       <h3>${title}</h3>
-      <div class="flex gap-8"><button class="btn btn-sm btn-ghost" onclick="loadWorkdirFiles('')">根目录</button><button class="btn btn-sm btn-ghost" onclick="loadWorkdirFiles(_workdirCurrentPath,true)">刷新</button></div>
+      <div class="flex gap-8"><button class="btn btn-sm btn-ghost" onclick="loadWorkdirFiles('')">根目录</button><button class="btn btn-sm btn-ghost" onclick="loadWorkdirFiles(_workdirCurrentPath)">刷新</button></div>
     </div>
     <div id="workdirBreadcrumb" style="font-size:12px;color:var(--text3);margin-bottom:8px"></div>
     <div id="workdirContent"><div class="empty">加载中...</div></div>
@@ -936,7 +938,7 @@ async function openEditAgentModal(path){
         <div class="form-group"><label>创建时间 <span style="color:var(--text2)">(只读)</span></label><input id="eaCreated" value="${fmtDate(a.created_at)}" disabled></div>
       </div>
       <div class="form-group"><label>工作目录</label><input id="eaWorkDir" value="${escHtml(a.work_dir||'')}" placeholder="留空使用默认"></div>
-      <div class="form-group"><label>系统提示</label><textarea id="eaPrompt" rows="4" ${isSys?'disabled':''}>${escHtml(a.system_prompt||'')}</textarea></div>
+      <div class="form-group"><label>系统提示</label><textarea id="eaPrompt" rows="4" ${isSys?'disabled':''}></textarea></div>
       <div class="flex gap-8 mt-16">
         <button class="btn btn-primary" onclick="doSaveAgent('${escHtml(path)}')">保存</button>
         <button class="btn btn-ghost" onclick="closeModal()">关闭</button>
@@ -945,11 +947,11 @@ async function openEditAgentModal(path){
 
     <!-- 人格系统 -->
     <div id="atSoul" class="hidden">
-      <div class="form-group"><label>soul.md</label><textarea id="eaSoul" rows="10" style="min-height:200px">${escHtml(a.soul||'')}</textarea>
+      <div class="form-group"><label>soul.md</label><textarea id="eaSoul" rows="10" style="min-height:200px"></textarea>
         <button class="btn btn-sm btn-primary mt-8" onclick="doSaveSoul('${escHtml(path)}')">保存 Soul</button></div>
-      <div class="form-group"><label>identity.md</label><textarea id="eaIdentity" rows="10" style="min-height:200px">${escHtml(a.identity||'')}</textarea>
+      <div class="form-group"><label>identity.md</label><textarea id="eaIdentity" rows="10" style="min-height:200px"></textarea>
         <button class="btn btn-sm btn-primary mt-8" onclick="doSaveIdentity('${escHtml(path)}')">保存 Identity</button></div>
-      <div class="form-group"><label>user.md</label><textarea id="eaUser" rows="6" style="min-height:120px">${escHtml(a.user||'')}</textarea>
+      <div class="form-group"><label>user.md</label><textarea id="eaUser" rows="6" style="min-height:120px"></textarea>
         <button class="btn btn-sm btn-primary mt-8" onclick="doSaveUser('${escHtml(path)}')">保存 User</button></div>
     </div>
 
@@ -978,6 +980,11 @@ async function openEditAgentModal(path){
       <div id="atPermsContent"><div class="empty">加载中...</div></div>
     </div>
   </div></div>`;
+  // [v1.20.2] 安全设置 textarea 内容（避免模板字符串注入和 HTML 实体问题）
+  if($('eaPrompt'))$('eaPrompt').value=a.system_prompt||'';
+  if($('eaSoul'))$('eaSoul').value=a.soul||'';
+  if($('eaIdentity'))$('eaIdentity').value=a.identity||'';
+  if($('eaUser'))$('eaUser').value=a.user||'';
 }
 
 function agentTabSwitch(el,tabId){
@@ -1001,7 +1008,10 @@ async function doSaveAgent(path){
     avatar_image:$('eaAvatarImage')?.value||''
   })});
   if(r.error){showToast(r.error,'danger');return}
-  showToast('已保存','success');renderAgents();
+  showToast('已保存','success');
+  // [v1.20.2] 如果 agent 被重命名，更新当前编辑路径，防止后续保存出现 not found
+  if(r.renamed_to){window._currentEditAgentPath=r.renamed_to}
+  renderAgents();
 }
 
 async function doSaveAgentSettings(path){
@@ -1012,9 +1022,9 @@ async function doSaveAgentSettings(path){
   showToast('设置已保存','success');
 }
 
-async function doSaveSoul(path){await api(`/api/agents/${encodeURIComponent(path)}/soul`,{method:'PUT',body:JSON.stringify({soul:$('eaSoul').value})});showToast('Soul.md 已保存','success')}
-async function doSaveIdentity(path){await api(`/api/agents/${encodeURIComponent(path)}/identity`,{method:'PUT',body:JSON.stringify({identity:$('eaIdentity').value})});showToast('Identity.md 已保存','success')}
-async function doSaveUser(path){await api(`/api/agents/${encodeURIComponent(path)}/user`,{method:'PUT',body:JSON.stringify({user:$('eaUser').value})});showToast('User.md 已保存','success')}
+async function doSaveSoul(path){const r=await api(`/api/agents/${encodeURIComponent(path)}/soul`,{method:'PUT',body:JSON.stringify({soul:$('eaSoul').value})});if(r.error){showToast(r.error,'danger');return}showToast('Soul.md 已保存','success')}
+async function doSaveIdentity(path){const r=await api(`/api/agents/${encodeURIComponent(path)}/identity`,{method:'PUT',body:JSON.stringify({identity:$('eaIdentity').value})});if(r.error){showToast(r.error,'danger');return}showToast('Identity.md 已保存','success')}
+async function doSaveUser(path){const r=await api(`/api/agents/${encodeURIComponent(path)}/user`,{method:'PUT',body:JSON.stringify({user:$('eaUser').value})});if(r.error){showToast(r.error,'danger');return}showToast('User.md 已保存','success')}
 
 async function loadAgentKB(){
   // Find current agent path from the modal title or store it
@@ -1223,66 +1233,163 @@ function chatWithAgent(path){
 async function renderPlatforms(){
   const ps=await api('/api/platforms');
   if(ps.error){$('content').innerHTML='<div class="empty" style="color:var(--danger)">加载失败: '+escHtml(ps.error)+'</div>';return}
-  const icons={telegram:'📱',discord:'🎮',feishu:'🐦',qq:'🐧',wechat:'💚'};
+  const icons={telegram:'📱',discord:'🎮',feishu:'🐦',qq:'🐧',wechat:'💚',whatsapp:'💬'};
   let html=`<div class="flex justify-between items-center mb-16">
-    <div style="color:var(--text2);font-size:13px">共 ${ps.length} 个平台</div>
+    <div style="color:var(--text2);font-size:13px">共 ${ps.length} 个平台实例</div>
     <button class="btn btn-primary" onclick="showAddPlatformModal()">+ 添加平台</button></div>`;
   if(!ps.length){html+='<div class="empty">暂无聊天平台配置，点击上方按钮添加</div>';$('content').innerHTML=html;return}
   html+='<div class="grid">';
   for(const p of ps){
-    const name=p.platform||p.name;
+    const pid=p.id||p.platform;
+    const displayName=p.display_name||(icons[p.platform]||'📡')+' '+p.platform;
+    const bindInfo=p.bind_agent?'绑定: '+escHtml(p.bind_agent):(p.bind_agents&&p.bind_agents.length?'绑定: '+p.bind_agents.map(a=>escHtml(a)).join(', '):'');
     html+=`<div class="card"><div class="flex justify-between items-center">
-      <h3 style="color:var(--text)">${icons[name]||'📡'} ${escHtml(name)}</h3>
+      <h3 style="color:var(--text)">${icons[p.platform]||'📡'} ${escHtml(p.display_name||p.platform)}</h3>
       <span class="badge ${p.enabled?'badge-green':'badge-red'}">${p.enabled?'已启用':'未启用'}</span>
     </div><p style="font-size:13px;color:var(--text2);margin-top:8px">Token: ${p.token?'已配置':'未配置'} ${p.app_id?'· App ID: '+escHtml(p.app_id):''}</p>
+    ${bindInfo?'<p style="font-size:12px;color:var(--text3);margin-top:4px">'+bindInfo+'</p>':''}
     <div class="mt-8 flex gap-8">
-      <button class="btn btn-sm ${p.enabled?'btn-danger':'btn-success'}" onclick="togglePlatform('${escHtml(name)}',${!p.enabled})">${p.enabled?'停用':'启用'}</button>
-      <button class="btn btn-sm btn-ghost" onclick="showEditPlatformModal('${escHtml(name)}')">配置</button>
+      <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>
     </div></div>`;
   }
   html+='</div>';$('content').innerHTML=html;
 }
-async function togglePlatform(name,enable){await api(`/api/platforms/${name}`,{method:'PUT',body:JSON.stringify({enabled})});renderPlatforms()}
+async function togglePlatform(id,enable){await api(`/api/platforms/${id}`,{method:'PUT',body:JSON.stringify({enabled})});renderPlatforms()}
 function showAddPlatformModal(){
-  $('modalContainer').innerHTML=`<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()">
+  $('modalContainer').innerHTML=`<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:520px">
     <h3>+ 添加聊天平台</h3>
-    <div class="form-group"><label>平台类型</label><select id="apType">
+    <div class="form-group"><label>平台类型</label><select id="apType" onchange="onPlatformTypeChange()">
       <option value="telegram">Telegram</option><option value="discord">Discord</option>
       <option value="feishu">飞书</option><option value="qq">QQ</option><option value="wechat">微信</option>
+      <option value="whatsapp">WhatsApp</option>
     </select></div>
-    <div class="form-group"><label>Token</label><input id="apToken" placeholder="Bot Token"></div>
-    <div class="form-group"><label>App ID</label><input id="apAppId" placeholder="应用ID (可选)"></div>
-    <div class="form-group"><label>Webhook URL</label><input id="apWebhook" placeholder="Webhook 地址 (可选)"></div>
+    <div class="form-group"><label>Token / Access Token</label><input id="apToken" placeholder="Bot Token 或 Access Token"></div>
+    <div id="apAppIdGroup" class="form-group"><label>App ID</label><input id="apAppId" placeholder="应用ID (可选)"></div>
+    <div id="apWebhookGroup" class="form-group"><label>Webhook URL</label><input id="apWebhook" placeholder="Webhook 地址 (可选)"></div>
+    <div class="form-group"><label>绑定 Agent</label>
+      <div class="flex gap-8">
+        <input id="apBindAgent" placeholder="手输 Agent ID (可选)" style="flex:1">
+        <button class="btn btn-sm btn-ghost" onclick="showAgentSelectorForPlatform('apBindAgent','apBindAgents')">选择 Agent</button>
+      </div>
+      <div id="apBindAgents" style="font-size:11px;color:var(--text3);margin-top:4px"></div>
+      <div class="hint">手输 Agent ID 或点击"选择 Agent"从部门中选择。支持绑定多个 Agent。</div>
+    </div>
     <div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="doAddPlatform()">添加</button><button class="btn btn-ghost" onclick="closeModal()">取消</button></div>
   </div></div>`;
 }
-async function doAddPlatform(){
-  const r=await api('/api/platforms',{method:'POST',body:JSON.stringify({platform:$('apType').value,token:$('apToken').value,app_id:$('apAppId').value,webhook_url:$('apWebhook').value})});
-  if(r.error){showToast(r.error,'danger');return}closeModal();showToast('已添加','success');renderPlatforms();
+function onPlatformTypeChange(){
+  var t=$('apType').value;
+  var showAppId=(t==='feishu'||t==='whatsapp');
+  var showWebhook=(t==='whatsapp');
+  if($('apAppIdGroup'))$('apAppIdGroup').style.display=showAppId?'':'none';
+  if($('apWebhookGroup'))$('apWebhookGroup').style.display=showWebhook?'':'none';
 }
-async function showEditPlatformModal(name){
-  const p=await api(`/api/platforms/${name}`);
+async function doAddPlatform(){
+  var bindAgent=$('apBindAgent').value.trim();
+  var bindAgents=[];
+  var selectedEls=document.querySelectorAll('#apBindAgents .selected-agent-tag');
+  selectedEls.forEach(function(el){var v=el.getAttribute('data-agent');if(v)bindAgents.push(v);});
+  if(bindAgent)bindAgents.unshift(bindAgent);
+  bindAgents=[...new Set(bindAgents)];
+  const r=await api('/api/platforms',{method:'POST',body:JSON.stringify({platform:$('apType').value,token:$('apToken').value,app_id:$('apAppId').value,webhook_url:$('apWebhook').value,bind_agent:bindAgents[0]||'',bind_agents:bindAgents})});
+  if(r.error){showToast(r.error,'danger');return}closeModal();showToast('已添加: '+(r.display_name||r.platform),'success');renderPlatforms();
+}
+async function showEditPlatformModal(id){
+  const p=await api(`/api/platforms/${id}`);
   if(p.error){showToast(p.error,'danger');return}
-  $('modalContainer').innerHTML=`<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()">
-    <h3>编辑 ${escHtml(p.platform)}</h3>
-    <div class="form-group"><label>Token</label><input id="epToken" value="${escHtml(p.token||'')}" placeholder="Bot Token"></div>
-    <div class="form-group"><label>App ID</label><input id="epAppId" value="${escHtml(p.app_id||'')}" placeholder="应用ID"></div>
+  const pid=p.id||id;
+  var bindAgentVal=p.bind_agent||'';
+  var bindAgentsArr=p.bind_agents||[];
+  $('modalContainer').innerHTML=`<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:520px">
+    <h3>配置 ${escHtml(p.display_name||p.platform)}</h3>
+    <div class="form-group"><label>显示名称</label><input id="epDisplayName" value="${escHtml(p.display_name||'')}" placeholder="留空自动生成"></div>
+    <div class="form-group"><label>Token / Access Token</label><input id="epToken" value="${escHtml(p.token||'')}" placeholder="Bot Token"></div>
+    <div id="epAppIdGroup" class="form-group"><label>App ID</label><input id="epAppId" value="${escHtml(p.app_id||'')}" placeholder="应用ID"></div>
     <div class="form-group"><label>App Secret</label><input id="epSecret" type="password" placeholder="${p.has_secret?'已配置（留空不修改）':'未配置'}"></div>
-    <div class="form-group"><label>Webhook URL</label><input id="epWebhook" value="${escHtml(p.webhook_url||'')}" placeholder="Webhook 地址"></div>
+    <div id="epWebhookGroup" class="form-group"><label>Webhook URL</label><input id="epWebhook" value="${escHtml(p.webhook_url||'')}" placeholder="Webhook 地址"></div>
     <div class="form-group"><label>允许用户 (逗号分隔)</label><input id="epUsers" value="${escHtml((p.allowed_users||[]).join(','))}" placeholder="user1,user2"></div>
-    <div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="doSavePlatform('${escHtml(name)}')">保存</button><button class="btn btn-danger" onclick="doDeletePlatform('${escHtml(name)}')">删除平台</button><button class="btn btn-ghost" onclick="closeModal()">关闭</button></div>
+    <div class="form-group"><label>绑定 Agent</label>
+      <div class="flex gap-8">
+        <input id="epBindAgent" value="${escHtml(bindAgentVal)}" placeholder="手输 Agent ID (可选)" style="flex:1">
+        <button class="btn btn-sm btn-ghost" onclick="showAgentSelectorForPlatform('epBindAgent','epBindAgents')">选择 Agent</button>
+      </div>
+      <div id="epBindAgents" style="font-size:11px;color:var(--text3);margin-top:4px">${bindAgentsArr.map(function(a){return '<span class="selected-agent-tag" data-agent="'+escHtml(a)+'" style="display:inline-block;background:var(--bg);border:1px solid var(--border);border-radius:4px;padding:1px 6px;margin:2px;font-size:11px;cursor:pointer" onclick="this.remove()" title="点击移除">'+escHtml(a)+' ×</span>';}).join('')}</div>
+      <div class="hint">手输 Agent ID 或点击"选择 Agent"从部门中选择。一个平台可以绑定多个 Agent。</div>
+    </div>
+    <div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="doSavePlatform('${escHtml(pid)}')">保存</button><button class="btn btn-danger" onclick="doDeletePlatform('${escHtml(pid)}')">删除平台</button><button class="btn btn-ghost" onclick="closeModal()">关闭</button></div>
   </div></div>`;
 }
-async function doSavePlatform(name){
-  const r=await api(`/api/platforms/${name}`,{method:'PUT',body:JSON.stringify({token:$('epToken').value,app_id:$('epAppId').value,app_secret:$('epSecret').value||undefined,webhook_url:$('epWebhook').value,allowed_users:$('epUsers').value.split(',').map(s=>s.trim()).filter(Boolean)})});
+async function doSavePlatform(id){
+  var bindAgent=$('epBindAgent').value.trim();
+  var bindAgents=[];
+  var selectedEls=document.querySelectorAll('#epBindAgents .selected-agent-tag');
+  selectedEls.forEach(function(el){var v=el.getAttribute('data-agent');if(v)bindAgents.push(v);});
+  if(bindAgent)bindAgents.unshift(bindAgent);
+  bindAgents=[...new Set(bindAgents)];
+  const r=await api(`/api/platforms/${id}`,{method:'PUT',body:JSON.stringify({display_name:$('epDisplayName').value,token:$('epToken').value,app_id:$('epAppId').value,app_secret:$('epSecret').value||undefined,webhook_url:$('epWebhook').value,allowed_users:$('epUsers').value.split(',').map(s=>s.trim()).filter(Boolean),bind_agent:bindAgents[0]||'',bind_agents:bindAgents})});
   if(r.error){showToast(r.error,'danger');return}closeModal();showToast('已保存','success');renderPlatforms();
 }
-async function doDeletePlatform(name){
-  showConfirm('删除平台','确认删除 "'+escHtml(name)+'" 吗？',async()=>{
-    const r=await api(`/api/platforms/${name}`,{method:'DELETE'});if(r.error){showToast(r.error,'danger');closeModal();return}closeModal();showToast('已删除','success');renderPlatforms();
+async function doDeletePlatform(id){
+  showConfirm('删除平台','确认删除该平台实例吗？',async()=>{
+    const r=await api(`/api/platforms/${id}`,{method:'DELETE'});if(r.error){showToast(r.error,'danger');closeModal();return}closeModal();showToast('已删除','success');renderPlatforms();
   });
 }
 
+// Agent 选择器（从部门树选择 Agent）
+async function showAgentSelectorForPlatform(inputId,containerId){
+  try{
+    var agents=await api('/api/agents');
+    if(!Array.isArray(agents)){showToast('加载 Agent 列表失败','danger');return}
+    var agentList=agents.filter(function(a){return!a.system&&a.path!=='default'});
+    var deptMap={};
+    agentList.forEach(function(a){
+      var dept=a.department||'未分组';
+      if(!deptMap[dept])deptMap[dept]=[];
+      deptMap[dept].push(a);
+    });
+    var html='<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:480px;max-height:70vh;overflow-y:auto">';
+    html+='<h3>选择 Agent</h3>';
+    for(var dept in deptMap){
+      html+='<div style="margin-bottom:12px"><div style="font-size:13px;font-weight:600;color:var(--text2);margin-bottom:4px">📁 '+escHtml(dept)+'</div>';
+      deptMap[dept].forEach(function(a){
+        var selected=false;
+        var existing=document.querySelectorAll('#'+containerId+' .selected-agent-tag');
+        existing.forEach(function(el){if(el.getAttribute('data-agent')===a.path)selected=true;});
+        html+='<label style="display:flex;align-items:center;gap:8px;padding:4px 0;cursor:pointer;font-size:13px"><input type="checkbox" value="'+escHtml(a.path)+'" '+(selected?'checked':'')+' onchange="toggleAgentSelection(this,\''+inputId+'\',\''+containerId+'\')"> '+(a.avatar_emoji||'🤖')+' '+escHtml(a.name)+' <span style="color:var(--text3);font-size:11px">('+escHtml(a.path)+')</span></label>';
+      });
+      html+='</div>';
+    }
+    html+='<div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="closeModal()">确定</button></div></div></div>';
+    $('modalContainer').innerHTML=html;
+  }catch(e){showToast('加载失败: '+e.message,'danger')}
+}
+function toggleAgentSelection(cb,inputId,containerId){
+  var agentPath=cb.value;
+  var container=document.getElementById(containerId);
+  if(cb.checked){
+    // 添加 tag
+    if(!container.querySelector('[data-agent="'+agentPath+'"]')){
+      var tag=document.createElement('span');
+      tag.className='selected-agent-tag';
+      tag.setAttribute('data-agent',agentPath);
+      tag.style.cssText='display:inline-block;background:var(--bg);border:1px solid var(--border);border-radius:4px;padding:1px 6px;margin:2px;font-size:11px;cursor:pointer';
+      tag.title='点击移除';
+      tag.textContent=agentPath+' ×';
+      tag.onclick=function(){this.remove();};
+      container.appendChild(tag);
+    }
+    // 同步到输入框
+    var first=container.querySelector('.selected-agent-tag');
+    if(first)document.getElementById(inputId).value=first.getAttribute('data-agent');
+  }else{
+    var existing=container.querySelector('[data-agent="'+agentPath+'"]');
+    if(existing)existing.remove();
+    var first=container.querySelector('.selected-agent-tag');
+    document.getElementById(inputId).value=first?first.getAttribute('data-agent'):'';
+  }
+}
+
 // ========== Sessions ==========
 async function renderSessions(){
   const ss=await api('/api/sessions');
@@ -2004,19 +2111,22 @@ async function viewSkillDetail(name){
 // ========== Files ==========
 var _workdirAgent=''; // 当前选中的 agent（空=全局工作目录）
 async function renderFiles(){
-  const [wd,agents]=await Promise.all([api('/api/workdir'),api('/api/agents').catch(()=>[])]);
+  try{
+  const [wd,agents]=await Promise.all([api('/api/workdir').catch(()=>({})),api('/api/agents').catch(()=>[])]);
   const agentList=Array.isArray(agents)?agents.filter(a=>!a.system&&a.path!=='default'):[];
+  const wdPath=wd&&wd.path?wd.path:'';
   let html=`<div class="flex items-center gap-8 mb-16 flex-wrap">
-    <span style="font-size:14px;color:var(--text2)">📁 工作目录: <strong>${escHtml(wd.path||'')}</strong></span>
+    <span style="font-size:14px;color:var(--text2)">📁 工作目录: <strong>${escHtml(wdPath)}</strong></span>
     <select id="workdirAgentSelect" onchange="onWorkdirAgentChange()" style="width:auto">
       <option value="">全局工作目录</option>
-      ${agentList.map(a=>`<option value="${escHtml(a.path)}">${escHtml((a.avatar_emoji||'🤖')+' '+a.name)} (${escHtml(a.path)})</option>`).join('')}
+      ${agentList.map(a=>`<option value="${escHtml(a.path)}" ${_workdirAgent===a.path?'selected':''}>${escHtml((a.avatar_emoji||'🤖')+' '+a.name)} (${escHtml(a.path)})</option>`).join('')}
     </select>
     <button class="btn btn-sm btn-ghost" onclick="changeWorkdir()">更改全局</button>
     <button class="btn btn-sm btn-ghost" onclick="renderFiles()">🔄 刷新</button></div>
     <div id="workdirContent">加载中...</div>`;
   $('content').innerHTML=html;
   loadWorkdirContent('');
+  }catch(e){console.error('renderFiles error:',e);$('content').innerHTML='<div class="empty" style="color:var(--danger)">加载失败: '+escHtml(e.message||'未知错误')+'</div>';}
 }
 function onWorkdirAgentChange(){
   _workdirAgent=$('workdirAgentSelect').value;