release: v3.5.22

fix: deadlock when docker is not available
📦 release: v3.5.21
2025-07-11 12:29:26 +08:00 · 2025-07-11 12:27:49 +08:00 · 2025-07-10 17:46:36 +08:00 · 2025-07-10 17:44:11 +08:00 · 2025-07-10 17:04:34 +08:00 · 2025-07-10 17:00:14 +08:00
114 changed files with 4338 additions and 2671 deletions
@@ -0,0 +1,31 @@
+---
+name: '🥳 发布插件'
+title: "[Plugin] 插件名"
+about: 提交插件到插件市场
+labels: [ "plugin-publish" ]
+assignees: ''
+
+---
+
+欢迎发布插件到插件市场！
+
+## 插件基本信息
+
+请将插件信息填写到下方的 Json 代码块中。`tags`（插件标签）和 `social_link`（社交链接）选填。
+
+```json
+{
+  "name": "插件名",
+  "desc": "插件介绍",
+  "author": "作者名",
+  "repo": "插件仓库链接",
+  "tags": [],
+  "social_link": ""
+}
+```
+
+## 检查
+
+- [ ] 我的插件经过完整的测试
+- [ ] 我的插件不包含恶意代码
+- [ ] 我已阅读并同意遵守该项目的 [行为准则](https://docs.github.com/zh/site-policy/github-terms/github-community-code-of-conduct)。
@@ -1,40 +0,0 @@
-name: '🥳 发布插件'
-title: "[Plugin] 插件名"
-description: 提交插件到插件市场
-labels: [ "plugin-publish" ]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        欢迎发布插件到插件市场！请确保您的插件经过**完整的**测试。
-  
-  - type: textarea
-    attributes:
-      label: 插件仓库
-      description: 插件的 GitHub 仓库链接
-      placeholder: >
-        如 https://github.com/Soulter/astrbot-github-cards
-
-  - type: textarea
-    attributes:
-      label: 描述
-      value: |
-        插件名: 
-        插件作者: 
-        插件简介: 
-        支持的消息平台:(必填，如 QQ、微信、飞书)
-        标签:(可选)
-        社交链接:(可选, 将会在插件市场作者名称上作为可点击的链接)
-      description: 必填。请以列表的字段按顺序将插件名、插件作者、插件简介放在这里。如果您不知道支持哪些消息平台，请填写测试过的消息平台。
-
-  - type: checkboxes
-    attributes:
-      label: Code of Conduct
-      options:
-        - label: >
-            我已阅读并同意遵守该项目的 [行为准则](https://docs.github.com/zh/site-policy/github-terms/github-community-code-of-conduct)。
-          required: true
-
-  - type: markdown
-    attributes:
-      value: "❤️"
@@ -0,0 +1,13 @@
+# Keep GitHub Actions up to date with GitHub's Dependabot...
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    groups:
+      github-actions:
+        patterns:
+          - "*"  # Group all Actions updates into a single larger pull request
+    schedule:
+      interval: weekly
@@ -73,7 +73,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
        with:
          python-version: '3.10'

@@ -1,6 +1,6 @@
 name: Run tests and upload coverage

-on: 
+on:
  push:
    branches:
      - master
@@ -8,6 +8,7 @@ on:
      - 'README.md'
      - 'changelogs/**'
      - 'dashboard/**'
+  pull_request:
  workflow_dispatch:

 jobs:
@@ -21,25 +22,24 @@ jobs:
          fetch-depth: 0

      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
      
      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pytest pytest-cov pytest-asyncio
+          pip install pytest pytest-asyncio pytest-cov
+          pip install --editable .

      - name: Run tests
        run: |
-          mkdir data
-          mkdir data/plugins
-          mkdir data/config
-          mkdir data/temp
+          mkdir -p data/plugins
+          mkdir -p data/config
+          mkdir -p data/temp
          export TESTING=true
          export ZHIPU_API_KEY=${{ secrets.OPENAI_API_KEY }}
-          PYTHONPATH=./ pytest --cov=. tests/ -v -o log_cli=true -o log_level=DEBUG
+          pytest --cov=. -v -o log_cli=true -o log_level=DEBUG

      - name: Upload results to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}
@@ -12,7 +12,7 @@ jobs:

    steps:
      - name: Pull The Codes
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0  # Must be 0 so we can fetch tags

@@ -18,7 +18,7 @@ jobs:
      pull-requests: write

    steps:
-    - uses: actions/stale@v5
+    - uses: actions/stale@v9
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        stale-issue-message: 'Stale issue message'
@@ -16,7 +16,7 @@ _✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
 <a  href="https://qm.qq.com/cgi-bin/qm/qr?k=wtbaNx7EioxeaqS9z7RQWVXPIxg2zYr7&jump_from=webapi&authKey=vlqnv/AV2DbJEvGIcxdlNSpfxVy+8vVqijgreRdnVKOaydpc+YSw4MctmEbr0k5"><img alt="QQ_community" src="https://img.shields.io/badge/QQ群-775869627-purple?style=for-the-badge&color=76bad9"></a>
 <a  href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 [![wakatime](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e.svg?style=for-the-badge&color=76bad9)](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e)
-![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fstats&query=v&label=7%E6%97%A5%E6%B4%BB%E8%B7%83%E9%87%8F&cacheSeconds=3600&style=for-the-badge&color=3b618e)
+![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fstats&query=v&label=7日消息量&cacheSeconds=3600&style=for-the-badge&color=3b618e)
 ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&style=for-the-badge&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600)

 <a href="https://github.com/Soulter/AstrBot/blob/master/README_en.md">English</a> ｜
@@ -111,10 +111,14 @@ uvx astrbot init

 或者请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html) 。

-#### Replit 部署
+#### 在 Replit 上部署

 [![Run on Repl.it](https://repl.it/badge/github/Soulter/AstrBot)](https://repl.it/github/Soulter/AstrBot)

+#### 在 雨云 上部署
+
+[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
+
 ## ⚡ 消息平台支持情况

 | 平台    | 支持性 |
@@ -140,7 +144,7 @@ uvx astrbot init

 | 名称    | 支持性 | 类型 | 备注 |
 | -------- | ------- | ------- | ------- |
-| OpenAI API | ✔    | 文本生成 | 也支持 DeepSeek、Google Gemini、GLM、Kimi、xAI 等兼容 OpenAI API 的服务 |
+| OpenAI API | ✔    | 文本生成 | 也支持 DeepSeek、Gemini、Kimi、xAI 等兼容 OpenAI API 的服务 |
 | Claude API | ✔    | 文本生成 |  |
 | Google Gemini API | ✔    | 文本生成 |  |
 | Dify | ✔    | LLMOps |  |
@@ -148,6 +152,8 @@ uvx astrbot init
 | Ollama | ✔    | 模型加载器 | 本地部署 DeepSeek、Llama 等开源语言模型 |
 | LM Studio | ✔    | 模型加载器 | 本地部署 DeepSeek、Llama 等开源语言模型 |
 | LLMTuner | ✔    | 模型加载器 | 本地加载 lora 等微调模型 |
+| [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | ✔    | 模型 API 及算力服务平台 |  |
+| [302.AI](https://share.302.ai/rr1M3l) | ✔    | 模型 API 服务平台 |  |
 | 硅基流动 | ✔    | 模型 API 服务平台 |  |
 | PPIO 派欧云 | ✔    | 模型 API 服务平台 |  |
 | OneAPI | ✔    | LLM 分发系统 |  |
@@ -223,7 +229,7 @@ _✨ WebUI ✨_

 此外，本项目的诞生离不开以下开源项目：

- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ)
+- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 伟大的猫猫框架
 - [wechatpy/wechatpy](https://github.com/wechatpy/wechatpy)

 ## ⭐ Star History
@@ -237,6 +243,9 @@ _✨ WebUI ✨_

 </div>

+![10k-star-banner-credit-by-kevin](https://github.com/user-attachments/assets/c97fc5fb-20b9-4bc8-9998-c20b930ab097)
+
+
 ## Disclaimer

 1. The project is protected under the `AGPL-v3` opensource license.
@@ -13,7 +13,6 @@ from .utils.astrbot_path import get_astrbot_data_path
 # 初始化数据存储文件夹
 os.makedirs(get_astrbot_data_path(), exist_ok=True)

-WEBUI_SK = "Advanced_System_for_Text_Response_and_Bot_Operations_Tool"
 DEMO_MODE = os.getenv("DEMO_MODE", False)

 astrbot_config = AstrBotConfig()
@@ -29,6 +28,3 @@ pip_installer = PipInstaller(
    astrbot_config.get("pip_install_arg", ""),
    astrbot_config.get("pypi_index_url", None),
 )
-web_chat_queue = asyncio.Queue(maxsize=32)
-web_chat_back_queue = asyncio.Queue(maxsize=32)
-
@@ -3,15 +3,17 @@
 """

 import os
+
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path

-VERSION = "3.5.16"
+VERSION = "3.5.22"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v3.db")

 # 默认配置
 DEFAULT_CONFIG = {
    "config_version": 2,
    "platform_settings": {
+        "plugin_enable": {},
        "unique_session": False,
        "rate_limit": {
            "time": 60,
@@ -52,6 +54,7 @@ DEFAULT_CONFIG = {
        "wake_prefix": "",
        "web_search": False,
        "web_search_link": False,
+        "display_reasoning_text": False,
        "identifier": False,
        "datetime_system_prompt": True,
        "default_personality": "default",
@@ -59,8 +62,9 @@ DEFAULT_CONFIG = {
        "max_context_length": -1,
        "dequeue_context_length": 1,
        "streaming_response": False,
+        "show_tool_use_status": False,
        "streaming_segmented": False,
-        "separate_provider": False,
+        "separate_provider": True,
    },
    "provider_stt_settings": {
        "enable": False,
@@ -102,6 +106,7 @@ DEFAULT_CONFIG = {
        "enable": True,
        "username": "astrbot",
        "password": "77b90590a8945a7d36c963981a307dc9",
+        "jwt_secret": "",
        "host": "0.0.0.0",
        "port": 6185,
    },
@@ -367,15 +372,15 @@ CONFIG_METADATA_2 = {
                        "hint": "请务必填对，否则 @ 机器人将无法唤醒，只能通过前缀唤醒。",
                        "obvious_hint": True,
                    },
-                    "discord_token":{
+                    "discord_token": {
                        "description": "Discord Bot Token",
                        "type": "string",
-                        "hint": "在此处填入你的Discord Bot Token"
+                        "hint": "在此处填入你的Discord Bot Token",
                    },
-                    "discord_proxy":{
+                    "discord_proxy": {
                        "description": "Discord 代理地址",
                        "type": "string",
-                        "hint": "可选的代理地址：http://ip:port"
+                        "hint": "可选的代理地址：http://ip:port",
                    },
                    "discord_command_register": {
                        "description": "是否自动将插件指令注册为 Discord 斜杠指令",
@@ -386,10 +391,6 @@ CONFIG_METADATA_2 = {
                        "type": "string",
                        "hint": "可选的 Discord 活动名称。留空则不设置活动。",
                    },
-                    "discord_guild_id_for_debug": {
-                        "description": "【开发用】指定一个服务器(Guild)ID。在此服务器注册的指令会立刻生效，便于调试。留空则注册为全局指令。",
-                        "type": "string",
-                    },
                },
            },
            "platform_settings": {
@@ -442,7 +443,7 @@ CONFIG_METADATA_2 = {
                    "ignore_bot_self_message": {
                        "description": "是否忽略机器人自身的消息",
                        "type": "bool",
-                        "hint": "某些平台如 gewechat 会将自身账号在其他 APP 端发送的消息也当做消息事件下发导致给自己发消息时唤醒机器人",
+                        "hint": "某些平台会将自身账号在其他 APP 端发送的消息也当做消息事件下发导致给自己发消息时唤醒机器人",
                    },
                    "ignore_at_all": {
                        "description": "是否忽略 @ 全体成员",
@@ -723,16 +724,16 @@ CONFIG_METADATA_2 = {
                            "model": "deepseek-chat",
                        },
                    },
-                    "智谱 AI": {
-                        "id": "zhipu_default",
-                        "type": "zhipu_chat_completion",
+                    "302.AI": {
+                        "id": "302ai",
+                        "type": "openai_chat_completion",
                        "provider_type": "chat_completion",
                        "enable": True,
                        "key": [],
+                        "api_base": "https://api.302.ai/v1",
                        "timeout": 120,
-                        "api_base": "https://open.bigmodel.cn/api/paas/v4/",
                        "model_config": {
-                            "model": "glm-4-flash",
+                            "model": "gpt-4.1-mini",
                        },
                    },
                    "硅基流动": {
@@ -747,18 +748,6 @@ CONFIG_METADATA_2 = {
                            "model": "deepseek-ai/DeepSeek-V3",
                        },
                    },
-                    "Kimi": {
-                        "id": "moonshot",
-                        "type": "openai_chat_completion",
-                        "provider_type": "chat_completion",
-                        "enable": True,
-                        "key": [],
-                        "timeout": 120,
-                        "api_base": "https://api.moonshot.cn/v1",
-                        "model_config": {
-                            "model": "moonshot-v1-8k",
-                        },
-                    },
                    "PPIO派欧云": {
                        "id": "ppio",
                        "type": "openai_chat_completion",
@@ -771,16 +760,29 @@ CONFIG_METADATA_2 = {
                            "model": "deepseek/deepseek-r1",
                        },
                    },
-                    "LLMTuner": {
-                        "id": "llmtuner_default",
-                        "type": "llm_tuner",
+                    "Kimi": {
+                        "id": "moonshot",
+                        "type": "openai_chat_completion",
                        "provider_type": "chat_completion",
                        "enable": True,
-                        "base_model_path": "",
-                        "adapter_model_path": "",
-                        "llmtuner_template": "",
-                        "finetuning_type": "lora",
-                        "quantization_bit": 4,
+                        "key": [],
+                        "timeout": 120,
+                        "api_base": "https://api.moonshot.cn/v1",
+                        "model_config": {
+                            "model": "moonshot-v1-8k",
+                        },
+                    },
+                    "智谱 AI": {
+                        "id": "zhipu_default",
+                        "type": "zhipu_chat_completion",
+                        "provider_type": "chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "timeout": 120,
+                        "api_base": "https://open.bigmodel.cn/api/paas/v4/",
+                        "model_config": {
+                            "model": "glm-4-flash",
+                        },
                    },
                    "Dify": {
                        "id": "dify_app_default",
@@ -974,6 +976,18 @@ CONFIG_METADATA_2 = {
                        "api_base": "https://openspeech.bytedance.com/api/v1/tts",
                        "timeout": 20,
                    },
+                    "Gemini TTS": {
+                        "id": "gemini_tts",
+                        "type": "gemini_tts",
+                        "provider_type": "text_to_speech",
+                        "enable": False,
+                        "gemini_tts_api_key": "",
+                        "gemini_tts_api_base": "",
+                        "gemini_tts_timeout": 20,
+                        "gemini_tts_model": "gemini-2.5-flash-preview-tts",
+                        "gemini_tts_prefix": "",
+                        "gemini_tts_voice_name": "Leda",
+                    },
                    "OpenAI Embedding": {
                        "id": "openai_embedding",
                        "type": "openai_embedding",
@@ -1651,6 +1665,11 @@ CONFIG_METADATA_2 = {
                        "obvious_hint": True,
                        "hint": "开启后，将会传入网页搜索结果的链接给模型，并引导模型输出引用链接。",
                    },
+                    "display_reasoning_text": {
+                        "description": "显示思考内容",
+                        "type": "bool",
+                        "hint": "开启后，将在回复中显示模型的思考过程。",
+                    },
                    "identifier": {
                        "description": "启动识别群员",
                        "type": "bool",
@@ -1688,10 +1707,15 @@ CONFIG_METADATA_2 = {
                        "type": "bool",
                        "hint": "启用后，将会流式输出 LLM 的响应。目前仅支持 OpenAI API提供商 以及 Telegram、QQ Official 私聊 两个平台",
                    },
+                    "show_tool_use_status": {
+                        "description": "函数调用状态输出",
+                        "type": "bool",
+                        "hint": "在触发函数调用时输出其函数名和内容。",
+                    },
                    "streaming_segmented": {
                        "description": "不支持流式回复的平台分段输出",
                        "type": "bool",
-                        "hint": "启用后，若平台不支持流式回复，会分段输出。目前仅支持 aiocqhttp 和 gewechat 两个平台，不支持或无需使用流式分段输出的平台会静默忽略此选项",
+                        "hint": "启用后，若平台不支持流式回复，会分段输出。目前仅支持 aiocqhttp 两个平台，不支持或无需使用流式分段输出的平台会静默忽略此选项",
                    },
                },
            },
@@ -88,7 +88,10 @@ class ConversationManager:
        return self.session_conversations.get(unified_msg_origin, None)

    async def get_conversation(
-        self, unified_msg_origin: str, conversation_id: str
+        self,
+        unified_msg_origin: str,
+        conversation_id: str,
+        create_if_not_exists: bool = False,
    ) -> Conversation:
        """获取会话的对话

@@ -98,6 +101,13 @@ class ConversationManager:
        Returns:
            conversation (Conversation): 对话对象
        """
+        conv = self.db.get_conversation_by_user_id(unified_msg_origin, conversation_id)
+        if not conv and create_if_not_exists:
+            # 如果对话不存在且需要创建，则新建一个对话
+            conversation_id = await self.new_conversation(unified_msg_origin)
+            return self.db.get_conversation_by_user_id(
+                unified_msg_origin, conversation_id
+            )
        return self.db.get_conversation_by_user_id(unified_msg_origin, conversation_id)

    async def get_conversations(self, unified_msg_origin: str) -> List[Conversation]:
@@ -46,9 +46,12 @@ class AstrBotCoreLifecycle:
        self.astrbot_config = astrbot_config  # 初始化配置
        self.db = db  # 初始化数据库

-        # 根据环境变量设置代理
-        os.environ["https_proxy"] = self.astrbot_config["http_proxy"]
-        os.environ["http_proxy"] = self.astrbot_config["http_proxy"]
+        # 设置代理
+        if self.astrbot_config.get("http_proxy", ""):
+            os.environ["https_proxy"] = self.astrbot_config["http_proxy"]
+            os.environ["http_proxy"] = self.astrbot_config["http_proxy"]
+        if proxy := os.environ.get("https_proxy"):
+            logger.debug(f"Using proxy: {proxy}")
        os.environ["no_proxy"] = "localhost"

    async def initialize(self):
@@ -125,6 +125,8 @@ class Plain(BaseMessageComponent):
    def toDict(self):
        return {"type": "text", "data": {"text": self.text.strip()}}

+    async def to_dict(self):
+        return {"type": "text", "data": {"text": self.text}}

 class Face(BaseMessageComponent):
    type: ComponentType = "Face"
@@ -610,6 +612,10 @@ class Node(BaseMessageComponent):
                        "data": {"file": f"base64://{bs64}"},
                    }
                )
+            elif isinstance(comp, Plain):
+                # For Plain segments, we need to handle the plain differently
+                d = await comp.to_dict()
+                data_content.append(d)
            elif isinstance(comp, File):
                # For File segments, we need to handle the file differently
                d = await comp.to_dict()
@@ -24,6 +24,8 @@ class MessageChain:

    chain: List[BaseMessageComponent] = field(default_factory=list)
    use_t2i_: Optional[bool] = None  # None 为跟随用户设置
+    type: Optional[str] = None
+    """消息链承载的消息的类型。可选，用于让消息平台区分不同业务场景的消息链。"""

    def message(self, message: str):
        """添加一条文本消息到消息链 `chain` 中。
@@ -98,6 +100,15 @@ class MessageChain:
        self.chain.append(Image.fromFileSystem(path))
        return self

+    def base64_image(self, base64_str: str):
+        """添加一条图片消息（base64 编码字符串）到消息链 `chain` 中。
+        Example:
+
+            CommandResult().base64_image("iVBORw0KGgoAAAANSUhEUgAAAAUA...")
+        """
+        self.chain.append(Image.fromBase64(base64_str))
+        return self
+
    def use_t2i(self, use_t2i: bool):
        """设置是否使用文本转图片服务。

@@ -157,7 +168,7 @@ class ResultContentType(enum.Enum):
    """普通的消息结果"""
    STREAMING_RESULT = enum.auto()
    """调用 LLM 产生的流式结果"""
-    STREAMING_FINISH= enum.auto()
+    STREAMING_FINISH = enum.auto()
    """流式输出完成"""


@@ -1,6 +1,14 @@
+import inspect
+import traceback
+import typing as T
 from dataclasses import dataclass
 from astrbot.core.config.astrbot_config import AstrBotConfig
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.star import PluginManager
+from astrbot.api import logger
+from astrbot.core.star.star_handler import star_handlers_registry, EventType
+from astrbot.core.star.star import star_map
+from astrbot.core.message.message_event_result import MessageEventResult, CommandResult


@dataclass
@@ -9,3 +17,97 @@ class PipelineContext:

    astrbot_config: AstrBotConfig  # AstrBot 配置对象
    plugin_manager: PluginManager  # 插件管理器对象
+
+    async def call_event_hook(
+        self,
+        event: AstrMessageEvent,
+        hook_type: EventType,
+        *args,
+    ) -> bool:
+        """调用事件钩子函数
+
+        Returns:
+            bool: 如果事件被终止，返回 True
+        """
+        platform_id = event.get_platform_id()
+        handlers = star_handlers_registry.get_handlers_by_event_type(
+            hook_type, platform_id=platform_id
+        )
+        for handler in handlers:
+            try:
+                logger.debug(
+                    f"hook(on_llm_request) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
+                )
+                await handler.handler(event, *args)
+            except BaseException:
+                logger.error(traceback.format_exc())
+
+            if event.is_stopped():
+                logger.info(
+                    f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
+                )
+
+        return event.is_stopped()
+
+    async def call_handler(
+        self,
+        event: AstrMessageEvent,
+        handler: T.Awaitable,
+        *args,
+        **kwargs,
+    ) -> T.AsyncGenerator[None, None]:
+        """执行事件处理函数并处理其返回结果
+
+        该方法负责调用处理函数并处理不同类型的返回值。它支持两种类型的处理函数:
+        1. 异步生成器: 实现洋葱模型，每次 yield 都会将控制权交回上层
+        2. 协程: 执行一次并处理返回值
+
+        Args:
+            ctx (PipelineContext): 消息管道上下文对象
+            event (AstrMessageEvent): 事件对象
+            handler (Awaitable): 事件处理函数
+
+        Returns:
+            AsyncGenerator[None, None]: 异步生成器，用于在管道中传递控制流
+        """
+        ready_to_call = None  # 一个协程或者异步生成器
+
+        trace_ = None
+
+        try:
+            ready_to_call = handler(event, *args, **kwargs)
+        except TypeError as _:
+            # 向下兼容
+            trace_ = traceback.format_exc()
+            # 以前的 handler 会额外传入一个参数, 但是 context 对象实际上在插件实例中有一份
+            ready_to_call = handler(event, self.plugin_manager.context, *args, **kwargs)
+
+        if inspect.isasyncgen(ready_to_call):
+            _has_yielded = False
+            try:
+                async for ret in ready_to_call:
+                    # 这里逐步执行异步生成器, 对于每个 yield 返回的 ret, 执行下面的代码
+                    # 返回值只能是 MessageEventResult 或者 None（无返回值）
+                    _has_yielded = True
+                    if isinstance(ret, (MessageEventResult, CommandResult)):
+                        # 如果返回值是 MessageEventResult, 设置结果并继续
+                        event.set_result(ret)
+                        yield
+                    else:
+                        # 如果返回值是 None, 则不设置结果并继续
+                        # 继续执行后续阶段
+                        yield ret
+                if not _has_yielded:
+                    # 如果这个异步生成器没有执行到 yield 分支
+                    yield
+            except Exception as e:
+                logger.error(f"Previous Error: {trace_}")
+                raise e
+        elif inspect.iscoroutine(ready_to_call):
+            # 如果只是一个协程, 直接执行
+            ret = await ready_to_call
+            if isinstance(ret, (MessageEventResult, CommandResult)):
+                event.set_result(ret)
+                yield
+            else:
+                yield ret
@@ -0,0 +1,57 @@
+import abc
+import typing as T
+from dataclasses import dataclass
+from astrbot.core.provider.entities import LLMResponse
+from ....message.message_event_result import MessageChain
+from enum import Enum, auto
+
+
+class AgentState(Enum):
+    """Agent 状态枚举"""
+    IDLE = auto()          # 初始状态
+    RUNNING = auto()       # 运行中
+    DONE = auto()          # 完成
+    ERROR = auto()         # 错误状态
+
+
+class AgentResponseData(T.TypedDict):
+    chain: MessageChain
+
+
+@dataclass
+class AgentResponse:
+    type: str
+    data: AgentResponseData
+
+
+class BaseAgentRunner:
+    @abc.abstractmethod
+    async def reset(self) -> None:
+        """
+        Reset the agent to its initial state.
+        This method should be called before starting a new run.
+        """
+        ...
+
+    @abc.abstractmethod
+    async def step(self) -> T.AsyncGenerator[AgentResponse, None]:
+        """
+        Process a single step of the agent.
+        """
+        ...
+
+    @abc.abstractmethod
+    def done(self) -> bool:
+        """
+        Check if the agent has completed its task.
+        Returns True if the agent is done, False otherwise.
+        """
+        ...
+
+    @abc.abstractmethod
+    def get_final_llm_resp(self) -> LLMResponse | None:
+        """
+        Get the final observation from the agent.
+        This method should be called after the agent is done.
+        """
+        ...
@@ -0,0 +1,306 @@
+import sys
+import traceback
+import typing as T
+from .base import BaseAgentRunner, AgentResponse, AgentResponseData, AgentState
+from ...context import PipelineContext
+from astrbot.core.provider.provider import Provider
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.message.message_event_result import (
+    MessageChain,
+)
+from astrbot.core.provider.entities import (
+    ProviderRequest,
+    LLMResponse,
+    ToolCallMessageSegment,
+    AssistantMessageSegment,
+    ToolCallsResult,
+)
+from mcp.types import (
+    TextContent,
+    ImageContent,
+    EmbeddedResource,
+    TextResourceContents,
+    BlobResourceContents,
+)
+from astrbot.core.star.star_handler import EventType
+from astrbot import logger
+
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+
+
+# TODO:
+# 1. 处理平台不兼容的处理器
+
+
+class ToolLoopAgent(BaseAgentRunner):
+    def __init__(
+        self, provider: Provider, event: AstrMessageEvent, pipeline_ctx: PipelineContext
+    ) -> None:
+        self.provider = provider
+        self.req = None
+        self.event = event
+        self.pipeline_ctx = pipeline_ctx
+        self._state = AgentState.IDLE
+        self.final_llm_resp = None
+        self.streaming = False
+
+    @override
+    async def reset(self, req: ProviderRequest, streaming: bool) -> None:
+        self.req = req
+        self.streaming = streaming
+        self.final_llm_resp = None
+        self._state = AgentState.IDLE
+
+    def _transition_state(self, new_state: AgentState) -> None:
+        """转换 Agent 状态"""
+        if self._state != new_state:
+            logger.debug(f"Agent state transition: {self._state} -> {new_state}")
+            self._state = new_state
+
+    async def _iter_llm_responses(self) -> T.AsyncGenerator[LLMResponse, None]:
+        """Yields chunks *and* a final LLMResponse."""
+        if self.streaming:
+            stream = self.provider.text_chat_stream(**self.req.__dict__)
+            async for resp in stream:  # type: ignore
+                yield resp
+        else:
+            yield await self.provider.text_chat(**self.req.__dict__)
+
+    @override
+    async def step(self):
+        """
+        Process a single step of the agent.
+        This method should return the result of the step.
+        """
+        if not self.req:
+            raise ValueError("Request is not set. Please call reset() first.")
+
+        # 开始处理，转换到运行状态
+        self._transition_state(AgentState.RUNNING)
+        llm_resp_result = None
+
+        async for llm_response in self._iter_llm_responses():
+            assert isinstance(llm_response, LLMResponse)
+            if llm_response.is_chunk:
+                if llm_response.result_chain:
+                    yield AgentResponse(
+                        type="streaming_delta",
+                        data=AgentResponseData(chain=llm_response.result_chain),
+                    )
+                else:
+                    yield AgentResponse(
+                        type="streaming_delta",
+                        data=AgentResponseData(
+                            chain=MessageChain().message(llm_response.completion_text)
+                        ),
+                    )
+                continue
+            llm_resp_result = llm_response
+            break  # got final response
+
+        if not llm_resp_result:
+            return
+
+        # 处理 LLM 响应
+        llm_resp = llm_resp_result
+
+        if llm_resp.role == "err":
+            # 如果 LLM 响应错误，转换到错误状态
+            self.final_llm_resp = llm_resp
+            self._transition_state(AgentState.ERROR)
+            yield AgentResponse(
+                type="err",
+                data=AgentResponseData(
+                    chain=MessageChain().message(
+                        f"LLM 响应错误: {llm_resp.completion_text or '未知错误'}"
+                    )
+                ),
+            )
+
+        if not llm_resp.tools_call_name:
+            # 如果没有工具调用，转换到完成状态
+            self.final_llm_resp = llm_resp
+            self._transition_state(AgentState.DONE)
+
+            # 执行事件钩子
+            if await self.pipeline_ctx.call_event_hook(
+                self.event, EventType.OnLLMResponseEvent, llm_resp
+            ):
+                return
+
+        # 返回 LLM 结果
+        if llm_resp.result_chain:
+            yield AgentResponse(
+                type="llm_result",
+                data=AgentResponseData(chain=llm_resp.result_chain),
+            )
+        elif llm_resp.completion_text:
+            yield AgentResponse(
+                type="llm_result",
+                data=AgentResponseData(
+                    chain=MessageChain().message(llm_resp.completion_text)
+                ),
+            )
+
+        # 如果有工具调用，还需处理工具调用
+        if llm_resp.tools_call_name:
+            tool_call_result_blocks = []
+            for tool_call_name in llm_resp.tools_call_name:
+                yield AgentResponse(
+                    type="tool_call",
+                    data=AgentResponseData(
+                        chain=MessageChain().message(f"🔨 调用工具: {tool_call_name}")
+                    ),
+                )
+            async for result in self._handle_function_tools(self.req, llm_resp):
+                if isinstance(result, list):
+                    tool_call_result_blocks = result
+                elif isinstance(result, MessageChain):
+                    yield AgentResponse(
+                        type="tool_call_result",
+                        data=AgentResponseData(chain=result),
+                    )
+            # 将结果添加到上下文中
+            tool_calls_result = ToolCallsResult(
+                tool_calls_info=AssistantMessageSegment(
+                    role="assistant",
+                    tool_calls=llm_resp.to_openai_tool_calls(),
+                    content=llm_resp.completion_text,
+                ),
+                tool_calls_result=tool_call_result_blocks,
+            )
+            self.req.append_tool_calls_result(tool_calls_result)
+
+    async def _handle_function_tools(
+        self,
+        req: ProviderRequest,
+        llm_response: LLMResponse,
+    ) -> T.AsyncGenerator[MessageChain | list[ToolCallMessageSegment], None]:
+        """处理函数工具调用。"""
+        tool_call_result_blocks: list[ToolCallMessageSegment] = []
+        logger.info(f"Agent 使用工具: {llm_response.tools_call_name}")
+
+        # 执行函数调用
+        for func_tool_name, func_tool_args, func_tool_id in zip(
+            llm_response.tools_call_name,
+            llm_response.tools_call_args,
+            llm_response.tools_call_ids,
+        ):
+            try:
+                if not req.func_tool:
+                    return
+                func_tool = req.func_tool.get_func(func_tool_name)
+                if func_tool.origin == "mcp":
+                    logger.info(
+                        f"从 MCP 服务 {func_tool.mcp_server_name} 调用工具函数：{func_tool.name}，参数：{func_tool_args}"
+                    )
+                    client = req.func_tool.mcp_client_dict[func_tool.mcp_server_name]
+                    res = await client.session.call_tool(func_tool.name, func_tool_args)
+                    if not res:
+                        continue
+                    if isinstance(res.content[0], TextContent):
+                        tool_call_result_blocks.append(
+                            ToolCallMessageSegment(
+                                role="tool",
+                                tool_call_id=func_tool_id,
+                                content=res.content[0].text,
+                            )
+                        )
+                        yield MessageChain().message(res.content[0].text)
+                    elif isinstance(res.content[0], ImageContent):
+                        tool_call_result_blocks.append(
+                            ToolCallMessageSegment(
+                                role="tool",
+                                tool_call_id=func_tool_id,
+                                content="返回了图片(已直接发送给用户)",
+                            )
+                        )
+                        yield MessageChain(type="tool_direct_result").base64_image(
+                            res.content[0].data
+                        )
+                    elif isinstance(res.content[0], EmbeddedResource):
+                        resource = res.content[0].resource
+                        if isinstance(resource, TextResourceContents):
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
+                                    tool_call_id=func_tool_id,
+                                    content=resource.text,
+                                )
+                            )
+                            yield MessageChain().message(resource.text)
+                        elif (
+                            isinstance(resource, BlobResourceContents)
+                            and resource.mimeType
+                            and resource.mimeType.startswith("image/")
+                        ):
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
+                                    tool_call_id=func_tool_id,
+                                    content="返回了图片(已直接发送给用户)",
+                                )
+                            )
+                            yield MessageChain(type="tool_direct_result").base64_image(
+                                res.content[0].data
+                            )
+                        else:
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
+                                    tool_call_id=func_tool_id,
+                                    content="返回的数据类型不受支持",
+                                )
+                            )
+                            yield MessageChain().message("返回的数据类型不受支持。")
+                else:
+                    logger.info(f"使用工具：{func_tool_name}，参数：{func_tool_args}")
+                    # 尝试调用工具函数
+                    wrapper = self.pipeline_ctx.call_handler(
+                        self.event, func_tool.handler, **func_tool_args
+                    )
+                    async for resp in wrapper:
+                        if resp is not None:
+                            # Tool 返回结果
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
+                                    tool_call_id=func_tool_id,
+                                    content=resp,
+                                )
+                            )
+                            yield MessageChain().message(resp)
+                        else:
+                            # Tool 直接请求发送消息给用户
+                            # 这里我们将直接结束 Agent Loop。
+                            self._transition_state(AgentState.DONE)
+                            if res := self.event.get_result():
+                                if res.chain:
+                                    yield MessageChain(
+                                        chain=res.chain, type="tool_direct_result"
+                                    )
+
+                self.event.clear_result()
+            except Exception as e:
+                logger.warning(traceback.format_exc())
+                tool_call_result_blocks.append(
+                    ToolCallMessageSegment(
+                        role="tool",
+                        tool_call_id=func_tool_id,
+                        content=f"error: {str(e)}",
+                    )
+                )
+
+        # 处理函数调用响应
+        if tool_call_result_blocks:
+            yield tool_call_result_blocks
+
+    def done(self) -> bool:
+        """检查 Agent 是否已完成工作"""
+        return self._state in (AgentState.DONE, AgentState.ERROR)
+
+    def get_final_llm_resp(self) -> LLMResponse | None:
+        return self.final_llm_resp
@@ -3,6 +3,7 @@
 """

 import traceback
+import copy
 import asyncio
 import json
 from typing import Union, AsyncGenerator
@@ -20,39 +21,27 @@ from astrbot.core.utils.metrics import Metric
 from astrbot.core.provider.entities import (
    ProviderRequest,
    LLMResponse,
-    ToolCallMessageSegment,
-    AssistantMessageSegment,
-    ToolCallsResult,
 )
-from astrbot.core.star.star_handler import star_handlers_registry, EventType
-from astrbot.core.star.star import star_map
-from mcp.types import (
-    TextContent,
-    ImageContent,
-    EmbeddedResource,
-    TextResourceContents,
-    BlobResourceContents,
-)
-from astrbot.core import web_chat_back_queue
+from astrbot.core.star.star_handler import EventType
+from ..agent_runner.tool_loop_agent import ToolLoopAgent
+from astrbot.core.provider import Provider


 class LLMRequestSubStage(Stage):
    async def initialize(self, ctx: PipelineContext) -> None:
        self.ctx = ctx
-        self.bot_wake_prefixs = ctx.astrbot_config["wake_prefix"]  # list
-        self.provider_wake_prefix = ctx.astrbot_config["provider_settings"][
-            "wake_prefix"
-        ]  # str
-        self.max_context_length = ctx.astrbot_config["provider_settings"][
-            "max_context_length"
-        ]  # int
-        self.dequeue_context_length = min(
-            max(1, ctx.astrbot_config["provider_settings"]["dequeue_context_length"]),
+        conf = ctx.astrbot_config
+        settings = conf["provider_settings"]
+        self.bot_wake_prefixs: list[str] = conf["wake_prefix"]  # list
+        self.provider_wake_prefix: str = settings["wake_prefix"]  # str
+        self.max_context_length = settings["max_context_length"]  # int
+        self.dequeue_context_length: int = min(
+            max(1, settings["dequeue_context_length"]),
            self.max_context_length - 1,
-        )  # int
-        self.streaming_response = ctx.astrbot_config["provider_settings"][
-            "streaming_response"
-        ]  # bool
+        )
+        self.streaming_response: bool = settings["streaming_response"]
+        self.max_step: int = settings.get("max_agent_step", 10)
+        self.show_tool_use: bool = settings.get("show_tool_use_status", True)

        for bwp in self.bot_wake_prefixs:
            if self.provider_wake_prefix.startswith(bwp):
@@ -63,16 +52,27 @@ class LLMRequestSubStage(Stage):

        self.conv_manager = ctx.plugin_manager.context.conversation_manager

+    def _select_provider(self, event: AstrMessageEvent) -> Provider | None:
+        """选择使用的 LLM 提供商"""
+        sel_provider = event.get_extra("selected_provider")
+        _ctx = self.ctx.plugin_manager.context
+        if sel_provider and isinstance(sel_provider, str):
+            provider = _ctx.get_provider_by_id(sel_provider)
+            if not provider:
+                logger.error(f"未找到指定的提供商: {sel_provider}。")
+            return provider
+
+        return _ctx.get_using_provider(umo=event.unified_msg_origin)
+
    async def process(
        self, event: AstrMessageEvent, _nested: bool = False
    ) -> Union[None, AsyncGenerator[None, None]]:
-        req: ProviderRequest = None
+        req: ProviderRequest | None = None

        if not self.ctx.astrbot_config["provider_settings"]["enable"]:
            logger.debug("未启用 LLM 能力，跳过处理。")
            return
-        umo = event.unified_msg_origin
-        provider = self.ctx.plugin_manager.context.get_using_provider(umo=umo)
+        provider = self._select_provider(event)
        if provider is None:
            return

@@ -83,13 +83,12 @@ class LLMRequestSubStage(Stage):
            )

            if req.conversation:
-                all_contexts = json.loads(req.conversation.history)
-                req.contexts = self._process_tool_message_pairs(
-                    all_contexts, remove_tags=True
-                )
+                req.contexts = json.loads(req.conversation.history)

        else:
            req = ProviderRequest(prompt="", image_urls=[])
+            if sel_model := event.get_extra("selected_model"):
+                req.model = sel_model
            if self.provider_wake_prefix:
                if not event.message_str.startswith(self.provider_wake_prefix):
                    return
@@ -127,26 +126,8 @@ class LLMRequestSubStage(Stage):
            return

        # 执行请求 LLM 前事件钩子。
-        # 装饰 system_prompt 等功能
-        # 获取当前平台ID
-        platform_id = event.get_platform_id()
-        handlers = star_handlers_registry.get_handlers_by_event_type(
-            EventType.OnLLMRequestEvent, platform_id=platform_id
-        )
-        for handler in handlers:
-            try:
-                logger.debug(
-                    f"hook(on_llm_request) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
-                )
-                await handler.handler(event, req)
-            except BaseException:
-                logger.error(traceback.format_exc())
-
-            if event.is_stopped():
-                logger.info(
-                    f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
-                )
-                return
+        if await self.ctx.call_event_hook(event, EventType.OnLLMRequestEvent, req):
+            return

        if isinstance(req.contexts, str):
            req.contexts = json.loads(req.contexts)
@@ -176,77 +157,74 @@ class LLMRequestSubStage(Stage):
        if not req.session_id:
            req.session_id = event.unified_msg_origin

-        async def requesting(req: ProviderRequest):
-            try:
-                need_loop = True
-                while need_loop:
-                    need_loop = False
-                    logger.debug(f"提供商请求 Payload: {req}")
+        # fix messages
+        req.contexts = self.fix_messages(req.contexts)

-                    final_llm_response = None
-
-                    if self.streaming_response:
-                        stream = provider.text_chat_stream(**req.__dict__)
-                        async for llm_response in stream:
-                            if llm_response.is_chunk:
-                                if llm_response.result_chain:
-                                    yield llm_response.result_chain  # MessageChain
-                                else:
-                                    yield MessageChain().message(
-                                        llm_response.completion_text
-                                    )
-                            else:
-                                final_llm_response = llm_response
-                    else:
-                        final_llm_response = await provider.text_chat(
-                            **req.__dict__
-                        )  # 请求 LLM
-
-                    if not final_llm_response:
-                        raise Exception("LLM response is None.")
-
-                    # 执行 LLM 响应后的事件钩子。
-                    handlers = star_handlers_registry.get_handlers_by_event_type(
-                        EventType.OnLLMResponseEvent
-                    )
-                    for handler in handlers:
-                        try:
-                            logger.debug(
-                                f"hook(on_llm_response) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
-                            )
-                            await handler.handler(event, final_llm_response)
-                        except BaseException:
-                            logger.error(traceback.format_exc())
+        # Call Agent
+        tool_loop_agent = ToolLoopAgent(
+            provider=provider,
+            event=event,
+            pipeline_ctx=self.ctx,
+        )
+        await tool_loop_agent.reset(req=req, streaming=self.streaming_response)

+        async def requesting():
+            step_idx = 0
+            while step_idx < self.max_step:
+                step_idx += 1
+                try:
+                    async for resp in tool_loop_agent.step():
                        if event.is_stopped():
-                            logger.info(
-                                f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
-                            )
                            return
+                        if resp.type == "tool_call_result":
+                            msg_chain = resp.data["chain"]
+                            if msg_chain.type == "tool_direct_result":
+                                # tool_direct_result 用于标记 llm tool 需要直接发送给用户的内容
+                                resp.data["chain"].type = "tool_call_result"
+                                await event.send(resp.data["chain"])
+                                continue
+                            # 对于其他情况，暂时先不处理
+                            continue
+                        elif resp.type == "tool_call":
+                            if self.streaming_response:
+                                # 用来标记流式响应需要分节
+                                yield MessageChain(chain=[], type="break")
+                            if (
+                                self.show_tool_use
+                                or event.get_platform_name() == "webchat"
+                            ):
+                                resp.data["chain"].type = "tool_call"
+                                await event.send(resp.data["chain"])
+                            continue

-                    if self.streaming_response:
-                        # 流式输出的处理
-                        async for result in self._handle_llm_stream_response(
-                            event, req, final_llm_response
-                        ):
-                            if isinstance(result, ProviderRequest):
-                                # 有函数工具调用并且返回了结果，我们需要再次请求 LLM
-                                req = result
-                                need_loop = True
-                            else:
-                                yield
-                    else:
-                        # 非流式输出的处理
-                        async for result in self._handle_llm_response(
-                            event, req, final_llm_response
-                        ):
-                            if isinstance(result, ProviderRequest):
-                                # 有函数工具调用并且返回了结果，我们需要再次请求 LLM
-                                req = result
-                                need_loop = True
-                            else:
-                                yield
+                        if not self.streaming_response:
+                            content_typ = (
+                                ResultContentType.LLM_RESULT
+                                if resp.type == "llm_result"
+                                else ResultContentType.GENERAL_RESULT
+                            )
+                            event.set_result(
+                                MessageEventResult(
+                                    chain=resp.data["chain"].chain,
+                                    result_content_type=content_typ,
+                                )
+                            )
+                            yield
+                            event.clear_result()
+                        else:
+                            if resp.type == "streaming_delta":
+                                yield resp.data["chain"]  # MessageChain
+                    if tool_loop_agent.done():
+                        break

+                except Exception as e:
+                    logger.error(traceback.format_exc())
+                    event.set_result(
+                        MessageEventResult().message(
+                            f"AstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {str(e)}"
+                        )
+                    )
+                    return
                asyncio.create_task(
                    Metric.upload(
                        llm_tick=1,
@@ -255,45 +233,41 @@ class LLMRequestSubStage(Stage):
                    )
                )

-                # 保存到历史记录
-                await self._save_to_history(event, req, final_llm_response)
-
-            except BaseException as e:
-                logger.error(traceback.format_exc())
-                event.set_result(
-                    MessageEventResult().message(
-                        f"AstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {str(e)}"
-                    )
-                )
-
-        if not self.streaming_response:
-            event.set_extra("tool_call_result", None)
-            async for _ in requesting(req):
-                yield
-        else:
+        if self.streaming_response:
+            # 流式响应
            event.set_result(
                MessageEventResult()
                .set_result_content_type(ResultContentType.STREAMING_RESULT)
-                .set_async_stream(requesting(req))
+                .set_async_stream(requesting())
            )
-            # 这里使用yield来暂停当前阶段，等待流式输出完成后继续处理
            yield
-
-            if event.get_extra("tool_call_result"):
-                event.set_result(event.get_extra("tool_call_result"))
-                event.set_extra("tool_call_result", None)
+            if tool_loop_agent.done():
+                if final_llm_resp := tool_loop_agent.get_final_llm_resp():
+                    if final_llm_resp.completion_text:
+                        chain = (
+                            MessageChain().message(final_llm_resp.completion_text).chain
+                        )
+                    else:
+                        chain = final_llm_resp.result_chain.chain
+                    event.set_result(
+                        MessageEventResult(
+                            chain=chain,
+                            result_content_type=ResultContentType.STREAMING_FINISH,
+                        )
+                    )
+        else:
+            async for _ in requesting():
                yield

-        # 暂时直接发出去
-        if img_b64 := event.get_extra("tool_call_img_respond"):
-            await event.send(MessageChain(chain=[Image.fromBase64(img_b64)]))
-            event.set_extra("tool_call_img_respond", None)
-
+        # 异步处理 WebChat 特殊情况
        if event.get_platform_name() == "webchat":
-            # 异步处理 WebChat 特殊情况
-            asyncio.create_task(self._handle_webchat(event, req))
+            asyncio.create_task(self._handle_webchat(event, req, provider))

-    async def _handle_webchat(self, event: AstrMessageEvent, req: ProviderRequest):
+        await self._save_to_history(event, req, tool_loop_agent.get_final_llm_resp())
+
+    async def _handle_webchat(
+        self, event: AstrMessageEvent, req: ProviderRequest, prov: Provider
+    ):
        """处理 WebChat 平台的特殊情况，包括第一次 LLM 对话时总结对话内容生成 title"""
        conversation = await self.conv_manager.get_conversation(
            event.unified_msg_origin, req.conversation.cid
@@ -303,21 +277,16 @@ class LLMRequestSubStage(Stage):
            latest_pair = messages[-2:]
            if not latest_pair:
                return
-            provider = self.ctx.plugin_manager.context.get_using_provider()
            cleaned_text = "User: " + latest_pair[0].get("content", "").strip()
-            # if len(latest_pair) > 1:
-            #     cleaned_text += (
-            #         "\nAssistant: " + latest_pair[1].get("content", "").strip()
-            #     )
            logger.debug(f"WebChat 对话标题生成请求，清理后的文本: {cleaned_text}")
-            llm_resp = await provider.text_chat(
+            llm_resp = await prov.text_chat(
                system_prompt="You are expert in summarizing user's query.",
                prompt=(
                    f"Please summarize the following query of user:\n"
                    f"{cleaned_text}\n"
                    "Only output the summary within 10 words, DO NOT INCLUDE any other text."
                    "You must use the same language as the user."
-                    "If you think the dialog is too short to summarize, only output a special mark: `None`"
+                    "If you think the dialog is too short to summarize, only output a special mark: `<None>`"
                ),
            )
            if llm_resp and llm_resp.completion_text:
@@ -325,7 +294,7 @@ class LLMRequestSubStage(Stage):
                    f"WebChat 对话标题生成响应: {llm_resp.completion_text.strip()}"
                )
                title = llm_resp.completion_text.strip()
-                if not title or "None" == title:
+                if not title or "<None>" in title:
                    return
                await self.conv_manager.update_conversation_title(
                    event.unified_msg_origin, title=title
@@ -341,330 +310,50 @@ class LLMRequestSubStage(Stage):
                        cid=cid,
                        title=title,
                    )
-                    web_chat_back_queue.put_nowait(
-                        {
-                            "type": "update_title",
-                            "cid": cid,
-                            "data": title,
-                        }
-                    )
-
-    async def _handle_llm_response(
-        self,
-        event: AstrMessageEvent,
-        req: ProviderRequest,
-        llm_response: LLMResponse,
-    ) -> AsyncGenerator[Union[None, ProviderRequest], None]:
-        """处理非流式 LLM 响应。
-
-        Returns:
-            AsyncGenerator[Union[None, ProviderRequest], None]: 如果返回 ProviderRequest，表示需要再次调用 LLM
-
-        Yields:
-            Iterator[Union[None, ProviderRequest]]: 将 event 交付给下一个 stage 或者返回 ProviderRequest 表示需要再次调用 LLM
-        """
-        if llm_response.role == "assistant":
-            # text completion
-            if llm_response.result_chain:
-                event.set_result(
-                    MessageEventResult(
-                        chain=llm_response.result_chain.chain
-                    ).set_result_content_type(ResultContentType.LLM_RESULT)
-                )
-            else:
-                event.set_result(
-                    MessageEventResult()
-                    .message(llm_response.completion_text)
-                    .set_result_content_type(ResultContentType.LLM_RESULT)
-                )
-        elif llm_response.role == "err":
-            event.set_result(
-                MessageEventResult().message(
-                    f"AstrBot 请求失败。\n错误信息: {llm_response.completion_text}"
-                )
-            )
-        elif llm_response.role == "tool":
-            # 处理函数工具调用
-            async for result in self._handle_function_tools(event, req, llm_response):
-                yield result
-
-    async def _handle_llm_stream_response(
-        self,
-        event: AstrMessageEvent,
-        req: ProviderRequest,
-        llm_response: LLMResponse,
-    ) -> AsyncGenerator[Union[None, ProviderRequest], None]:
-        """处理流式 LLM 响应。
-
-        专门用于处理流式输出完成后的响应，与非流式响应处理分离。
-
-        Returns:
-            AsyncGenerator[Union[None, ProviderRequest], None]: 如果返回 ProviderRequest，表示需要再次调用 LLM
-
-        Yields:
-            Iterator[Union[None, ProviderRequest]]: 将 event 交付给下一个 stage 或者返回 ProviderRequest 表示需要再次调用 LLM
-        """
-        if llm_response.role == "assistant":
-            # text completion
-            if llm_response.result_chain:
-                event.set_result(
-                    MessageEventResult(
-                        chain=llm_response.result_chain.chain
-                    ).set_result_content_type(ResultContentType.STREAMING_FINISH)
-                )
-            else:
-                event.set_result(
-                    MessageEventResult()
-                    .message(llm_response.completion_text)
-                    .set_result_content_type(ResultContentType.STREAMING_FINISH)
-                )
-        elif llm_response.role == "err":
-            event.set_result(
-                MessageEventResult().message(
-                    f"AstrBot 请求失败。\n错误信息: {llm_response.completion_text}"
-                )
-            )
-        elif llm_response.role == "tool":
-            # 处理函数工具调用
-            async for result in self._handle_function_tools(event, req, llm_response):
-                yield result
-
-    async def _handle_function_tools(
-        self,
-        event: AstrMessageEvent,
-        req: ProviderRequest,
-        llm_response: LLMResponse,
-    ) -> AsyncGenerator[Union[None, ProviderRequest], None]:
-        """处理函数工具调用。
-
-        Returns:
-            AsyncGenerator[Union[None, ProviderRequest], None]: 如果返回 ProviderRequest，表示需要再次调用 LLM
-        """
-        # function calling
-        tool_call_result: list[ToolCallMessageSegment] = []
-        logger.info(
-            f"触发 {len(llm_response.tools_call_name)} 个函数调用: {llm_response.tools_call_name}"
-        )
-        for func_tool_name, func_tool_args, func_tool_id in zip(
-            llm_response.tools_call_name,
-            llm_response.tools_call_args,
-            llm_response.tools_call_ids,
-        ):
-            try:
-                func_tool = req.func_tool.get_func(func_tool_name)
-                if func_tool.origin == "mcp":
-                    logger.info(
-                        f"从 MCP 服务 {func_tool.mcp_server_name} 调用工具函数：{func_tool.name}，参数：{func_tool_args}"
-                    )
-                    client = req.func_tool.mcp_client_dict[func_tool.mcp_server_name]
-                    res = await client.session.call_tool(func_tool.name, func_tool_args)
-                    if res:
-                        # TODO 仅对ImageContent | EmbeddedResource进行了简单的Fallback
-                        if isinstance(res.content[0], TextContent):
-                            tool_call_result.append(
-                                ToolCallMessageSegment(
-                                    role="tool",
-                                    tool_call_id=func_tool_id,
-                                    content=res.content[0].text,
-                                )
-                            )
-                        elif isinstance(res.content[0], ImageContent):
-                            tool_call_result.append(
-                                ToolCallMessageSegment(
-                                    role="tool",
-                                    tool_call_id=func_tool_id,
-                                    content="返回了图片(已直接发送给用户)",
-                                )
-                            )
-                            event.set_extra(
-                                "tool_call_img_respond",
-                                res.content[0].data,
-                            )
-                        elif isinstance(res.content[0], EmbeddedResource):
-                            resource = res.content[0].resource
-                            if isinstance(resource, TextResourceContents):
-                                tool_call_result.append(
-                                    ToolCallMessageSegment(
-                                        role="tool",
-                                        tool_call_id=func_tool_id,
-                                        content=resource.text,
-                                    )
-                                )
-                            elif (
-                                isinstance(resource, BlobResourceContents)
-                                and resource.mimeType
-                                and resource.mimeType.startswith("image/")
-                            ):
-                                tool_call_result.append(
-                                    ToolCallMessageSegment(
-                                        role="tool",
-                                        tool_call_id=func_tool_id,
-                                        content="返回了图片(已直接发送给用户)",
-                                    )
-                                )
-                                event.set_extra(
-                                    "tool_call_img_respond",
-                                    res.content[0].data,
-                                )
-                            else:
-                                tool_call_result.append(
-                                    ToolCallMessageSegment(
-                                        role="tool",
-                                        tool_call_id=func_tool_id,
-                                        content="返回的数据类型不受支持",
-                                    )
-                                )
-                else:
-                    # 获取处理器，过滤掉平台不兼容的处理器
-                    platform_id = event.get_platform_id()
-                    star_md = star_map.get(func_tool.handler_module_path)
-                    if (
-                        star_md
-                        and platform_id in star_md.supported_platforms
-                        and not star_md.supported_platforms[platform_id]
-                    ):
-                        logger.debug(
-                            f"处理器 {func_tool_name}({star_md.name}) 在当前平台不兼容或者被禁用，跳过执行"
-                        )
-                        # 直接跳过，不添加任何消息到tool_call_result
-                        continue
-
-                    logger.info(
-                        f"调用工具函数：{func_tool_name}，参数：{func_tool_args}"
-                    )
-                    # 尝试调用工具函数
-                    wrapper = self._call_handler(
-                        self.ctx, event, func_tool.handler, **func_tool_args
-                    )
-                    async for resp in wrapper:
-                        if resp is not None:  # 有 return 返回
-                            tool_call_result.append(
-                                ToolCallMessageSegment(
-                                    role="tool",
-                                    tool_call_id=func_tool_id,
-                                    content=resp,
-                                )
-                            )
-                        else:
-                            res = event.get_result()
-                            if res and res.chain:
-                                event.set_extra("tool_call_result", res)
-                            yield  # 有生成器返回
-                event.clear_result()  # 清除上一个 handler 的结果
-            except BaseException as e:
-                logger.warning(traceback.format_exc())
-                tool_call_result.append(
-                    ToolCallMessageSegment(
-                        role="tool",
-                        tool_call_id=func_tool_id,
-                        content=f"error: {str(e)}",
-                    )
-                )
-        if tool_call_result:
-            # 函数调用结果
-            req.func_tool = None  # 暂时不支持递归工具调用
-            assistant_msg_seg = AssistantMessageSegment(
-                role="assistant", tool_calls=llm_response.to_openai_tool_calls()
-            )
-            # 在多轮 Tool 调用的情况下，这里始终保持最新的 Tool 调用结果，减少上下文长度。
-            req.tool_calls_result = ToolCallsResult(
-                tool_calls_info=assistant_msg_seg,
-                tool_calls_result=tool_call_result,
-            )
-            yield req  # 再次执行 LLM 请求
-        else:
-            if llm_response.completion_text:
-                event.set_result(
-                    MessageEventResult().message(llm_response.completion_text)
-                )

    async def _save_to_history(
-        self, event: AstrMessageEvent, req: ProviderRequest, llm_response: LLMResponse
+        self,
+        event: AstrMessageEvent,
+        req: ProviderRequest,
+        llm_response: LLMResponse | None,
    ):
-        if not req or not req.conversation or not llm_response:
+        if (
+            not req
+            or not req.conversation
+            or not llm_response
+            or llm_response.role != "assistant"
+        ):
            return

-        if llm_response.role == "assistant":
-            # 文本回复
-            contexts = req.contexts.copy()
-            contexts.append(await req.assemble_context())
+        # 历史上下文
+        messages = copy.deepcopy(req.contexts)
+        # 这一轮对话请求的用户输入
+        messages.append(await req.assemble_context())
+        # 这一轮对话的 LLM 响应
+        if req.tool_calls_result:
+            if not isinstance(req.tool_calls_result, list):
+                messages.extend(req.tool_calls_result.to_openai_messages())
+            elif isinstance(req.tool_calls_result, list):
+                for tcr in req.tool_calls_result:
+                    messages.extend(tcr.to_openai_messages())
+        messages.append({"role": "assistant", "content": llm_response.completion_text})
+        messages = list(filter(lambda item: "_no_save" not in item, messages))
+        await self.conv_manager.update_conversation(
+            event.unified_msg_origin, req.conversation.cid, history=messages
+        )

-            # 记录并标记函数调用结果
-            if req.tool_calls_result:
-                tool_calls_messages = req.tool_calls_result.to_openai_messages()
-
-                # 添加标记
-                for message in tool_calls_messages:
-                    message["_tool_call_history"] = True
-
-                processed_tool_messages = self._process_tool_message_pairs(
-                    tool_calls_messages, remove_tags=False
-                )
-
-                contexts.extend(processed_tool_messages)
-
-            contexts.append(
-                {"role": "assistant", "content": llm_response.completion_text}
-            )
-            contexts_to_save = list(
-                filter(lambda item: "_no_save" not in item, contexts)
-            )
-            await self.conv_manager.update_conversation(
-                event.unified_msg_origin, req.conversation.cid, history=contexts_to_save
-            )
-
-    def _process_tool_message_pairs(self, messages, remove_tags=True):
-        """处理工具调用消息，确保assistant和tool消息成对出现
-
-        Args:
-            messages (list): 消息列表
-            remove_tags (bool): 是否移除_tool_call_history标记
-
-        Returns:
-            list: 处理后的消息列表，保证了assistant和对应tool消息的成对出现
-        """
-        result = []
-        i = 0
-
-        while i < len(messages):
-            current_msg = messages[i]
-
-            # 普通消息直接添加
-            if "_tool_call_history" not in current_msg:
-                result.append(current_msg.copy() if remove_tags else current_msg)
-                i += 1
-                continue
-
-            # 工具调用消息成对处理
-            if current_msg.get("role") == "assistant" and "tool_calls" in current_msg:
-                assistant_msg = current_msg.copy()
-
-                if remove_tags and "_tool_call_history" in assistant_msg:
-                    del assistant_msg["_tool_call_history"]
-
-                related_tools = []
-                j = i + 1
-                while (
-                    j < len(messages)
-                    and messages[j].get("role") == "tool"
-                    and "_tool_call_history" in messages[j]
-                ):
-                    tool_msg = messages[j].copy()
-
-                    if remove_tags:
-                        del tool_msg["_tool_call_history"]
-
-                    related_tools.append(tool_msg)
-                    j += 1
-
-                # 成对的时候添加到结果
-                if related_tools:
-                    result.append(assistant_msg)
-                    result.extend(related_tools)
-
-                i = j  # 跳过已处理
+    def fix_messages(self, messages: list[dict]) -> list[dict]:
+        """验证并且修复上下文"""
+        fixed_messages = []
+        for message in messages:
+            if message.get("role") == "tool":
+                # tool block 前面必须要有 user 和 assistant block
+                if len(fixed_messages) < 2:
+                    # 这种情况可能是上下文被截断导致的
+                    # 我们直接将之前的上下文都清空
+                    fixed_messages = []
+                else:
+                    fixed_messages.append(message)
            else:
-                # 单独的tool消息
-                i += 1
-
-        return result
+                fixed_messages.append(message)
+        return fixed_messages
@@ -50,7 +50,7 @@ class StarRequestSubStage(Stage):
                logger.debug(
                    f"plugin -> {star_map.get(handler.handler_module_path).name} - {handler.handler_name}"
                )
-                wrapper = self._call_handler(self.ctx, event, handler.handler, **params)
+                wrapper = self.ctx.call_handler(event, handler.handler, **params)
                async for ret in wrapper:
                    yield ret
                event.clear_result()  # 清除上一个 handler 的结果
@@ -128,9 +128,7 @@ class RespondStage(Stage):
                "streaming_segmented", False
            )
            logger.info(f"应用流式输出({event.get_platform_name()})")
-            await event._pre_send()
            await event.send_streaming(result.async_stream, use_fallback)
-            await event._post_send()
            return
        elif len(result.chain) > 0:
            # 检查路径映射
@@ -141,8 +139,6 @@ class RespondStage(Stage):
                        component.file = path_Mapping(mappings, component.file)
                        event.get_result().chain[idx] = component

-            await event._pre_send()
-
            # 检查消息链是否为空
            try:
                if await self._is_empty_message_chain(result.chain):
@@ -158,9 +154,14 @@ class RespondStage(Stage):
                c for c in result.chain if not isinstance(c, Comp.Record)
            ]

-            if self.enable_seg and (
-                (self.only_llm_result and result.is_llm_result())
-                or not self.only_llm_result
+            if (
+                self.enable_seg
+                and (
+                    (self.only_llm_result and result.is_llm_result())
+                    or not self.only_llm_result
+                )
+                and event.get_platform_name()
+                not in ["qq_official", "weixin_official_account", "dingtalk"]
            ):
                decorated_comps = []
                if self.reply_with_mention:
@@ -208,7 +209,6 @@ class RespondStage(Stage):
                    logger.error(traceback.format_exc())
                    logger.error(f"发送消息失败: {e} chain: {result.chain}")

-            await event._post_send()
            logger.info(
                f"AstrBot -> {event.get_sender_name()}/{event.get_sender_id()}: {event._outline_chain(result.chain)}"
            )
@@ -141,7 +141,11 @@ class ResultDecorateStage(Stage):
                        break

            # 分段回复
-            if self.enable_segmented_reply:
+            if self.enable_segmented_reply and event.get_platform_name() not in [
+                "qq_official",
+                "weixin_official_account",
+                "dingtalk",
+            ]:
                if (
                    self.only_llm_result and result.is_llm_result()
                ) or not self.only_llm_result:
@@ -73,7 +73,7 @@ class PipelineScheduler:
        await self._process_stages(event)

        # 如果没有发送操作, 则发送一个空消息, 以便于后续的处理
-        if not event._has_send_oper and event.get_platform_name() == "webchat":
+        if event.get_platform_name() == "webchat":
            await event.send(None)

        logger.debug("pipeline 执行完毕。")
@@ -1,12 +1,8 @@
 from __future__ import annotations
 import abc
-import inspect
-import traceback
-from astrbot.api import logger
-from typing import List, AsyncGenerator, Union, Awaitable
+from typing import List, AsyncGenerator, Union
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from .context import PipelineContext
-from astrbot.core.message.message_event_result import MessageEventResult, CommandResult

 registered_stages: List[Stage] = []  # 维护了所有已注册的 Stage 实现类

@@ -41,70 +37,3 @@ class Stage(abc.ABC):
            Union[None, AsyncGenerator[None, None]]: 处理结果，可能是 None 或者异步生成器, 如果为 None 则表示不需要继续处理, 如果为异步生成器则表示需要继续处理(进入下一个阶段)
        """
        raise NotImplementedError
-
-    async def _call_handler(
-        self,
-        ctx: PipelineContext,
-        event: AstrMessageEvent,
-        handler: Awaitable,
-        *args,
-        **kwargs,
-    ) -> AsyncGenerator[None, None]:
-        """执行事件处理函数并处理其返回结果
-
-        该方法负责调用处理函数并处理不同类型的返回值。它支持两种类型的处理函数:
-        1. 异步生成器: 实现洋葱模型，每次yield都会将控制权交回上层
-        2. 协程: 执行一次并处理返回值
-
-        Args:
-            ctx (PipelineContext): 消息管道上下文对象
-            event (AstrMessageEvent): 待处理的事件对象
-            handler (Awaitable): 事件处理函数
-            *args: 传递给handler的位置参数
-            **kwargs: 传递给handler的关键字参数
-
-        Returns:
-            AsyncGenerator[None, None]: 异步生成器，用于在管道中传递控制流
-        """
-        ready_to_call = None  # 一个协程或者异步生成器(async def)
-
-        trace_ = None
-
-        try:
-            ready_to_call = handler(event, *args, **kwargs)
-        except TypeError as _:
-            # 向下兼容
-            trace_ = traceback.format_exc()
-            # 以前的handler会额外传入一个参数, 但是context对象实际上在插件实例中有一份
-            ready_to_call = handler(event, ctx.plugin_manager.context, *args, **kwargs)
-
-        if isinstance(ready_to_call, AsyncGenerator):
-            # 如果是一个异步生成器, 进入洋葱模型
-            _has_yielded = False  # 是否返回过值
-            try:
-                async for ret in ready_to_call:
-                    # 这里逐步执行异步生成器, 对于每个yield返回的ret, 执行下面的代码
-                    # 返回值只能是 MessageEventResult 或者 None（无返回值）
-                    _has_yielded = True
-                    if isinstance(ret, (MessageEventResult, CommandResult)):
-                        # 如果返回值是 MessageEventResult, 设置结果并继续
-                        event.set_result(ret)
-                        yield  # 传递控制权给上一层的process函数
-                    else:
-                        # 如果返回值是 None, 则不设置结果并继续
-                        # 继续执行后续阶段
-                        yield ret  # 传递控制权给上一层的process函数
-                if not _has_yielded:
-                    # 如果这个异步生成器没有执行到yield分支
-                    yield
-            except Exception as e:
-                logger.error(f"Previous Error: {trace_}")
-                raise e
-        elif inspect.iscoroutine(ready_to_call):
-            # 如果只是一个协程, 直接执行
-            ret = await ready_to_call
-            if isinstance(ret, (MessageEventResult, CommandResult)):
-                event.set_result(ret)
-                yield  # 传递控制权给上一层的process函数
-            else:
-                yield ret  # 传递控制权给上一层的process函数
@@ -135,7 +135,6 @@ class WakingCheckStage(Stage):
                            f"插件 {star_map[handler.handler_module_path].name}: {e}"
                        )
                    )
-                    await event._post_send()
                    event.stop_event()
                    passed = False
                    break
@@ -150,7 +149,6 @@ class WakingCheckStage(Stage):
                                f"您(ID: {event.get_sender_id()})的权限不足以使用此指令。通过 /sid 获取 ID 并请管理员添加。"
                            )
                        )
-                        await event._post_send()
                    logger.info(
                        f"触发 {star_map[handler.handler_module_path].name} 时, 用户(ID={event.get_sender_id()}) 权限不足。"
                    )
@@ -166,7 +164,7 @@ class WakingCheckStage(Stage):
                        "parsed_params"
                    )

-            event.clear_extra()
+            event._extras.pop("parsed_params", None)

        event.set_extra("activated_handlers", activated_handlers)
        event.set_extra("handlers_parsed_params", handlers_parsed_params)
@@ -235,10 +235,10 @@ class AstrMessageEvent(abc.ABC):
        self._has_send_oper = True

    async def _pre_send(self):
-        """调度器会在执行 send() 前调用该方法"""
+        """调度器会在执行 send() 前调用该方法 deprecated in v3.5.18"""

    async def _post_send(self):
-        """调度器会在执行 send() 后调用该方法"""
+        """调度器会在执行 send() 后调用该方法 deprecated in v3.5.18"""

    def set_result(self, result: Union[MessageEventResult, str]):
        """设置消息事件的结果。
@@ -1,7 +1,7 @@
 import asyncio
 import re
 from typing import AsyncGenerator, Dict, List
-from aiocqhttp import CQHttp
+from aiocqhttp import CQHttp, Event
 from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.api.message_components import (
    Image,
@@ -58,50 +58,85 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
            ret.append(d)
        return ret

-    async def send(self, message: MessageChain):
+    @classmethod
+    async def _dispatch_send(
+        cls,
+        bot: CQHttp,
+        event: Event | None,
+        is_group: bool,
+        session_id: str,
+        messages: list[dict],
+    ):
+        if event:
+            await bot.send(event=event, message=messages)
+        elif is_group:
+            await bot.send_group_msg(group_id=session_id, message=messages)
+        else:
+            await bot.send_private_msg(user_id=session_id, message=messages)
+
+    @classmethod
+    async def send_message(
+        cls,
+        bot: CQHttp,
+        message_chain: MessageChain,
+        event: Event | None = None,
+        is_group: bool = False,
+        session_id: str = None,
+    ):
+        """发送消息"""
+
        # 转发消息、文件消息不能和普通消息混在一起发送
        send_one_by_one = any(
-            isinstance(seg, (Node, Nodes, File)) for seg in message.chain
+            isinstance(seg, (Node, Nodes, File)) for seg in message_chain.chain
        )
-        if send_one_by_one:
-            for seg in message.chain:
-                if isinstance(seg, (Node, Nodes)):
-                    # 合并转发消息
-
-                    if isinstance(seg, Node):
-                        nodes = Nodes([seg])
-                        seg = nodes
-
-                    payload = await seg.to_dict()
-
-                    if self.get_group_id():
-                        payload["group_id"] = self.get_group_id()
-                        await self.bot.call_action("send_group_forward_msg", **payload)
-                    else:
-                        payload["user_id"] = self.get_sender_id()
-                        await self.bot.call_action(
-                            "send_private_forward_msg", **payload
-                        )
-                elif isinstance(seg, File):
-                    d = await AiocqhttpMessageEvent._from_segment_to_dict(seg)
-                    await self.bot.send(
-                        self.message_obj.raw_message,
-                        [d],
-                    )
-                else:
-                    await self.bot.send(
-                        self.message_obj.raw_message,
-                        await AiocqhttpMessageEvent._parse_onebot_json(
-                            MessageChain([seg])
-                        ),
-                    )
-                    await asyncio.sleep(0.5)
-        else:
-            ret = await AiocqhttpMessageEvent._parse_onebot_json(message)
+        if not send_one_by_one:
+            ret = await cls._parse_onebot_json(message_chain)
            if not ret:
                return
-            await self.bot.send(self.message_obj.raw_message, ret)
+            await cls._dispatch_send(bot, event, is_group, session_id, ret)
+            return
+        for seg in message_chain.chain:
+            if isinstance(seg, (Node, Nodes)):
+                # 合并转发消息
+                if isinstance(seg, Node):
+                    nodes = Nodes([seg])
+                    seg = nodes

+                payload = await seg.to_dict()
+
+                if is_group:
+                    payload["group_id"] = session_id
+                    await bot.call_action("send_group_forward_msg", **payload)
+                else:
+                    payload["user_id"] = session_id
+                    await bot.call_action("send_private_forward_msg", **payload)
+            elif isinstance(seg, File):
+                d = await cls._from_segment_to_dict(seg)
+                await cls._dispatch_send(bot, event, is_group, session_id, [d])
+            else:
+                messages = await cls._parse_onebot_json(MessageChain([seg]))
+                if not messages:
+                    continue
+                await cls._dispatch_send(bot, event, is_group, session_id, messages)
+                await asyncio.sleep(0.5)
+
+    async def send(self, message: MessageChain):
+        """发送消息"""
+        event = self.message_obj.raw_message
+        assert isinstance(event, Event), "Event must be an instance of aiocqhttp.Event"
+        is_group = False
+        if self.get_group_id():
+            is_group = True
+            session_id = self.get_group_id()
+        else:
+            session_id = self.get_sender_id()
+        await self.send_message(
+            bot=self.bot,
+            message_chain=message,
+            event=event,
+            is_group=is_group,
+            session_id=session_id,
+        )
        await super().send(message)

    async def send_streaming(
@@ -83,19 +83,18 @@ class AiocqhttpAdapter(Platform):
    async def send_by_session(
        self, session: MessageSesion, message_chain: MessageChain
    ):
-        ret = await AiocqhttpMessageEvent._parse_onebot_json(message_chain)
-        match session.message_type.value:
-            case MessageType.GROUP_MESSAGE.value:
-                if "_" in session.session_id:
-                    # 独立会话
-                    _, group_id = session.session_id.split("_")
-                    await self.bot.send_group_msg(group_id=group_id, message=ret)
-                else:
-                    await self.bot.send_group_msg(
-                        group_id=session.session_id, message=ret
-                    )
-            case MessageType.FRIEND_MESSAGE.value:
-                await self.bot.send_private_msg(user_id=session.session_id, message=ret)
+        is_group = session.message_type == MessageType.GROUP_MESSAGE
+        if is_group:
+            session_id = session.session_id.split("_")[-1]
+        else:
+            session_id = session.session_id
+        await AiocqhttpMessageEvent.send_message(
+            bot=self.bot,
+            message_chain=message_chain,
+            event=None,  # 这里不需要 event，因为是通过 session 发送的
+            is_group=is_group,
+            session_id=session_id,
+        )
        await super().send_by_session(session, message_chain)

    async def convert_message(self, event: Event) -> AstrBotMessage:
@@ -168,9 +167,7 @@ class AiocqhttpAdapter(Platform):

        if "sub_type" in event:
            if event["sub_type"] == "poke" and "target_id" in event:
-                abm.message.append(
-                    Poke(qq=str(event["target_id"]), type="poke")
-                )  # noqa: F405
+                abm.message.append(Poke(qq=str(event["target_id"]), type="poke"))  # noqa: F405

        return abm

@@ -273,6 +270,8 @@ class AiocqhttpAdapter(Platform):
                                action="get_msg",
                                message_id=int(m["data"]["id"]),
                            )
+                            # 添加必要的 post_type 字段，防止 Event.from_payload 报错
+                            reply_event_data["post_type"] = "message"
                            abm_reply = await self._convert_handle_message_event(
                                Event.from_payload(reply_event_data), get_reply=False
                            )
@@ -307,7 +306,9 @@ class AiocqhttpAdapter(Platform):
                            user_id=int(m["data"]["qq"]),
                        )
                        if at_info:
-                            nickname = at_info.get("nick", "")
+                            nickname = at_info.get("nick", "") or at_info.get(
+                                "nickname", ""
+                            )
                            is_at_self = str(m["data"]["qq"]) in {abm.self_id, "all"}

                            abm.message.append(
@@ -322,7 +323,7 @@ class AiocqhttpAdapter(Platform):
                                first_at_self_processed = True
                            else:
                                # 非第一个@机器人或@其他用户，添加到message_str
-                                message_str += f" @{nickname} "
+                                message_str += f" @{nickname}({m['data']['qq']}) "
                        else:
                            abm.message.append(At(qq=str(m["data"]["qq"]), name=""))
                    except ActionFailed as e:
@@ -46,6 +46,8 @@ class DiscordPlatformAdapter(Platform):
        self.enable_command_register = self.config.get("discord_command_register", True)
        self.guild_id = self.config.get("discord_guild_id_for_debug", None)
        self.activity_name = self.config.get("discord_activity_name", None)
+        self.shutdown_event = asyncio.Event()
+        self._polling_task = None

    @override
    async def send_by_session(
@@ -137,7 +139,8 @@ class DiscordPlatformAdapter(Platform):
        self.client.on_ready_once_callback = callback

        try:
-            await self.client.start_polling()
+            self._polling_task = asyncio.create_task(self.client.start_polling())
+            await self.shutdown_event.wait()
        except discord.errors.LoginFailure:
            logger.error("[Discord] 登录失败。请检查你的 Bot Token 是否正确。")
        except discord.errors.ConnectionClosed:
@@ -162,42 +165,47 @@ class DiscordPlatformAdapter(Platform):
    def _convert_message_to_abm(self, data: dict) -> AstrBotMessage:
        """将普通消息转换为 AstrBotMessage"""
        message: discord.Message = data["message"]
-        is_mentioned = data.get("is_mentioned", False)

        content = message.content

        # 如果机器人被@，移除@部分
-        if (
-            is_mentioned
-            and self.client
-            and self.client.user
-            and self.client.user in message.mentions
-        ):
-            # 构建机器人的@字符串，格式为 <@USER_ID> 或 <@!USER_ID>
+        # 剥离 User Mention (<@id>, <@!id>)
+        if self.client and self.client.user:
            mention_str = f"<@{self.client.user.id}>"
-            mention_str_nickname = (
-                f"<@!{self.client.user.id}>"  # 有些客户端会使用带!的格式
-            )
-
+            mention_str_nickname = f"<@!{self.client.user.id}>"
            if content.startswith(mention_str):
                content = content[len(mention_str) :].lstrip()
            elif content.startswith(mention_str_nickname):
                content = content[len(mention_str_nickname) :].lstrip()

-        abm = AstrBotMessage()
+        # 剥离 Role Mention（bot 拥有的任一角色被提及，<@&role_id>）
+        if (
+            hasattr(message, "role_mentions")
+            and hasattr(message, "guild")
+            and message.guild
+        ):
+            bot_member = (
+                message.guild.get_member(self.client.user.id)
+                if self.client and self.client.user
+                else None
+            )
+            if bot_member and hasattr(bot_member, "roles"):
+                for role in bot_member.roles:
+                    role_mention_str = f"<@&{role.id}>"
+                    if content.startswith(role_mention_str):
+                        content = content[len(role_mention_str) :].lstrip()
+                        break  # 只剥离第一个匹配的角色 mention

+        abm = AstrBotMessage()
        abm.type = self._get_message_type(message.channel)
        abm.group_id = self._get_channel_id(message.channel)
-
        abm.message_str = content
        abm.sender = MessageMember(
            user_id=str(message.author.id), nickname=message.author.display_name
        )
-
        message_chain = []
        if abm.message_str:
            message_chain.append(Plain(text=abm.message_str))
-
        if message.attachments:
            for attachment in message.attachments:
                if attachment.content_type and attachment.content_type.startswith(
@@ -210,7 +218,6 @@ class DiscordPlatformAdapter(Platform):
                    message_chain.append(
                        File(name=attachment.filename, url=attachment.url)
                    )
-
        abm.message = message_chain
        abm.raw_message = message
        abm.self_id = self.client_self_id
@@ -237,13 +244,35 @@ class DiscordPlatformAdapter(Platform):
        # 检查是否为斜杠指令
        is_slash_command = message_event.interaction_followup_webhook is not None

-        # 检查是否被@
-        is_mention = (
+        # 检查是否被@（User Mention 或 Bot 拥有的 Role Mention）
+        is_mention = False
+        # User Mention
+        if (
            self.client
            and self.client.user
            and hasattr(message.raw_message, "mentions")
-            and self.client.user in message.raw_message.mentions
-        )
+        ):
+            if self.client.user in message.raw_message.mentions:
+                is_mention = True
+        # Role Mention（Bot 拥有的角色被提及）
+        if not is_mention and hasattr(message.raw_message, "role_mentions"):
+            bot_member = None
+            if hasattr(message.raw_message, "guild") and message.raw_message.guild:
+                try:
+                    bot_member = message.raw_message.guild.get_member(
+                        self.client.user.id
+                    )
+                except Exception:
+                    bot_member = None
+            if bot_member and hasattr(bot_member, "roles"):
+                bot_roles = set(bot_member.roles)
+                mentioned_roles = set(message.raw_message.role_mentions)
+                if (
+                    bot_roles
+                    and mentioned_roles
+                    and bot_roles.intersection(mentioned_roles)
+                ):
+                    is_mention = True

        # 如果是斜杠指令或被@的消息，设置为唤醒状态
        if is_slash_command or is_mention:
@@ -255,23 +284,37 @@ class DiscordPlatformAdapter(Platform):
    @override
    async def terminate(self):
        """终止适配器"""
-        logger.info("[Discord] 正在终止适配器...")
-
+        logger.info("[Discord] 正在终止适配器... (step 1: cancel polling task)")
+        self.shutdown_event.set()
+        # 优先 cancel polling_task
+        if self._polling_task:
+            self._polling_task.cancel()
+            try:
+                await asyncio.wait_for(self._polling_task, timeout=10)
+            except asyncio.CancelledError:
+                logger.info("[Discord] polling_task 已取消。")
+            except Exception as e:
+                logger.warning(f"[Discord] polling_task 取消异常: {e}")
+        logger.info("[Discord] 正在清理已注册的斜杠指令... (step 2)")
        # 清理指令
        if self.enable_command_register and self.client:
-            logger.info("[Discord] 正在清理已注册的斜杠指令...")
            try:
-                # 传入空的列表来清除所有全局指令
-                # 如果指定了 guild_id，则只清除该服务器的指令
-                await self.client.sync_commands(
-                    commands=[], guild_ids=[self.guild_id] if self.guild_id else None
+                await asyncio.wait_for(
+                    self.client.sync_commands(
+                        commands=[],
+                        guild_ids=[self.guild_id] if self.guild_id else None,
+                    ),
+                    timeout=10,
                )
                logger.info("[Discord] 指令清理完成。")
            except Exception as e:
                logger.error(f"[Discord] 清理指令时发生错误: {e}", exc_info=True)
-
+        logger.info("[Discord] 正在关闭 Discord 客户端... (step 3)")
        if self.client and hasattr(self.client, "close"):
-            await self.client.close()
+            try:
+                await asyncio.wait_for(self.client.close(), timeout=10)
+            except Exception as e:
+                logger.warning(f"[Discord] 客户端关闭异常: {e}")
        logger.info("[Discord] 适配器已终止。")

    def register_handler(self, handler_info):
@@ -28,10 +28,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
        self.send_buffer = None

    async def send(self, message: MessageChain):
-        if not self.send_buffer:
-            self.send_buffer = message
-        else:
-            self.send_buffer.chain.extend(message.chain)
+        self.send_buffer = message
+        await self._post_send()

    async def send_streaming(self, generator, use_fallback: bool = False):
        """流式输出仅支持消息列表私聊"""
@@ -40,20 +40,21 @@ class TelegramPlatformEvent(AstrMessageEvent):
        super().__init__(message_str, message_obj, platform_meta, session_id)
        self.client = client

-    def _split_message(self, text: str) -> list[str]:
-        if len(text) <= self.MAX_MESSAGE_LENGTH:
+    @classmethod
+    def _split_message(cls, text: str) -> list[str]:
+        if len(text) <= cls.MAX_MESSAGE_LENGTH:
            return [text]

        chunks = []
        while text:
-            if len(text) <= self.MAX_MESSAGE_LENGTH:
+            if len(text) <= cls.MAX_MESSAGE_LENGTH:
                chunks.append(text)
                break

-            split_point = self.MAX_MESSAGE_LENGTH
-            segment = text[: self.MAX_MESSAGE_LENGTH]
+            split_point = cls.MAX_MESSAGE_LENGTH
+            segment = text[: cls.MAX_MESSAGE_LENGTH]

-            for _, pattern in self.SPLIT_PATTERNS.items():
+            for _, pattern in cls.SPLIT_PATTERNS.items():
                if matches := list(pattern.finditer(segment)):
                    last_match = matches[-1]
                    split_point = last_match.end()
@@ -64,9 +65,8 @@ class TelegramPlatformEvent(AstrMessageEvent):

        return chunks

-    async def send_with_client(
-        self, client: ExtBot, message: MessageChain, user_name: str
-    ):
+    @classmethod
+    async def send_with_client(cls, client: ExtBot, message: MessageChain, user_name: str):
        image_path = None

        has_reply = False
@@ -97,7 +97,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
                if at_user_id and not at_flag:
                    i.text = f"@{at_user_id} {i.text}"
                    at_flag = True
-                chunks = self._split_message(i.text)
+                chunks = cls._split_message(i.text)
                for chunk in chunks:
                    try:
                        md_text = telegramify_markdown.markdownify(
@@ -158,6 +158,12 @@ class TelegramPlatformEvent(AstrMessageEvent):

        async for chain in generator:
            if isinstance(chain, MessageChain):
+                if chain.type == "break":
+                    # 分割符
+                    message_id = None  # 重置消息 ID
+                    delta = ""  # 重置 delta
+                    continue
+
                # 处理消息链中的每个组件
                for i in chain.chain:
                    if isinstance(i, Plain):
@@ -2,7 +2,7 @@ import time
 import asyncio
 import uuid
 import os
-from typing import Awaitable, Any
+from typing import Awaitable, Any, Callable
 from astrbot.core.platform import (
    Platform,
    AstrBotMessage,
@@ -13,7 +13,7 @@ from astrbot.core.platform import (
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.message.components import Plain, Image, Record  # noqa: F403
 from astrbot import logger
-from astrbot.core import web_chat_queue
+from .webchat_queue_mgr import webchat_queue_mgr, WebChatQueueMgr
 from .webchat_event import WebChatMessageEvent
 from astrbot.core.platform.astr_message_event import MessageSesion
 from ...register import register_platform_adapter
@@ -21,14 +21,46 @@ from astrbot.core.utils.astrbot_path import get_astrbot_data_path


 class QueueListener:
-    def __init__(self, queue: asyncio.Queue, callback: callable) -> None:
-        self.queue = queue
+    def __init__(self, webchat_queue_mgr: WebChatQueueMgr, callback: Callable) -> None:
+        self.webchat_queue_mgr = webchat_queue_mgr
        self.callback = callback
+        self.running_tasks = set()
+
+    async def listen_to_queue(self, conversation_id: str):
+        """Listen to a specific conversation queue"""
+        queue = self.webchat_queue_mgr.get_or_create_queue(conversation_id)
+        while True:
+            try:
+                data = await queue.get()
+                await self.callback(data)
+            except Exception as e:
+                logger.error(
+                    f"Error processing message from conversation {conversation_id}: {e}"
+                )
+                break

    async def run(self):
+        """Monitor for new conversation queues and start listeners"""
+        monitored_conversations = set()
+
        while True:
-            data = await self.queue.get()
-            await self.callback(data)
+            # Check for new conversations
+            current_conversations = set(self.webchat_queue_mgr.queues.keys())
+            new_conversations = current_conversations - monitored_conversations
+
+            # Start listeners for new conversations
+            for conversation_id in new_conversations:
+                task = asyncio.create_task(self.listen_to_queue(conversation_id))
+                self.running_tasks.add(task)
+                task.add_done_callback(self.running_tasks.discard)
+                monitored_conversations.add(conversation_id)
+                logger.debug(f"Started listener for conversation: {conversation_id}")
+
+            # Clean up monitored conversations that no longer exist
+            removed_conversations = monitored_conversations - current_conversations
+            monitored_conversations -= removed_conversations
+
+            await asyncio.sleep(1)  # Check for new conversations every second


@register_platform_adapter("webchat", "webchat")
@@ -45,7 +77,7 @@ class WebChatAdapter(Platform):
        os.makedirs(self.imgs_dir, exist_ok=True)

        self.metadata = PlatformMetadata(
-            name="webchat", description="webchat", id=self.config.get("id")
+            name="webchat", description="webchat", id=self.config.get("id", "")
        )

    async def send_by_session(
@@ -105,7 +137,7 @@ class WebChatAdapter(Platform):
            abm = await self.convert_message(data)
            await self.handle_msg(abm)

-        bot = QueueListener(web_chat_queue, callback)
+        bot = QueueListener(webchat_queue_mgr, callback)
        return bot.run()

    def meta(self) -> PlatformMetadata:
@@ -119,6 +151,10 @@ class WebChatAdapter(Platform):
            session_id=message.session_id,
        )

+        _, _, payload = message.raw_message  # type: ignore
+        message_event.set_extra("selected_provider", payload.get("selected_provider"))
+        message_event.set_extra("selected_model", payload.get("selected_model"))
+
        self.commit_event(message_event)

    async def terminate(self):
@@ -5,8 +5,8 @@ from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.api.message_components import Plain, Image, Record
 from astrbot.core.utils.io import download_image_by_url
-from astrbot.core import web_chat_back_queue
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from .webchat_queue_mgr import webchat_queue_mgr

 imgs_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")

@@ -18,13 +18,18 @@ class WebChatMessageEvent(AstrMessageEvent):

    @staticmethod
    async def _send(message: MessageChain, session_id: str, streaming: bool = False):
+        cid = session_id.split("!")[-1]
+        web_chat_back_queue = webchat_queue_mgr.get_or_create_back_queue(cid)
        if not message:
            await web_chat_back_queue.put(
-                {"type": "end", "data": "", "streaming": False}
+                {
+                    "type": "end",
+                    "data": "",
+                    "streaming": False,
+                }  # end means this request is finished
            )
            return ""

-        cid = session_id.split("!")[-1]
        data = ""
        for comp in message.chain:
            if isinstance(comp, Plain):
@@ -35,6 +40,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                        "cid": cid,
                        "data": data,
                        "streaming": streaming,
+                        "chain_type": message.type,
                    }
                )
            elif isinstance(comp, Image):
@@ -97,29 +103,35 @@ class WebChatMessageEvent(AstrMessageEvent):

    async def send(self, message: MessageChain):
        await WebChatMessageEvent._send(message, session_id=self.session_id)
-        await web_chat_back_queue.put(
-            {
-                "type": "end",
-                "data": "",
-                "streaming": False,
-                "cid": self.session_id.split("!")[-1],
-            }
-        )
        await super().send(message)

    async def send_streaming(self, generator, use_fallback: bool = False):
        final_data = ""
+        cid = self.session_id.split("!")[-1]
+        web_chat_back_queue = webchat_queue_mgr.get_or_create_back_queue(cid)
        async for chain in generator:
+            if chain.type == "break" and final_data:
+                # 分割符
+                await web_chat_back_queue.put(
+                    {
+                        "type": "break",  # break means a segment end
+                        "data": final_data,
+                        "streaming": True,
+                        "cid": cid,
+                    }
+                )
+                final_data = ""
+                continue
            final_data += await WebChatMessageEvent._send(
                chain, session_id=self.session_id, streaming=True
            )

        await web_chat_back_queue.put(
            {
-                "type": "end",
+                "type": "complete",  # complete means we return the final result
                "data": final_data,
                "streaming": True,
-                "cid": self.session_id.split("!")[-1],
+                "cid": cid,
            }
        )
        await super().send_streaming(generator, use_fallback)
@@ -0,0 +1,33 @@
+import asyncio
+
+class WebChatQueueMgr:
+    def __init__(self) -> None:
+        self.queues = {}
+        """Conversation ID to asyncio.Queue mapping"""
+        self.back_queues = {}
+        """Conversation ID to asyncio.Queue mapping for responses"""
+
+    def get_or_create_queue(self, conversation_id: str) -> asyncio.Queue:
+        """Get or create a queue for the given conversation ID"""
+        if conversation_id not in self.queues:
+            self.queues[conversation_id] = asyncio.Queue()
+        return self.queues[conversation_id]
+
+    def get_or_create_back_queue(self, conversation_id: str) -> asyncio.Queue:
+        """Get or create a back queue for the given conversation ID"""
+        if conversation_id not in self.back_queues:
+            self.back_queues[conversation_id] = asyncio.Queue()
+        return self.back_queues[conversation_id]
+
+    def remove_queues(self, conversation_id: str):
+        """Remove queues for the given conversation ID"""
+        if conversation_id in self.queues:
+            del self.queues[conversation_id]
+        if conversation_id in self.back_queues:
+            del self.back_queues[conversation_id]
+
+    def has_queue(self, conversation_id: str) -> bool:
+        """Check if a queue exists for the given conversation ID"""
+        return conversation_id in self.queues
+
+webchat_queue_mgr = WebChatQueueMgr()
@@ -210,6 +210,16 @@ class WeChatPadProAdapter(Platform):
                logger.error(traceback.format_exc())
                return False

+    def _extract_auth_key(self, data):
+        """Helper method to extract auth_key from response data."""
+        if isinstance(data, dict):
+            auth_keys = data.get("authKeys") # 新接口
+            if isinstance(auth_keys, list) and auth_keys:
+                return auth_keys[0]
+        elif isinstance(data, list) and data: # 旧接口
+            return data[0]
+        return None
+
    async def generate_auth_key(self):
        """
        生成授权码。
@@ -218,28 +228,26 @@ class WeChatPadProAdapter(Platform):
        params = {"key": self.admin_key}
        payload = {"Count": 1, "Days": 365}  # 生成一个有效期365天的授权码

+        self.auth_key = None  # Reset auth_key before generating a new one
+
        async with aiohttp.ClientSession() as session:
            try:
                async with session.post(url, params=params, json=payload) as response:
+                    if response.status != 200:
+                        logger.error(f"生成授权码失败: {response.status}, {await response.text()}")
+                        return
+
                    response_data = await response.json()
-                    # 修正成功判断条件和授权码提取路径
-                    if response.status == 200 and response_data.get("Code") == 200:
-                        # 授权码在 Data 字段的列表中
-                        if (
-                            response_data.get("Data")
-                            and isinstance(response_data["Data"], list)
-                            and len(response_data["Data"]) > 0
-                        ):
-                            self.auth_key = response_data["Data"][0]
-                            logger.info(f"成功获取授权码 {self.auth_key[:8]}...")
+                    if response_data.get("Code") == 200:
+                        if data := response_data.get("Data"):
+                            self.auth_key = self._extract_auth_key(data)
+
+                        if self.auth_key:
+                            logger.info("成功获取授权码")
                        else:
-                            logger.error(
-                                f"生成授权码成功但未找到授权码: {response_data}"
-                            )
+                            logger.error(f"生成授权码成功但未找到授权码: {response_data}")
                    else:
-                        logger.error(
-                            f"生成授权码失败: {response.status}, {response_data}"
-                        )
+                        logger.error(f"生成授权码失败: {response_data}")
            except aiohttp.ClientConnectorError as e:
                logger.error(f"连接到 WeChatPadPro 服务失败: {e}")
            except Exception as e:
@@ -17,7 +17,7 @@ from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.platform.astrbot_message import AstrBotMessage, MessageType
 from astrbot.core.platform.platform_metadata import PlatformMetadata
-from astrbot.core.utils.tencent_record_helper import wav_to_tencent_silk_base64
+from astrbot.core.utils.tencent_record_helper import audio_to_tencent_silk_base64

 if TYPE_CHECKING:
    from .wechatpadpro_adapter import WeChatPadProAdapter
@@ -113,7 +113,7 @@ class WeChatPadProMessageEvent(AstrMessageEvent):
    async def _send_voice(self, session: aiohttp.ClientSession, comp: Record):
        record_path = await comp.convert_to_file_path()
        # 默认已经存在 data/temp 中
-        b64, duration = await wav_to_tencent_silk_base64(record_path)
+        b64, duration = await audio_to_tencent_silk_base64(record_path)
        payload = {
            "ToUserName": self.session_id,
            "VoiceData": b64,
@@ -58,7 +58,7 @@ class AssistantMessageSegment:
    """OpenAI 格式的上下文中 role 为 assistant 的消息段。参考: https://platform.openai.com/docs/guides/function-calling"""

    content: str = None
-    tool_calls: List[ChatCompletionMessageToolCall | Dict] = None
+    tool_calls: List[ChatCompletionMessageToolCall | Dict] = field(default_factory=list)
    role: str = "assistant"

    def to_dict(self):
@@ -67,7 +67,7 @@ class AssistantMessageSegment:
        }
        if self.content:
            ret["content"] = self.content
-        elif self.tool_calls:
+        if self.tool_calls:
            ret["tool_calls"] = self.tool_calls
        return ret

@@ -95,27 +95,38 @@ class ProviderRequest:
    """提示词"""
    session_id: str = ""
    """会话 ID"""
-    image_urls: List[str] = None
+    image_urls: list[str] = field(default_factory=list)
    """图片 URL 列表"""
-    func_tool: FuncCall = None
+    func_tool: FuncCall | None = None
    """可用的函数工具"""
-    contexts: List = None
+    contexts: list[dict] = field(default_factory=list)
    """上下文。格式与 openai 的上下文格式一致：
    参考 https://platform.openai.com/docs/api-reference/chat/create#chat-create-messages
    """
    system_prompt: str = ""
    """系统提示词"""
-    conversation: Conversation = None
+    conversation: Conversation | None = None

-    tool_calls_result: ToolCallsResult = None
+    tool_calls_result: list[ToolCallsResult] | ToolCallsResult | None = None
    """附加的上次请求后工具调用的结果。参考: https://platform.openai.com/docs/guides/function-calling#handling-function-calls"""

+    model: str | None = None
+    """模型名称，为 None 时使用提供商的默认模型"""
+
    def __repr__(self):
        return f"ProviderRequest(prompt={self.prompt}, session_id={self.session_id}, image_urls={self.image_urls}, func_tool={self.func_tool}, contexts={self._print_friendly_context()}, system_prompt={self.system_prompt.strip()}, tool_calls_result={self.tool_calls_result})"

    def __str__(self):
        return self.__repr__()

+    def append_tool_calls_result(self, tool_calls_result: ToolCallsResult):
+        """添加工具调用结果到请求中"""
+        if not self.tool_calls_result:
+            self.tool_calls_result = []
+        if isinstance(self.tool_calls_result, ToolCallsResult):
+            self.tool_calls_result = [self.tool_calls_result]
+        self.tool_calls_result.append(tool_calls_result)
+
    def _print_friendly_context(self):
        """打印友好的消息上下文。将 image_url 的值替换为 <Image>"""
        if not self.contexts:
@@ -1,12 +1,14 @@
-import traceback
 import asyncio
-from astrbot.core.config.astrbot_config import AstrBotConfig
-from .provider import Provider, STTProvider, TTSProvider, Personality
-from .entities import ProviderType
+import traceback
 from typing import List
-from astrbot.core.db import BaseDatabase
-from .register import provider_cls_map, llm_tools
+
 from astrbot.core import logger, sp
+from astrbot.core.config.astrbot_config import AstrBotConfig
+from astrbot.core.db import BaseDatabase
+
+from .entities import ProviderType
+from .provider import Personality, Provider, STTProvider, TTSProvider
+from .register import llm_tools, provider_cls_map


 class ProviderManager:
@@ -93,15 +95,15 @@ class ProviderManager:
        """加载的 Text To Speech Provider 的实例"""
        self.embedding_provider_insts: List[Provider] = []
        """加载的 Embedding Provider 的实例"""
-        self.inst_map = {}
+        self.inst_map: dict[str, Provider] = {}
        """Provider 实例映射. key: provider_id, value: Provider 实例"""
        self.llm_tools = llm_tools

-        self.curr_provider_inst: Provider = None
+        self.curr_provider_inst: Provider | None = None
        """默认的 Provider 实例"""
-        self.curr_stt_provider_inst: STTProvider = None
+        self.curr_stt_provider_inst: STTProvider | None = None
        """默认的 Speech To Text Provider 实例"""
-        self.curr_tts_provider_inst: TTSProvider = None
+        self.curr_tts_provider_inst: TTSProvider | None = None
        """默认的 Text To Speech Provider 实例"""
        self.db_helper = db_helper

@@ -145,21 +147,24 @@ class ProviderManager:
            await self.load_provider(provider_config)

        # 设置默认提供商
-        self.curr_provider_inst = self.inst_map.get(
-            self.provider_settings.get("default_provider_id")
+        selected_provider_id = sp.get(
+            "curr_provider", self.provider_settings.get("default_provider_id")
        )
+        selected_stt_provider_id = sp.get(
+            "curr_provider_stt", self.provider_stt_settings.get("provider_id")
+        )
+        selected_tts_provider_id = sp.get(
+            "curr_provider_tts", self.provider_tts_settings.get("provider_id")
+        )
+        self.curr_provider_inst = self.inst_map.get(selected_provider_id)
        if not self.curr_provider_inst and self.provider_insts:
            self.curr_provider_inst = self.provider_insts[0]

-        self.curr_stt_provider_inst = self.inst_map.get(
-            self.provider_stt_settings.get("provider_id")
-        )
+        self.curr_stt_provider_inst = self.inst_map.get(selected_stt_provider_id)
        if not self.curr_stt_provider_inst and self.stt_provider_insts:
            self.curr_stt_provider_inst = self.stt_provider_insts[0]

-        self.curr_tts_provider_inst = self.inst_map.get(
-            self.provider_tts_settings.get("provider_id")
-        )
+        self.curr_tts_provider_inst = self.inst_map.get(selected_tts_provider_id)
        if not self.curr_tts_provider_inst and self.tts_provider_insts:
            self.curr_tts_provider_inst = self.tts_provider_insts[0]

@@ -190,11 +195,6 @@ class ProviderManager:
                    from .sources.anthropic_source import (
                        ProviderAnthropic as ProviderAnthropic,
                    )
-                case "llm_tuner":
-                    logger.info("加载 LLM Tuner 工具 ...")
-                    from .sources.llmtuner_source import (
-                        LLMTunerModelLoader as LLMTunerModelLoader,
-                    )
                case "dify":
                    from .sources.dify_source import ProviderDify as ProviderDify
                case "dashscope":
@@ -253,6 +253,10 @@ class ProviderManager:
                    from .sources.volcengine_tts import (
                        ProviderVolcengineTTS as ProviderVolcengineTTS,
                    )
+                case "gemini_tts":
+                    from .sources.gemini_tts_source import (
+                        ProviderGeminiTTSAPI as ProviderGeminiTTSAPI,
+                    )
                case "openai_embedding":
                    from .sources.openai_embedding_source import (
                        OpenAIEmbeddingProvider as OpenAIEmbeddingProvider,
@@ -326,8 +330,6 @@ class ProviderManager:
                inst = provider_metadata.cls_type(
                    provider_config,
                    self.provider_settings,
-                    self.db_helper,
-                    self.provider_settings.get("persistant_history", True),
                    self.selected_default_persona,
                )

@@ -420,7 +422,7 @@ class ProviderManager:
                self.curr_tts_provider_inst = None

            if getattr(self.inst_map[provider_id], "terminate", None):
-                await self.inst_map[provider_id].terminate()
+                await self.inst_map[provider_id].terminate() # type: ignore

            logger.info(
                f"{provider_id} 提供商适配器已终止({len(self.provider_insts)}, {len(self.stt_provider_insts)}, {len(self.tts_provider_insts)})"
@@ -430,6 +432,6 @@ class ProviderManager:
    async def terminate(self):
        for provider_inst in self.provider_insts:
            if hasattr(provider_inst, "terminate"):
-                await provider_inst.terminate()
+                await provider_inst.terminate() # type: ignore
        # 清理 MCP Client 连接
        await self.llm_tools.mcp_service_queue.put({"type": "terminate"})
@@ -1,6 +1,5 @@
 import abc
 from typing import List
-from astrbot.core.db import BaseDatabase
 from typing import TypedDict, AsyncGenerator
 from astrbot.core.provider.func_tool_manager import FuncCall
 from astrbot.core.provider.entities import LLMResponse, ToolCallsResult
@@ -53,15 +52,13 @@ class Provider(AbstractProvider):
        self,
        provider_config: dict,
        provider_settings: dict,
-        persistant_history: bool = True,
-        db_helper: BaseDatabase = None,
-        default_persona: Personality = None,
+        default_persona: Personality | None = None,
    ) -> None:
        super().__init__(provider_config)

        self.provider_settings = provider_settings

-        self.curr_personality: Personality = default_persona
+        self.curr_personality = default_persona
        """维护了当前的使用的 persona，即人格。可能为 None"""

    @abc.abstractmethod
@@ -86,11 +83,12 @@ class Provider(AbstractProvider):
        self,
        prompt: str,
        session_id: str = None,
-        image_urls: List[str] = None,
+        image_urls: list[str] = None,
        func_tool: FuncCall = None,
-        contexts: List = None,
+        contexts: list = None,
        system_prompt: str = None,
-        tool_calls_result: ToolCallsResult = None,
+        tool_calls_result: ToolCallsResult | list[ToolCallsResult] = None,
+        model: str | None = None,
        **kwargs,
    ) -> LLMResponse:
        """获得 LLM 的文本对话结果。会使用当前的模型进行对话。
@@ -114,11 +112,12 @@ class Provider(AbstractProvider):
        self,
        prompt: str,
        session_id: str = None,
-        image_urls: List[str] = None,
+        image_urls: list[str] = None,
        func_tool: FuncCall = None,
-        contexts: List = None,
+        contexts: list = None,
        system_prompt: str = None,
-        tool_calls_result: ToolCallsResult = None,
+        tool_calls_result: ToolCallsResult | list[ToolCallsResult] = None,
+        model: str | None = None,
        **kwargs,
    ) -> AsyncGenerator[LLMResponse, None]:
        """获得 LLM 的流式文本对话结果。会使用当前的模型进行对话。在生成的最后会返回一次完整的结果。
@@ -1,3 +1,6 @@
+import json
+import anthropic
+import base64
 from typing import List
 from mimetypes import guess_type

@@ -5,41 +8,33 @@ from anthropic import AsyncAnthropic
 from anthropic.types import Message

 from astrbot.core.utils.io import download_image_by_url
-from astrbot.core.db import BaseDatabase
-from astrbot.api.provider import Provider, Personality
+from astrbot.api.provider import Provider
 from astrbot import logger
 from astrbot.core.provider.func_tool_manager import FuncCall
 from ..register import register_provider_adapter
-from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.provider.entities import LLMResponse, ToolCallsResult
-from .openai_source import ProviderOpenAIOfficial
+from astrbot.core.provider.entities import LLMResponse
+from typing import AsyncGenerator


@register_provider_adapter(
    "anthropic_chat_completion", "Anthropic Claude API 提供商适配器"
 )
-class ProviderAnthropic(ProviderOpenAIOfficial):
+class ProviderAnthropic(Provider):
    def __init__(
        self,
-        provider_config: dict,
-        provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=True,
-        default_persona: Personality = None,
+        provider_config,
+        provider_settings,
+        default_persona=None,
    ) -> None:
-        # Skip OpenAI's __init__ and call Provider's __init__ directly
-        Provider.__init__(
-            self,
+        super().__init__(
            provider_config,
            provider_settings,
-            persistant_history,
-            db_helper,
            default_persona,
        )

-        self.chosen_api_key = None
+        self.chosen_api_key: str = ""
        self.api_keys: List = provider_config.get("key", [])
-        self.chosen_api_key = self.api_keys[0] if len(self.api_keys) > 0 else None
+        self.chosen_api_key = self.api_keys[0] if len(self.api_keys) > 0 else ""
        self.base_url = provider_config.get("api_base", "https://api.anthropic.com")
        self.timeout = provider_config.get("timeout", 120)
        if isinstance(self.timeout, str):
@@ -51,10 +46,63 @@ class ProviderAnthropic(ProviderOpenAIOfficial):

        self.set_model(provider_config["model_config"]["model"])

+    def _prepare_payload(self, messages: list[dict]):
+        """准备 Anthropic API 的请求 payload
+
+        Args:
+            messages: OpenAI 格式的消息列表，包含用户输入和系统提示等信息
+        Returns:
+            system_prompt: 系统提示内容
+            new_messages: 处理后的消息列表，去除系统提示
+        """
+        system_prompt = ""
+        new_messages = []
+        for message in messages:
+            if message["role"] == "system":
+                system_prompt = message["content"]
+            elif message["role"] == "assistant":
+                blocks = []
+                if isinstance(message["content"], str):
+                    blocks.append({"type": "text", "text": message["content"]})
+                if "tool_calls" in message:
+                    for tool_call in message["tool_calls"]:
+                        blocks.append(  # noqa: PERF401
+                            {
+                                "type": "tool_use",
+                                "name": tool_call["function"]["name"],
+                                "input": json.loads(tool_call["function"]["arguments"])
+                                if isinstance(tool_call["function"]["arguments"], str)
+                                else tool_call["function"]["arguments"],
+                                "id": tool_call["id"],
+                            }
+                        )
+                new_messages.append(
+                    {
+                        "role": "assistant",
+                        "content": blocks,
+                    }
+                )
+            elif message["role"] == "tool":
+                new_messages.append(
+                    {
+                        "role": "user",
+                        "content": [
+                            {
+                                "type": "tool_result",
+                                "tool_use_id": message["tool_call_id"],
+                                "content": message["content"],
+                            }
+                        ],
+                    }
+                )
+            else:
+                new_messages.append(message)
+
+        return system_prompt, new_messages
+
    async def _query(self, payloads: dict, tools: FuncCall) -> LLMResponse:
        if tools:
-            tool_list = tools.get_func_desc_anthropic_style()
-            if tool_list:
+            if tool_list := tools.get_func_desc_anthropic_style():
                payloads["tools"] = tool_list

        completion = await self.client.messages.create(**payloads, stream=False)
@@ -64,70 +112,158 @@ class ProviderAnthropic(ProviderOpenAIOfficial):

        if len(completion.content) == 0:
            raise Exception("API 返回的 completion 为空。")
-        # TODO: 如果进行函数调用，思维链被截断，用户可能需要思维链的内容
-        # 选最后一条消息，如果要进行函数调用，anthropic会先返回文本消息的思维链，然后再返回函数调用请求
-        content = completion.content[-1]

-        llm_response = LLMResponse("assistant")
+        llm_response = LLMResponse(role="assistant")

-        if content.type == "text":
-            # text completion
-            completion_text = str(content.text).strip()
-            # llm_response.completion_text = completion_text
-            llm_response.result_chain = MessageChain().message(completion_text)
-
-        # Anthropic每次只返回一个函数调用
-        if completion.stop_reason == "tool_use":
-            # tools call (function calling)
-            args_ls = []
-            func_name_ls = []
-            tool_use_ids = []
-            func_name_ls.append(content.name)
-            args_ls.append(content.input)
-            tool_use_ids.append(content.id)
-            llm_response.role = "tool"
-            llm_response.tools_call_args = args_ls
-            llm_response.tools_call_name = func_name_ls
-            llm_response.tools_call_ids = tool_use_ids
+        for content_block in completion.content:
+            if content_block.type == "text":
+                completion_text = str(content_block.text).strip()
+                llm_response.completion_text = completion_text

+            if content_block.type == "tool_use":
+                llm_response.tools_call_args.append(content_block.input)
+                llm_response.tools_call_name.append(content_block.name)
+                llm_response.tools_call_ids.append(content_block.id)
+        # TODO(Soulter): 处理 end_turn 情况
        if not llm_response.completion_text and not llm_response.tools_call_args:
-            logger.error(f"API 返回的 completion 无法解析：{completion}。")
-            raise Exception(f"API 返回的 completion 无法解析：{completion}。")
-
-        llm_response.raw_completion = completion
+            raise Exception(f"Anthropic API 返回的 completion 无法解析：{completion}。")

        return llm_response

+    async def _query_stream(
+        self, payloads: dict, tools: FuncCall
+    ) -> AsyncGenerator[LLMResponse, None]:
+        if tools:
+            if tool_list := tools.get_func_desc_anthropic_style():
+                payloads["tools"] = tool_list
+
+        # 用于累积工具调用信息
+        tool_use_buffer = {}
+        # 用于累积最终结果
+        final_text = ""
+        final_tool_calls = []
+
+        async with self.client.messages.stream(**payloads) as stream:
+            assert isinstance(stream, anthropic.AsyncMessageStream)
+            async for event in stream:
+                if event.type == "content_block_start":
+                    if event.content_block.type == "text":
+                        # 文本块开始
+                        yield LLMResponse(
+                            role="assistant", completion_text="", is_chunk=True
+                        )
+                    elif event.content_block.type == "tool_use":
+                        # 工具使用块开始，初始化缓冲区
+                        tool_use_buffer[event.index] = {
+                            "id": event.content_block.id,
+                            "name": event.content_block.name,
+                            "input": {},
+                        }
+
+                elif event.type == "content_block_delta":
+                    if event.delta.type == "text_delta":
+                        # 文本增量
+                        final_text += event.delta.text
+                        yield LLMResponse(
+                            role="assistant",
+                            completion_text=event.delta.text,
+                            is_chunk=True,
+                        )
+                    elif event.delta.type == "input_json_delta":
+                        # 工具调用参数增量
+                        if event.index in tool_use_buffer:
+                            # 累积 JSON 输入
+                            if "input_json" not in tool_use_buffer[event.index]:
+                                tool_use_buffer[event.index]["input_json"] = ""
+                            tool_use_buffer[event.index]["input_json"] += (
+                                event.delta.partial_json
+                            )
+
+                elif event.type == "content_block_stop":
+                    # 内容块结束
+                    if event.index in tool_use_buffer:
+                        # 解析完整的工具调用
+                        tool_info = tool_use_buffer[event.index]
+                        try:
+                            if "input_json" in tool_info:
+                                tool_info["input"] = json.loads(tool_info["input_json"])
+
+                            # 添加到最终结果
+                            final_tool_calls.append(
+                                {
+                                    "id": tool_info["id"],
+                                    "name": tool_info["name"],
+                                    "input": tool_info["input"],
+                                }
+                            )
+
+                            yield LLMResponse(
+                                role="tool",
+                                completion_text="",
+                                tools_call_args=[tool_info["input"]],
+                                tools_call_name=[tool_info["name"]],
+                                tools_call_ids=[tool_info["id"]],
+                                is_chunk=True,
+                            )
+                        except json.JSONDecodeError:
+                            # JSON 解析失败，跳过这个工具调用
+                            logger.warning(f"工具调用参数 JSON 解析失败: {tool_info}")
+
+                        # 清理缓冲区
+                        del tool_use_buffer[event.index]
+
+        # 返回最终的完整结果
+        final_response = LLMResponse(
+            role="assistant", completion_text=final_text, is_chunk=False
+        )
+
+        if final_tool_calls:
+            final_response.tools_call_args = [
+                call["input"] for call in final_tool_calls
+            ]
+            final_response.tools_call_name = [call["name"] for call in final_tool_calls]
+            final_response.tools_call_ids = [call["id"] for call in final_tool_calls]
+
+        yield final_response
+
    async def text_chat(
        self,
-        prompt: str,
-        session_id: str = None,
-        image_urls: List[str] = [],
-        func_tool: FuncCall = None,
+        prompt,
+        session_id=None,
+        image_urls=None,
+        func_tool=None,
        contexts=None,
        system_prompt=None,
-        tool_calls_result: ToolCallsResult = None,
+        tool_calls_result=None,
+        model=None,
        **kwargs,
    ) -> LLMResponse:
        if contexts is None:
            contexts = []
-        if not prompt:
-            prompt = "<image>"
-
        new_record = await self.assemble_context(prompt, image_urls)
        context_query = [*contexts, new_record]
+        if system_prompt:
+            context_query.insert(0, {"role": "system", "content": system_prompt})

        for part in context_query:
            if "_no_save" in part:
                del part["_no_save"]

+        # tool calls result
        if tool_calls_result:
-            # 暂时这样写。
-            prompt += f"Here are the related results via using tools: {str(tool_calls_result.tool_calls_result)}"
+            if not isinstance(tool_calls_result, list):
+                context_query.extend(tool_calls_result.to_openai_messages())
+            else:
+                for tcr in tool_calls_result:
+                    context_query.extend(tcr.to_openai_messages())
+
+        system_prompt, new_messages = self._prepare_payload(context_query)

        model_config = self.provider_config.get("model_config", {})
+        model_config["model"] = model or self.get_model()
+
+        payloads = {"messages": new_messages, **model_config}

-        payloads = {"messages": context_query, **model_config}
        # Anthropic has a different way of handling system prompts
        if system_prompt:
            payloads["system"] = system_prompt
@@ -135,32 +271,9 @@ class ProviderAnthropic(ProviderOpenAIOfficial):
        llm_response = None
        try:
            llm_response = await self._query(payloads, func_tool)
-
        except Exception as e:
-            if "maximum context length" in str(e):
-                retry_cnt = 20
-                while retry_cnt > 0:
-                    logger.warning(
-                        f"上下文长度超过限制。尝试弹出最早的记录然后重试。当前记录条数: {len(context_query)}"
-                    )
-                    try:
-                        await self.pop_record(context_query)
-                        response = await self.client.messages.create(
-                            messages=context_query, **model_config
-                        )
-                        llm_response = LLMResponse("assistant")
-                        llm_response.result_chain = MessageChain().message(response.content[0].text)
-                        llm_response.raw_completion = response
-                        return llm_response
-                    except Exception as e:
-                        if "maximum context length" in str(e):
-                            retry_cnt -= 1
-                        else:
-                            raise e
-                return LLMResponse("err", "err: 请尝试 /reset 清除会话记录。")
-            else:
-                logger.error(f"发生了错误。Provider 配置如下: {model_config}")
-                raise e
+            logger.error(f"发生了错误。Provider 配置如下: {model_config}")
+            raise e

        return llm_response

@@ -173,23 +286,41 @@ class ProviderAnthropic(ProviderOpenAIOfficial):
        contexts=...,
        system_prompt=None,
        tool_calls_result=None,
+        model=None,
        **kwargs,
    ):
-        # raise NotImplementedError("This method is not implemented yet.")
-        # 调用 text_chat 模拟流式
-        llm_response = await self.text_chat(
-            prompt=prompt,
-            session_id=session_id,
-            image_urls=image_urls,
-            func_tool=func_tool,
-            contexts=contexts,
-            system_prompt=system_prompt,
-            tool_calls_result=tool_calls_result,
-        )
-        llm_response.is_chunk = True
-        yield llm_response
-        llm_response.is_chunk = False
-        yield llm_response
+        if contexts is None:
+            contexts = []
+        new_record = await self.assemble_context(prompt, image_urls)
+        context_query = [*contexts, new_record]
+        if system_prompt:
+            context_query.insert(0, {"role": "system", "content": system_prompt})
+
+        for part in context_query:
+            if "_no_save" in part:
+                del part["_no_save"]
+
+        # tool calls result
+        if tool_calls_result:
+            if not isinstance(tool_calls_result, list):
+                context_query.extend(tool_calls_result.to_openai_messages())
+            else:
+                for tcr in tool_calls_result:
+                    context_query.extend(tcr.to_openai_messages())
+
+        system_prompt, new_messages = self._prepare_payload(context_query)
+
+        model_config = self.provider_config.get("model_config", {})
+        model_config["model"] = model or self.get_model()
+
+        payloads = {"messages": new_messages, **model_config}
+
+        # Anthropic has a different way of handling system prompts
+        if system_prompt:
+            payloads["system"] = system_prompt
+
+        async for llm_response in self._query_stream(payloads, func_tool):
+            yield llm_response

    async def assemble_context(self, text: str, image_urls: List[str] = None):
        """组装上下文，支持文本和图片"""
@@ -232,3 +363,28 @@ class ProviderAnthropic(ProviderOpenAIOfficial):
            )

        return {"role": "user", "content": content}
+
+    async def encode_image_bs64(self, image_url: str) -> str:
+        """
+        将图片转换为 base64
+        """
+        if image_url.startswith("base64://"):
+            return image_url.replace("base64://", "data:image/jpeg;base64,")
+        with open(image_url, "rb") as f:
+            image_bs64 = base64.b64encode(f.read()).decode("utf-8")
+            return "data:image/jpeg;base64," + image_bs64
+        return ""
+
+    def get_current_key(self) -> str:
+        return self.chosen_api_key
+
+    async def get_models(self) -> List[str]:
+        models_str = []
+        models = await self.client.models.list()
+        models = sorted(models.data, key=lambda x: x.id)
+        for model in models:
+            models_str.append(model.id)
+        return models_str
+
+    def set_key(self, key: str):
+        self.chosen_api_key = key
@@ -19,6 +19,7 @@ from ..register import register_provider_adapter
 TEMP_DIR = Path("data/temp/azure_tts")
 TEMP_DIR.mkdir(parents=True, exist_ok=True)

+
 class OTTSProvider:
    def __init__(self, config: Dict):
        self.skey = config["OTTS_SKEY"]
@@ -70,12 +71,12 @@ class OTTSProvider:
                        "style": voice_params["style"],
                        "role": voice_params["role"],
                        "rate": voice_params["rate"],
-                        "volume": voice_params["volume"]
+                        "volume": voice_params["volume"],
                    },
                    headers={
                        "User-Agent": f"AstrBot/{VERSION}",
-                        "UAK": "AstrBot/AzureTTS"
-                    }
+                        "UAK": "AstrBot/AzureTTS",
+                    },
                )
                response.raise_for_status()
                file_path.parent.mkdir(parents=True, exist_ok=True)
@@ -88,14 +89,19 @@ class OTTSProvider:
                    raise RuntimeError(f"OTTS请求失败: {str(e)}") from e
                await asyncio.sleep(0.5 * (attempt + 1))

+
 class AzureNativeProvider(TTSProvider):
    def __init__(self, provider_config: dict, provider_settings: dict):
        super().__init__(provider_config, provider_settings)
-        self.subscription_key = provider_config.get("azure_tts_subscription_key", "").strip()
+        self.subscription_key = provider_config.get(
+            "azure_tts_subscription_key", ""
+        ).strip()
        if not re.fullmatch(r"^[a-zA-Z0-9]{32}$", self.subscription_key):
            raise ValueError("无效的Azure订阅密钥")
        self.region = provider_config.get("azure_tts_region", "eastus").strip()
-        self.endpoint = f"https://{self.region}.tts.speech.microsoft.com/cognitiveservices/v1"
+        self.endpoint = (
+            f"https://{self.region}.tts.speech.microsoft.com/cognitiveservices/v1"
+        )
        self.client = None
        self.token = None
        self.token_expire = 0
@@ -104,15 +110,17 @@ class AzureNativeProvider(TTSProvider):
            "style": provider_config.get("azure_tts_style", "cheerful"),
            "role": provider_config.get("azure_tts_role", "Boy"),
            "rate": provider_config.get("azure_tts_rate", "1"),
-            "volume": provider_config.get("azure_tts_volume", "100")
+            "volume": provider_config.get("azure_tts_volume", "100"),
        }

    async def __aenter__(self):
-        self.client = AsyncClient(headers={
-            "User-Agent": f"AstrBot/{VERSION}",
-            "Content-Type": "application/ssml+xml",
-            "X-Microsoft-OutputFormat": "riff-48khz-16bit-mono-pcm"
-        })
+        self.client = AsyncClient(
+            headers={
+                "User-Agent": f"AstrBot/{VERSION}",
+                "Content-Type": "application/ssml+xml",
+                "X-Microsoft-OutputFormat": "riff-48khz-16bit-mono-pcm",
+            }
+        )
        return self

    async def __aexit__(self, exc_type, exc_val, exc_tb):
@@ -120,10 +128,11 @@ class AzureNativeProvider(TTSProvider):
            await self.client.aclose()

    async def _refresh_token(self):
-        token_url = f"https://{self.region}.api.cognitive.microsoft.com/sts/v1.0/issuetoken"
+        token_url = (
+            f"https://{self.region}.api.cognitive.microsoft.com/sts/v1.0/issuetoken"
+        )
        response = await self.client.post(
-            token_url,
-            headers={"Ocp-Apim-Subscription-Key": self.subscription_key}
+            token_url, headers={"Ocp-Apim-Subscription-Key": self.subscription_key}
        )
        response.raise_for_status()
        self.token = response.text
@@ -150,8 +159,8 @@ class AzureNativeProvider(TTSProvider):
            content=ssml,
            headers={
                "Authorization": f"Bearer {self.token}",
-                "User-Agent": f"AstrBot/{VERSION}"
-            }
+                "User-Agent": f"AstrBot/{VERSION}",
+            },
        )
        response.raise_for_status()
        file_path.parent.mkdir(parents=True, exist_ok=True)
@@ -160,6 +169,7 @@ class AzureNativeProvider(TTSProvider):
                f.write(chunk)
        return str(file_path.resolve())

+
@register_provider_adapter("azure_tts", "Azure TTS", ProviderType.TEXT_TO_SPEECH)
 class AzureTTSProvider(TTSProvider):
    def __init__(self, provider_config: dict, provider_settings: dict):
@@ -183,7 +193,7 @@ class AzureTTSProvider(TTSProvider):
                error_msg = (
                    f"JSON解析失败，请检查格式（错误位置：行 {e.lineno} 列 {e.colno}）\n"
                    f"错误详情: {e.msg}\n"
-                    f"错误上下文: {json_str[max(0, e.pos-30):e.pos+30]}"
+                    f"错误上下文: {json_str[max(0, e.pos - 30) : e.pos + 30]}"
                )
                raise ValueError(error_msg) from e
            except KeyError as e:
@@ -202,8 +212,8 @@ class AzureTTSProvider(TTSProvider):
                        "style": self.provider_config.get("azure_tts_style"),
                        "role": self.provider_config.get("azure_tts_role"),
                        "rate": self.provider_config.get("azure_tts_rate"),
-                        "volume": self.provider_config.get("azure_tts_volume")
-                    }
+                        "volume": self.provider_config.get("azure_tts_volume"),
+                    },
                )
        else:
            async with self.provider as provider:
@@ -5,7 +5,6 @@ from typing import List
 from .. import Provider, Personality
 from ..entities import LLMResponse
 from ..func_tool_manager import FuncCall
-from astrbot.core.db import BaseDatabase
 from ..register import register_provider_adapter
 from astrbot.core.message.message_event_result import MessageChain
 from .openai_source import ProviderOpenAIOfficial
@@ -19,16 +18,12 @@ class ProviderDashscope(ProviderOpenAIOfficial):
        self,
        provider_config: dict,
        provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=False,
-        default_persona: Personality = None,
+        default_persona: Personality | None = None,
    ) -> None:
        Provider.__init__(
            self,
            provider_config,
            provider_settings,
-            persistant_history,
-            db_helper,
            default_persona,
        )
        self.api_key = provider_config.get("dashscope_api_key", "")
@@ -72,6 +67,7 @@ class ProviderDashscope(ProviderOpenAIOfficial):
        func_tool: FuncCall = None,
        contexts: List = None,
        system_prompt: str = None,
+        model=None,
        **kwargs,
    ) -> LLMResponse:
        if contexts is None:
@@ -168,6 +164,7 @@ class ProviderDashscope(ProviderOpenAIOfficial):
        contexts=...,
        system_prompt=None,
        tool_calls_result=None,
+        model=None,
        **kwargs,
    ):
        # raise NotImplementedError("This method is not implemented yet.")
@@ -1,10 +1,9 @@
 import astrbot.core.message.components as Comp
 import os
 from typing import List
-from .. import Provider, Personality
+from .. import Provider
 from ..entities import LLMResponse
 from ..func_tool_manager import FuncCall
-from astrbot.core.db import BaseDatabase
 from ..register import register_provider_adapter
 from astrbot.core.utils.dify_api_client import DifyAPIClient
 from astrbot.core.utils.io import download_image_by_url, download_file
@@ -17,17 +16,13 @@ from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 class ProviderDify(Provider):
    def __init__(
        self,
-        provider_config: dict,
-        provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=False,
-        default_persona: Personality = None,
+        provider_config,
+        provider_settings,
+        default_persona=None,
    ) -> None:
        super().__init__(
            provider_config,
            provider_settings,
-            persistant_history,
-            db_helper,
            default_persona,
        )
        self.api_key = provider_config.get("dify_api_key", "")
@@ -65,12 +60,14 @@ class ProviderDify(Provider):
        func_tool: FuncCall = None,
        contexts: List = None,
        system_prompt: str = None,
+        tool_calls_result=None,
+        model=None,
        **kwargs,
    ) -> LLMResponse:
        if image_urls is None:
            image_urls = []
        result = ""
-        session_id = session_id or kwargs.get("user") # 1734
+        session_id = session_id or kwargs.get("user") or "unknown"  # 1734
        conversation_id = self.conversation_ids.get(session_id, "")

        files_payload = []
@@ -202,6 +199,7 @@ class ProviderDify(Provider):
        contexts=...,
        system_prompt=None,
        tool_calls_result=None,
+        model=None,
        **kwargs,
    ):
        # raise NotImplementedError("This method is not implemented yet.")
@@ -12,10 +12,9 @@ from google.genai.errors import APIError

 import astrbot.core.message.components as Comp
 from astrbot import logger
-from astrbot.api.provider import Personality, Provider
-from astrbot.core.db import BaseDatabase
+from astrbot.api.provider import Provider
 from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.provider.entities import LLMResponse, ToolCallsResult
+from astrbot.core.provider.entities import LLMResponse
 from astrbot.core.provider.func_tool_manager import FuncCall
 from astrbot.core.utils.io import download_image_by_url

@@ -52,17 +51,13 @@ class ProviderGoogleGenAI(Provider):

    def __init__(
        self,
-        provider_config: dict,
-        provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=True,
-        default_persona: Personality = None,
+        provider_config,
+        provider_settings,
+        default_persona=None,
    ) -> None:
        super().__init__(
            provider_config,
            provider_settings,
-            persistant_history,
-            db_helper,
            default_persona,
        )
        self.api_keys: list = provider_config.get("key", [])
@@ -506,12 +501,13 @@ class ProviderGoogleGenAI(Provider):
    async def text_chat(
        self,
        prompt: str,
-        session_id: str = None,
-        image_urls: list[str] = None,
-        func_tool: FuncCall = None,
-        contexts: list = None,
-        system_prompt: str = None,
-        tool_calls_result: ToolCallsResult = None,
+        session_id=None,
+        image_urls=None,
+        func_tool=None,
+        contexts=None,
+        system_prompt=None,
+        tool_calls_result=None,
+        model=None,
        **kwargs,
    ) -> LLMResponse:
        if contexts is None:
@@ -527,10 +523,14 @@ class ProviderGoogleGenAI(Provider):

        # tool calls result
        if tool_calls_result:
-            context_query.extend(tool_calls_result.to_openai_messages())
+            if not isinstance(tool_calls_result, list):
+                context_query.extend(tool_calls_result.to_openai_messages())
+            else:
+                for tcr in tool_calls_result:
+                    context_query.extend(tcr.to_openai_messages())

        model_config = self.provider_config.get("model_config", {})
-        model_config["model"] = self.get_model()
+        model_config["model"] = model or self.get_model()

        payloads = {"messages": context_query, **model_config}

@@ -547,13 +547,14 @@ class ProviderGoogleGenAI(Provider):

    async def text_chat_stream(
        self,
-        prompt: str,
-        session_id: str = None,
-        image_urls: list[str] = None,
-        func_tool: FuncCall = None,
-        contexts: str = None,
-        system_prompt: str = None,
-        tool_calls_result: ToolCallsResult = None,
+        prompt,
+        session_id=None,
+        image_urls=None,
+        func_tool=None,
+        contexts=None,
+        system_prompt=None,
+        tool_calls_result=None,
+        model=None,
        **kwargs,
    ) -> AsyncGenerator[LLMResponse, None]:
        if contexts is None:
@@ -569,10 +570,14 @@ class ProviderGoogleGenAI(Provider):

        # tool calls result
        if tool_calls_result:
-            context_query.extend(tool_calls_result.to_openai_messages())
+            if not isinstance(tool_calls_result, list):
+                context_query.extend(tool_calls_result.to_openai_messages())
+            else:
+                for tcr in tool_calls_result:
+                    context_query.extend(tcr.to_openai_messages())

        model_config = self.provider_config.get("model_config", {})
-        model_config["model"] = self.get_model()
+        model_config["model"] = model or self.get_model()

        payloads = {"messages": context_query, **model_config}

@@ -632,7 +637,10 @@ class ProviderGoogleGenAI(Provider):
                    logger.warning(f"图片 {image_url} 得到的结果为空，将忽略。")
                    continue
                user_content["content"].append(
-                    {"type": "image_url", "image_url": {"url": image_data}}
+                    {
+                        "type": "image_url",
+                        "image_url": {"url": image_data},
+                    }
                )
            return user_content
        else:
@@ -0,0 +1,79 @@
+import os
+import uuid
+import wave
+
+from google import genai
+from google.genai import types
+
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+
+from ..entities import ProviderType
+from ..provider import TTSProvider
+from ..register import register_provider_adapter
+
+
+@register_provider_adapter(
+    "gemini_tts", "Gemini TTS API", provider_type=ProviderType.TEXT_TO_SPEECH
+)
+class ProviderGeminiTTSAPI(TTSProvider):
+    def __init__(
+        self,
+        provider_config: dict,
+        provider_settings: dict,
+    ) -> None:
+        super().__init__(provider_config, provider_settings)
+        api_key: str = provider_config.get("gemini_tts_api_key", "")
+        api_base: str | None = provider_config.get("gemini_tts_api_base")
+        timeout: int = int(provider_config.get("gemini_tts_timeout", 20))
+        http_options = types.HttpOptions(timeout=timeout * 1000)
+
+        if api_base:
+            if api_base.endswith("/"):
+                api_base = api_base[:-1]
+            http_options.base_url = api_base
+
+        self.client = genai.Client(api_key=api_key, http_options=http_options).aio
+        self.model: str = provider_config.get(
+            "gemini_tts_model", "gemini-2.5-flash-preview-tts"
+        )
+        self.prefix: str | None = provider_config.get(
+            "gemini_tts_prefix",
+        )
+        self.voice_name: str = provider_config.get("gemini_tts_voice_name", "Leda")
+
+    async def get_audio(self, text: str) -> str:
+        temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+        path = os.path.join(temp_dir, f"gemini_tts_{uuid.uuid4()}.wav")
+        prompt = f"{self.prefix}: {text}" if self.prefix else text
+        response = await self.client.models.generate_content(
+            model=self.model,
+            contents=prompt,
+            config=types.GenerateContentConfig(
+                response_modalities=["AUDIO"],
+                speech_config=types.SpeechConfig(
+                    voice_config=types.VoiceConfig(
+                        prebuilt_voice_config=types.PrebuiltVoiceConfig(
+                            voice_name=self.voice_name,
+                        )
+                    )
+                ),
+            ),
+        )
+
+        # 不想看类型检查报错
+        if (
+            not response.candidates
+            or not response.candidates[0].content
+            or not response.candidates[0].content.parts
+            or not response.candidates[0].content.parts[0].inline_data
+            or not response.candidates[0].content.parts[0].inline_data.data
+        ):
+            raise Exception("No audio content returned from Gemini TTS API.")
+
+        with wave.open(path, "wb") as wf:
+            wf.setnchannels(1)
+            wf.setsampwidth(2)
+            wf.setframerate(24000)
+            wf.writeframes(response.candidates[0].content.parts[0].inline_data.data)
+
+        return path
@@ -1,134 +0,0 @@
-import os
-from llmtuner.chat import ChatModel
-from typing import List
-from .. import Provider
-from ..entities import LLMResponse
-from ..func_tool_manager import FuncCall
-from astrbot.core.db import BaseDatabase
-from ..register import register_provider_adapter
-
-
-@register_provider_adapter(
-    "llm_tuner", "LLMTuner 适配器, 用于装载使用 LlamaFactory 微调后的模型"
-)
-class LLMTunerModelLoader(Provider):
-    def __init__(
-        self,
-        provider_config: dict,
-        provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=True,
-        default_persona=None,
-    ) -> None:
-        super().__init__(
-            provider_config,
-            provider_settings,
-            persistant_history,
-            db_helper,
-            default_persona,
-        )
-        if not os.path.exists(provider_config["base_model_path"]) or not os.path.exists(
-            provider_config["adapter_model_path"]
-        ):
-            raise FileNotFoundError("模型文件路径不存在。")
-        self.base_model_path = provider_config["base_model_path"]
-        self.adapter_model_path = provider_config["adapter_model_path"]
-        self.model = ChatModel(
-            {
-                "model_name_or_path": self.base_model_path,
-                "adapter_name_or_path": self.adapter_model_path,
-                "template": provider_config["llmtuner_template"],
-                "finetuning_type": provider_config["finetuning_type"],
-                "quantization_bit": provider_config["quantization_bit"],
-            }
-        )
-        self.set_model(
-            os.path.basename(self.base_model_path)
-            + "_"
-            + os.path.basename(self.adapter_model_path)
-        )
-
-    async def assemble_context(self, text: str, image_urls: List[str] = None):
-        """
-        组装上下文。
-        """
-        return {"role": "user", "content": text}
-
-    async def text_chat(
-        self,
-        prompt: str,
-        session_id: str = None,
-        image_urls: List[str] = None,
-        func_tool: FuncCall = None,
-        contexts: List = None,
-        system_prompt: str = None,
-        **kwargs,
-    ) -> LLMResponse:
-        if contexts is None:
-            contexts = []
-        system_prompt = ""
-        new_record = {"role": "user", "content": prompt}
-        query_context = [*contexts, new_record]
-
-        # 提取出系统提示
-        system_idxs = []
-        for idx, context in enumerate(query_context):
-            if context["role"] == "system":
-                system_idxs.append(idx)
-
-            if "_no_save" in context:
-                del context["_no_save"]
-
-        for idx in reversed(system_idxs):
-            system_prompt += " " + query_context.pop(idx)["content"]
-
-        conf = {
-            "messages": query_context,
-            "system": system_prompt,
-        }
-        if func_tool:
-            tool_list = func_tool.get_func_desc_openai_style()
-            if tool_list:
-                conf["tools"] = tool_list
-
-        responses = await self.model.achat(**conf)
-
-        llm_response = LLMResponse("assistant", responses[-1].response_text)
-
-        return llm_response
-
-    async def text_chat_stream(
-        self,
-        prompt,
-        session_id=None,
-        image_urls=...,
-        func_tool=None,
-        contexts=...,
-        system_prompt=None,
-        tool_calls_result=None,
-        **kwargs,
-    ):
-        # raise NotImplementedError("This method is not implemented yet.")
-        # 调用 text_chat 模拟流式
-        llm_response = await self.text_chat(
-            prompt=prompt,
-            session_id=session_id,
-            image_urls=image_urls,
-            func_tool=func_tool,
-            contexts=contexts,
-            system_prompt=system_prompt,
-            tool_calls_result=tool_calls_result,
-        )
-        llm_response.is_chunk = True
-        yield llm_response
-        llm_response.is_chunk = False
-        yield llm_response
-
-    async def get_current_key(self):
-        return "none"
-
-    async def set_key(self, key):
-        pass
-
-    async def get_models(self):
-        return [self.get_model()]
@@ -9,14 +9,12 @@ import astrbot.core.message.components as Comp
 from openai import AsyncOpenAI, AsyncAzureOpenAI
 from openai.types.chat.chat_completion import ChatCompletion

-# from openai.types.chat.chat_completion_chunk import ChatCompletionChunk
 from openai._exceptions import NotFoundError, UnprocessableEntityError
 from openai.lib.streaming.chat._completions import ChatCompletionStreamState
 from astrbot.core.utils.io import download_image_by_url
 from astrbot.core.message.message_event_result import MessageChain

-from astrbot.core.db import BaseDatabase
-from astrbot.api.provider import Provider, Personality
+from astrbot.api.provider import Provider
 from astrbot import logger
 from astrbot.core.provider.func_tool_manager import FuncCall
 from typing import List, AsyncGenerator
@@ -30,17 +28,13 @@ from astrbot.core.provider.entities import LLMResponse, ToolCallsResult
 class ProviderOpenAIOfficial(Provider):
    def __init__(
        self,
-        provider_config: dict,
-        provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=True,
-        default_persona: Personality = None,
+        provider_config,
+        provider_settings,
+        default_persona=None,
    ) -> None:
        super().__init__(
            provider_config,
            provider_settings,
-            persistant_history,
-            db_helper,
            default_persona,
        )
        self.chosen_api_key = None
@@ -224,12 +218,11 @@ class ProviderOpenAIOfficial(Provider):
    async def _prepare_chat_payload(
        self,
        prompt: str,
-        session_id: str = None,
-        image_urls: list[str] = None,
-        func_tool: FuncCall = None,
-        contexts: list = None,
-        system_prompt: str = None,
-        tool_calls_result: ToolCallsResult = None,
+        image_urls: list[str] | None = None,
+        contexts: list | None = None,
+        system_prompt: str | None = None,
+        tool_calls_result: ToolCallsResult | list[ToolCallsResult] | None = None,
+        model: str | None = None,
        **kwargs,
    ) -> tuple:
        """准备聊天所需的有效载荷和上下文"""
@@ -246,14 +239,18 @@ class ProviderOpenAIOfficial(Provider):

        # tool calls result
        if tool_calls_result:
-            context_query.extend(tool_calls_result.to_openai_messages())
+            if isinstance(tool_calls_result, ToolCallsResult):
+                context_query.extend(tool_calls_result.to_openai_messages())
+            else:
+                for tcr in tool_calls_result:
+                    context_query.extend(tcr.to_openai_messages())

        model_config = self.provider_config.get("model_config", {})
-        model_config["model"] = self.get_model()
+        model_config["model"] = model or self.get_model()

        payloads = {"messages": context_query, **model_config}

-        return payloads, context_query, func_tool
+        return payloads, context_query

    async def _handle_api_error(
        self,
@@ -350,16 +347,16 @@ class ProviderOpenAIOfficial(Provider):
        contexts=None,
        system_prompt=None,
        tool_calls_result=None,
+        model=None,
        **kwargs,
    ) -> LLMResponse:
-        payloads, context_query, func_tool = await self._prepare_chat_payload(
+        payloads, context_query = await self._prepare_chat_payload(
            prompt,
-            session_id,
            image_urls,
-            func_tool,
            contexts,
            system_prompt,
            tool_calls_result,
+            model=model,
            **kwargs,
        )

@@ -419,17 +416,17 @@ class ProviderOpenAIOfficial(Provider):
        contexts=[],
        system_prompt=None,
        tool_calls_result=None,
+        model=None,
        **kwargs,
    ) -> AsyncGenerator[LLMResponse, None]:
        """流式对话，与服务商交互并逐步返回结果"""
-        payloads, context_query, func_tool = await self._prepare_chat_payload(
+        payloads, context_query = await self._prepare_chat_payload(
            prompt,
-            session_id,
            image_urls,
-            func_tool,
            contexts,
            system_prompt,
            tool_calls_result,
+            model=model,
            **kwargs,
        )

@@ -485,13 +482,8 @@ class ProviderOpenAIOfficial(Provider):
        """
        new_contexts = []

-        flag = False
        for context in contexts:
-            if flag:
-                flag = False  # 删除 image 后，下一条（LLM 响应）也要删除
-                continue
-            if isinstance(context["content"], list):
-                flag = True
+            if "content" in context and isinstance(context["content"], list):
                # continue
                new_content = []
                for item in context["content"]:
@@ -534,7 +526,10 @@ class ProviderOpenAIOfficial(Provider):
                    logger.warning(f"图片 {image_url} 得到的结果为空，将忽略。")
                    continue
                user_content["content"].append(
-                    {"type": "image_url", "image_url": {"url": image_data}}
+                    {
+                        "type": "image_url",
+                        "image_url": {"url": image_data},
+                    }
                )
            return user_content
        else:
@@ -5,12 +5,12 @@ import os
 import traceback
 import asyncio
 import aiohttp
-import requests
 from ..provider import TTSProvider
 from ..entities import ProviderType
 from ..register import register_provider_adapter
 from astrbot import logger

+
@register_provider_adapter(
    "volcengine_tts", "火山引擎 TTS", provider_type=ProviderType.TEXT_TO_SPEECH
 )
@@ -22,7 +22,9 @@ class ProviderVolcengineTTS(TTSProvider):
        self.cluster = provider_config.get("volcengine_cluster", "")
        self.voice_type = provider_config.get("volcengine_voice_type", "")
        self.speed_ratio = provider_config.get("volcengine_speed_ratio", 1.0)
-        self.api_base = provider_config.get("api_base", f"https://openspeech.bytedance.com/api/v1/tts")
+        self.api_base = provider_config.get(
+            "api_base", "https://openspeech.bytedance.com/api/v1/tts"
+        )
        self.timeout = provider_config.get("timeout", 20)

    def _build_request_payload(self, text: str) -> dict:
@@ -30,11 +32,9 @@ class ProviderVolcengineTTS(TTSProvider):
            "app": {
                "appid": self.appid,
                "token": self.api_key,
-                "cluster": self.cluster
-            },
-            "user": {
-                "uid": str(uuid.uuid4())  
+                "cluster": self.cluster,
            },
+            "user": {"uid": str(uuid.uuid4())},
            "audio": {
                "voice_type": self.voice_type,
                "encoding": "mp3",
@@ -48,60 +48,61 @@ class ProviderVolcengineTTS(TTSProvider):
                "text_type": "plain",
                "operation": "query",
                "with_frontend": 1,
-                "frontend_type": "unitTson"
-            }
+                "frontend_type": "unitTson",
+            },
        }

    async def get_audio(self, text: str) -> str:
        """异步方法获取语音文件路径"""
        headers = {
            "Content-Type": "application/json",
-            "Authorization": f"Bearer; {self.api_key}"
+            "Authorization": f"Bearer; {self.api_key}",
        }
-        
+
        payload = self._build_request_payload(text)
-        
+
        logger.debug(f"请求头: {headers}")
        logger.debug(f"请求 URL: {self.api_base}")
        logger.debug(f"请求体: {json.dumps(payload, ensure_ascii=False)[:100]}...")
-        
+
        try:
            async with aiohttp.ClientSession() as session:
                async with session.post(
                    self.api_base,
-                    data=json.dumps(payload), 
+                    data=json.dumps(payload),
                    headers=headers,
-                    timeout=self.timeout
+                    timeout=self.timeout,
                ) as response:
                    logger.debug(f"响应状态码: {response.status}")
-                    
+
                    response_text = await response.text()
                    logger.debug(f"响应内容: {response_text[:200]}...")
-                    
+
                    if response.status == 200:
                        resp_data = json.loads(response_text)
-                        
+
                        if "data" in resp_data:
                            audio_data = base64.b64decode(resp_data["data"])
-                            
+
                            os.makedirs("data/temp", exist_ok=True)
-                            
+
                            file_path = f"data/temp/volcengine_tts_{uuid.uuid4()}.mp3"
-                            
+
                            loop = asyncio.get_running_loop()
                            await loop.run_in_executor(
-                                None, 
-                                lambda: open(file_path, "wb").write(audio_data)
+                                None, lambda: open(file_path, "wb").write(audio_data)
                            )
-                            
+
                            return file_path
                        else:
                            error_msg = resp_data.get("message", "未知错误")
                            raise Exception(f"火山引擎 TTS API 返回错误: {error_msg}")
                    else:
-                        raise Exception(f"火山引擎 TTS API 请求失败: {response.status}, {response_text}")
-        
+                        raise Exception(
+                            f"火山引擎 TTS API 请求失败: {response.status}, {response_text}"
+                        )
+
        except Exception as e:
            error_details = traceback.format_exc()
            logger.debug(f"火山引擎 TTS 异常详情: {error_details}")
-            raise Exception(f"火山引擎 TTS 异常: {str(e)}")
+            raise Exception(f"火山引擎 TTS 异常: {str(e)}")
@@ -1,4 +1,3 @@
-from astrbot.core.db import BaseDatabase
 from astrbot import logger
 from astrbot.core.provider.func_tool_manager import FuncCall
 from typing import List
@@ -13,15 +12,11 @@ class ProviderZhipu(ProviderOpenAIOfficial):
        self,
        provider_config: dict,
        provider_settings: dict,
-        db_helper: BaseDatabase,
-        persistant_history=True,
        default_persona=None,
    ) -> None:
        super().__init__(
            provider_config,
            provider_settings,
-            db_helper,
-            persistant_history,
            default_persona,
        )

@@ -33,6 +28,7 @@ class ProviderZhipu(ProviderOpenAIOfficial):
        func_tool: FuncCall = None,
        contexts=None,
        system_prompt=None,
+        model=None,
        **kwargs,
    ) -> LLMResponse:
        if contexts is None:
@@ -43,7 +39,7 @@ class ProviderZhipu(ProviderOpenAIOfficial):
        context_query = [*contexts, new_record]

        model_cfgs: dict = self.provider_config.get("model_config", {})
-        model = self.get_model()
+        model = model or self.get_model()
        # glm-4v-flash 只支持一张图片
        if model.lower() == "glm-4v-flash" and image_urls and len(context_query) > 1:
            logger.debug("glm-4v-flash 只支持一张图片，将只保留最后一张图片")
@@ -1,4 +1,4 @@
-from .star import StarMetadata
+from .star import StarMetadata, star_map, star_registry
 from .star_manager import PluginManager
 from .context import Context
 from astrbot.core.provider import Provider
@@ -14,14 +14,31 @@ class Star(CommandParserMixin):
        StarTools.initialize(context)
        self.context = context

-    async def text_to_image(self, text: str, return_url=True) -> str:
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        if not star_map.get(cls.__module__):
+            metadata = StarMetadata(
+                star_cls_type=cls,
+                module_path=cls.__module__,
+            )
+            star_map[cls.__module__] = metadata
+            star_registry.append(metadata)
+        else:
+            star_map[cls.__module__].star_cls_type = cls
+            star_map[cls.__module__].module_path = cls.__module__
+
+    @staticmethod
+    async def text_to_image(text: str, return_url=True) -> str:
        """将文本转换为图片"""
        return await html_renderer.render_t2i(text, return_url=return_url)

-    async def html_render(self, tmpl: str, data: dict, return_url=True) -> str:
+    @staticmethod
+    async def html_render(
+        tmpl: str, data: dict, return_url=True, options: dict = None
+    ) -> str:
        """渲染 HTML"""
        return await html_renderer.render_custom_template(
-            tmpl, data, return_url=return_url
+            tmpl, data, return_url=return_url, options=options
        )

    async def terminate(self):
@@ -7,10 +7,13 @@ from astrbot.core.config import AstrBotConfig
 from .custom_filter import CustomFilter
 from ..star_handler import StarHandlerMetadata

+
 class GreedyStr(str):
    """标记指令完成其他参数接收后的所有剩余文本。"""
+
    pass

+
 # 标准指令受到 wake_prefix 的制约。
 class CommandFilter(HandlerFilter):
    """标准指令过滤器"""
@@ -18,8 +21,8 @@ class CommandFilter(HandlerFilter):
    def __init__(
        self,
        command_name: str,
-        alias: set = None,
-        handler_md: StarHandlerMetadata = None,
+        alias: set | None = None,
+        handler_md: StarHandlerMetadata | None = None,
        parent_command_names: List[str] = [""],
    ):
        self.command_name = command_name
@@ -110,6 +113,17 @@ class CommandFilter(HandlerFilter):
                    elif isinstance(param_type_or_default_val, str):
                        # 如果 param_type_or_default_val 是字符串，直接赋值
                        result[param_name] = params[i]
+                    elif isinstance(param_type_or_default_val, bool):
+                        # 处理布尔类型
+                        lower_param = str(params[i]).lower()
+                        if lower_param in ["true", "yes", "1"]:
+                            result[param_name] = True
+                        elif lower_param in ["false", "no", "0"]:
+                            result[param_name] = False
+                        else:
+                            raise ValueError(
+                                f"参数 {param_name} 必须是布尔值（true/false, yes/no, 1/0）。"
+                            )
                    elif isinstance(param_type_or_default_val, int):
                        result[param_name] = int(params[i])
                    elif isinstance(param_type_or_default_val, float):
@@ -8,22 +8,48 @@ from typing import Union
 class PlatformAdapterType(enum.Flag):
    AIOCQHTTP = enum.auto()
    QQOFFICIAL = enum.auto()
-    VCHAT = enum.auto()
    GEWECHAT = enum.auto()
    TELEGRAM = enum.auto()
    WECOM = enum.auto()
    LARK = enum.auto()
-    ALL = AIOCQHTTP | QQOFFICIAL | VCHAT | GEWECHAT | TELEGRAM | WECOM | LARK
+    WECHATPADPRO = enum.auto()
+    DINGTALK = enum.auto()
+    DISCORD = enum.auto()
+    SLACK = enum.auto()
+    KOOK = enum.auto()
+    VOCECHAT = enum.auto()
+    WEIXIN_OFFICIAL_ACCOUNT = enum.auto()
+    ALL = (
+        AIOCQHTTP
+        | QQOFFICIAL
+        | GEWECHAT
+        | TELEGRAM
+        | WECOM
+        | LARK
+        | WECHATPADPRO
+        | DINGTALK
+        | DISCORD
+        | SLACK
+        | KOOK
+        | VOCECHAT
+        | WEIXIN_OFFICIAL_ACCOUNT
+    )


 ADAPTER_NAME_2_TYPE = {
    "aiocqhttp": PlatformAdapterType.AIOCQHTTP,
    "qq_official": PlatformAdapterType.QQOFFICIAL,
-    "vchat": PlatformAdapterType.VCHAT,
    "gewechat": PlatformAdapterType.GEWECHAT,
    "telegram": PlatformAdapterType.TELEGRAM,
    "wecom": PlatformAdapterType.WECOM,
    "lark": PlatformAdapterType.LARK,
+    "dingtalk": PlatformAdapterType.DINGTALK,
+    "discord": PlatformAdapterType.DISCORD,
+    "slack": PlatformAdapterType.SLACK,
+    "kook": PlatformAdapterType.KOOK,
+    "wechatpadpro": PlatformAdapterType.WECHATPADPRO,
+    "vocechat": PlatformAdapterType.VOCECHAT,
+    "weixin_official_account": PlatformAdapterType.WEIXIN_OFFICIAL_ACCOUNT,
 }


@@ -1,9 +1,17 @@
-from ..star import star_registry, StarMetadata, star_map
+import warnings
+
+from astrbot.core.star import StarMetadata, star_map
+
+_warned_register_star = False


 def register_star(name: str, author: str, desc: str, version: str, repo: str = None):
    """注册一个插件(Star)。

+    [DEPRECATED] 该装饰器已废弃，将在未来版本中移除。
+    在 v3.5.19 版本之后（不含），您不需要使用该装饰器来装饰插件类，
+    AstrBot 会自动识别继承自 Star 的类并将其作为插件类加载。
+
    Args:
        name: 插件名称。
        author: 作者。
@@ -21,18 +29,32 @@ def register_star(name: str, author: str, desc: str, version: str, repo: str = N
    帮助信息会被自动提取。使用 `/plugin <插件名> 可以查看帮助信息。`
    """

-    def decorator(cls):
-        star_metadata = StarMetadata(
-            name=name,
-            author=author,
-            desc=desc,
-            version=version,
-            repo=repo,
-            star_cls_type=cls,
-            module_path=cls.__module__,
+    global _warned_register_star
+    if not _warned_register_star:
+        _warned_register_star = True
+        warnings.warn(
+            "The 'register_star' decorator is deprecated and will be removed in a future version.",
+            DeprecationWarning,
+            stacklevel=2,
        )
-        star_registry.append(star_metadata)
-        star_map[cls.__module__] = star_metadata
+
+    def decorator(cls):
+        if not star_map.get(cls.__module__):
+            metadata = StarMetadata(
+                name=name,
+                author=author,
+                desc=desc,
+                version=version,
+                repo=repo,
+            )
+            star_map[cls.__module__] = metadata
+        else:
+            star_map[cls.__module__].name = name
+            star_map[cls.__module__].author = author
+            star_map[cls.__module__].desc = desc
+            star_map[cls.__module__].version = version
+            star_map[cls.__module__].repo = repo
+
        return cls

    return decorator
@@ -1,12 +1,12 @@
 from __future__ import annotations

-from types import ModuleType
-from typing import List, Dict
 from dataclasses import dataclass, field
+from types import ModuleType
+
 from astrbot.core.config import AstrBotConfig

-star_registry: List[StarMetadata] = []
-star_map: Dict[str, StarMetadata] = {}
+star_registry: list[StarMetadata] = []
+star_map: dict[str, StarMetadata] = {}
 """key 是模块路径，__module__"""


@@ -18,22 +18,27 @@ class StarMetadata:
    当 activated 为 False 时，star_cls 可能为 None，请不要在插件未激活时调用 star_cls 的方法。
    """

-    name: str
-    author: str  # 插件作者
-    desc: str  # 插件简介
-    version: str  # 插件版本
-    repo: str = None  # 插件仓库地址
+    name: str | None = None
+    """插件名"""
+    author: str | None = None
+    """插件作者"""
+    desc: str | None = None
+    """插件简介"""
+    version: str | None = None
+    """插件版本"""
+    repo: str | None = None
+    """插件仓库地址"""

-    star_cls_type: type = None
+    star_cls_type: type | None = None
    """插件的类对象的类型"""
-    module_path: str = None
+    module_path: str | None = None
    """插件的模块路径"""

-    star_cls: object = None
+    star_cls: object | None = None
    """插件的类对象"""
-    module: ModuleType = None
+    module: ModuleType | None = None
    """插件的模块对象"""
-    root_dir_name: str = None
+    root_dir_name: str | None = None
    """插件的目录名称"""
    reserved: bool = False
    """是否是 AstrBot 的保留插件"""
@@ -41,17 +46,20 @@ class StarMetadata:
    activated: bool = True
    """是否被激活"""

-    config: AstrBotConfig = None
+    config: AstrBotConfig | None = None
    """插件配置"""

-    star_handler_full_names: List[str] = field(default_factory=list)
+    star_handler_full_names: list[str] = field(default_factory=list)
    """注册的 Handler 的全名列表"""

-    supported_platforms: Dict[str, bool] = field(default_factory=dict)
+    supported_platforms: dict[str, bool] = field(default_factory=dict)
    """插件支持的平台ID字典，key为平台ID，value为是否支持"""

    def __str__(self) -> str:
-        return f"StarMetadata({self.name}, {self.desc}, {self.version}, {self.repo})"
+        return f"Plugin {self.name} ({self.version}) by {self.author}: {self.desc}"
+
+    def __repr__(self) -> str:
+        return f"Plugin {self.name} ({self.version}) by {self.author}: {self.desc}"

    def update_platform_compatibility(self, plugin_enable_config: dict) -> None:
        """更新插件支持的平台列表
@@ -11,7 +11,6 @@ import os
 import sys
 import traceback
 from types import ModuleType
-from typing import List

 import yaml

@@ -37,12 +36,6 @@ except ImportError:
    if os.getenv("ASTRBOT_RELOAD", "0") == "1":
        logger.warning("未安装 watchfiles，无法实现插件的热重载。")

-try:
-    import nh3
-except ImportError:
-    logger.warning("未安装 nh3 库，无法清理插件 README.md 中的 HTML 标签。")
-    nh3 = None
-

 class PluginManager:
    def __init__(self, context: Context, config: AstrBotConfig):
@@ -64,6 +57,8 @@ class PluginManager:
        """保留插件的路径。在 packages 目录下"""
        self.conf_schema_fname = "_conf_schema.json"
        """插件配置 Schema 文件名"""
+        self._pm_lock = asyncio.Lock()
+        """StarManager操作互斥锁"""

        self.failed_plugin_info = ""
        if os.getenv("ASTRBOT_RELOAD", "0") == "1":
@@ -119,7 +114,8 @@ class PluginManager:
                    reloaded_plugins.add(plugin_name)
                    break

-    def _get_classes(self, arg: ModuleType):
+    @staticmethod
+    def _get_classes(arg: ModuleType):
        """获取指定模块（可以理解为一个 python 文件）下所有的类"""
        classes = []
        clsmembers = inspect.getmembers(arg, inspect.isclass)
@@ -129,7 +125,8 @@ class PluginManager:
                break
        return classes

-    def _get_modules(self, path):
+    @staticmethod
+    def _get_modules(path):
        modules = []

        dirs = os.listdir(path)
@@ -155,7 +152,7 @@ class PluginManager:
                    )
        return modules

-    def _get_plugin_modules(self) -> List[dict]:
+    def _get_plugin_modules(self) -> list[dict]:
        plugins = []
        if os.path.exists(self.plugin_store_path):
            plugins.extend(self._get_modules(self.plugin_store_path))
@@ -189,10 +186,11 @@ class PluginManager:
                except Exception as e:
                    logger.error(f"更新插件 {p} 的依赖失败。Code: {str(e)}")

-    def _load_plugin_metadata(self, plugin_path: str, plugin_obj=None) -> StarMetadata:
-        """v3.4.0 以前的方式载入插件元数据
+    @staticmethod
+    def _load_plugin_metadata(plugin_path: str, plugin_obj=None) -> StarMetadata:
+        """先寻找 metadata.yaml 文件，如果不存在，则使用插件对象的 info() 函数获取元数据。

-        先寻找 metadata.yaml 文件，如果不存在，则使用插件对象的 info() 函数获取元数据。
+        Notes: 旧版本 AstrBot 插件可能使用的是 info() 函数来获取元数据。
        """
        metadata = None

@@ -204,11 +202,14 @@ class PluginManager:
                os.path.join(plugin_path, "metadata.yaml"), "r", encoding="utf-8"
            ) as f:
                metadata = yaml.safe_load(f)
-        elif plugin_obj:
+        elif plugin_obj and hasattr(plugin_obj, "info"):
            # 使用 info() 函数
            metadata = plugin_obj.info()

        if isinstance(metadata, dict):
+            if "desc" not in metadata and "description" in metadata:
+                metadata["desc"] = metadata["description"]
+
            if (
                "name" not in metadata
                or "desc" not in metadata
@@ -228,8 +229,9 @@ class PluginManager:

        return metadata

+    @staticmethod
    def _get_plugin_related_modules(
-        self, plugin_root_dir: str, is_reserved: bool = False
+        plugin_root_dir: str, is_reserved: bool = False
    ) -> list[str]:
        """获取与指定插件相关的所有已加载模块名

@@ -293,50 +295,51 @@ class PluginManager:
                - success (bool): 重载是否成功
                - error_message (str|None): 错误信息，成功时为 None
        """
-        specified_module_path = None
-        if specified_plugin_name:
-            for smd in star_registry:
-                if smd.name == specified_plugin_name:
-                    specified_module_path = smd.module_path
-                    break
+        async with self._pm_lock:
+            specified_module_path = None
+            if specified_plugin_name:
+                for smd in star_registry:
+                    if smd.name == specified_plugin_name:
+                        specified_module_path = smd.module_path
+                        break

-        # 终止插件
-        if not specified_module_path:
-            # 重载所有插件
-            for smd in star_registry:
-                try:
-                    await self._terminate_plugin(smd)
-                except Exception as e:
-                    logger.warning(traceback.format_exc())
-                    logger.warning(
-                        f"插件 {smd.name} 未被正常终止: {str(e)}, 可能会导致该插件运行不正常。"
-                    )
+            # 终止插件
+            if not specified_module_path:
+                # 重载所有插件
+                for smd in star_registry:
+                    try:
+                        await self._terminate_plugin(smd)
+                    except Exception as e:
+                        logger.warning(traceback.format_exc())
+                        logger.warning(
+                            f"插件 {smd.name} 未被正常终止: {str(e)}, 可能会导致该插件运行不正常。"
+                        )

-                await self._unbind_plugin(smd.name, smd.module_path)
+                    await self._unbind_plugin(smd.name, smd.module_path)

-            star_handlers_registry.clear()
-            star_map.clear()
-            star_registry.clear()
-        else:
-            # 只重载指定插件
-            smd = star_map.get(specified_module_path)
-            if smd:
-                try:
-                    await self._terminate_plugin(smd)
-                except Exception as e:
-                    logger.warning(traceback.format_exc())
-                    logger.warning(
-                        f"插件 {smd.name} 未被正常终止: {str(e)}, 可能会导致该插件运行不正常。"
-                    )
+                star_handlers_registry.clear()
+                star_map.clear()
+                star_registry.clear()
+            else:
+                # 只重载指定插件
+                smd = star_map.get(specified_module_path)
+                if smd:
+                    try:
+                        await self._terminate_plugin(smd)
+                    except Exception as e:
+                        logger.warning(traceback.format_exc())
+                        logger.warning(
+                            f"插件 {smd.name} 未被正常终止: {str(e)}, 可能会导致该插件运行不正常。"
+                        )

-                await self._unbind_plugin(smd.name, specified_module_path)
+                    await self._unbind_plugin(smd.name, specified_module_path)

-        result = await self.load(specified_module_path)
+            result = await self.load(specified_module_path)

-        # 更新所有插件的平台兼容性
-        await self.update_all_platform_compatibility()
+            # 更新所有插件的平台兼容性
+            await self.update_all_platform_compatibility()

-        return result
+            return result

    async def update_all_platform_compatibility(self):
        """更新所有插件的平台兼容性设置"""
@@ -435,7 +438,7 @@ class PluginManager:
                        )

                if path in star_map:
-                    # 通过装饰器的方式注册插件
+                    # 通过 __init__subclass__ 注册插件
                    metadata = star_map[path]

                    try:
@@ -449,8 +452,11 @@ class PluginManager:
                            metadata.desc = metadata_yaml.desc
                            metadata.version = metadata_yaml.version
                            metadata.repo = metadata_yaml.repo
-                    except Exception:
-                        pass
+                    except Exception as e:
+                        logger.warning(
+                            f"插件 {root_dir_name} 元数据载入失败: {str(e)}。使用默认元数据。"
+                        )
+                    logger.info(metadata)
                    metadata.config = plugin_config
                    if path not in inactivated_plugins:
                        # 只有没有禁用插件时才实例化插件类
@@ -622,43 +628,45 @@ class PluginManager:
                - readme: README.md 文件的内容(如果存在)
                如果找不到插件元数据则返回 None。
        """
-        plugin_path = await self.updator.install(repo_url, proxy)
-        # reload the plugin
-        dir_name = os.path.basename(plugin_path)
-        await self.load(specified_dir_name=dir_name)
+        async with self._pm_lock:
+            plugin_path = await self.updator.install(repo_url, proxy)
+            # reload the plugin
+            dir_name = os.path.basename(plugin_path)
+            await self.load(specified_dir_name=dir_name)

-        # Get the plugin metadata to return repo info
-        plugin = self.context.get_registered_star(dir_name)
-        if not plugin:
-            # Try to find by other name if directory name doesn't match plugin name
-            for star in self.context.get_all_stars():
-                if star.root_dir_name == dir_name:
-                    plugin = star
-                    break
+            # Get the plugin metadata to return repo info
+            plugin = self.context.get_registered_star(dir_name)
+            if not plugin:
+                # Try to find by other name if directory name doesn't match plugin name
+                for star in self.context.get_all_stars():
+                    if star.root_dir_name == dir_name:
+                        plugin = star
+                        break

-        # Extract README.md content if exists
-        readme_content = None
-        readme_path = os.path.join(plugin_path, "README.md")
-        if not os.path.exists(readme_path):
-            readme_path = os.path.join(plugin_path, "readme.md")
+            # Extract README.md content if exists
+            readme_content = None
+            readme_path = os.path.join(plugin_path, "README.md")
+            if not os.path.exists(readme_path):
+                readme_path = os.path.join(plugin_path, "readme.md")

-        if os.path.exists(readme_path) and nh3:
-            try:
-                with open(readme_path, "r", encoding="utf-8") as f:
-                    readme_content = f.read()
-                cleaned_content = nh3.clean(readme_content)
-            except Exception as e:
-                logger.warning(f"读取插件 {dir_name} 的 README.md 文件失败: {str(e)}")
+            if os.path.exists(readme_path):
+                try:
+                    with open(readme_path, "r", encoding="utf-8") as f:
+                        readme_content = f.read()
+                except Exception as e:
+                    logger.warning(
+                        f"读取插件 {dir_name} 的 README.md 文件失败: {str(e)}"
+                    )

-        plugin_info = None
-        if plugin:
-            plugin_info = {
-                "repo": plugin.repo,
-                "readme": cleaned_content,
-                "name": plugin.name,
-            }
+            plugin_info = None
+            if plugin:
+                plugin_info = {
+                    "repo": plugin.repo,
+                    "readme": readme_content,
+                    "name": plugin.name,
+                }

-        return plugin_info
+            return plugin_info

    async def uninstall_plugin(self, plugin_name: str):
        """卸载指定的插件。
@@ -669,32 +677,33 @@ class PluginManager:
        Raises:
            Exception: 当插件不存在、是保留插件时，或删除插件文件夹失败时抛出异常
        """
-        plugin = self.context.get_registered_star(plugin_name)
-        if not plugin:
-            raise Exception("插件不存在。")
-        if plugin.reserved:
-            raise Exception("该插件是 AstrBot 保留插件，无法卸载。")
-        root_dir_name = plugin.root_dir_name
-        ppath = self.plugin_store_path
+        async with self._pm_lock:
+            plugin = self.context.get_registered_star(plugin_name)
+            if not plugin:
+                raise Exception("插件不存在。")
+            if plugin.reserved:
+                raise Exception("该插件是 AstrBot 保留插件，无法卸载。")
+            root_dir_name = plugin.root_dir_name
+            ppath = self.plugin_store_path

-        # 终止插件
-        try:
-            await self._terminate_plugin(plugin)
-        except Exception as e:
-            logger.warning(traceback.format_exc())
-            logger.warning(
-                f"插件 {plugin_name} 未被正常终止 {str(e)}, 可能会导致资源泄露等问题。"
-            )
+            # 终止插件
+            try:
+                await self._terminate_plugin(plugin)
+            except Exception as e:
+                logger.warning(traceback.format_exc())
+                logger.warning(
+                    f"插件 {plugin_name} 未被正常终止 {str(e)}, 可能会导致资源泄露等问题。"
+                )

-        # 从 star_registry 和 star_map 中删除
-        await self._unbind_plugin(plugin_name, plugin.module_path)
+            # 从 star_registry 和 star_map 中删除
+            await self._unbind_plugin(plugin_name, plugin.module_path)

-        try:
-            remove_dir(os.path.join(ppath, root_dir_name))
-        except Exception as e:
-            raise Exception(
-                f"移除插件成功，但是删除插件文件夹失败: {str(e)}。您可以手动删除该文件夹，位于 addons/plugins/ 下。"
-            )
+            try:
+                remove_dir(os.path.join(ppath, root_dir_name))
+            except Exception as e:
+                raise Exception(
+                    f"移除插件成功，但是删除插件文件夹失败: {str(e)}。您可以手动删除该文件夹，位于 addons/plugins/ 下。"
+                )

    async def _unbind_plugin(self, plugin_name: str, plugin_module_path: str):
        """解绑并移除一个插件。
@@ -747,35 +756,37 @@ class PluginManager:
        将插件的 module_path 加入到 data/shared_preferences.json 的 inactivated_plugins 列表中。
        并且同时将插件启用的 llm_tool 禁用。
        """
-        plugin = self.context.get_registered_star(plugin_name)
-        if not plugin:
-            raise Exception("插件不存在。")
+        async with self._pm_lock:
+            plugin = self.context.get_registered_star(plugin_name)
+            if not plugin:
+                raise Exception("插件不存在。")

-        # 调用插件的终止方法
-        await self._terminate_plugin(plugin)
+            # 调用插件的终止方法
+            await self._terminate_plugin(plugin)

-        # 加入到 shared_preferences 中
-        inactivated_plugins: list = sp.get("inactivated_plugins", [])
-        if plugin.module_path not in inactivated_plugins:
-            inactivated_plugins.append(plugin.module_path)
+            # 加入到 shared_preferences 中
+            inactivated_plugins: list = sp.get("inactivated_plugins", [])
+            if plugin.module_path not in inactivated_plugins:
+                inactivated_plugins.append(plugin.module_path)

-        inactivated_llm_tools: list = list(
-            set(sp.get("inactivated_llm_tools", []))
-        )  # 后向兼容
+            inactivated_llm_tools: list = list(
+                set(sp.get("inactivated_llm_tools", []))
+            )  # 后向兼容

-        # 禁用插件启用的 llm_tool
-        for func_tool in llm_tools.func_list:
-            if func_tool.handler_module_path == plugin.module_path:
-                func_tool.active = False
-                if func_tool.name not in inactivated_llm_tools:
-                    inactivated_llm_tools.append(func_tool.name)
+            # 禁用插件启用的 llm_tool
+            for func_tool in llm_tools.func_list:
+                if func_tool.handler_module_path == plugin.module_path:
+                    func_tool.active = False
+                    if func_tool.name not in inactivated_llm_tools:
+                        inactivated_llm_tools.append(func_tool.name)

-        sp.put("inactivated_plugins", inactivated_plugins)
-        sp.put("inactivated_llm_tools", inactivated_llm_tools)
+            sp.put("inactivated_plugins", inactivated_plugins)
+            sp.put("inactivated_llm_tools", inactivated_llm_tools)

-        plugin.activated = False
+            plugin.activated = False

-    async def _terminate_plugin(self, star_metadata: StarMetadata):
+    @staticmethod
+    async def _terminate_plugin(star_metadata: StarMetadata):
        """终止插件，调用插件的 terminate() 和 __del__() 方法"""
        logger.info(f"正在终止插件 {star_metadata.name} ...")

@@ -11,7 +11,7 @@ ASTRBOT_T2I_DEFAULT_ENDPOINT = "https://t2i.soulter.top/text2img"


 class NetworkRenderStrategy(RenderStrategy):
-    def __init__(self, base_url: str = ASTRBOT_T2I_DEFAULT_ENDPOINT) -> None:
+    def __init__(self, base_url: str | None = None) -> None:
        super().__init__()
        if not base_url:
            base_url = ASTRBOT_T2I_DEFAULT_ENDPOINT
@@ -34,18 +34,22 @@ class NetworkRenderStrategy(RenderStrategy):
            self.BASE_RENDER_URL += "/text2img"

    async def render_custom_template(
-        self, tmpl_str: str, tmpl_data: dict, return_url: bool = True
+        self,
+        tmpl_str: str,
+        tmpl_data: dict,
+        return_url: bool = True,
+        options: dict | None = None,
    ) -> str:
        """使用自定义文转图模板"""
+        default_options = {"full_page": True, "type": "jpeg", "quality": 40}
+        if options:
+            default_options |= options
+
        post_data = {
            "tmpl": tmpl_str,
            "json": return_url,
            "tmpldata": tmpl_data,
-            "options": {
-                "full_page": True,
-                "type": "jpeg",
-                "quality": 40,
-            },
+            "options": default_options,
        }
        if return_url:
            ssl_context = ssl.create_default_context(cafile=certifi.where())
@@ -6,7 +6,7 @@ logger = LogManager.GetLogger(log_name="astrbot")


 class HtmlRenderer:
-    def __init__(self, endpoint_url: str = None):
+    def __init__(self, endpoint_url: str | None = None):
        self.network_strategy = NetworkRenderStrategy(endpoint_url)
        self.local_strategy = LocalRenderStrategy()

@@ -16,19 +16,24 @@ class HtmlRenderer:
        self.network_strategy.set_endpoint(endpoint_url)

    async def render_custom_template(
-        self, tmpl_str: str, tmpl_data: dict, return_url: bool = False
+        self,
+        tmpl_str: str,
+        tmpl_data: dict,
+        return_url: bool = False,
+        options: dict | None = None,
    ):
        """使用自定义文转图模板。该方法会通过网络调用 t2i 终结点图文渲染API。
        @param tmpl_str: HTML Jinja2 模板。
        @param tmpl_data: jinja2 模板数据。
+        @param options: 渲染选项。

        @return: 图片 URL 或者文件路径，取决于 return_url 参数。

        @example: 参见 https://astrbot.app 插件开发部分。
        """
-        local = locals()
-        local.pop("self")
-        return await self.network_strategy.render_custom_template(**local)
+        return await self.network_strategy.render_custom_template(
+            tmpl_str, tmpl_data, return_url, options
+        )

    async def render_t2i(
        self, text: str, use_network: bool = True, return_url: bool = False
@@ -1,9 +1,11 @@
 import base64
 import wave
 import os
+import subprocess
 from io import BytesIO
 import asyncio
 import tempfile
+from astrbot.core import logger
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path


@@ -57,33 +59,89 @@ async def wav_to_tencent_silk(wav_path: str, output_path: str) -> int:
        return duration


-async def wav_to_tencent_silk_base64(wav_path: str) -> str:
+async def convert_to_pcm_wav(input_path: str, output_path: str) -> str:
    """
-    将 WAV 文件转为 Silk，并返回 Base64 字符串。
-    默认采样率为 24000，输出临时文件为 temp/output.silk。
+    将 MP3 或其他音频格式转换为 PCM 16bit WAV，采样率24000Hz，单声道。
+    若转换失败则抛出异常。
+    """
+    try:
+        from pyffmpeg import FFmpeg
+
+        ff = FFmpeg()
+        ff.convert(input=input_path, output=output_path)
+    except Exception as e:
+        logger.debug(f"pyffmpeg 转换失败: {e}, 尝试使用 ffmpeg 命令行进行转换")
+
+        p = await asyncio.create_subprocess_exec(
+            "ffmpeg",
+            "-y",
+            "-i",
+            input_path,
+            "-acodec",
+            "pcm_s16le",
+            "-ar",
+            "24000",
+            "-ac",
+            "1",
+            "-af",
+            "apad=pad_dur=2",
+            "-fflags",
+            "+genpts",
+            "-hide_banner",
+            output_path,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+        stdout, stderr = await p.communicate()
+        logger.info(f"[FFmpeg] stdout: {stdout.decode().strip()}")
+        logger.debug(f"[FFmpeg] stderr: {stderr.decode().strip()}")
+        logger.info(f"[FFmpeg] return code: {p.returncode}")
+
+    if os.path.exists(output_path) and os.path.getsize(output_path) > 0:
+        return output_path
+    else:
+        raise RuntimeError("生成的WAV文件不存在或为空")
+
+
+async def audio_to_tencent_silk_base64(audio_path: str) -> tuple[str, float]:
+    """
+    将 MP3/WAV 文件转为 Tencent Silk 并返回 base64 编码与时长（秒）。

    参数:
-    - wav_path: 输入 .wav 文件路径（需为 PCM 16bit）
+    - audio_path: 输入音频文件路径（.mp3 或 .wav）

    返回:
-    - Base64 编码的 Silk 字符串
+    - silk_b64: Base64 编码的 Silk 字符串
    - duration: 音频时长（秒）
    """
    try:
        import pilk
    except ImportError as e:
-        raise Exception("pysilk 模块未安装，请安装 pysilk") from e
+        raise Exception("未安装 pilk: pip install pilk") from e

    temp_dir = os.path.join(get_astrbot_data_path(), "temp")
    os.makedirs(temp_dir, exist_ok=True)

-    with wave.open(wav_path, "rb") as wav:
-        rate = wav.getframerate()
+    # 是否需要转换为 WAV
+    ext = os.path.splitext(audio_path)[1].lower()
+    temp_wav = tempfile.NamedTemporaryFile(
+        suffix=".wav", delete=False, dir=temp_dir
+    ).name

-    with tempfile.NamedTemporaryFile(
+    if ext != ".wav":
+        await convert_to_pcm_wav(audio_path, temp_wav)
+        # 删除原文件
+        os.remove(audio_path)
+        wav_path = temp_wav
+    else:
+        wav_path = audio_path
+
+    with wave.open(wav_path, "rb") as wav_file:
+        rate = wav_file.getframerate()
+
+    silk_path = tempfile.NamedTemporaryFile(
        suffix=".silk", delete=False, dir=temp_dir
-    ) as tmp_file:
-        silk_path = tmp_file.name
+    ).name

    try:
        duration = await asyncio.to_thread(
@@ -96,5 +154,7 @@ async def wav_to_tencent_silk_base64(wav_path: str) -> str:

        return silk_b64, duration  # 已是秒
    finally:
+        if os.path.exists(wav_path) and wav_path != audio_path:
+            os.remove(wav_path)
        if os.path.exists(silk_path):
            os.remove(silk_path)
@@ -3,7 +3,7 @@ import datetime
 import asyncio
 from .route import Route, Response, RouteContext
 from quart import request
-from astrbot.core import WEBUI_SK, DEMO_MODE
+from astrbot.core import DEMO_MODE
 from astrbot import logger


@@ -80,5 +80,8 @@ class AuthRoute(Route):
            "username": username,
            "exp": datetime.datetime.utcnow() + datetime.timedelta(days=7),
        }
-        token = jwt.encode(payload, WEBUI_SK, algorithm="HS256")
+        jwt_token = self.config["dashboard"].get("jwt_secret", None)
+        if not jwt_token:
+            raise ValueError("JWT secret is not set in the cmd_config.")
+        token = jwt.encode(payload, jwt_token, algorithm="HS256")
        return token
@@ -2,7 +2,7 @@ import uuid
 import json
 import os
 from .route import Route, Response, RouteContext
-from astrbot.core import web_chat_queue, web_chat_back_queue
+from astrbot.core.platform.sources.webchat.webchat_queue_mgr import webchat_queue_mgr
 from quart import request, Response as QuartResponse, g, make_response
 from astrbot.core.db import BaseDatabase
 import asyncio
@@ -21,7 +21,6 @@ class ChatRoute(Route):
        super().__init__(context)
        self.routes = {
            "/chat/send": ("POST", self.chat),
-            "/chat/listen": ("GET", self.listener),
            "/chat/new_conversation": ("GET", self.new_conversation),
            "/chat/conversations": ("GET", self.get_conversations),
            "/chat/get_conversation": ("GET", self.get_conversation),
@@ -40,9 +39,6 @@ class ChatRoute(Route):

        self.supported_imgs = ["jpg", "jpeg", "png", "gif", "webp"]

-        self.curr_user_cid = {}
-        self.curr_chat_sse = {}
-
    async def status(self):
        has_llm_enabled = (
            self.core_lifecycle.provider_manager.curr_provider_inst is not None
@@ -124,6 +120,8 @@ class ChatRoute(Route):
        conversation_id = post_data["conversation_id"]
        image_url = post_data.get("image_url")
        audio_url = post_data.get("audio_url")
+        selected_provider = post_data.get("selected_provider")
+        selected_model = post_data.get("selected_model")
        if not message and not image_url and not audio_url:
            return (
                Response()
@@ -133,21 +131,10 @@ class ChatRoute(Route):
        if not conversation_id:
            return Response().error("conversation_id is empty").__dict__

-        self.curr_user_cid[username] = conversation_id
+        # Get conversation-specific queues
+        back_queue = webchat_queue_mgr.get_or_create_back_queue(conversation_id)

-        await web_chat_queue.put(
-            (
-                username,
-                conversation_id,
-                {
-                    "message": message,
-                    "image_url": image_url,  # list
-                    "audio_url": audio_url,
-                },
-            )
-        )
-
-        # 持久化
+        # append user message
        conversation = self.db.get_conversation_by_user_id(username, conversation_id)
        try:
            history = json.loads(conversation.history)
@@ -164,30 +151,12 @@ class ChatRoute(Route):
            username, conversation_id, history=json.dumps(history)
        )

-        return Response().ok().__dict__
-
-    async def listener(self):
-        """一直保持长连接"""
-
-        username = g.get("username", "guest")
-
-        if username in self.curr_chat_sse:
-            return Response().error("Already connected").__dict__
-
-        self.curr_chat_sse[username] = None
-
-        heartbeat = json.dumps({"type": "heartbeat", "data": "ping"})
-
        async def stream():
            try:
-                yield f"data: {heartbeat}\n\n"  # 心跳包
                while True:
                    try:
-                        result = await asyncio.wait_for(
-                            web_chat_back_queue.get(), timeout=10
-                        )  # 设置超时时间为5秒
+                        result = await asyncio.wait_for(back_queue.get(), timeout=10)
                    except asyncio.TimeoutError:
-                        yield f"data: {heartbeat}\n\n"  # 心跳包
                        continue

                    if not result:
@@ -197,19 +166,13 @@ class ChatRoute(Route):
                    type = result.get("type")
                    cid = result.get("cid")
                    streaming = result.get("streaming", False)
-                    if cid != self.curr_user_cid.get(username):
-                        # 丢弃
-                        continue
                    yield f"data: {json.dumps(result, ensure_ascii=False)}\n\n"
                    await asyncio.sleep(0.05)

-                    if streaming and type != "end":
-                        continue
-
-                    if type == "update_title":
-                        continue
-
-                    if result_text:
+                    if type == "end":
+                        break
+                    elif (streaming and type == "complete") or not streaming:
+                        # append bot message
                        conversation = self.db.get_conversation_by_user_id(
                            username, cid
                        )
@@ -222,11 +185,27 @@ class ChatRoute(Route):
                        self.db.update_conversation(
                            username, cid, history=json.dumps(history)
                        )
+
            except BaseException as _:
                logger.debug(f"用户 {username} 断开聊天长连接。")
-                self.curr_chat_sse.pop(username)
                return

+        # Put message to conversation-specific queue
+        chat_queue = webchat_queue_mgr.get_or_create_queue(conversation_id)
+        await chat_queue.put(
+            (
+                username,
+                conversation_id,
+                {
+                    "message": message,
+                    "image_url": image_url,  # list
+                    "audio_url": audio_url,
+                    "selected_provider": selected_provider,
+                    "selected_model": selected_model,
+                },
+            )
+        )
+
        response = await make_response(
            stream(),
            {
@@ -236,7 +215,6 @@ class ChatRoute(Route):
                "Connection": "keep-alive",
            },
        )
-        response.timeout = None
        return response

    async def delete_conversation(self):
@@ -245,6 +223,8 @@ class ChatRoute(Route):
        if not conversation_id:
            return Response().error("Missing key: conversation_id").__dict__

+        # Clean up queues when deleting conversation
+        webchat_queue_mgr.remove_queues(conversation_id)
        self.db.delete_conversation(username, conversation_id)
        return Response().ok().__dict__

@@ -279,6 +259,4 @@ class ChatRoute(Route):

        conversation = self.db.get_conversation_by_user_id(username, conversation_id)

-        self.curr_user_cid[username] = conversation_id
-
        return Response().ok(data=conversation).__dict__
@@ -9,6 +9,7 @@ from astrbot.core.platform.register import platform_registry
 from astrbot.core.provider.register import provider_registry
 from astrbot.core.star.star import star_registry
 from astrbot.core import logger
+from astrbot.core.provider import Provider
 import asyncio


@@ -166,8 +167,9 @@ class ConfigRoute(Route):
            "/config/provider/update": ("POST", self.post_update_provider),
            "/config/provider/delete": ("POST", self.post_delete_provider),
            "/config/llmtools": ("GET", self.get_llm_tools),
-            "/config/provider/check_status": ("GET", self.check_all_providers_status),
+            "/config/provider/check_one": ("GET", self.check_one_provider_status),
            "/config/provider/list": ("GET", self.get_provider_config_list),
+            "/config/provider/model_list": ("GET", self.get_provider_model_list),
            "/config/provider/get_session_seperate": (
                "GET",
                lambda: Response()
@@ -256,33 +258,37 @@ class ConfigRoute(Route):
            )
        return status_info

-    async def check_all_providers_status(self):
-        """
-        API 接口: 检查所有 LLM Providers 的状态
-        """
-        logger.info("API call received: /config/provider/check_status")
+    def _error_response(self, message: str, status_code: int = 500, log_fn=logger.error):
+        log_fn(message)
+        # 记录更详细的traceback信息，但只在是严重错误时
+        if status_code == 500:
+            log_fn(traceback.format_exc())
+        return Response().error(message, status_code=status_code).__dict__
+
+    async def check_one_provider_status(self):
+        """API: check a single LLM Provider's status by id"""
+        provider_id = request.args.get("id")
+        if not provider_id:
+            return self._error_response("Missing provider_id parameter", 400, logger.warning)
+
+        logger.info(f"API call: /config/provider/check_one id={provider_id}")
        try:
-            all_providers: typing.List = (
-                self.core_lifecycle.star_context.get_all_providers()
+            all_providers = self.core_lifecycle.star_context.get_all_providers()
+            # replace manual loop with next(filter(...))
+            target = next(
+                (p for p in all_providers if p.provider_config.get("id") == provider_id),
+                None
            )
-            logger.debug(f"Found {len(all_providers)} providers to check.")
+            if not target:
+                return self._error_response(f"Provider with id '{provider_id}' not found", 404, logger.warning)

-            if not all_providers:
-                logger.info("No providers found to check.")
-                return Response().ok([]).__dict__
+            result = await self._test_single_provider(target)
+            return Response().ok(result).__dict__

-            tasks = [self._test_single_provider(p) for p in all_providers]
-            logger.debug(f"Created {len(tasks)} tasks for concurrent provider checks.")
-
-            results = await asyncio.gather(*tasks)
-            logger.info(f"Provider status check completed. Results: {results}")
-
-            return Response().ok(results).__dict__
        except Exception as e:
-            logger.error(f"Critical error in check_all_providers_status: {str(e)}")
-            logger.error(traceback.format_exc())
-            return (
-                Response().error(f"检查 Provider 状态时发生严重错误: {str(e)}").__dict__
+            return self._error_response(
+                f"Critical error checking provider {provider_id}: {e}",
+                500
            )

    async def get_configs(self):
@@ -319,6 +325,28 @@ class ConfigRoute(Route):
                provider_list.append(provider)
        return Response().ok(provider_list).__dict__

+    async def get_provider_model_list(self):
+        """获取指定提供商的模型列表"""
+        provider_id = request.args.get("provider_id", None)
+        if not provider_id:
+            return Response().error("缺少参数 provider_id").__dict__
+
+        prov_mgr = self.core_lifecycle.provider_manager
+        provider: Provider | None = prov_mgr.inst_map.get(provider_id, None)
+        if not provider:
+            return Response().error(f"未找到 ID 为 {provider_id} 的提供商").__dict__
+
+        try:
+            models = await provider.get_models()
+            ret = {
+                "models": models,
+                "provider_id": provider_id,
+            }
+            return Response().ok(ret).__dict__
+        except Exception as e:
+            logger.error(traceback.format_exc())
+            return Response().error(str(e)).__dict__
+
    async def post_astrbot_configs(self):
        post_configs = await request.json
        try:
@@ -29,6 +29,7 @@ class ConversationRoute(Route):
            ),
        }
        self.db_helper = db_helper
+        self.core_lifecycle = core_lifecycle
        self.register_routes()

    async def list_conversations(self):
@@ -165,11 +166,9 @@ class ConversationRoute(Route):

            if not user_id or not cid:
                return Response().error("缺少必要参数: user_id 和 cid").__dict__
-            conversation = self.db_helper.get_conversation_by_user_id(user_id, cid)
-            if not conversation:
-                return Response().error("对话不存在").__dict__
-            self.db_helper.delete_conversation(user_id, cid)
-
+            await self.core_lifecycle.conversation_manager.delete_conversation(
+                unified_msg_origin=user_id, conversation_id=cid
+            )
            return Response().ok({"message": "对话删除成功"}).__dict__

        except Exception as e:
@@ -18,12 +18,6 @@ from astrbot.core.star.filter.regex import RegexFilter
 from astrbot.core.star.star_handler import EventType
 from astrbot.core import DEMO_MODE

-try:
-    import nh3
-except ImportError:
-    logger.warning("未安装 nh3 库，无法清理插件 README.md 中的 HTML 标签。")
-    nh3 = None
-

 class PluginRoute(Route):
    def __init__(
@@ -332,9 +326,6 @@ class PluginRoute(Route):
            return Response().error(str(e)).__dict__

    async def get_plugin_readme(self):
-        if not nh3:
-            return Response().error("未安装 nh3 库").__dict__
-
        plugin_name = request.args.get("name")
        logger.debug(f"正在获取插件 {plugin_name} 的README文件内容")

@@ -370,11 +361,9 @@ class PluginRoute(Route):
            with open(readme_path, "r", encoding="utf-8") as f:
                readme_content = f.read()

-            cleaned_content = nh3.clean(readme_content)
-
            return (
                Response()
-                .ok({"content": cleaned_content}, "成功获取README内容")
+                .ok({"content": readme_content}, "成功获取README内容")
                .__dict__
            )
        except Exception as e:
@@ -395,12 +384,14 @@ class PluginRoute(Route):
                platform_type = platform.get("type", "")
                platform_id = platform.get("id", "")

-                platforms.append({
-                    "name": platform_id,  # 使用type作为name，这是系统内部使用的平台名称
-                    "id": platform_id,  # 保留id字段以便前端可以显示
-                    "type": platform_type,
-                    "display_name": f"{platform_type}({platform_id})",
-                })
+                platforms.append(
+                    {
+                        "name": platform_id,  # 使用type作为name，这是系统内部使用的平台名称
+                        "id": platform_id,  # 保留id字段以便前端可以显示
+                        "type": platform_type,
+                        "display_name": f"{platform_type}({platform_id})",
+                    }
+                )

            adjusted_platform_enable = {}
            for platform_id, plugins in platform_enable.items():
@@ -409,11 +400,13 @@ class PluginRoute(Route):
            # 获取所有插件，包括系统内部插件
            plugins = []
            for plugin in self.plugin_manager.context.get_all_stars():
-                plugins.append({
-                    "name": plugin.name,
-                    "desc": plugin.desc,
-                    "reserved": plugin.reserved,  # 添加reserved标志
-                })
+                plugins.append(
+                    {
+                        "name": plugin.name,
+                        "desc": plugin.desc,
+                        "reserved": plugin.reserved,  # 添加reserved标志
+                    }
+                )

            logger.debug(
                f"获取插件平台配置: 原始配置={platform_enable}, 调整后={adjusted_platform_enable}"
@@ -421,11 +414,13 @@ class PluginRoute(Route):

            return (
                Response()
-                .ok({
-                    "platforms": platforms,
-                    "plugins": plugins,
-                    "platform_enable": adjusted_platform_enable,
-                })
+                .ok(
+                    {
+                        "platforms": platforms,
+                        "plugins": plugins,
+                        "platform_enable": adjusted_platform_enable,
+                    }
+                )
                .__dict__
            )
        except Exception as e:
@@ -41,10 +41,15 @@ class StatRoute(Route):
        await self.core_lifecycle.restart()
        return Response().ok().__dict__

-    def format_sec(self, sec: int):
-        m, s = divmod(sec, 60)
-        h, m = divmod(m, 60)
-        return f"{h}小时{m}分{s}秒"
+    def _get_running_time_components(self, total_seconds: int):
+        """将总秒数转换为时分秒组件"""
+        minutes, seconds = divmod(total_seconds, 60)
+        hours, minutes = divmod(minutes, 60)
+        return {
+            "hours": hours,
+            "minutes": minutes,
+            "seconds": seconds
+        }

    def is_default_cred(self):
        username = self.config["dashboard"]["username"]
@@ -107,6 +112,11 @@ class StatRoute(Route):
                }
                plugin_info.append(info)

+            # 计算运行时长组件
+            running_time = self._get_running_time_components(
+                int(time.time()) - self.core_lifecycle.start_time
+            )
+
            stat_dict.update(
                {
                    "platform": self.db_helper.get_grouped_base_stats(
@@ -119,9 +129,7 @@ class StatRoute(Route):
                    "plugin_count": len(plugins),
                    "plugins": plugin_info,
                    "message_time_series": message_time_based_stats,
-                    "running": self.format_sec(
-                        int(time.time()) - self.core_lifecycle.start_time
-                    ),
+                    "running": running_time,  # 现在返回时间组件而不是格式化的字符串
                    "memory": {
                        "process": psutil.Process().memory_info().rss >> 20,
                        "system": psutil.virtual_memory().total >> 20,
@@ -10,7 +10,7 @@ from quart.logging import default_handler
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from .routes import *
 from .routes.route import RouteContext, Response
-from astrbot.core import logger, WEBUI_SK
+from astrbot.core import logger
 from astrbot.core.db import BaseDatabase
 from astrbot.core.utils.io import get_local_ip_addresses
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
@@ -62,6 +62,8 @@ class AstrBotDashboard:

        self.shutdown_event = shutdown_event

+        self._init_jwt_secret()
+
    async def srv_plug_route(self, subpath, *args, **kwargs):
        """
        插件路由
@@ -88,7 +90,7 @@ class AstrBotDashboard:
        if token.startswith("Bearer "):
            token = token[7:]
        try:
-            payload = jwt.decode(token, WEBUI_SK, algorithms=["HS256"])
+            payload = jwt.decode(token, self._jwt_secret, algorithms=["HS256"])
            g.username = payload["username"]
        except jwt.ExpiredSignatureError:
            r = jsonify(Response().error("Token 过期").__dict__)
@@ -140,6 +142,15 @@ class AstrBotDashboard:
        except Exception as e:
            return f"获取进程信息失败: {str(e)}"

+    def _init_jwt_secret(self):
+        if not self.config.get("dashboard", {}).get("jwt_secret", None):
+            # 如果没有设置 JWT 密钥，则生成一个新的密钥
+            jwt_secret = os.urandom(32).hex()
+            self.config["dashboard"]["jwt_secret"] = jwt_secret
+            self.config.save_config()
+            logger.info("Initialized random JWT secret for dashboard.")
+        self._jwt_secret = self.config["dashboard"]["jwt_secret"]
+
    def run(self):
        ip_addr = []
        if p := os.environ.get("DASHBOARD_PORT"):
@@ -0,0 +1,20 @@
+# What's Changed
+
+> 对 v3.5.16 的修订版本
+
+1. 新增：支持接入 Slack
+2. 新增：支持接入 Discord
+3. 新增：支持接入 KOOK
+4. 新增：支持接入 VoceChat
+5. 新增：微信客服支持语音的收发
+6. 新增：实现 WebUI 的 i18n 模型，WebUI 现已支持 English。
+7. 新增：支持接入 GPT SoVITS
+8. 优化：支持通过引用 Bot 消息来唤醒 Bot
+9.  优化：WebUI 滚动条、侧边栏样式优化
+10. 优化：WebUI ChatBox 的样式优化，添加切换夜间模式按钮
+11. 优化：WebUI Chat 页面的 SSE 连接优化及一些其他样式优化
+12. 优化：钉钉发送图片支持使用 AstrBot 自带的文件服务器
+13. 优化：新建服务提供商时，如果没有添加 Key，会弹出警告提示框
+14. 修复：会话隔离模式下，WeChatPadPro 会话 ID 为自身 ID
+15. 修复：会话隔离模式下，WeChatPadPro 无法回复群聊消息
+16. 修复：使用 uvx 启动 AstrBot 时，插件依赖无法正常安装
@@ -0,0 +1,18 @@
+# What's Changed
+
+> 重构了大模型请求部分，如果发现此部分使用时有问题请提交 issue
+
+1. 修复: 安装插件按钮被删除、无法自定义安装插件
+2. 修复: 环境变量中的代理地址无法生效
+1. 修复: randomize jwt secret
+2. 修复: 在 Node 消息段发送简单文本信息的问题
+1. 修复: QQ 官方机器人适配器使用 SessionController(会话控制)功能时机器人回复消息无法发送到聊天平台
+4. 修复: Discord 适配器无法优雅重载
+1. 修复: Telegram 适配器无法主动回复
+1. 修复: 仪表盘的『插件配置』中不显示代码编辑器
+3. 新增: Gemini TTS API
+1. 新增: 允许 html_render 方法传入 Playwright.screenshot 配置参数
+1. 优化: 修复 CommandFilter 支持对布尔类型进行解析
+4. 新增: WechatPadPro 发送 TTS 时 添加对 MP3 格式音频支持
+1. 重构: 将大模型请求部分抽象成 AgentRunner，提高可读性和可扩展性，工具调用结果支持持久化保存到数据库，完善 Agent 的多轮工具调用能力。
+1. 移除: LLMTuner 模型提供商适配器。请使用 Ollama 来加载微调模型
@@ -0,0 +1,10 @@
+# What's Changed
+
+1. 修复: 通过 provider 指令设置提供商，重启后失效
+2. 新增: WebChat 支持直接选择提供商和模型
+3. 优化: WebUI 视觉效果、WebChat 视觉效果
+4. 优化: WebUI 测试提供商功能
+5. 优化: 修复潜在的 README XSS 注入问题
+6. 修复: WechatPadPro 授权码提取逻辑以适配上游新版本，并提高安全性
+7. 修复: Gemini 下，多轮工具调用时可能报错的问题
+8. 其他修复与优化
@@ -0,0 +1,6 @@
+# What's Changed
+
+1. 修复: 工具调用的结果错误地被当作消息发送
+2. 新增: 支持对引用消息中的图片进行理解(QQ, Telegram)
+3. 优化: QQ 主动消息发送逻辑，优化合并消息、文件、语音、图片等的处理
+4. 优化: 移除插件的 @register 插件注册装饰器（插件只需要继承 Star 类即可，AstrBot 会自动处理），简化插件代码开发
@@ -0,0 +1,7 @@
+# What's Changed
+
+1. 修复: WebChat 下图片、音频消息没有被正确渲染
+2. 修复: 部分情况下，插件信息无法正确显示
+3. 修复: WebChat 下开启分段回复后，消息错位
+4. 优化: 提高插件加载的性能和稳定性
+5. 修复: WebUI 对话数据库页中，无法真正删除对话
@@ -0,0 +1,3 @@
+# What's Changed
+
+1. 修复: 用户环境没有 Docker 时，可能导致死锁（表现为在初始化 AstrBot 的时候卡住）
@@ -26,6 +26,7 @@
    "js-md5": "^0.8.3",
    "lodash": "4.17.21",
    "marked": "^15.0.7",
+    "markdown-it": "^14.1.0",
    "pinia": "2.1.6",
    "remixicon": "3.5.0",
    "vee-validate": "4.11.3",
@@ -0,0 +1,353 @@
+<template>
+    <div>
+        <!-- 选择提供商和模型按钮 -->
+        <v-btn 
+            class="text-none" 
+            variant="tonal" 
+            rounded="xl" 
+            size="small" 
+            v-if="selectedProviderId && selectedModelName" 
+            @click="showDialog = true">
+            {{ selectedProviderId }} / {{ selectedModelName }}
+        </v-btn>
+        <v-btn 
+            variant="tonal" 
+            rounded="xl" 
+            size="small" 
+            v-else 
+            @click="showDialog = true">
+            选择模型
+        </v-btn>
+
+        <!-- 选择提供商和模型对话框 -->
+        <v-dialog v-model="showDialog" max-width="800" persistent>
+            <v-card style="padding: 8px;">
+                <v-card-title class="dialog-title">
+                    <span>选择提供商和模型</span>
+                </v-card-title>
+                <v-card-text class="pa-0">
+                    <div class="provider-model-container">
+                        <!-- 左侧提供商列表 -->
+                        <div class="provider-list-panel">
+                            <div class="panel-header">
+                                <h4>提供商</h4>
+                            </div>
+                            <v-list density="compact" nav class="provider-list">
+                                <v-list-item 
+                                    v-for="provider in providerConfigs" 
+                                    :key="provider.id"
+                                    :value="provider.id"
+                                    @click="selectProvider(provider)"
+                                    :active="selectedProviderId === provider.id"
+                                    rounded="lg"
+                                    class="provider-item">
+                                    <v-list-item-title>{{ provider.id }}</v-list-item-title>
+                                    <v-list-item-subtitle v-if="provider.api_base">{{ provider.api_base }}</v-list-item-subtitle>
+                                </v-list-item>
+                            </v-list>
+                            <div v-if="providerConfigs.length === 0" class="empty-state">
+                                <v-icon icon="mdi-cloud-off-outline" size="large" color="grey-lighten-1"></v-icon>
+                                <div class="empty-text">暂无可用提供商</div>
+                            </div>
+                        </div>
+
+                        <!-- 右侧模型列表 -->
+                        <div class="model-list-panel">
+                            <div class="panel-header">
+                                <h4>模型</h4>
+                                <v-btn 
+                                    v-if="selectedProviderId" 
+                                    icon="mdi-refresh" 
+                                    size="small" 
+                                    variant="text" 
+                                    @click="refreshModels"
+                                    :loading="loadingModels">
+                                </v-btn>
+                            </div>
+                            <v-list density="compact" nav class="model-list" v-if="selectedProviderId">
+                                <v-list-item 
+                                    v-for="model in modelList" 
+                                    :key="model"
+                                    :value="model"
+                                    @click="selectModel(model)"
+                                    :active="selectedModelName === model"
+                                    rounded="lg"
+                                    class="model-item">
+                                    <v-list-item-title>{{ model }}</v-list-item-title>
+                                    <v-list-item-subtitle v-if="model.description">{{ model.description }}</v-list-item-subtitle>
+                                </v-list-item>
+                            </v-list>
+                            <div v-else class="empty-state">
+                                <v-icon icon="mdi-robot-outline" size="large" color="grey-lighten-1"></v-icon>
+                                <div class="empty-text">请先选择提供商</div>
+                            </div>
+                            <div v-if="selectedProviderId && modelList.length === 0 && !loadingModels" class="empty-state">
+                                <v-icon icon="mdi-robot-off-outline" size="large" color="grey-lighten-1"></v-icon>
+                                <div class="empty-text">该提供商暂无可用模型</div>
+                            </div>
+                        </div>
+                    </div>
+                </v-card-text>
+                <v-card-actions>
+                    <v-spacer></v-spacer>
+                    <v-btn text @click="closeDialog" color="grey-darken-1">取消</v-btn>
+                    <v-btn 
+                        text 
+                        @click="confirmSelection" 
+                        color="primary"
+                        :disabled="!selectedProviderId || !selectedModelName">
+                        确认选择
+                    </v-btn>
+                </v-card-actions>
+            </v-card>
+        </v-dialog>
+    </div>
+</template>
+
+<script>
+import axios from 'axios';
+
+export default {
+    name: 'ProviderModelSelector',
+    props: {
+        initialProvider: {
+            type: String,
+            default: ''
+        },
+        initialModel: {
+            type: String,
+            default: ''
+        }
+    },
+    emits: ['selection-changed'],
+    data() {
+        return {
+            showDialog: false,
+            providerConfigs: [],
+            modelList: [],
+            selectedProviderId: '',
+            selectedModelName: '',
+            loadingModels: false
+        };
+    },
+    mounted() {
+        // 从localStorage加载保存的选择
+        this.loadFromStorage();
+        // 获取提供商列表
+        this.loadProviderConfigs();
+        // 如果有保存的选择，加载对应的模型列表
+        if (this.selectedProviderId) {
+            this.getProviderModels(this.selectedProviderId);
+        }
+    },
+    methods: {
+        // 从localStorage加载保存的选择
+        loadFromStorage() {
+            const savedProvider = localStorage.getItem('selectedProvider');
+            const savedModel = localStorage.getItem('selectedModel');
+            
+            if (savedProvider) {
+                this.selectedProviderId = savedProvider;
+            } else if (this.initialProvider) {
+                this.selectedProviderId = this.initialProvider;
+            }
+            
+            if (savedModel) {
+                this.selectedModelName = savedModel;
+            } else if (this.initialModel) {
+                this.selectedModelName = this.initialModel;
+            }
+        },
+
+        // 保存到localStorage
+        saveToStorage() {
+            if (this.selectedProviderId) {
+                localStorage.setItem('selectedProvider', this.selectedProviderId);
+            }
+            if (this.selectedModelName) {
+                localStorage.setItem('selectedModel', this.selectedModelName);
+            }
+        },
+
+        // 获取提供商配置列表
+        loadProviderConfigs() {
+            axios.get('/api/config/provider/list', {
+                params: {
+                    provider_type: 'chat_completion'
+                }
+            })
+                .then(response => {
+                    if (response.data.status === 'ok') {
+                        this.providerConfigs = response.data.data || [];
+                    } else {
+                        console.error('获取聊天完成提供商列表失败:', response.data.message);
+                    }
+                })
+                .catch(error => {
+                    console.error('获取聊天完成提供商列表失败:', error);
+                });
+        },
+
+        // 获取指定提供商的模型列表
+        getProviderModels(providerId) {
+            this.loadingModels = true;
+            axios.get('/api/config/provider/model_list', {
+                params: {
+                    provider_id: providerId
+                }
+            })
+                .then(response => {
+                    if (response.data.status === 'ok') {
+                        this.modelList = response.data.data.models || [];
+                    } else {
+                        console.error('获取模型列表失败:', response.data.message);
+                        this.modelList = [];
+                    }
+                })
+                .catch(error => {
+                    console.error('获取模型列表失败:', error);
+                    this.modelList = [];
+                })
+                .finally(() => {
+                    this.loadingModels = false;
+                });
+        },
+
+        // 选择提供商
+        selectProvider(provider) {
+            this.selectedProviderId = provider.id;
+            this.selectedModelName = ''; // 清空已选择的模型
+            this.modelList = []; // 清空模型列表
+            this.getProviderModels(provider.id); // 获取该提供商的模型列表
+        },
+
+        // 选择模型
+        selectModel(model) {
+            this.selectedModelName = model;
+        },
+
+        // 刷新模型列表
+        refreshModels() {
+            if (this.selectedProviderId) {
+                this.getProviderModels(this.selectedProviderId);
+            }
+        },
+
+        // 确认选择
+        confirmSelection() {
+            if (this.selectedProviderId && this.selectedModelName) {
+                // 保存到localStorage
+                this.saveToStorage();
+                
+                // 触发事件通知父组件
+                this.$emit('selection-changed', {
+                    providerId: this.selectedProviderId,
+                    modelName: this.selectedModelName
+                });
+                
+                this.closeDialog();
+            }
+        },
+
+        // 关闭对话框
+        closeDialog() {
+            this.showDialog = false;
+        },
+
+        // 公开方法：获取当前选择
+        getCurrentSelection() {
+            return {
+                providerId: this.selectedProviderId,
+                modelName: this.selectedModelName
+            };
+        }
+    }
+};
+</script>
+
+<style scoped>
+/* 对话框标题样式 */
+.dialog-title {
+    font-size: 18px;
+    font-weight: 500;
+    padding-bottom: 8px;
+}
+
+/* 提供商和模型选择对话框样式 */
+.provider-model-container {
+    display: flex;
+    height: 500px;
+    border: 1px solid var(--v-theme-border);
+    border-radius: 8px;
+    overflow: hidden;
+}
+
+.provider-list-panel,
+.model-list-panel {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    background-color: var(--v-theme-surface);
+}
+
+.provider-list-panel {
+    border-right: 1px solid var(--v-theme-border);
+}
+
+.panel-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px;
+    border-bottom: 1px solid var(--v-theme-border);
+    background-color: var(--v-theme-containerBg);
+}
+
+.panel-header h4 {
+    margin: 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: var(--v-theme-primaryText);
+}
+
+.provider-list,
+.model-list {
+    flex: 1;
+    overflow-y: auto;
+    padding: 8px;
+}
+
+.provider-item,
+.model-item {
+    margin-bottom: 4px;
+    border-radius: 8px !important;
+    transition: all 0.2s ease;
+    cursor: pointer;
+}
+
+.provider-item:hover,
+.model-item:hover {
+    background-color: rgba(103, 58, 183, 0.05);
+}
+
+.provider-item.v-list-item--active,
+.model-item.v-list-item--active {
+    background-color: rgba(103, 58, 183, 0.1);
+    color: var(--v-theme-secondary);
+}
+
+.empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 200px;
+    opacity: 0.6;
+    gap: 12px;
+}
+
+.empty-text {
+    font-size: 14px;
+    color: var(--v-theme-secondaryText);
+}
+</style>
@@ -1,6 +1,25 @@
 <script setup>
 import { VueMonacoEditor } from '@guolao/vue-monaco-editor'
 import { ref } from 'vue'
+import ListConfigItem from './ListConfigItem.vue'
+import { useI18n } from '@/i18n/composables'
+
+defineProps({
+  metadata: {
+    type: Object,
+    required: true
+  },
+  iterable: {
+    type: Object,
+    required: true
+  },
+  metadataKey: {
+    type: String,
+    required: true
+  }
+})
+
+const { t } = useI18n()

 const dialog = ref(false)
 const currentEditingKey = ref('')
@@ -307,35 +326,7 @@ function saveEditedContent() {
  </v-dialog>
 </template>

-<script>
-import ListConfigItem from './ListConfigItem.vue';
-import { useI18n } from '@/i18n/composables';

-export default {
-  name: 'AstrBotConfig',
-  components: {
-    ListConfigItem
-  },
-  setup() {
-    const { t } = useI18n();
-    return { t };
-  },
-  props: {
-    metadata: {
-      type: Object,
-      required: true
-    },
-    iterable: {
-      type: Object,
-      required: true
-    },
-    metadataKey: {
-      type: String,
-      required: true
-    }
-  }
-}
-</script>

 <style scoped>
 .config-section {
@@ -464,4 +455,4 @@ export default {
    padding: 4px;
  }
 }
-</style>
+</style>
@@ -49,6 +49,11 @@ const reloadExtension = () => {
 };

 const $confirm = inject("$confirm");
+
+const installExtension = async () => {
+  emit('install', props.extension);
+};
+
 const uninstallExtension = async () => {
  if (typeof $confirm !== "function") {
    console.error(tm("card.errors.confirmNotRegistered"));
@@ -117,6 +122,10 @@ const viewReadme = () => {
            <v-icon icon="mdi-cogs" start></v-icon>
            {{ extension.handlers?.length }}{{ tm("card.status.handlersCount") }}
          </v-chip>
+          <v-chip v-for="tag in extension.tags" :key="tag" :color="tag === 'danger' ? 'error' : 'primary'" label
+            size="small" class="ml-2">
+            {{ tag === 'danger' ? tm('tags.danger') : tag }}
+          </v-chip>
        </div>

        <div class="mt-2" :class="{ 'text-caption': $vuetify.display.xs }" style="max-height: 65px; overflow-y: auto;">
@@ -139,7 +148,7 @@ const viewReadme = () => {
      <v-btn color="teal-accent-4" :text="tm('buttons.viewDocs')" variant="text" @click="viewReadme"></v-btn>
      <v-btn v-if="!marketMode" color="teal-accent-4" :text="tm('buttons.actions')" variant="text" @click="reveal = true"></v-btn>
      <v-btn v-if="marketMode && !extension?.installed" color="teal-accent-4" :text="tm('buttons.install')" variant="text"
-        @click="emit('install', extension)"></v-btn>
+        @click="installExtension"></v-btn>
      <v-btn v-if="marketMode && extension?.installed" color="teal-accent-4" :text="tm('status.installed')" variant="text" disabled></v-btn>
    </v-card-actions>

@@ -200,6 +209,7 @@ const viewReadme = () => {
      </v-card>
    </v-expand-transition>
  </v-card>
+
 </template>

 <style scoped>
@@ -0,0 +1,129 @@
+<template>
+  <v-card class="item-card hover-elevation" style="padding: 4px;" elevation="0">
+    <v-card-title class="d-flex justify-space-between align-center pb-1 pt-3">
+      <span class="text-h2 text-truncate" :title="getItemTitle()">{{ getItemTitle() }}</span>
+      <v-tooltip location="top">
+        <template v-slot:activator="{ props }">
+          <v-switch 
+            color="primary" 
+            hide-details 
+            density="compact" 
+            :model-value="getItemEnabled()"
+            v-bind="props" 
+            @update:model-value="toggleEnabled"
+          ></v-switch>
+        </template>
+        <span>{{ getItemEnabled() ? t('core.common.itemCard.enabled') : t('core.common.itemCard.disabled') }}</span>
+      </v-tooltip>
+    </v-card-title>
+    
+    <v-card-text>
+      <slot name="item-details" :item="item"></slot>
+    </v-card-text>
+    
+    <v-card-actions style="margin: 8px;">
+      <v-btn
+        variant="outlined" 
+        color="error"
+        rounded="xl"
+        @click="$emit('delete', item)"
+      >
+        {{ t('core.common.itemCard.delete') }}
+      </v-btn>
+      <v-btn
+        variant="tonal"
+        color="primary"
+        rounded="xl"
+        @click="$emit('edit', item)"
+      >
+        {{ t('core.common.itemCard.edit') }}
+      </v-btn>
+      <v-spacer></v-spacer>
+    </v-card-actions>
+
+    <div class="d-flex justify-end align-center" style="position: absolute; bottom: 16px; right: 16px; opacity: 0.2;" v-if="bglogo">
+      <v-img
+        :src="bglogo"
+        contain
+        width="120"
+        height="120"
+        class="rounded-circle"
+      ></v-img>
+    </div>
+  </v-card>
+</template>
+
+<script>
+import { useI18n } from '@/i18n/composables';
+
+export default {
+  name: 'ItemCard',
+  setup() {
+    const { t } = useI18n();
+    return { t };
+  },
+  props: {
+    item: {
+      type: Object,
+      required: true
+    },
+    titleField: {
+      type: String,
+      default: 'id'
+    },
+    enabledField: {
+      type: String,
+      default: 'enable'
+    },
+    bglogo: {
+      type: String,
+      default: null
+    }
+  },
+  emits: ['toggle-enabled', 'delete', 'edit'],
+  methods: {
+    getItemTitle() {
+      return this.item[this.titleField];
+    },
+    getItemEnabled() {
+      return this.item[this.enabledField];
+    },
+    toggleEnabled() {
+      this.$emit('toggle-enabled', this.item);
+    }
+  }
+}
+</script>
+
+<style scoped>
+.item-card {
+  position: relative;
+  border-radius: 18px;
+  transition: all 0.3s ease;
+  overflow: hidden;
+  min-height: 220px;
+  margin-bottom: 16px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.hover-elevation:hover {
+  transform: translateY(-2px);
+}
+
+.item-status-indicator {
+  position: absolute;
+  top: 8px;
+  left: 8px;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: #ccc;
+  z-index: 10;
+}
+
+.item-status-indicator.active {
+  background-color: #4caf50;
+}
+</style>
@@ -9,10 +9,10 @@

    <v-row v-else>
      <v-col v-for="(item, index) in items" :key="index" cols="12" md="6" lg="4" xl="3">
-        <v-card class="item-card hover-elevation" :color="getItemEnabled(item) ? '' : 'grey-lighten-4'">
+        <v-card class="item-card hover-elevation" style="padding: 4px;" elevation="0">
          <div class="item-status-indicator" :class="{'active': getItemEnabled(item)}"></div>
          <v-card-title class="d-flex justify-space-between align-center pb-1 pt-3">
-            <span class="text-h4 text-truncate" :title="getItemTitle(item)">{{ getItemTitle(item) }}</span>
+            <span class="text-h2 text-truncate" :title="getItemTitle(item)">{{ getItemTitle(item) }}</span>
            <v-tooltip location="top">
              <template v-slot:activator="{ props }">
                <v-switch 
@@ -32,29 +32,36 @@
            <slot name="item-details" :item="item"></slot>
          </v-card-text>
          
-          <v-divider></v-divider>
-          
-          <v-card-actions class="pa-2">
-            <v-spacer></v-spacer>
-            <v-btn 
-              variant="text" 
-              size="small" 
-              color="error" 
-              prepend-icon="mdi-delete" 
+          <v-card-actions style="margin: 8px;">
+            <v-btn
+              variant="outlined" 
+              color="error"
+              rounded="xl"
              @click="$emit('delete', item)"
            >
              {{ t('core.common.itemCard.delete') }}
            </v-btn>
-            <v-btn 
-              variant="text" 
-              size="small" 
-              color="primary" 
-              prepend-icon="mdi-pencil" 
+            <v-btn
+              variant="tonal"
+              color="primary"
+              rounded="xl"
              @click="$emit('edit', item)"
            >
              {{ t('core.common.itemCard.edit') }}
            </v-btn>
+            <v-spacer></v-spacer>
          </v-card-actions>
+
+          <div class="d-flex justify-end align-center" style="position: absolute; bottom: 16px; right: 16px; opacity: 0.2;" v-if="bglogo">
+            <v-img
+              :src="bglogo"
+              contain
+              width="120"
+              height="120"
+              class="rounded-circle"
+            ></v-img>
+          </div>
+
        </v-card>
      </v-col>
    </v-row>
@@ -90,6 +97,10 @@ export default {
    emptyText: {
      type: String,
      default: null
+    },
+    bglogo: {
+      type: String,
+      default: null
    }
  },
  emits: ['toggle-enabled', 'delete', 'edit'],
@@ -112,10 +123,11 @@ export default {
 }
 </script>

-<style scoped>
+<style>
+
 .item-card {
  position: relative;
-  border-radius: 8px;
+  border-radius: 18px;
  transition: all 0.3s ease;
  overflow: hidden;
  min-height: 220px;
@@ -126,7 +138,6 @@ export default {
 }

 .hover-elevation:hover {
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.1);
  transform: translateY(-2px);
 }
 </style>
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, watch, onMounted, computed } from 'vue';
 import axios from 'axios';
-import { marked } from 'marked';
+import MarkdownIt from 'markdown-it';
 import hljs from 'highlight.js';
 import 'highlight.js/styles/github.css';
 import { useI18n } from '@/i18n/composables';
@@ -74,29 +74,28 @@ function openRepoInNewTab() {
  }
 }

+// 配置markdown-it，启用代码高亮
+const md = new MarkdownIt({
+  html: true,        // 启用HTML标签
+  breaks: true,       // 换行转<br>
+  linkify: true,      // 自动转链接
+  typographer: false, // 禁用智能引号
+  highlight: function(code, lang) {
+    if (lang && hljs.getLanguage(lang)) {
+      try {
+        return hljs.highlight(code, { language: lang }).value;
+      } catch (e) {
+        console.error(e);
+      }
+    }
+    return hljs.highlightAuto(code).value;
+  }
+});
+
 // 渲染Markdown内容
 function renderMarkdown(content) {
  if (!content) return '';
-  
-  // 配置marked使用highlight.js进行语法高亮
-  marked.setOptions({
-    highlight: function(code, lang) {
-      if (lang && hljs.getLanguage(lang)) {
-        try {
-          return hljs.highlight(code, { language: lang }).value;
-        } catch (e) {
-          console.error(e);
-        }
-      }
-      return hljs.highlightAuto(code).value;
-    },
-    gfm: true, // GitHub Flavored Markdown
-    breaks: true, // Convert \n to <br>
-    headerIds: true, // Add id attributes to headers
-    mangle: false // Don't mangle email addresses
-  });
-  
-  return marked(content);
+  return md.render(content);
 }

 // 刷新README内容
@@ -120,7 +119,7 @@ const _show = computed({
    <v-card>
      <v-card-title class="d-flex justify-space-between align-center">
        <span class="text-h5">{{ t('core.common.readme.title') }}</span>
-        <v-btn icon @click="$emit('update:show', false)">
+        <v-btn icon @click="$emit('update:show', false)" variant="text">
          <v-icon>mdi-close</v-icon>
        </v-btn>
      </v-card-title>
@@ -2,6 +2,7 @@
  "save": "Save",
  "cancel": "Cancel",
  "close": "Close",
+  "copy": "Copy",
  "delete": "Delete",
  "edit": "Edit",
  "add": "Add",
@@ -32,6 +33,7 @@
  "longPress": "Long press",
  "yes": "Yes",
  "no": "No",
+  "imagePreview": "Image Preview",
  "dialog": {
    "confirmTitle": "Confirm Action",
    "confirmMessage": "Are you sure you want to perform this action?",
@@ -21,7 +21,8 @@
    },
    "runningTime": {
      "title": "Uptime",
-      "subtitle": "System uptime duration"
+      "subtitle": "System uptime duration",
+      "format": "{hours}h {minutes}m {seconds}s"
    },
    "memoryUsage": {
      "title": "Memory Usage",
@@ -31,7 +31,8 @@
    "saveAndClose": "Save and Close",
    "cancel": "Cancel",
    "actions": "Actions",
-    "back": "Back"
+    "back": "Back",
+    "selectFile": "Select File"
  },
  "status": {
    "enabled": "Enabled",
@@ -78,6 +79,9 @@
    "devDocs": "Extension Development Docs",
    "submitRepo": "Submit Extension Repository"
  },
+  "tags": {
+    "danger": "Danger"
+  },
  "dialogs": {
    "error": {
      "title": "Error Information",
@@ -106,6 +110,17 @@
    "uninstall": {
      "title": "Confirm Deletion",
      "message": "Are you sure you want to delete this extension?"
+    },
+    "install": {
+      "title": "Install Extension",
+      "fromFile": "Install from File",
+      "fromUrl": "Install from URL"
+    },
+    "danger_warning": {
+      "title": "Dangerous Plugin Warning",
+      "message": "This plugin has been flagged as containing security risks, including unsafe code or functionalities that may cause system malfunctions or data loss. Do you wish to proceed with the installation?",
+      "confirm": "Continue",
+      "cancel": "Cancel"
    }
  },
  "messages": {
@@ -127,7 +142,8 @@
    "hasUpdate": "New version available:",
    "confirmDelete": "Are you sure you want to delete this extension?",
    "fillUrlOrFile": "Please fill in extension URL or upload extension file",
-    "dontFillBoth": "Please don't fill in both extension URL and upload file"
+    "dontFillBoth": "Please don't fill in both extension URL and upload file",
+    "supportedFormats": "Supports .zip extension files"
  },
  "upload": {
    "fromFile": "Install from File",
@@ -157,4 +173,4 @@
      "confirmNotRegistered": "$confirm not properly registered"
    }
  }
-} 
+}
@@ -21,7 +21,14 @@
    "refresh": "Refresh",
    "cancel": "Cancel",
    "save": "Save",
-    "addPlatform": "Add Platform Adapter"
+    "addPlatform": "Add Platform Adapter",
+    "connectTitle": "Connect {name}",
+    "viewTutorial": "View Tutorial",
+    "idConflict": {
+      "title": "ID Conflict Warning",
+      "message": "Detected duplicate ID \"{id}\". Please use a new ID.",
+      "confirm": "OK"
+    }
  },
  "messages": {
    "updateSuccess": "Update successful!",
@@ -29,6 +29,7 @@
    "noData": "Click \"Refresh Status\" button to get service provider availability",
    "available": "Available",
    "unavailable": "Unavailable",
+    "pending": "Pending...",
    "errorMessage": "Error Message"
  },
  "logs": {
@@ -2,6 +2,7 @@
  "save": "保存",
  "cancel": "取消",
  "close": "关闭",
+  "copy": "复制",
  "delete": "删除",
  "edit": "编辑",
  "add": "添加",
@@ -32,6 +33,7 @@
  "longPress": "长按",
  "yes": "是",
  "no": "否",
+  "imagePreview": "图片预览",
  "dialog": {
    "confirmTitle": "确认操作",
    "confirmMessage": "你确定要执行此操作吗？",
@@ -21,7 +21,8 @@
    },
    "runningTime": {
      "title": "运行时间",
-      "subtitle": "系统已运行时长"
+      "subtitle": "系统已运行时长",
+      "format": "{hours}小时{minutes}分{seconds}秒"
    },
    "memoryUsage": {
      "title": "内存占用",
@@ -31,7 +31,8 @@
    "saveAndClose": "保存并关闭",
    "cancel": "取消",
    "actions": "操作",
-    "back": "返回"
+    "back": "返回",
+    "selectFile": "选择文件"
  },
  "status": {
    "enabled": "启用",
@@ -78,6 +79,9 @@
    "devDocs": "插件开发文档",
    "submitRepo": "提交插件仓库"
  },
+  "tags": {
+    "danger": "危险"
+  },
  "dialogs": {
    "error": {
      "title": "错误信息",
@@ -106,6 +110,17 @@
    "uninstall": {
      "title": "删除确认",
      "message": "你确定要删除当前插件吗？"
+    },
+    "install": {
+      "title": "安装插件",
+      "fromFile": "从文件安装",
+      "fromUrl": "从链接安装"
+    },
+    "danger_warning": {
+      "title": "警告",
+      "message": "该插件可能包含不安全的代码或功能，可能导致系统异常或数据损失等。请确认是否继续安装？",
+      "confirm": "继续",
+      "cancel": "取消"
    }
  },
  "messages": {
@@ -127,7 +142,8 @@
    "hasUpdate": "有新版本:",
    "confirmDelete": "确定要删除插件吗？",
    "fillUrlOrFile": "请填写插件链接或上传插件文件",
-    "dontFillBoth": "请不要同时填写插件链接和上传插件文件"
+    "dontFillBoth": "请不要同时填写插件链接和上传文件",
+    "supportedFormats": "支持 .zip 格式的插件文件"
  },
  "upload": {
    "fromFile": "从文件安装",
@@ -157,4 +173,4 @@
      "confirmNotRegistered": "$confirm 未正确注册"
    }
  }
-} 
+}
@@ -21,7 +21,14 @@
    "refresh": "刷新",
    "cancel": "取消",
    "save": "保存",
-    "addPlatform": "添加平台适配器"
+    "addPlatform": "添加平台适配器",
+    "connectTitle": "接入 {name}",
+    "viewTutorial": "查看接入教程",
+    "idConflict": {
+      "title": "ID 冲突警告",
+      "message": "检测到 ID \"{id}\" 重复。请使用一个新的 ID。",
+      "confirm": "好的"
+    }
  },
  "messages": {
    "updateSuccess": "更新成功!",
@@ -29,6 +29,7 @@
    "noData": "点击\"刷新状态\"按钮获取服务提供商可用性",
    "available": "可用",
    "unavailable": "不可用",
+    "pending": "检查中...",
    "errorMessage": "错误信息"
  },
  "logs": {
@@ -7,9 +7,17 @@ import LanguageSwitcher from '@/components/shared/LanguageSwitcher.vue';
 import {md5} from 'js-md5';
 import {useAuthStore} from '@/stores/auth';
 import {useCommonStore} from '@/stores/common';
-import {marked} from 'marked';
+import MarkdownIt from 'markdown-it';
 import { useI18n } from '@/i18n/composables';

+// 配置markdown-it，默认安全设置
+const md = new MarkdownIt({
+    html: true,        // 启用HTML标签
+    breaks: true,       // 换行转<br>
+    linkify: true,      // 自动转链接
+    typographer: false  // 禁用智能引号
+});
+
 const customizer = useCustomizerStore();
 const { t } = useI18n();
 let dialog = ref(false);
@@ -29,7 +37,7 @@ let dashboardCurrentVersion = ref('');
 let version = ref('');
 let releases = ref([]);
 let devCommits = ref([]);
-
+let updatingDashboardLoading = ref(false);
 let installLoading = ref(false);

 let tab = ref(0);
@@ -217,6 +225,7 @@ function switchVersion(version: string) {
 }

 function updateDashboard() {
+  updatingDashboardLoading.value = true;
  updateStatus.value = t('core.header.updateDialog.status.updating');
  axios.post('/api/update/dashboard')
      .then((res) => {
@@ -230,7 +239,9 @@ function updateDashboard() {
      .catch((err) => {
        console.log(err);
        updateStatus.value = err
-      });
+      }).finally(() => {
+    updatingDashboardLoading.value = false;
+  });
 }

 function toggleDarkMode() {
@@ -320,7 +331,7 @@ commonStore.getStartTime();

            <div v-if="releaseMessage"
                style="background-color: #646cff24; padding: 16px; border-radius: 10px; font-size: 14px; max-height: 400px; overflow-y: auto;"
-                v-html="marked(releaseMessage)" class="markdown-content">
+                v-html="md.render(releaseMessage)" class="markdown-content">
            </div>

            <div class="mb-4 mt-4">
@@ -416,7 +427,7 @@ commonStore.getStartTime();
              </div>

              <v-btn color="primary" style="border-radius: 10px;" @click="updateDashboard()"
-                     :disabled="!dashboardHasNewVersion">
+                     :disabled="!dashboardHasNewVersion" :loading="updatingDashboardLoading">
                {{ t('core.header.updateDialog.dashboardUpdate.downloadAndUpdate') }}
              </v-btn>
            </div>
@@ -19,7 +19,7 @@ export default createVuetify({
  defaults: {
    VBtn: {},
    VCard: {
-      rounded: 'md'
+      rounded: 'lg'
    },
    VTextField: {
      rounded: 'lg'
@@ -39,7 +39,8 @@ const PurpleThemeDark: ThemeTypes = {
    background: '#111111',
    overlay: '#111111aa',
    codeBg: '#282833',
-    code: '#ffffffdd'
+    code: '#ffffffdd',
+    chatMessageBubble: '#2d2e30',
  }
 };

@@ -20,14 +20,14 @@ const PurpleTheme: ThemeTypes = {
    lightsuccess: '#b9f6ca',
    lighterror: '#f9d8d8',
    lightwarning: '#fff8e1',
-    primaryText: '#000000dd',
+    primaryText: '#1b1c1d',
    secondaryText: '#000000aa',
    darkprimary: '#1565c0',
    darksecondary: '#4527a0',
    borderLight: '#d0d0d0',
    border: '#d0d0d0',
    inputBorder: '#787878',
-    containerBg: '#eef2f6',
+    containerBg: '#f7f1f6',
    surface: '#fff',
    'on-surface-variant': '#fff',
    facebook: '#4267b2',
@@ -39,7 +39,8 @@ const PurpleTheme: ThemeTypes = {
    background: '#f9fafcf4',
    overlay: '#ffffffaa',
    codeBg: '#f5f0ff',
-    code: '#673ab7'
+    code: '#673ab7',
+    chatMessageBubble: '#e7ebf4',
  }
 };

@@ -35,5 +35,6 @@ export type ThemeTypes = {
    secondary200?: string;
    codeBg?: string;
    code?: string;
+    chatMessageBubble?: string;
  };
 };
@@ -318,12 +318,16 @@
 <script>
 import axios from 'axios';
 import { VueMonacoEditor } from '@guolao/vue-monaco-editor';
-import { marked } from 'marked';
+import MarkdownIt from 'markdown-it';
 import { useCommonStore } from '@/stores/common';
 import { useI18n, useModuleI18n } from '@/i18n/composables';

-marked.setOptions({
-    breaks: true
+// 配置markdown-it，默认安全设置
+const md = new MarkdownIt({
+    html: false,        // 禁用HTML标签（关键！）
+    breaks: true,       // 换行转<br>
+    linkify: true,      // 自动转链接
+    typographer: false  // 禁用智能引号（避免干扰）
 });

 export default {
@@ -879,8 +883,9 @@ export default {
                // 处理字符串内容
                final_content = content;
            } else if (!final_content) return this.tm('status.emptyContent');
-            // 使用marked处理Markdown格式
-            return marked(final_content);
+            
+            // 使用markdown-it处理，默认安全（html: false会禁用HTML标签）
+            return md.render(final_content);
        },

        // 显示成功消息
@@ -13,6 +13,7 @@ import { ref, computed, onMounted, reactive } from 'vue';
 const commonStore = useCommonStore();
 const { t } = useI18n();
 const { tm } = useModuleI18n('features/extension');
+const fileInput = ref(null);
 const activeTab = ref('installed');
 const extension_data = reactive({
  data: [],
@@ -57,10 +58,15 @@ const isListView = ref(false);
 const pluginSearch = ref("");
 const loading_ = ref(false);

+// 危险插件确认对话框
+const dangerConfirmDialog = ref(false);
+const selectedDangerPlugin = ref(null);
+
 // 插件市场相关
 const extension_url = ref("");
 const dialog = ref(false);
 const upload_file = ref(null);
+const uploadTab = ref('file');
 const showPluginFullName = ref(false);
 const marketSearch = ref("");
 const filterKeys = ['name', 'desc', 'author'];
@@ -419,6 +425,35 @@ const open = (link) => {
  }
 };

+// 为表格视图创建一个处理安装插件的函数
+const handleInstallPlugin = async (plugin) => {
+  if (plugin.tags && plugin.tags.includes('danger')) {
+    selectedDangerPlugin.value = plugin;
+    dangerConfirmDialog.value = true;
+  } else {
+    extension_url.value = plugin.repo;
+    dialog.value = true;
+    uploadTab.value = 'url';
+  }
+};
+
+// 确认安装危险插件
+const confirmDangerInstall = () => {
+  if (selectedDangerPlugin.value) {
+    extension_url.value = selectedDangerPlugin.value.repo;
+    dialog.value = true;
+    uploadTab.value = 'url';
+  }
+  dangerConfirmDialog.value = false;
+  selectedDangerPlugin.value = null;
+};
+
+// 取消安装危险插件
+const cancelDangerInstall = () => {
+  dangerConfirmDialog.value = false;
+  selectedDangerPlugin.value = null;
+};
+
 // 插件市场显示完整插件名称
 const trimExtensionName = () => {
  pluginMarketData.value.forEach(plugin => {
@@ -552,7 +587,7 @@ onMounted(async () => {
 <template>
  <v-row>
    <v-col cols="12" md="12">
-      <v-card variant="flat" class="rounded-xl">
+      <v-card variant="flat">
        <v-card-item>
          <template v-slot:prepend>
            <div class="plugin-page-icon d-flex justify-center align-center rounded-lg mr-4">
@@ -629,16 +664,20 @@ onMounted(async () => {
                  </v-btn>
                </v-btn-group>

-                <v-btn @click="toggleShowReserved" prepend-icon="mdi-eye-settings-outline"
-                  :color="showReserved ? 'primary' : undefined" :variant="showReserved ? 'flat' : 'outlined'"
-                  class="flex-shrink-0">
+                <v-btn class="ml-2" variant="tonal" @click="toggleShowReserved">
+                  <v-icon>{{ showReserved ? 'mdi-eye-off' : 'mdi-eye' }}</v-icon>
                  {{ showReserved ? tm('buttons.hideSystemPlugins') : tm('buttons.showSystemPlugins') }}
                </v-btn>

-                <v-btn prepend-icon="mdi-tune-vertical" color="primary" variant="outlined"
-                  @click="getPlatformEnableConfig" class="flex-shrink-0">
+                <v-btn class="ml-2" variant="tonal" @click="getPlatformEnableConfig">
+                  <v-icon>mdi-cog</v-icon>
                  {{ tm('buttons.platformConfig') }}
                </v-btn>
+
+                <v-btn class="ml-2" color="primary" variant="tonal" @click="dialog = true">
+                  <v-icon>mdi-plus</v-icon>
+                  {{ tm('buttons.install') }}
+                </v-btn>
              </v-col>

              <v-col cols="12" sm="auto" md="6" class="ml-auto">
@@ -808,12 +847,16 @@ onMounted(async () => {

            <!-- <small style="color: var(--v-theme-secondaryText);">每个插件都是作者无偿提供的的劳动成果。如果您喜欢某个插件，请 Star！</small> -->

+            <v-btn icon="mdi-plus" size="x-large" style="position: fixed; right: 52px; bottom: 52px; z-index: 10000" @click="dialog = true"
+                color="darkprimary">
+            </v-btn>
+
            <div v-if="pinnedPlugins.length > 0" class="mt-4">
              <h2>{{ tm('market.recommended') }}</h2>
              <v-row style="margin-top: 8px;">
                <v-col cols="12" md="6" lg="6" v-for="plugin in pinnedPlugins" :key="plugin.name">
                  <ExtensionCard :extension="plugin" class="h-120 rounded-lg" market-mode="true" :highlight="true"
-                    @install="extension_url = plugin.repo; newExtension()" @view-readme="open(plugin.repo)">
+                    @install="handleInstallPlugin(plugin)" @view-readme="open(plugin.repo)">
                  </ExtensionCard>
                </v-col>
              </v-row>
@@ -861,12 +904,12 @@ onMounted(async () => {
                  </template>
                  <template v-slot:item.tags="{ item }">
                    <span v-if="item.tags.length === 0">-</span>
-                    <v-chip v-for="tag in item.tags" :key="tag" color="primary" size="x-small">
+                    <v-chip v-for="tag in item.tags" :key="tag" :color="tag === 'danger' ? 'error' : 'primary'" size="x-small" v-show="tag !== 'danger'">
                      {{ tag }}</v-chip>
                  </template>
                  <template v-slot:item.actions="{ item }">
                    <v-btn v-if="!item.installed" class="text-none mr-2" size="x-small" variant="flat"
-                      @click="extension_url = item.repo; newExtension()">
+                      @click="handleInstallPlugin(item)">
                      <v-icon>mdi-download</v-icon></v-btn>
                    <v-btn v-else class="text-none mr-2" size="x-small" variant="flat" border
                      disabled><v-icon>mdi-check</v-icon></v-btn>
@@ -950,7 +993,7 @@ onMounted(async () => {
                        </v-list-item>
                      </v-list>
                    </v-menu>
-                  </div>
+                    </div>
                </th>
              </tr>
            </thead>
@@ -1067,6 +1110,97 @@ onMounted(async () => {

  <ReadmeDialog v-model:show="readmeDialog.show" :plugin-name="readmeDialog.pluginName"
    :repo-url="readmeDialog.repoUrl" />
+
+  <!-- 危险插件确认对话框 -->
+  <v-dialog v-model="dangerConfirmDialog" width="500" persistent>
+    <v-card>
+      <v-card-title class="text-h5 d-flex align-center">
+        <v-icon color="warning" class="mr-2">mdi-alert-circle</v-icon>
+        {{ tm('dialogs.danger_warning.title') }}
+      </v-card-title>
+      <v-card-text>
+        <div>{{ tm('dialogs.danger_warning.message') }}</div>
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="grey" @click="cancelDangerInstall">
+          {{ tm('dialogs.danger_warning.cancel') }}
+        </v-btn>
+        <v-btn color="warning" @click="confirmDangerInstall">
+          {{ tm('dialogs.danger_warning.confirm') }}
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+
+  <!-- 上传插件对话框 -->
+  <v-dialog v-model="dialog" width="500">
+    <v-card>
+      <v-card-title class="text-h5">{{ tm('dialogs.install.title') }}</v-card-title>
+      <v-card-text>
+        <v-tabs v-model="uploadTab">
+          <v-tab value="file">{{ tm('dialogs.install.fromFile') }}</v-tab>
+          <v-tab value="url">{{ tm('dialogs.install.fromUrl') }}</v-tab>
+        </v-tabs>
+
+        <v-window v-model="uploadTab" class="mt-4">
+          <v-window-item value="file">
+            <div class="d-flex flex-column align-center justify-center pa-4">
+              <v-file-input
+                ref="fileInput"
+                v-model="upload_file"
+                :label="tm('upload.selectFile')"
+                accept=".zip"
+                hide-details
+                hide-input
+                class="d-none"
+              ></v-file-input>
+              
+              <v-btn
+                color="primary"
+                size="large"
+                prepend-icon="mdi-upload"
+                @click="$refs.fileInput.click()"
+              >
+                {{ tm('buttons.selectFile') }}
+              </v-btn>
+              
+              <div class="text-body-2 text-medium-emphasis mt-2">
+                {{ tm('messages.supportedFormats') }}
+              </div>
+
+              <div v-if="upload_file" class="mt-4 text-center">
+                <v-chip color="primary" size="large" closable @click:close="upload_file = null">
+                  {{ upload_file.name }}
+                  <template v-slot:append>
+                    <span class="text-caption ml-2">({{ (upload_file.size / 1024).toFixed(1) }}KB)</span>
+                  </template>
+                </v-chip>
+              </div>
+            </div>
+          </v-window-item>
+
+          <v-window-item value="url">
+            <div class="pa-4">
+              <v-text-field
+                v-model="extension_url"
+                :label="tm('upload.enterUrl')"
+                variant="outlined"
+                prepend-inner-icon="mdi-link"
+                hide-details
+                placeholder="https://github.com/username/repo"
+              ></v-text-field>
+            </div>
+          </v-window-item>
+        </v-window>
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="grey" variant="text" @click="dialog = false">{{ tm('buttons.cancel') }}</v-btn>
+        <v-btn color="primary" variant="text" @click="newExtension">{{ tm('buttons.install') }}</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
 </template>

 <style scoped>
@@ -1,62 +1,48 @@
 <template>
  <div class="platform-page">
    <v-container fluid class="pa-0">
-      <!-- 页面标题 -->
-      <v-row>
-        <v-col cols="12">
-          <h1 class="text-h4 font-weight-bold mb-2">
-            <v-icon size="x-large" color="primary" class="me-2">mdi-connection</v-icon>{{ tm('title') }}
+      <v-row class="d-flex justify-space-between align-center px-4 py-3 pb-8">
+        <div>
+          <h1 class="text-h1 font-weight-bold mb-2">
+            <v-icon color="black" class="me-2">mdi-connection</v-icon>{{ tm('title') }}
          </h1>
          <p class="text-subtitle-1 text-medium-emphasis mb-4">
            {{ tm('subtitle') }}
          </p>
-        </v-col>
+        </div>
+        <v-btn color="primary" prepend-icon="mdi-plus" variant="tonal" @click="showAddPlatformDialog = true" rounded="xl" size="x-large">
+          {{ tm('addAdapter') }}
+        </v-btn>
      </v-row>

-      <!-- 平台适配器部分 -->
-      <v-card class="mb-6" elevation="2">
-        <v-card-title class="d-flex align-center py-3 px-4">
-          <v-icon color="primary" class="me-2">mdi-apps</v-icon>
-          <span class="text-h6">{{ tm('adapters') }}</span>
-          <v-chip color="info" size="small" class="ml-2">{{ config_data.platform?.length || 0 }}</v-chip>
-          <v-spacer></v-spacer>
-          <v-btn color="primary" prepend-icon="mdi-plus" variant="tonal" @click="showAddPlatformDialog = true">
-            {{ tm('addAdapter') }}
-          </v-btn>
-        </v-card-title>
+      <div>
+        <v-row v-if="(config_data.platform || []).length === 0">
+          <v-col cols="12" class="text-center pa-8">
+            <v-icon size="64" color="grey-lighten-1">mdi-connection</v-icon>
+            <p class="text-grey mt-4">{{ tm('emptyText') }}</p>
+          </v-col>
+        </v-row>

-        <v-divider></v-divider>
-
-        <v-card-text class="px-4 py-3">
-          <item-card-grid :items="config_data.platform || []" title-field="id" enabled-field="enable"
-            empty-icon="mdi-connection" :empty-text="tm('emptyText')" @toggle-enabled="platformStatusChange"
-            @delete="deletePlatform" @edit="editPlatform">
-            <template v-slot:item-details="{ item }">
-              <div class="d-flex align-center mb-2">
-                <v-icon size="small" color="grey" class="me-2">mdi-tag</v-icon>
-                <span class="text-caption text-medium-emphasis">
-                  {{ tm('details.adapterType') }}:
-                  <v-chip size="x-small" color="primary" class="ml-1">{{ item.type }}</v-chip>
-                </span>
-              </div>
-              <div v-if="item.token" class="d-flex align-center mb-2">
-                <v-icon size="small" color="grey" class="me-2">mdi-key</v-icon>
-                <span class="text-caption text-medium-emphasis">{{ tm('details.token') }}: ••••••••</span>
-              </div>
-              <div v-if="item.description" class="d-flex align-center">
-                <v-icon size="small" color="grey" class="me-2">mdi-information-outline</v-icon>
-                <span class="text-caption text-medium-emphasis text-truncate">{{ item.description }}</span>
-              </div>
-            </template>
-          </item-card-grid>
-        </v-card-text>
-      </v-card>
+        <v-row v-else>
+          <v-col v-for="(platform, index) in config_data.platform || []" :key="index" cols="12" md="6" lg="4" xl="3">
+            <item-card 
+              :item="platform" 
+              title-field="id" 
+              enabled-field="enable"
+              :bglogo="getPlatformIcon(platform.type || platform.id)"
+              @toggle-enabled="platformStatusChange"
+              @delete="deletePlatform" 
+              @edit="editPlatform">
+            </item-card>
+          </v-col>
+        </v-row>
+      </div>

      <!-- 日志部分 -->
-      <v-card elevation="2">
+      <v-card elevation="0" class="mt-4">
        <v-card-title class="d-flex align-center py-3 px-4">
-          <v-icon color="primary" class="me-2">mdi-console-line</v-icon>
-          <span class="text-h6">{{ tm('logs.title') }}</span>
+          <v-icon class="me-2">mdi-console-line</v-icon>
+          <span class="text-h4">{{ tm('logs.title') }}</span>
          <v-spacer></v-spacer>
          <v-btn variant="text" color="primary" @click="showConsole = !showConsole">
            {{ showConsole ? tm('logs.collapse') : tm('logs.expand') }}
@@ -93,13 +79,13 @@
              <v-card variant="outlined" hover class="platform-card" @click="selectPlatformTemplate(name)">
                <div class="platform-card-content">
                  <div class="platform-card-text">
-                    <v-card-title class="platform-card-title">接入 {{ name }}</v-card-title>
+                    <v-card-title class="platform-card-title">{{ tm('dialog.connectTitle', { name }) }}</v-card-title>
                    <v-card-text class="text-caption text-medium-emphasis platform-card-description">
                      {{ getPlatformDescription(template, name) }}
                    </v-card-text>
                  </div>
                  <div class="platform-card-logo">
-                    <img :src="getPlatformIcon(name)" v-if="getPlatformIcon(name)" class="platform-logo-img">
+                    <img :src="getPlatformIcon(template.type)" v-if="getPlatformIcon(template.type)" class="platform-logo-img">
                    <div v-else class="platform-logo-fallback">
                      {{ name[0].toUpperCase() }}
                    </div>
@@ -139,7 +125,7 @@
            <v-col cols="12" class="text-center">
              <v-btn color="info" variant="outlined" @click="openTutorial">
                <v-icon start>mdi-book-open-variant</v-icon>
-                查看接入教程
+                {{ tm('dialog.viewTutorial') }}
              </v-btn>
            </v-col>
          </v-row>
@@ -172,14 +158,15 @@
      <v-card>
        <v-card-title class="text-h6 bg-warning d-flex align-center">
          <v-icon start class="me-2">mdi-alert-circle-outline</v-icon>
-          ID 冲突警告
+          {{ tm('dialog.idConflict.title') }}
        </v-card-title>
        <v-card-text class="py-4 text-body-1 text-medium-emphasis">
-          检测到 ID "{{ conflictId }}" 重复。请使用一个新的 ID。
+          {{ tm('dialog.idConflict.message', { id: conflictId }) }}
        </v-card-text>
        <v-card-actions>
          <v-spacer></v-spacer>
-          <v-btn color="grey" variant="text" @click="handleIdConflictConfirm(false)">好的</v-btn>
+          <v-btn color="grey" variant="text" @click="handleIdConflictConfirm(false)">{{ tm('dialog.idConflict.confirm')
+          }}</v-btn>
        </v-card-actions>
      </v-card>
    </v-dialog>
@@ -191,7 +178,7 @@ import axios from 'axios';
 import AstrBotConfig from '@/components/shared/AstrBotConfig.vue';
 import WaitingForRestart from '@/components/shared/WaitingForRestart.vue';
 import ConsoleDisplayer from '@/components/shared/ConsoleDisplayer.vue';
-import ItemCardGrid from '@/components/shared/ItemCardGrid.vue';
+import ItemCard from '@/components/shared/ItemCard.vue';
 import { useCommonStore } from '@/stores/common';
 import { useI18n, useModuleI18n } from '@/i18n/composables';

@@ -201,7 +188,7 @@ export default {
    AstrBotConfig,
    WaitingForRestart,
    ConsoleDisplayer,
-    ItemCardGrid
+    ItemCard
  },
  setup() {
    const { t } = useI18n();
@@ -274,26 +261,26 @@ export default {
    },

    getPlatformIcon(name) {
-      if (name.includes('QQ')) {
-        return '/src/assets/images/platform_logos/qq.png'
-      } else if (name.includes('企业微信')) {
-        return '/src/assets/images/platform_logos/wecom.png'
-      } else if (name.includes('微信')) {
-        return '/src/assets/images/platform_logos/wechat.png';
-      } else if (name.includes('Lark')) {
-        return '/src/assets/images/platform_logos/lark.png';
-      } else if (name.includes('DingTalk')) {
-        return '/src/assets/images/platform_logos/dingtalk.svg';
-      } else if (name.includes('Telegram')) {
-        return '/src/assets/images/platform_logos/telegram.svg';
-      } else if (name.includes('Discord')) {
-        return '/src/assets/images/platform_logos/discord.svg';
-      } else if (name.includes('Slack')) {
-        return '/src/assets/images/platform_logos/slack.svg';
-      } else if (name.includes('kook')) {
-        return '/src/assets/images/platform_logos/kook.png';
-      } else if (name.includes('vocechat')) {
-        return '/src/assets/images/platform_logos/vocechat.png';
+      if (name === 'aiocqhttp' || name === 'qq_official' || name === 'qq_official_webhook') {
+        return new URL('@/assets/images/platform_logos/qq.png', import.meta.url).href
+      } else if (name === 'wecom') {
+        return new URL('@/assets/images/platform_logos/wecom.png', import.meta.url).href
+      } else if (name === 'gewechat' || name === 'wechatpadpro' || name === 'weixin_official_account' || name === 'wechat') {
+        return new URL('@/assets/images/platform_logos/wechat.png', import.meta.url).href
+      } else if (name === 'lark') {
+        return new URL('@/assets/images/platform_logos/lark.png', import.meta.url).href
+      } else if (name === 'dingtalk') {
+        return new URL('@/assets/images/platform_logos/dingtalk.svg', import.meta.url).href
+      } else if (name === 'telegram') {
+        return new URL('@/assets/images/platform_logos/telegram.svg', import.meta.url).href
+      } else if (name === 'discord') {
+        return new URL('@/assets/images/platform_logos/discord.svg', import.meta.url).href
+      } else if (name === 'slack') {
+        return new URL('@/assets/images/platform_logos/slack.svg', import.meta.url).href
+      } else if (name === 'kook') {
+        return new URL('@/assets/images/platform_logos/kook.png', import.meta.url).href
+      } else if (name === 'vocechat') {
+        return new URL('@/assets/images/platform_logos/vocechat.png', import.meta.url).href
      }
    },

@@ -2,144 +2,137 @@
  <div class="provider-page">
    <v-container fluid class="pa-0">
      <!-- 页面标题 -->
-      <v-row>
-        <v-col cols="12">
-          <h1 class="text-h4 font-weight-bold mb-2">
-            <v-icon size="x-large" color="primary" class="me-2">mdi-creation</v-icon>{{ tm('title') }}
+      <v-row class="d-flex justify-space-between align-center px-4 py-3 pb-8">
+        <div>
+          <h1 class="text-h1 font-weight-bold mb-2">
+            <v-icon color="black" class="me-2">mdi-creation</v-icon>{{ tm('title') }}
          </h1>
          <p class="text-subtitle-1 text-medium-emphasis mb-4">
            {{ tm('subtitle') }}
          </p>
-        </v-col>
-      </v-row>
-
-      <!-- 服务提供商部分 -->
-      <v-card class="mb-6" elevation="2">
-        <v-card-title class="d-flex align-center py-3 px-4">
-          <v-icon color="primary" class="me-2">mdi-api</v-icon>
-          <span class="text-h6">{{ tm('providers.title') }}</span>
-          <v-chip color="info" size="small" class="ml-2">{{ config_data.provider?.length || 0 }}</v-chip>
-          <v-spacer></v-spacer>
-          <v-btn color="success" prepend-icon="mdi-cog" variant="tonal" class="me-2" @click="showSettingsDialog = true">
+        </div>
+        <div>
+          <v-btn color="success" prepend-icon="mdi-cog" variant="tonal" class="me-2" @click="showSettingsDialog = true" rounded="xl" size="x-large">
            {{ tm('providers.settings') }}
          </v-btn>
-          <v-btn color="primary" prepend-icon="mdi-plus" variant="tonal" @click="showAddProviderDialog = true">
+          <v-btn color="primary" prepend-icon="mdi-plus" variant="tonal" @click="showAddProviderDialog = true" rounded="xl" size="x-large">
            {{ tm('providers.addProvider') }}
          </v-btn>
-        </v-card-title>
-
-        <v-divider></v-divider>
+        </div>
+      </v-row>

+      <div>
        <!-- 添加分类标签页 -->
-        <v-card-text class="px-4 pt-3 pb-0">
-          <v-tabs v-model="activeProviderTypeTab" bg-color="transparent">
-            <v-tab value="all" class="font-weight-medium px-3">
-              <v-icon start>mdi-filter-variant</v-icon>
-              {{ tm('providers.tabs.all') }}
-            </v-tab>
-            <v-tab value="chat_completion" class="font-weight-medium px-3">
-              <v-icon start>mdi-message-text</v-icon>
-              {{ tm('providers.tabs.chatCompletion') }}
-            </v-tab>
-            <v-tab value="speech_to_text" class="font-weight-medium px-3">
-              <v-icon start>mdi-microphone-message</v-icon>
-              {{ tm('providers.tabs.speechToText') }}
-            </v-tab>
-            <v-tab value="text_to_speech" class="font-weight-medium px-3">
-              <v-icon start>mdi-volume-high</v-icon>
-              {{ tm('providers.tabs.textToSpeech') }}
-            </v-tab>
-            <v-tab value="embedding" class="font-weight-medium px-3">
-              <v-icon start>mdi-code-json</v-icon>
-              {{ tm('providers.tabs.embedding') }}
-            </v-tab>
-          </v-tabs>
-        </v-card-text>
+        <v-tabs v-model="activeProviderTypeTab" bg-color="transparent" class="mb-4">
+          <v-tab value="all" class="font-weight-medium px-3">
+            <v-icon start>mdi-filter-variant</v-icon>
+            {{ tm('providers.tabs.all') }}
+          </v-tab>
+          <v-tab value="chat_completion" class="font-weight-medium px-3">
+            <v-icon start>mdi-message-text</v-icon>
+            {{ tm('providers.tabs.chatCompletion') }}
+          </v-tab>
+          <v-tab value="speech_to_text" class="font-weight-medium px-3">
+            <v-icon start>mdi-microphone-message</v-icon>
+            {{ tm('providers.tabs.speechToText') }}
+          </v-tab>
+          <v-tab value="text_to_speech" class="font-weight-medium px-3">
+            <v-icon start>mdi-volume-high</v-icon>
+            {{ tm('providers.tabs.textToSpeech') }}
+          </v-tab>
+          <v-tab value="embedding" class="font-weight-medium px-3">
+            <v-icon start>mdi-code-json</v-icon>
+            {{ tm('providers.tabs.embedding') }}
+          </v-tab>
+        </v-tabs>

-        <v-card-text class="px-4 py-3">
-          <item-card-grid
-            :items="filteredProviders"
-            title-field="id"
-            enabled-field="enable"
-            empty-icon="mdi-api-off"
-            :empty-text="getEmptyText()"
-            @toggle-enabled="providerStatusChange"
-            @delete="deleteProvider"
-            @edit="configExistingProvider"
-          >
-            <template v-slot:item-details="{ item }">
-              <div class="d-flex align-center mb-2">
-                <v-icon size="small" color="grey" class="me-2">mdi-tag</v-icon>
-                <span class="text-caption text-medium-emphasis">
-                  {{ tm('providers.providerType') }}:
-                  <v-chip size="x-small" color="primary" class="ml-1">{{ item.type }}</v-chip>
-                </span>
-              </div>
-              <div v-if="item.api_base" class="d-flex align-center mb-2">
-                <v-icon size="small" color="grey" class="me-2">mdi-web</v-icon>
-                <span class="text-caption text-medium-emphasis text-truncate" :title="item.api_base">
-                  API Base: {{ item.api_base }}
-                </span>
-              </div>
-              <div v-if="item.api_key" class="d-flex align-center">
-                <v-icon size="small" color="grey" class="me-2">mdi-key</v-icon>
-                <span class="text-caption text-medium-emphasis">API Key: ••••••••</span>
-              </div>
-            </template>
-          </item-card-grid>
-        </v-card-text>
-      </v-card>
+        <v-row v-if="filteredProviders.length === 0">
+          <v-col cols="12" class="text-center pa-8">
+            <v-icon size="64" color="grey-lighten-1">mdi-api-off</v-icon>
+            <p class="text-grey mt-4">{{ getEmptyText() }}</p>
+          </v-col>
+        </v-row>
+
+        <v-row v-else>
+          <v-col v-for="(provider, index) in filteredProviders" :key="index" cols="12" md="6" lg="4" xl="3">
+            <item-card 
+              :item="provider" 
+              title-field="id" 
+              enabled-field="enable"
+              @toggle-enabled="providerStatusChange"
+              @delete="deleteProvider" 
+              @edit="configExistingProvider">
+              <template v-slot:details="{ item }">
+              </template>
+            </item-card>
+          </v-col>
+        </v-row>
+      </div>

      <!-- 供应商状态部分 -->
-      <v-card class="mb-6" elevation="2">
+      <v-card elevation="0" class="mt-4">
        <v-card-title class="d-flex align-center py-3 px-4">
-          <v-icon color="primary" class="me-2">mdi-heart-pulse</v-icon>
-          <span class="text-h6">{{ tm('availability.title') }}</span>
+          <v-icon class="me-2">mdi-heart-pulse</v-icon>
+          <span class="text-h4">{{ tm('availability.title') }}</span>
          <v-spacer></v-spacer>
          <v-btn color="primary" variant="tonal" :loading="loadingStatus" @click="fetchProviderStatus">
            <v-icon left>mdi-refresh</v-icon>
            {{ tm('availability.refresh') }}
          </v-btn>
+          <v-btn variant="text" color="primary" @click="showStatus = !showStatus" style="margin-left: 8px;">
+            {{ showStatus ? tm('logs.collapse') : tm('logs.expand') }}
+            <v-icon>{{ showStatus ? 'mdi-chevron-up' : 'mdi-chevron-down' }}</v-icon>
+          </v-btn>
        </v-card-title>
-        <v-card-subtitle class="px-4 py-1 text-caption text-medium-emphasis">
-          {{ tm('availability.subtitle') }}
-        </v-card-subtitle>

        <v-divider></v-divider>

-        <v-card-text class="px-4 py-3">
-          <v-alert v-if="providerStatuses.length === 0" type="info" variant="tonal">
-            {{ tm('availability.noData') }}
-          </v-alert>
-          
-          <v-container v-else class="pa-0">
-            <v-row>
-              <v-col v-for="status in providerStatuses" :key="status.id" cols="12" sm="6" md="4">
-                <v-card variant="outlined" class="status-card">
-                  <v-card-item>
-                    <v-icon :color="status.status === 'available' ? 'success' : 'error'" class="me-2">
-                      {{ status.status === 'available' ? 'mdi-check-circle' : 'mdi-alert-circle' }}
-                    </v-icon>
-                    <span class="font-weight-bold">{{ status.id }}</span>
-                    <v-chip :color="status.status === 'available' ? 'success' : 'error'" size="small" class="ml-2">
-                      {{ status.status === 'available' ? tm('availability.available') : tm('availability.unavailable') }}
-                    </v-chip>
-                  </v-card-item>
-                  <v-card-text v-if="status.status === 'unavailable'" class="text-caption text-medium-emphasis">
-                    <span class="font-weight-bold">{{ tm('availability.errorMessage') }}:</span> {{ status.error }}
-                  </v-card-text>
-                </v-card>
-              </v-col>
-            </v-row>
-          </v-container>
-        </v-card-text>
+        <v-expand-transition>
+          <v-card-text class="pa-0" v-if="showStatus">
+            <v-card-text class="px-4 py-3">
+              <v-alert v-if="providerStatuses.length === 0" type="info" variant="tonal">
+                {{ tm('availability.noData') }}
+              </v-alert>
+              
+              <v-container v-else class="pa-0">
+                <v-row>
+                  <v-col v-for="status in providerStatuses" :key="status.id" cols="12" sm="6" md="4">
+                    <v-card variant="outlined" class="status-card" :class="`status-${status.status}`">
+                      <v-card-item>
+                        <v-icon v-if="status.status === 'available'" color="success" class="me-2">mdi-check-circle</v-icon>
+                        <v-icon v-else-if="status.status === 'unavailable'" color="error" class="me-2">mdi-alert-circle</v-icon>
+                        <v-progress-circular
+                          v-else-if="status.status === 'pending'"
+                          indeterminate
+                          color="primary"
+                          size="20"
+                          width="2"
+                          class="me-2"
+                        ></v-progress-circular>
+
+                        <span class="font-weight-bold">{{ status.id }}</span>
+                        
+                        <v-chip :color="getStatusColor(status.status)" size="small" class="ml-2">
+                          {{ getStatusText(status.status) }}
+                        </v-chip>
+                      </v-card-item>
+                      <v-card-text v-if="status.status === 'unavailable'" class="text-caption text-medium-emphasis">
+                        <span class="font-weight-bold">{{ tm('availability.errorMessage') }}:</span> {{ status.error }}
+                      </v-card-text>
+                    </v-card>
+                  </v-col>
+                </v-row>
+              </v-container>
+            </v-card-text>
+          </v-card-text>
+        </v-expand-transition>
      </v-card>

      <!-- 日志部分 -->
-      <v-card elevation="2">
+      <v-card elevation="0" class="mt-4">
        <v-card-title class="d-flex align-center py-3 px-4">
-          <v-icon color="primary" class="me-2">mdi-console-line</v-icon>
-          <span class="text-h6">{{ tm('logs.title') }}</span>
+          <v-icon class="me-2">mdi-console-line</v-icon>
+          <span class="text-h4">{{ tm('logs.title') }}</span>
          <v-spacer></v-spacer>
          <v-btn variant="text" color="primary" @click="showConsole = !showConsole">
            {{ showConsole ? tm('logs.collapse') : tm('logs.expand') }}
@@ -349,7 +342,7 @@ import axios from 'axios';
 import AstrBotConfig from '@/components/shared/AstrBotConfig.vue';
 import WaitingForRestart from '@/components/shared/WaitingForRestart.vue';
 import ConsoleDisplayer from '@/components/shared/ConsoleDisplayer.vue';
-import ItemCardGrid from '@/components/shared/ItemCardGrid.vue';
+import ItemCard from '@/components/shared/ItemCard.vue';
 import { useModuleI18n } from '@/i18n/composables';

 export default {
@@ -358,7 +351,7 @@ export default {
    AstrBotConfig,
    WaitingForRestart,
    ConsoleDisplayer,
-    ItemCardGrid
+    ItemCard
  },
  setup() {
    const { tm } = useModuleI18n('features/provider');
@@ -397,6 +390,9 @@ export default {

      showConsole: false,
      
+      // 显示状态部分
+      showStatus: false,
+      
      // 供应商状态相关
      providerStatuses: [],
      loadingStatus: false,
@@ -414,7 +410,6 @@ export default {
        "anthropic_chat_completion": "chat_completion",
        "googlegenai_chat_completion": "chat_completion",
        "zhipu_chat_completion": "chat_completion",
-        "llm_tuner": "chat_completion",
        "dify": "chat_completion",
        "dashscope": "chat_completion",
        "openai_whisper_api": "speech_to_text",
@@ -471,10 +466,16 @@ export default {
          sessionSeparation: this.tm('messages.success.sessionSeparation')
        },
        error: {
-          sessionSeparation: this.tm('messages.error.sessionSeparation')
+          sessionSeparation: this.tm('messages.error.sessionSeparation'),
+          fetchStatus: this.tm('messages.error.fetchStatus')
        },
        confirm: {
          delete: this.tm('messages.confirm.delete')
+        },
+        status: {
+          available: this.tm('availability.available'),
+          unavailable: this.tm('availability.unavailable'),
+          pending: this.tm('availability.pending')
        }
      };
    },
@@ -545,7 +546,7 @@ export default {
        'Whisper': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/openai.svg',
        'xAI': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/xai.svg',
        'Anthropic': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/anthropic.svg',
-        'Ollama': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/anthropic.svg',
+        'Ollama': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/ollama.svg',
        'Gemini': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/gemini-color.svg',
        'Gemini(OpenAI兼容)': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/gemini-color.svg',
        'DeepSeek': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/deepseek.svg',
@@ -560,6 +561,7 @@ export default {
        'FishAudio': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/fishaudio.svg',
        'Azure': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/azure.svg',
        'MiniMax': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/minimax.svg',
+        '302.AI': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/1.53.0/files/icons/ai302-color.svg',
      };
      for (const key in icons) {
        if (type.startsWith(key)) {
@@ -764,19 +766,59 @@ export default {
    },
    
    // 获取供应商状态
-    fetchProviderStatus() {
+    async fetchProviderStatus() {
+      if (this.loadingStatus) return;
+
      this.loadingStatus = true;
-      axios.get('/api/config/provider/check_status').then((res) => {
-        if (res.data && res.data.status === 'ok') {
-          this.providerStatuses = res.data.data || [];
-        } else {
-          this.showError(res.data?.message || this.tm('messages.error.fetchStatus'));
-        }
-        this.loadingStatus = false;
-      }).catch((err) => {
-        this.loadingStatus = false;
-        this.showError(err.response?.data?.message || err.message);
+      this.showStatus = true; // 自动展开状态部分
+      
+      // 1. 立即初始化UI为pending状态
+      this.providerStatuses = this.config_data.provider.map(p => ({
+        id: p.id,
+        name: p.id,
+        status: 'pending',
+        error: null
+      }));
+
+      // 2. 为每个provider创建一个并发的测试请求
+      const promises = this.config_data.provider.map(p => {
+        return axios.get(`/api/config/provider/check_one?id=${p.id}`)
+          .then(res => {
+            if (res.data && res.data.status === 'ok') {
+              // 成功，更新对应的provider状态
+              const index = this.providerStatuses.findIndex(s => s.id === p.id);
+              if (index !== -1) {
+                this.providerStatuses.splice(index, 1, res.data.data);
+              }
+            } else {
+              // 接口返回了业务错误
+              throw new Error(res.data?.message || `Failed to check status for ${p.id}`);
+            }
+          })
+          .catch(err => {
+            // 网络错误或业务错误
+            const errorMessage = err.response?.data?.message || err.message || 'Unknown error';
+            const index = this.providerStatuses.findIndex(s => s.id === p.id);
+            if (index !== -1) {
+              const failedStatus = {
+                ...this.providerStatuses[index],
+                status: 'unavailable',
+                error: errorMessage
+              };
+              this.providerStatuses.splice(index, 1, failedStatus);
+            }
+            // 可以在这里选择性地向上抛出错误，以便Promise.allSettled知道
+            return Promise.reject(errorMessage);
+          });
      });
+
+      // 3. 等待所有请求完成（无论成功或失败）
+      try {
+        await Promise.allSettled(promises);
+      } finally {
+        // 4. 关闭全局加载状态
+        this.loadingStatus = false;
+      }
    },

    confirmEmptyKey() {
@@ -807,6 +849,22 @@ export default {
      }
      this.showIdConflictDialog = false;
    },
+    getStatusColor(status) {
+      switch (status) {
+        case 'available':
+          return 'success';
+        case 'unavailable':
+          return 'error';
+        case 'pending':
+          return 'grey';
+        default:
+          return 'default';
+      }
+    },
+
+    getStatusText(status) {
+      return this.messages.status[status] || status;
+    },
  }
 }
 </script>
@@ -817,11 +875,6 @@ export default {
  padding-top: 8px;
 }

-.provider-selection-dialog .v-card-title {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-
 .provider-card {
  transition: all 0.3s ease;
  height: 100%;
@@ -1,11 +1,11 @@
 <template>
  <div class="tools-page">
-    <v-container fluid class="pa-0">
+    <v-container fluid class="pa-0" elevation="0">
      <!-- 页面标题 -->
-      <v-row>
-        <v-col cols="12">
-          <h1 class="text-h4 font-weight-bold mb-2">
-            <v-icon size="x-large" color="primary" class="me-2">mdi-function-variant</v-icon>{{ tm('title') }}
+      <v-row class="d-flex justify-space-between align-center px-4 py-3 pb-8">
+        <div>
+          <h1 class="text-h1 font-weight-bold mb-2">
+            <v-icon color="black" class="me-2">mdi-function-variant</v-icon>{{ tm('title') }}
          </h1>
          <p class="text-subtitle-1 text-medium-emphasis mb-4 d-flex align-center">
            {{ tm('subtitle') }}
@@ -19,11 +19,14 @@
              <span>{{ tm('tooltip.info') }}</span>
            </v-tooltip>
          </p>
-        </v-col>
+        </div>
+        <v-btn color="primary" prepend-icon="mdi-plus" variant="tonal" @click="showMcpServerDialog = true" rounded="xl" size="x-large">
+          {{ tm('mcpServers.buttons.add') }}
+        </v-btn>
      </v-row>

      <!-- 标签页切换 -->
-      <v-tabs v-model="activeTab" color="primary" class="mb-4" show-arrows>
+      <v-tabs v-model="activeTab" color="primary" class="mb-6" show-arrows>
        <v-tab value="local" class="font-weight-medium">
          <v-icon start>mdi-server</v-icon>
          {{ tm('tabs.local') }}
@@ -58,47 +61,57 @@
            <v-divider></v-divider>

            <v-card-text class="px-4 py-3">
+              <div v-if="mcpServers.length === 0" class="text-center pa-8">
+                <v-icon size="64" color="grey-lighten-1">mdi-server-off</v-icon>
+                <p class="text-grey mt-4">{{ tm('mcpServers.empty') }}</p>
+              </div>

-              <item-card-grid :items="mcpServers || []" title-field="name" enabled-field="active"
-                empty-icon="mdi-server-off" :empty-text="tm('mcpServers.empty')" @toggle-enabled="updateServerStatus"
-                @delete="deleteServer" @edit="editServer">
-                <template v-slot:item-details="{ item }">
-
-                  <div class="d-flex align-center mb-2">
-                    <v-icon size="small" color="grey" class="me-2">mdi-file-code</v-icon>
-                    <span class="text-caption text-medium-emphasis text-truncate" :title="getServerConfigSummary(item)">
-                      {{ getServerConfigSummary(item) }}
-                    </span>
-                  </div>
-
-                  <div v-if="item.tools && item.tools.length > 0">
-                    <div class="d-flex align-center mb-1">
-                      <v-icon size="small" color="grey" class="me-2">mdi-tools</v-icon>
-                      <span class="text-caption text-medium-emphasis">{{ tm('mcpServers.status.availableTools') }} ({{ item.tools.length }})</span>
-                    </div>
-                    <v-chip-group class="tool-chips">
-                      <v-chip v-for="(tool, idx) in item.tools" :key="idx" size="x-small" density="compact" color="info"
-                        class="text-caption">
-                        {{ tool }}
-                      </v-chip>
-                    </v-chip-group>
-                  </div>
-                  <div v-else class="text-caption text-medium-emphasis mt-2">
-                    <v-icon size="small" color="warning" class="me-1">mdi-alert-circle</v-icon>
-                    {{ tm('mcpServers.status.noTools') }}
-                  </div>
-
-                </template>
-              </item-card-grid>
+              <v-row v-else>
+                <v-col v-for="(server, index) in mcpServers || []" :key="index" cols="12" md="6" lg="4" xl="3">
+                  <item-card
+                    style="background-color: #f7f2f9;"
+                    :item="server" 
+                    title-field="name" 
+                    enabled-field="active"
+                    @toggle-enabled="updateServerStatus"
+                    @delete="deleteServer" 
+                    @edit="editServer">
+                    <template v-slot:item-details="{ item }">
+                      <div class="d-flex align-center mb-2">
+                        <v-icon size="small" color="grey" class="me-2">mdi-file-code</v-icon>
+                        <span class="text-caption text-medium-emphasis text-truncate" :title="getServerConfigSummary(item)">
+                          {{ getServerConfigSummary(item) }}
+                        </span>
+                      </div>

+                      <div v-if="item.tools && item.tools.length > 0">
+                        <div class="d-flex align-center mb-1">
+                          <v-icon size="small" color="grey" class="me-2">mdi-tools</v-icon>
+                          <span class="text-caption text-medium-emphasis">{{ tm('mcpServers.status.availableTools') }} ({{ item.tools.length }})</span>
+                        </div>
+                        <v-chip-group class="tool-chips">
+                          <v-chip v-for="(tool, idx) in item.tools" :key="idx" size="x-small" density="compact" color="info"
+                            class="text-caption">
+                            {{ tool }}
+                          </v-chip>
+                        </v-chip-group>
+                      </div>
+                      <div v-else class="text-caption text-medium-emphasis mt-2">
+                        <v-icon size="small" color="warning" class="me-1">mdi-alert-circle</v-icon>
+                        {{ tm('mcpServers.status.noTools') }}
+                      </div>
+                    </template>
+                  </item-card>
+                </v-col>
+              </v-row>
            </v-card-text>
          </v-card>

          <!-- 函数工具部分 -->
-          <v-card elevation="2">
+          <v-card elevation="0" class="mt-4">
            <v-card-title class="d-flex align-center py-3 px-4">
              <v-icon color="primary" class="me-2">mdi-function</v-icon>
-              <span class="text-h6">{{ tm('functionTools.title') }}</span>
+              <span class="text-h4">{{ tm('functionTools.title') }}</span>
              <v-chip color="info" size="small" class="ml-2">{{ tools.length }}</v-chip>
              <v-spacer></v-spacer>
              <v-btn variant="text" color="primary" @click="showTools = !showTools">
@@ -110,84 +123,86 @@
            <v-divider></v-divider>

            <v-expand-transition>
-              <v-card-text class="pa-3" v-if="showTools">
-                <div v-if="tools.length === 0" class="text-center pa-8">
-                  <v-icon size="64" color="grey-lighten-1">mdi-api-off</v-icon>
-                  <p class="text-grey mt-4">{{ tm('functionTools.empty') }}</p>
-                </div>
+              <v-card-text class="pa-0" v-if="showTools">
+                <div class="pa-4">
+                  <div v-if="tools.length === 0" class="text-center pa-8">
+                    <v-icon size="64" color="grey-lighten-1">mdi-api-off</v-icon>
+                    <p class="text-grey mt-4">{{ tm('functionTools.empty') }}</p>
+                  </div>

-                <div v-else>
-                  <v-text-field v-model="toolSearch" prepend-inner-icon="mdi-magnify" :label="tm('functionTools.search')" variant="outlined"
-                    density="compact" class="mb-4" hide-details clearable></v-text-field>
+                  <div v-else>
+                    <v-text-field v-model="toolSearch" prepend-inner-icon="mdi-magnify" :label="tm('functionTools.search')" variant="outlined"
+                      density="compact" class="mb-4" hide-details clearable></v-text-field>

-                  <v-expansion-panels v-model="openedPanel" multiple>
-                    <v-expansion-panel v-for="(tool, index) in filteredTools" :key="index" :value="index"
-                      class="mb-2 tool-panel" rounded="lg">
-                      <v-expansion-panel-title>
-                        <v-row no-gutters align="center">
-                          <v-col cols="3">
-                            <div class="d-flex align-center">
-                              <v-icon color="primary" class="me-2" size="small">
-                                {{ tool.function.name.includes(':') ? 'mdi-server-network' : 'mdi-function-variant' }}
-                              </v-icon>
-                              <span class="text-body-1 text-high-emphasis font-weight-medium text-truncate"
-                                :title="tool.function.name">
-                                {{ formatToolName(tool.function.name) }}
-                              </span>
-                            </div>
-                          </v-col>
-                          <v-col cols="9" class="text-grey">
-                            {{ tool.function.description }}
-                          </v-col>
-                        </v-row>
-                      </v-expansion-panel-title>
+                    <v-expansion-panels v-model="openedPanel" multiple>
+                      <v-expansion-panel v-for="(tool, index) in filteredTools" :key="index" :value="index"
+                        class="mb-2 tool-panel" rounded="lg">
+                        <v-expansion-panel-title>
+                          <v-row no-gutters align="center">
+                            <v-col cols="3">
+                              <div class="d-flex align-center">
+                                <v-icon color="primary" class="me-2" size="small">
+                                  {{ tool.function.name.includes(':') ? 'mdi-server-network' : 'mdi-function-variant' }}
+                                </v-icon>
+                                <span class="text-body-1 text-high-emphasis font-weight-medium text-truncate"
+                                  :title="tool.function.name">
+                                  {{ formatToolName(tool.function.name) }}
+                                </span>
+                              </div>
+                            </v-col>
+                            <v-col cols="9" class="text-grey">
+                              {{ tool.function.description }}
+                            </v-col>
+                          </v-row>
+                        </v-expansion-panel-title>

-                      <v-expansion-panel-text>
-                        <v-card flat>
-                          <v-card-text>
-                            <p class="text-body-1 font-weight-medium mb-3">
-                              <v-icon color="primary" size="small" class="me-1">mdi-information</v-icon>
-                              {{ tm('functionTools.description') }}
-                            </p>
-                            <p class="text-body-2 ml-6 mb-4">{{ tool.function.description }}</p>
-
-                            <template v-if="tool.function.parameters && tool.function.parameters.properties">
+                        <v-expansion-panel-text>
+                          <v-card flat>
+                            <v-card-text>
                              <p class="text-body-1 font-weight-medium mb-3">
-                                <v-icon color="primary" size="small" class="me-1">mdi-code-json</v-icon>
-                                {{ tm('functionTools.parameters') }}
+                                <v-icon color="primary" size="small" class="me-1">mdi-information</v-icon>
+                                {{ tm('functionTools.description') }}
                              </p>
+                              <p class="text-body-2 ml-6 mb-4">{{ tool.function.description }}</p>

-                              <v-table density="compact" class="params-table mt-1">
-                                <thead>
-                                  <tr>
-                                    <th>{{ tm('functionTools.table.paramName') }}</th>
-                                    <th>{{ tm('functionTools.table.type') }}</th>
-                                    <th>{{ tm('functionTools.table.description') }}</th>
-                                  </tr>
-                                </thead>
-                                <tbody>
-                                  <tr v-for="(param, paramName) in tool.function.parameters.properties"
-                                    :key="paramName">
-                                    <td class="font-weight-medium">{{ paramName }}</td>
-                                    <td>
-                                      <v-chip size="x-small" color="primary" text class="text-caption">
-                                        {{ param.type }}
-                                      </v-chip>
-                                    </td>
-                                    <td>{{ param.description }}</td>
-                                  </tr>
-                                </tbody>
-                              </v-table>
-                            </template>
-                            <div v-else class="text-center pa-4 text-medium-emphasis">
-                              <v-icon size="large" color="grey-lighten-1">mdi-code-brackets</v-icon>
-                              <p>{{ tm('functionTools.noParameters') }}</p>
-                            </div>
-                          </v-card-text>
-                        </v-card>
-                      </v-expansion-panel-text>
-                    </v-expansion-panel>
-                  </v-expansion-panels>
+                              <template v-if="tool.function.parameters && tool.function.parameters.properties">
+                                <p class="text-body-1 font-weight-medium mb-3">
+                                  <v-icon color="primary" size="small" class="me-1">mdi-code-json</v-icon>
+                                  {{ tm('functionTools.parameters') }}
+                                </p>
+
+                                <v-table density="compact" class="params-table mt-1">
+                                  <thead>
+                                    <tr>
+                                      <th>{{ tm('functionTools.table.paramName') }}</th>
+                                      <th>{{ tm('functionTools.table.type') }}</th>
+                                      <th>{{ tm('functionTools.table.description') }}</th>
+                                    </tr>
+                                  </thead>
+                                  <tbody>
+                                    <tr v-for="(param, paramName) in tool.function.parameters.properties"
+                                      :key="paramName">
+                                      <td class="font-weight-medium">{{ paramName }}</td>
+                                      <td>
+                                        <v-chip size="x-small" color="primary" text class="text-caption">
+                                          {{ param.type }}
+                                        </v-chip>
+                                      </td>
+                                      <td>{{ param.description }}</td>
+                                    </tr>
+                                  </tbody>
+                                </v-table>
+                              </template>
+                              <div v-else class="text-center pa-4 text-medium-emphasis">
+                                <v-icon size="large" color="grey-lighten-1">mdi-code-brackets</v-icon>
+                                <p>{{ tm('functionTools.noParameters') }}</p>
+                              </div>
+                            </v-card-text>
+                          </v-card>
+                        </v-expansion-panel-text>
+                      </v-expansion-panel>
+                    </v-expansion-panels>
+                  </div>
                </div>
              </v-card-text>
            </v-expand-transition>
@@ -466,7 +481,7 @@
 import axios from 'axios';
 import AstrBotConfig from '@/components/shared/AstrBotConfig.vue';
 import { VueMonacoEditor } from '@guolao/vue-monaco-editor';
-import ItemCardGrid from '@/components/shared/ItemCardGrid.vue';
+import ItemCard from '@/components/shared/ItemCard.vue';
 import { useI18n, useModuleI18n } from '@/i18n/composables';

 export default {
@@ -474,7 +489,7 @@ export default {
  components: {
    AstrBotConfig,
    VueMonacoEditor,
-    ItemCardGrid
+    ItemCard
  },
  setup() {
    const { t } = useI18n();
@@ -939,6 +954,7 @@ export default {
 .text-truncate-2 {
  display: -webkit-box;
  -webkit-line-clamp: 2;
+  line-clamp: 2;
  -webkit-box-orient: vertical;
  overflow: hidden;
  text-overflow: ellipsis;
@@ -30,7 +30,16 @@ export default {
  },
  computed: {
    formattedTime() {
-      return this.stat?.running || this.t('status.loading');
+      if (!this.stat?.running) {
+        return this.t('status.loading');
+      }
+
+      const { hours, minutes, seconds } = this.stat.running;
+      return this.t('stats.runningTime.format', {
+        hours,
+        minutes,
+        seconds
+      });
    }
  }
 };
@@ -10,6 +10,7 @@ import astrbot.api.event.filter as filter
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 from astrbot.api import sp
 from astrbot.api.provider import ProviderRequest
+from astrbot.core import DEMO_MODE
 from astrbot.core.platform.astr_message_event import MessageSesion
 from astrbot.core.platform.message_type import MessageType
 from astrbot.core.provider.entities import ProviderType
@@ -55,12 +56,6 @@ class RstScene(Enum):
        return cls.PRIVATE


-@star.register(
-    name="astrbot",
-    desc="AstrBot 基础指令结合 + 拓展功能",
-    author="Soulter",
-    version="4.0.0",
-)
 class Main(star.Star):
    def __init__(self, context: star.Context) -> None:
        self.context = context
@@ -233,6 +228,9 @@ class Main(star.Star):
    @plugin.command("off")
    async def plugin_off(self, event: AstrMessageEvent, plugin_name: str = None):
        """禁用插件"""
+        if DEMO_MODE:
+            event.set_result(MessageEventResult().message("演示模式下无法禁用插件。"))
+            return
        if not plugin_name:
            event.set_result(
                MessageEventResult().message("/plugin off <插件名> 禁用插件。")
@@ -245,6 +243,9 @@ class Main(star.Star):
    @plugin.command("on")
    async def plugin_on(self, event: AstrMessageEvent, plugin_name: str = None):
        """启用插件"""
+        if DEMO_MODE:
+            event.set_result(MessageEventResult().message("演示模式下无法启用插件。"))
+            return
        if not plugin_name:
            event.set_result(
                MessageEventResult().message("/plugin on <插件名> 启用插件。")
@@ -257,6 +258,9 @@ class Main(star.Star):
    @plugin.command("get")
    async def plugin_get(self, event: AstrMessageEvent, plugin_repo: str = None):
        """安装插件"""
+        if DEMO_MODE:
+            event.set_result(MessageEventResult().message("演示模式下无法安装插件。"))
+            return
        if not plugin_repo:
            event.set_result(
                MessageEventResult().message("/plugin get <插件仓库地址> 安装插件")
@@ -655,25 +659,16 @@ UID: {user_id} 此 ID 可用于设置管理员。
            return

        size_per_page = 6
-        session_curr_cid = (
-            await self.context.conversation_manager.get_curr_conversation_id(
-                message.unified_msg_origin
-            )
-        )
+
+        conv_mgr = self.context.conversation_manager
+        umo = message.unified_msg_origin
+        session_curr_cid = await conv_mgr.get_curr_conversation_id(umo)

        if not session_curr_cid:
-            message.set_result(
-                MessageEventResult().message(
-                    "当前未处于对话状态，请 /switch 序号 切换或者 /new 创建。"
-                )
-            )
-            return
+            session_curr_cid = await conv_mgr.new_conversation(umo)

-        (
-            contexts,
-            total_pages,
-        ) = await self.context.conversation_manager.get_human_readable_context(
-            message.unified_msg_origin, session_curr_cid, page, size_per_page
+        contexts, total_pages = await conv_mgr.get_human_readable_context(
+            umo, session_curr_cid, page, size_per_page
        )

        history = ""
@@ -682,12 +677,12 @@ UID: {user_id} 此 ID 可用于设置管理员。
                context = context[:150] + "..."
            history += f"{context}\n"

-        ret = f"""当前对话历史记录：
-{history}
-第 {page} 页 | 共 {total_pages} 页
-
-*输入 /history 2 跳转到第 2 页
-"""
+        ret = (
+            f"当前对话历史记录："
+            f"{history if history else '无历史记录'}\n\n"
+            f"第 {page} 页 | 共 {total_pages} 页\n"
+            f"*输入 /history 2 跳转到第 2 页"
+        )

        message.set_result(MessageEventResult().message(ret).use_t2i(False))

@@ -1022,14 +1017,10 @@ UID: {user_id} 此 ID 可用于设置管理员。
        curr_cid_title = "无"
        if cid:
            conversation = await self.context.conversation_manager.get_conversation(
-                message.unified_msg_origin, cid
+                unified_msg_origin=message.unified_msg_origin,
+                conversation_id=cid,
+                create_if_not_exists=True,
            )
-            if not conversation:
-                message.set_result(
-                    MessageEventResult().message(
-                        "请先进入一个对话。可以使用 /new 创建。"
-                    )
-                )
            if not conversation.persona_id and not conversation.persona_id == "[%None]":
                curr_persona_name = (
                    self.context.provider_manager.selected_default_persona["name"]
@@ -1307,12 +1298,36 @@ UID: {user_id} 此 ID 可用于设置管理员。
                ) and not req.contexts:
                    req.contexts[:0] = begin_dialogs

-        if quote and quote.message_str:
+        if quote:
+            sender_info = ""
            if quote.sender_nickname:
                sender_info = f"(Sent by {quote.sender_nickname})"
-            else:
-                sender_info = ""
-            req.system_prompt += f"\nUser is quoting the message{sender_info}: {quote.message_str}, please consider the context."
+            message_str = quote.message_str or "[Empty Text]"
+            req.system_prompt += (
+                f"\nUser is quoting a message{sender_info}.\n"
+                f"Here are the information of the quoted message: Text Content: {message_str}.\n"
+            )
+            image_seg = None
+            if quote.chain:
+                for comp in quote.chain:
+                    if isinstance(comp, Image):
+                        image_seg = comp
+                        break
+            if image_seg:
+                try:
+                    if prov := self.context.get_using_provider(
+                        event.unified_msg_origin
+                    ):
+                        llm_resp = await prov.text_chat(
+                            prompt="Please describe the image content.",
+                            image_urls=[await image_seg.convert_to_file_path()],
+                        )
+                        if llm_resp.completion_text:
+                            req.system_prompt += (
+                                f"Image Caption: {llm_resp.completion_text}\n"
+                            )
+                except BaseException as e:
+                    logger.error(f"处理引用图片失败: {e}")

        if self.ltm:
            try:
--- a/Show More
+++ b/Show More