Merge remote-tracking branch 'origin/master' into feat/memory

- Introduced `ConversationSidebar.vue` for improved conversation management and sidebar functionality.
- Enhanced `MessageList.vue` to handle loading states and improved message rendering.
- Created new composables: `useConversations`, `useMessages`, `useMediaHandling`, `useRecording` for better code organization and reusability.
- Added loading indicators and improved user experience during message processing.
- Ensured backward compatibility and maintained existing functionalities.

.github/workflows/auto_release.yml

@@ -13,7 +13,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Dashboard Build
         run: |
@@ -70,7 +70,7 @@ jobs:
     needs: build-and-publish-to-github-release
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Set up Python
         uses: actions/setup-python@v6

.github/workflows/code-format.yml

@@ -12,7 +12,7 @@ jobs:
     
     steps:
     - name: Checkout code
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
       
     - name: Set up Python
       uses: actions/setup-python@v6

.github/workflows/codeql.yml

@@ -56,7 +56,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/coverage_test.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/dashboard_ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -36,7 +36,7 @@ jobs:
           zip -r dist.zip dist
 
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: dist-without-markdown
           path: |

.github/workflows/docker-image.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 1
           fetch-tag: true
@@ -118,7 +118,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 1
           fetch-tag: true

.github/workflows/smoke_test.yml

@@ -1,58 +0,0 @@
-name: Smoke Test
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'README*.md'
-      - 'changelogs/**'
-      - 'dashboard/**'
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  smoke-test:
-    name: Run smoke tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.12'
-      
-      - name: Install UV package manager
-        run: |
-          pip install uv
-
-      - name: Install dependencies
-        run: |
-          uv sync
-        timeout-minutes: 15
-
-      - name: Run smoke tests
-        run: |
-          uv run main.py &
-          APP_PID=$!
-
-          echo "Waiting for application to start..."
-          for i in {1..60}; do
-            if curl -f http://localhost:6185 > /dev/null 2>&1; then
-              echo "Application started successfully!"
-              kill $APP_PID
-              exit 0
-            fi
-            sleep 1
-          done
-
-          echo "Application failed to start within 30 seconds"
-          kill $APP_PID 2>/dev/null || true
-          exit 1
-        timeout-minutes: 2

.gitignore

@@ -34,7 +34,6 @@ dashboard/node_modules/
 dashboard/dist/
 package-lock.json
 package.json
-yarn.lock
 
 # Operating System
 **/.DS_Store
@@ -48,5 +47,3 @@ astrbot.lock
 chroma
 venv/*
 pytest.ini
-AGENTS.md
-IFLOW.md

CONTRIBUTING.md

@@ -1,90 +0,0 @@
-# CONTRIBUTING
-
-## 贡献指南
-
-首先，感谢您花时间做出贡献！❤️
-
-所有类型的贡献都受到鼓励和重视。有关不同的帮助方式和处理方式的详细信息，请参阅[目录](#目录)。在做出贡献之前，请确保阅读相关部分。这将使我们维护人员的工作变得更加容易，并为所有参与者带来顺畅的体验。社区期待您的贡献。🎉
-
-### 目录
-
-- [报告问题](#报告问题)
-- [提交代码更改](#提交代码更改)
-
-### 报告问题
-
-如果您在使用 AstrBot 时遇到任何问题，请按照以下步骤报告：
-
-1. **检查现有问题**：在提交新问题之前，请先检查 [Issues](https://github.com/AstrBotDevs/AstrBot/issues) 中是否已经存在类似的问题。
-2. **创建新问题**：如果没有类似的问题，请创建一个新问题。请确保提供以下信息：
-   - 问题的简要描述
-   - 重现问题的步骤
-   - 预期结果和实际结果
-   - 相关日志或错误消息
-
-### 提交代码更改
-
-#### 分支命名
-
-我们使用 `fix/` 前缀来修复错误，使用 `feat/` 前缀来添加新功能。对于 `fix/` 分支，请使用简短的描述，或者直接使用 Issue 编号。例如：`fix/1234` 或者 `fix/1234-login-typo`。对于 `feat/` 分支，请使用简短的描述，例如：`feat/add-user-profile`。
-
-#### PR 描述
-
-- 请使用英文描述您的 PR。
-- 标题请使用 `fix: `, `feat: `, `docs: `, `style: `, `refactor: `, `test: `, `chore: ` 等语义化前缀，并简要描述更改内容。如：`fix: correct login page typo`。
-
-#### 代码规范
-
-##### Core
-
-我们使用 Ruff 作为代码格式化和静态分析工具。在提交代码之前，请运行以下命令以确保代码符合规范：
-
-```bash
-ruff format .
-ruff check .
-```
-
-如果您使用 VSCode，可以安装 `Ruff` 插件。
-
-
-## Contributing Guide
-
-First off, thanks for taking the time to contribute! ❤️
-
-All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
-
-### Table of Contents
-
-- [Reporting Issues](#reporting-issues)
-- [Pull Requests](#pull-requests)
-
-### Reporting Issues
-
-If you encounter any issues while using AstrBot, please follow these steps to report them:
-1. **Check Existing Issues**: Before submitting a new issue, please check if a similar issue already exists in the [Issues](https://github.com/AstrBotDevs/AstrBot/issues) section of the repository.
-2. **Create a New Issue**: If no similar issue exists, please create a new issue. Make sure to provide the following information:
-   - A brief description of the issue
-   - Steps to reproduce the issue
-   - Expected and actual results
-   - Relevant logs or error messages
-
-### Pull Requests
-
-#### Branch Naming
-
-We use the `fix/` prefix for bug fixes and the `feat/` prefix for new features. For `fix/` branches, please use a short description or directly use the Issue number, e.g., `fix/1234` or `fix/1234-login-typo`. For `feat/` branches, please use a short description, e.g., `feat/add-user-profile`.
-
-#### PR Description
-- Please use English to describe your PR.
-- Use semantic prefixes like `fix: `, `feat: `, `docs: `, `style: `, `refactor: `, `test: `, `chore: ` in the title, followed by a brief description of the changes, e.g., `fix: correct login page typo`.
-
-#### Code Style
-
-##### Core
-
-We use Ruff as our code formatter and static analysis tool. Before submitting your code, please run the following commands to ensure your code adheres to the style guidelines:
-
-```bash
-ruff format .
-ruff check .
-```

README.md

@@ -1,13 +1,10 @@
 ![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
 
+</p>
+
 <div align="center">
 
-
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
+<br>
 
 <div>
 <a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
@@ -17,38 +14,35 @@
 <br>
 
 <div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
-<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600">
-<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
+<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
+<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
+<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>
+<img src="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">
 </div>
 
 <br>
 
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
 <a href="https://astrbot.app/">文档</a> ｜
 <a href="https://blog.astrbot.app/">Blog</a> ｜
 <a href="https://astrbot.featurebase.app/roadmap">路线图</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/issues">问题提交</a>
 </div>
 
-AstrBot 是一个开源的一站式 Agent 聊天机器人平台，可接入主流即时通讯软件，为个人、开发者和团队打造可靠、可扩展的对话式智能基础设施。无论是个人 AI 伙伴、智能客服、自动化助手，还是企业知识库，AstrBot 都能在你的即时通讯软件平台的工作流中快速构建生产可用的 AI 应用。
-
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
+AstrBot 是一个开源的一站式 Agent 聊天机器人平台及开发框架。
 
 ## 主要功能
 
-1. 💯 免费 & 开源。
-1. ✨ AI 大模型对话，多模态，Agent，MCP，知识库，人格设定。
-2. 🤖 支持接入 Dify、阿里云百炼、Coze 等智能体平台。
-2. 🌐 多平台，支持 QQ、企业微信、飞书、钉钉、微信公众号、Telegram、Slack 以及[更多](#支持的消息平台)。
-3. 📦 插件扩展，已有近 800 个插件可一键安装。
-5. 💻 WebUI 支持。
-6. 🌐 国际化（i18n）支持。
+1. **大模型对话**。支持接入多种大模型服务。支持多模态、工具调用、MCP、原生知识库、人设等功能。
+2. **多消息平台支持**。支持接入 QQ、企业微信、微信公众号、飞书、Telegram、钉钉、Discord、KOOK 等平台。支持速率限制、白名单、百度内容审核。
+3. **Agent**。完善适配的 Agentic 能力。支持多轮工具调用、内置沙盒代码执行器、网页搜索等功能。
+4. **插件扩展**。深度优化的插件机制，支持[开发插件](https://astrbot.app/dev/plugin.html)扩展功能，社区插件生态丰富。
+5. **WebUI**。可视化配置和管理机器人，功能齐全。
 
-## 快速开始
+## 部署方式 
 
 #### Docker 部署(推荐 🥳)
 
@@ -56,12 +50,6 @@ AstrBot 是一个开源的一站式 Agent 聊天机器人平台，可接入主
 
 请参阅官方文档 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) 。
 
-#### uv 部署
-
-```bash
-uvx astrbot
-```
-
 #### 宝塔面板部署
 
 AstrBot 与宝塔面板合作，已上架至宝塔面板。
@@ -113,6 +101,24 @@ uv run main.py
 
 或者请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html) 。
 
+## 🌍 社区
+
+### QQ 群组
+
+- 1 群：322154837
+- 3 群：630166526
+- 5 群：822130018
+- 6 群：753075035
+- 开发者群：975206796
+
+### Telegram 群组
+
+<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>
+
+### Discord 群组
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
 ## 支持的消息平台
 
 **官方维护**
@@ -199,25 +205,6 @@ pip install pre-commit
 pre-commit install
 ```
 
-## 🌍 社区
-
-### QQ 群组
-
-- 1 群：322154837
-- 3 群：630166526
-- 5 群：822130018
-- 6 群：753075035
-- 7 群：743746109
-- 开发者群：975206796
-
-### Telegram 群组
-
-<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>
-
-### Discord 群组
-
-<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
 ## ❤️ Special Thanks
 
 特别感谢所有 Contributors 和插件开发者对 AstrBot 的贡献 ❤️
@@ -243,10 +230,4 @@ pre-commit install
 
 </details>
 
-<div align="center">
-
 _私は、高性能ですから!_
-
-<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
-</div
-

README_en.md

@@ -19,38 +19,30 @@
 <a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
 <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>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20plugins&style=for-the-badge&label=Marketplace&cacheSeconds=3600">
+<img src="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">
 </div>
 
 <br>
 
 <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
-
 <a href="https://astrbot.app/">Documentation</a> ｜
 <a href="https://blog.astrbot.app/">Blog</a> ｜
 <a href="https://astrbot.featurebase.app/roadmap">Roadmap</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/issues">Issue Tracker</a>
 </div>
 
-AstrBot is an open-source all-in-one Agent chatbot platform that integrates with mainstream instant messaging apps. It provides reliable and scalable conversational AI infrastructure for individuals, developers, and teams. Whether you're building a personal AI companion, intelligent customer service, automation assistant, or enterprise knowledge base, AstrBot enables you to quickly build production-ready AI applications within your IM platform workflows.
-
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
+AstrBot is an open-source all-in-one Agent chatbot platform and development framework.
 
 ## Key Features
 
-1. 💯 Free & Open Source.
-2. ✨ AI LLM Conversations, Multimodal, Agent, MCP, Knowledge Base, Persona Settings.
-3. 🤖 Supports integration with Dify, Alibaba Cloud Bailian, Coze and other agent platforms.
-4. 🌐 Multi-Platform: QQ, WeChat Work, Feishu, DingTalk, WeChat Official Accounts, Telegram, Slack, and [more](#supported-messaging-platforms).
-5. 📦 Plugin Extensions with nearly 800 plugins available for one-click installation.
-6. 💻 WebUI Support.
-7. 🌐 Internationalization (i18n) Support.
+1. **LLM Conversations**. Supports integration with various large language model services. Features include multimodal capabilities, tool calling, MCP, native knowledge base, character personas, and more.
+2. **Multi-Platform Support**. Integrates with QQ, WeChat Work, WeChat Official Accounts, Feishu, Telegram, DingTalk, Discord, KOOK, and other platforms. Supports rate limiting, whitelisting, and Baidu content moderation.
+3. **Agent Capabilities**. Fully optimized agentic features including multi-turn tool calling, built-in sandboxed code executor, web search, and more.
+4. **Plugin Extensions**. Deeply optimized plugin mechanism supporting [plugin development](https://astrbot.app/dev/plugin.html) to extend functionality, with a rich community plugin ecosystem.
+5. **Web UI**. Visual configuration and management of your bot with comprehensive features.
 
-## Quick Start
+## Deployment Methods
 
 #### Docker Deployment (Recommended 🥳)
 
@@ -58,12 +50,6 @@ We recommend deploying AstrBot using Docker or Docker Compose.
 
 Please refer to the official documentation: [Deploy AstrBot with Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
 
-#### uv Deployment
-
-```bash
-uvx astrbot
-```
-
 #### BT-Panel Deployment
 
 AstrBot has partnered with BT-Panel and is now available in their marketplace.
@@ -115,6 +101,24 @@ uv run main.py
 
 Or refer to the official documentation: [Deploy AstrBot from Source](https://astrbot.app/deploy/astrbot/cli.html).
 
+## 🌍 Community
+
+### QQ Groups
+
+- Group 1: 322154837
+- Group 3: 630166526
+- Group 5: 822130018
+- Group 6: 753075035
+- Developer Group: 975206796
+
+### Telegram Group
+
+<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>
+
+### Discord Server
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
 ## Supported Messaging Platforms
 
 **Officially Maintained**
@@ -201,24 +205,6 @@ pip install pre-commit
 pre-commit install
 ```
 
-## 🌍 Community
-
-### QQ Groups
-
-- Group 1: 322154837
-- Group 3: 630166526
-- Group 5: 822130018
-- Group 6: 753075035
-- Developer Group: 975206796
-
-### Telegram Group
-
-<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>
-
-### Discord Server
-
-<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
 ## ❤️ Special Thanks
 
 Special thanks to all Contributors and plugin developers for their contributions to AstrBot ❤️

README_fr.md

@@ -1,248 +0,0 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
-
-</p>
-
-<div align="center">
-
-<br>
-
-<div>
-<a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-<a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-</div>
-
-<br>
-
-<div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
-<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>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20plugins&style=for-the-badge&label=Marketplace&cacheSeconds=3600">
-</div>
-
-<br>
-
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
-
-<a href="https://astrbot.app/">Documentation</a> ｜
-<a href="https://blog.astrbot.app/">Blog</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">Feuille de route</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/issues">Signaler un problème</a>
-</div>
-
-AstrBot est une plateforme de chatbot Agent tout-en-un open source qui s'intègre aux principales applications de messagerie instantanée. Elle fournit une infrastructure d'IA conversationnelle fiable et évolutive pour les particuliers, les développeurs et les équipes. Que vous construisiez un compagnon IA personnel, un service client intelligent, un assistant d'automatisation ou une base de connaissances d'entreprise, AstrBot vous permet de créer rapidement des applications d'IA prêtes pour la production dans les flux de travail de votre plateforme de messagerie.
-
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
-
-## Fonctionnalités principales
-
-1. 💯 Gratuit & Open Source.
-2. ✨ Conversations avec LLM IA, Multimodal, Agent, MCP, Base de connaissances, Paramètres de personnalité.
-3. 🤖 Prise en charge de l'intégration avec Dify, Alibaba Cloud Bailian, Coze et autres plateformes d'agents.
-4. 🌐 Multi-plateforme : QQ, WeChat Work, Feishu, DingTalk, Comptes officiels WeChat, Telegram, Slack, et [plus encore](#plateformes-de-messagerie-prises-en-charge).
-5. 📦 Extensions de plugins avec près de 800 plugins disponibles pour une installation en un clic.
-6. 💻 Support WebUI.
-7. 🌐 Support de l'internationalisation (i18n).
-
-## Démarrage rapide
-
-#### Déploiement Docker (Recommandé 🥳)
-
-Nous recommandons de déployer AstrBot en utilisant Docker ou Docker Compose.
-
-Veuillez consulter la documentation officielle : [Déployer AstrBot avec Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
-
-#### Déploiement uv
-
-```bash
-uvx astrbot
-```
-
-#### Déploiement BT-Panel
-
-AstrBot s'est associé à BT-Panel et est maintenant disponible sur leur marketplace.
-
-Veuillez consulter la documentation officielle : [Déploiement BT-Panel](https://astrbot.app/deploy/astrbot/btpanel.html).
-
-#### Déploiement 1Panel
-
-AstrBot a été officiellement listé sur le marketplace 1Panel.
-
-Veuillez consulter la documentation officielle : [Déploiement 1Panel](https://astrbot.app/deploy/astrbot/1panel.html).
-
-#### Déployer sur RainYun
-
-AstrBot a été officiellement listé sur la plateforme d'applications cloud de RainYun avec un déploiement en un clic.
-
-[![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)
-
-#### Déployer sur Replit
-
-Méthode de déploiement contribuée par la communauté.
-
-[![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
-
-#### Installateur Windows en un clic
-
-Veuillez consulter la documentation officielle : [Déployer AstrBot avec l'installateur Windows en un clic](https://astrbot.app/deploy/astrbot/windows.html).
-
-#### Déploiement CasaOS
-
-Méthode de déploiement contribuée par la communauté.
-
-Veuillez consulter la documentation officielle : [Déploiement CasaOS](https://astrbot.app/deploy/astrbot/casaos.html).
-
-#### Déploiement manuel
-
-Tout d'abord, installez uv :
-
-```bash
-pip install uv
-```
-
-Installez AstrBot via Git Clone :
-
-```bash
-git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
-uv run main.py
-```
-
-Ou consultez la documentation officielle : [Déployer AstrBot depuis les sources](https://astrbot.app/deploy/astrbot/cli.html).
-
-## Plateformes de messagerie prises en charge
-
-**Maintenues officiellement**
-
-- QQ (Plateforme officielle & OneBot)
-- Telegram
-- Application WeChat Work & Bot intelligent WeChat Work
-- Service client WeChat & Comptes officiels WeChat
-- Feishu (Lark)
-- DingTalk
-- Slack
-- Discord
-- Satori
-- Misskey
-- WhatsApp (Bientôt disponible)
-- LINE (Bientôt disponible)
-
-**Maintenues par la communauté**
-
-- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
-- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
-- [Messages directs Bilibili](https://github.com/Hina-Chat/astrbot_plugin_bilibili_adapter)
-- [wxauto](https://github.com/luosheng520qaq/wxauto-repost-onebotv11)
-
-## Services de modèles pris en charge
-
-**Services LLM**
-
-- OpenAI et services compatibles
-- Anthropic
-- Google Gemini
-- Moonshot AI
-- Zhipu AI
-- DeepSeek
-- Ollama (Auto-hébergé)
-- LM Studio (Auto-hébergé)
-- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
-- [302.AI](https://share.302.ai/rr1M3l)
-- [TokenPony](https://www.tokenpony.cn/3YPyf)
-- [SiliconFlow](https://docs.siliconflow.cn/cn/usecases/use-siliconcloud-in-astrbot)
-- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE)
-- ModelScope
-- OneAPI
-
-**Plateformes LLMOps**
-
-- Dify
-- Applications Alibaba Cloud Bailian
-- Coze
-
-**Services de reconnaissance vocale**
-
-- OpenAI Whisper
-- SenseVoice
-
-**Services de synthèse vocale**
-
-- OpenAI TTS
-- Gemini TTS
-- GPT-Sovits-Inference
-- GPT-Sovits
-- FishAudio
-- Edge TTS
-- Alibaba Cloud Bailian TTS
-- Azure TTS
-- Minimax TTS
-- Volcano Engine TTS
-
-## ❤️ Contribuer
-
-Les Issues et Pull Requests sont toujours les bienvenues ! N'hésitez pas à soumettre vos modifications à ce projet :)
-
-### Comment contribuer
-
-Vous pouvez contribuer en examinant les issues ou en aidant à la revue des pull requests. Toutes les issues ou PRs sont les bienvenues pour encourager la participation de la communauté. Bien sûr, ce ne sont que des suggestions - vous pouvez contribuer de la manière que vous souhaitez. Pour l'ajout de nouvelles fonctionnalités, veuillez d'abord en discuter via une Issue.
-
-### Environnement de développement
-
-AstrBot utilise `ruff` pour le formatage et le linting du code.
-
-```bash
-git clone https://github.com/AstrBotDevs/AstrBot
-pip install pre-commit
-pre-commit install
-```
-
-## 🌍 Communauté
-
-### Groupes QQ
-
-- Groupe 1 : 322154837
-- Groupe 3 : 630166526
-- Groupe 5 : 822130018
-- Groupe 6 : 753075035
-- Groupe développeurs : 975206796
-
-### Groupe Telegram
-
-<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>
-
-### Serveur Discord
-
-<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
-## ❤️ Remerciements spéciaux
-
-Un grand merci à tous les contributeurs et développeurs de plugins pour leurs contributions à AstrBot ❤️
-
-<a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
-</a>
-
-De plus, la naissance de ce projet n'aurait pas été possible sans l'aide des projets open source suivants :
-
-- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - L'incroyable framework chat
-
-## ⭐ Historique des étoiles
-
-> [!TIP]
-> Si ce projet vous a aidé dans votre vie ou votre travail, ou si vous êtes intéressé par son développement futur, veuillez donner une étoile au projet. C'est la force motrice derrière la maintenance de ce projet open source <3
-
-<div align="center">
-
-[![Star History Chart](https://api.star-history.com/svg?repos=astrbotdevs/astrbot&type=Date)](https://star-history.com/#astrbotdevs/astrbot&Date)
-
-</div>
-
-</details>
-
-_私は、高性能ですから!_
-

README_ja.md

@@ -19,38 +19,30 @@
 <a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
 <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>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E5%80%8B&style=for-the-badge&label=%E3%83%97%E3%83%A9%E3%82%B0%E3%82%A4%E3%83%B3&cacheSeconds=3600">
+<img src="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">
 </div>
 
 <br>
 
 <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
-
 <a href="https://astrbot.app/">ドキュメント</a> ｜
 <a href="https://blog.astrbot.app/">Blog</a> ｜
 <a href="https://astrbot.featurebase.app/roadmap">ロードマップ</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/issues">Issue</a>
 </div>
 
-AstrBot は、主要なインスタントメッセージングアプリと統合できるオープンソースのオールインワン Agent チャットボットプラットフォームです。個人、開発者、チームに信頼性が高くスケーラブルな会話型 AI インフラストラクチャを提供します。パーソナル AI コンパニオン、インテリジェントカスタマーサービス、オートメーションアシスタント、エンタープライズナレッジベースなど、AstrBot を使用すると、IM プラットフォームのワークフロー内で本番環境対応の AI アプリケーションを迅速に構築できます。
-
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
+AstrBot は、オープンソースのオールインワン Agent チャットボットプラットフォーム及び開発フレームワークです。
 
 ## 主な機能
 
-1. 💯 無料 & オープンソース。
-2. ✨ AI 大規模言語モデル対話、マルチモーダル、Agent、MCP、ナレッジベース、ペルソナ設定。
-3. 🤖 Dify、Alibaba Cloud 百炼、Coze などの Agent プラットフォームとの統合をサポート。
-4. 🌐 マルチプラットフォーム：QQ、WeChat Work、Feishu、DingTalk、WeChat 公式アカウント、Telegram、Slack、[その他](#サポートされているメッセージプラットフォーム)。
-5. 📦 約800個のプラグインをワンクリックでインストール可能なプラグイン拡張機能。
-6. 💻 WebUI サポート。
-7. 🌐 国際化（i18n）サポート。
+1. **大規模言語モデル対話**。多様な大規模言語モデルサービスとの統合をサポート。マルチモーダル、ツール呼び出し、MCP、ネイティブナレッジベース、キャラクター設定などの機能を搭載。
+2. **マルチメッセージプラットフォームサポート**。QQ、WeChat Work、WeChat公式アカウント、Feishu、Telegram、DingTalk、Discord、KOOK などのプラットフォームと統合可能。レート制限、ホワイトリスト、Baidu コンテンツ審査をサポート。
+3. **Agent**。完全に最適化された Agentic 機能。マルチターンツール呼び出し、内蔵サンドボックスコード実行環境、Web 検索などの機能をサポート。
+4. **プラグイン拡張**。深く最適化されたプラグインメカニズムで、[プラグイン開発](https://astrbot.app/dev/plugin.html)による機能拡張をサポート。豊富なコミュニティプラグインエコシステム。
+5. **WebUI**。ビジュアル設定とボット管理、充実した機能。
 
-## クイックスタート
+## デプロイ方法
 
 #### Docker デプロイ（推奨 🥳）
 
@@ -58,12 +50,6 @@ Docker / Docker Compose を使用した AstrBot のデプロイを推奨しま
 
 公式ドキュメント [Docker を使用した AstrBot のデプロイ](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) をご参照ください。
 
-#### uv デプロイ
-
-```bash
-uvx astrbot
-```
-
 #### 宝塔パネルデプロイ
 
 AstrBot は宝塔パネルと提携し、宝塔パネルに公開されています。
@@ -115,6 +101,24 @@ uv run main.py
 
 または、公式ドキュメント [ソースコードから AstrBot をデプロイ](https://astrbot.app/deploy/astrbot/cli.html) をご参照ください。
 
+## 🌍 コミュニティ
+
+### QQ グループ
+
+- 1群:322154837
+- 3群:630166526
+- 5群:822130018
+- 6群:753075035
+- 開発者群:975206796
+
+### Telegram グループ
+
+<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>
+
+### Discord サーバー
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
 ## サポートされているメッセージプラットフォーム
 
 **公式メンテナンス**
@@ -201,24 +205,6 @@ pip install pre-commit
 pre-commit install
 ```
 
-## 🌍 コミュニティ
-
-### QQ グループ
-
-- 1群: 322154837
-- 3群: 630166526
-- 5群: 822130018
-- 6群: 753075035
-- 開発者群: 975206796
-
-### Telegram グループ
-
-<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>
-
-### Discord サーバー
-
-<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
 ## ❤️ Special Thanks
 
 AstrBot への貢献をしていただいたすべてのコントリビューターとプラグイン開発者に特別な感謝を ❤️

README_ru.md

@@ -1,248 +0,0 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
-
-</p>
-
-<div align="center">
-
-<br>
-
-<div>
-<a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-<a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-</div>
-
-<br>
-
-<div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
-<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>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20%D0%BF%D0%BB%D0%B0%D0%B3%D0%B8%D0%BD%D0%BE%D0%B2&style=for-the-badge&label=%D0%9C%D0%B0%D0%B3%D0%B0%D0%B7%D0%B8%D0%BD&cacheSeconds=3600">
-</div>
-
-<br>
-
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
-
-<a href="https://astrbot.app/">Документация</a> ｜
-<a href="https://blog.astrbot.app/">Блог</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">Дорожная карта</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/issues">Сообщить о проблеме</a>
-</div>
-
-AstrBot — это универсальная платформа Agent-чатботов с открытым исходным кодом, которая интегрируется с основными приложениями для обмена мгновенными сообщениями. Она предоставляет надёжную и масштабируемую инфраструктуру разговорного ИИ для частных лиц, разработчиков и команд. Будь то персональный ИИ-компаньон, интеллектуальная служба поддержки, автоматизированный помощник или корпоративная база знаний — AstrBot позволяет быстро создавать готовые к использованию ИИ-приложения в рабочих процессах вашей платформы обмена сообщениями.
-
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
-
-## Основные возможности
-
-1. 💯 Бесплатно и с открытым исходным кодом.
-2. ✨ ИИ-диалоги с LLM, мультимодальность, Agent, MCP, база знаний, настройки личности.
-3. 🤖 Поддержка интеграции с Dify, Alibaba Cloud Bailian, Coze и другими платформами агентов.
-4. 🌐 Мультиплатформенность: QQ, WeChat Work, Feishu, DingTalk, официальные аккаунты WeChat, Telegram, Slack и [другие](#поддерживаемые-платформы-обмена-сообщениями).
-5. 📦 Расширения плагинов с почти 800 плагинами, доступными для установки в один клик.
-6. 💻 Поддержка WebUI.
-7. 🌐 Поддержка интернационализации (i18n).
-
-## Быстрый старт
-
-#### Развёртывание Docker (Рекомендуется 🥳)
-
-Мы рекомендуем развёртывать AstrBot с помощью Docker или Docker Compose.
-
-См. официальную документацию: [Развёртывание AstrBot с Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
-
-#### Развёртывание uv
-
-```bash
-uvx astrbot
-```
-
-#### Развёртывание BT-Panel
-
-AstrBot в партнёрстве с BT-Panel теперь доступен на их маркетплейсе.
-
-См. официальную документацию: [Развёртывание BT-Panel](https://astrbot.app/deploy/astrbot/btpanel.html).
-
-#### Развёртывание 1Panel
-
-AstrBot официально размещён на маркетплейсе 1Panel.
-
-См. официальную документацию: [Развёртывание 1Panel](https://astrbot.app/deploy/astrbot/1panel.html).
-
-#### Развёртывание на RainYun
-
-AstrBot официально размещён на облачной платформе приложений RainYun с развёртыванием в один клик.
-
-[![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)
-
-#### Развёртывание на Replit
-
-Метод развёртывания от сообщества.
-
-[![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
-
-#### Установщик Windows в один клик
-
-См. официальную документацию: [Развёртывание AstrBot с установщиком Windows в один клик](https://astrbot.app/deploy/astrbot/windows.html).
-
-#### Развёртывание CasaOS
-
-Метод развёртывания от сообщества.
-
-См. официальную документацию: [Развёртывание CasaOS](https://astrbot.app/deploy/astrbot/casaos.html).
-
-#### Ручное развёртывание
-
-Сначала установите uv:
-
-```bash
-pip install uv
-```
-
-Установите AstrBot через Git Clone:
-
-```bash
-git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
-uv run main.py
-```
-
-Или см. официальную документацию: [Развёртывание AstrBot из исходного кода](https://astrbot.app/deploy/astrbot/cli.html).
-
-## Поддерживаемые платформы обмена сообщениями
-
-**Официально поддерживаемые**
-
-- QQ (Официальная платформа и OneBot)
-- Telegram
-- Приложение WeChat Work и интеллектуальный бот WeChat Work
-- Служба поддержки WeChat и официальные аккаунты WeChat
-- Feishu (Lark)
-- DingTalk
-- Slack
-- Discord
-- Satori
-- Misskey
-- WhatsApp (Скоро)
-- LINE (Скоро)
-
-**Поддерживаемые сообществом**
-
-- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
-- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
-- [Личные сообщения Bilibili](https://github.com/Hina-Chat/astrbot_plugin_bilibili_adapter)
-- [wxauto](https://github.com/luosheng520qaq/wxauto-repost-onebotv11)
-
-## Поддерживаемые сервисы моделей
-
-**Сервисы LLM**
-
-- OpenAI и совместимые сервисы
-- Anthropic
-- Google Gemini
-- Moonshot AI
-- Zhipu AI
-- DeepSeek
-- Ollama (Самостоятельное размещение)
-- LM Studio (Самостоятельное размещение)
-- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
-- [302.AI](https://share.302.ai/rr1M3l)
-- [TokenPony](https://www.tokenpony.cn/3YPyf)
-- [SiliconFlow](https://docs.siliconflow.cn/cn/usecases/use-siliconcloud-in-astrbot)
-- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE)
-- ModelScope
-- OneAPI
-
-**Платформы LLMOps**
-
-- Dify
-- Приложения Alibaba Cloud Bailian
-- Coze
-
-**Сервисы распознавания речи**
-
-- OpenAI Whisper
-- SenseVoice
-
-**Сервисы синтеза речи**
-
-- OpenAI TTS
-- Gemini TTS
-- GPT-Sovits-Inference
-- GPT-Sovits
-- FishAudio
-- Edge TTS
-- Alibaba Cloud Bailian TTS
-- Azure TTS
-- Minimax TTS
-- Volcano Engine TTS
-
-## ❤️ Вклад в проект
-
-Issues и Pull Request всегда приветствуются! Не стесняйтесь отправлять свои изменения в этот проект :)
-
-### Как внести вклад
-
-Вы можете внести вклад, просматривая issues или помогая с ревью pull request. Любые issues или PR приветствуются для поощрения участия сообщества. Конечно, это лишь предложения — вы можете вносить вклад любым удобным для вас способом. Для добавления новых функций сначала обсудите это через Issue.
-
-### Среда разработки
-
-AstrBot использует `ruff` для форматирования и линтинга кода.
-
-```bash
-git clone https://github.com/AstrBotDevs/AstrBot
-pip install pre-commit
-pre-commit install
-```
-
-## 🌍 Сообщество
-
-### Группы QQ
-
-- Группа 1: 322154837
-- Группа 3: 630166526
-- Группа 5: 822130018
-- Группа 6: 753075035
-- Группа разработчиков: 975206796
-
-### Группа Telegram
-
-<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>
-
-### Сервер Discord
-
-<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
-## ❤️ Особая благодарность
-
-Особая благодарность всем контрибьюторам и разработчикам плагинов за их вклад в AstrBot ❤️
-
-<a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
-</a>
-
-Кроме того, рождение этого проекта было бы невозможно без помощи следующих проектов с открытым исходным кодом:
-
-- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - Замечательный кошачий фреймворк
-
-## ⭐ История звёзд
-
-> [!TIP]
-> Если этот проект помог вам в жизни или работе, или если вас интересует его будущее развитие, пожалуйста, поставьте проекту звезду. Это движущая сила поддержки этого проекта с открытым исходным кодом <3
-
-<div align="center">
-
-[![Star History Chart](https://api.star-history.com/svg?repos=astrbotdevs/astrbot&type=Date)](https://star-history.com/#astrbotdevs/astrbot&Date)
-
-</div>
-
-</details>
-
-_私は、高性能ですから!_
-

README_zh-TW.md

@@ -1,248 +0,0 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
-
-</p>
-
-<div align="center">
-
-<br>
-
-<div>
-<a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-<a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-</div>
-
-<br>
-
-<div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
-<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>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E5%80%8B&style=for-the-badge&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%A0%B4&cacheSeconds=3600">
-</div>
-
-<br>
-
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">简体中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
-
-<a href="https://astrbot.app/">文件</a> ｜
-<a href="https://blog.astrbot.app/">Blog</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">路線圖</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/issues">問題回報</a>
-</div>
-
-AstrBot 是一個開源的一站式 Agent 聊天機器人平台，可接入主流即時通訊軟體，為個人、開發者和團隊打造可靠、可擴展的對話式智慧基礎設施。無論是個人 AI 夥伴、智慧客服、自動化助手，還是企業知識庫，AstrBot 都能在您的即時通訊軟體平台的工作流程中快速構建生產可用的 AI 應用程式。
-
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
-
-## 主要功能
-
-1. 💯 免費 & 開源。
-2. ✨ AI 大型模型對話，多模態，Agent，MCP，知識庫，人格設定。
-3. 🤖 支援接入 Dify、阿里雲百煉、Coze 等智慧體平台。
-4. 🌐 多平台：QQ、企業微信、飛書、釘釘、微信公眾號、Telegram、Slack 以及[更多](#支援的訊息平台)。
-5. 📦 外掛擴充，已有近 800 個外掛可一鍵安裝。
-6. 💻 WebUI 支援。
-7. 🌐 國際化（i18n）支援。
-
-## 快速開始
-
-#### Docker 部署（推薦 🥳）
-
-推薦使用 Docker / Docker Compose 方式部署 AstrBot。
-
-請參閱官方文件 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot)。
-
-#### uv 部署
-
-```bash
-uvx astrbot
-```
-
-#### 寶塔面板部署
-
-AstrBot 與寶塔面板合作，已上架至寶塔面板。
-
-請參閱官方文件 [寶塔面板部署](https://astrbot.app/deploy/astrbot/btpanel.html)。
-
-#### 1Panel 部署
-
-AstrBot 已由 1Panel 官方上架至 1Panel 面板。
-
-請參閱官方文件 [1Panel 部署](https://astrbot.app/deploy/astrbot/1panel.html)。
-
-#### 在雨雲上部署
-
-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)
-
-#### 在 Replit 上部署
-
-社群貢獻的部署方式。
-
-[![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
-
-#### Windows 一鍵安裝器部署
-
-請參閱官方文件 [使用 Windows 一鍵安裝器部署 AstrBot](https://astrbot.app/deploy/astrbot/windows.html)。
-
-#### CasaOS 部署
-
-社群貢獻的部署方式。
-
-請參閱官方文件 [CasaOS 部署](https://astrbot.app/deploy/astrbot/casaos.html)。
-
-#### 手動部署
-
-首先安裝 uv：
-
-```bash
-pip install uv
-```
-
-透過 Git Clone 安裝 AstrBot：
-
-```bash
-git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
-uv run main.py
-```
-
-或者請參閱官方文件 [透過原始碼部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html)。
-
-## 支援的訊息平台
-
-**官方維護**
-
-- QQ（官方平台 & OneBot）
-- Telegram
-- 企微應用 & 企微智慧機器人
-- 微信客服 & 微信公眾號
-- 飛書
-- 釘釘
-- Slack
-- Discord
-- Satori
-- Misskey
-- Whatsapp（即將支援）
-- LINE（即將支援）
-
-**社群維護**
-
-- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
-- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
-- [Bilibili 私訊](https://github.com/Hina-Chat/astrbot_plugin_bilibili_adapter)
-- [wxauto](https://github.com/luosheng520qaq/wxauto-repost-onebotv11)
-
-## 支援的模型服務
-
-**大型模型服務**
-
-- OpenAI 及相容服務
-- Anthropic
-- Google Gemini
-- Moonshot AI
-- 智譜 AI
-- DeepSeek
-- Ollama（本機部署）
-- LM Studio（本機部署）
-- [優雲智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
-- [302.AI](https://share.302.ai/rr1M3l)
-- [小馬算力](https://www.tokenpony.cn/3YPyf)
-- [矽基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot)
-- [PPIO 派歐雲](https://ppio.com/user/register?invited_by=AIOONE)
-- ModelScope
-- OneAPI
-
-**LLMOps 平台**
-
-- Dify
-- 阿里雲百煉應用
-- Coze
-
-**語音轉文字服務**
-
-- OpenAI Whisper
-- SenseVoice
-
-**文字轉語音服務**
-
-- OpenAI TTS
-- Gemini TTS
-- GPT-Sovits-Inference
-- GPT-Sovits
-- FishAudio
-- Edge TTS
-- 阿里雲百煉 TTS
-- Azure TTS
-- Minimax TTS
-- 火山引擎 TTS
-
-## ❤️ 貢獻
-
-歡迎任何 Issues/Pull Requests！只需要將您的變更提交到此專案 ：)
-
-### 如何貢獻
-
-您可以透過檢視問題或協助審核 PR（拉取請求）來貢獻。任何問題或 PR 都歡迎參與，以促進社群貢獻。當然，這些只是建議，您可以以任何方式進行貢獻。對於新功能的新增，請先透過 Issue 討論。
-
-### 開發環境
-
-AstrBot 使用 `ruff` 進行程式碼格式化和檢查。
-
-```bash
-git clone https://github.com/AstrBotDevs/AstrBot
-pip install pre-commit
-pre-commit install
-```
-
-## 🌍 社群
-
-### QQ 群組
-
-- 1 群：322154837
-- 3 群：630166526
-- 5 群：822130018
-- 6 群：753075035
-- 開發者群：975206796
-
-### Telegram 群組
-
-<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>
-
-### Discord 群組
-
-<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
-## ❤️ Special Thanks
-
-特別感謝所有 Contributors 和外掛開發者對 AstrBot 的貢獻 ❤️
-
-<a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
-</a>
-
-此外，本專案的誕生離不開以下開源專案的幫助：
-
-- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 偉大的貓貓框架
-
-## ⭐ Star History
-
-> [!TIP]
-> 如果本專案對您的生活 / 工作產生了幫助，或者您關注本專案的未來發展，請給專案 Star，這是我們維護這個開源專案的動力 <3
-
-<div align="center">
-
-[![Star History Chart](https://api.star-history.com/svg?repos=astrbotdevs/astrbot&type=Date)](https://star-history.com/#astrbotdevs/astrbot&Date)
-
-</div>
-
-</details>
-
-_私は、高性能ですから!_
-

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.10.0"
+__version__ = "3.5.23"

astrbot/core/agent/mcp_client.py

@@ -345,6 +345,9 @@ class MCPClient:
 
     async def cleanup(self):
         """Clean up resources including old exit stacks from reconnections"""
+        # Set running_event first to unblock any waiting tasks
+        self.running_event.set()
+
         # Close current exit stack
         try:
             await self.exit_stack.aclose()
@@ -356,9 +359,6 @@ class MCPClient:
         # Just clear the list to release references
         self._old_exit_stacks.clear()
 
-        # Set running_event first to unblock any waiting tasks
-        self.running_event.set()
-
 
 class MCPTool(FunctionTool, Generic[TContext]):
     """A function tool that calls an MCP service."""

astrbot/core/agent/message.py

@@ -3,7 +3,7 @@
 
 from typing import Any, ClassVar, Literal, cast
 
-from pydantic import BaseModel, GetCoreSchemaHandler, model_serializer, model_validator
+from pydantic import BaseModel, GetCoreSchemaHandler
 from pydantic_core import core_schema
 
 
@@ -122,12 +122,10 @@ class ToolCall(BaseModel):
     extra_content: dict[str, Any] | None = None
     """Extra metadata for the tool call."""
 
-    @model_serializer(mode="wrap")
-    def serialize(self, handler):
-        data = handler(self)
+    def model_dump(self, **kwargs: Any) -> dict[str, Any]:
         if self.extra_content is None:
-            data.pop("extra_content", None)
-        return data
+            kwargs.setdefault("exclude", set()).add("extra_content")
+        return super().model_dump(**kwargs)
 
 
 class ToolCallPart(BaseModel):
@@ -147,39 +145,22 @@ class Message(BaseModel):
         "tool",
     ]
 
-    content: str | list[ContentPart] | None = None
+    content: str | list[ContentPart]
     """The content of the message."""
 
-    tool_calls: list[ToolCall] | list[dict] | None = None
-    """The tool calls of the message."""
-
-    tool_call_id: str | None = None
-    """The ID of the tool call."""
-
-    @model_validator(mode="after")
-    def check_content_required(self):
-        # assistant + tool_calls is not None: allow content to be None
-        if self.role == "assistant" and self.tool_calls is not None:
-            return self
-
-        # other all cases: content is required
-        if self.content is None:
-            raise ValueError(
-                "content is required unless role='assistant' and tool_calls is not None"
-            )
-        return self
-
 
 class AssistantMessageSegment(Message):
     """A message segment from the assistant."""
 
     role: Literal["assistant"] = "assistant"
+    tool_calls: list[ToolCall] | list[dict] | None = None
 
 
 class ToolCallMessageSegment(Message):
     """A message segment representing a tool call."""
 
     role: Literal["tool"] = "tool"
+    tool_call_id: str
 
 
 class UserMessageSegment(Message):

astrbot/core/agent/response.py

@@ -1,8 +1,7 @@
 import typing as T
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 
 from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.provider.entities import TokenUsage
 
 
 class AgentResponseData(T.TypedDict):
@@ -13,23 +12,3 @@ class AgentResponseData(T.TypedDict):
 class AgentResponse:
     type: str
     data: AgentResponseData
-
-
-@dataclass
-class AgentStats:
-    token_usage: TokenUsage = field(default_factory=TokenUsage)
-    start_time: float = 0.0
-    end_time: float = 0.0
-    time_to_first_token: float = 0.0
-
-    @property
-    def duration(self) -> float:
-        return self.end_time - self.start_time
-
-    def to_dict(self) -> dict:
-        return {
-            "token_usage": self.token_usage.__dict__,
-            "start_time": self.start_time,
-            "end_time": self.end_time,
-            "time_to_first_token": self.time_to_first_token,
-        }

astrbot/core/agent/run_context.py

@@ -9,7 +9,7 @@ from .message import Message
 TContext = TypeVar("TContext", default=Any)
 
 
-@dataclass
+@dataclass(config={"arbitrary_types_allowed": True})
 class ContextWrapper(Generic[TContext]):
     """A context for running an agent, which can be used to pass additional data or state."""
 

astrbot/core/agent/runners/base.py

@@ -2,12 +2,13 @@ import abc
 import typing as T
 from enum import Enum, auto
 
-from astrbot import logger
+from astrbot.core.provider import Provider
 from astrbot.core.provider.entities import LLMResponse
 
 from ..hooks import BaseAgentRunHooks
 from ..response import AgentResponse
 from ..run_context import ContextWrapper, TContext
+from ..tool_executor import BaseFunctionToolExecutor
 
 
 class AgentState(Enum):
@@ -23,7 +24,9 @@ class BaseAgentRunner(T.Generic[TContext]):
     @abc.abstractmethod
     async def reset(
         self,
+        provider: Provider,
         run_context: ContextWrapper[TContext],
+        tool_executor: BaseFunctionToolExecutor[TContext],
         agent_hooks: BaseAgentRunHooks[TContext],
         **kwargs: T.Any,
     ) -> None:
@@ -57,9 +60,3 @@ class BaseAgentRunner(T.Generic[TContext]):
         This method should be called after the agent is done.
         """
         ...
-
-    def _transition_state(self, new_state: AgentState) -> None:
-        """Transition the agent state."""
-        if self._state != new_state:
-            logger.debug(f"Agent state transition: {self._state} -> {new_state}")
-            self._state = new_state

astrbot/core/agent/runners/coze/coze_agent_runner.py

@@ -1,367 +0,0 @@
-import base64
-import json
-import sys
-import typing as T
-
-import astrbot.core.message.components as Comp
-from astrbot import logger
-from astrbot.core import sp
-from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.provider.entities import (
-    LLMResponse,
-    ProviderRequest,
-)
-
-from ...hooks import BaseAgentRunHooks
-from ...response import AgentResponseData
-from ...run_context import ContextWrapper, TContext
-from ..base import AgentResponse, AgentState, BaseAgentRunner
-from .coze_api_client import CozeAPIClient
-
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
-
-class CozeAgentRunner(BaseAgentRunner[TContext]):
-    """Coze Agent Runner"""
-
-    @override
-    async def reset(
-        self,
-        request: ProviderRequest,
-        run_context: ContextWrapper[TContext],
-        agent_hooks: BaseAgentRunHooks[TContext],
-        provider_config: dict,
-        **kwargs: T.Any,
-    ) -> None:
-        self.req = request
-        self.streaming = kwargs.get("streaming", False)
-        self.final_llm_resp = None
-        self._state = AgentState.IDLE
-        self.agent_hooks = agent_hooks
-        self.run_context = run_context
-
-        self.api_key = provider_config.get("coze_api_key", "")
-        if not self.api_key:
-            raise Exception("Coze API Key 不能为空。")
-        self.bot_id = provider_config.get("bot_id", "")
-        if not self.bot_id:
-            raise Exception("Coze Bot ID 不能为空。")
-        self.api_base: str = provider_config.get("coze_api_base", "https://api.coze.cn")
-
-        if not isinstance(self.api_base, str) or not self.api_base.startswith(
-            ("http://", "https://"),
-        ):
-            raise Exception(
-                "Coze API Base URL 格式不正确，必须以 http:// 或 https:// 开头。",
-            )
-
-        self.timeout = provider_config.get("timeout", 120)
-        if isinstance(self.timeout, str):
-            self.timeout = int(self.timeout)
-        self.auto_save_history = provider_config.get("auto_save_history", True)
-
-        # 创建 API 客户端
-        self.api_client = CozeAPIClient(api_key=self.api_key, api_base=self.api_base)
-
-        # 会话相关缓存
-        self.file_id_cache: dict[str, dict[str, str]] = {}
-
-    @override
-    async def step(self):
-        """
-        执行 Coze Agent 的一个步骤
-        """
-        if not self.req:
-            raise ValueError("Request is not set. Please call reset() first.")
-
-        if self._state == AgentState.IDLE:
-            try:
-                await self.agent_hooks.on_agent_begin(self.run_context)
-            except Exception as e:
-                logger.error(f"Error in on_agent_begin hook: {e}", exc_info=True)
-
-        # 开始处理，转换到运行状态
-        self._transition_state(AgentState.RUNNING)
-
-        try:
-            # 执行 Coze 请求并处理结果
-            async for response in self._execute_coze_request():
-                yield response
-        except Exception as e:
-            logger.error(f"Coze 请求失败：{str(e)}")
-            self._transition_state(AgentState.ERROR)
-            self.final_llm_resp = LLMResponse(
-                role="err", completion_text=f"Coze 请求失败：{str(e)}"
-            )
-            yield AgentResponse(
-                type="err",
-                data=AgentResponseData(
-                    chain=MessageChain().message(f"Coze 请求失败：{str(e)}")
-                ),
-            )
-        finally:
-            await self.api_client.close()
-
-    @override
-    async def step_until_done(
-        self, max_step: int = 30
-    ) -> T.AsyncGenerator[AgentResponse, None]:
-        while not self.done():
-            async for resp in self.step():
-                yield resp
-
-    async def _execute_coze_request(self):
-        """执行 Coze 请求的核心逻辑"""
-        prompt = self.req.prompt or ""
-        session_id = self.req.session_id or "unknown"
-        image_urls = self.req.image_urls or []
-        contexts = self.req.contexts or []
-        system_prompt = self.req.system_prompt
-
-        # 用户ID参数
-        user_id = session_id
-
-        # 获取或创建会话ID
-        conversation_id = await sp.get_async(
-            scope="umo",
-            scope_id=user_id,
-            key="coze_conversation_id",
-            default="",
-        )
-
-        # 构建消息
-        additional_messages = []
-
-        if system_prompt:
-            if not self.auto_save_history or not conversation_id:
-                additional_messages.append(
-                    {
-                        "role": "system",
-                        "content": system_prompt,
-                        "content_type": "text",
-                    },
-                )
-
-        # 处理历史上下文
-        if not self.auto_save_history and contexts:
-            for ctx in contexts:
-                if isinstance(ctx, dict) and "role" in ctx and "content" in ctx:
-                    # 处理上下文中的图片
-                    content = ctx["content"]
-                    if isinstance(content, list):
-                        # 多模态内容，需要处理图片
-                        processed_content = []
-                        for item in content:
-                            if isinstance(item, dict):
-                                if item.get("type") == "text":
-                                    processed_content.append(item)
-                                elif item.get("type") == "image_url":
-                                    # 处理图片上传
-                                    try:
-                                        image_data = item.get("image_url", {})
-                                        url = image_data.get("url", "")
-                                        if url:
-                                            file_id = (
-                                                await self._download_and_upload_image(
-                                                    url, session_id
-                                                )
-                                            )
-                                            processed_content.append(
-                                                {
-                                                    "type": "file",
-                                                    "file_id": file_id,
-                                                    "file_url": url,
-                                                }
-                                            )
-                                    except Exception as e:
-                                        logger.warning(f"处理上下文图片失败: {e}")
-                                        continue
-
-                        if processed_content:
-                            additional_messages.append(
-                                {
-                                    "role": ctx["role"],
-                                    "content": processed_content,
-                                    "content_type": "object_string",
-                                }
-                            )
-                    else:
-                        # 纯文本内容
-                        additional_messages.append(
-                            {
-                                "role": ctx["role"],
-                                "content": content,
-                                "content_type": "text",
-                            }
-                        )
-
-        # 构建当前消息
-        if prompt or image_urls:
-            if image_urls:
-                # 多模态
-                object_string_content = []
-                if prompt:
-                    object_string_content.append({"type": "text", "text": prompt})
-
-                for url in image_urls:
-                    # the url is a base64 string
-                    try:
-                        image_data = base64.b64decode(url)
-                        file_id = await self.api_client.upload_file(image_data)
-                        object_string_content.append(
-                            {
-                                "type": "image",
-                                "file_id": file_id,
-                            }
-                        )
-                    except Exception as e:
-                        logger.warning(f"处理图片失败 {url}: {e}")
-                        continue
-
-                if object_string_content:
-                    content = json.dumps(object_string_content, ensure_ascii=False)
-                    additional_messages.append(
-                        {
-                            "role": "user",
-                            "content": content,
-                            "content_type": "object_string",
-                        }
-                    )
-            elif prompt:
-                # 纯文本
-                additional_messages.append(
-                    {
-                        "role": "user",
-                        "content": prompt,
-                        "content_type": "text",
-                    },
-                )
-
-        # 执行 Coze API 请求
-        accumulated_content = ""
-        message_started = False
-
-        async for chunk in self.api_client.chat_messages(
-            bot_id=self.bot_id,
-            user_id=user_id,
-            additional_messages=additional_messages,
-            conversation_id=conversation_id,
-            auto_save_history=self.auto_save_history,
-            stream=True,
-            timeout=self.timeout,
-        ):
-            event_type = chunk.get("event")
-            data = chunk.get("data", {})
-
-            if event_type == "conversation.chat.created":
-                if isinstance(data, dict) and "conversation_id" in data:
-                    await sp.put_async(
-                        scope="umo",
-                        scope_id=user_id,
-                        key="coze_conversation_id",
-                        value=data["conversation_id"],
-                    )
-
-            if event_type == "conversation.message.delta":
-                # 增量消息
-                content = data.get("content", "")
-                if not content and "delta" in data:
-                    content = data["delta"].get("content", "")
-                if not content and "text" in data:
-                    content = data.get("text", "")
-
-                if content:
-                    accumulated_content += content
-                    message_started = True
-
-                    # 如果是流式响应，发送增量数据
-                    if self.streaming:
-                        yield AgentResponse(
-                            type="streaming_delta",
-                            data=AgentResponseData(
-                                chain=MessageChain().message(content)
-                            ),
-                        )
-
-            elif event_type == "conversation.message.completed":
-                # 消息完成
-                logger.debug("Coze message completed")
-                message_started = True
-
-            elif event_type == "conversation.chat.completed":
-                # 对话完成
-                logger.debug("Coze chat completed")
-                break
-
-            elif event_type == "error":
-                # 错误处理
-                error_msg = data.get("msg", "未知错误")
-                error_code = data.get("code", "UNKNOWN")
-                logger.error(f"Coze 出现错误: {error_code} - {error_msg}")
-                raise Exception(f"Coze 出现错误: {error_code} - {error_msg}")
-
-        if not message_started and not accumulated_content:
-            logger.warning("Coze 未返回任何内容")
-            accumulated_content = ""
-
-        # 创建最终响应
-        chain = MessageChain(chain=[Comp.Plain(accumulated_content)])
-        self.final_llm_resp = LLMResponse(role="assistant", result_chain=chain)
-        self._transition_state(AgentState.DONE)
-
-        try:
-            await self.agent_hooks.on_agent_done(self.run_context, self.final_llm_resp)
-        except Exception as e:
-            logger.error(f"Error in on_agent_done hook: {e}", exc_info=True)
-
-        # 返回最终结果
-        yield AgentResponse(
-            type="llm_result",
-            data=AgentResponseData(chain=chain),
-        )
-
-    async def _download_and_upload_image(
-        self,
-        image_url: str,
-        session_id: str | None = None,
-    ) -> str:
-        """下载图片并上传到 Coze，返回 file_id"""
-        import hashlib
-
-        # 计算哈希实现缓存
-        cache_key = hashlib.md5(image_url.encode("utf-8")).hexdigest()
-
-        if session_id:
-            if session_id not in self.file_id_cache:
-                self.file_id_cache[session_id] = {}
-
-            if cache_key in self.file_id_cache[session_id]:
-                file_id = self.file_id_cache[session_id][cache_key]
-                logger.debug(f"[Coze] 使用缓存的 file_id: {file_id}")
-                return file_id
-
-        try:
-            image_data = await self.api_client.download_image(image_url)
-            file_id = await self.api_client.upload_file(image_data)
-
-            if session_id:
-                self.file_id_cache[session_id][cache_key] = file_id
-                logger.debug(f"[Coze] 图片上传成功并缓存，file_id: {file_id}")
-
-            return file_id
-
-        except Exception as e:
-            logger.error(f"处理图片失败 {image_url}: {e!s}")
-            raise Exception(f"处理图片失败: {e!s}")
-
-    @override
-    def done(self) -> bool:
-        """检查 Agent 是否已完成工作"""
-        return self._state in (AgentState.DONE, AgentState.ERROR)
-
-    @override
-    def get_final_llm_resp(self) -> LLMResponse | None:
-        return self.final_llm_resp

astrbot/core/agent/runners/dashscope/dashscope_agent_runner.py

@@ -1,403 +0,0 @@
-import asyncio
-import functools
-import queue
-import re
-import sys
-import threading
-import typing as T
-
-from dashscope import Application
-from dashscope.app.application_response import ApplicationResponse
-
-import astrbot.core.message.components as Comp
-from astrbot.core import logger, sp
-from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.provider.entities import (
-    LLMResponse,
-    ProviderRequest,
-)
-
-from ...hooks import BaseAgentRunHooks
-from ...response import AgentResponseData
-from ...run_context import ContextWrapper, TContext
-from ..base import AgentResponse, AgentState, BaseAgentRunner
-
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
-
-class DashscopeAgentRunner(BaseAgentRunner[TContext]):
-    """Dashscope Agent Runner"""
-
-    @override
-    async def reset(
-        self,
-        request: ProviderRequest,
-        run_context: ContextWrapper[TContext],
-        agent_hooks: BaseAgentRunHooks[TContext],
-        provider_config: dict,
-        **kwargs: T.Any,
-    ) -> None:
-        self.req = request
-        self.streaming = kwargs.get("streaming", False)
-        self.final_llm_resp = None
-        self._state = AgentState.IDLE
-        self.agent_hooks = agent_hooks
-        self.run_context = run_context
-
-        self.api_key = provider_config.get("dashscope_api_key", "")
-        if not self.api_key:
-            raise Exception("阿里云百炼 API Key 不能为空。")
-        self.app_id = provider_config.get("dashscope_app_id", "")
-        if not self.app_id:
-            raise Exception("阿里云百炼 APP ID 不能为空。")
-        self.dashscope_app_type = provider_config.get("dashscope_app_type", "")
-        if not self.dashscope_app_type:
-            raise Exception("阿里云百炼 APP 类型不能为空。")
-
-        self.variables: dict = provider_config.get("variables", {}) or {}
-        self.rag_options: dict = provider_config.get("rag_options", {})
-        self.output_reference = self.rag_options.get("output_reference", False)
-        self.rag_options = self.rag_options.copy()
-        self.rag_options.pop("output_reference", None)
-
-        self.timeout = provider_config.get("timeout", 120)
-        if isinstance(self.timeout, str):
-            self.timeout = int(self.timeout)
-
-    def has_rag_options(self):
-        """判断是否有 RAG 选项
-
-        Returns:
-            bool: 是否有 RAG 选项
-
-        """
-        if self.rag_options and (
-            len(self.rag_options.get("pipeline_ids", [])) > 0
-            or len(self.rag_options.get("file_ids", [])) > 0
-        ):
-            return True
-        return False
-
-    @override
-    async def step(self):
-        """
-        执行 Dashscope Agent 的一个步骤
-        """
-        if not self.req:
-            raise ValueError("Request is not set. Please call reset() first.")
-
-        if self._state == AgentState.IDLE:
-            try:
-                await self.agent_hooks.on_agent_begin(self.run_context)
-            except Exception as e:
-                logger.error(f"Error in on_agent_begin hook: {e}", exc_info=True)
-
-        # 开始处理，转换到运行状态
-        self._transition_state(AgentState.RUNNING)
-
-        try:
-            # 执行 Dashscope 请求并处理结果
-            async for response in self._execute_dashscope_request():
-                yield response
-        except Exception as e:
-            logger.error(f"阿里云百炼请求失败：{str(e)}")
-            self._transition_state(AgentState.ERROR)
-            self.final_llm_resp = LLMResponse(
-                role="err", completion_text=f"阿里云百炼请求失败：{str(e)}"
-            )
-            yield AgentResponse(
-                type="err",
-                data=AgentResponseData(
-                    chain=MessageChain().message(f"阿里云百炼请求失败：{str(e)}")
-                ),
-            )
-
-    @override
-    async def step_until_done(
-        self, max_step: int = 30
-    ) -> T.AsyncGenerator[AgentResponse, None]:
-        while not self.done():
-            async for resp in self.step():
-                yield resp
-
-    def _consume_sync_generator(
-        self, response: T.Any, response_queue: queue.Queue
-    ) -> None:
-        """在线程中消费同步generator,将结果放入队列
-
-        Args:
-            response: 同步generator对象
-            response_queue: 用于传递数据的队列
-
-        """
-        try:
-            if self.streaming:
-                for chunk in response:
-                    response_queue.put(("data", chunk))
-            else:
-                response_queue.put(("data", response))
-        except Exception as e:
-            response_queue.put(("error", e))
-        finally:
-            response_queue.put(("done", None))
-
-    async def _process_stream_chunk(
-        self, chunk: ApplicationResponse, output_text: str
-    ) -> tuple[str, list | None, AgentResponse | None]:
-        """处理流式响应的单个chunk
-
-        Args:
-            chunk: Dashscope响应chunk
-            output_text: 当前累积的输出文本
-
-        Returns:
-            (更新后的output_text, doc_references, AgentResponse或None)
-
-        """
-        logger.debug(f"dashscope stream chunk: {chunk}")
-
-        if chunk.status_code != 200:
-            logger.error(
-                f"阿里云百炼请求失败: request_id={chunk.request_id}, code={chunk.status_code}, message={chunk.message}, 请参考文档：https://help.aliyun.com/zh/model-studio/developer-reference/error-code",
-            )
-            self._transition_state(AgentState.ERROR)
-            error_msg = (
-                f"阿里云百炼请求失败: message={chunk.message} code={chunk.status_code}"
-            )
-            self.final_llm_resp = LLMResponse(
-                role="err",
-                result_chain=MessageChain().message(error_msg),
-            )
-            return (
-                output_text,
-                None,
-                AgentResponse(
-                    type="err",
-                    data=AgentResponseData(chain=MessageChain().message(error_msg)),
-                ),
-            )
-
-        chunk_text = chunk.output.get("text", "") or ""
-        # RAG 引用脚标格式化
-        chunk_text = re.sub(r"<ref>\[(\d+)\]</ref>", r"[\1]", chunk_text)
-
-        response = None
-        if chunk_text:
-            output_text += chunk_text
-            response = AgentResponse(
-                type="streaming_delta",
-                data=AgentResponseData(chain=MessageChain().message(chunk_text)),
-            )
-
-        # 获取文档引用
-        doc_references = chunk.output.get("doc_references", None)
-
-        return output_text, doc_references, response
-
-    def _format_doc_references(self, doc_references: list) -> str:
-        """格式化文档引用为文本
-
-        Args:
-            doc_references: 文档引用列表
-
-        Returns:
-            格式化后的引用文本
-
-        """
-        ref_parts = []
-        for ref in doc_references:
-            ref_title = (
-                ref.get("title", "") if ref.get("title") else ref.get("doc_name", "")
-            )
-            ref_parts.append(f"{ref['index_id']}. {ref_title}\n")
-        ref_str = "".join(ref_parts)
-        return f"\n\n回答来源:\n{ref_str}"
-
-    async def _build_request_payload(
-        self, prompt: str, session_id: str, contexts: list, system_prompt: str
-    ) -> dict:
-        """构建请求payload
-
-        Args:
-            prompt: 用户输入
-            session_id: 会话ID
-            contexts: 上下文列表
-            system_prompt: 系统提示词
-
-        Returns:
-            请求payload字典
-
-        """
-        conversation_id = await sp.get_async(
-            scope="umo",
-            scope_id=session_id,
-            key="dashscope_conversation_id",
-            default="",
-        )
-        # 获得会话变量
-        payload_vars = self.variables.copy()
-        session_var = await sp.get_async(
-            scope="umo",
-            scope_id=session_id,
-            key="session_variables",
-            default={},
-        )
-        payload_vars.update(session_var)
-
-        if (
-            self.dashscope_app_type in ["agent", "dialog-workflow"]
-            and not self.has_rag_options()
-        ):
-            # 支持多轮对话的
-            p = {
-                "app_id": self.app_id,
-                "api_key": self.api_key,
-                "prompt": prompt,
-                "biz_params": payload_vars or None,
-                "stream": self.streaming,
-                "incremental_output": True,
-            }
-            if conversation_id:
-                p["session_id"] = conversation_id
-            return p
-        else:
-            # 不支持多轮对话的
-            payload = {
-                "app_id": self.app_id,
-                "prompt": prompt,
-                "api_key": self.api_key,
-                "biz_params": payload_vars or None,
-                "stream": self.streaming,
-                "incremental_output": True,
-            }
-            if self.rag_options:
-                payload["rag_options"] = self.rag_options
-            return payload
-
-    async def _handle_streaming_response(
-        self, response: T.Any, session_id: str
-    ) -> T.AsyncGenerator[AgentResponse, None]:
-        """处理流式响应
-
-        Args:
-            response: Dashscope 流式响应 generator
-
-        Yields:
-            AgentResponse 对象
-
-        """
-        response_queue = queue.Queue()
-        consumer_thread = threading.Thread(
-            target=self._consume_sync_generator,
-            args=(response, response_queue),
-            daemon=True,
-        )
-        consumer_thread.start()
-
-        output_text = ""
-        doc_references = None
-
-        while True:
-            try:
-                item_type, item_data = await asyncio.get_event_loop().run_in_executor(
-                    None, response_queue.get, True, 1
-                )
-            except queue.Empty:
-                continue
-
-            if item_type == "done":
-                break
-            elif item_type == "error":
-                raise item_data
-            elif item_type == "data":
-                chunk = item_data
-                assert isinstance(chunk, ApplicationResponse)
-
-                (
-                    output_text,
-                    chunk_doc_refs,
-                    response,
-                ) = await self._process_stream_chunk(chunk, output_text)
-
-                if response:
-                    if response.type == "err":
-                        yield response
-                        return
-                    yield response
-
-                if chunk_doc_refs:
-                    doc_references = chunk_doc_refs
-
-                if chunk.output.session_id:
-                    await sp.put_async(
-                        scope="umo",
-                        scope_id=session_id,
-                        key="dashscope_conversation_id",
-                        value=chunk.output.session_id,
-                    )
-
-        # 添加 RAG 引用
-        if self.output_reference and doc_references:
-            ref_text = self._format_doc_references(doc_references)
-            output_text += ref_text
-
-            if self.streaming:
-                yield AgentResponse(
-                    type="streaming_delta",
-                    data=AgentResponseData(chain=MessageChain().message(ref_text)),
-                )
-
-        # 创建最终响应
-        chain = MessageChain(chain=[Comp.Plain(output_text)])
-        self.final_llm_resp = LLMResponse(role="assistant", result_chain=chain)
-        self._transition_state(AgentState.DONE)
-
-        try:
-            await self.agent_hooks.on_agent_done(self.run_context, self.final_llm_resp)
-        except Exception as e:
-            logger.error(f"Error in on_agent_done hook: {e}", exc_info=True)
-
-        # 返回最终结果
-        yield AgentResponse(
-            type="llm_result",
-            data=AgentResponseData(chain=chain),
-        )
-
-    async def _execute_dashscope_request(self):
-        """执行 Dashscope 请求的核心逻辑"""
-        prompt = self.req.prompt or ""
-        session_id = self.req.session_id or "unknown"
-        image_urls = self.req.image_urls or []
-        contexts = self.req.contexts or []
-        system_prompt = self.req.system_prompt
-
-        # 检查图片输入
-        if image_urls:
-            logger.warning("阿里云百炼暂不支持图片输入，将自动忽略图片内容。")
-
-        # 构建请求payload
-        payload = await self._build_request_payload(
-            prompt, session_id, contexts, system_prompt
-        )
-
-        if not self.streaming:
-            payload["incremental_output"] = False
-
-        # 发起请求
-        partial = functools.partial(Application.call, **payload)
-        response = await asyncio.get_event_loop().run_in_executor(None, partial)
-
-        async for resp in self._handle_streaming_response(response, session_id):
-            yield resp
-
-    @override
-    def done(self) -> bool:
-        """检查 Agent 是否已完成工作"""
-        return self._state in (AgentState.DONE, AgentState.ERROR)
-
-    @override
-    def get_final_llm_resp(self) -> LLMResponse | None:
-        return self.final_llm_resp

astrbot/core/agent/runners/dify/dify_agent_runner.py

@@ -1,336 +0,0 @@
-import base64
-import os
-import sys
-import typing as T
-
-import astrbot.core.message.components as Comp
-from astrbot.core import logger, sp
-from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.provider.entities import (
-    LLMResponse,
-    ProviderRequest,
-)
-from astrbot.core.utils.astrbot_path import get_astrbot_data_path
-from astrbot.core.utils.io import download_file
-
-from ...hooks import BaseAgentRunHooks
-from ...response import AgentResponseData
-from ...run_context import ContextWrapper, TContext
-from ..base import AgentResponse, AgentState, BaseAgentRunner
-from .dify_api_client import DifyAPIClient
-
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
-
-class DifyAgentRunner(BaseAgentRunner[TContext]):
-    """Dify Agent Runner"""
-
-    @override
-    async def reset(
-        self,
-        request: ProviderRequest,
-        run_context: ContextWrapper[TContext],
-        agent_hooks: BaseAgentRunHooks[TContext],
-        provider_config: dict,
-        **kwargs: T.Any,
-    ) -> None:
-        self.req = request
-        self.streaming = kwargs.get("streaming", False)
-        self.final_llm_resp = None
-        self._state = AgentState.IDLE
-        self.agent_hooks = agent_hooks
-        self.run_context = run_context
-
-        self.api_key = provider_config.get("dify_api_key", "")
-        self.api_base = provider_config.get("dify_api_base", "https://api.dify.ai/v1")
-        self.api_type = provider_config.get("dify_api_type", "chat")
-        self.workflow_output_key = provider_config.get(
-            "dify_workflow_output_key",
-            "astrbot_wf_output",
-        )
-        self.dify_query_input_key = provider_config.get(
-            "dify_query_input_key",
-            "astrbot_text_query",
-        )
-        self.variables: dict = provider_config.get("variables", {}) or {}
-        self.timeout = provider_config.get("timeout", 60)
-        if isinstance(self.timeout, str):
-            self.timeout = int(self.timeout)
-
-        self.api_client = DifyAPIClient(self.api_key, self.api_base)
-
-    @override
-    async def step(self):
-        """
-        执行 Dify Agent 的一个步骤
-        """
-        if not self.req:
-            raise ValueError("Request is not set. Please call reset() first.")
-
-        if self._state == AgentState.IDLE:
-            try:
-                await self.agent_hooks.on_agent_begin(self.run_context)
-            except Exception as e:
-                logger.error(f"Error in on_agent_begin hook: {e}", exc_info=True)
-
-        # 开始处理，转换到运行状态
-        self._transition_state(AgentState.RUNNING)
-
-        try:
-            # 执行 Dify 请求并处理结果
-            async for response in self._execute_dify_request():
-                yield response
-        except Exception as e:
-            logger.error(f"Dify 请求失败：{str(e)}")
-            self._transition_state(AgentState.ERROR)
-            self.final_llm_resp = LLMResponse(
-                role="err", completion_text=f"Dify 请求失败：{str(e)}"
-            )
-            yield AgentResponse(
-                type="err",
-                data=AgentResponseData(
-                    chain=MessageChain().message(f"Dify 请求失败：{str(e)}")
-                ),
-            )
-        finally:
-            await self.api_client.close()
-
-    @override
-    async def step_until_done(
-        self, max_step: int = 30
-    ) -> T.AsyncGenerator[AgentResponse, None]:
-        while not self.done():
-            async for resp in self.step():
-                yield resp
-
-    async def _execute_dify_request(self):
-        """执行 Dify 请求的核心逻辑"""
-        prompt = self.req.prompt or ""
-        session_id = self.req.session_id or "unknown"
-        image_urls = self.req.image_urls or []
-        system_prompt = self.req.system_prompt
-
-        conversation_id = await sp.get_async(
-            scope="umo",
-            scope_id=session_id,
-            key="dify_conversation_id",
-            default="",
-        )
-        result = ""
-
-        # 处理图片上传
-        files_payload = []
-        for image_url in image_urls:
-            # image_url is a base64 string
-            try:
-                image_data = base64.b64decode(image_url)
-                file_response = await self.api_client.file_upload(
-                    file_data=image_data,
-                    user=session_id,
-                    mime_type="image/png",
-                    file_name="image.png",
-                )
-                logger.debug(f"Dify 上传图片响应：{file_response}")
-                if "id" not in file_response:
-                    logger.warning(
-                        f"上传图片后得到未知的 Dify 响应：{file_response}，图片将忽略。"
-                    )
-                    continue
-                files_payload.append(
-                    {
-                        "type": "image",
-                        "transfer_method": "local_file",
-                        "upload_file_id": file_response["id"],
-                    }
-                )
-            except Exception as e:
-                logger.warning(f"上传图片失败：{e}")
-                continue
-
-        # 获得会话变量
-        payload_vars = self.variables.copy()
-        # 动态变量
-        session_var = await sp.get_async(
-            scope="umo",
-            scope_id=session_id,
-            key="session_variables",
-            default={},
-        )
-        payload_vars.update(session_var)
-        payload_vars["system_prompt"] = system_prompt
-
-        # 处理不同的 API 类型
-        match self.api_type:
-            case "chat" | "agent" | "chatflow":
-                if not prompt:
-                    prompt = "请描述这张图片。"
-
-                async for chunk in self.api_client.chat_messages(
-                    inputs={
-                        **payload_vars,
-                    },
-                    query=prompt,
-                    user=session_id,
-                    conversation_id=conversation_id,
-                    files=files_payload,
-                    timeout=self.timeout,
-                ):
-                    logger.debug(f"dify resp chunk: {chunk}")
-                    if chunk["event"] == "message" or chunk["event"] == "agent_message":
-                        result += chunk["answer"]
-                        if not conversation_id:
-                            await sp.put_async(
-                                scope="umo",
-                                scope_id=session_id,
-                                key="dify_conversation_id",
-                                value=chunk["conversation_id"],
-                            )
-                            conversation_id = chunk["conversation_id"]
-
-                        # 如果是流式响应，发送增量数据
-                        if self.streaming and chunk["answer"]:
-                            yield AgentResponse(
-                                type="streaming_delta",
-                                data=AgentResponseData(
-                                    chain=MessageChain().message(chunk["answer"])
-                                ),
-                            )
-                    elif chunk["event"] == "message_end":
-                        logger.debug("Dify message end")
-                        break
-                    elif chunk["event"] == "error":
-                        logger.error(f"Dify 出现错误：{chunk}")
-                        raise Exception(
-                            f"Dify 出现错误 status: {chunk['status']} message: {chunk['message']}"
-                        )
-
-            case "workflow":
-                async for chunk in self.api_client.workflow_run(
-                    inputs={
-                        self.dify_query_input_key: prompt,
-                        "astrbot_session_id": session_id,
-                        **payload_vars,
-                    },
-                    user=session_id,
-                    files=files_payload,
-                    timeout=self.timeout,
-                ):
-                    logger.debug(f"dify workflow resp chunk: {chunk}")
-                    match chunk["event"]:
-                        case "workflow_started":
-                            logger.info(
-                                f"Dify 工作流(ID: {chunk['workflow_run_id']})开始运行。"
-                            )
-                        case "node_finished":
-                            logger.debug(
-                                f"Dify 工作流节点(ID: {chunk['data']['node_id']} Title: {chunk['data'].get('title', '')})运行结束。"
-                            )
-                        case "text_chunk":
-                            if self.streaming and chunk["data"]["text"]:
-                                yield AgentResponse(
-                                    type="streaming_delta",
-                                    data=AgentResponseData(
-                                        chain=MessageChain().message(
-                                            chunk["data"]["text"]
-                                        )
-                                    ),
-                                )
-                        case "workflow_finished":
-                            logger.info(
-                                f"Dify 工作流(ID: {chunk['workflow_run_id']})运行结束"
-                            )
-                            logger.debug(f"Dify 工作流结果：{chunk}")
-                            if chunk["data"]["error"]:
-                                logger.error(
-                                    f"Dify 工作流出现错误：{chunk['data']['error']}"
-                                )
-                                raise Exception(
-                                    f"Dify 工作流出现错误：{chunk['data']['error']}"
-                                )
-                            if self.workflow_output_key not in chunk["data"]["outputs"]:
-                                raise Exception(
-                                    f"Dify 工作流的输出不包含指定的键名：{self.workflow_output_key}"
-                                )
-                            result = chunk
-            case _:
-                raise Exception(f"未知的 Dify API 类型：{self.api_type}")
-
-        if not result:
-            logger.warning("Dify 请求结果为空，请查看 Debug 日志。")
-
-        # 解析结果
-        chain = await self.parse_dify_result(result)
-
-        # 创建最终响应
-        self.final_llm_resp = LLMResponse(role="assistant", result_chain=chain)
-        self._transition_state(AgentState.DONE)
-
-        try:
-            await self.agent_hooks.on_agent_done(self.run_context, self.final_llm_resp)
-        except Exception as e:
-            logger.error(f"Error in on_agent_done hook: {e}", exc_info=True)
-
-        # 返回最终结果
-        yield AgentResponse(
-            type="llm_result",
-            data=AgentResponseData(chain=chain),
-        )
-
-    async def parse_dify_result(self, chunk: dict | str) -> MessageChain:
-        """解析 Dify 的响应结果"""
-        if isinstance(chunk, str):
-            # Chat
-            return MessageChain(chain=[Comp.Plain(chunk)])
-
-        async def parse_file(item: dict):
-            match item["type"]:
-                case "image":
-                    return Comp.Image(file=item["url"], url=item["url"])
-                case "audio":
-                    # 仅支持 wav
-                    temp_dir = os.path.join(get_astrbot_data_path(), "temp")
-                    path = os.path.join(temp_dir, f"{item['filename']}.wav")
-                    await download_file(item["url"], path)
-                    return Comp.Image(file=item["url"], url=item["url"])
-                case "video":
-                    return Comp.Video(file=item["url"])
-                case _:
-                    return Comp.File(name=item["filename"], file=item["url"])
-
-        output = chunk["data"]["outputs"][self.workflow_output_key]
-        chains = []
-        if isinstance(output, str):
-            # 纯文本输出
-            chains.append(Comp.Plain(output))
-        elif isinstance(output, list):
-            # 主要适配 Dify 的 HTTP 请求结点的多模态输出
-            for item in output:
-                # handle Array[File]
-                if (
-                    not isinstance(item, dict)
-                    or item.get("dify_model_identity", "") != "__dify__file__"
-                ):
-                    chains.append(Comp.Plain(str(output)))
-                    break
-        else:
-            chains.append(Comp.Plain(str(output)))
-
-        # scan file
-        files = chunk["data"].get("files", [])
-        for item in files:
-            comp = await parse_file(item)
-            chains.append(comp)
-
-        return MessageChain(chain=chains)
-
-    @override
-    def done(self) -> bool:
-        """检查 Agent 是否已完成工作"""
-        return self._state in (AgentState.DONE, AgentState.ERROR)
-
-    @override
-    def get_final_llm_resp(self) -> LLMResponse | None:
-        return self.final_llm_resp

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -1,5 +1,4 @@
 import sys
-import time
 import traceback
 import typing as T
 
@@ -13,7 +12,6 @@ from mcp.types import (
 )
 
 from astrbot import logger
-from astrbot.core.message.components import Json
 from astrbot.core.message.message_event_result import (
     MessageChain,
 )
@@ -26,7 +24,7 @@ from astrbot.core.provider.provider import Provider
 
 from ..hooks import BaseAgentRunHooks
 from ..message import AssistantMessageSegment, Message, ToolCallMessageSegment
-from ..response import AgentResponseData, AgentStats
+from ..response import AgentResponseData
 from ..run_context import ContextWrapper, TContext
 from ..tool_executor import BaseFunctionToolExecutor
 from .base import AgentResponse, AgentState, BaseAgentRunner
@@ -71,24 +69,20 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             )
         self.run_context.messages = messages
 
-        self.stats = AgentStats()
-        self.stats.start_time = time.time()
+    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."""
-        payload = {
-            "contexts": self.run_context.messages,
-            "func_tool": self.req.func_tool,
-            "model": self.req.model,  # NOTE: in fact, this arg is None in most cases
-            "session_id": self.req.session_id,
-        }
-
         if self.streaming:
-            stream = self.provider.text_chat_stream(**payload)
+            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(**payload)
+            yield await self.provider.text_chat(**self.req.__dict__)
 
     @override
     async def step(self):
@@ -109,11 +103,8 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         llm_resp_result = None
 
         async for llm_response in self._iter_llm_responses():
+            assert isinstance(llm_response, LLMResponse)
             if llm_response.is_chunk:
-                # update ttft
-                if self.stats.time_to_first_token == 0:
-                    self.stats.time_to_first_token = time.time() - self.stats.start_time
-
                 if llm_response.result_chain:
                     yield AgentResponse(
                         type="streaming_delta",
@@ -137,10 +128,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                     )
                 continue
             llm_resp_result = llm_response
-
-            if not llm_response.is_chunk and llm_response.usage:
-                # only count the token usage of the final response for computation purpose
-                self.stats.token_usage += llm_response.usage
             break  # got final response
 
         if not llm_resp_result:
@@ -152,7 +139,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         if llm_resp.role == "err":
             # 如果 LLM 响应错误，转换到错误状态
             self.final_llm_resp = llm_resp
-            self.stats.end_time = time.time()
             self._transition_state(AgentState.ERROR)
             yield AgentResponse(
                 type="err",
@@ -167,12 +153,11 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             # 如果没有工具调用，转换到完成状态
             self.final_llm_resp = llm_resp
             self._transition_state(AgentState.DONE)
-            self.stats.end_time = time.time()
             # record the final assistant message
             self.run_context.messages.append(
                 Message(
                     role="assistant",
-                    content=llm_resp.completion_text or "*No response*",
+                    content=llm_resp.completion_text or "",
                 ),
             )
             try:
@@ -197,19 +182,22 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         # 如果有工具调用，还需处理工具调用
         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(type="tool_call").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):
-                    if result.type is None:
-                        # should not happen
-                        continue
-                    if result.type == "tool_direct_result":
-                        ar_type = "tool_call_result"
-                    else:
-                        ar_type = result.type
+                    result.type = "tool_call_result"
                     yield AgentResponse(
-                        type=ar_type,
+                        type="tool_call_result",
                         data=AgentResponseData(chain=result),
                     )
             # 将结果添加到上下文中
@@ -237,25 +225,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             async for resp in self.step():
                 yield resp
 
-        #  如果循环结束了但是 agent 还没有完成，说明是达到了 max_step
-        if not self.done():
-            logger.warning(
-                f"Agent reached max steps ({max_step}), forcing a final response."
-            )
-            # 拔掉所有工具
-            if self.req:
-                self.req.func_tool = None
-            # 注入提示词
-            self.run_context.messages.append(
-                Message(
-                    role="user",
-                    content="工具调用次数已达到上限，请停止使用工具，并根据已经收集到的信息，对你的任务和发现进行总结，然后直接回复用户。",
-                )
-            )
-            # 再执行最后一步
-            async for resp in self.step():
-                yield resp
-
     async def _handle_function_tools(
         self,
         req: ProviderRequest,
@@ -271,19 +240,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             llm_response.tools_call_args,
             llm_response.tools_call_ids,
         ):
-            yield MessageChain(
-                type="tool_call",
-                chain=[
-                    Json(
-                        data={
-                            "id": func_tool_id,
-                            "name": func_tool_name,
-                            "args": func_tool_args,
-                            "ts": time.time(),
-                        }
-                    )
-                ],
-            )
             try:
                 if not req.func_tool:
                     return
@@ -357,6 +313,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                                     content=res.content[0].text,
                                 ),
                             )
+                            yield MessageChain().message(res.content[0].text)
                         elif isinstance(res.content[0], ImageContent):
                             tool_call_result_blocks.append(
                                 ToolCallMessageSegment(
@@ -378,6 +335,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                                         content=resource.text,
                                     ),
                                 )
+                                yield MessageChain().message(resource.text)
                             elif (
                                 isinstance(resource, BlobResourceContents)
                                 and resource.mimeType
@@ -401,34 +359,20 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                                         content="返回的数据类型不受支持",
                                     ),
                                 )
+                                yield MessageChain().message("返回的数据类型不受支持。")
 
                     elif resp is None:
                         # Tool 直接请求发送消息给用户
                         # 这里我们将直接结束 Agent Loop。
                         # 发送消息逻辑在 ToolExecutor 中处理了。
                         logger.warning(
-                            f"{func_tool_name} 没有没有返回值或者将结果直接发送给用户。"
+                            f"{func_tool_name} 没有没有返回值或者将结果直接发送给用户，此工具调用不会被记录到历史中。"
                         )
                         self._transition_state(AgentState.DONE)
-                        self.stats.end_time = time.time()
-                        tool_call_result_blocks.append(
-                            ToolCallMessageSegment(
-                                role="tool",
-                                tool_call_id=func_tool_id,
-                                content="*工具没有返回值或者将结果直接发送给了用户*",
-                            ),
-                        )
                     else:
                         # 不应该出现其他类型
                         logger.warning(
-                            f"Tool 返回了不支持的类型: {type(resp)}。",
-                        )
-                        tool_call_result_blocks.append(
-                            ToolCallMessageSegment(
-                                role="tool",
-                                tool_call_id=func_tool_id,
-                                content="*工具返回了不支持的类型，请告诉用户检查这个工具的定义和实现。*",
-                            ),
+                            f"Tool 返回了不支持的类型: {type(resp)}，将忽略。",
                         )
 
                 try:
@@ -450,22 +394,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                     ),
                 )
 
-        # yield the last tool call result
-        if tool_call_result_blocks:
-            last_tcr_content = str(tool_call_result_blocks[-1].content)
-            yield MessageChain(
-                type="tool_call_result",
-                chain=[
-                    Json(
-                        data={
-                            "id": func_tool_id,
-                            "ts": time.time(),
-                            "result": last_tcr_content,
-                        }
-                    )
-                ],
-            )
-
         # 处理函数调用响应
         if tool_call_result_blocks:
             yield tool_call_result_blocks

astrbot/core/agent/tool.py

@@ -1,4 +1,4 @@
-from collections.abc import AsyncGenerator, Awaitable, Callable
+from collections.abc import Awaitable, Callable
 from typing import Any, Generic
 
 import jsonschema
@@ -7,8 +7,6 @@ from deprecated import deprecated
 from pydantic import Field, model_validator
 from pydantic.dataclasses import dataclass
 
-from astrbot.core.message.message_event_result import MessageEventResult
-
 from .run_context import ContextWrapper, TContext
 
 ParametersType = dict[str, Any]
@@ -40,10 +38,7 @@ class ToolSchema:
 class FunctionTool(ToolSchema, Generic[TContext]):
     """A callable tool, for function calling."""
 
-    handler: (
-        Callable[..., Awaitable[str | None] | AsyncGenerator[MessageEventResult, None]]
-        | None
-    ) = None
+    handler: Callable[..., Awaitable[Any]] | None = None
     """a callable that implements the tool's functionality. It should be an async function."""
 
     handler_module_path: str | None = None

astrbot/core/astr_agent_context.py

@@ -6,10 +6,8 @@ from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.star.context import Context
 
 
-@dataclass
+@dataclass(config={"arbitrary_types_allowed": True})
 class AstrAgentContext:
-    __pydantic_config__ = {"arbitrary_types_allowed": True}
-
     context: Context
     """The star context instance"""
     event: AstrMessageEvent

astrbot/core/astr_agent_run_util.py

@@ -2,16 +2,13 @@ import traceback
 from collections.abc import AsyncGenerator
 
 from astrbot.core import logger
-from astrbot.core.agent.message import Message
 from astrbot.core.agent.runners.tool_loop_agent_runner import ToolLoopAgentRunner
 from astrbot.core.astr_agent_context import AstrAgentContext
-from astrbot.core.message.components import Json
 from astrbot.core.message.message_event_result import (
     MessageChain,
     MessageEventResult,
     ResultContentType,
 )
-from astrbot.core.provider.entities import LLMResponse
 
 AgentRunner = ToolLoopAgentRunner[AstrAgentContext]
 
@@ -25,25 +22,8 @@ async def run_agent(
 ) -> AsyncGenerator[MessageChain | None, None]:
     step_idx = 0
     astr_event = agent_runner.run_context.context.event
-    while step_idx < max_step + 1:
+    while step_idx < max_step:
         step_idx += 1
-
-        if step_idx == max_step + 1:
-            logger.warning(
-                f"Agent reached max steps ({max_step}), forcing a final response."
-            )
-            if not agent_runner.done():
-                # 拔掉所有工具
-                if agent_runner.req:
-                    agent_runner.req.func_tool = None
-                # 注入提示词
-                agent_runner.run_context.messages.append(
-                    Message(
-                        role="user",
-                        content="工具调用次数已达到上限，请停止使用工具，并根据已经收集到的信息，对你的任务和发现进行总结，然后直接回复用户。",
-                    )
-                )
-
         try:
             async for resp in agent_runner.step():
                 if astr_event.is_stopped():
@@ -52,27 +32,16 @@ async def run_agent(
                     msg_chain = resp.data["chain"]
                     if msg_chain.type == "tool_direct_result":
                         # tool_direct_result 用于标记 llm tool 需要直接发送给用户的内容
-                        await astr_event.send(msg_chain)
+                        await astr_event.send(resp.data["chain"])
                         continue
-                    if astr_event.get_platform_id() == "webchat":
-                        await astr_event.send(msg_chain)
                     # 对于其他情况，暂时先不处理
                     continue
                 elif resp.type == "tool_call":
                     if agent_runner.streaming:
                         # 用来标记流式响应需要分节
                         yield MessageChain(chain=[], type="break")
-
-                    if astr_event.get_platform_name() == "webchat":
+                    if show_tool_use:
                         await astr_event.send(resp.data["chain"])
-                    elif show_tool_use:
-                        json_comp = resp.data["chain"].chain[0]
-                        if isinstance(json_comp, Json):
-                            m = f"🔨 调用工具: {json_comp.data.get('name')}"
-                        else:
-                            m = "🔨 调用工具..."
-                        chain = MessageChain(type="tool_call").message(m)
-                        await astr_event.send(chain)
                     continue
 
                 if stream_to_general and resp.type == "streaming_delta":
@@ -99,33 +68,11 @@ async def run_agent(
                         continue
                     yield resp.data["chain"]  # MessageChain
             if agent_runner.done():
-                # send agent stats to webchat
-                if astr_event.get_platform_name() == "webchat":
-                    await astr_event.send(
-                        MessageChain(
-                            type="agent_stats",
-                            chain=[Json(data=agent_runner.stats.to_dict())],
-                        )
-                    )
-
                 break
 
         except Exception as e:
             logger.error(traceback.format_exc())
-
-            err_msg = f"\n\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {e!s}\n\n请在平台日志查看和分享错误详情。\n"
-
-            error_llm_response = LLMResponse(
-                role="err",
-                completion_text=err_msg,
-            )
-            try:
-                await agent_runner.agent_hooks.on_agent_done(
-                    agent_runner.run_context, error_llm_response
-                )
-            except Exception:
-                logger.exception("Error in on_agent_done hook")
-
+            err_msg = f"\n\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {e!s}\n\n请在控制台查看和分享错误详情。\n"
             if agent_runner.streaming:
                 yield MessageChain().message(err_msg)
             else:

astrbot/core/astr_agent_tool_exec.py

@@ -185,11 +185,7 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
 
 async def call_local_llm_tool(
     context: ContextWrapper[AstrAgentContext],
-    handler: T.Callable[
-        ...,
-        T.Awaitable[MessageEventResult | mcp.types.CallToolResult | str | None]
-        | T.AsyncGenerator[MessageEventResult | CommandResult | str | None, None],
-    ],
+    handler: T.Callable[..., T.Awaitable[T.Any]],
     method_name: str,
     *args,
     **kwargs,
@@ -209,42 +205,12 @@ async def call_local_llm_tool(
         else:
             raise ValueError(f"未知的方法名: {method_name}")
     except ValueError as e:
-        raise Exception(f"Tool execution ValueError: {e}") from e
-    except TypeError as e:
-        # 获取函数的签名（包括类型），除了第一个 event/context 参数。
-        try:
-            sig = inspect.signature(handler)
-            params = list(sig.parameters.values())
-            # 跳过第一个参数（event 或 context）
-            if params:
-                params = params[1:]
-
-            param_strs = []
-            for param in params:
-                param_str = param.name
-                if param.annotation != inspect.Parameter.empty:
-                    # 获取类型注解的字符串表示
-                    if isinstance(param.annotation, type):
-                        type_str = param.annotation.__name__
-                    else:
-                        type_str = str(param.annotation)
-                    param_str += f": {type_str}"
-                if param.default != inspect.Parameter.empty:
-                    param_str += f" = {param.default!r}"
-                param_strs.append(param_str)
-
-            handler_param_str = (
-                ", ".join(param_strs) if param_strs else "(no additional parameters)"
-            )
-        except Exception:
-            handler_param_str = "(unable to inspect signature)"
-
-        raise Exception(
-            f"Tool handler parameter mismatch, please check the handler definition. Handler parameters: {handler_param_str}"
-        ) from e
+        logger.error(f"调用本地 LLM 工具时出错: {e}", exc_info=True)
+    except TypeError:
+        logger.error("处理函数参数不匹配，请检查 handler 的定义。", exc_info=True)
     except Exception as e:
         trace_ = traceback.format_exc()
-        raise Exception(f"Tool execution error: {e}. Traceback: {trace_}") from e
+        logger.error(f"调用本地 LLM 工具时出错: {e}\n{trace_}")
 
     if not ready_to_call:
         return

astrbot/core/config/astrbot_config.py

@@ -24,10 +24,6 @@ class AstrBotConfig(dict):
     - 如果传入了 schema，将会通过 schema 解析出 default_config，此时传入的 default_config 会被忽略。
     """
 
-    config_path: str
-    default_config: dict
-    schema: dict | None
-
     def __init__(
         self,
         config_path: str = ASTRBOT_CONFIG_PATH,

astrbot/core/config/i18n_utils.py

@@ -1,111 +0,0 @@
-"""
-配置元数据国际化工具
-
-提供配置元数据的国际化键转换功能
-"""
-
-from typing import Any
-
-
-class ConfigMetadataI18n:
-    """配置元数据国际化转换器"""
-
-    @staticmethod
-    def _get_i18n_key(group: str, section: str, field: str, attr: str) -> str:
-        """
-        生成国际化键
-
-        Args:
-            group: 配置组，如 'ai_group', 'platform_group'
-            section: 配置节，如 'agent_runner', 'general'
-            field: 字段名，如 'enable', 'default_provider'
-            attr: 属性类型，如 'description', 'hint', 'labels'
-
-        Returns:
-            国际化键，格式如: 'ai_group.agent_runner.enable.description'
-        """
-        if field:
-            return f"{group}.{section}.{field}.{attr}"
-        else:
-            return f"{group}.{section}.{attr}"
-
-    @staticmethod
-    def convert_to_i18n_keys(metadata: dict[str, Any]) -> dict[str, Any]:
-        """
-        将配置元数据转换为使用国际化键
-
-        Args:
-            metadata: 原始配置元数据字典
-
-        Returns:
-            使用国际化键的配置元数据字典
-        """
-        result = {}
-
-        for group_key, group_data in metadata.items():
-            group_result = {
-                "name": f"{group_key}.name",
-                "metadata": {},
-            }
-
-            for section_key, section_data in group_data.get("metadata", {}).items():
-                section_result = {
-                    "description": f"{group_key}.{section_key}.description",
-                    "type": section_data.get("type"),
-                }
-
-                # 复制其他属性
-                for key in ["items", "condition", "_special", "invisible"]:
-                    if key in section_data:
-                        section_result[key] = section_data[key]
-
-                # 处理 hint
-                if "hint" in section_data:
-                    section_result["hint"] = f"{group_key}.{section_key}.hint"
-
-                # 处理 items 中的字段
-                if "items" in section_data and isinstance(section_data["items"], dict):
-                    items_result = {}
-                    for field_key, field_data in section_data["items"].items():
-                        # 处理嵌套的点号字段名（如 provider_settings.enable）
-                        field_name = field_key
-
-                        field_result = {}
-
-                        # 复制基本属性
-                        for attr in [
-                            "type",
-                            "condition",
-                            "_special",
-                            "invisible",
-                            "options",
-                            "slider",
-                        ]:
-                            if attr in field_data:
-                                field_result[attr] = field_data[attr]
-
-                        # 转换文本属性为国际化键
-                        if "description" in field_data:
-                            field_result["description"] = (
-                                f"{group_key}.{section_key}.{field_name}.description"
-                            )
-
-                        if "hint" in field_data:
-                            field_result["hint"] = (
-                                f"{group_key}.{section_key}.{field_name}.hint"
-                            )
-
-                        if "labels" in field_data:
-                            field_result["labels"] = (
-                                f"{group_key}.{section_key}.{field_name}.labels"
-                            )
-
-                        items_result[field_key] = field_result
-
-                    section_result["items"] = items_result
-
-                group_result["metadata"][section_key] = section_result
-
-            result[group_key] = group_result
-
-        return result

astrbot/core/core_lifecycle.py

@@ -16,13 +16,15 @@ import time
 import traceback
 from asyncio import Queue
 
-from astrbot.api import logger, sp
-from astrbot.core import LogBroker
+from astrbot.core import LogBroker, logger, sp
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.config.default import VERSION
 from astrbot.core.conversation_mgr import ConversationManager
 from astrbot.core.db import BaseDatabase
+from astrbot.core.db.migration.migra_45_to_46 import migrate_45_to_46
+from astrbot.core.db.migration.migra_webchat_session import migrate_webchat_session
 from astrbot.core.knowledge_base.kb_mgr import KnowledgeBaseManager
+from astrbot.core.memory.memory_manager import MemoryManager
 from astrbot.core.persona_mgr import PersonaManager
 from astrbot.core.pipeline.scheduler import PipelineContext, PipelineScheduler
 from astrbot.core.platform.manager import PlatformManager
@@ -33,8 +35,6 @@ from astrbot.core.star.context import Context
 from astrbot.core.star.star_handler import EventType, star_handlers_registry, star_map
 from astrbot.core.umop_config_router import UmopConfigRouter
 from astrbot.core.updator import AstrBotUpdator
-from astrbot.core.utils.llm_metadata import update_llm_metadata
-from astrbot.core.utils.migra_helper import migra
 
 from . import astrbot_config, html_renderer
 from .event_bus import EventBus
@@ -98,16 +98,18 @@ class AstrBotCoreLifecycle:
             sp=sp,
         )
 
-        # apply migration
+        # 4.5 to 4.6 migration for umop_config_router
         try:
-            await migra(
-                self.db,
-                self.astrbot_config_mgr,
-                self.umop_config_router,
-                self.astrbot_config_mgr,
-            )
+            await migrate_45_to_46(self.astrbot_config_mgr, self.umop_config_router)
         except Exception as e:
-            logger.error(f"AstrBot migration failed: {e!s}")
+            logger.error(f"Migration from version 4.5 to 4.6 failed: {e!s}")
+            logger.error(traceback.format_exc())
+
+        # migration for webchat session
+        try:
+            await migrate_webchat_session(self.db)
+        except Exception as e:
+            logger.error(f"Migration for webchat session failed: {e!s}")
             logger.error(traceback.format_exc())
 
         # 初始化事件队列
@@ -135,6 +137,8 @@ class AstrBotCoreLifecycle:
 
         # 初始化知识库管理器
         self.kb_manager = KnowledgeBaseManager(self.provider_manager)
+        # 初始化记忆管理器
+        self.memory_manager = MemoryManager()
 
         # 初始化提供给插件的上下文
         self.star_context = Context(
@@ -148,6 +152,7 @@ class AstrBotCoreLifecycle:
             self.persona_mgr,
             self.astrbot_config_mgr,
             self.kb_manager,
+            self.memory_manager,
         )
 
         # 初始化插件管理器
@@ -186,8 +191,6 @@ class AstrBotCoreLifecycle:
         # 初始化关闭控制面板的事件
         self.dashboard_shutdown_event = asyncio.Event()
 
-        asyncio.create_task(update_llm_metadata())
-
     def _load(self) -> None:
         """加载事件总线和任务并初始化."""
         # 创建一个异步任务来执行事件总线的 dispatch() 方法
@@ -200,7 +203,7 @@ class AstrBotCoreLifecycle:
         # 把插件中注册的所有协程函数注册到事件总线中并执行
         extra_tasks = []
         for task in self.star_context._register_tasks:
-            extra_tasks.append(asyncio.create_task(task, name=task.__name__))  # type: ignore
+            extra_tasks.append(asyncio.create_task(task, name=task.__name__))
 
         tasks_ = [event_bus_task, *extra_tasks]
         for task in tasks_:

astrbot/core/db/__init__.py

@@ -5,12 +5,11 @@ from contextlib import asynccontextmanager
 from dataclasses import dataclass
 
 from deprecated import deprecated
-from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
+from sqlalchemy.orm import sessionmaker
 
 from astrbot.core.db.po import (
     Attachment,
-    CommandConfig,
-    CommandConflict,
     ConversationV2,
     Persona,
     PlatformMessageHistory,
@@ -33,7 +32,7 @@ class BaseDatabase(abc.ABC):
             echo=False,
             future=True,
         )
-        self.AsyncSessionLocal = async_sessionmaker(
+        self.AsyncSessionLocal = sessionmaker(
             self.engine,
             class_=AsyncSession,
             expire_on_commit=False,
@@ -174,7 +173,7 @@ class BaseDatabase(abc.ABC):
         content: dict,
         sender_id: str | None = None,
         sender_name: str | None = None,
-    ) -> PlatformMessageHistory:
+    ) -> None:
         """Insert a new platform message history record."""
         ...
 
@@ -199,14 +198,6 @@ class BaseDatabase(abc.ABC):
         """Get platform message history for a specific user."""
         ...
 
-    @abc.abstractmethod
-    async def get_platform_message_history_by_id(
-        self,
-        message_id: int,
-    ) -> PlatformMessageHistory | None:
-        """Get a platform message history record by its ID."""
-        ...
-
     @abc.abstractmethod
     async def insert_attachment(
         self,
@@ -222,27 +213,6 @@ class BaseDatabase(abc.ABC):
         """Get an attachment by its ID."""
         ...
 
-    @abc.abstractmethod
-    async def get_attachments(self, attachment_ids: list[str]) -> list[Attachment]:
-        """Get multiple attachments by their IDs."""
-        ...
-
-    @abc.abstractmethod
-    async def delete_attachment(self, attachment_id: str) -> bool:
-        """Delete an attachment by its ID.
-
-        Returns True if the attachment was deleted, False if it was not found.
-        """
-        ...
-
-    @abc.abstractmethod
-    async def delete_attachments(self, attachment_ids: list[str]) -> int:
-        """Delete multiple attachments by their IDs.
-
-        Returns the number of attachments deleted.
-        """
-        ...
-
     @abc.abstractmethod
     async def insert_persona(
         self,
@@ -316,76 +286,6 @@ class BaseDatabase(abc.ABC):
         """Clear all preferences for a specific scope ID."""
         ...
 
-    @abc.abstractmethod
-    async def get_command_configs(self) -> list[CommandConfig]:
-        """Get all stored command configurations."""
-        ...
-
-    @abc.abstractmethod
-    async def get_command_config(self, handler_full_name: str) -> CommandConfig | None:
-        """Fetch a single command configuration by handler."""
-        ...
-
-    @abc.abstractmethod
-    async def upsert_command_config(
-        self,
-        handler_full_name: str,
-        plugin_name: str,
-        module_path: str,
-        original_command: str,
-        *,
-        resolved_command: str | None = None,
-        enabled: bool | None = None,
-        keep_original_alias: bool | None = None,
-        conflict_key: str | None = None,
-        resolution_strategy: str | None = None,
-        note: str | None = None,
-        extra_data: dict | None = None,
-        auto_managed: bool | None = None,
-    ) -> CommandConfig:
-        """Create or update a command configuration."""
-        ...
-
-    @abc.abstractmethod
-    async def delete_command_config(self, handler_full_name: str) -> None:
-        """Delete a single command configuration."""
-        ...
-
-    @abc.abstractmethod
-    async def delete_command_configs(self, handler_full_names: list[str]) -> None:
-        """Bulk delete command configurations."""
-        ...
-
-    @abc.abstractmethod
-    async def list_command_conflicts(
-        self,
-        status: str | None = None,
-    ) -> list[CommandConflict]:
-        """List recorded command conflict entries."""
-        ...
-
-    @abc.abstractmethod
-    async def upsert_command_conflict(
-        self,
-        conflict_key: str,
-        handler_full_name: str,
-        plugin_name: str,
-        *,
-        status: str | None = None,
-        resolution: str | None = None,
-        resolved_command: str | None = None,
-        note: str | None = None,
-        extra_data: dict | None = None,
-        auto_generated: bool | None = None,
-    ) -> CommandConflict:
-        """Create or update a conflict record."""
-        ...
-
-    @abc.abstractmethod
-    async def delete_command_conflicts(self, ids: list[int]) -> None:
-        """Delete conflict records."""
-        ...
-
     # @abc.abstractmethod
     # async def insert_llm_message(
     #     self,

astrbot/core/db/migration/migra_3_to_4.py

@@ -70,7 +70,6 @@ async def migration_conversation_table(
                         logger.info(
                             f"未找到该条旧会话对应的具体数据: {conversation}, 跳过。",
                         )
-                        continue
                     if ":" not in conv.user_id:
                         continue
                     session = MessageSesion.from_str(session_str=conv.user_id)
@@ -208,7 +207,6 @@ async def migration_webchat_data(
                         logger.info(
                             f"未找到该条旧会话对应的具体数据: {conversation}, 跳过。",
                         )
-                        continue
                     if ":" in conv.user_id:
                         continue
                     platform_id = "webchat"

astrbot/core/db/migration/migra_webchat_session.py

@@ -25,7 +25,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
     """
     # 检查是否已经完成迁移
     migration_done = await db_helper.get_preference(
-        "global", "global", "migration_done_webchat_session_1"
+        "global", "global", "migration_done_webchat_session"
     )
     if migration_done:
         return
@@ -43,7 +43,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
                     func.max(PlatformMessageHistory.updated_at).label("latest"),
                 )
                 .where(col(PlatformMessageHistory.platform_id) == "webchat")
-                .where(col(PlatformMessageHistory.sender_id) != "bot")
+                .where(col(PlatformMessageHistory.sender_id) == "astrbot")
                 .group_by(col(PlatformMessageHistory.user_id))
             )
 
@@ -53,7 +53,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
             if not webchat_users:
                 logger.info("没有找到需要迁移的 WebChat 数据")
                 await sp.put_async(
-                    "global", "global", "migration_done_webchat_session_1", True
+                    "global", "global", "migration_done_webchat_session", True
                 )
                 return
 
@@ -124,7 +124,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
                 logger.info("没有新会话需要迁移")
 
         # 标记迁移完成
-        await sp.put_async("global", "global", "migration_done_webchat_session_1", True)
+        await sp.put_async("global", "global", "migration_done_webchat_session", True)
 
     except Exception as e:
         logger.error(f"迁移过程中发生错误: {e}", exc_info=True)

astrbot/core/db/migration/sqlite_v3.py

@@ -127,7 +127,7 @@ class SQLiteDatabase:
         conn.text_factory = str
         return conn
 
-    def _exec_sql(self, sql: str, params: tuple | None = None):
+    def _exec_sql(self, sql: str, params: tuple = None):
         conn = self.conn
         try:
             c = self.conn.cursor()
@@ -224,11 +224,9 @@ class SQLiteDatabase:
 
         c.close()
 
-        return Stats(platform)
+        return Stats(platform, [], [])
 
-    def get_conversation_by_user_id(
-        self, user_id: str, cid: str
-    ) -> Conversation | None:
+    def get_conversation_by_user_id(self, user_id: str, cid: str) -> Conversation:
         try:
             c = self.conn.cursor()
         except sqlite3.ProgrammingError:
@@ -260,7 +258,7 @@ class SQLiteDatabase:
             (user_id, cid, history, updated_at, created_at),
         )
 
-    def get_conversations(self, user_id: str) -> list[Conversation]:
+    def get_conversations(self, user_id: str) -> tuple:
         try:
             c = self.conn.cursor()
         except sqlite3.ProgrammingError:

astrbot/core/db/po.py

@@ -12,7 +12,7 @@ class PlatformStat(SQLModel, table=True):
     Note: In astrbot v4, we moved `platform` table to here.
     """
 
-    __tablename__: str = "platform_stats"
+    __tablename__ = "platform_stats"  # type: ignore
 
     id: int = Field(primary_key=True, sa_column_kwargs={"autoincrement": True})
     timestamp: datetime = Field(nullable=False)
@@ -31,10 +31,9 @@ class PlatformStat(SQLModel, table=True):
 
 
 class ConversationV2(SQLModel, table=True):
-    __tablename__: str = "conversations"
+    __tablename__ = "conversations"  # type: ignore
 
-    inner_conversation_id: int | None = Field(
-        default=None,
+    inner_conversation_id: int = Field(
         primary_key=True,
         sa_column_kwargs={"autoincrement": True},
     )
@@ -69,7 +68,7 @@ class Persona(SQLModel, table=True):
     It can be used to customize the behavior of LLMs.
     """
 
-    __tablename__: str = "personas"
+    __tablename__ = "personas"  # type: ignore
 
     id: int | None = Field(
         primary_key=True,
@@ -99,7 +98,7 @@ class Persona(SQLModel, table=True):
 class Preference(SQLModel, table=True):
     """This class represents preferences for bots."""
 
-    __tablename__: str = "preferences"
+    __tablename__ = "preferences"  # type: ignore
 
     id: int | None = Field(
         default=None,
@@ -135,7 +134,7 @@ class PlatformMessageHistory(SQLModel, table=True):
     or platform-specific messages.
     """
 
-    __tablename__: str = "platform_message_history"
+    __tablename__ = "platform_message_history"  # type: ignore
 
     id: int | None = Field(
         primary_key=True,
@@ -163,7 +162,7 @@ class PlatformSession(SQLModel, table=True):
     Each session can have multiple conversations (对话) associated with it.
     """
 
-    __tablename__: str = "platform_sessions"
+    __tablename__ = "platform_sessions"  # type: ignore
 
     inner_id: int | None = Field(
         primary_key=True,
@@ -174,7 +173,7 @@ class PlatformSession(SQLModel, table=True):
         max_length=100,
         nullable=False,
         unique=True,
-        default_factory=lambda: str(uuid.uuid4()),
+        default_factory=lambda: f"webchat_{uuid.uuid4()}",
     )
     platform_id: str = Field(default="webchat", nullable=False)
     """Platform identifier (e.g., 'webchat', 'qq', 'discord')"""
@@ -204,7 +203,7 @@ class Attachment(SQLModel, table=True):
     Attachments can be images, files, or other media types.
     """
 
-    __tablename__: str = "attachments"
+    __tablename__ = "attachments"  # type: ignore
 
     inner_attachment_id: int | None = Field(
         primary_key=True,
@@ -234,65 +233,6 @@ class Attachment(SQLModel, table=True):
     )
 
 
-class CommandConfig(SQLModel, table=True):
-    """Per-command configuration overrides for dashboard management."""
-
-    __tablename__ = "command_configs"  # type: ignore
-
-    handler_full_name: str = Field(
-        primary_key=True,
-        max_length=512,
-    )
-    plugin_name: str = Field(nullable=False, max_length=255)
-    module_path: str = Field(nullable=False, max_length=255)
-    original_command: str = Field(nullable=False, max_length=255)
-    resolved_command: str | None = Field(default=None, max_length=255)
-    enabled: bool = Field(default=True, nullable=False)
-    keep_original_alias: bool = Field(default=False, nullable=False)
-    conflict_key: str | None = Field(default=None, max_length=255)
-    resolution_strategy: str | None = Field(default=None, max_length=64)
-    note: str | None = Field(default=None, sa_type=Text)
-    extra_data: dict | None = Field(default=None, sa_type=JSON)
-    auto_managed: bool = Field(default=False, nullable=False)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
-
-
-class CommandConflict(SQLModel, table=True):
-    """Conflict tracking for duplicated command names."""
-
-    __tablename__ = "command_conflicts"  # type: ignore
-
-    id: int | None = Field(
-        default=None, primary_key=True, sa_column_kwargs={"autoincrement": True}
-    )
-    conflict_key: str = Field(nullable=False, max_length=255)
-    handler_full_name: str = Field(nullable=False, max_length=512)
-    plugin_name: str = Field(nullable=False, max_length=255)
-    status: str = Field(default="pending", max_length=32)
-    resolution: str | None = Field(default=None, max_length=64)
-    resolved_command: str | None = Field(default=None, max_length=255)
-    note: str | None = Field(default=None, sa_type=Text)
-    extra_data: dict | None = Field(default=None, sa_type=JSON)
-    auto_generated: bool = Field(default=False, nullable=False)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
-
-    __table_args__ = (
-        UniqueConstraint(
-            "conflict_key",
-            "handler_full_name",
-            name="uix_conflict_handler",
-        ),
-    )
-
-
 @dataclass
 class Conversation:
     """LLM 对话类
@@ -321,17 +261,17 @@ class Personality(TypedDict):
     在 v4.0.0 版本及之后，推荐使用上面的 Persona 类。并且， mood_imitation_dialogs 字段已被废弃。
     """
 
-    prompt: str
-    name: str
-    begin_dialogs: list[str]
-    mood_imitation_dialogs: list[str]
+    prompt: str = ""
+    name: str = ""
+    begin_dialogs: list[str] = []
+    mood_imitation_dialogs: list[str] = []
     """情感模拟对话预设。在 v4.0.0 版本及之后，已被废弃。"""
-    tools: list[str] | None
+    tools: list[str] | None = None
     """工具列表。None 表示使用所有工具，空列表表示不使用任何工具"""
 
     # cache
-    _begin_dialogs_processed: list[dict]
-    _mood_imitation_dialogs_processed: str
+    _begin_dialogs_processed: list[dict] = []
+    _mood_imitation_dialogs_processed: str = ""
 
 
 # ====

astrbot/core/db/sqlite.py

@@ -1,18 +1,14 @@
 import asyncio
 import threading
 import typing as T
-from collections.abc import Awaitable, Callable
 from datetime import datetime, timedelta, timezone
 
-from sqlalchemy import CursorResult
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import col, delete, desc, func, or_, select, text, update
 
 from astrbot.core.db import BaseDatabase
 from astrbot.core.db.po import (
     Attachment,
-    CommandConfig,
-    CommandConflict,
     ConversationV2,
     Persona,
     PlatformMessageHistory,
@@ -29,7 +25,6 @@ from astrbot.core.db.po import (
 )
 
 NOT_GIVEN = T.TypeVar("NOT_GIVEN")
-TxResult = T.TypeVar("TxResult")
 
 
 class SQLiteDatabase(BaseDatabase):
@@ -110,8 +105,8 @@ class SQLiteDatabase(BaseDatabase):
                 text("""
                 SELECT * FROM platform_stats
                 WHERE timestamp >= :start_time
-                GROUP BY platform_id
                 ORDER BY timestamp DESC
+                GROUP BY platform_id
                 """),
                 {"start_time": start_time},
             )
@@ -454,18 +449,6 @@ class SQLiteDatabase(BaseDatabase):
             result = await session.execute(query.offset(offset).limit(page_size))
             return result.scalars().all()
 
-    async def get_platform_message_history_by_id(
-        self, message_id: int
-    ) -> PlatformMessageHistory | None:
-        """Get a platform message history record by its ID."""
-        async with self.get_db() as session:
-            session: AsyncSession
-            query = select(PlatformMessageHistory).where(
-                PlatformMessageHistory.id == message_id
-            )
-            result = await session.execute(query)
-            return result.scalar_one_or_none()
-
     async def insert_attachment(self, path, type, mime_type):
         """Insert a new attachment record."""
         async with self.get_db() as session:
@@ -487,48 +470,6 @@ class SQLiteDatabase(BaseDatabase):
             result = await session.execute(query)
             return result.scalar_one_or_none()
 
-    async def get_attachments(self, attachment_ids: list[str]) -> list:
-        """Get multiple attachments by their IDs."""
-        if not attachment_ids:
-            return []
-        async with self.get_db() as session:
-            session: AsyncSession
-            query = select(Attachment).where(
-                col(Attachment.attachment_id).in_(attachment_ids)
-            )
-            result = await session.execute(query)
-            return list(result.scalars().all())
-
-    async def delete_attachment(self, attachment_id: str) -> bool:
-        """Delete an attachment by its ID.
-
-        Returns True if the attachment was deleted, False if it was not found.
-        """
-        async with self.get_db() as session:
-            session: AsyncSession
-            async with session.begin():
-                query = delete(Attachment).where(
-                    col(Attachment.attachment_id) == attachment_id
-                )
-                result = T.cast(CursorResult, await session.execute(query))
-                return result.rowcount > 0
-
-    async def delete_attachments(self, attachment_ids: list[str]) -> int:
-        """Delete multiple attachments by their IDs.
-
-        Returns the number of attachments deleted.
-        """
-        if not attachment_ids:
-            return 0
-        async with self.get_db() as session:
-            session: AsyncSession
-            async with session.begin():
-                query = delete(Attachment).where(
-                    col(Attachment.attachment_id).in_(attachment_ids)
-                )
-                result = T.cast(CursorResult, await session.execute(query))
-                return result.rowcount
-
     async def insert_persona(
         self,
         persona_id,
@@ -674,242 +615,6 @@ class SQLiteDatabase(BaseDatabase):
                 )
             await session.commit()
 
-    # ====
-    # Command Configuration & Conflict Tracking
-    # ====
-
-    async def _run_in_tx(
-        self,
-        fn: Callable[[AsyncSession], Awaitable[TxResult]],
-    ) -> TxResult:
-        async with self.get_db() as session:
-            session: AsyncSession
-            async with session.begin():
-                return await fn(session)
-
-    @staticmethod
-    def _apply_updates(model, **updates) -> None:
-        for field, value in updates.items():
-            if value is not None:
-                setattr(model, field, value)
-
-    @staticmethod
-    def _new_command_config(
-        handler_full_name: str,
-        plugin_name: str,
-        module_path: str,
-        original_command: str,
-        *,
-        resolved_command: str | None = None,
-        enabled: bool | None = None,
-        keep_original_alias: bool | None = None,
-        conflict_key: str | None = None,
-        resolution_strategy: str | None = None,
-        note: str | None = None,
-        extra_data: dict | None = None,
-        auto_managed: bool | None = None,
-    ) -> CommandConfig:
-        return CommandConfig(
-            handler_full_name=handler_full_name,
-            plugin_name=plugin_name,
-            module_path=module_path,
-            original_command=original_command,
-            resolved_command=resolved_command,
-            enabled=True if enabled is None else enabled,
-            keep_original_alias=False
-            if keep_original_alias is None
-            else keep_original_alias,
-            conflict_key=conflict_key or original_command,
-            resolution_strategy=resolution_strategy,
-            note=note,
-            extra_data=extra_data,
-            auto_managed=bool(auto_managed),
-        )
-
-    @staticmethod
-    def _new_command_conflict(
-        conflict_key: str,
-        handler_full_name: str,
-        plugin_name: str,
-        *,
-        status: str | None = None,
-        resolution: str | None = None,
-        resolved_command: str | None = None,
-        note: str | None = None,
-        extra_data: dict | None = None,
-        auto_generated: bool | None = None,
-    ) -> CommandConflict:
-        return CommandConflict(
-            conflict_key=conflict_key,
-            handler_full_name=handler_full_name,
-            plugin_name=plugin_name,
-            status=status or "pending",
-            resolution=resolution,
-            resolved_command=resolved_command,
-            note=note,
-            extra_data=extra_data,
-            auto_generated=bool(auto_generated),
-        )
-
-    async def get_command_configs(self) -> list[CommandConfig]:
-        async with self.get_db() as session:
-            session: AsyncSession
-            result = await session.execute(select(CommandConfig))
-            return list(result.scalars().all())
-
-    async def get_command_config(
-        self,
-        handler_full_name: str,
-    ) -> CommandConfig | None:
-        async with self.get_db() as session:
-            session: AsyncSession
-            return await session.get(CommandConfig, handler_full_name)
-
-    async def upsert_command_config(
-        self,
-        handler_full_name: str,
-        plugin_name: str,
-        module_path: str,
-        original_command: str,
-        *,
-        resolved_command: str | None = None,
-        enabled: bool | None = None,
-        keep_original_alias: bool | None = None,
-        conflict_key: str | None = None,
-        resolution_strategy: str | None = None,
-        note: str | None = None,
-        extra_data: dict | None = None,
-        auto_managed: bool | None = None,
-    ) -> CommandConfig:
-        async def _op(session: AsyncSession) -> CommandConfig:
-            config = await session.get(CommandConfig, handler_full_name)
-            if not config:
-                config = self._new_command_config(
-                    handler_full_name,
-                    plugin_name,
-                    module_path,
-                    original_command,
-                    resolved_command=resolved_command,
-                    enabled=enabled,
-                    keep_original_alias=keep_original_alias,
-                    conflict_key=conflict_key,
-                    resolution_strategy=resolution_strategy,
-                    note=note,
-                    extra_data=extra_data,
-                    auto_managed=auto_managed,
-                )
-                session.add(config)
-            else:
-                self._apply_updates(
-                    config,
-                    plugin_name=plugin_name,
-                    module_path=module_path,
-                    original_command=original_command,
-                    resolved_command=resolved_command,
-                    enabled=enabled,
-                    keep_original_alias=keep_original_alias,
-                    conflict_key=conflict_key,
-                    resolution_strategy=resolution_strategy,
-                    note=note,
-                    extra_data=extra_data,
-                    auto_managed=auto_managed,
-                )
-            await session.flush()
-            await session.refresh(config)
-            return config
-
-        return await self._run_in_tx(_op)
-
-    async def delete_command_config(self, handler_full_name: str) -> None:
-        await self.delete_command_configs([handler_full_name])
-
-    async def delete_command_configs(self, handler_full_names: list[str]) -> None:
-        if not handler_full_names:
-            return
-
-        async def _op(session: AsyncSession) -> None:
-            await session.execute(
-                delete(CommandConfig).where(
-                    col(CommandConfig.handler_full_name).in_(handler_full_names),
-                ),
-            )
-
-        await self._run_in_tx(_op)
-
-    async def list_command_conflicts(
-        self,
-        status: str | None = None,
-    ) -> list[CommandConflict]:
-        async with self.get_db() as session:
-            session: AsyncSession
-            query = select(CommandConflict)
-            if status:
-                query = query.where(CommandConflict.status == status)
-            result = await session.execute(query)
-            return list(result.scalars().all())
-
-    async def upsert_command_conflict(
-        self,
-        conflict_key: str,
-        handler_full_name: str,
-        plugin_name: str,
-        *,
-        status: str | None = None,
-        resolution: str | None = None,
-        resolved_command: str | None = None,
-        note: str | None = None,
-        extra_data: dict | None = None,
-        auto_generated: bool | None = None,
-    ) -> CommandConflict:
-        async def _op(session: AsyncSession) -> CommandConflict:
-            result = await session.execute(
-                select(CommandConflict).where(
-                    CommandConflict.conflict_key == conflict_key,
-                    CommandConflict.handler_full_name == handler_full_name,
-                ),
-            )
-            record = result.scalar_one_or_none()
-            if not record:
-                record = self._new_command_conflict(
-                    conflict_key,
-                    handler_full_name,
-                    plugin_name,
-                    status=status,
-                    resolution=resolution,
-                    resolved_command=resolved_command,
-                    note=note,
-                    extra_data=extra_data,
-                    auto_generated=auto_generated,
-                )
-                session.add(record)
-            else:
-                self._apply_updates(
-                    record,
-                    plugin_name=plugin_name,
-                    status=status,
-                    resolution=resolution,
-                    resolved_command=resolved_command,
-                    note=note,
-                    extra_data=extra_data,
-                    auto_generated=auto_generated,
-                )
-            await session.flush()
-            await session.refresh(record)
-            return record
-
-        return await self._run_in_tx(_op)
-
-    async def delete_command_conflicts(self, ids: list[int]) -> None:
-        if not ids:
-            return
-
-        async def _op(session: AsyncSession) -> None:
-            await session.execute(
-                delete(CommandConflict).where(col(CommandConflict.id).in_(ids)),
-            )
-
-        await self._run_in_tx(_op)
-
     # ====
     # Deprecated Methods
     # ====
@@ -1089,7 +794,7 @@ class SQLiteDatabase(BaseDatabase):
 
                 await session.execute(
                     update(PlatformSession)
-                    .where(col(PlatformSession.session_id) == session_id)
+                    .where(col(PlatformSession.session_id == session_id))
                     .values(**values),
                 )
 
@@ -1100,6 +805,6 @@ class SQLiteDatabase(BaseDatabase):
             async with session.begin():
                 await session.execute(
                     delete(PlatformSession).where(
-                        col(PlatformSession.session_id) == session_id,
+                        col(PlatformSession.session_id == session_id),
                     ),
                 )

astrbot/core/db/vec_db/base.py

@@ -1,11 +1,20 @@
 import abc
 from dataclasses import dataclass
+from typing import TypedDict
 
 
 @dataclass
 class Result:
+    class ResultData(TypedDict):
+        id: str
+        doc_id: str
+        text: str
+        metadata: str
+        created_at: int
+        updated_at: int
+
     similarity: float
-    data: dict
+    data: ResultData | dict
 
 
 class BaseVecDB:

astrbot/core/db/vec_db/faiss_impl/embedding_storage.py

@@ -90,6 +90,4 @@ class EmbeddingStorage:
             path (str): 保存索引的路径
 
         """
-        if self.index is None:
-            return
         faiss.write_index(self.index, self.path)

astrbot/core/event_bus.py

@@ -27,7 +27,7 @@ class EventBus:
         self,
         event_queue: Queue,
         pipeline_scheduler_mapping: dict[str, PipelineScheduler],
-        astrbot_config_mgr: AstrBotConfigManager,
+        astrbot_config_mgr: AstrBotConfigManager = None,
     ):
         self.event_queue = event_queue  # 事件队列
         # abconf uuid -> scheduler
@@ -40,11 +40,6 @@ class EventBus:
             conf_info = self.astrbot_config_mgr.get_conf_info(event.unified_msg_origin)
             self._print_event(event, conf_info["name"])
             scheduler = self.pipeline_scheduler_mapping.get(conf_info["id"])
-            if not scheduler:
-                logger.error(
-                    f"PipelineScheduler not found for id: {conf_info['id']}, event ignored."
-                )
-                continue
             asyncio.create_task(scheduler.execute(event))
 
     def _print_event(self, event: AstrMessageEvent, conf_name: str):

astrbot/core/knowledge_base/retrieval/manager.py

@@ -166,11 +166,7 @@ class RetrievalManager:
         # 5. Rerank
         first_rerank = None
         for kb_id in kb_ids:
-            vec_db = kb_options[kb_id]["vec_db"]
-            if not isinstance(vec_db, FaissVecDB):
-                logger.warning(f"vec_db for kb_id {kb_id} is not FaissVecDB")
-                continue
-
+            vec_db: FaissVecDB = kb_options[kb_id]["vec_db"]
             rerank_pi = kb_options[kb_id]["rerank_provider_id"]
             if (
                 vec_db

astrbot/core/log.py

@@ -24,7 +24,6 @@ import asyncio
 import logging
 import os
 import sys
-import time
 from asyncio import Queue
 from collections import deque
 
@@ -149,7 +148,7 @@ class LogQueueHandler(logging.Handler):
         self.log_broker.publish(
             {
                 "level": record.levelname,
-                "time": time.time(),
+                "time": record.asctime,
                 "data": log_entry,
             },
         )

astrbot/core/memory/DESIGN.excalidraw

@@ -0,0 +1,822 @@
+{
+  "type": "excalidraw",
+  "version": 2,
+  "source": "https://marketplace.visualstudio.com/items?itemName=pomdtr.excalidraw-editor",
+  "elements": [
+    {
+      "id": "l6cYurMvF69IM4Kc33Qou",
+      "type": "rectangle",
+      "x": 173.140625,
+      "y": -29.0234375,
+      "width": 92.95703125,
+      "height": 77.109375,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a0",
+      "roundness": {
+        "type": 3
+      },
+      "seed": 1409469537,
+      "version": 91,
+      "versionNonce": 307958671,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763703733605,
+      "link": null,
+      "locked": false
+    },
+    {
+      "id": "1ZvS6t8U6ihUjNU0dakgl",
+      "type": "arrow",
+      "x": 409.30859375,
+      "y": 9.6875,
+      "width": 118.2734375,
+      "height": 1.9609375,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a1",
+      "roundness": {
+        "type": 2
+      },
+      "seed": 326508865,
+      "version": 120,
+      "versionNonce": 199367023,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703733605,
+      "link": null,
+      "locked": false,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          -118.2734375,
+          -1.9609375
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": "arrow",
+      "elbowed": false
+    },
+    {
+      "id": "tfdUGiJdcMoOHGfqFHXK6",
+      "type": "text",
+      "x": 153.46875,
+      "y": -70.9765625,
+      "width": 136.4598846435547,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a2",
+      "roundness": null,
+      "seed": 688712865,
+      "version": 67,
+      "versionNonce": 300660705,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703743816,
+      "link": null,
+      "locked": false,
+      "text": "FAISS+SQLite",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "FAISS+SQLite",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "AeL3kEB9a8_TAvAXpAbpl",
+      "type": "text",
+      "x": 438.36328125,
+      "y": -3.78125,
+      "width": 116.109375,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a3",
+      "roundness": null,
+      "seed": 788579535,
+      "version": 33,
+      "versionNonce": 946602095,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703932431,
+      "link": null,
+      "locked": false,
+      "text": "FACT",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "FACT",
+      "autoResize": false,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "Pe3TeMZvxQ8tRTcbD5v6P",
+      "type": "arrow",
+      "x": 297.125,
+      "y": 40.2578125,
+      "width": 120.2421875,
+      "height": 1.421875,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a4",
+      "roundness": {
+        "type": 2
+      },
+      "seed": 1146229999,
+      "version": 44,
+      "versionNonce": 636917679,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703759050,
+      "link": null,
+      "locked": false,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          120.2421875,
+          1.421875
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": "arrow",
+      "elbowed": false
+    },
+    {
+      "id": "GhmQoadtQRK8c8aEEbYKQ",
+      "type": "text",
+      "x": 283.53515625,
+      "y": 64.76171875,
+      "width": 130.85989379882812,
+      "height": 50,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a5",
+      "roundness": null,
+      "seed": 1445650959,
+      "version": 79,
+      "versionNonce": 566193167,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703768982,
+      "link": null,
+      "locked": false,
+      "text": "top-n Similary\n",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "top-n Similary\n",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "uTEFJs8cNS09WFq2pi9P7",
+      "type": "rectangle",
+      "x": 528.1586158430439,
+      "y": -173.43472375183552,
+      "width": 135.7578125,
+      "height": 128.73828125,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a6",
+      "roundness": {
+        "type": 3
+      },
+      "seed": 223409231,
+      "version": 44,
+      "versionNonce": 1066827105,
+      "isDeleted": false,
+      "boundElements": [
+        {
+          "id": "FfWdx1_yCq6UYfXamJX9N",
+          "type": "arrow"
+        }
+      ],
+      "updated": 1763704050188,
+      "link": null,
+      "locked": false
+    },
+    {
+      "id": "2SzqzpJ4C2ymVj8-8vN7H",
+      "type": "text",
+      "x": 548.1480270948795,
+      "y": -211,
+      "width": 86.43992614746094,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "a7",
+      "roundness": null,
+      "seed": 1015608623,
+      "version": 23,
+      "versionNonce": 950374849,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763704047884,
+      "link": null,
+      "locked": false,
+      "text": "Memories",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "Memories",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "CgW6Yf9v0a9q1tsjhDl7b",
+      "type": "text",
+      "x": 568.3099317299038,
+      "y": -154.69469411681115,
+      "width": 62.099945068359375,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aA",
+      "roundness": null,
+      "seed": 452254927,
+      "version": 10,
+      "versionNonce": 972895023,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763704057762,
+      "link": null,
+      "locked": false,
+      "text": "chunk1",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "chunk1",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "knvlKpaFZ8lY-73Y-e9W6",
+      "type": "text",
+      "x": 569.11328125,
+      "y": -116.91056665512056,
+      "width": 67.55995178222656,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aB",
+      "roundness": null,
+      "seed": 914644015,
+      "version": 90,
+      "versionNonce": 158135631,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763704057762,
+      "link": null,
+      "locked": false,
+      "text": "chunk2",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "chunk2",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "Q7URqvTSMpvj08ye-afTT",
+      "type": "rectangle",
+      "x": 444.515625,
+      "y": 36.7890625,
+      "width": 58.859375,
+      "height": 29.41796875,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aC",
+      "roundness": {
+        "type": 3
+      },
+      "seed": 1642537601,
+      "version": 19,
+      "versionNonce": 948406575,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703870173,
+      "link": null,
+      "locked": false
+    },
+    {
+      "id": "JjxBt9cZIZXNTd6CmwyKL",
+      "type": "rectangle",
+      "x": 452.203125,
+      "y": 46.064453125,
+      "width": 58.859375,
+      "height": 29.41796875,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aD",
+      "roundness": {
+        "type": 3
+      },
+      "seed": 1746916641,
+      "version": 40,
+      "versionNonce": 1650978255,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763703871882,
+      "link": null,
+      "locked": false
+    },
+    {
+      "id": "XGBCPPFnjriqsL8LvLwyQ",
+      "type": "rectangle",
+      "x": 461.56640625,
+      "y": 56.162109375,
+      "width": 58.859375,
+      "height": 29.41796875,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aE",
+      "roundness": {
+        "type": 3
+      },
+      "seed": 529794575,
+      "version": 85,
+      "versionNonce": 2131900641,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763703874182,
+      "link": null,
+      "locked": false
+    },
+    {
+      "id": "FfWdx1_yCq6UYfXamJX9N",
+      "type": "arrow",
+      "x": 537.6875,
+      "y": 48.203125,
+      "width": 6.615850226297994,
+      "height": 75.81335873223107,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aF",
+      "roundness": {
+        "type": 2
+      },
+      "seed": 1982870689,
+      "version": 90,
+      "versionNonce": 25307457,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763704050188,
+      "link": null,
+      "locked": false,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          6.615850226297994,
+          -75.81335873223107
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": {
+        "elementId": "uTEFJs8cNS09WFq2pi9P7",
+        "focus": 0.6071885090336794,
+        "gap": 24.64453125
+      },
+      "startArrowhead": null,
+      "endArrowhead": "arrow",
+      "elbowed": false
+    },
+    {
+      "id": "jgJgqGMRWcaNX_28wY4CU",
+      "type": "text",
+      "x": 570,
+      "y": 10,
+      "width": 67.11994934082031,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aG",
+      "roundness": null,
+      "seed": 1065220559,
+      "version": 26,
+      "versionNonce": 2115991521,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703959397,
+      "link": null,
+      "locked": false,
+      "text": "update",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "update",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "_5pSPPOpp9h1TpFCIc055",
+      "type": "text",
+      "x": 292.36328125,
+      "y": -138.5703125,
+      "width": 122.87992858886719,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aH",
+      "roundness": null,
+      "seed": 51461025,
+      "version": 26,
+      "versionNonce": 1647492655,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763703925147,
+      "link": null,
+      "locked": false,
+      "text": "ADD Memory",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "ADD Memory",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "YG6MdL14l7lk4ypQNMZ_k",
+      "type": "text",
+      "x": 296.71885397566257,
+      "y": 161.399157096715,
+      "width": 295.27984619140625,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aJ",
+      "roundness": null,
+      "seed": 1183210273,
+      "version": 122,
+      "versionNonce": 1702733281,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763704085083,
+      "link": null,
+      "locked": false,
+      "text": "RETRIEVE Memory (STATIC)",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "RETRIEVE Memory (STATIC)",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "Foa3VPJYqhj1uAX5mn3n0",
+      "type": "rectangle",
+      "x": 324.7616636099071,
+      "y": 248.63213980937013,
+      "width": 135.7578125,
+      "height": 128.73828125,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aL",
+      "roundness": {
+        "type": 3
+      },
+      "seed": 995116257,
+      "version": 225,
+      "versionNonce": 1886900225,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763704055846,
+      "link": null,
+      "locked": false
+    },
+    {
+      "id": "pe3veI_yBFKYtbaJwDKQT",
+      "type": "text",
+      "x": 344.7510748617428,
+      "y": 211.06686356120565,
+      "width": 86.43992614746094,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aM",
+      "roundness": null,
+      "seed": 26673345,
+      "version": 204,
+      "versionNonce": 1004546017,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763704055846,
+      "link": null,
+      "locked": false,
+      "text": "Memories",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "Memories",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "bOlhO8AaKE86_43viu5UG",
+      "type": "text",
+      "x": 365.50408375566445,
+      "y": 269.24725381983865,
+      "width": 62.099945068359375,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aN",
+      "roundness": null,
+      "seed": 1849784033,
+      "version": 106,
+      "versionNonce": 762320737,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763704060295,
+      "link": null,
+      "locked": false,
+      "text": "chunk1",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "chunk1",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "V_iDW10PKwMe7vWb5S5HF",
+      "type": "text",
+      "x": 366.3074332757606,
+      "y": 307.03138128152926,
+      "width": 67.55995178222656,
+      "height": 25,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aO",
+      "roundness": null,
+      "seed": 1670509249,
+      "version": 186,
+      "versionNonce": 1964540737,
+      "isDeleted": false,
+      "boundElements": [],
+      "updated": 1763704060295,
+      "link": null,
+      "locked": false,
+      "text": "chunk2",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "chunk2",
+      "autoResize": true,
+      "lineHeight": 1.25
+    },
+    {
+      "id": "LHKMRdSowgcl2LsKacxTz",
+      "type": "text",
+      "x": 484.9493410573871,
+      "y": 292.45619471187945,
+      "width": 273.579833984375,
+      "height": 50,
+      "angle": 0,
+      "strokeColor": "#1e1e1e",
+      "backgroundColor": "transparent",
+      "fillStyle": "solid",
+      "strokeWidth": 2,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "frameId": null,
+      "index": "aP",
+      "roundness": null,
+      "seed": 945666991,
+      "version": 104,
+      "versionNonce": 1512137505,
+      "isDeleted": false,
+      "boundElements": null,
+      "updated": 1763704096016,
+      "link": null,
+      "locked": false,
+      "text": "RANKED By DECAY SCORE,\nTOP K",
+      "fontSize": 20,
+      "fontFamily": 5,
+      "textAlign": "left",
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "RANKED By DECAY SCORE,\nTOP K",
+      "autoResize": true,
+      "lineHeight": 1.25
+    }
+  ],
+  "appState": {
+    "gridSize": 20,
+    "gridStep": 5,
+    "gridModeEnabled": false,
+    "viewBackgroundColor": "#ffffff"
+  },
+  "files": {}
+}

astrbot/core/memory/_README.md

@@ -0,0 +1,76 @@
+## Decay Score
+
+记忆衰减分数定义为：
+
+\[
+\text{decay\_score}
+= \alpha \cdot e^{-\lambda \cdot \Delta t \cdot \beta}
+
++ (1-\alpha)\cdot (1 - e^{-\gamma \cdot c})
+\]
+
+其中：
+
++ \(\Delta t\)：自上次检索以来经过的时间（天），由 `last_retrieval_at` 计算；
++ \(c\)：检索次数，对应字段 `retrieval_count`；
++ \(\alpha\)：控制时间衰减和检索次数影响的权重；
++ \(\gamma\)：控制检索次数影响的速率；
++ \(\lambda\)：控制时间衰减的速率；
++ \(\beta\)：时间衰减调节因子；
+
+\[
+\beta = \frac{1}{1 + a \cdot c}
+\]
+
++ \(a\)：控制检索次数对时间衰减影响的权重。
+
+## ADD MEMORY
+
++ LLM 通过 `astr_add_memory` 工具调用，传入记忆内容和记忆类型。
++ 生成 `mem_id = uuid4()`。
++ 从上下文中获取 `owner_id = unified_message_origin`。
+
+步骤：
+
+1. 使用 VecDB 以新记忆内容为 query，检索前 20 条相似记忆。
+2. 从中取相似度最高的前 5 条：
+   + 若相似度超过“合并阈值”（如 `sim >= merge_threshold`）：
+     + 将该条记忆视为同一记忆，使用 LLM 将旧内容与新内容合并；
+     + 在同一个 `mem_id` 上更新 MemoryDB 和 VecDB（UPDATE，而非新建）。
+   + 否则：
+     + 作为全新的记忆插入：
+       + 写入 VecDB（metadata 中包含 `mem_id`, `owner_id`）；
+       + 写入 MemoryDB 的 `memory_chunks` 表，初始化：
+         + `created_at = now`
+         + `last_retrieval_at = now`
+         + `retrieval_count = 1` 等。
+3. 对 VecDB 返回的前 20 条记忆，如果相似度高于某个“赫布阈值”（`hebb_threshold`），则：
+   + `retrieval_count += 1`
+   + `last_retrieval_at = now`
+
+这一步体现了赫布学习：与新记忆共同被激活的旧记忆会获得一次强化。
+
+## QUERY MEMORY (STATIC)
+
++ LLM 通过 `astr_query_memory` 工具调用，无参数。
+
+步骤：
+
+1. 从 MemoryDB 的 `memory_chunks` 表中查询当前用户所有活跃记忆：
+   + `SELECT * FROM memory_chunks WHERE owner_id = ? AND is_active = 1`
+2. 对每条记忆，根据 `last_retrieval_at` 和 `retrieval_count` 计算对应的 `decay_score`。
+3. 按 `decay_score` 从高到低排序，返回前 `top_k` 条记忆内容给 LLM。
+4. 对返回的这 `top_k` 条记忆：
+   + `retrieval_count += 1`
+   + `last_retrieval_at = now`
+
+## QUERY MEMORY (DYNAMIC)（暂不实现）
+
++ LLM 提供查询内容作为语义 query。
++ 使用 VecDB 检索与该 query 最相似的前 `N` 条记忆（`N > top_k`）。
++ 根据 `mem_id` 从 `memory_chunks` 中加载对应记录。
++ 对这批候选记忆计算：
+  + 语义相似度（来自 VecDB）
+  + `decay_score`
+  + 最终排序分数（例如 `w1 * sim + w2 * decay_score`）
++ 按最终排序分数从高到低返回前 `top_k` 条记忆内容，并更新它们的 `retrieval_count` 和 `last_retrieval_at`。

astrbot/core/memory/entities.py

@@ -0,0 +1,63 @@
+import uuid
+from datetime import datetime, timezone
+
+import numpy as np
+from sqlmodel import Field, MetaData, SQLModel
+
+MEMORY_TYPE_IMPORTANCE = {"persona": 1.3, "fact": 1.0, "ephemeral": 0.8}
+
+
+class BaseMemoryModel(SQLModel, table=False):
+    metadata = MetaData()
+
+
+class MemoryChunk(BaseMemoryModel, table=True):
+    """A chunk of memory stored in the system."""
+
+    __tablename__ = "memory_chunks"  # type: ignore
+
+    id: int | None = Field(
+        primary_key=True,
+        sa_column_kwargs={"autoincrement": True},
+        default=None,
+    )
+    mem_id: str = Field(
+        max_length=36,
+        nullable=False,
+        unique=True,
+        default_factory=lambda: str(uuid.uuid4()),
+        index=True,
+    )
+    fact: str = Field(nullable=False)
+    """The factual content of the memory chunk."""
+    owner_id: str = Field(max_length=255, nullable=False, index=True)
+    """The identifier of the owner (user) of the memory chunk."""
+    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    """The timestamp when the memory chunk was created."""
+    last_retrieval_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc)
+    )
+    """The timestamp when the memory chunk was last retrieved."""
+    retrieval_count: int = Field(default=1, nullable=False)
+    """The number of times the memory chunk has been retrieved."""
+    memory_type: str = Field(max_length=20, nullable=False, default="fact")
+    """The type of memory (e.g., 'persona', 'fact', 'ephemeral')."""
+    is_active: bool = Field(default=True, nullable=False)
+    """Whether the memory chunk is active."""
+
+    def compute_decay_score(self, current_time: datetime) -> float:
+        """Compute the decay score of the memory chunk based on time and retrievals."""
+        # Constants for the decay formula
+        alpha = 0.5
+        gamma = 0.1
+        lambda_ = 0.05
+        a = 0.1
+
+        # Calculate delta_t in days
+        delta_t = (current_time - self.last_retrieval_at).total_seconds() / 86400
+        c = self.retrieval_count
+        beta = 1 / (1 + a * c)
+        decay_score = alpha * np.exp(-lambda_ * delta_t * beta) + (1 - alpha) * (
+            1 - np.exp(-gamma * c)
+        )
+        return decay_score * MEMORY_TYPE_IMPORTANCE.get(self.memory_type, 1.0)

astrbot/core/memory/mem_db_sqlite.py

@@ -0,0 +1,174 @@
+from contextlib import asynccontextmanager
+from datetime import datetime, timezone
+from pathlib import Path
+
+from sqlalchemy import select, text, update
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlmodel import col
+
+from astrbot.core import logger
+
+from .entities import BaseMemoryModel, MemoryChunk
+
+
+class MemoryDatabase:
+    def __init__(self, db_path: str = "data/astr_memory/memory.db") -> None:
+        """Initialize memory database
+
+        Args:
+            db_path: Database file path, default is data/astr_memory/memory.db
+
+        """
+        self.db_path = db_path
+        self.DATABASE_URL = f"sqlite+aiosqlite:///{db_path}"
+        self.inited = False
+
+        # Ensure directory exists
+        Path(db_path).parent.mkdir(parents=True, exist_ok=True)
+
+        # Create async engine
+        self.engine = create_async_engine(
+            self.DATABASE_URL,
+            echo=False,
+            pool_pre_ping=True,
+            pool_recycle=3600,
+        )
+
+        # Create session factory
+        self.async_session = async_sessionmaker(
+            self.engine,
+            class_=AsyncSession,
+            expire_on_commit=False,
+        )
+
+    @asynccontextmanager
+    async def get_db(self):
+        """Get database session
+
+        Usage:
+            async with mem_db.get_db() as session:
+                # Perform database operations
+                result = await session.execute(stmt)
+        """
+        async with self.async_session() as session:
+            yield session
+
+    async def initialize(self) -> None:
+        """Initialize database, create tables and configure SQLite parameters"""
+        async with self.engine.begin() as conn:
+            # Create all memory related tables
+            await conn.run_sync(BaseMemoryModel.metadata.create_all)
+
+            # Configure SQLite performance optimization parameters
+            await conn.execute(text("PRAGMA journal_mode=WAL"))
+            await conn.execute(text("PRAGMA synchronous=NORMAL"))
+            await conn.execute(text("PRAGMA cache_size=20000"))
+            await conn.execute(text("PRAGMA temp_store=MEMORY"))
+            await conn.execute(text("PRAGMA mmap_size=134217728"))
+            await conn.execute(text("PRAGMA optimize"))
+            await conn.commit()
+
+        await self._create_indexes()
+        self.inited = True
+        logger.info(f"Memory database initialized: {self.db_path}")
+
+    async def _create_indexes(self) -> None:
+        """Create indexes for memory_chunks table"""
+        async with self.get_db() as session:
+            async with session.begin():
+                # Create memory chunks table indexes
+                await session.execute(
+                    text(
+                        "CREATE INDEX IF NOT EXISTS idx_mem_mem_id "
+                        "ON memory_chunks(mem_id)",
+                    ),
+                )
+                await session.execute(
+                    text(
+                        "CREATE INDEX IF NOT EXISTS idx_mem_owner_id "
+                        "ON memory_chunks(owner_id)",
+                    ),
+                )
+                await session.execute(
+                    text(
+                        "CREATE INDEX IF NOT EXISTS idx_mem_owner_active "
+                        "ON memory_chunks(owner_id, is_active)",
+                    ),
+                )
+                await session.commit()
+
+    async def close(self) -> None:
+        """Close database connection"""
+        await self.engine.dispose()
+        logger.info(f"Memory database closed: {self.db_path}")
+
+    async def insert_memory(self, memory: MemoryChunk) -> MemoryChunk:
+        """Insert a new memory chunk"""
+        async with self.get_db() as session:
+            session.add(memory)
+            await session.commit()
+            await session.refresh(memory)
+            return memory
+
+    async def get_memory_by_id(self, mem_id: str) -> MemoryChunk | None:
+        """Get memory chunk by mem_id"""
+        async with self.get_db() as session:
+            stmt = select(MemoryChunk).where(col(MemoryChunk.mem_id) == mem_id)
+            result = await session.execute(stmt)
+            return result.scalar_one_or_none()
+
+    async def update_memory(self, memory: MemoryChunk) -> MemoryChunk:
+        """Update an existing memory chunk"""
+        async with self.get_db() as session:
+            session.add(memory)
+            await session.commit()
+            await session.refresh(memory)
+            return memory
+
+    async def get_active_memories(self, owner_id: str) -> list[MemoryChunk]:
+        """Get all active memories for a user"""
+        async with self.get_db() as session:
+            stmt = select(MemoryChunk).where(
+                col(MemoryChunk.owner_id) == owner_id,
+                col(MemoryChunk.is_active) == True,  # noqa: E712
+            )
+            result = await session.execute(stmt)
+            return list(result.scalars().all())
+
+    async def update_retrieval_stats(
+        self,
+        mem_ids: list[str],
+        current_time: datetime | None = None,
+    ) -> None:
+        """Update retrieval statistics for multiple memories"""
+        if not mem_ids:
+            return
+
+        if current_time is None:
+            current_time = datetime.now(timezone.utc)
+
+        async with self.get_db() as session:
+            async with session.begin():
+                stmt = (
+                    update(MemoryChunk)
+                    .where(col(MemoryChunk.mem_id).in_(mem_ids))
+                    .values(
+                        retrieval_count=MemoryChunk.retrieval_count + 1,
+                        last_retrieval_at=current_time,
+                    )
+                )
+                await session.execute(stmt)
+                await session.commit()
+
+    async def deactivate_memory(self, mem_id: str) -> bool:
+        """Deactivate a memory chunk"""
+        async with self.get_db() as session:
+            async with session.begin():
+                stmt = (
+                    update(MemoryChunk)
+                    .where(col(MemoryChunk.mem_id) == mem_id)
+                    .values(is_active=False)
+                )
+                result = await session.execute(stmt)
+                await session.commit()
+                return result.rowcount > 0 if result.rowcount else False  # type: ignore

astrbot/core/memory/memory_manager.py

@@ -0,0 +1,281 @@
+import json
+import uuid
+from datetime import datetime, timezone
+from pathlib import Path
+
+from astrbot.core import logger
+from astrbot.core.db.vec_db.faiss_impl import FaissVecDB
+from astrbot.core.provider.provider import EmbeddingProvider
+from astrbot.core.provider.provider import Provider as LLMProvider
+
+from .entities import MemoryChunk
+from .mem_db_sqlite import MemoryDatabase
+
+MERGE_THRESHOLD = 0.85
+"""Similarity threshold for merging memories"""
+HEBB_THRESHOLD = 0.70
+"""Similarity threshold for Hebbian learning reinforcement"""
+MERGE_SYSTEM_PROMPT = """You are a memory consolidation assistant. Your task is to merge two related memory entries into a single, comprehensive memory.
+
+Input format:
+- Old memory: [existing memory content]
+- New memory: [new memory content to be integrated]
+
+Your output should be a single, concise memory that combines the essential information from both entries. Preserve specific details, update outdated information, and eliminate redundancy. Output only the merged memory content without any explanations or meta-commentary."""
+
+
+class MemoryManager:
+    """Manager for user long-term memory storage and retrieval"""
+
+    def __init__(self, memory_root_dir: str = "data/astr_memory"):
+        self.memory_root_dir = Path(memory_root_dir)
+        self.memory_root_dir.mkdir(parents=True, exist_ok=True)
+
+        self.mem_db: MemoryDatabase | None = None
+        self.vec_db: FaissVecDB | None = None
+
+        self._initialized = False
+
+    async def initialize(
+        self,
+        embedding_provider: EmbeddingProvider,
+        merge_llm_provider: LLMProvider,
+    ):
+        """Initialize memory database and vector database"""
+        # Initialize MemoryDB
+        db_path = self.memory_root_dir / "memory.db"
+        self.mem_db = MemoryDatabase(db_path.as_posix())
+        await self.mem_db.initialize()
+
+        self.embedding_provider = embedding_provider
+        self.merge_llm_provider = merge_llm_provider
+
+        # Initialize VecDB
+        doc_store_path = self.memory_root_dir / "doc.db"
+        index_store_path = self.memory_root_dir / "index.faiss"
+        self.vec_db = FaissVecDB(
+            doc_store_path=doc_store_path.as_posix(),
+            index_store_path=index_store_path.as_posix(),
+            embedding_provider=self.embedding_provider,
+        )
+        await self.vec_db.initialize()
+
+        logger.info("Memory manager initialized")
+        self._initialized = True
+
+    async def terminate(self):
+        """Close all database connections"""
+        if self.vec_db:
+            await self.vec_db.close()
+        if self.mem_db:
+            await self.mem_db.close()
+
+    async def add_memory(
+        self,
+        fact: str,
+        owner_id: str,
+        memory_type: str = "fact",
+    ) -> MemoryChunk:
+        """Add a new memory with similarity check and merge logic
+
+        Implements the ADD MEMORY workflow from _README.md:
+        1. Search for similar memories using VecDB
+        2. If similarity >= merge_threshold, merge with existing memory
+        3. Otherwise, create new memory
+        4. Apply Hebbian learning to similar memories (similarity >= hebb_threshold)
+
+        Args:
+            fact: Memory content
+            owner_id: User identifier
+            memory_type: Memory type ('persona', 'fact', 'ephemeral')
+
+        Returns:
+            The created or updated MemoryChunk
+
+        """
+        if not self.vec_db or not self.mem_db:
+            raise RuntimeError("Memory manager not initialized")
+
+        current_time = datetime.now(timezone.utc)
+
+        # Step 1: Search for similar memories
+        similar_results = await self.vec_db.retrieve(
+            query=fact,
+            k=20,
+            fetch_k=50,
+            metadata_filters={"owner_id": owner_id},
+        )
+
+        # Step 2: Check if we should merge with existing memories (top 3 similar ones)
+        merge_candidates = [
+            r for r in similar_results[:3] if r.similarity >= MERGE_THRESHOLD
+        ]
+
+        if merge_candidates:
+            # Get all candidate memories from database
+            candidate_memories: list[tuple[str, MemoryChunk]] = []
+            for candidate in merge_candidates:
+                mem_id = json.loads(candidate.data["metadata"])["mem_id"]
+                memory = await self.mem_db.get_memory_by_id(mem_id)
+                if memory:
+                    candidate_memories.append((mem_id, memory))
+
+            if candidate_memories:
+                # Use the most similar memory as the base
+                base_mem_id, base_memory = candidate_memories[0]
+
+                # Collect all facts to merge (existing candidates + new fact)
+                all_facts = [mem.fact for _, mem in candidate_memories] + [fact]
+                merged_fact = await self._merge_multiple_memories(all_facts)
+
+                # Update the base memory
+                base_memory.fact = merged_fact
+                base_memory.last_retrieval_at = current_time
+                base_memory.retrieval_count += 1
+                updated_memory = await self.mem_db.update_memory(base_memory)
+
+                # Update VecDB for base memory
+                await self.vec_db.delete(base_mem_id)
+                await self.vec_db.insert(
+                    content=merged_fact,
+                    metadata={
+                        "mem_id": base_mem_id,
+                        "owner_id": owner_id,
+                        "memory_type": memory_type,
+                    },
+                    id=base_mem_id,
+                )
+
+                # Deactivate and remove other merged memories
+                for mem_id, _ in candidate_memories[1:]:
+                    await self.mem_db.deactivate_memory(mem_id)
+                    await self.vec_db.delete(mem_id)
+
+                logger.info(
+                    f"Merged {len(candidate_memories)} memories into {base_mem_id} for user {owner_id}"
+                )
+                return updated_memory
+
+        # Step 3: Create new memory
+        mem_id = str(uuid.uuid4())
+        new_memory = MemoryChunk(
+            mem_id=mem_id,
+            fact=fact,
+            owner_id=owner_id,
+            memory_type=memory_type,
+            created_at=current_time,
+            last_retrieval_at=current_time,
+            retrieval_count=1,
+            is_active=True,
+        )
+
+        # Insert into MemoryDB
+        created_memory = await self.mem_db.insert_memory(new_memory)
+
+        # Insert into VecDB
+        await self.vec_db.insert(
+            content=fact,
+            metadata={
+                "mem_id": mem_id,
+                "owner_id": owner_id,
+                "memory_type": memory_type,
+            },
+            id=mem_id,
+        )
+
+        # Step 4: Apply Hebbian learning to similar memories
+        hebb_mem_ids = [
+            json.loads(r.data["metadata"])["mem_id"]
+            for r in similar_results
+            if r.similarity >= HEBB_THRESHOLD
+        ]
+        if hebb_mem_ids:
+            await self.mem_db.update_retrieval_stats(hebb_mem_ids, current_time)
+            logger.debug(
+                f"Applied Hebbian learning to {len(hebb_mem_ids)} memories for user {owner_id}",
+            )
+
+        logger.info(f"Created new memory {mem_id} for user {owner_id}")
+        return created_memory
+
+    async def query_memory(
+        self,
+        owner_id: str,
+        top_k: int = 5,
+    ) -> list[MemoryChunk]:
+        """Query user's memories using static retrieval with decay score ranking
+
+        Implements the QUERY MEMORY (STATIC) workflow from _README.md:
+        1. Get all active memories for user from MemoryDB
+        2. Compute decay_score for each memory
+        3. Sort by decay_score and return top_k
+        4. Update retrieval statistics for returned memories
+
+        Args:
+            owner_id: User identifier
+            top_k: Number of memories to return
+
+        Returns:
+            List of top_k MemoryChunk sorted by decay score
+        """
+        if not self.mem_db:
+            raise RuntimeError("Memory manager not initialized")
+
+        current_time = datetime.now(timezone.utc)
+
+        # Step 1: Get all active memories for user
+        all_memories = await self.mem_db.get_active_memories(owner_id)
+
+        if not all_memories:
+            return []
+
+        # Step 2-3: Compute decay scores and sort
+        memories_with_scores = [
+            (mem, mem.compute_decay_score(current_time)) for mem in all_memories
+        ]
+        memories_with_scores.sort(key=lambda x: x[1], reverse=True)
+
+        # Get top_k memories
+        top_memories = [mem for mem, _ in memories_with_scores[:top_k]]
+
+        # Step 4: Update retrieval statistics
+        mem_ids = [mem.mem_id for mem in top_memories]
+        await self.mem_db.update_retrieval_stats(mem_ids, current_time)
+
+        logger.debug(f"Retrieved {len(top_memories)} memories for user {owner_id}")
+        return top_memories
+
+    async def _merge_multiple_memories(self, facts: list[str]) -> str:
+        """Merge multiple memory facts using LLM in one call
+
+        Args:
+            facts: List of memory facts to merge
+
+        Returns:
+            Merged memory content
+        """
+        if not self.merge_llm_provider:
+            return " ".join(facts)
+
+        if len(facts) == 1:
+            return facts[0]
+
+        try:
+            # Format all facts as a numbered list
+            facts_list = "\n".join(f"{i + 1}. {fact}" for i, fact in enumerate(facts))
+            user_prompt = (
+                f"Please merge the following {len(facts)} related memory entries "
+                "into a single, comprehensive memory:"
+                f"\n{facts_list}\n\nOutput only the merged memory content."
+            )
+            response = await self.merge_llm_provider.text_chat(
+                prompt=user_prompt,
+                system_prompt=MERGE_SYSTEM_PROMPT,
+            )
+
+            merged_content = response.completion_text.strip()
+            return merged_content if merged_content else " ".join(facts)
+
+        except Exception as e:
+            logger.warning(f"Failed to merge memories with LLM: {e}, using fallback")
+            return " ".join(facts)

astrbot/core/memory/tools.py

@@ -0,0 +1,156 @@
+from pydantic import Field
+from pydantic.dataclasses import dataclass
+
+from astrbot.core.agent.tool import FunctionTool, ToolExecResult
+from astrbot.core.astr_agent_context import AstrAgentContext, ContextWrapper
+
+
+@dataclass
+class AddMemory(FunctionTool[AstrAgentContext]):
+    """Tool for adding memories to user's long-term memory storage"""
+
+    name: str = "astr_add_memory"
+    description: str = (
+        "Add a new memory to the user's long-term memory storage. "
+        "Use this tool only when the user explicitly asks you to remember something, "
+        "or when they share stable preferences, identity, or long-term goals that will be useful in future interactions."
+    )
+    parameters: dict = Field(
+        default_factory=lambda: {
+            "type": "object",
+            "properties": {
+                "fact": {
+                    "type": "string",
+                    "description": (
+                        "The concrete memory content to store, such as a user preference, "
+                        "identity detail, long-term goal, or stable profile fact."
+                    ),
+                },
+                "memory_type": {
+                    "type": "string",
+                    "enum": ["persona", "fact", "ephemeral"],
+                    "description": (
+                        "The relative importance of this memory. "
+                        "Use 'persona' for core identity or highly impactful information, "
+                        "'fact' for normal long-term preferences, "
+                        "and 'ephemeral' for minor or tentative facts."
+                    ),
+                },
+            },
+            "required": ["fact", "memory_type"],
+        }
+    )
+
+    async def call(
+        self, context: ContextWrapper[AstrAgentContext], **kwargs
+    ) -> ToolExecResult:
+        """Add a memory to long-term storage
+
+        Args:
+            context: Agent context
+            **kwargs: Must contain 'fact' and 'memory_type'
+
+        Returns:
+            ToolExecResult with success message
+
+        """
+        mm = context.context.context.memory_manager
+        fact = kwargs.get("fact")
+        memory_type = kwargs.get("memory_type", "fact")
+
+        if not fact:
+            return "Missing required parameter: fact"
+
+        try:
+            # Get owner_id from context
+            owner_id = context.context.event.unified_msg_origin
+
+            # Add memory using memory manager
+            memory = await mm.add_memory(
+                fact=fact,
+                owner_id=owner_id,
+                memory_type=memory_type,
+            )
+
+            return f"Memory added successfully (ID: {memory.mem_id})"
+
+        except Exception as e:
+            return f"Failed to add memory: {str(e)}"
+
+
+@dataclass
+class QueryMemory(FunctionTool[AstrAgentContext]):
+    """Tool for querying user's long-term memories"""
+
+    name: str = "astr_query_memory"
+    description: str = (
+        "Query the user's long-term memory storage and return the most relevant memories. "
+        "Use this tool when you need user-specific context, preferences, or past facts "
+        "that are not explicitly present in the current conversation."
+    )
+    parameters: dict = Field(
+        default_factory=lambda: {
+            "type": "object",
+            "properties": {
+                "top_k": {
+                    "type": "integer",
+                    "description": (
+                        "Maximum number of memories to retrieve after retention-based ranking. "
+                        "Typically between 3 and 10."
+                    ),
+                    "default": 5,
+                    "minimum": 1,
+                    "maximum": 20,
+                },
+            },
+            "required": [],
+        }
+    )
+
+    async def call(
+        self, context: ContextWrapper[AstrAgentContext], **kwargs
+    ) -> ToolExecResult:
+        """Query memories from long-term storage
+
+        Args:
+            context: Agent context
+            **kwargs: Optional 'top_k' parameter
+
+        Returns:
+            ToolExecResult with formatted memory list
+
+        """
+        mm = context.context.context.memory_manager
+        top_k = kwargs.get("top_k", 5)
+
+        try:
+            # Get owner_id from context
+            owner_id = context.context.event.unified_msg_origin
+
+            # Query memories using memory manager
+            memories = await mm.query_memory(
+                owner_id=owner_id,
+                top_k=top_k,
+            )
+
+            if not memories:
+                return "No memories found for this user."
+
+            # Format memories for output
+            formatted_memories = []
+            for i, mem in enumerate(memories, 1):
+                formatted_memories.append(
+                    f"{i}. [{mem.memory_type.upper()}] {mem.fact} "
+                    f"(retrieved {mem.retrieval_count} times, "
+                    f"last: {mem.last_retrieval_at.strftime('%Y-%m-%d')})"
+                )
+
+            result_text = "Retrieved memories:\n" + "\n".join(formatted_memories)
+            return result_text
+
+        except Exception as e:
+            return f"Failed to query memories: {str(e)}"
+
+
+ADD_MEMORY_TOOL = AddMemory()
+QUERY_MEMORY_TOOL = QueryMemory()

astrbot/core/message/components.py

@@ -66,9 +66,6 @@ class ComponentType(str, Enum):
 class BaseMessageComponent(BaseModel):
     type: ComponentType
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
     def toDict(self):
         data = {}
         for k, v in self.__dict__.items():
@@ -554,7 +551,7 @@ class Node(BaseMessageComponent):
     id: int | None = 0  # 忽略
     name: str | None = ""  # qq昵称
     uin: str | None = "0"  # qq号
-    content: list[BaseMessageComponent] = []
+    content: list[BaseMessageComponent] | None = []
     seq: str | list | None = ""  # 忽略
     time: int | None = 0  # 忽略
 
@@ -618,7 +615,7 @@ class Nodes(BaseMessageComponent):
             ret["messages"].append(d)
         return ret
 
-    async def to_dict(self) -> dict:
+    async def to_dict(self):
         """将 Nodes 转换为字典格式，适用于 OneBot JSON 格式"""
         ret = {"messages": []}
         for node in self.nodes:
@@ -629,11 +626,12 @@ class Nodes(BaseMessageComponent):
 
 class Json(BaseMessageComponent):
     type = ComponentType.Json
-    data: dict
+    data: str | dict
+    resid: int | None = 0
 
-    def __init__(self, data: str | dict, **_):
-        if isinstance(data, str):
-            data = json.loads(data)
+    def __init__(self, data, **_):
+        if isinstance(data, dict):
+            data = json.dumps(data)
         super().__init__(data=data, **_)
 
 
@@ -716,23 +714,15 @@ class File(BaseMessageComponent):
 
         if self.url:
             await self._download_file()
-            if self.file_:
-                return os.path.abspath(self.file_)
+            return os.path.abspath(self.file_)
 
         return ""
 
     async def _download_file(self):
         """下载文件"""
-        if not self.url:
-            raise ValueError("Download failed: No URL provided in File component.")
         download_dir = os.path.join(get_astrbot_data_path(), "temp")
         os.makedirs(download_dir, exist_ok=True)
-        if self.name:
-            name, ext = os.path.splitext(self.name)
-            filename = f"{name}_{uuid.uuid4().hex[:8]}{ext}"
-        else:
-            filename = f"{uuid.uuid4().hex}"
-        file_path = os.path.join(download_dir, filename)
+        file_path = os.path.join(download_dir, f"{uuid.uuid4().hex}")
         await download_file(self.url, file_path)
         self.file_ = os.path.abspath(file_path)
 

astrbot/core/persona_mgr.py

@@ -98,8 +98,8 @@ class PersonaManager:
         self,
         persona_id: str,
         system_prompt: str,
-        begin_dialogs: list[str] | None = None,
-        tools: list[str] | None = None,
+        begin_dialogs: list[str] = None,
+        tools: list[str] = None,
     ) -> Persona:
         """创建新的 persona。tools 参数为 None 时表示使用所有工具，空列表表示不使用任何工具"""
         if await self.db.get_persona_by_id(persona_id):

astrbot/core/pipeline/content_safety_check/stage.py

@@ -24,7 +24,7 @@ class ContentSafetyCheckStage(Stage):
         self,
         event: AstrMessageEvent,
         check_text: str | None = None,
-    ) -> AsyncGenerator[None, None]:
+    ) -> None | AsyncGenerator[None, None]:
         """检查内容安全"""
         text = check_text if check_text else event.get_message_str()
         ok, info = self.strategy_selector.check(text)

astrbot/core/pipeline/context_utils.py

@@ -11,7 +11,7 @@ from astrbot.core.star.star_handler import EventType, star_handlers_registry
 
 async def call_handler(
     event: AstrMessageEvent,
-    handler: T.Callable[..., T.Awaitable[T.Any] | T.AsyncGenerator[T.Any, None]],
+    handler: T.Callable[..., T.Awaitable[T.Any]],
     *args,
     **kwargs,
 ) -> T.AsyncGenerator[T.Any, None]:
@@ -91,7 +91,6 @@ async def call_event_hook(
     )
     for handler in handlers:
         try:
-            assert inspect.iscoroutinefunction(handler.handler)
             logger.debug(
                 f"hook({hook_type.name}) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}",
             )

astrbot/core/pipeline/process_stage/method/agent_request.py

@@ -1,48 +0,0 @@
-from collections.abc import AsyncGenerator
-
-from astrbot.core import logger
-from astrbot.core.platform.astr_message_event import AstrMessageEvent
-from astrbot.core.star.session_llm_manager import SessionServiceManager
-
-from ...context import PipelineContext
-from ..stage import Stage
-from .agent_sub_stages.internal import InternalAgentSubStage
-from .agent_sub_stages.third_party import ThirdPartyAgentSubStage
-
-
-class AgentRequestSubStage(Stage):
-    async def initialize(self, ctx: PipelineContext) -> None:
-        self.ctx = ctx
-        self.config = ctx.astrbot_config
-
-        self.bot_wake_prefixs: list[str] = self.config["wake_prefix"]
-        self.prov_wake_prefix: str = self.config["provider_settings"]["wake_prefix"]
-        for bwp in self.bot_wake_prefixs:
-            if self.prov_wake_prefix.startswith(bwp):
-                logger.info(
-                    f"识别 LLM 聊天额外唤醒前缀 {self.prov_wake_prefix} 以机器人唤醒前缀 {bwp} 开头，已自动去除。",
-                )
-                self.prov_wake_prefix = self.prov_wake_prefix[len(bwp) :]
-
-        agent_runner_type = self.config["provider_settings"]["agent_runner_type"]
-        if agent_runner_type == "local":
-            self.agent_sub_stage = InternalAgentSubStage()
-        else:
-            self.agent_sub_stage = ThirdPartyAgentSubStage()
-        await self.agent_sub_stage.initialize(ctx)
-
-    async def process(self, event: AstrMessageEvent) -> AsyncGenerator[None, None]:
-        if not self.ctx.astrbot_config["provider_settings"]["enable"]:
-            logger.debug(
-                "This pipeline does not enable AI capability, skip processing."
-            )
-            return
-
-        if not SessionServiceManager.should_process_llm_request(event):
-            logger.debug(
-                f"The session {event.unified_msg_origin} has disabled AI capability, skipping processing."
-            )
-            return
-
-        async for resp in self.agent_sub_stage.process(event, self.prov_wake_prefix):
-            yield resp

astrbot/core/pipeline/process_stage/method/agent_sub_stages/third_party.py

@@ -1,205 +0,0 @@
-import asyncio
-from collections.abc import AsyncGenerator
-from typing import TYPE_CHECKING
-
-from astrbot.core import astrbot_config, logger
-from astrbot.core.agent.runners.coze.coze_agent_runner import CozeAgentRunner
-from astrbot.core.agent.runners.dashscope.dashscope_agent_runner import (
-    DashscopeAgentRunner,
-)
-from astrbot.core.agent.runners.dify.dify_agent_runner import DifyAgentRunner
-from astrbot.core.message.components import Image
-from astrbot.core.message.message_event_result import (
-    MessageChain,
-    MessageEventResult,
-    ResultContentType,
-)
-
-if TYPE_CHECKING:
-    from astrbot.core.agent.runners.base import BaseAgentRunner
-from astrbot.core.platform.astr_message_event import AstrMessageEvent
-from astrbot.core.provider.entities import (
-    ProviderRequest,
-)
-from astrbot.core.star.star_handler import EventType
-from astrbot.core.utils.metrics import Metric
-
-from .....astr_agent_context import AgentContextWrapper, AstrAgentContext
-from .....astr_agent_hooks import MAIN_AGENT_HOOKS
-from ....context import PipelineContext, call_event_hook
-from ...stage import Stage
-
-AGENT_RUNNER_TYPE_KEY = {
-    "dify": "dify_agent_runner_provider_id",
-    "coze": "coze_agent_runner_provider_id",
-    "dashscope": "dashscope_agent_runner_provider_id",
-}
-
-
-async def run_third_party_agent(
-    runner: "BaseAgentRunner",
-    stream_to_general: bool = False,
-) -> AsyncGenerator[MessageChain | None, None]:
-    """
-    运行第三方 agent runner 并转换响应格式
-    类似于 run_agent 函数，但专门处理第三方 agent runner
-    """
-    try:
-        async for resp in runner.step_until_done(max_step=30):  # type: ignore[misc]
-            if resp.type == "streaming_delta":
-                if stream_to_general:
-                    continue
-                yield resp.data["chain"]
-            elif resp.type == "llm_result":
-                if stream_to_general:
-                    yield resp.data["chain"]
-    except Exception as e:
-        logger.error(f"Third party agent runner error: {e}")
-        err_msg = (
-            f"\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n"
-            f"错误信息: {e!s}\n\n请在平台日志查看和分享错误详情。\n"
-        )
-        yield MessageChain().message(err_msg)
-
-
-class ThirdPartyAgentSubStage(Stage):
-    async def initialize(self, ctx: PipelineContext) -> None:
-        self.ctx = ctx
-        self.conf = ctx.astrbot_config
-        self.runner_type = self.conf["provider_settings"]["agent_runner_type"]
-        self.prov_id = self.conf["provider_settings"].get(
-            AGENT_RUNNER_TYPE_KEY.get(self.runner_type, ""),
-            "",
-        )
-        settings = ctx.astrbot_config["provider_settings"]
-        self.streaming_response: bool = settings["streaming_response"]
-        self.unsupported_streaming_strategy: str = settings[
-            "unsupported_streaming_strategy"
-        ]
-
-    async def process(
-        self, event: AstrMessageEvent, provider_wake_prefix: str
-    ) -> AsyncGenerator[None, None]:
-        req: ProviderRequest | None = None
-
-        if provider_wake_prefix and not event.message_str.startswith(
-            provider_wake_prefix
-        ):
-            return
-
-        self.prov_cfg: dict = next(
-            (p for p in astrbot_config["provider"] if p["id"] == self.prov_id),
-            {},
-        )
-        if not self.prov_id:
-            logger.error("没有填写 Agent Runner 提供商 ID，请前往配置页面配置。")
-            return
-        if not self.prov_cfg:
-            logger.error(
-                f"Agent Runner 提供商 {self.prov_id} 配置不存在，请前往配置页面修改配置。"
-            )
-            return
-
-        # make provider request
-        req = ProviderRequest()
-        req.session_id = event.unified_msg_origin
-        req.prompt = event.message_str[len(provider_wake_prefix) :]
-        for comp in event.message_obj.message:
-            if isinstance(comp, Image):
-                image_path = await comp.convert_to_base64()
-                req.image_urls.append(image_path)
-
-        if not req.prompt and not req.image_urls:
-            return
-
-        # call event hook
-        if await call_event_hook(event, EventType.OnLLMRequestEvent, req):
-            return
-
-        if self.runner_type == "dify":
-            runner = DifyAgentRunner[AstrAgentContext]()
-        elif self.runner_type == "coze":
-            runner = CozeAgentRunner[AstrAgentContext]()
-        elif self.runner_type == "dashscope":
-            runner = DashscopeAgentRunner[AstrAgentContext]()
-        else:
-            raise ValueError(
-                f"Unsupported third party agent runner type: {self.runner_type}",
-            )
-
-        astr_agent_ctx = AstrAgentContext(
-            context=self.ctx.plugin_manager.context,
-            event=event,
-        )
-
-        streaming_response = self.streaming_response
-        if (enable_streaming := event.get_extra("enable_streaming")) is not None:
-            streaming_response = bool(enable_streaming)
-
-        stream_to_general = (
-            self.unsupported_streaming_strategy == "turn_off"
-            and not event.platform_meta.support_streaming_message
-        )
-
-        await runner.reset(
-            request=req,
-            run_context=AgentContextWrapper(
-                context=astr_agent_ctx,
-                tool_call_timeout=60,
-            ),
-            agent_hooks=MAIN_AGENT_HOOKS,
-            provider_config=self.prov_cfg,
-            streaming=streaming_response,
-        )
-
-        if streaming_response and not stream_to_general:
-            # 流式响应
-            event.set_result(
-                MessageEventResult()
-                .set_result_content_type(ResultContentType.STREAMING_RESULT)
-                .set_async_stream(
-                    run_third_party_agent(
-                        runner,
-                        stream_to_general=False,
-                    ),
-                ),
-            )
-            yield
-            if runner.done():
-                final_resp = runner.get_final_llm_resp()
-                if final_resp and final_resp.result_chain:
-                    event.set_result(
-                        MessageEventResult(
-                            chain=final_resp.result_chain.chain or [],
-                            result_content_type=ResultContentType.STREAMING_FINISH,
-                        ),
-                    )
-        else:
-            # 非流式响应或转换为普通响应
-            async for _ in run_third_party_agent(
-                runner,
-                stream_to_general=stream_to_general,
-            ):
-                yield
-
-            final_resp = runner.get_final_llm_resp()
-
-            if not final_resp or not final_resp.result_chain:
-                logger.warning("Agent Runner 未返回最终结果。")
-                return
-
-            event.set_result(
-                MessageEventResult(
-                    chain=final_resp.result_chain.chain or [],
-                    result_content_type=ResultContentType.LLM_RESULT,
-                ),
-            )
-            yield
-
-        asyncio.create_task(
-            Metric.upload(
-                llm_tick=1,
-                model_name=self.runner_type,
-                provider_type=self.runner_type,
-            ),
-        )

astrbot/core/pipeline/process_stage/method/llm_request.py

@@ -9,7 +9,7 @@ from astrbot.core import logger
 from astrbot.core.agent.tool import ToolSet
 from astrbot.core.astr_agent_context import AstrAgentContext
 from astrbot.core.conversation_mgr import Conversation
-from astrbot.core.message.components import File, Image, Reply
+from astrbot.core.message.components import Image
 from astrbot.core.message.message_event_result import (
     MessageChain,
     MessageEventResult,
@@ -21,25 +21,28 @@ from astrbot.core.provider.entities import (
     LLMResponse,
     ProviderRequest,
 )
+from astrbot.core.star.session_llm_manager import SessionServiceManager
 from astrbot.core.star.star_handler import EventType, star_map
-from astrbot.core.utils.file_extract import extract_file_moonshotai
 from astrbot.core.utils.metrics import Metric
 from astrbot.core.utils.session_lock import session_lock_manager
 
-from .....astr_agent_context import AgentContextWrapper
-from .....astr_agent_hooks import MAIN_AGENT_HOOKS
-from .....astr_agent_run_util import AgentRunner, run_agent
-from .....astr_agent_tool_exec import FunctionToolExecutor
-from ....context import PipelineContext, call_event_hook
-from ...stage import Stage
-from ...utils import KNOWLEDGE_BASE_QUERY_TOOL, retrieve_knowledge_base
+from ....astr_agent_context import AgentContextWrapper
+from ....astr_agent_hooks import MAIN_AGENT_HOOKS
+from ....astr_agent_run_util import AgentRunner, run_agent
+from ....astr_agent_tool_exec import FunctionToolExecutor
+from ....memory.tools import ADD_MEMORY_TOOL, QUERY_MEMORY_TOOL
+from ...context import PipelineContext, call_event_hook
+from ..stage import Stage
+from ..utils import KNOWLEDGE_BASE_QUERY_TOOL, retrieve_knowledge_base
 
 
-class InternalAgentSubStage(Stage):
+class LLMRequestSubStage(Stage):
     async def initialize(self, ctx: PipelineContext) -> None:
         self.ctx = ctx
         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"]),
@@ -57,12 +60,12 @@ class InternalAgentSubStage(Stage):
         self.show_reasoning = settings.get("display_reasoning_text", False)
         self.kb_agentic_mode: bool = conf.get("kb_agentic_mode", False)
 
-        file_extract_conf: dict = settings.get("file_extract", {})
-        self.file_extract_enabled: bool = file_extract_conf.get("enable", False)
-        self.file_extract_prov: str = file_extract_conf.get("provider", "moonshotai")
-        self.file_extract_msh_api_key: str = file_extract_conf.get(
-            "moonshotai_api_key", ""
-        )
+        for bwp in self.bot_wake_prefixs:
+            if self.provider_wake_prefix.startswith(bwp):
+                logger.info(
+                    f"识别 LLM 聊天额外唤醒前缀 {self.provider_wake_prefix} 以机器人唤醒前缀 {bwp} 开头，已自动去除。",
+                )
+                self.provider_wake_prefix = self.provider_wake_prefix[len(bwp) :]
 
         self.conv_manager = ctx.plugin_manager.context.conversation_manager
 
@@ -122,49 +125,14 @@ class InternalAgentSubStage(Stage):
                 req.func_tool = ToolSet()
             req.func_tool.add_tool(KNOWLEDGE_BASE_QUERY_TOOL)
 
-    async def _apply_file_extract(
-        self,
-        event: AstrMessageEvent,
-        req: ProviderRequest,
-    ):
-        """Apply file extract to the provider request"""
-        file_paths = []
-        file_names = []
-        for comp in event.message_obj.message:
-            if isinstance(comp, File):
-                file_paths.append(await comp.get_file())
-                file_names.append(comp.name)
-            elif isinstance(comp, Reply) and comp.chain:
-                for reply_comp in comp.chain:
-                    if isinstance(reply_comp, File):
-                        file_paths.append(await reply_comp.get_file())
-                        file_names.append(reply_comp.name)
-        if not file_paths:
+    async def _apply_memory(self, req: ProviderRequest):
+        mm = self.ctx.plugin_manager.context.memory_manager
+        if not mm or not mm._initialized:
             return
-        if not req.prompt:
-            req.prompt = "总结一下文件里面讲了什么？"
-        if self.file_extract_prov == "moonshotai":
-            if not self.file_extract_msh_api_key:
-                logger.error("Moonshot AI API key for file extract is not set")
-                return
-            file_contents = await asyncio.gather(
-                *[
-                    extract_file_moonshotai(file_path, self.file_extract_msh_api_key)
-                    for file_path in file_paths
-                ]
-            )
-        else:
-            logger.error(f"Unsupported file extract provider: {self.file_extract_prov}")
-            return
-
-        # add file extract results to contexts
-        for file_content, file_name in zip(file_contents, file_names):
-            req.contexts.append(
-                {
-                    "role": "system",
-                    "content": f"File Extract Results of user uploaded files:\n{file_content}\nFile Name: {file_name or 'Unknown'}",
-                },
-            )
+        if req.func_tool is None:
+            req.func_tool = ToolSet()
+        req.func_tool.add_tool(ADD_MEMORY_TOOL)
+        req.func_tool.add_tool(QUERY_MEMORY_TOOL)
 
     def _truncate_contexts(
         self,
@@ -321,12 +289,7 @@ class InternalAgentSubStage(Stage):
             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 or "*No response*",
-            }
-        )
+        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,
@@ -351,10 +314,21 @@ class InternalAgentSubStage(Stage):
         return fixed_messages
 
     async def process(
-        self, event: AstrMessageEvent, provider_wake_prefix: str
-    ) -> AsyncGenerator[None, None]:
+        self,
+        event: AstrMessageEvent,
+        _nested: bool = False,
+    ) -> None | AsyncGenerator[None, None]:
         req: ProviderRequest | None = None
 
+        if not self.ctx.astrbot_config["provider_settings"]["enable"]:
+            logger.debug("未启用 LLM 能力，跳过处理。")
+            return
+
+        # 检查会话级别的LLM启停状态
+        if not SessionServiceManager.should_process_llm_request(event):
+            logger.debug(f"会话 {event.unified_msg_origin} 禁用了 LLM，跳过处理。")
+            return
+
         provider = self._select_provider(event)
         if provider is None:
             return
@@ -384,12 +358,12 @@ class InternalAgentSubStage(Stage):
                 req.image_urls = []
                 if sel_model := event.get_extra("selected_model"):
                     req.model = sel_model
-                if provider_wake_prefix and not event.message_str.startswith(
-                    provider_wake_prefix
+                if self.provider_wake_prefix and not event.message_str.startswith(
+                    self.provider_wake_prefix
                 ):
                     return
 
-                req.prompt = event.message_str[len(provider_wake_prefix) :]
+                req.prompt = event.message_str[len(self.provider_wake_prefix) :]
                 # func_tool selection 现在已经转移到 packages/astrbot 插件中进行选择。
                 # req.func_tool = self.ctx.plugin_manager.context.get_llm_tool_manager()
                 for comp in event.message_obj.message:
@@ -403,17 +377,6 @@ class InternalAgentSubStage(Stage):
 
                 event.set_extra("provider_request", req)
 
-            # fix contexts json str
-            if isinstance(req.contexts, str):
-                req.contexts = json.loads(req.contexts)
-
-            # apply file extract
-            if self.file_extract_enabled:
-                try:
-                    await self._apply_file_extract(event, req)
-                except Exception as e:
-                    logger.error(f"Error occurred while applying file extract: {e}")
-
             if not req.prompt and not req.image_urls:
                 return
 
@@ -424,6 +387,13 @@ class InternalAgentSubStage(Stage):
             # apply knowledge base feature
             await self._apply_kb(event, req)
 
+            # apply memory feature
+            await self._apply_memory(req)
+
+            # fix contexts json str
+            if isinstance(req.contexts, str):
+                req.contexts = json.loads(req.contexts)
+
             # truncate contexts to fit max length
             if req.contexts:
                 req.contexts = self._truncate_contexts(req.contexts)

astrbot/core/pipeline/process_stage/method/star_request.py

@@ -16,6 +16,7 @@ from ..stage import Stage
 
 class StarRequestSubStage(Stage):
     async def initialize(self, ctx: PipelineContext) -> None:
+        self.curr_provider = ctx.plugin_manager.context.get_using_provider()
         self.prompt_prefix = ctx.astrbot_config["provider_settings"]["prompt_prefix"]
         self.identifier = ctx.astrbot_config["provider_settings"]["identifier"]
         self.ctx = ctx
@@ -23,7 +24,7 @@ class StarRequestSubStage(Stage):
     async def process(
         self,
         event: AstrMessageEvent,
-    ) -> AsyncGenerator[Any, None]:
+    ) -> None | AsyncGenerator[None, None]:
         activated_handlers: list[StarHandlerMetadata] = event.get_extra(
             "activated_handlers",
         )

astrbot/core/pipeline/process_stage/stage.py

@@ -1,12 +1,13 @@
 from collections.abc import AsyncGenerator
 
+from astrbot.core import logger
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.provider.entities import ProviderRequest
 from astrbot.core.star.star_handler import StarHandlerMetadata
 
 from ..context import PipelineContext
 from ..stage import Stage, register_stage
-from .method.agent_request import AgentRequestSubStage
+from .method.llm_request import LLMRequestSubStage
 from .method.star_request import StarRequestSubStage
 
 
@@ -16,12 +17,9 @@ class ProcessStage(Stage):
         self.ctx = ctx
         self.config = ctx.astrbot_config
         self.plugin_manager = ctx.plugin_manager
+        self.llm_request_sub_stage = LLMRequestSubStage()
+        await self.llm_request_sub_stage.initialize(ctx)
 
-        # initialize agent sub stage
-        self.agent_sub_stage = AgentRequestSubStage()
-        await self.agent_sub_stage.initialize(ctx)
-
-        # initialize star request sub stage
         self.star_request_sub_stage = StarRequestSubStage()
         await self.star_request_sub_stage.initialize(ctx)
 
@@ -41,7 +39,7 @@ class ProcessStage(Stage):
                     # Handler 的 LLM 请求
                     event.set_extra("provider_request", resp)
                     _t = False
-                    async for _ in self.agent_sub_stage.process(event):
+                    async for _ in self.llm_request_sub_stage.process(event):
                         _t = True
                         yield
                     if not _t:
@@ -60,7 +58,14 @@ class ProcessStage(Stage):
         ):
             # 是否有过发送操作 and 是否是被 @ 或者通过唤醒前缀
             if (
-                event.get_result() and not event.is_stopped()
+                event.get_result() and not event.get_result().is_stopped()
             ) or not event.get_result():
-                async for _ in self.agent_sub_stage.process(event):
+                # 事件没有终止传播
+                provider = self.ctx.plugin_manager.context.get_using_provider()
+
+                if not provider:
+                    logger.info("未找到可用的 LLM 提供商，请先前往配置服务提供商。")
+                    return
+
+                async for _ in self.llm_request_sub_stage.process(event):
                     yield

astrbot/core/pipeline/respond/stage.py

@@ -117,9 +117,7 @@ class RespondStage(Stage):
         if not self.enable_seg:
             return False
 
-        if (result := event.get_result()) is None:
-            return False
-        if self.only_llm_result and not result.is_llm_result():
+        if self.only_llm_result and not event.get_result().is_llm_result():
             return False
 
         if event.get_platform_name() in [
@@ -158,11 +156,7 @@ class RespondStage(Stage):
         result = event.get_result()
         if result is None:
             return
-        if event.get_extra("_streaming_finished", False):
-            # prevent some plugin make result content type to LLM_RESULT after streaming finished, lead to send again
-            return
         if result.result_content_type == ResultContentType.STREAMING_FINISH:
-            event.set_extra("_streaming_finished", True)
             return
 
         logger.info(
@@ -191,7 +185,7 @@ class RespondStage(Stage):
                     if isinstance(component, Comp.File) and component.file:
                         # 支持 File 消息段的路径映射。
                         component.file = path_Mapping(mappings, component.file)
-                        result.chain[idx] = component
+                        event.get_result().chain[idx] = component
 
             # 检查消息链是否为空
             try:

astrbot/core/pipeline/result_decorate/stage.py

@@ -1,4 +1,3 @@
-import random
 import re
 import time
 import traceback
@@ -7,7 +6,6 @@ from collections.abc import AsyncGenerator
 from astrbot.core import file_token_service, html_renderer, logger
 from astrbot.core.message.components import At, File, Image, Node, Plain, Record, Reply
 from astrbot.core.message.message_event_result import ResultContentType
-from astrbot.core.pipeline.content_safety_check.stage import ContentSafetyCheckStage
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.platform.message_type import MessageType
 from astrbot.core.star.session_llm_manager import SessionServiceManager
@@ -43,18 +41,6 @@ class ResultDecorateStage(Stage):
             "forward_threshold"
         ]
 
-        trigger_probability = ctx.astrbot_config["provider_tts_settings"].get(
-            "trigger_probability",
-            1,
-        )
-        try:
-            self.tts_trigger_probability = max(
-                0.0,
-                min(float(trigger_probability), 1.0),
-            )
-        except (TypeError, ValueError):
-            self.tts_trigger_probability = 1.0
-
         # 分段回复
         self.words_count_threshold = int(
             ctx.astrbot_config["platform_settings"]["segmented_reply"][
@@ -67,22 +53,7 @@ class ResultDecorateStage(Stage):
         self.only_llm_result = ctx.astrbot_config["platform_settings"][
             "segmented_reply"
         ]["only_llm_result"]
-        self.split_mode = ctx.astrbot_config["platform_settings"][
-            "segmented_reply"
-        ].get("split_mode", "regex")
         self.regex = ctx.astrbot_config["platform_settings"]["segmented_reply"]["regex"]
-        self.split_words = ctx.astrbot_config["platform_settings"][
-            "segmented_reply"
-        ].get("split_words", ["。", "？", "！", "~", "…"])
-        if self.split_words:
-            escaped_words = sorted(
-                [re.escape(word) for word in self.split_words], key=len, reverse=True
-            )
-            self.split_words_pattern = re.compile(
-                f"(.*?({'|'.join(escaped_words)})|.+$)", re.DOTALL
-            )
-        else:
-            self.split_words_pattern = None
         self.content_cleanup_rule = ctx.astrbot_config["platform_settings"][
             "segmented_reply"
         ]["content_cleanup_rule"]
@@ -98,28 +69,6 @@ class ResultDecorateStage(Stage):
                     self.content_safe_check_stage = stage_cls()
                     await self.content_safe_check_stage.initialize(ctx)
 
-    def _split_text_by_words(self, text: str) -> list[str]:
-        """使用分段词列表分段文本"""
-        if not self.split_words_pattern:
-            return [text]
-
-        segments = self.split_words_pattern.findall(text)
-        result = []
-        for seg in segments:
-            if isinstance(seg, tuple):
-                content = seg[0]
-                if not isinstance(content, str):
-                    continue
-                for word in self.split_words:
-                    if content.endswith(word):
-                        content = content[: -len(word)]
-                        break
-                if content.strip():
-                    result.append(content)
-            elif seg and seg.strip():
-                result.append(seg)
-        return result if result else [text]
-
     async def process(
         self,
         event: AstrMessageEvent,
@@ -144,13 +93,11 @@ class ResultDecorateStage(Stage):
             for comp in result.chain:
                 if isinstance(comp, Plain):
                     text += comp.text
-
-            if isinstance(self.content_safe_check_stage, ContentSafetyCheckStage):
-                async for _ in self.content_safe_check_stage.process(
-                    event,
-                    check_text=text,
-                ):
-                    yield
+            async for _ in self.content_safe_check_stage.process(
+                event,
+                check_text=text,
+            ):
+                yield
 
         # 发送消息前事件钩子
         handlers = star_handlers_registry.get_handlers_by_event_type(
@@ -167,8 +114,7 @@ class ResultDecorateStage(Stage):
                         "启用流式输出时，依赖发送消息前事件钩子的插件可能无法正常工作",
                     )
                 await handler.handler(event)
-
-                if (result := event.get_result()) is None or not result.chain:
+                if event.get_result() is None or not event.get_result().chain:
                     logger.debug(
                         f"hook(on_decorating_result) -> {star_map[handler.handler_module_path].name} - {handler.handler_name} 将消息结果清空。",
                     )
@@ -215,27 +161,11 @@ class ResultDecorateStage(Stage):
                                 # 不分段回复
                                 new_chain.append(comp)
                                 continue
-
-                            # 根据 split_mode 选择分段方式
-                            if self.split_mode == "words":
-                                split_response = self._split_text_by_words(comp.text)
-                            else:  # regex 模式
-                                try:
-                                    split_response = re.findall(
-                                        self.regex,
-                                        comp.text,
-                                        re.DOTALL | re.MULTILINE,
-                                    )
-                                except re.error:
-                                    logger.error(
-                                        f"分段回复正则表达式错误，使用默认分段方式: {traceback.format_exc()}",
-                                    )
-                                    split_response = re.findall(
-                                        r".*?[。？！~…]+|.+$",
-                                        comp.text,
-                                        re.DOTALL | re.MULTILINE,
-                                    )
-
+                            split_response = re.findall(
+                                self.regex,
+                                comp.text,
+                                re.DOTALL | re.MULTILINE,
+                            )
                             if not split_response:
                                 new_chain.append(comp)
                                 continue
@@ -259,14 +189,7 @@ class ResultDecorateStage(Stage):
                 and result.is_llm_result()
                 and SessionServiceManager.should_process_tts_request(event)
             ):
-                should_tts = self.tts_trigger_probability >= 1.0 or (
-                    self.tts_trigger_probability > 0.0
-                    and random.random() <= self.tts_trigger_probability
-                )
-
-                if not should_tts:
-                    logger.debug("跳过 TTS：触发概率未命中。")
-                elif not tts_provider:
+                if not tts_provider:
                     logger.warning(
                         f"会话 {event.unified_msg_origin} 未配置文本转语音模型。",
                     )

astrbot/core/pipeline/scheduler.py

@@ -2,10 +2,6 @@ from collections.abc import AsyncGenerator
 
 from astrbot.core import logger
 from astrbot.core.platform import AstrMessageEvent
-from astrbot.core.platform.sources.webchat.webchat_event import WebChatMessageEvent
-from astrbot.core.platform.sources.wecom_ai_bot.wecomai_event import (
-    WecomAIBotMessageEvent,
-)
 
 from . import STAGES_ORDER
 from .context import PipelineContext
@@ -82,7 +78,7 @@ class PipelineScheduler:
         await self._process_stages(event)
 
         # 如果没有发送操作, 则发送一个空消息, 以便于后续的处理
-        if isinstance(event, (WebChatMessageEvent, WecomAIBotMessageEvent)):
+        if event.get_platform_name() in ["webchat", "wecom_ai_bot"]:
             await event.send(None)
 
         logger.debug("pipeline 执行完毕。")

astrbot/core/pipeline/waking_check/stage.py

@@ -50,9 +50,6 @@ class WakingCheckStage(Stage):
             "ignore_at_all",
             False,
         )
-        self.disable_builtin_commands = self.ctx.astrbot_config.get(
-            "disable_builtin_commands", False
-        )
 
     async def process(
         self,
@@ -134,13 +131,6 @@ class WakingCheckStage(Stage):
             EventType.AdapterMessageEvent,
             plugins_name=event.plugins_name,
         ):
-            if (
-                self.disable_builtin_commands
-                and handler.handler_module_path == "packages.builtin_commands.main"
-            ):
-                logger.debug("skipping builtin command")
-                continue
-
             # filter 需满足 AND 逻辑关系
             passed = True
             permission_not_pass = False

astrbot/core/platform/astr_message_event.py

@@ -153,9 +153,7 @@ class AstrMessageEvent(abc.ABC):
 
     def get_sender_name(self) -> str:
         """获取消息发送者的名称。(可能会返回空字符串)"""
-        if isinstance(self.message_obj.sender.nickname, str):
-            return self.message_obj.sender.nickname
-        return ""
+        return self.message_obj.sender.nickname
 
     def set_extra(self, key, value):
         """设置额外的信息。"""
@@ -272,7 +270,7 @@ class AstrMessageEvent(abc.ABC):
         """
         self.call_llm = call_llm
 
-    def get_result(self) -> MessageEventResult | None:
+    def get_result(self) -> MessageEventResult:
         """获取消息事件的结果。"""
         return self._result
 
@@ -322,7 +320,7 @@ class AstrMessageEvent(abc.ABC):
         self,
         prompt: str,
         func_tool_manager=None,
-        session_id: str = "",
+        session_id: str = None,
         image_urls: list[str] | None = None,
         contexts: list | None = None,
         system_prompt: str = "",

astrbot/core/platform/astrbot_message.py

@@ -54,7 +54,7 @@ class AstrBotMessage:
     self_id: str  # 机器人的识别id
     session_id: str  # 会话id。取决于 unique_session 的设置。
     message_id: str  # 消息id
-    group: Group | None  # 群组
+    group: Group  # 群组
     sender: MessageMember  # 发送者
     message: list[BaseMessageComponent]  # 消息链使用 Nakuru 的消息链格式
     message_str: str  # 最直观的纯文本消息字符串
@@ -78,7 +78,7 @@ class AstrBotMessage:
         return ""
 
     @group_id.setter
-    def group_id(self, value: str | None):
+    def group_id(self, value: str):
         """设置 group_id"""
         if value:
             if self.group:

astrbot/core/platform/manager.py

@@ -5,9 +5,8 @@ from asyncio import Queue
 from astrbot.core import logger
 from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot.core.star.star_handler import EventType, star_handlers_registry, star_map
-from astrbot.core.utils.webhook_utils import ensure_platform_webhook_config
 
-from .platform import Platform, PlatformStatus
+from .platform import Platform
 from .register import platform_cls_map
 from .sources.webchat.webchat_adapter import WebChatAdapter
 
@@ -17,9 +16,8 @@ class PlatformManager:
         self.platform_insts: list[Platform] = []
         """加载的 Platform 的实例"""
 
-        self._inst_map: dict[str, dict] = {}
+        self._inst_map = {}
 
-        self.astrbot_config = config
         self.platforms_config = config["platform"]
         self.settings = config["platform_settings"]
         """NOTE: 这里是 default 的配置文件，以保证最大的兼容性；
@@ -31,8 +29,6 @@ class PlatformManager:
         """初始化所有平台适配器"""
         for platform in self.platforms_config:
             try:
-                if ensure_platform_webhook_config(platform):
-                    self.astrbot_config.save_config()
                 await self.load_platform(platform)
             except Exception as e:
                 logger.error(f"初始化 {platform} 平台适配器失败: {e}")
@@ -41,10 +37,7 @@ class PlatformManager:
         webchat_inst = WebChatAdapter({}, self.settings, self.event_queue)
         self.platform_insts.append(webchat_inst)
         asyncio.create_task(
-            self._task_wrapper(
-                asyncio.create_task(webchat_inst.run(), name="webchat"),
-                platform=webchat_inst,
-            ),
+            self._task_wrapper(asyncio.create_task(webchat_inst.run(), name="webchat")),
         )
 
     async def load_platform(self, platform_config: dict):
@@ -114,7 +107,7 @@ class PlatformManager:
                     )
         except (ImportError, ModuleNotFoundError) as e:
             logger.error(
-                f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。请检查依赖库是否安装。提示：可以在 管理面板->平台日志->安装Pip库 中安装依赖库。",
+                f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。请检查依赖库是否安装。提示：可以在 管理面板->控制台->安装Pip库 中安装依赖库。",
             )
         except Exception as e:
             logger.error(f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。")
@@ -138,7 +131,6 @@ class PlatformManager:
                     inst.run(),
                     name=f"platform_{platform_config['type']}_{platform_config['id']}",
                 ),
-                platform=inst,
             ),
         )
         handlers = star_handlers_registry.get_handlers_by_event_type(
@@ -153,28 +145,17 @@ class PlatformManager:
             except Exception:
                 logger.error(traceback.format_exc())
 
-    async def _task_wrapper(self, task: asyncio.Task, platform: Platform | None = None):
-        # 设置平台状态为运行中
-        if platform:
-            platform.status = PlatformStatus.RUNNING
-
+    async def _task_wrapper(self, task: asyncio.Task):
         try:
             await task
         except asyncio.CancelledError:
-            if platform:
-                platform.status = PlatformStatus.STOPPED
+            pass
         except Exception as e:
-            error_msg = str(e)
-            tb_str = traceback.format_exc()
             logger.error(f"------- 任务 {task.get_name()} 发生错误: {e}")
-            for line in tb_str.split("\n"):
+            for line in traceback.format_exc().split("\n"):
                 logger.error(f"|    {line}")
             logger.error("-------")
 
-            # 记录错误到平台实例
-            if platform:
-                platform.record_error(error_msg, tb_str)
-
     async def reload(self, platform_config: dict):
         await self.terminate_platform(platform_config["id"])
         if platform_config["enable"]:
@@ -191,9 +172,9 @@ class PlatformManager:
             logger.info(f"正在尝试终止 {platform_id} 平台适配器 ...")
 
             # client_id = self._inst_map.pop(platform_id, None)
-            info = self._inst_map.pop(platform_id)
+            info = self._inst_map.pop(platform_id, None)
             client_id = info["client_id"]
-            inst: Platform = info["inst"]
+            inst = info["inst"]
             try:
                 self.platform_insts.remove(
                     next(
@@ -215,46 +196,3 @@ class PlatformManager:
 
     def get_insts(self):
         return self.platform_insts
-
-    def get_all_stats(self) -> dict:
-        """获取所有平台的统计信息
-
-        Returns:
-            包含所有平台统计信息的字典
-        """
-        stats_list = []
-        total_errors = 0
-        running_count = 0
-        error_count = 0
-
-        for inst in self.platform_insts:
-            try:
-                stat = inst.get_stats()
-                stats_list.append(stat)
-                total_errors += stat.get("error_count", 0)
-                if stat.get("status") == PlatformStatus.RUNNING.value:
-                    running_count += 1
-                elif stat.get("status") == PlatformStatus.ERROR.value:
-                    error_count += 1
-            except Exception as e:
-                # 如果获取统计信息失败，记录基本信息
-                logger.warning(f"获取平台统计信息失败: {e}")
-                stats_list.append(
-                    {
-                        "id": getattr(inst, "config", {}).get("id", "unknown"),
-                        "type": "unknown",
-                        "status": "unknown",
-                        "error_count": 0,
-                        "last_error": None,
-                    }
-                )
-
-        return {
-            "platforms": stats_list,
-            "summary": {
-                "total": len(stats_list),
-                "running": running_count,
-                "error": error_count,
-                "total_errors": total_errors,
-            },
-        }

astrbot/core/platform/platform.py

@@ -1,10 +1,7 @@
 import abc
 import uuid
 from asyncio import Queue
-from collections.abc import Coroutine
-from dataclasses import dataclass, field
-from datetime import datetime
-from enum import Enum
+from collections.abc import Awaitable
 from typing import Any
 
 from astrbot.core.message.message_event_result import MessageChain
@@ -15,100 +12,15 @@ from .message_session import MessageSesion
 from .platform_metadata import PlatformMetadata
 
 
-class PlatformStatus(Enum):
-    """平台运行状态"""
-
-    PENDING = "pending"  # 待启动
-    RUNNING = "running"  # 运行中
-    ERROR = "error"  # 发生错误
-    STOPPED = "stopped"  # 已停止
-
-
-@dataclass
-class PlatformError:
-    """平台错误信息"""
-
-    message: str
-    timestamp: datetime = field(default_factory=datetime.now)
-    traceback: str | None = None
-
-
 class Platform(abc.ABC):
-    def __init__(self, config: dict, event_queue: Queue):
+    def __init__(self, event_queue: Queue):
         super().__init__()
-        # 平台配置
-        self.config = config
         # 维护了消息平台的事件队列，EventBus 会从这里取出事件并处理。
         self._event_queue = event_queue
         self.client_self_id = uuid.uuid4().hex
 
-        # 平台运行状态
-        self._status: PlatformStatus = PlatformStatus.PENDING
-        self._errors: list[PlatformError] = []
-        self._started_at: datetime | None = None
-
-    @property
-    def status(self) -> PlatformStatus:
-        """获取平台运行状态"""
-        return self._status
-
-    @status.setter
-    def status(self, value: PlatformStatus):
-        """设置平台运行状态"""
-        self._status = value
-        if value == PlatformStatus.RUNNING and self._started_at is None:
-            self._started_at = datetime.now()
-
-    @property
-    def errors(self) -> list[PlatformError]:
-        """获取错误列表"""
-        return self._errors
-
-    @property
-    def last_error(self) -> PlatformError | None:
-        """获取最近的错误"""
-        return self._errors[-1] if self._errors else None
-
-    def record_error(self, message: str, traceback_str: str | None = None):
-        """记录一个错误"""
-        self._errors.append(PlatformError(message=message, traceback=traceback_str))
-        self._status = PlatformStatus.ERROR
-
-    def clear_errors(self):
-        """清除错误记录"""
-        self._errors.clear()
-        if self._status == PlatformStatus.ERROR:
-            self._status = PlatformStatus.RUNNING
-
-    def unified_webhook(self) -> bool:
-        """是否正在使用统一 Webhook 模式"""
-        return bool(
-            self.config.get("unified_webhook_mode", False)
-            and self.config.get("webhook_uuid")
-        )
-
-    def get_stats(self) -> dict:
-        """获取平台统计信息"""
-        meta = self.meta()
-        return {
-            "id": meta.id or self.config.get("id"),
-            "type": meta.name,
-            "display_name": meta.adapter_display_name or meta.name,
-            "status": self._status.value,
-            "started_at": self._started_at.isoformat() if self._started_at else None,
-            "error_count": len(self._errors),
-            "last_error": {
-                "message": self.last_error.message,
-                "timestamp": self.last_error.timestamp.isoformat(),
-                "traceback": self.last_error.traceback,
-            }
-            if self.last_error
-            else None,
-            "unified_webhook": self.unified_webhook(),
-        }
-
     @abc.abstractmethod
-    def run(self) -> Coroutine[Any, Any, None]:
+    def run(self) -> Awaitable[Any]:
         """得到一个平台的运行实例，需要返回一个协程对象。"""
         raise NotImplementedError
 
@@ -124,7 +36,7 @@ class Platform(abc.ABC):
         self,
         session: MessageSesion,
         message_chain: MessageChain,
-    ) -> None:
+    ) -> Awaitable[Any]:
         """通过会话发送消息。该方法旨在让插件能够直接通过**可持久化的会话数据**发送消息，而不需要保存 event 对象。
 
         异步方法。
@@ -137,20 +49,3 @@ class Platform(abc.ABC):
 
     def get_client(self):
         """获取平台的客户端对象。"""
-
-    async def webhook_callback(self, request: Any) -> Any:
-        """统一 Webhook 回调入口。
-
-        支持统一 Webhook 模式的平台需要实现此方法。
-        当 Dashboard 收到 /api/platform/webhook/{uuid} 请求时，会调用此方法。
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            响应内容，格式取决于具体平台的要求
-
-        Raises:
-            NotImplementedError: 平台未实现统一 Webhook 模式
-        """
-        raise NotImplementedError(f"平台 {self.meta().name} 未实现统一 Webhook 模式")

astrbot/core/platform/platform_metadata.py

@@ -7,7 +7,7 @@ class PlatformMetadata:
     """平台的名称，即平台的类型，如 aiocqhttp, discord, slack"""
     description: str
     """平台的描述"""
-    id: str
+    id: str | None = None
     """平台的唯一标识符，用于配置中识别特定平台"""
 
     default_config_tmpl: dict | None = None

astrbot/core/platform/register.py

@@ -40,7 +40,6 @@ def register_platform_adapter(
         pm = PlatformMetadata(
             name=adapter_name,
             description=desc,
-            id=adapter_name,
             default_config_tmpl=default_config_tmpl,
             adapter_display_name=adapter_display_name,
             logo_path=logo_path,

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py

@@ -70,18 +70,16 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         bot: CQHttp,
         event: Event | None,
         is_group: bool,
-        session_id: str | None,
+        session_id: str,
         messages: list[dict],
     ):
         # session_id 必须是纯数字字符串
-        session_id_int = (
-            int(session_id) if session_id and session_id.isdigit() else None
-        )
+        session_id = int(session_id) if session_id.isdigit() else None
 
-        if is_group and isinstance(session_id_int, int):
-            await bot.send_group_msg(group_id=session_id_int, message=messages)
-        elif not is_group and isinstance(session_id_int, int):
-            await bot.send_private_msg(user_id=session_id_int, message=messages)
+        if is_group and isinstance(session_id, int):
+            await bot.send_group_msg(group_id=session_id, message=messages)
+        elif not is_group and isinstance(session_id, int):
+            await bot.send_private_msg(user_id=session_id, message=messages)
         elif isinstance(event, Event):  # 最后兜底
             await bot.send(event=event, message=messages)
         else:

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py

@@ -4,7 +4,7 @@ import logging
 import time
 import uuid
 from collections.abc import Awaitable
-from typing import Any, cast
+from typing import Any
 
 from aiocqhttp import CQHttp, Event
 from aiocqhttp.exceptions import ActionFailed
@@ -38,8 +38,9 @@ class AiocqhttpAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
 
+        self.config = platform_config
         self.settings = platform_settings
         self.unique_session = platform_settings["unique_session"]
         self.host = platform_config["ws_reverse_host"]
@@ -48,7 +49,7 @@ class AiocqhttpAdapter(Platform):
         self.metadata = PlatformMetadata(
             name="aiocqhttp",
             description="适用于 OneBot 标准的消息平台适配器，支持反向 WebSockets。",
-            id=cast(str, self.config.get("id")),
+            id=self.config.get("id"),
             support_streaming_message=False,
         )
 
@@ -127,9 +128,7 @@ class AiocqhttpAdapter(Platform):
         """OneBot V11 请求类事件"""
         abm = AstrBotMessage()
         abm.self_id = str(event.self_id)
-        abm.sender = MessageMember(
-            user_id=str(event.user_id), nickname=str(event.user_id)
-        )
+        abm.sender = MessageMember(user_id=str(event.user_id), nickname=event.user_id)
         abm.type = MessageType.OTHER_MESSAGE
         if event.get("group_id"):
             abm.type = MessageType.GROUP_MESSAGE
@@ -155,9 +154,7 @@ class AiocqhttpAdapter(Platform):
         """OneBot V11 通知类事件"""
         abm = AstrBotMessage()
         abm.self_id = str(event.self_id)
-        abm.sender = MessageMember(
-            user_id=str(event.user_id), nickname=str(event.user_id)
-        )
+        abm.sender = MessageMember(user_id=str(event.user_id), nickname=event.user_id)
         abm.type = MessageType.OTHER_MESSAGE
         if event.get("group_id"):
             abm.group_id = str(event.group_id)
@@ -196,7 +193,6 @@ class AiocqhttpAdapter(Platform):
         @param event: 事件对象
         @param get_reply: 是否获取回复消息。这个参数是为了防止多个回复嵌套。
         """
-        assert event.sender is not None
         abm = AstrBotMessage()
         abm.self_id = str(event.self_id)
         abm.sender = MessageMember(
@@ -206,7 +202,6 @@ class AiocqhttpAdapter(Platform):
         if event["message_type"] == "group":
             abm.type = MessageType.GROUP_MESSAGE
             abm.group_id = str(event.group_id)
-            abm.group = Group(str(event.group_id))
             abm.group.group_name = event.get("group_name", "N/A")
         elif event["message_type"] == "private":
             abm.type = MessageType.FRIEND_MESSAGE
@@ -232,7 +227,7 @@ class AiocqhttpAdapter(Platform):
                 await self.bot.send(event, err)
             except BaseException as e:
                 logger.error(f"回复消息失败: {e}")
-            raise ValueError(err)
+            return None
 
         # 按消息段类型类型适配
         for t, m_group in itertools.groupby(event.message, key=lambda x: x["type"]):
@@ -251,13 +246,7 @@ class AiocqhttpAdapter(Platform):
                     if m["data"].get("url") and m["data"].get("url").startswith("http"):
                         # Lagrange
                         logger.info("guessing lagrange")
-                        # 检查多个可能的文件名字段
-                        file_name = (
-                            m["data"].get("file_name", "")
-                            or m["data"].get("name", "")
-                            or m["data"].get("file", "")
-                            or "file"
-                        )
+                        file_name = m["data"].get("file_name", "file")
                         abm.message.append(File(name=file_name, url=m["data"]["url"]))
                     else:
                         try:
@@ -276,14 +265,7 @@ class AiocqhttpAdapter(Platform):
                                 )
                             if ret and "url" in ret:
                                 file_url = ret["url"]  # https
-                                # 优先从 API 返回值获取文件名，其次从原始消息数据获取
-                                file_name = (
-                                    ret.get("file_name", "")
-                                    or ret.get("name", "")
-                                    or m["data"].get("file", "")
-                                    or m["data"].get("file_name", "")
-                                )
-                                a = File(name=file_name, url=file_url)
+                                a = File(name="", url=file_url)
                                 abm.message.append(a)
                             else:
                                 logger.error(f"获取文件失败: {ret}")
@@ -421,7 +403,7 @@ class AiocqhttpAdapter(Platform):
 
     async def shutdown_trigger_placeholder(self):
         await self.shutdown_event.wait()
-        logger.info("aiocqhttp 适配器已被关闭")
+        logger.info("aiocqhttp 适配器已被优雅地关闭")
 
     def meta(self) -> PlatformMetadata:
         return self.metadata

astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py

@@ -2,7 +2,6 @@ import asyncio
 import os
 import threading
 import uuid
-from typing import cast
 
 import aiohttp
 import dingtalk_stream
@@ -48,21 +47,21 @@ class DingtalkPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+
+        self.config = platform_config
 
         self.unique_session = platform_settings["unique_session"]
 
         self.client_id = platform_config["client_id"]
         self.client_secret = platform_config["client_secret"]
 
-        outer_self = self
-
         class AstrCallbackClient(dingtalk_stream.ChatbotHandler):
-            async def process(self, message: dingtalk_stream.CallbackMessage):
+            async def process(self_, message: dingtalk_stream.CallbackMessage):
                 logger.debug(f"dingtalk: {message.data}")
                 im = dingtalk_stream.ChatbotMessage.from_dict(message.data)
-                abm = await outer_self.convert_msg(im)
-                await outer_self.handle_msg(abm)
+                abm = await self.convert_msg(im)
+                await self.handle_msg(abm)
 
                 return AckMessage.STATUS_OK, "OK"
 
@@ -76,15 +75,14 @@ class DingtalkPlatformAdapter(Platform):
             self.client,
         )
         self.client_ = client  # 用于 websockets 的 client
-        self._shutdown_event: threading.Event | None = None
 
-    def _id_to_sid(self, dingtalk_id: str | None) -> str:
+    def _id_to_sid(self, dingtalk_id: str | None) -> str | None:
         if not dingtalk_id:
-            return dingtalk_id or "unknown"
+            return dingtalk_id
         prefix = "$:LWCP_v1:$"
         if dingtalk_id.startswith(prefix):
             return dingtalk_id[len(prefix) :]
-        return dingtalk_id or "unknown"
+        return dingtalk_id
 
     async def send_by_session(
         self,
@@ -97,7 +95,7 @@ class DingtalkPlatformAdapter(Platform):
         return PlatformMetadata(
             name="dingtalk",
             description="钉钉机器人官方 API 适配器",
-            id=cast(str, self.config.get("id")),
+            id=self.config.get("id"),
             support_streaming_message=False,
         )
 
@@ -108,7 +106,7 @@ class DingtalkPlatformAdapter(Platform):
         abm = AstrBotMessage()
         abm.message = []
         abm.message_str = ""
-        abm.timestamp = int(cast(int, message.create_at) / 1000)
+        abm.timestamp = int(message.create_at / 1000)
         abm.type = (
             MessageType.GROUP_MESSAGE
             if message.conversation_type == "2"
@@ -119,7 +117,7 @@ class DingtalkPlatformAdapter(Platform):
             nickname=message.sender_nick,
         )
         abm.self_id = self._id_to_sid(message.chatbot_user_id)
-        abm.message_id = cast(str, message.message_id)
+        abm.message_id = message.message_id
         abm.raw_message = message
 
         if abm.type == MessageType.GROUP_MESSAGE:
@@ -136,16 +134,14 @@ class DingtalkPlatformAdapter(Platform):
         else:
             abm.session_id = abm.sender.user_id
 
-        message_type: str = cast(str, message.message_type)
+        message_type: str = message.message_type
         match message_type:
             case "text":
                 abm.message_str = message.text.content.strip()
                 abm.message.append(Plain(abm.message_str))
             case "richText":
-                rtc: dingtalk_stream.RichTextContent = cast(
-                    dingtalk_stream.RichTextContent, message.rich_text_content
-                )
-                contents: list[dict] = cast(list[dict], rtc.rich_text_list)
+                rtc: dingtalk_stream.RichTextContent = message.rich_text_content
+                contents: list[dict] = rtc.rich_text_list
                 for content in contents:
                     plains = ""
                     if "text" in content:
@@ -154,7 +150,7 @@ class DingtalkPlatformAdapter(Platform):
                     elif "type" in content and content["type"] == "picture":
                         f_path = await self.download_ding_file(
                             content["downloadCode"],
-                            cast(str, message.robot_code),
+                            message.robot_code,
                             "jpg",
                         )
                         abm.message.append(Image.fromFileSystem(f_path))
@@ -199,7 +195,7 @@ class DingtalkPlatformAdapter(Platform):
                 logger.error(
                     f"下载钉钉文件失败: {resp.status}, {await resp.text()}",
                 )
-                return ""
+                return None
             resp_data = await resp.json()
             download_url = resp_data["data"]["downloadUrl"]
             await download_file(download_url, f_path)
@@ -219,7 +215,7 @@ class DingtalkPlatformAdapter(Platform):
                     logger.error(
                         f"获取钉钉机器人 access_token 失败: {resp.status}, {await resp.text()}",
                     )
-                    return ""
+                    return None
                 return (await resp.json())["data"]["accessToken"]
 
     async def handle_msg(self, abm: AstrBotMessage):
@@ -245,7 +241,7 @@ class DingtalkPlatformAdapter(Platform):
                     task.result()
             except Exception as e:
                 if "Graceful shutdown" in str(e):
-                    logger.info("钉钉适配器已被关闭")
+                    logger.info("钉钉适配器已被优雅地关闭")
                     return
                 logger.error(f"钉钉机器人启动失败: {e}")
 
@@ -254,13 +250,11 @@ class DingtalkPlatformAdapter(Platform):
 
     async def terminate(self):
         def monkey_patch_close():
-            raise KeyboardInterrupt("Graceful shutdown")
+            raise Exception("Graceful shutdown")
 
-        if self.client_.websocket is not None:
-            self.client_.open_connection = monkey_patch_close
-            await self.client_.websocket.close(code=1000, reason="Graceful shutdown")
-        if self._shutdown_event is not None:
-            self._shutdown_event.set()
+        self.client_.open_connection = monkey_patch_close
+        await self.client_.websocket.close(code=1000, reason="Graceful shutdown")
+        self._shutdown_event.set()
 
     def get_client(self):
         return self.client

astrbot/core/platform/sources/dingtalk/dingtalk_event.py

@@ -1,5 +1,4 @@
 import asyncio
-from typing import cast
 
 import dingtalk_stream
 
@@ -33,7 +32,7 @@ class DingtalkMessageEvent(AstrMessageEvent):
                     client.reply_markdown,
                     segment.text,
                     segment.text,
-                    cast(dingtalk_stream.ChatbotMessage, self.message_obj.raw_message),
+                    self.message_obj.raw_message,
                 )
             elif isinstance(segment, Comp.Image):
                 markdown_str = ""
@@ -54,9 +53,7 @@ class DingtalkMessageEvent(AstrMessageEvent):
                         client.reply_markdown,
                         "😄",
                         markdown_str,
-                        cast(
-                            dingtalk_stream.ChatbotMessage, self.message_obj.raw_message
-                        ),
+                        self.message_obj.raw_message,
                     )
                     logger.debug(f"send image: {ret}")
 

astrbot/core/platform/sources/discord/client.py

@@ -1,5 +1,4 @@
 import sys
-from collections.abc import Awaitable, Callable
 
 import discord
 
@@ -28,16 +27,13 @@ class DiscordBotClient(discord.Bot):
         super().__init__(intents=intents, proxy=proxy)
 
         # 回调函数
-        self.on_message_received: Callable[[dict], Awaitable[None]] | None = None
-        self.on_ready_once_callback: Callable[[], Awaitable[None]] | None = None
+        self.on_message_received = None
+        self.on_ready_once_callback = None
         self._ready_once_fired = False
 
+    @override
     async def on_ready(self):
         """当机器人成功连接并准备就绪时触发"""
-        if self.user is None:
-            logger.error("[Discord] 客户端未正确加载用户信息 (self.user is None)")
-            return
-
         logger.info(f"[Discord] 已作为 {self.user} (ID: {self.user.id}) 登录")
         logger.info("[Discord] 客户端已准备就绪。")
 
@@ -53,9 +49,6 @@ class DiscordBotClient(discord.Bot):
 
     def _create_message_data(self, message: discord.Message) -> dict:
         """从 discord.Message 创建数据字典"""
-        if self.user is None:
-            raise RuntimeError("Bot is not ready: self.user is None")
-
         is_mentioned = self.user in message.mentions
         return {
             "message": message,
@@ -73,12 +66,6 @@ class DiscordBotClient(discord.Bot):
 
     def _create_interaction_data(self, interaction: discord.Interaction) -> dict:
         """从 discord.Interaction 创建数据字典"""
-        if self.user is None:
-            raise RuntimeError("Bot is not ready: self.user is None")
-
-        if interaction.user is None:
-            raise ValueError("Interaction received without a valid user")
-
         return {
             "interaction": interaction,
             "bot_id": str(self.user.id),
@@ -93,6 +80,7 @@ class DiscordBotClient(discord.Bot):
             "type": "interaction",
         }
 
+    @override
     async def on_message(self, message: discord.Message):
         """当接收到消息时触发"""
         if message.author.bot:

astrbot/core/platform/sources/discord/components.py

@@ -97,8 +97,8 @@ class DiscordView(BaseMessageComponent):
 
     def __init__(
         self,
-        components: list[BaseMessageComponent] | None = None,
-        timeout: float | None = None,
+        components: list[BaseMessageComponent] = None,
+        timeout: float = None,
     ):
         self.components = components or []
         self.timeout = timeout

astrbot/core/platform/sources/discord/discord_platform_adapter.py

@@ -1,10 +1,10 @@
 import asyncio
 import re
 import sys
-from typing import Any, cast
+from typing import Any
 
 import discord
-from discord.abc import GuildChannel, Messageable, PrivateChannel
+from discord.abc import Messageable
 from discord.channel import DMChannel
 
 from astrbot import logger
@@ -44,9 +44,10 @@ class DiscordPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+        self.config = platform_config
         self.settings = platform_settings
-        self.client_self_id: str | None = None
+        self.client_self_id = None
         self.registered_handlers = []
         # 指令注册相关
         self.enable_command_register = self.config.get("discord_command_register", True)
@@ -62,12 +63,6 @@ class DiscordPlatformAdapter(Platform):
         message_chain: MessageChain,
     ):
         """通过会话发送消息"""
-        if self.client.user is None:
-            logger.error(
-                "[Discord] 客户端未就绪 (self.client.user is None)，无法发送消息"
-            )
-            return
-
         # 创建一个 message_obj 以便在 event 中使用
         message_obj = AstrBotMessage()
         if "_" in session.session_id:
@@ -95,7 +90,7 @@ class DiscordPlatformAdapter(Platform):
             user_id=str(self.client_self_id),
             nickname=self.client.user.display_name,
         )
-        message_obj.self_id = cast(str, self.client_self_id)
+        message_obj.self_id = self.client_self_id
         message_obj.session_id = session.session_id
         message_obj.message = message_chain.chain
 
@@ -116,7 +111,7 @@ class DiscordPlatformAdapter(Platform):
         return PlatformMetadata(
             "discord",
             "Discord 适配器",
-            id=cast(str, self.config.get("id")),
+            id=self.config.get("id"),
             default_config_tmpl=self.config,
             support_streaming_message=False,
         )
@@ -166,7 +161,7 @@ class DiscordPlatformAdapter(Platform):
 
     def _get_message_type(
         self,
-        channel: Messageable | GuildChannel | PrivateChannel,
+        channel: Messageable,
         guild_id: int | None = None,
     ) -> MessageType:
         """根据 channel 对象和 guild_id 判断消息类型"""
@@ -176,15 +171,13 @@ class DiscordPlatformAdapter(Platform):
             return MessageType.FRIEND_MESSAGE
         return MessageType.GROUP_MESSAGE
 
-    def _get_channel_id(
-        self, channel: Messageable | GuildChannel | PrivateChannel
-    ) -> str:
+    def _get_channel_id(self, channel: Messageable) -> str:
         """根据 channel 对象获取ID"""
         return str(getattr(channel, "id", None))
 
     def _convert_message_to_abm(self, data: dict) -> AstrBotMessage:
         """将普通消息转换为 AstrBotMessage"""
-        message = data["message"]
+        message: discord.Message = data["message"]
 
         content = message.content
 
@@ -241,7 +234,7 @@ class DiscordPlatformAdapter(Platform):
                     )
         abm.message = message_chain
         abm.raw_message = message
-        abm.self_id = cast(str, self.client_self_id)
+        abm.self_id = self.client_self_id
         abm.session_id = str(message.channel.id)
         abm.message_id = str(message.id)
         return abm
@@ -262,52 +255,32 @@ class DiscordPlatformAdapter(Platform):
             interaction_followup_webhook=followup_webhook,
         )
 
-        if self.client.user is None:
-            logger.error(
-                "[Discord] 客户端未就绪 (self.client.user is None)，无法处理消息"
-            )
-            return
-
         # 检查是否为斜杠指令
         is_slash_command = message_event.interaction_followup_webhook is not None
 
-        # 1. 优先处理斜杠指令
-        if is_slash_command:
-            message_event.is_wake = True
-            message_event.is_at_or_wake_command = True
-            self.commit_event(message_event)
-            return
-
-        # 2. 处理普通消息（提及检测）
-        # 确保 raw_message 是 discord.Message 类型，以便静态检查通过
-        raw_message = message.raw_message
-        if not isinstance(raw_message, discord.Message):
-            logger.warning(
-                f"[Discord] 收到非 Message 类型的消息: {type(raw_message)}，已忽略。"
-            )
-            return
-
         # 检查是否被@（User Mention 或 Bot 拥有的 Role Mention）
         is_mention = False
-
         # User Mention
-        # 此时 Pylance 知道 raw_message 是 discord.Message，具有 mentions 属性
-        if self.client.user in raw_message.mentions:
-            is_mention = True
-
+        if (
+            self.client
+            and self.client.user
+            and hasattr(message.raw_message, "mentions")
+        ):
+            if self.client.user in message.raw_message.mentions:
+                is_mention = True
         # Role Mention（Bot 拥有的角色被提及）
-        if not is_mention and raw_message.role_mentions:
+        if not is_mention and hasattr(message.raw_message, "role_mentions"):
             bot_member = None
-            if raw_message.guild:
+            if hasattr(message.raw_message, "guild") and message.raw_message.guild:
                 try:
-                    bot_member = raw_message.guild.get_member(
+                    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(raw_message.role_mentions)
+                mentioned_roles = set(message.raw_message.role_mentions)
                 if (
                     bot_roles
                     and mentioned_roles
@@ -315,8 +288,8 @@ class DiscordPlatformAdapter(Platform):
                 ):
                     is_mention = True
 
-        # 如果是被@的消息，设置为唤醒状态
-        if is_mention:
+        # 如果是斜杠指令或被@的消息，设置为唤醒状态
+        if is_slash_command or is_mention:
             message_event.is_wake = True
             message_event.is_at_or_wake_command = True
 
@@ -452,7 +425,7 @@ class DiscordPlatformAdapter(Platform):
             )
             abm.message = [Plain(text=message_str_for_filter)]
             abm.raw_message = ctx.interaction
-            abm.self_id = cast(str, self.client_self_id)
+            abm.self_id = self.client_self_id
             abm.session_id = str(ctx.channel_id)
             abm.message_id = str(ctx.interaction.id)
 
@@ -465,7 +438,7 @@ class DiscordPlatformAdapter(Platform):
     def _extract_command_info(
         event_filter: Any,
         handler_metadata: StarHandlerMetadata,
-    ) -> tuple[str, str, CommandFilter | None] | None:
+    ) -> tuple[str, str, CommandFilter] | None:
         """从事件过滤器中提取指令信息"""
         cmd_name = None
         # is_group = False

astrbot/core/platform/sources/discord/discord_platform_event.py

@@ -4,10 +4,8 @@ import binascii
 from collections.abc import AsyncGenerator
 from io import BytesIO
 from pathlib import Path
-from typing import cast
 
 import discord
-from discord.types.interactions import ComponentInteractionData
 
 from astrbot import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
@@ -87,9 +85,6 @@ class DiscordPlatformEvent(AstrMessageEvent):
                 channel = await self._get_channel()
                 if not channel:
                     return
-                if not isinstance(channel, discord.abc.Messageable):
-                    logger.error(f"[Discord] 频道 {channel.id} 不是可发送消息的类型")
-                    return
                 await channel.send(**kwargs)
 
         except Exception as e:
@@ -112,9 +107,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
         await self.send(buffer)
         return await super().send_streaming(generator, use_fallback)
 
-    async def _get_channel(
-        self,
-    ) -> discord.Thread | discord.abc.GuildChannel | discord.abc.PrivateChannel | None:
+    async def _get_channel(self) -> discord.abc.Messageable | None:
         """获取当前事件对应的频道对象"""
         try:
             channel_id = int(self.session_id)
@@ -128,13 +121,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
     async def _parse_to_discord(
         self,
         message: MessageChain,
-    ) -> tuple[
-        str,
-        list[discord.File],
-        discord.ui.View | None,
-        list[discord.Embed],
-        str | int | None,
-    ]:
+    ) -> tuple[str, list[discord.File], discord.ui.View | None, list[discord.Embed]]:
         """将 MessageChain 解析为 Discord 发送所需的内容"""
         content_parts = []
         files = []
@@ -274,9 +261,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
                 self.message_obj.raw_message,
                 "add_reaction",
             ):
-                await cast(discord.Message, self.message_obj.raw_message).add_reaction(
-                    emoji
-                )
+                await self.message_obj.raw_message.add_reaction(emoji)
         except Exception as e:
             logger.error(f"[Discord] 添加反应失败: {e}")
 
@@ -285,7 +270,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
         return (
             hasattr(self.message_obj, "raw_message")
             and hasattr(self.message_obj.raw_message, "type")
-            and cast(discord.Interaction, self.message_obj.raw_message).type
+            and self.message_obj.raw_message.type
             == discord.InteractionType.application_command
         )
 
@@ -294,18 +279,14 @@ class DiscordPlatformEvent(AstrMessageEvent):
         return (
             hasattr(self.message_obj, "raw_message")
             and hasattr(self.message_obj.raw_message, "type")
-            and cast(discord.Interaction, self.message_obj.raw_message).type
-            == discord.InteractionType.component
+            and self.message_obj.raw_message.type == discord.InteractionType.component
         )
 
     def get_interaction_custom_id(self) -> str:
         """获取交互组件的custom_id"""
         if self.is_button_interaction():
             try:
-                return cast(
-                    ComponentInteractionData,
-                    cast(discord.Interaction, self.message_obj.raw_message).data,
-                ).get("custom_id", "")
+                return self.message_obj.raw_message.data.get("custom_id", "")
             except Exception:
                 pass
         return ""
@@ -318,9 +299,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
         ):
             return any(
                 mention.id == int(self.message_obj.self_id)
-                for mention in cast(
-                    discord.Message, self.message_obj.raw_message
-                ).mentions
+                for mention in self.message_obj.raw_message.mentions
             )
         return False
 
@@ -330,5 +309,5 @@ class DiscordPlatformEvent(AstrMessageEvent):
             self.message_obj.raw_message,
             "clean_content",
         ):
-            return cast(discord.Message, self.message_obj.raw_message).clean_content
+            return self.message_obj.raw_message.clean_content
         return self.message_str

astrbot/core/platform/sources/lark/lark_adapter.py

@@ -2,17 +2,10 @@ import asyncio
 import base64
 import json
 import re
-import time
 import uuid
-from typing import Any, cast
 
 import lark_oapi as lark
-from lark_oapi.api.im.v1 import (
-    CreateMessageRequest,
-    CreateMessageRequestBody,
-    GetMessageResourceRequest,
-)
-from lark_oapi.api.im.v1.processor import P2ImMessageReceiveV1Processor
+from lark_oapi.api.im.v1 import *
 
 import astrbot.api.message_components as Comp
 from astrbot import logger
@@ -25,11 +18,9 @@ from astrbot.api.platform import (
     PlatformMetadata,
 )
 from astrbot.core.platform.astr_message_event import MessageSesion
-from astrbot.core.utils.webhook_utils import log_webhook_info
 
 from ...register import register_platform_adapter
 from .lark_event import LarkMessageEvent
-from .server import LarkWebhookServer
 
 
 @register_platform_adapter(
@@ -42,7 +33,9 @@ class LarkPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+
+        self.config = platform_config
 
         self.unique_session = platform_settings["unique_session"]
 
@@ -51,13 +44,9 @@ class LarkPlatformAdapter(Platform):
         self.domain = platform_config.get("domain", lark.FEISHU_DOMAIN)
         self.bot_name = platform_config.get("lark_bot_name", "astrbot")
 
-        # socket or webhook
-        self.connection_mode = platform_config.get("lark_connection_mode", "socket")
-
         if not self.bot_name:
             logger.warning("未设置飞书机器人名称，@ 机器人可能得不到回复。")
 
-        # 初始化 WebSocket 长连接相关配置
         async def on_msg_event_recv(event: lark.im.v1.P2ImMessageReceiveV1):
             await self.convert_msg(event)
 
@@ -70,8 +59,6 @@ class LarkPlatformAdapter(Platform):
             .build()
         )
 
-        self.do_v2_msg_event = do_v2_msg_event
-
         self.client = lark.ws.Client(
             app_id=self.appid,
             app_secret=self.appsecret,
@@ -81,56 +68,14 @@ class LarkPlatformAdapter(Platform):
         )
 
         self.lark_api = (
-            lark.Client.builder()
-            .app_id(self.appid)
-            .app_secret(self.appsecret)
-            .log_level(lark.LogLevel.ERROR)
-            .domain(self.domain)
-            .build()
+            lark.Client.builder().app_id(self.appid).app_secret(self.appsecret).build()
         )
 
-        self.webhook_server = None
-        if self.connection_mode == "webhook":
-            self.webhook_server = LarkWebhookServer(platform_config, event_queue)
-            self.webhook_server.set_callback(self.handle_webhook_event)
-
-        self.event_id_timestamps: dict[str, float] = {}
-
-    def _clean_expired_events(self):
-        """清理超过 30 分钟的事件记录"""
-        current_time = time.time()
-        expired_keys = [
-            event_id
-            for event_id, timestamp in self.event_id_timestamps.items()
-            if current_time - timestamp > 1800
-        ]
-        for event_id in expired_keys:
-            del self.event_id_timestamps[event_id]
-
-    def _is_duplicate_event(self, event_id: str) -> bool:
-        """检查事件是否重复
-
-        Args:
-            event_id: 事件ID
-
-        Returns:
-            True 表示重复事件，False 表示新事件
-        """
-        self._clean_expired_events()
-        if event_id in self.event_id_timestamps:
-            return True
-        self.event_id_timestamps[event_id] = time.time()
-        return False
-
     async def send_by_session(
         self,
         session: MessageSesion,
         message_chain: MessageChain,
     ):
-        if self.lark_api.im is None:
-            logger.error("[Lark] API Client im 模块未初始化，无法发送消息")
-            return
-
         res = await LarkMessageEvent._convert_to_lark(message_chain, self.lark_api)
         wrapped = {
             "zh_cn": {
@@ -171,25 +116,14 @@ class LarkPlatformAdapter(Platform):
         return PlatformMetadata(
             name="lark",
             description="飞书机器人官方 API 适配器",
-            id=cast(str, self.config.get("id")),
+            id=self.config.get("id"),
             support_streaming_message=False,
         )
 
     async def convert_msg(self, event: lark.im.v1.P2ImMessageReceiveV1):
-        if event.event is None:
-            logger.debug("[Lark] 收到空事件(event.event is None)")
-            return
         message = event.event.message
-        if message is None:
-            logger.debug("[Lark] 事件中没有消息体(message is None)")
-            return
-
         abm = AstrBotMessage()
-
-        if message.create_time:
-            abm.timestamp = int(message.create_time) // 1000
-        else:
-            abm.timestamp = int(time.time())
+        abm.timestamp = int(message.create_time) / 1000
         abm.message = []
         abm.type = (
             MessageType.GROUP_MESSAGE
@@ -204,28 +138,14 @@ class LarkPlatformAdapter(Platform):
         at_list = {}
         if message.mentions:
             for m in message.mentions:
-                if m.id is None:
-                    continue
-                # 飞书 open_id 可能是 None，这里做个防护
-                open_id = m.id.open_id if m.id.open_id else ""
-                at_list[m.key] = Comp.At(qq=open_id, name=m.name)
-
+                at_list[m.key] = Comp.At(qq=m.id.open_id, name=m.name)
                 if m.name == self.bot_name:
-                    if m.id.open_id is not None:
-                        abm.self_id = m.id.open_id
+                    abm.self_id = m.id.open_id
 
-        if message.content is None:
-            logger.warning("[Lark] 消息内容为空")
-            return
-
-        try:
-            content_json_b = json.loads(message.content)
-        except json.JSONDecodeError:
-            logger.error(f"[Lark] 解析消息内容失败: {message.content}")
-            return
+        content_json_b = json.loads(message.content)
 
         if message.message_type == "text":
-            message_str_raw = content_json_b.get("text", "")  # 带有 @ 的消息
+            message_str_raw = content_json_b["text"]  # 带有 @ 的消息
             at_pattern = r"(@_user_\d+)"  # 可以根据需求修改正则
             # at_users = re.findall(at_pattern, message_str_raw)
             # 拆分文本，去掉AT符号部分
@@ -250,47 +170,27 @@ class LarkPlatformAdapter(Platform):
             content_json_b = _ls
         elif message.message_type == "image":
             content_json_b = [
-                {
-                    "tag": "img",
-                    "image_key": content_json_b.get("image_key"),
-                    "style": [],
-                },
+                {"tag": "img", "image_key": content_json_b["image_key"], "style": []},
             ]
 
         if message.message_type in ("post", "image"):
             for comp in content_json_b:
-                if comp.get("tag") == "at":
-                    user_id = comp.get("user_id")
-                    if user_id in at_list:
-                        abm.message.append(at_list[user_id])
-                elif comp.get("tag") == "text" and comp.get("text", "").strip():
+                if comp["tag"] == "at":
+                    abm.message.append(at_list[comp["user_id"]])
+                elif comp["tag"] == "text" and comp["text"].strip():
                     abm.message.append(Comp.Plain(comp["text"].strip()))
-                elif comp.get("tag") == "img":
-                    image_key = comp.get("image_key")
-                    if not image_key:
-                        continue
-
+                elif comp["tag"] == "img":
+                    image_key = comp["image_key"]
                     request = (
                         GetMessageResourceRequest.builder()
-                        .message_id(cast(str, message.message_id))
+                        .message_id(message.message_id)
                         .file_key(image_key)
                         .type("image")
                         .build()
                     )
-
-                    if self.lark_api.im is None:
-                        logger.error("[Lark] API Client im 模块未初始化")
-                        continue
-
                     response = await self.lark_api.im.v1.message_resource.aget(request)
                     if not response.success():
                         logger.error(f"无法下载飞书图片: {image_key}")
-                        continue
-
-                    if response.file is None:
-                        logger.error(f"飞书图片响应中不包含文件流: {image_key}")
-                        continue
-
                     image_bytes = response.file.read()
                     image_base64 = base64.b64encode(image_bytes).decode()
                     abm.message.append(Comp.Image.fromBase64(image_base64))
@@ -298,19 +198,6 @@ class LarkPlatformAdapter(Platform):
         for comp in abm.message:
             if isinstance(comp, Comp.Plain):
                 abm.message_str += comp.text
-
-        if message.message_id is None:
-            logger.error("[Lark] 消息缺少 message_id")
-            return
-
-        if (
-            event.event.sender is None
-            or event.event.sender.sender_id is None
-            or event.event.sender.sender_id.open_id is None
-        ):
-            logger.error("[Lark] 消息发送者信息不完整")
-            return
-
         abm.message_id = message.message_id
         abm.raw_message = message
         abm.sender = MessageMember(
@@ -342,61 +229,13 @@ class LarkPlatformAdapter(Platform):
 
         self._event_queue.put_nowait(event)
 
-    async def handle_webhook_event(self, event_data: dict):
-        """处理 Webhook 事件
-
-        Args:
-            event_data: Webhook 事件数据
-        """
-        try:
-            header = event_data.get("header", {})
-            event_id = header.get("event_id", "")
-            if event_id and self._is_duplicate_event(event_id):
-                logger.debug(f"[Lark Webhook] 跳过重复事件: {event_id}")
-                return
-            event_type = header.get("event_type", "")
-            if event_type == "im.message.receive_v1":
-                processor = P2ImMessageReceiveV1Processor(self.do_v2_msg_event)
-                data = (processor.type())(event_data)
-                processor.do(data)
-            else:
-                logger.debug(f"[Lark Webhook] 未处理的事件类型: {event_type}")
-        except Exception as e:
-            logger.error(f"[Lark Webhook] 处理事件失败: {e}", exc_info=True)
-
     async def run(self):
-        if self.connection_mode == "webhook":
-            # Webhook 模式
-            if self.webhook_server is None:
-                logger.error("[Lark] Webhook 模式已启用，但 webhook_server 未初始化")
-                return
-
-            webhook_uuid = self.config.get("webhook_uuid")
-            if webhook_uuid:
-                log_webhook_info(f"{self.meta().id}(飞书 Webhook)", webhook_uuid)
-            else:
-                logger.warning("[Lark] Webhook 模式已启用，但未配置 webhook_uuid")
-        else:
-            # 长连接模式
-            await self.client._connect()
-
-    async def webhook_callback(self, request: Any) -> Any:
-        """统一 Webhook 回调入口"""
-        if not self.webhook_server:
-            return {"error": "Webhook server not initialized"}, 500
-
-        return await self.webhook_server.handle_callback(request)
+        # self.client.start()
+        await self.client._connect()
 
     async def terminate(self):
-        if self.connection_mode == "socket":
-            await self.client._disconnect()
-        logger.info("飞书(Lark) 适配器已关闭")
+        await self.client._disconnect()
+        logger.info("飞书(Lark) 适配器已被优雅地关闭")
 
-    def get_client(self) -> lark.ws.Client:
+    def get_client(self) -> lark.Client:
         return self.client
-
-    def unified_webhook(self) -> bool:
-        return bool(
-            self.config.get("lark_connection_mode", "") == "webhook"
-            and self.config.get("webhook_uuid")
-        )

astrbot/core/platform/sources/lark/lark_event.py

@@ -5,15 +5,7 @@ import uuid
 from io import BytesIO
 
 import lark_oapi as lark
-from lark_oapi.api.im.v1 import (
-    CreateImageRequest,
-    CreateImageRequestBody,
-    CreateMessageReactionRequest,
-    CreateMessageReactionRequestBody,
-    Emoji,
-    ReplyMessageRequest,
-    ReplyMessageRequestBody,
-)
+from lark_oapi.api.im.v1 import *
 
 from astrbot import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
@@ -52,7 +44,7 @@ class LarkMessageEvent(AstrMessageEvent):
                     file_path = comp.file.replace("file:///", "")
                 elif comp.file and comp.file.startswith("http"):
                     image_file_path = await download_image_by_url(comp.file)
-                    file_path = image_file_path if image_file_path else ""
+                    file_path = image_file_path
                 elif comp.file and comp.file.startswith("base64://"):
                     base64_str = comp.file.removeprefix("base64://")
                     image_data = base64.b64decode(base64_str)
@@ -62,17 +54,10 @@ class LarkMessageEvent(AstrMessageEvent):
                     with open(file_path, "wb") as f:
                         f.write(BytesIO(image_data).getvalue())
                 else:
-                    file_path = comp.file if comp.file else ""
+                    file_path = comp.file
 
                 if image_file is None:
-                    if not file_path:
-                        logger.error("[Lark] 图片路径为空，无法上传")
-                        continue
-                    try:
-                        image_file = open(file_path, "rb")
-                    except Exception as e:
-                        logger.error(f"[Lark] 无法打开图片文件: {e}")
-                        continue
+                    image_file = open(file_path, "rb")
 
                 request = (
                     CreateImageRequest.builder()
@@ -84,20 +69,9 @@ class LarkMessageEvent(AstrMessageEvent):
                     )
                     .build()
                 )
-
-                if lark_client.im is None:
-                    logger.error("[Lark] API Client im 模块未初始化，无法上传图片")
-                    continue
-
                 response = await lark_client.im.v1.image.acreate(request)
                 if not response.success():
                     logger.error(f"无法上传飞书图片({response.code}): {response.msg}")
-                    continue
-
-                if response.data is None:
-                    logger.error("[Lark] 上传图片成功但未返回数据(data is None)")
-                    continue
-
                 image_key = response.data.image_key
                 logger.debug(image_key)
                 ret.append(_stage)
@@ -133,10 +107,6 @@ class LarkMessageEvent(AstrMessageEvent):
             .build()
         )
 
-        if self.bot.im is None:
-            logger.error("[Lark] API Client im 模块未初始化，无法回复消息")
-            return
-
         response = await self.bot.im.v1.message.areply(request)
 
         if not response.success():
@@ -145,10 +115,6 @@ class LarkMessageEvent(AstrMessageEvent):
         await super().send(message)
 
     async def react(self, emoji: str):
-        if self.bot.im is None:
-            logger.error("[Lark] API Client im 模块未初始化，无法发送表情")
-            return
-
         request = (
             CreateMessageReactionRequest.builder()
             .message_id(self.message_obj.message_id)
@@ -159,7 +125,6 @@ class LarkMessageEvent(AstrMessageEvent):
             )
             .build()
         )
-
         response = await self.bot.im.v1.message_reaction.acreate(request)
         if not response.success():
             logger.error(f"发送飞书表情回应失败({response.code}): {response.msg}")

astrbot/core/platform/sources/lark/server.py

@@ -1,206 +0,0 @@
-"""飞书(Lark) Webhook 服务器实现
-
-实现飞书事件订阅的 Webhook 模式，支持:
-1. 请求 URL 验证 (challenge 验证)
-2. 事件加密/解密 (AES-256-CBC)
-3. 签名校验 (SHA256)
-4. 事件接收和处理
-"""
-
-import asyncio
-import base64
-import hashlib
-import json
-from collections.abc import Awaitable, Callable
-
-from Crypto.Cipher import AES
-
-from astrbot.api import logger
-
-
-class AESCipher:
-    """AES 加密/解密工具类"""
-
-    def __init__(self, key: str):
-        self.bs = AES.block_size
-        self.key = hashlib.sha256(self.str_to_bytes(key)).digest()
-
-    @staticmethod
-    def str_to_bytes(data):
-        u_type = type(b"".decode("utf8"))
-        if isinstance(data, u_type):
-            return data.encode("utf8")
-        return data
-
-    @staticmethod
-    def _unpad(s):
-        return s[: -ord(s[len(s) - 1 :])]
-
-    def decrypt(self, enc):
-        iv = enc[: AES.block_size]
-        cipher = AES.new(self.key, AES.MODE_CBC, iv)
-        return self._unpad(cipher.decrypt(enc[AES.block_size :]))
-
-    def decrypt_string(self, enc):
-        enc = base64.b64decode(enc)
-        return self.decrypt(enc).decode("utf8")
-
-
-class LarkWebhookServer:
-    """飞书 Webhook 服务器
-
-    仅支持统一 Webhook 模式
-    """
-
-    def __init__(self, config: dict, event_queue: asyncio.Queue):
-        """初始化 Webhook 服务器
-
-        Args:
-            config: 飞书配置
-            event_queue: 事件队列
-        """
-        self.app_id = config["app_id"]
-        self.app_secret = config["app_secret"]
-        self.encrypt_key = config.get("lark_encrypt_key", "")
-        self.verification_token = config.get("lark_verification_token", "")
-
-        self.event_queue = event_queue
-        self.callback: Callable[[dict], Awaitable[None]] | None = None
-
-        # 初始化加密工具
-        self.cipher = None
-        if self.encrypt_key:
-            self.cipher = AESCipher(self.encrypt_key)
-
-    def verify_signature(
-        self,
-        timestamp: str,
-        nonce: str,
-        encrypt_key: str,
-        body: bytes,
-        signature: str,
-    ) -> bool:
-        """验证签名
-
-        Args:
-            timestamp: 请求时间戳
-            nonce: 随机数
-            encrypt_key: 加密密钥
-            body: 请求体
-            signature: 签名
-
-        Returns:
-            签名是否有效
-        """
-        # 拼接字符串: timestamp + nonce + encrypt_key + body
-        bytes_b1 = (timestamp + nonce + encrypt_key).encode("utf-8")
-        bytes_b = bytes_b1 + body
-        h = hashlib.sha256(bytes_b)
-        calculated_signature = h.hexdigest()
-        return calculated_signature == signature
-
-    def decrypt_event(self, encrypted_data: str) -> dict:
-        """解密事件数据
-
-        Args:
-            encrypted_data: 加密的事件数据
-
-        Returns:
-            解密后的事件字典
-        """
-        if not self.cipher:
-            raise ValueError("未配置 encrypt_key，无法解密事件")
-
-        decrypted_str = self.cipher.decrypt_string(encrypted_data)
-        return json.loads(decrypted_str)
-
-    async def handle_challenge(self, event_data: dict) -> dict:
-        """处理 challenge 验证请求
-
-        Args:
-            event_data: 事件数据
-
-        Returns:
-            包含 challenge 的响应
-        """
-        challenge = event_data.get("challenge", "")
-        logger.info(f"[Lark Webhook] 收到 challenge 验证请求: {challenge}")
-
-        return {"challenge": challenge}
-
-    async def handle_callback(self, request) -> tuple[dict, int] | dict:
-        """处理 webhook 回调，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            响应数据
-        """
-        # 获取原始请求体
-        body = await request.get_data()
-
-        try:
-            event_data = await request.json
-        except Exception as e:
-            logger.error(f"[Lark Webhook] 解析请求体失败: {e}")
-            return {"error": "Invalid JSON"}, 400
-
-        if not event_data:
-            logger.error("[Lark Webhook] 请求体为空")
-            return {"error": "Empty request body"}, 400
-
-        # 如果配置了 encrypt_key，进行签名验证
-        if self.encrypt_key:
-            timestamp = request.headers.get("X-Lark-Request-Timestamp", "")
-            nonce = request.headers.get("X-Lark-Request-Nonce", "")
-            signature = request.headers.get("X-Lark-Signature", "")
-
-            if timestamp and nonce and signature:
-                if not self.verify_signature(
-                    timestamp, nonce, self.encrypt_key, body, signature
-                ):
-                    logger.error("[Lark Webhook] 签名验证失败")
-                    return {"error": "Invalid signature"}, 401
-
-        # 检查是否是加密事件
-        if "encrypt" in event_data:
-            try:
-                event_data = self.decrypt_event(event_data["encrypt"])
-                logger.debug(f"[Lark Webhook] 解密后的事件: {event_data}")
-            except Exception as e:
-                logger.error(f"[Lark Webhook] 解密事件失败: {e}")
-                return {"error": "Decryption failed"}, 400
-
-        # 验证 token
-        if self.verification_token:
-            header = event_data.get("header", {})
-            if header:
-                token = header.get("token", "")
-            else:
-                token = event_data.get("token", "")
-            if token != self.verification_token:
-                logger.error("[Lark Webhook] Verification Token 不匹配。")
-                return {"error": "Invalid verification token"}, 401
-
-        # 处理 URL 验证 (challenge)
-        if event_data.get("type") == "url_verification":
-            return await self.handle_challenge(event_data)
-
-        # 调用回调函数处理事件
-        if self.callback:
-            try:
-                await self.callback(event_data)
-            except Exception as e:
-                logger.error(f"[Lark Webhook] 处理事件回调失败: {e}", exc_info=True)
-                return {"error": "Event processing failed"}, 500
-
-        return {}
-
-    def set_callback(self, callback: Callable[[dict], Awaitable[None]]):
-        """设置事件回调函数
-
-        Args:
-            callback: 处理事件的异步函数
-        """
-        self.callback = callback

astrbot/core/platform/sources/misskey/misskey_adapter.py

@@ -1,6 +1,7 @@
 import asyncio
 import os
 import random
+from collections.abc import Awaitable
 from typing import Any
 
 import astrbot.api.message_components as Comp
@@ -54,7 +55,8 @@ class MisskeyPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config or {}, event_queue)
+        super().__init__(event_queue)
+        self.config = platform_config or {}
         self.settings = platform_settings or {}
         self.instance_url = self.config.get("misskey_instance_url", "")
         self.access_token = self.config.get("misskey_token", "")
@@ -202,7 +204,7 @@ class MisskeyPlatformAdapter(Platform):
             if not isinstance(message.raw_message, dict):
                 message.raw_message = {}
             message.raw_message["poll"] = poll
-            message.__setattr__("poll", poll)
+            message.poll = poll
         except Exception:
             pass
 
@@ -371,7 +373,7 @@ class MisskeyPlatformAdapter(Platform):
         self,
         session: MessageSession,
         message_chain: MessageChain,
-    ) -> None:
+    ) -> Awaitable[Any]:
         if not self.api:
             logger.error("[Misskey] API 客户端未初始化")
             return await super().send_by_session(session, message_chain)

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -3,7 +3,6 @@ import base64
 import os
 import random
 import uuid
-from typing import cast
 
 import aiofiles
 import botpy
@@ -61,10 +60,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     time_since_last_edit = current_time - last_edit_time
 
                     if time_since_last_edit >= throttle_interval:
-                        ret = cast(
-                            message.Message,
-                            await self._post_send(stream=stream_payload),
-                        )
+                        ret = await self._post_send(stream=stream_payload)
                         stream_payload["index"] += 1
                         stream_payload["id"] = ret["id"]
                         last_edit_time = asyncio.get_event_loop().time()
@@ -73,8 +69,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                 # 结束流式对话，并且传输 buffer 中剩余的消息
                 stream_payload["state"] = 10
                 ret = await self._post_send(stream=stream_payload)
-            else:
-                ret = await self._post_send()
 
         except Exception as e:
             logger.error(f"发送流式消息时出错: {e}", exc_info=True)
@@ -87,8 +81,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             return None
 
         source = self.message_obj.raw_message
-
-        if not isinstance(
+        assert isinstance(
             source,
             (
                 botpy.message.Message,
@@ -96,9 +89,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                 botpy.message.DirectMessage,
                 botpy.message.C2CMessage,
             ),
-        ):
-            logger.warning(f"[QQOfficial] 不支持的消息源类型: {type(source)}")
-            return None
+        )
 
         (
             plain_text,
@@ -115,7 +106,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         ):
             return None
 
-        payload: dict = {
+        payload = {
             "content": plain_text,
             "msg_id": self.message_obj.message_id,
         }
@@ -125,12 +116,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
 
         ret = None
 
-        match source:
-            case botpy.message.GroupMessage():
-                if not source.group_openid:
-                    logger.error("[QQOfficial] GroupMessage 缺少 group_openid")
-                    return None
-
+        match type(source):
+            case botpy.message.GroupMessage:
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(
                         image_base64,
@@ -151,8 +138,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     group_openid=source.group_openid,
                     **payload,
                 )
-
-            case botpy.message.C2CMessage():
+            case botpy.message.C2CMessage:
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(
                         image_base64,
@@ -181,23 +167,18 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                         **payload,
                     )
                 logger.debug(f"Message sent to C2C: {ret}")
-
-            case botpy.message.Message():
+            case botpy.message.Message:
                 if image_path:
                     payload["file_image"] = image_path
                 ret = await self.bot.api.post_message(
                     channel_id=source.channel_id,
                     **payload,
                 )
-
-            case botpy.message.DirectMessage():
+            case botpy.message.DirectMessage:
                 if image_path:
                     payload["file_image"] = image_path
                 ret = await self.bot.api.post_dms(guild_id=source.guild_id, **payload)
 
-            case _:
-                pass
-
         await super().send(self.send_buffer)
 
         self.send_buffer = None
@@ -215,33 +196,18 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             "file_type": file_type,
             "srv_send_msg": False,
         }
-
-        result = None
         if "openid" in kwargs:
             payload["openid"] = kwargs["openid"]
             route = Route("POST", "/v2/users/{openid}/files", openid=kwargs["openid"])
-            result = await self.bot.api._http.request(route, json=payload)
-        elif "group_openid" in kwargs:
+            return await self.bot.api._http.request(route, json=payload)
+        if "group_openid" in kwargs:
             payload["group_openid"] = kwargs["group_openid"]
             route = Route(
                 "POST",
                 "/v2/groups/{group_openid}/files",
                 group_openid=kwargs["group_openid"],
             )
-            result = await self.bot.api._http.request(route, json=payload)
-        else:
-            raise ValueError("Invalid upload parameters")
-
-        if not isinstance(result, dict):
-            raise RuntimeError(
-                f"Failed to upload image, response is not dict: {result}"
-            )
-
-        return Media(
-            file_uuid=result["file_uuid"],
-            file_info=result["file_info"],
-            ttl=result.get("ttl", 0),
-        )
+            return await self.bot.api._http.request(route, json=payload)
 
     async def upload_group_and_c2c_record(
         self,
@@ -284,14 +250,11 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             result = await self.bot.api._http.request(route, json=payload)
 
             if result:
-                if not isinstance(result, dict):
-                    logger.error(f"上传文件响应格式错误: {result}")
-                    return None
-
                 return Media(
-                    file_uuid=result["file_uuid"],
-                    file_info=result["file_info"],
+                    file_uuid=result.get("file_uuid"),
+                    file_info=result.get("file_info"),
                     ttl=result.get("ttl", 0),
+                    file_id=result.get("id", ""),
                 )
         except Exception as e:
             logger.error(f"上传请求错误: {e}")
@@ -308,7 +271,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         message_reference: message.Reference | None = None,
         media: message.Media | None = None,
         msg_id: str | None = None,
-        msg_seq: int | None = 1,
+        msg_seq: str = 1,
         event_id: str | None = None,
         markdown: message.MarkdownPayload | None = None,
         keyboard: message.Keyboard | None = None,
@@ -317,14 +280,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         payload = locals()
         payload.pop("self", None)
         route = Route("POST", "/v2/users/{openid}/messages", openid=openid)
-        result = await self.bot.api._http.request(route, json=payload)
-
-        if not isinstance(result, dict):
-            raise RuntimeError(
-                f"Failed to post c2c message, response is not dict: {result}"
-            )
-
-        return message.Message(**result)
+        return await self.bot.api._http.request(route, json=payload)
 
     @staticmethod
     async def _parse_to_qqofficial(message: MessageChain):
@@ -344,10 +300,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     image_base64 = file_to_base64(image_file_path)
                 elif i.file and i.file.startswith("base64://"):
                     image_base64 = i.file
-                elif i.file:
-                    image_base64 = file_to_base64(i.file)
                 else:
-                    raise ValueError("Unsupported image file format")
+                    image_base64 = file_to_base64(i.file)
                 image_base64 = image_base64.removeprefix("base64://")
             elif isinstance(i, Record):
                 if i.file:

astrbot/core/platform/sources/qqofficial/qqofficial_platform_adapter.py

@@ -4,7 +4,6 @@ import asyncio
 import logging
 import os
 import time
-from typing import cast
 
 import botpy
 import botpy.message
@@ -45,9 +44,7 @@ class botClient(Client):
             MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
-            abm.sender.user_id
-            if self.platform.unique_session
-            else cast(str, message.group_openid)
+            abm.sender.user_id if self.platform.unique_session else message.group_openid
         )
         self._commit(abm)
 
@@ -100,11 +97,13 @@ class QQOfficialPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+
+        self.config = platform_config
 
         self.appid = platform_config["appid"]
         self.secret = platform_config["secret"]
-        self.unique_session: bool = platform_settings["unique_session"]
+        self.unique_session = platform_settings["unique_session"]
         qq_group = platform_config["enable_group_c2c"]
         guild_dm = platform_config["enable_guild_direct_message"]
 
@@ -140,15 +139,12 @@ class QQOfficialPlatformAdapter(Platform):
         return PlatformMetadata(
             name="qq_official",
             description="QQ 机器人官方 API 适配器",
-            id=cast(str, self.config.get("id")),
+            id=self.config.get("id"),
         )
 
     @staticmethod
     def _parse_from_qqofficial(
-        message: botpy.message.Message
-        | botpy.message.GroupMessage
-        | botpy.message.DirectMessage
-        | botpy.message.C2CMessage,
+        message: botpy.message.Message | botpy.message.GroupMessage,
         message_type: MessageType,
     ):
         abm = AstrBotMessage()
@@ -156,7 +152,7 @@ class QQOfficialPlatformAdapter(Platform):
         abm.timestamp = int(time.time())
         abm.raw_message = message
         abm.message_id = message.id
-        # abm.tag = "qq_official"
+        abm.tag = "qq_official"
         msg: list[BaseMessageComponent] = []
 
         if isinstance(message, botpy.message.GroupMessage) or isinstance(
@@ -186,9 +182,9 @@ class QQOfficialPlatformAdapter(Platform):
             message,
             botpy.message.DirectMessage,
         ):
-            if isinstance(message, botpy.message.Message):
+            try:
                 abm.self_id = str(message.mentions[0].id)
-            else:
+            except BaseException as _:
                 abm.self_id = ""
 
             plain_content = message.content.replace(

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_adapter.py

@@ -1,6 +1,5 @@
 import asyncio
 import logging
-from typing import Any, cast
 
 import botpy
 import botpy.message
@@ -12,7 +11,6 @@ from astrbot import logger
 from astrbot.api.event import MessageChain
 from astrbot.api.platform import AstrBotMessage, MessageType, Platform, PlatformMetadata
 from astrbot.core.platform.astr_message_event import MessageSesion
-from astrbot.core.utils.webhook_utils import log_webhook_info
 
 from ...register import register_platform_adapter
 from ..qqofficial.qqofficial_platform_adapter import QQOfficialPlatformAdapter
@@ -36,9 +34,7 @@ class botClient(Client):
             MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
-            abm.sender.user_id
-            if self.platform.unique_session
-            else cast(str, message.group_openid)
+            abm.sender.user_id if self.platform.unique_session else message.group_openid
         )
         self._commit(abm)
 
@@ -91,12 +87,13 @@ class QQOfficialWebhookPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+
+        self.config = platform_config
 
         self.appid = platform_config["appid"]
         self.secret = platform_config["secret"]
         self.unique_session = platform_settings["unique_session"]
-        self.unified_webhook_mode = platform_config.get("unified_webhook_mode", False)
 
         intents = botpy.Intents(
             public_messages=True,
@@ -109,7 +106,6 @@ class QQOfficialWebhookPlatformAdapter(Platform):
             timeout=20,
         )
         self.client.set_platform(self)
-        self.webhook_helper = None
 
     async def send_by_session(
         self,
@@ -122,7 +118,7 @@ class QQOfficialWebhookPlatformAdapter(Platform):
         return PlatformMetadata(
             name="qq_official_webhook",
             description="QQ 机器人官方 API 适配器",
-            id=cast(str, self.config.get("id")),
+            id=self.config.get("id"),
         )
 
     async def run(self):
@@ -132,37 +128,16 @@ class QQOfficialWebhookPlatformAdapter(Platform):
             self.client,
         )
         await self.webhook_helper.initialize()
-
-        # 如果启用统一 webhook 模式，则不启动独立服务器
-        webhook_uuid = self.config.get("webhook_uuid")
-        if self.unified_webhook_mode and webhook_uuid:
-            log_webhook_info(f"{self.meta().id}(QQ 官方机器人 Webhook)", webhook_uuid)
-            # 保持运行状态，等待 shutdown
-            await self.webhook_helper.shutdown_event.wait()
-        else:
-            await self.webhook_helper.start_polling()
+        await self.webhook_helper.start_polling()
 
     def get_client(self) -> botClient:
         return self.client
 
-    async def webhook_callback(self, request: Any) -> Any:
-        """统一 Webhook 回调入口"""
-        if not self.webhook_helper:
-            return {"error": "Webhook helper not initialized"}, 500
-
-        # 复用 webhook_helper 的回调处理逻辑
-        return await self.webhook_helper.handle_callback(request)
-
     async def terminate(self):
-        if self.webhook_helper:
-            self.webhook_helper.shutdown_event.set()
+        self.webhook_helper.shutdown_event.set()
         await self.client.close()
-        if self.webhook_helper and not self.unified_webhook_mode:
-            try:
-                await self.webhook_helper.server.shutdown()
-            except Exception as exc:
-                logger.warning(
-                    f"Exception occurred during QQOfficialWebhook server shutdown: {exc}",
-                    exc_info=True,
-                )
+        try:
+            await self.webhook_helper.server.shutdown()
+        except Exception as _:
+            pass
         logger.info("QQ 机器人官方 API 适配器已经被优雅地关闭")

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py

@@ -1,6 +1,5 @@
 import asyncio
 import logging
-from typing import cast
 
 import quart
 from botpy import BotAPI, BotHttp, BotWebSocket, Client, ConnectionSession, Token
@@ -79,19 +78,7 @@ class QQOfficialWebhook:
         return response
 
     async def callback(self):
-        """内部服务器的回调入口"""
-        return await self.handle_callback(quart.request)
-
-    async def handle_callback(self, request) -> dict:
-        """处理 webhook 回调，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            响应数据
-        """
-        msg: dict = await request.json
+        msg: dict = await quart.request.json
         logger.debug(f"收到 qq_official_webhook 回调: {msg}")
 
         event = msg.get("t")
@@ -100,7 +87,7 @@ class QQOfficialWebhook:
 
         if opcode == 13:
             # validation
-            signed = await self.webhook_validation(cast(dict, data))
+            signed = await self.webhook_validation(data)
             print(signed)
             return signed
 

astrbot/core/platform/sources/satori/satori_adapter.py

@@ -38,7 +38,8 @@ class SatoriPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+        self.config = platform_config
         self.settings = platform_settings
 
         self.api_base_url = self.config.get(

astrbot/core/platform/sources/slack/client.py

@@ -4,11 +4,9 @@ import hmac
 import json
 import logging
 from collections.abc import Callable
-from typing import cast
 
 from quart import Quart, Response, request
 from slack_sdk.socket_mode.aiohttp import SocketModeClient
-from slack_sdk.socket_mode.async_client import AsyncBaseSocketModeClient
 from slack_sdk.socket_mode.request import SocketModeRequest
 from slack_sdk.socket_mode.response import SocketModeResponse
 from slack_sdk.web.async_client import AsyncWebClient
@@ -49,62 +47,51 @@ class SlackWebhookClient:
 
         @self.app.route(self.path, methods=["POST"])
         async def slack_events():
-            """内部服务器的 POST 回调入口"""
-            return await self.handle_callback(request)
+            """处理 Slack 事件"""
+            try:
+                # 获取请求体和头部
+                body = await request.get_data()
+                event_data = json.loads(body.decode("utf-8"))
+
+                # Verify Slack request signature
+                timestamp = request.headers.get("X-Slack-Request-Timestamp")
+                signature = request.headers.get("X-Slack-Signature")
+                if not timestamp or not signature:
+                    return Response("Missing headers", status=400)
+                # Calculate the HMAC signature
+                sig_basestring = f"v0:{timestamp}:{body.decode('utf-8')}"
+                my_signature = (
+                    "v0="
+                    + hmac.new(
+                        self.signing_secret.encode("utf-8"),
+                        sig_basestring.encode("utf-8"),
+                        hashlib.sha256,
+                    ).hexdigest()
+                )
+                # Verify the signature
+                if not hmac.compare_digest(my_signature, signature):
+                    logger.warning("Slack request signature verification failed")
+                    return Response("Invalid signature", status=400)
+                logger.info(f"Received Slack event: {event_data}")
+
+                # 处理 URL 验证事件
+                if event_data.get("type") == "url_verification":
+                    return {"challenge": event_data.get("challenge")}
+                # 处理事件
+                if self.event_handler and event_data.get("type") == "event_callback":
+                    await self.event_handler(event_data)
+
+                return Response("", status=200)
+
+            except Exception as e:
+                logger.error(f"处理 Slack 事件时出错: {e}")
+                return Response("Internal Server Error", status=500)
 
         @self.app.route("/health", methods=["GET"])
         async def health_check():
             """健康检查端点"""
             return {"status": "ok", "service": "slack-webhook"}
 
-    async def handle_callback(self, req):
-        """处理 Slack 回调请求，可被统一 webhook 入口复用
-
-        Args:
-            req: Quart 请求对象
-
-        Returns:
-            Response 对象或字典
-        """
-        try:
-            # 获取请求体和头部
-            body = cast(bytes, await req.get_data())
-            event_data = json.loads(body.decode("utf-8"))
-
-            # Verify Slack request signature
-            timestamp = req.headers.get("X-Slack-Request-Timestamp")
-            signature = req.headers.get("X-Slack-Signature")
-            if not timestamp or not signature:
-                return Response("Missing headers", status=400)
-            # Calculate the HMAC signature
-            sig_basestring = f"v0:{timestamp}:{body.decode('utf-8')}"
-            my_signature = (
-                "v0="
-                + hmac.new(
-                    self.signing_secret.encode("utf-8"),
-                    sig_basestring.encode("utf-8"),
-                    hashlib.sha256,
-                ).hexdigest()
-            )
-            # Verify the signature
-            if not hmac.compare_digest(my_signature, signature):
-                logger.warning("Slack request signature verification failed")
-                return Response("Invalid signature", status=400)
-            logger.info(f"Received Slack event: {event_data}")
-
-            # 处理 URL 验证事件
-            if event_data.get("type") == "url_verification":
-                return {"challenge": event_data.get("challenge")}
-            # 处理事件
-            if self.event_handler and event_data.get("type") == "event_callback":
-                await self.event_handler(event_data)
-
-            return Response("", status=200)
-
-        except Exception as e:
-            logger.error(f"处理 Slack 事件时出错: {e}")
-            return Response("Internal Server Error", status=500)
-
     async def start(self):
         """启动 Webhook 服务器"""
         logger.info(
@@ -141,14 +128,9 @@ class SlackSocketClient:
         self.event_handler = event_handler
         self.socket_client = None
 
-    async def _handle_events(
-        self, _: AsyncBaseSocketModeClient, req: SocketModeRequest
-    ):
+    async def _handle_events(self, _: SocketModeClient, req: SocketModeRequest):
         """处理 Socket Mode 事件"""
         try:
-            if self.socket_client is None:
-                raise RuntimeError("Socket client is not initialized")
-
             # 确认收到事件
             response = SocketModeResponse(envelope_id=req.envelope_id)
             await self.socket_client.send_socket_mode_response(response)

astrbot/core/platform/sources/slack/slack_adapter.py

@@ -3,7 +3,8 @@ import base64
 import re
 import time
 import uuid
-from typing import Any, cast
+from collections.abc import Awaitable
+from typing import Any
 
 import aiohttp
 from slack_sdk.socket_mode.request import SocketModeRequest
@@ -20,7 +21,6 @@ from astrbot.api.platform import (
     PlatformMetadata,
 )
 from astrbot.core.platform.astr_message_event import MessageSesion
-from astrbot.core.utils.webhook_utils import log_webhook_info
 
 from ...register import register_platform_adapter
 from .client import SlackSocketClient, SlackWebhookClient
@@ -39,7 +39,9 @@ class SlackAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+
+        self.config = platform_config
         self.settings = platform_settings
         self.unique_session = platform_settings.get("unique_session", False)
 
@@ -47,7 +49,6 @@ class SlackAdapter(Platform):
         self.app_token = platform_config.get("app_token")
         self.signing_secret = platform_config.get("signing_secret")
         self.connection_mode = platform_config.get("slack_connection_mode", "socket")
-        self.unified_webhook_mode = platform_config.get("unified_webhook_mode", False)
         self.webhook_host = platform_config.get("slack_webhook_host", "0.0.0.0")
         self.webhook_port = platform_config.get("slack_webhook_port", 3000)
         self.webhook_path = platform_config.get(
@@ -67,7 +68,7 @@ class SlackAdapter(Platform):
         self.metadata = PlatformMetadata(
             name="slack",
             description="适用于 Slack 的消息平台适配器，支持 Socket Mode 和 Webhook Mode。",
-            id=cast(str, self.config.get("id")),
+            id=self.config.get("id"),
             support_streaming_message=False,
         )
 
@@ -117,13 +118,13 @@ class SlackAdapter(Platform):
         logger.debug(f"[slack] RawMessage {event}")
 
         abm = AstrBotMessage()
-        abm.self_id = cast(str, self.bot_self_id)
+        abm.self_id = self.bot_self_id
 
         # 获取用户信息
         user_id = event.get("user", "")
         try:
             user_info = await self.web_client.users_info(user=user_id)
-            user_data = cast(dict, user_info["user"])
+            user_data = user_info["user"]
             user_name = user_data.get("real_name") or user_data.get("name", user_id)
         except Exception:
             user_name = user_id
@@ -134,7 +135,7 @@ class SlackAdapter(Platform):
         channel_id = event.get("channel", "")
         try:
             channel_info = await self.web_client.conversations_info(channel=channel_id)
-            is_im = cast(dict, channel_info["channel"])["is_im"]
+            is_im = channel_info["channel"]["is_im"]
 
             if is_im:
                 abm.type = MessageType.FRIEND_MESSAGE
@@ -177,7 +178,7 @@ class SlackAdapter(Platform):
                 for mention in mentions:
                     try:
                         mentioned_user = await self.web_client.users_info(user=mention)
-                        user_data = cast(dict, mentioned_user["user"])
+                        user_data = mentioned_user["user"]
                         user_name = user_data.get("real_name") or user_data.get(
                             "name",
                             mention,
@@ -328,7 +329,7 @@ class SlackAdapter(Platform):
                 )
                 raise Exception(f"下载文件失败: {resp.status}")
 
-    async def run(self) -> None:
+    async def run(self) -> Awaitable[Any]:
         self.bot_self_id = await self.get_bot_user_id()
         logger.info(f"Slack auth test OK. Bot ID: {self.bot_self_id}")
 
@@ -360,17 +361,10 @@ class SlackAdapter(Platform):
                 self._handle_webhook_event,
             )
 
-            # 如果启用统一 webhook 模式，则不启动独立服务器
-            webhook_uuid = self.config.get("webhook_uuid")
-            if self.unified_webhook_mode and webhook_uuid:
-                log_webhook_info(f"{self.meta().id}(Slack)", webhook_uuid)
-                # 保持运行状态，等待 shutdown
-                await self.webhook_client.shutdown_event.wait()
-            else:
-                logger.info(
-                    f"Slack 适配器 (Webhook Mode) 启动中，监听 {self.webhook_host}:{self.webhook_port}{self.webhook_path}...",
-                )
-                await self.webhook_client.start()
+            logger.info(
+                f"Slack 适配器 (Webhook Mode) 启动中，监听 {self.webhook_host}:{self.webhook_port}{self.webhook_path}...",
+            )
+            await self.webhook_client.start()
 
         else:
             raise ValueError(
@@ -397,19 +391,12 @@ class SlackAdapter(Platform):
             if abm:
                 await self.handle_msg(abm)
 
-    async def webhook_callback(self, request: Any) -> Any:
-        """统一 Webhook 回调入口"""
-        if self.connection_mode != "webhook" or not self.webhook_client:
-            return {"error": "Slack adapter is not in webhook mode"}, 400
-
-        return await self.webhook_client.handle_callback(request)
-
     async def terminate(self):
         if self.socket_client:
             await self.socket_client.stop()
         if self.webhook_client:
             await self.webhook_client.stop()
-        logger.info("Slack 适配器已被关闭")
+        logger.info("Slack 适配器已被优雅地关闭")
 
     def meta(self) -> PlatformMetadata:
         return self.metadata
@@ -427,10 +414,3 @@ class SlackAdapter(Platform):
 
     def get_client(self):
         return self.web_client
-
-    def unified_webhook(self) -> bool:
-        return bool(
-            self.config.get("unified_webhook_mode", False)
-            and self.config.get("slack_connection_mode", "") == "webhook"
-            and self.config.get("webhook_uuid")
-        )

astrbot/core/platform/sources/slack/slack_event.py

@@ -1,7 +1,6 @@
 import asyncio
 import re
-from collections.abc import AsyncGenerator, Iterable
-from typing import cast
+from collections.abc import AsyncGenerator
 
 from slack_sdk.web.async_client import AsyncWebClient
 
@@ -32,14 +31,14 @@ class SlackMessageEvent(AstrMessageEvent):
     async def _from_segment_to_slack_block(
         segment: BaseMessageComponent,
         web_client: AsyncWebClient,
-    ) -> dict | None:
+    ) -> dict:
         """将消息段转换为 Slack 块格式"""
         if isinstance(segment, Plain):
             return {"type": "section", "text": {"type": "mrkdwn", "text": segment.text}}
         if isinstance(segment, Image):
             # upload file
             url = segment.url or segment.file
-            if url and url.startswith("http"):
+            if url.startswith("http"):
                 return {
                     "type": "image",
                     "image_url": url,
@@ -56,7 +55,7 @@ class SlackMessageEvent(AstrMessageEvent):
                     "type": "section",
                     "text": {"type": "mrkdwn", "text": "图片上传失败"},
                 }
-            image_url = cast(list, response["files"])[0]["url_private"]
+            image_url = response["files"][0]["url_private"]
             logger.debug(f"Slack file upload response: {response}")
             return {
                 "type": "image",
@@ -78,7 +77,7 @@ class SlackMessageEvent(AstrMessageEvent):
                     "type": "section",
                     "text": {"type": "mrkdwn", "text": "文件上传失败"},
                 }
-            file_url = cast(list, response["files"])[0]["permalink"]
+            file_url = response["files"][0]["permalink"]
             return {
                 "type": "section",
                 "text": {
@@ -86,6 +85,7 @@ class SlackMessageEvent(AstrMessageEvent):
                     "text": f"文件: <{file_url}|{segment.name or '文件'}>",
                 },
             }
+        return {"type": "section", "text": {"type": "mrkdwn", "text": str(segment)}}
 
     @staticmethod
     async def _parse_slack_blocks(
@@ -115,8 +115,7 @@ class SlackMessageEvent(AstrMessageEvent):
                     segment,
                     web_client,
                 )
-                if block:
-                    blocks.append(block)
+                blocks.append(block)
 
         # 如果最后还有文本内容
         if text_content.strip():
@@ -226,10 +225,10 @@ class SlackMessageEvent(AstrMessageEvent):
             )
 
             members = []
-            for member_id in cast(Iterable, members_response["members"]):
+            for member_id in members_response["members"]:
                 try:
                     user_info = await self.web_client.users_info(user=member_id)
-                    user_data = cast(dict, user_info["user"])
+                    user_data = user_info["user"]
                     members.append(
                         MessageMember(
                             user_id=member_id,
@@ -241,7 +240,7 @@ class SlackMessageEvent(AstrMessageEvent):
                     # 如果获取用户信息失败，使用默认信息
                     members.append(MessageMember(user_id=member_id, nickname=member_id))
 
-            channel_data = cast(dict, channel_info["channel"])
+            channel_data = channel_info["channel"]
             return Group(
                 group_id=channel_id,
                 group_name=channel_data.get("name", ""),

astrbot/core/platform/sources/telegram/tg_adapter.py

@@ -42,7 +42,8 @@ class TelegramPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+        self.config = platform_config
         self.settings = platform_settings
         self.client_self_id = uuid.uuid4().hex[:8]
 
@@ -380,9 +381,7 @@ class TelegramPlatformAdapter(Platform):
                     f"Telegram document file_path is None, cannot save the file {file_name}.",
                 )
             else:
-                message.message.append(
-                    Comp.File(file=file_path, name=file_name, url=file_path)
-                )
+                message.message.append(Comp.File(file=file_path, name=file_name))
 
         elif update.message.video:
             file = await update.message.video.get_file()
@@ -424,6 +423,6 @@ class TelegramPlatformAdapter(Platform):
             if self.application.updater is not None:
                 await self.application.updater.stop()
 
-            logger.info("Telegram 适配器已被关闭")
+            logger.info("Telegram 适配器已被优雅地关闭")
         except Exception as e:
             logger.error(f"Telegram 适配器关闭时出错: {e}")

astrbot/core/platform/sources/telegram/tg_event.py

@@ -1,7 +1,6 @@
 import asyncio
 import os
 import re
-from typing import Any, cast
 
 import telegramify_markdown
 from telegram import ReactionTypeCustomEmoji, ReactionTypeEmoji
@@ -18,6 +17,8 @@ from astrbot.api.message_components import (
     Reply,
 )
 from astrbot.api.platform import AstrBotMessage, MessageType, PlatformMetadata
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from astrbot.core.utils.io import download_file
 
 
 class TelegramPlatformEvent(AstrMessageEvent):
@@ -96,7 +97,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
                 "chat_id": user_name,
             }
             if has_reply:
-                payload["reply_to_message_id"] = str(reply_message_id)
+                payload["reply_to_message_id"] = reply_message_id
             if message_thread_id:
                 payload["message_thread_id"] = message_thread_id
 
@@ -109,30 +110,33 @@ class TelegramPlatformEvent(AstrMessageEvent):
                     try:
                         md_text = telegramify_markdown.markdownify(
                             chunk,
+                            max_line_length=None,
                             normalize_whitespace=False,
                         )
                         await client.send_message(
                             text=md_text,
                             parse_mode="MarkdownV2",
-                            **cast(Any, payload),
+                            **payload,
                         )
                     except Exception as e:
                         logger.warning(
                             f"MarkdownV2 send failed: {e}. Using plain text instead.",
                         )
-                        await client.send_message(text=chunk, **cast(Any, payload))
+                        await client.send_message(text=chunk, **payload)
             elif isinstance(i, Image):
                 image_path = await i.convert_to_file_path()
-                await client.send_photo(photo=image_path, **cast(Any, payload))
+                await client.send_photo(photo=image_path, **payload)
             elif isinstance(i, File):
-                path = await i.get_file()
-                name = i.name or os.path.basename(path)
-                await client.send_document(
-                    document=path, filename=name, **cast(Any, payload)
-                )
+                if i.file.startswith("https://"):
+                    temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+                    path = os.path.join(temp_dir, i.name)
+                    await download_file(i.file, path)
+                    i.file = path
+
+                await client.send_document(document=i.file, filename=i.name, **payload)
             elif isinstance(i, Record):
                 path = await i.convert_to_file_path()
-                await client.send_voice(voice=path, **cast(Any, payload))
+                await client.send_voice(voice=path, **payload)
 
     async def send(self, message: MessageChain):
         if self.get_message_type() == MessageType.GROUP_MESSAGE:
@@ -200,15 +204,6 @@ class TelegramPlatformEvent(AstrMessageEvent):
             if isinstance(chain, MessageChain):
                 if chain.type == "break":
                     # 分割符
-                    if message_id:
-                        try:
-                            await self.client.edit_message_text(
-                                text=delta,
-                                chat_id=payload["chat_id"],
-                                message_id=message_id,
-                            )
-                        except Exception as e:
-                            logger.warning(f"编辑消息失败(streaming-break): {e!s}")
                     message_id = None  # 重置消息 ID
                     delta = ""  # 重置 delta
                     continue
@@ -219,23 +214,24 @@ class TelegramPlatformEvent(AstrMessageEvent):
                         delta += i.text
                     elif isinstance(i, Image):
                         image_path = await i.convert_to_file_path()
-                        await self.client.send_photo(
-                            photo=image_path, **cast(Any, payload)
-                        )
+                        await self.client.send_photo(photo=image_path, **payload)
                         continue
                     elif isinstance(i, File):
-                        path = await i.get_file()
-                        name = i.name or os.path.basename(path)
+                        if i.file.startswith("https://"):
+                            temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+                            path = os.path.join(temp_dir, i.name)
+                            await download_file(i.file, path)
+                            i.file = path
 
                         await self.client.send_document(
-                            document=path,
-                            filename=name,
-                            **cast(Any, payload),
+                            document=i.file,
+                            filename=i.name,
+                            **payload,
                         )
                         continue
                     elif isinstance(i, Record):
                         path = await i.convert_to_file_path()
-                        await self.client.send_voice(voice=path, **cast(Any, payload))
+                        await self.client.send_voice(voice=path, **payload)
                         continue
                     else:
                         logger.warning(f"不支持的消息类型: {type(i)}")
@@ -264,9 +260,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
                 else:
                     # delta 长度一般不会大于 4096，因此这里直接发送
                     try:
-                        msg = await self.client.send_message(
-                            text=delta, **cast(Any, payload)
-                        )
+                        msg = await self.client.send_message(text=delta, **payload)
                         current_content = delta
                     except Exception as e:
                         logger.warning(f"发送消息失败(streaming): {e!s}")
@@ -280,6 +274,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
                 try:
                     markdown_text = telegramify_markdown.markdownify(
                         delta,
+                        max_line_length=None,
                         normalize_whitespace=False,
                     )
                     await self.client.edit_message_text(

astrbot/core/platform/sources/webchat/webchat_adapter.py

@@ -2,13 +2,11 @@ import asyncio
 import os
 import time
 import uuid
-from collections.abc import Callable, Coroutine
+from collections.abc import Awaitable, Callable
 from typing import Any
 
 from astrbot import logger
-from astrbot.core import db_helper
-from astrbot.core.db.po import PlatformMessageHistory
-from astrbot.core.message.components import File, Image, Plain, Record, Reply, Video
+from astrbot.core.message.components import Image, Plain, Record
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.platform import (
     AstrBotMessage,
@@ -76,8 +74,9 @@ class WebChatAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
 
+        self.config = platform_config
         self.settings = platform_settings
         self.unique_session = platform_settings["unique_session"]
         self.imgs_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")
@@ -97,92 +96,6 @@ class WebChatAdapter(Platform):
         await WebChatMessageEvent._send(message_chain, session.session_id)
         await super().send_by_session(session, message_chain)
 
-    async def _get_message_history(
-        self, message_id: int
-    ) -> PlatformMessageHistory | None:
-        return await db_helper.get_platform_message_history_by_id(message_id)
-
-    async def _parse_message_parts(
-        self,
-        message_parts: list,
-        depth: int = 0,
-        max_depth: int = 1,
-    ) -> tuple[list, list[str]]:
-        """解析消息段列表，返回消息组件列表和纯文本列表
-
-        Args:
-            message_parts: 消息段列表
-            depth: 当前递归深度
-            max_depth: 最大递归深度（用于处理 reply）
-
-        Returns:
-            tuple[list, list[str]]: (消息组件列表, 纯文本列表)
-        """
-        components = []
-        text_parts = []
-
-        for part in message_parts:
-            part_type = part.get("type")
-            if part_type == "plain":
-                text = part.get("text", "")
-                components.append(Plain(text))
-                text_parts.append(text)
-            elif part_type == "reply":
-                message_id = part.get("message_id")
-                reply_chain = []
-                reply_message_str = ""
-                sender_id = None
-                sender_name = None
-
-                # recursively get the content of the referenced message
-                if depth < max_depth and message_id:
-                    history = await self._get_message_history(message_id)
-                    if history and history.content:
-                        reply_parts = history.content.get("message", [])
-                        if isinstance(reply_parts, list):
-                            (
-                                reply_chain,
-                                reply_text_parts,
-                            ) = await self._parse_message_parts(
-                                reply_parts,
-                                depth=depth + 1,
-                                max_depth=max_depth,
-                            )
-                            reply_message_str = "".join(reply_text_parts)
-                        sender_id = history.sender_id
-                        sender_name = history.sender_name
-
-                components.append(
-                    Reply(
-                        id=message_id,
-                        chain=reply_chain,
-                        message_str=reply_message_str,
-                        sender_id=sender_id,
-                        sender_nickname=sender_name,
-                    )
-                )
-            elif part_type == "image":
-                path = part.get("path")
-                if path:
-                    components.append(Image.fromFileSystem(path))
-            elif part_type == "record":
-                path = part.get("path")
-                if path:
-                    components.append(Record.fromFileSystem(path))
-            elif part_type == "file":
-                path = part.get("path")
-                if path:
-                    filename = part.get("filename") or (
-                        os.path.basename(path) if path else "file"
-                    )
-                    components.append(File(name=filename, file=path))
-            elif part_type == "video":
-                path = part.get("path")
-                if path:
-                    components.append(Video.fromFileSystem(path))
-
-        return components, text_parts
-
     async def convert_message(self, data: tuple) -> AstrBotMessage:
         username, cid, payload = data
 
@@ -195,19 +108,40 @@ class WebChatAdapter(Platform):
         abm.session_id = f"webchat!{username}!{cid}"
 
         abm.message_id = str(uuid.uuid4())
+        abm.message = []
 
-        # 处理消息段列表
-        message_parts = payload.get("message", [])
-        abm.message, message_str_parts = await self._parse_message_parts(message_parts)
+        if payload["message"]:
+            abm.message.append(Plain(payload["message"]))
+        if payload["image_url"]:
+            if isinstance(payload["image_url"], list):
+                for img in payload["image_url"]:
+                    abm.message.append(
+                        Image.fromFileSystem(os.path.join(self.imgs_dir, img)),
+                    )
+            else:
+                abm.message.append(
+                    Image.fromFileSystem(
+                        os.path.join(self.imgs_dir, payload["image_url"]),
+                    ),
+                )
+        if payload["audio_url"]:
+            if isinstance(payload["audio_url"], list):
+                for audio in payload["audio_url"]:
+                    path = os.path.join(self.imgs_dir, audio)
+                    abm.message.append(Record(file=path, path=path))
+            else:
+                path = os.path.join(self.imgs_dir, payload["audio_url"])
+                abm.message.append(Record(file=path, path=path))
 
         logger.debug(f"WebChatAdapter: {abm.message}")
 
+        message_str = payload["message"]
         abm.timestamp = int(time.time())
-        abm.message_str = "".join(message_str_parts)
+        abm.message_str = message_str
         abm.raw_message = data
         return abm
 
-    def run(self) -> Coroutine[Any, Any, None]:
+    def run(self) -> Awaitable[Any]:
         async def callback(data: tuple):
             abm = await self.convert_message(data)
             await self.handle_msg(abm)

astrbot/core/platform/sources/webchat/webchat_event.py

@@ -1,13 +1,12 @@
 import base64
-import json
 import os
-import shutil
 import uuid
 
 from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.message_components import File, Image, Json, Plain, Record
+from astrbot.api.message_components import Image, Plain, Record
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from astrbot.core.utils.io import download_image_by_url
 
 from .webchat_queue_mgr import webchat_queue_mgr
 
@@ -20,9 +19,7 @@ class WebChatMessageEvent(AstrMessageEvent):
         os.makedirs(imgs_dir, exist_ok=True)
 
     @staticmethod
-    async def _send(
-        message: MessageChain | None, session_id: str, streaming: bool = False
-    ) -> str | None:
+    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:
@@ -33,7 +30,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                     "streaming": False,
                 },  # end means this request is finished
             )
-            return
+            return ""
 
         data = ""
         for comp in message.chain:
@@ -42,62 +39,61 @@ class WebChatMessageEvent(AstrMessageEvent):
                 await web_chat_back_queue.put(
                     {
                         "type": "plain",
+                        "cid": cid,
                         "data": data,
                         "streaming": streaming,
                         "chain_type": message.type,
                     },
                 )
-            elif isinstance(comp, Json):
-                await web_chat_back_queue.put(
-                    {
-                        "type": "plain",
-                        "data": json.dumps(comp.data, ensure_ascii=False),
-                        "streaming": streaming,
-                        "chain_type": message.type,
-                    },
-                )
             elif isinstance(comp, Image):
                 # save image to local
-                filename = f"{str(uuid.uuid4())}.jpg"
+                filename = str(uuid.uuid4()) + ".jpg"
                 path = os.path.join(imgs_dir, filename)
-                image_base64 = await comp.convert_to_base64()
-                with open(path, "wb") as f:
-                    f.write(base64.b64decode(image_base64))
+                if comp.file and comp.file.startswith("file:///"):
+                    ph = comp.file[8:]
+                    with open(path, "wb") as f:
+                        with open(ph, "rb") as f2:
+                            f.write(f2.read())
+                elif comp.file.startswith("base64://"):
+                    base64_str = comp.file[9:]
+                    image_data = base64.b64decode(base64_str)
+                    with open(path, "wb") as f:
+                        f.write(image_data)
+                elif comp.file and comp.file.startswith("http"):
+                    await download_image_by_url(comp.file, path=path)
+                else:
+                    with open(path, "wb") as f:
+                        with open(comp.file, "rb") as f2:
+                            f.write(f2.read())
                 data = f"[IMAGE]{filename}"
                 await web_chat_back_queue.put(
                     {
                         "type": "image",
+                        "cid": cid,
                         "data": data,
                         "streaming": streaming,
                     },
                 )
             elif isinstance(comp, Record):
                 # save record to local
-                filename = f"{str(uuid.uuid4())}.wav"
+                filename = str(uuid.uuid4()) + ".wav"
                 path = os.path.join(imgs_dir, filename)
-                record_base64 = await comp.convert_to_base64()
-                with open(path, "wb") as f:
-                    f.write(base64.b64decode(record_base64))
+                if comp.file and comp.file.startswith("file:///"):
+                    ph = comp.file[8:]
+                    with open(path, "wb") as f:
+                        with open(ph, "rb") as f2:
+                            f.write(f2.read())
+                elif comp.file and comp.file.startswith("http"):
+                    await download_image_by_url(comp.file, path=path)
+                else:
+                    with open(path, "wb") as f:
+                        with open(comp.file, "rb") as f2:
+                            f.write(f2.read())
                 data = f"[RECORD]{filename}"
                 await web_chat_back_queue.put(
                     {
                         "type": "record",
-                        "data": data,
-                        "streaming": streaming,
-                    },
-                )
-            elif isinstance(comp, File):
-                # save file to local
-                file_path = await comp.get_file()
-                original_name = comp.name or os.path.basename(file_path)
-                ext = os.path.splitext(original_name)[1] or ""
-                filename = f"{uuid.uuid4()!s}{ext}"
-                dest_path = os.path.join(imgs_dir, filename)
-                shutil.copy2(file_path, dest_path)
-                data = f"[FILE]{filename}|{original_name}"
-                await web_chat_back_queue.put(
-                    {
-                        "type": "file",
+                        "cid": cid,
                         "data": data,
                         "streaming": streaming,
                     },
@@ -107,9 +103,9 @@ class WebChatMessageEvent(AstrMessageEvent):
 
         return data
 
-    async def send(self, message: MessageChain | None):
+    async def send(self, message: MessageChain):
         await WebChatMessageEvent._send(message, session_id=self.session_id)
-        await super().send(MessageChain([]))
+        await super().send(message)
 
     async def send_streaming(self, generator, use_fallback: bool = False):
         final_data = ""
@@ -117,25 +113,24 @@ class WebChatMessageEvent(AstrMessageEvent):
         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,
-            #         },
-            #     )
-            #     final_data = ""
-            #     continue
+            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
 
             r = await WebChatMessageEvent._send(
                 chain,
                 session_id=self.session_id,
                 streaming=True,
             )
-            if not r:
-                continue
             if chain.type == "reasoning":
                 reasoning_content += chain.get_plain_text()
             else:
@@ -147,6 +142,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                 "data": final_data,
                 "reasoning": reasoning_content,
                 "streaming": True,
+                "cid": cid,
             },
         )
         await super().send_streaming(generator, use_fallback)

astrbot/core/platform/sources/wechatpadpro/wechatpadpro_adapter.py

@@ -4,7 +4,6 @@ import json
 import os
 import time
 import traceback
-from typing import cast
 
 import aiohttp
 import anyio
@@ -43,9 +42,10 @@ class WeChatPadProAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
         self._shutdown_event = None
         self.wxnewpass = None
+        self.config = platform_config
         self.settings = platform_settings
         self.unique_session = platform_settings.get("unique_session", False)
 
@@ -70,7 +70,7 @@ class WeChatPadProAdapter(Platform):
         )
         self.base_url = f"http://{self.host}:{self.port}"
         self.auth_key = None  # 用于保存生成的授权码
-        self.wxid: str | None = None  # 用于保存登录成功后的 wxid
+        self.wxid = None  # 用于保存登录成功后的 wxid
         self.credentials_file = os.path.join(
             get_astrbot_data_path(),
             "wechatpadpro_credentials.json",
@@ -399,7 +399,7 @@ class WeChatPadProAdapter(Platform):
                 )
                 await asyncio.sleep(5)
 
-    async def handle_websocket_message(self, message: str | bytes):
+    async def handle_websocket_message(self, message: str):
         """处理从 WebSocket 接收到的消息。"""
         logger.debug(f"收到 WebSocket 消息: {message}")
         try:
@@ -431,13 +431,10 @@ class WeChatPadProAdapter(Platform):
 
     async def convert_message(self, raw_message: dict) -> AstrBotMessage | None:
         """将 WeChatPadPro 原始消息转换为 AstrBotMessage。"""
-        if self.wxid is None:
-            logger.error("WeChatPadPro 适配器未登录或未获取到 wxid，无法处理消息。")
-            return None
         abm = AstrBotMessage()
         abm.raw_message = raw_message
         abm.message_id = str(raw_message.get("msg_id"))
-        abm.timestamp = cast(int, raw_message.get("create_time"))
+        abm.timestamp = raw_message.get("create_time")
         abm.self_id = self.wxid
 
         if int(time.time()) - abm.timestamp > 180:
@@ -450,7 +447,7 @@ class WeChatPadProAdapter(Platform):
         to_user_name = raw_message.get("to_user_name", {}).get("str", "")
         content = raw_message.get("content", {}).get("str", "")
         push_content = raw_message.get("push_content", "")
-        msg_type = cast(int, raw_message.get("msg_type"))
+        msg_type = raw_message.get("msg_type")
 
         abm.message_str = ""
         abm.message = []
@@ -578,7 +575,7 @@ class WeChatPadProAdapter(Platform):
         from_user_name: str,
         to_user_name: str,
         msg_id: int,
-    ) -> dict | None:
+    ):
         """下载原始图片。"""
         url = f"{self.base_url}/message/GetMsgBigImg"
         params = {"key": self.auth_key}
@@ -729,15 +726,12 @@ class WeChatPadProAdapter(Platform):
             # 图片消息
             from_user_name = raw_message.get("from_user_name", {}).get("str", "")
             to_user_name = raw_message.get("to_user_name", {}).get("str", "")
-            msg_id = cast(int, raw_message.get("msg_id"))
+            msg_id = raw_message.get("msg_id")
             image_resp = await self._download_raw_image(
                 from_user_name,
                 to_user_name,
                 msg_id,
             )
-            if image_resp is None:
-                logger.error(f"下载图片失败: msg_id={msg_id}")
-                return
             image_bs64_data = (
                 image_resp.get("Data", {}).get("Data", {}).get("Buffer", None)
             )
@@ -778,9 +772,6 @@ class WeChatPadProAdapter(Platform):
             bufid = 0
             to_user_name = raw_message.get("to_user_name", {}).get("str", "")
             new_msg_id = raw_message.get("new_msg_id")
-            if new_msg_id is None:
-                logger.error("语音消息缺少 new_msg_id")
-                return
             data_parser = GeweDataParser(
                 content=content,
                 is_private_chat=(abm.type != MessageType.GROUP_MESSAGE),
@@ -788,9 +779,6 @@ class WeChatPadProAdapter(Platform):
             )
 
             voicemsg = data_parser._format_to_xml().find("voicemsg")
-            if voicemsg is None:
-                logger.error("无法从 XML 解析 voicemsg 节点")
-                return
             bufid = voicemsg.get("bufid") or "0"
             length = int(voicemsg.get("length") or 0)
             voice_resp = await self.download_voice(
@@ -799,9 +787,6 @@ class WeChatPadProAdapter(Platform):
                 bufid=bufid,
                 length=length,
             )
-            if voice_resp is None:
-                logger.error(f"下载语音失败: new_msg_id={new_msg_id}")
-                return
             voice_bs64_data = voice_resp.get("Data", {}).get("Base64", None)
             if voice_bs64_data:
                 voice_bs64_data = base64.b64decode(voice_bs64_data)
@@ -843,8 +828,7 @@ class WeChatPadProAdapter(Platform):
         try:
             if self.ws_handle_task:
                 self.ws_handle_task.cancel()
-            if self._shutdown_event is not None:
-                self._shutdown_event.set()
+            self._shutdown_event.set()
         except Exception:
             pass
 
@@ -911,8 +895,8 @@ class WeChatPadProAdapter(Platform):
 
     async def get_contact_details_list(
         self,
-        room_wx_id_list: list[str] | None = None,
-        user_names: list[str] | None = None,
+        room_wx_id_list: list[str] = None,
+        user_names: list[str] = None,
     ) -> dict | None:
         """获取联系人详情列表。"""
         if room_wx_id_list is None:

astrbot/core/platform/sources/wecom/wecom_adapter.py

@@ -2,8 +2,6 @@ import asyncio
 import os
 import sys
 import uuid
-from collections.abc import Awaitable, Callable
-from typing import Any, cast
 
 import quart
 from requests import Response
@@ -26,7 +24,6 @@ from astrbot.api.platform import (
 from astrbot.core import logger
 from astrbot.core.platform.astr_message_event import MessageSesion
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
-from astrbot.core.utils.webhook_utils import log_webhook_info
 
 from .wecom_event import WecomPlatformEvent
 from .wecom_kf import WeChatKF
@@ -41,7 +38,7 @@ else:
 class WecomServer:
     def __init__(self, event_queue: asyncio.Queue, config: dict):
         self.server = quart.Quart(__name__)
-        self.port = int(cast(str, config.get("port")))
+        self.port = int(config.get("port"))
         self.callback_server_host = config.get("callback_server_host", "0.0.0.0")
         self.server.add_url_rule(
             "/callback/command",
@@ -61,24 +58,12 @@ class WecomServer:
             config["corpid"].strip(),
         )
 
-        self.callback: Callable[[BaseMessage], Awaitable[None]] | None = None
+        self.callback = None
         self.shutdown_event = asyncio.Event()
 
     async def verify(self):
-        """内部服务器的 GET 验证入口"""
-        return await self.handle_verify(quart.request)
-
-    async def handle_verify(self, request) -> str:
-        """处理验证请求，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            验证响应
-        """
-        logger.info(f"验证请求有效性: {request.args}")
-        args = request.args
+        logger.info(f"验证请求有效性: {quart.request.args}")
+        args = quart.request.args
         try:
             echo_str = self.crypto.check_signature(
                 args.get("msg_signature"),
@@ -93,29 +78,17 @@ class WecomServer:
             raise
 
     async def callback_command(self):
-        """内部服务器的 POST 回调入口"""
-        return await self.handle_callback(quart.request)
-
-    async def handle_callback(self, request) -> str:
-        """处理回调请求，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            响应内容
-        """
-        data = await request.get_data()
-        msg_signature = request.args.get("msg_signature")
-        timestamp = request.args.get("timestamp")
-        nonce = request.args.get("nonce")
+        data = await quart.request.get_data()
+        msg_signature = quart.request.args.get("msg_signature")
+        timestamp = quart.request.args.get("timestamp")
+        nonce = quart.request.args.get("nonce")
         try:
             xml = self.crypto.decrypt_message(data, msg_signature, timestamp, nonce)
         except InvalidSignatureException:
             logger.error("解密失败，签名异常，请检查配置。")
             raise
         else:
-            msg = cast(BaseMessage, parse_message(xml))
+            msg = parse_message(xml)
             logger.info(f"解析成功: {msg}")
 
             if self.callback:
@@ -145,14 +118,14 @@ class WecomPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+        self.config = platform_config
         self.settingss = platform_settings
         self.client_self_id = uuid.uuid4().hex[:8]
         self.api_base_url = platform_config.get(
             "api_base_url",
             "https://qyapi.weixin.qq.com/cgi-bin/",
         )
-        self.unified_webhook_mode = platform_config.get("unified_webhook_mode", False)
 
         if not self.api_base_url:
             self.api_base_url = "https://qyapi.weixin.qq.com/cgi-bin/"
@@ -177,10 +150,10 @@ class WecomPlatformAdapter(Platform):
             # inject
             self.wechat_kf_api = WeChatKF(client=self.client)
             self.wechat_kf_message_api = WeChatKFMessage(self.client)
-            self.client.__setattr__("kf", self.wechat_kf_api)
-            self.client.__setattr__("kf_message", self.wechat_kf_message_api)
+            self.client.kf = self.wechat_kf_api
+            self.client.kf_message = self.wechat_kf_message_api
 
-        self.client.__setattr__("API_BASE_URL", self.api_base_url)
+        self.client.API_BASE_URL = self.api_base_url
 
         async def callback(msg: BaseMessage):
             if msg.type == "unknown" and msg._data["Event"] == "kf_msg_or_event":
@@ -259,53 +232,41 @@ class WecomPlatformAdapter(Platform):
                     )
             except Exception as e:
                 logger.error(e)
-
-        # 如果启用统一 webhook 模式，则不启动独立服务器
-        webhook_uuid = self.config.get("webhook_uuid")
-        if self.unified_webhook_mode and webhook_uuid:
-            log_webhook_info(f"{self.meta().id}(企业微信)", webhook_uuid)
-            # 保持运行状态，等待 shutdown
-            await self.server.shutdown_event.wait()
-        else:
-            await self.server.start_polling()
-
-    async def webhook_callback(self, request: Any) -> Any:
-        """统一 Webhook 回调入口"""
-        # 根据请求方法分发到不同的处理函数
-        if request.method == "GET":
-            return await self.server.handle_verify(request)
-        else:
-            return await self.server.handle_callback(request)
+        await self.server.start_polling()
 
     async def convert_message(self, msg: BaseMessage) -> AstrBotMessage | None:
         abm = AstrBotMessage()
-        if isinstance(msg, TextMessage):
+        if msg.type == "text":
+            assert isinstance(msg, TextMessage)
             abm.message_str = msg.content
             abm.self_id = str(msg.agent)
             abm.message = [Plain(msg.content)]
             abm.type = MessageType.FRIEND_MESSAGE
             abm.sender = MessageMember(
-                cast(str, msg.source),
-                cast(str, msg.source),
+                msg.source,
+                msg.source,
             )
-            abm.message_id = str(msg.id)
-            abm.timestamp = int(cast(int | str, msg.time))
+            abm.message_id = msg.id
+            abm.timestamp = msg.time
             abm.session_id = abm.sender.user_id
             abm.raw_message = msg
-        elif isinstance(msg, ImageMessage):
+        elif msg.type == "image":
+            assert isinstance(msg, ImageMessage)
             abm.message_str = "[图片]"
             abm.self_id = str(msg.agent)
             abm.message = [Image(file=msg.image, url=msg.image)]
             abm.type = MessageType.FRIEND_MESSAGE
             abm.sender = MessageMember(
-                cast(str, msg.source),
-                cast(str, msg.source),
+                msg.source,
+                msg.source,
             )
-            abm.message_id = str(msg.id)
-            abm.timestamp = int(cast(int | str, msg.time))
+            abm.message_id = msg.id
+            abm.timestamp = msg.time
             abm.session_id = abm.sender.user_id
             abm.raw_message = msg
-        elif isinstance(msg, VoiceMessage):
+        elif msg.type == "voice":
+            assert isinstance(msg, VoiceMessage)
+
             resp: Response = await asyncio.get_event_loop().run_in_executor(
                 None,
                 self.client.media.download,
@@ -332,11 +293,11 @@ class WecomPlatformAdapter(Platform):
             abm.message = [Record(file=path_wav, url=path_wav)]
             abm.type = MessageType.FRIEND_MESSAGE
             abm.sender = MessageMember(
-                cast(str, msg.source),
-                cast(str, msg.source),
+                msg.source,
+                msg.source,
             )
-            abm.message_id = str(msg.id)
-            abm.timestamp = int(cast(int | str, msg.time))
+            abm.message_id = msg.id
+            abm.timestamp = msg.time
             abm.session_id = abm.sender.user_id
             abm.raw_message = msg
         else:
@@ -348,7 +309,7 @@ class WecomPlatformAdapter(Platform):
 
     async def convert_wechat_kf_message(self, msg: dict) -> AstrBotMessage | None:
         msgtype = msg.get("msgtype")
-        external_userid = cast(str, msg.get("external_userid"))
+        external_userid = msg.get("external_userid")
         abm = AstrBotMessage()
         abm.raw_message = msg
         abm.raw_message["_wechat_kf_flag"] = None  # 方便处理
@@ -422,4 +383,4 @@ class WecomPlatformAdapter(Platform):
             await self.server.server.shutdown()
         except Exception as _:
             pass
-        logger.info("企业微信 适配器已被关闭")
+        logger.info("企业微信 适配器已被优雅地关闭")

astrbot/core/platform/sources/wecom/wecom_event.py

@@ -16,7 +16,7 @@ try:
     import pydub
 except Exception:
     logger.warning(
-        "检测到 pydub 库未安装，企业微信将无法语音收发。如需使用语音，请前往管理面板 -> 平台日志 -> 安装 Pip 库安装 pydub。",
+        "检测到 pydub 库未安装，企业微信将无法语音收发。如需使用语音，请前往管理面板 -> 控制台 -> 安装 Pip 库安装 pydub。",
     )
 
 
@@ -93,10 +93,10 @@ class WecomPlatformEvent(AstrMessageEvent):
         if is_wechat_kf:
             # 微信客服
             kf_message_api = getattr(self.client, "kf_message", None)
-            if not isinstance(kf_message_api, WeChatKFMessage):
+            if not kf_message_api:
                 logger.warning("未找到微信客服发送消息方法。")
                 return
-
+            assert isinstance(kf_message_api, WeChatKFMessage)
             user_id = self.get_sender_id()
             for comp in message.chain:
                 if isinstance(comp, Plain):

astrbot/core/platform/sources/wecom_ai_bot/wecomai_adapter.py

@@ -22,7 +22,6 @@ from astrbot.api.platform import (
     PlatformMetadata,
 )
 from astrbot.core.platform.astr_message_event import MessageSesion
-from astrbot.core.utils.webhook_utils import log_webhook_info
 
 from ...register import register_platform_adapter
 from .wecomai_api import (
@@ -104,7 +103,9 @@ class WecomAIBotAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+
+        self.config = platform_config
         self.settings = platform_settings
 
         # 初始化配置参数
@@ -121,7 +122,6 @@ class WecomAIBotAdapter(Platform):
             "wecomaibot_friend_message_welcome_text",
             "",
         )
-        self.unified_webhook_mode = self.config.get("unified_webhook_mode", False)
 
         # 平台元数据
         self.metadata = PlatformMetadata(
@@ -425,34 +425,17 @@ class WecomAIBotAdapter(Platform):
 
     def run(self) -> Awaitable[Any]:
         """运行适配器，同时启动HTTP服务器和队列监听器"""
+        logger.info("启动企业微信智能机器人适配器，监听 %s:%d", self.host, self.port)
 
         async def run_both():
-            # 如果启用统一 webhook 模式，则不启动独立服务器
-            webhook_uuid = self.config.get("webhook_uuid")
-            if self.unified_webhook_mode and webhook_uuid:
-                log_webhook_info(f"{self.meta().id}(企业微信智能机器人)", webhook_uuid)
-                # 只运行队列监听器
-                await self.queue_listener.run()
-            else:
-                logger.info(
-                    "启动企业微信智能机器人适配器，监听 %s:%d", self.host, self.port
-                )
-                # 同时运行HTTP服务器和队列监听器
-                await asyncio.gather(
-                    self.server.start_server(),
-                    self.queue_listener.run(),
-                )
+            # 同时运行HTTP服务器和队列监听器
+            await asyncio.gather(
+                self.server.start_server(),
+                self.queue_listener.run(),
+            )
 
         return run_both()
 
-    async def webhook_callback(self, request: Any) -> Any:
-        """统一 Webhook 回调入口"""
-        # 根据请求方法分发到不同的处理函数
-        if request.method == "GET":
-            return await self.server.handle_verify(request)
-        else:
-            return await self.server.handle_callback(request)
-
     async def terminate(self):
         """终止适配器"""
         logger.info("企业微信智能机器人适配器正在关闭...")

astrbot/core/platform/sources/wecom_ai_bot/wecomai_event.py

@@ -39,7 +39,7 @@ class WecomAIBotMessageEvent(AstrMessageEvent):
 
     @staticmethod
     async def _send(
-        message_chain: MessageChain | None,
+        message_chain: MessageChain,
         stream_id: str,
         queue_mgr: WecomAIQueueMgr,
         streaming: bool = False,
@@ -90,7 +90,7 @@ class WecomAIBotMessageEvent(AstrMessageEvent):
 
         return data
 
-    async def send(self, message: MessageChain | None):
+    async def send(self, message: MessageChain):
         """发送消息"""
         raw = self.message_obj.raw_message
         assert isinstance(raw, dict), (
@@ -98,7 +98,7 @@ class WecomAIBotMessageEvent(AstrMessageEvent):
         )
         stream_id = raw.get("stream_id", self.session_id)
         await WecomAIBotMessageEvent._send(message, stream_id, self.queue_mgr)
-        await super().send(MessageChain([]))
+        await super().send(message)
 
     async def send_streaming(self, generator, use_fallback=False):
         """流式发送消息，参考webchat的send_streaming设计"""

astrbot/core/platform/sources/wecom_ai_bot/wecomai_server.py

@@ -59,19 +59,8 @@ class WecomAIBotServer:
         )
 
     async def verify_url(self):
-        """内部服务器的 GET 验证入口"""
-        return await self.handle_verify(quart.request)
-
-    async def handle_verify(self, request):
-        """处理 URL 验证请求，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            验证响应元组 (content, status_code, headers)
-        """
-        args = request.args
+        """验证回调 URL"""
+        args = quart.request.args
         msg_signature = args.get("msg_signature")
         timestamp = args.get("timestamp")
         nonce = args.get("nonce")
@@ -92,19 +81,8 @@ class WecomAIBotServer:
         return result, 200, {"Content-Type": "text/plain"}
 
     async def handle_message(self):
-        """内部服务器的 POST 消息回调入口"""
-        return await self.handle_callback(quart.request)
-
-    async def handle_callback(self, request):
-        """处理消息回调，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            响应元组 (content, status_code, headers)
-        """
-        args = request.args
+        """处理消息回调"""
+        args = quart.request.args
         msg_signature = args.get("msg_signature")
         timestamp = args.get("timestamp")
         nonce = args.get("nonce")
@@ -124,7 +102,7 @@ class WecomAIBotServer:
 
         try:
             # 获取请求体
-            post_data = await request.get_data()
+            post_data = await quart.request.get_data()
 
             # 确保 post_data 是 bytes 类型
             if isinstance(post_data, str):

astrbot/core/platform/sources/weixin_official_account/weixin_offacc_adapter.py

@@ -1,8 +1,6 @@
 import asyncio
 import sys
 import uuid
-from collections.abc import Awaitable, Callable
-from typing import Any, cast
 
 import quart
 from requests import Response
@@ -24,7 +22,6 @@ from astrbot.api.platform import (
 )
 from astrbot.core import logger
 from astrbot.core.platform.astr_message_event import MessageSesion
-from astrbot.core.utils.webhook_utils import log_webhook_info
 
 from .weixin_offacc_event import WeixinOfficialAccountPlatformEvent
 
@@ -34,10 +31,10 @@ else:
     from typing_extensions import override
 
 
-class WeixinOfficialAccountServer:
+class WecomServer:
     def __init__(self, event_queue: asyncio.Queue, config: dict):
         self.server = quart.Quart(__name__)
-        self.port = int(cast(int | str, config.get("port")))
+        self.port = int(config.get("port"))
         self.callback_server_host = config.get("callback_server_host", "0.0.0.0")
         self.token = config.get("token")
         self.encoding_aes_key = config.get("encoding_aes_key")
@@ -56,25 +53,13 @@ class WeixinOfficialAccountServer:
 
         self.event_queue = event_queue
 
-        self.callback: Callable[[BaseMessage], Awaitable[None]] | None = None
+        self.callback = None
         self.shutdown_event = asyncio.Event()
 
     async def verify(self):
-        """内部服务器的 GET 验证入口"""
-        return await self.handle_verify(quart.request)
+        logger.info(f"验证请求有效性: {quart.request.args}")
 
-    async def handle_verify(self, request) -> str:
-        """处理验证请求，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            验证响应
-        """
-        logger.info(f"验证请求有效性: {request.args}")
-
-        args = request.args
+        args = quart.request.args
         if not args.get("signature", None):
             logger.error("未知的响应，请检查回调地址是否填写正确。")
             return "err"
@@ -92,22 +77,10 @@ class WeixinOfficialAccountServer:
             return "err"
 
     async def callback_command(self):
-        """内部服务器的 POST 回调入口"""
-        return await self.handle_callback(quart.request)
-
-    async def handle_callback(self, request) -> str:
-        """处理回调请求，可被统一 webhook 入口复用
-
-        Args:
-            request: Quart 请求对象
-
-        Returns:
-            响应内容
-        """
-        data = await request.get_data()
-        msg_signature = request.args.get("msg_signature")
-        timestamp = request.args.get("timestamp")
-        nonce = request.args.get("nonce")
+        data = await quart.request.get_data()
+        msg_signature = quart.request.args.get("msg_signature")
+        timestamp = quart.request.args.get("timestamp")
+        nonce = quart.request.args.get("nonce")
         try:
             xml = self.crypto.decrypt_message(data, msg_signature, timestamp, nonce)
         except InvalidSignatureException:
@@ -115,9 +88,6 @@ class WeixinOfficialAccountServer:
             raise
         else:
             msg = parse_message(xml)
-            if not msg:
-                logger.error("解析失败。msg为None。")
-                raise
             logger.info(f"解析成功: {msg}")
 
             if self.callback:
@@ -153,7 +123,8 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(platform_config, event_queue)
+        super().__init__(event_queue)
+        self.config = platform_config
         self.settingss = platform_settings
         self.client_self_id = uuid.uuid4().hex[:8]
         self.api_base_url = platform_config.get(
@@ -161,7 +132,6 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
             "https://api.weixin.qq.com/cgi-bin/",
         )
         self.active_send_mode = self.config.get("active_send_mode", False)
-        self.unified_webhook_mode = platform_config.get("unified_webhook_mode", False)
 
         if not self.api_base_url:
             self.api_base_url = "https://api.weixin.qq.com/cgi-bin/"
@@ -173,14 +143,14 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
         if not self.api_base_url.endswith("/"):
             self.api_base_url += "/"
 
-        self.server = WeixinOfficialAccountServer(self._event_queue, self.config)
+        self.server = WecomServer(self._event_queue, self.config)
 
         self.client = WeChatClient(
             self.config["appid"].strip(),
             self.config["secret"].strip(),
         )
 
-        self.client.__setattr__("API_BASE_URL", self.api_base_url)
+        self.client.API_BASE_URL = self.api_base_url
 
         # 微信公众号必须 5 秒内进行回复，否则会重试 3 次，我们需要对其进行消息排重
         # msgid -> Future
@@ -192,11 +162,11 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
                     await self.convert_message(msg, None)
                 else:
                     if msg.id in self.wexin_event_workers:
-                        future = self.wexin_event_workers[str(cast(str | int, msg.id))]
+                        future = self.wexin_event_workers[msg.id]
                         logger.debug(f"duplicate message id checked: {msg.id}")
                     else:
                         future = asyncio.get_event_loop().create_future()
-                        self.wexin_event_workers[str(cast(str | int, msg.id))] = future
+                        self.wexin_event_workers[msg.id] = future
                         await self.convert_message(msg, future)
                     # I love shield so much!
                     result = await asyncio.wait_for(
@@ -204,7 +174,7 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
                         60,
                     )  # wait for 60s
                     logger.debug(f"Got future result: {result}")
-                    self.wexin_event_workers.pop(str(cast(str | int, msg.id)), None)
+                    self.wexin_event_workers.pop(msg.id, None)
                     return result  # xml. see weixin_offacc_event.py
             except asyncio.TimeoutError:
                 pass
@@ -232,53 +202,38 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
 
     @override
     async def run(self):
-        # 如果启用统一 webhook 模式，则不启动独立服务器
-        webhook_uuid = self.config.get("webhook_uuid")
-        if self.unified_webhook_mode and webhook_uuid:
-            log_webhook_info(f"{self.meta().id}(微信公众平台)", webhook_uuid)
-            # 保持运行状态，等待 shutdown
-            await self.server.shutdown_event.wait()
-        else:
-            await self.server.start_polling()
-
-    async def webhook_callback(self, request: Any) -> Any:
-        """统一 Webhook 回调入口"""
-        # 根据请求方法分发到不同的处理函数
-        if request.method == "GET":
-            return await self.server.handle_verify(request)
-        else:
-            return await self.server.handle_callback(request)
+        await self.server.start_polling()
 
     async def convert_message(
         self,
         msg,
-        future: asyncio.Future | None = None,
+        future: asyncio.Future = None,
     ) -> AstrBotMessage | None:
         abm = AstrBotMessage()
         if isinstance(msg, TextMessage):
-            abm.message_str = cast(str, msg.content)
+            abm.message_str = msg.content
             abm.self_id = str(msg.target)
-            abm.message = [Plain(cast(str, msg.content))]
+            abm.message = [Plain(msg.content)]
             abm.type = MessageType.FRIEND_MESSAGE
             abm.sender = MessageMember(
-                cast(str, msg.source),
-                cast(str, msg.source),
+                msg.source,
+                msg.source,
             )
-            abm.message_id = str(cast(str | int, msg.id))
-            abm.timestamp = cast(int, msg.time)
+            abm.message_id = msg.id
+            abm.timestamp = msg.time
             abm.session_id = abm.sender.user_id
         elif msg.type == "image":
             assert isinstance(msg, ImageMessage)
             abm.message_str = "[图片]"
             abm.self_id = str(msg.target)
-            abm.message = [Image(file=cast(str, msg.image), url=cast(str, msg.image))]
+            abm.message = [Image(file=msg.image, url=msg.image)]
             abm.type = MessageType.FRIEND_MESSAGE
             abm.sender = MessageMember(
-                cast(str, msg.source),
-                cast(str, msg.source),
+                msg.source,
+                msg.source,
             )
-            abm.message_id = str(cast(str | int, msg.id))
-            abm.timestamp = cast(int, msg.time)
+            abm.message_id = msg.id
+            abm.timestamp = msg.time
             abm.session_id = abm.sender.user_id
         elif msg.type == "voice":
             assert isinstance(msg, VoiceMessage)
@@ -310,16 +265,15 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
             abm.message = [Record(file=path_wav, url=path_wav)]
             abm.type = MessageType.FRIEND_MESSAGE
             abm.sender = MessageMember(
-                cast(str, msg.source),
-                cast(str, msg.source),
+                msg.source,
+                msg.source,
             )
-            abm.message_id = str(cast(str | int, msg.id))
-            abm.timestamp = cast(int, msg.time)
+            abm.message_id = msg.id
+            abm.timestamp = msg.time
             abm.session_id = abm.sender.user_id
         else:
             logger.warning(f"暂未实现的事件: {msg.type}")
-            if future:
-                future.set_result(None)
+            future.set_result(None)
             return
         # 很不优雅 :(
         abm.raw_message = {
@@ -349,4 +303,4 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
             await self.server.server.shutdown()
         except Exception as _:
             pass
-        logger.info("微信公众平台 适配器已被关闭")
+        logger.info("微信公众平台 适配器已被优雅地关闭")