chore: bump version to 4.18.3

Fixes #5478

.dockerignore

@@ -17,7 +17,6 @@ ENV/
 .conda/
 dashboard/
 data/
-changelogs/
 tests/
 .ruff_cache/
 .astrbot

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,42 +1,40 @@
 
-name: '🎉 功能建议'
+name: '🎉 Feature Request / 功能建议'
 title: "[Feature]"
-description: 提交建议帮助我们改进。
+description: Submit a suggestion to help us improve. / 提交建议帮助我们改进。
 labels: [ "enhancement" ]
 body:
   - type: markdown
     attributes:
       value: |
-        感谢您抽出时间提出新功能建议，请准确解释您的想法。
+        Thank you for taking the time to suggest a new feature! Please explain your idea clearly and accurately. / 感谢您抽出时间提出新功能建议，请准确解释您的想法。
 
   - type: textarea
     attributes:
-      label: 描述
-      description: 简短描述您的功能建议。
+      label: Description / 描述
+      description: Please describe the feature you want to be added in detail. / 请详细描述您希望添加的功能。
 
   - type: textarea
     attributes:
-      label: 使用场景
-      description: 你想要发生什么？
-      placeholder: >
-        一个清晰且具体的描述这个功能的使用场景。
+      label: Use Case / 使用场景
+      description: Please describe the use case for this feature. / 请描述这个功能的使用场景。
 
   - type: checkboxes
     attributes:
-      label: 你愿意提交PR吗?
+      label: Willing to Submit PR? / 是否愿意提交PR？
       description: >
-        这不是必须的，但我们欢迎您的贡献。
+        This is not required, but if you are willing to submit a PR to implement this feature, it would be greatly appreciated! / 这不是必需的，但如果您愿意提交 PR 来实现这个功能，我们将不胜感激！
       options:
-        - label: 是的, 我愿意提交PR!
+        - label: Yes, I am willing to submit a PR. / 是的，我愿意提交 PR。
 
   - type: checkboxes
     attributes:
       label: Code of Conduct
       options:
         - label: >
-            我已阅读并同意遵守该项目的 [行为准则](https://docs.github.com/zh/site-policy/github-terms/github-community-code-of-conduct)。
+            I have read and agree to abide by the project's [Code of Conduct](https://docs.github.com/zh/site-policy/github-terms/github-community-code-of-conduct). /
           required: true
 
   - type: markdown
     attributes:
-      value: "感谢您填写我们的表单！"
+      value: "Thank you for filling out our form!"

.github/workflows/code-format.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: '3.10'
+        python-version: '3.12'
         
     - name: Install UV
       run: pip install uv

.github/workflows/coverage_test.yml

@@ -37,7 +37,7 @@ jobs:
           mkdir -p data/temp
           export TESTING=true
           export ZHIPU_API_KEY=${{ secrets.OPENAI_API_KEY }}
-          pytest --cov=. -v -o log_cli=true -o log_level=DEBUG
+          pytest --cov=astrbot -v -o log_cli=true -o log_level=DEBUG
 
       - name: Upload results to Codecov
         uses: codecov/codecov-action@v5

.github/workflows/release.yml

@@ -102,170 +102,11 @@ jobs:
           cp "dashboard/AstrBot-${VERSION_TAG}-dashboard.zip" "dashboard/astrbot-webui-${VERSION_TAG}.zip"
           rclone copy "dashboard/astrbot-webui-${VERSION_TAG}.zip" "r2:${R2_BUCKET_NAME}" --progress
 
-  build-desktop:
-    name: Build ${{ matrix.name }}
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: linux-x64
-            runner: ubuntu-24.04
-            os: linux
-            arch: amd64
-          - name: linux-arm64
-            runner: ubuntu-24.04-arm
-            os: linux
-            arch: arm64
-          - name: windows-x64
-            runner: windows-2022
-            os: win
-            arch: amd64
-          - name: windows-arm64
-            runner: windows-11-arm
-            os: win
-            arch: arm64
-          - name: macos-x64
-            runner: macos-15-intel
-            os: mac
-            arch: amd64
-          - name: macos-arm64
-            runner: macos-15
-            os: mac
-            arch: arm64
-    env:
-      CSC_IDENTITY_AUTO_DISCOVERY: "false"
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          ref: ${{ inputs.ref || github.ref }}
-
-      - name: Resolve tag
-        id: tag
-        shell: bash
-        run: |
-          if [ "${{ github.event_name }}" = "push" ]; then
-            tag="${GITHUB_REF_NAME}"
-          elif [ -n "${{ inputs.tag }}" ]; then
-            tag="${{ inputs.tag }}"
-          else
-            tag="$(git describe --tags --abbrev=0)"
-          fi
-          if [ -z "$tag" ]; then
-            echo "Failed to resolve tag." >&2
-            exit 1
-          fi
-          echo "tag=$tag" >> "$GITHUB_OUTPUT"
-
-      - name: Setup uv
-        uses: astral-sh/setup-uv@v7
-
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.12"
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10.28.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: '24.13.0'
-          cache: "pnpm"
-          cache-dependency-path: |
-            dashboard/pnpm-lock.yaml
-            desktop/pnpm-lock.yaml
-
-      - name: Prepare OpenSSL for Windows ARM64
-        if: ${{ matrix.os == 'win' && matrix.arch == 'arm64' }}
-        shell: pwsh
-        run: |
-          git clone https://github.com/microsoft/vcpkg.git C:\vcpkg
-          & C:\vcpkg\bootstrap-vcpkg.bat -disableMetrics
-          & C:\vcpkg\vcpkg.exe install openssl:arm64-windows
-
-          "VCPKG_ROOT=C:\vcpkg" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          "VCPKGRS_TRIPLET=arm64-windows" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          "OPENSSL_DIR=C:\vcpkg\installed\arm64-windows" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          "OPENSSL_ROOT_DIR=C:\vcpkg\installed\arm64-windows" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          "OPENSSL_LIB_DIR=C:\vcpkg\installed\arm64-windows\lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          "OPENSSL_INCLUDE_DIR=C:\vcpkg\installed\arm64-windows\include" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-      - name: Install dependencies
-        shell: bash
-        run: |
-          uv sync
-          pnpm --dir dashboard install --frozen-lockfile
-          pnpm --dir desktop install --frozen-lockfile
-
-      - name: Build desktop package
-        shell: bash
-        run: |
-          pnpm --dir dashboard run build
-          pnpm --dir desktop run build:webui
-          pnpm --dir desktop run build:backend
-          pnpm --dir desktop run sync:version
-          pnpm --dir desktop exec electron-builder --publish never
-
-      - name: Normalize artifact names
-        shell: bash
-        env:
-          NAME_PREFIX: AstrBot-${{ steps.tag.outputs.tag }}-${{ matrix.arch }}-${{ matrix.os }}
-        run: |
-          shopt -s nullglob
-          out_dir="desktop/dist/release"
-          mkdir -p "$out_dir"
-          files=(
-            desktop/dist/*.AppImage
-            desktop/dist/*.dmg
-            desktop/dist/*.zip
-            desktop/dist/*.exe
-          )
-          if [ ${#files[@]} -eq 0 ]; then
-            echo "No desktop artifacts found to rename." >&2
-            exit 1
-          fi
-          for src in "${files[@]}"; do
-            file="$(basename "$src")"
-            case "$file" in
-              *.AppImage)
-                dest="$out_dir/${NAME_PREFIX}.AppImage"
-                ;;
-              *.dmg)
-                dest="$out_dir/${NAME_PREFIX}.dmg"
-                ;;
-              *.exe)
-                dest="$out_dir/${NAME_PREFIX}.exe"
-                ;;
-              *.zip)
-                dest="$out_dir/${NAME_PREFIX}.zip"
-                ;;
-              *)
-                continue
-                ;;
-            esac
-            cp "$src" "$dest"
-          done
-          ls -la "$out_dir"
-
-      - name: Upload desktop artifacts
-        uses: actions/upload-artifact@v6
-        with:
-          name: AstrBot-${{ steps.tag.outputs.tag }}-${{ matrix.arch }}-${{ matrix.os }}
-          if-no-files-found: error
-          path: desktop/dist/release/*
-
   publish-release:
     name: Publish GitHub Release
     runs-on: ubuntu-24.04
     needs:
       - build-dashboard
-      - build-desktop
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -296,12 +137,6 @@ jobs:
           name: Dashboard-${{ steps.tag.outputs.tag }}
           path: release-assets
 
-      - name: Download desktop artifacts
-        uses: actions/download-artifact@v7
-        with:
-          pattern: AstrBot-${{ steps.tag.outputs.tag }}-*
-          path: release-assets
-          merge-multiple: true
 
       - name: Resolve release notes
         id: notes

.gitignore

@@ -33,13 +33,6 @@ tests/astrbot_plugin_openai
 dashboard/node_modules/
 dashboard/dist/
 .pnpm-store/
-desktop/node_modules/
-desktop/dist/
-desktop/out/
-desktop/resources/backend/astrbot-backend*
-desktop/resources/backend/*.exe
-desktop/resources/webui/*
-desktop/resources/.pyinstaller/
 package-lock.json
 yarn.lock
 

Dockerfile

@@ -22,6 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 RUN python -m pip install uv \
     && echo "3.12" > .python-version \
+    && uv lock \
     && uv export --format requirements.txt --output-file requirements.txt --frozen \
     && uv pip install -r requirements.txt --no-cache-dir --system \
     && uv pip install socksio uv pilk --no-cache-dir --system

README.md

@@ -43,7 +43,7 @@ AstrBot 是一个开源的一站式 Agentic 个人和群聊助手，可在 QQ、
 2. ✨ AI 大模型对话，多模态，Agent，MCP，Skills，知识库，人格设定，自动压缩对话。
 3. 🤖 支持接入 Dify、阿里云百炼、Coze 等智能体平台。
 4. 🌐 多平台，支持 QQ、企业微信、飞书、钉钉、微信公众号、Telegram、Slack 以及[更多](#支持的消息平台)。
-5. 📦 插件扩展，已有近 800 个插件可一键安装。
+5. 📦 插件扩展，已有 1000+ 个插件可一键安装。
 6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) 隔离化环境，安全地执行任何代码、调用 Shell、会话级资源复用。
 7. 💻 WebUI 支持。
 8. 🌈 Web ChatUI 支持，ChatUI 内置代理沙盒、网页搜索等。
@@ -56,7 +56,7 @@ AstrBot 是一个开源的一站式 Agentic 个人和群聊助手，可在 QQ、
     <th>💙 角色扮演 & 情感陪伴</th>
     <th>✨ 主动式 Agent</th>
     <th>🚀 通用 Agentic 能力</th>
-    <th>🧩 900+ 社区插件</th>
+    <th>🧩 1000+ 社区插件</th>
   </tr>
   <tr>
     <td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
@@ -81,6 +81,16 @@ uv tool install astrbot
 astrbot
 ```
 
+#### 桌面应用部署（Tauri）
+
+桌面应用仓库 [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop)。
+
+支持多系统架构，安装包直接安装，开箱即用，最适合新手和懒人的一键桌面部署方案，不推荐服务器场景。
+
+#### 启动器一键部署（AstrBot Launcher）
+
+快速部署和多开方案，实现环境隔离，进入 [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) 仓库，在 Releases 页最新版本下找到对应的系统安装包安装即可。
+
 #### 宝塔面板部署
 
 AstrBot 与宝塔面板合作，已上架至宝塔面板。
@@ -142,15 +152,12 @@ yay -S astrbot-git
 paru -S astrbot-git
 ```
 
-#### 桌面端 Electron 打包
-
-桌面端（Electron 打包，`pnpm` 工作流）构建流程请参阅：[`desktop/README.md`](desktop/README.md)。
-
 ## 支持的消息平台
 
 **官方维护**
 
-- QQ (官方平台 & OneBot)
+- QQ
+- OneBot v11 协议实现
 - Telegram
 - 企微应用 & 企微智能机器人
 - 微信客服 & 微信公众号
@@ -158,10 +165,10 @@ paru -S astrbot-git
 - 钉钉
 - Slack
 - Discord
+- LINE
 - Satori
 - Misskey
 - Whatsapp (将支持)
-- LINE (将支持)
 
 **社区维护**
 
@@ -181,6 +188,7 @@ paru -S astrbot-git
 - DeepSeek
 - Ollama (本地部署)
 - LM Studio (本地部署)
+- [AIHubMix](https://aihubmix.com/?aff=4bfH)
 - [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
 - [302.AI](https://share.302.ai/rr1M3l)
 - [小马算力](https://www.tokenpony.cn/3YPyf)
@@ -256,13 +264,23 @@ pre-commit install
 特别感谢所有 Contributors 和插件开发者对 AstrBot 的贡献 ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
 </a>
 
 此外，本项目的诞生离不开以下开源项目的帮助：
 
 - [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 伟大的猫猫框架
 
+开源项目友情链接：
+
+- [NoneBot2](https://github.com/nonebot/nonebot2) - 优秀的 Python 异步 ChatBot 框架
+- [Koishi](https://github.com/koishijs/koishi) - 优秀的 Node.js ChatBot 框架
+- [MaiBot](https://github.com/Mai-with-u/MaiBot) - 优秀的拟人化 AI ChatBot
+- [nekro-agent](https://github.com/KroMiose/nekro-agent) - 优秀的 Agent ChatBot
+- [LangBot](https://github.com/langbot-app/LangBot) - 优秀的多平台 AI ChatBot
+- [ChatLuna](https://github.com/ChatLunaLab/chatluna) - 优秀的多平台 AI ChatBot Koishi 插件
+- [Operit AI](https://github.com/AAswordman/Operit) - 优秀的 AI 智能助手 Android APP
+
 ## ⭐ Star History
 
 > [!TIP]

README_en.md

@@ -37,7 +37,7 @@
 
 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.
 
-![070d50ba43ea3c96980787127bbbe552](https://github.com/user-attachments/assets/6fe147c5-68d9-4f47-a8de-252e63fdcbd8)
+![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba)
 
 ## Key Features
 
@@ -45,7 +45,7 @@ AstrBot is an open-source all-in-one Agent chatbot platform that integrates with
 2. ✨ AI LLM Conversations, Multimodal, Agent, MCP, Skills, Knowledge Base, Persona Settings, Auto Context Compression.
 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.
+5. 📦 Plugin Extensions with 1000+ plugins available for one-click installation.
 6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) for isolated, safe execution of code, shell calls, and session-level resource reuse.
 7. 💻 WebUI Support.
 8. 🌈 Web ChatUI Support with built-in agent sandbox and web search.
@@ -58,7 +58,7 @@ AstrBot is an open-source all-in-one Agent chatbot platform that integrates with
     <th>💙 Role-playing & Emotional Companionship</th>
     <th>✨ Proactive Agent</th>
     <th>🚀 General Agentic Capabilities</th>
-    <th>🧩 900+ Community Plugins</th>
+    <th>🧩 1000+ Community Plugins</th>
   </tr>
   <tr>
     <td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
@@ -93,6 +93,16 @@ yay -S astrbot-git
 paru -S astrbot-git
 ```
 
+#### Desktop Application (Tauri)
+
+Desktop repository: [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop).
+
+Supports multiple system architectures, direct installation, out-of-the-box experience. Ideal for beginners.
+
+#### AstrBot Launcher
+
+Quick deployment and multi-instance solution. Visit the [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) repository and find the latest release for your system.
+
 #### BT-Panel Deployment
 
 AstrBot has partnered with BT-Panel and is now available in their marketplace.
@@ -144,20 +154,6 @@ uv run main.py
 
 Or refer to the official documentation: [Deploy AstrBot from Source](https://astrbot.app/deploy/astrbot/cli.html).
 
-#### System Package Manager Installation 
-
-##### Arch Linux
-
-```bash
-yay -S astrbot-git
-# or use paru
-paru -S astrbot-git
-```
-
-#### Desktop Electron Build
-
-For desktop build steps (Electron packaging, `pnpm` workflow), see [`desktop/README.md`](desktop/README.md).
-
 ## Supported Messaging Platforms
 
 **Officially Maintained**
@@ -172,8 +168,8 @@ For desktop build steps (Electron packaging, `pnpm` workflow), see [`desktop/REA
 - Discord
 - Satori
 - Misskey
+- LINE
 - WhatsApp (Coming Soon)
-- LINE (Coming Soon)
 
 **Community Maintained**
 
@@ -268,7 +264,7 @@ pre-commit install
 Special thanks to all Contributors and plugin developers for their contributions to AstrBot ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
 </a>
 
 Additionally, the birth of this project would not have been possible without the help of the following open-source projects:

README_fr.md

@@ -21,9 +21,9 @@
 <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://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%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFZIiBmaWxsPSIjZmZmIi8%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://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20&label=Marketplace&cacheSeconds=3600">
 <img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
 </div>
 
@@ -37,7 +37,7 @@
 
 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" />
+![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba)
 
 ## Fonctionnalités principales
 
@@ -45,7 +45,7 @@ AstrBot est une plateforme de chatbot Agent tout-en-un open source qui s'intègr
 2. ✨ Dialogue avec de grands modèles d'IA, multimodal, Agent, MCP, Skills, Base de connaissances, Paramétrage de personnalité, compression automatique des dialogues.
 3. 🤖 Prise en charge de l'accès aux plateformes d'Agents telles que Dify, Alibaba Cloud Bailian, Coze, etc.
 4. 🌐 Multiplateforme : supporte QQ, WeChat Enterprise, Feishu, DingTalk, Comptes officiels WeChat, Telegram, Slack et [plus encore](#plateformes-de-messagerie-prises-en-charge).
-5. 📦 Extension par plugins, avec près de 800 plugins déjà disponibles pour une installation en un clic.
+5. 📦 Extension par plugins, avec plus de 1000 plugins déjà disponibles pour une installation en un clic.
 6. 🛡️  Environnement isolé [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) : exécution sécurisée de code, appels Shell et réutilisation des ressources au niveau de la session.
 7. 💻 Support WebUI.
 8. 🌈 Support Web ChatUI, avec sandbox d'agent intégrée, recherche web, etc.
@@ -58,7 +58,7 @@ AstrBot est une plateforme de chatbot Agent tout-en-un open source qui s'intègr
     <th>💙 Jeux de rôle & Accompagnement émotionnel</th>
     <th>✨ Agent proactif</th>
     <th>🚀 Capacités agentiques générales</th>
-    <th>🧩 900+ Plugins de communauté</th>
+    <th>🧩 1000+ Plugins de communauté</th>
   </tr>
   <tr>
     <td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
@@ -83,15 +83,15 @@ uv tool install astrbot
 astrbot
 ```
 
-#### Installation via le gestionnaire de paquets du système
+#### Application de bureau (Tauri)
 
-##### Arch Linux
+Dépôt de l'application de bureau : [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop).
 
-```bash
-yay -S astrbot-git
-# ou utiliser paru
-paru -S astrbot-git
-```
+Prend en charge plusieurs architectures système, installation directe, prête à l'emploi. La solution de déploiement de bureau en un clic la plus adaptée aux débutants. Non recommandée pour les serveurs.
+
+#### Déploiement en un clic avec le lanceur (AstrBot Launcher)
+
+Déploiement rapide et solution multi-instances, isolation de l'environnement. Accédez au dépôt [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher), trouvez le package d'installation correspondant à votre système sous la dernière version sur la page Releases.
 
 #### Déploiement BT-Panel
 
@@ -144,13 +144,13 @@ uv run main.py
 
 Ou consultez la documentation officielle : [Déployer AstrBot depuis les sources](https://astrbot.app/deploy/astrbot/cli.html).
 
-#### Установка через системный пакетный менеджер
+#### Installation via le gestionnaire de paquets du système
 
 ##### Arch Linux
 
 ```bash
 yay -S astrbot-git
-# или используйте paru
+# ou utiliser paru
 paru -S astrbot-git
 ```
 
@@ -168,8 +168,8 @@ paru -S astrbot-git
 - Discord
 - Satori
 - Misskey
+- LINE
 - WhatsApp (Bientôt disponible)
-- LINE (Bientôt disponible)
 
 **Maintenues par la communauté**
 
@@ -262,7 +262,7 @@ pre-commit install
 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" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
 </a>
 
 De plus, la naissance de ce projet n'aurait pas été possible sans l'aide des projets open source suivants :

README_ja.md

@@ -21,9 +21,9 @@
 <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://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%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFZIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0LjYxNTZDNS4zMTUwMiAxNC4zOTk5IDUuNjAxNTYgMTQuMTEzNCA1LjYwMTU2IDEzLjc1OTlWMTEuMDM5OUM1LjYwMTU2IDEwLjY4NjQgNS4zMTUwMiAxMC4zOTk5IDQuOTYxNTYgMTAuMzk5OVoiIGZpbGw9IiNmZmYiLz4KPHBhdGggZD0iTTEzLjc1ODQgMS42MDAxSDExLjAzODRDMTAuNjg1IDEuNjAwMSAxMC4zOTg0IDEuODg2NjQgMTAuMzk4NCAyLjI0MDFWNC45NjAxQzEwLjM5ODQgNS4zMTM1NiAxMC42ODUgNS42MDAxIDExLjAzODQgNS42MDAxSDEzLjc1ODRDMTQuMTExOSA1LjYwMDEgMTQuMzk4NCA1LjMxMzU2IDE0LjM5ODQgNC45NjAxVjIuMjQwMUMxNC4zOTg0IDEuODg2NjQgMTQuMTExOSAxLjYwMDEgMTMuNzU4NCAxLjYwMDFZIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDRMNCAxMlpFIiBmaWxsPSIjZmZmIi8%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://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20&label=%E3%83%97%E3%83%A9%E3%82%B0%E3%82%A4%E3%83%B3%E3%83%9E%E3%83%BC%E3%82%B1%E3%83%83%E3%83%88&cacheSeconds=3600">
 <img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
 </div>
 
@@ -37,7 +37,7 @@
 
 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" />
+![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba)
 
 ## 主な機能
 
@@ -45,7 +45,7 @@ AstrBot は、主要なインスタントメッセージングアプリと統合
 2. ✨ AI大規模言語モデル対話、マルチモーダル、Agent、MCP、Skills、ナレッジベース、ペルソナ設定、対話の自動圧縮。
 3. 🤖 Dify、Alibaba Cloud Bailian（百煉）、Coze などのAgentプラットフォームへの接続をサポート。
 4. 🌐 マルチプラットフォーム：QQ、企業微信（WeCom）、飛書（Lark）、釘釘（DingTalk）、WeChat公式アカウント、Telegram、Slack、[その他](#サポートされているメッセージプラットフォーム)に対応。
-5. 📦 プラグイン拡張：800近い既存プラグインをワンクリックでインストール可能。
+5. 📦 プラグイン拡張：1000を超える既存プラグインをワンクリックでインストール可能。
 6. 🛡️  隔離環境[Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html)：コードの安全な実行、Shell呼び出し、セッションレベルのリソース再利用。
 7. 💻 WebUI 対応。
 8. 🌈 Web ChatUI 対応：ChatUI内にAgent Sandboxやウェブ検索などを内蔵。
@@ -58,7 +58,7 @@ AstrBot は、主要なインスタントメッセージングアプリと統合
     <th>💙 ロールプレイ & 感情的な対話</th>
     <th>✨ プロアクティブ・エージェント (Proactive Agent)</th>
     <th>🚀 汎用 エージェント的能力</th>
-    <th>🧩 900+ コミュニティプラグイン</th>
+    <th>🧩 1000+ コミュニティプラグイン</th>
   </tr>
   <tr>
     <td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
@@ -83,15 +83,15 @@ uv tool install astrbot
 astrbot
 ```
 
-#### システムパッケージマネージャーでのインストール
+#### デスクトップアプリのデプロイ（Tauri）
 
-##### Arch Linux
+デスクトップアプリのリポジトリ [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop)。
 
-```bash
-yay -S astrbot-git
-# または paru を使用
-paru -S astrbot-git
-```
+マルチシステムアーキテクチャをサポートし、インストールしてすぐに使用可能。初心者や手軽さを求める人に最適なワンクリックデスクトップデプロイソリューションです。サーバー環境での使用は推奨されません。
+
+#### ランチャーによるワンクリックデプロイ（AstrBot Launcher）
+
+迅速なデプロイとマルチインスタンス対応、環境の隔離が可能。[AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) リポジトリにアクセスし、Releases ページから最新バージョンのシステム対応パッケージをダウンロードしてインストールしてください。
 
 #### 宝塔パネルデプロイ
 
@@ -144,13 +144,13 @@ uv run main.py
 
 または、公式ドキュメント [ソースコードから AstrBot をデプロイ](https://astrbot.app/deploy/astrbot/cli.html) をご参照ください。
 
-#### Установка через системный пакетный менеджер
+#### システムパッケージマネージャーでのインストール
 
 ##### Arch Linux
 
 ```bash
 yay -S astrbot-git
-# или используйте paru
+# または paru を使用
 paru -S astrbot-git
 ```
 
@@ -168,8 +168,8 @@ paru -S astrbot-git
 - Discord
 - Satori
 - Misskey
+- LINE
 - WhatsApp (近日対応予定)
-- LINE (近日対応予定)
 
 **コミュニティメンテナンス**
 
@@ -263,7 +263,7 @@ pre-commit install
 AstrBot への貢献をしていただいたすべてのコントリビューターとプラグイン開発者に特別な感謝を ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
 </a>
 
 また、このプロジェクトの誕生は以下のオープンソースプロジェクトの助けなしには実現できませんでした:

README_ru.md

@@ -21,9 +21,9 @@
 <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://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%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFZIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjczODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%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://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20&label=%D0%9C%D0%B0%D1%80%D0%BA%D0%B5%D1%82%D0%BF%D0%BB%D0%B5%D0%B9%D1%81&cacheSeconds=3600">
 <img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
 </div>
 
@@ -37,7 +37,7 @@
 
 AstrBot — это универсальная платформа Agent-чатботов с открытым исходным кодом, которая интегрируется с основными приложениями для обмена мгновенными сообщениями. Она предоставляет надёжную и масштабируемую инфраструктуру разговорного ИИ для частных лиц, разработчиков и команд. Будь то персональный ИИ-компаньон, интеллектуальная служба поддержки, автоматизированный помощник или корпоративная база знаний — AstrBot позволяет быстро создавать готовые к использованию ИИ-приложения в рабочих процессах вашей платформы обмена сообщениями.
 
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
+![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba)
 
 ## Основные возможности
 
@@ -45,7 +45,7 @@ AstrBot — это универсальная платформа Agent-чатб
 2. ✨ Диалоги с ИИ-моделями, мультимодальность, Agent, MCP, Skills, База знаний, Настройка личности, автоматическое сжатие диалогов.
 3. 🤖 Поддержка интеграции с платформами Agents, такими как Dify, Alibaba Cloud Bailian, Coze и др.
 4. 🌐 Мультиплатформенность: поддержка QQ, WeChat для предприятий, Feishu, DingTalk, публичных аккаунтов WeChat, Telegram, Slack и [других](#Поддерживаемые-платформы-обмена-сообщениями).
-5. 📦 Расширение плагинами: доступно почти 800 плагинов для установки в один клик.
+5. 📦 Расширение плагинами: доступно более 1000 плагинов для установки в один клик.
 6. 🛡️  Изолированная среда[Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html): безопасное выполнение любого кода, вызов Shell, повторное использование ресурсов на уровне сессии.
 7. 💻 Поддержка WebUI.
 8. 🌈 Поддержка Web ChatUI: встроенная песочница агента, веб-поиск и др.
@@ -56,9 +56,9 @@ AstrBot — это универсальная платформа Agent-чатб
 <table align="center">
   <tr align="center">
     <th>💙 Ролевые игры & Эмоциональная поддержка</th>
-    <th>✨ Проактивный Агент(Agent)</th>
-    <th>🚀 Универсальные Агентные возможности</th>
-    <th>🧩 Универсальные Агентные (Agentic) возможности</th>
+    <th>✨ Проактивный Агент (Agent)</th>
+    <th>🚀 Универсальные возможности Агента</th>
+    <th>🧩 1000+ плагинов сообщества</th>
   </tr>
   <tr>
     <td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
@@ -83,6 +83,16 @@ uv tool install astrbot
 astrbot
 ```
 
+#### Десктопное приложение (Tauri)
+
+Репозиторий десктопного приложения: [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop).
+
+Поддерживает различные системные архитектуры, устанавливается напрямую, "из коробки", лучшее настольное решение в один клик для новичков и тех, кто ценит простоту. Не рекомендуется для серверных сценариев.
+
+#### Установка в один клик через лаунчер (AstrBot Launcher)
+
+Быстрое развёртывание и поддержка нескольких экземпляров, изоляция среды. Перейдите в репозиторий [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher), найдите последнюю версию на странице Releases и установите соответствующий пакет для вашей системы.
+
 #### Развёртывание BT-Panel
 
 AstrBot в партнёрстве с BT-Panel теперь доступен на их маркетплейсе.
@@ -158,8 +168,9 @@ paru -S astrbot-git
 - Discord
 - Satori
 - Misskey
+- LINE
 - WhatsApp (Скоро)
-- LINE (Скоро)
+
 
 **Поддерживаемые сообществом**
 
@@ -252,7 +263,7 @@ pre-commit install
 Особая благодарность всем контрибьюторам и разработчикам плагинов за их вклад в AstrBot ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
 </a>
 
 Кроме того, рождение этого проекта было бы невозможно без помощи следующих проектов с открытым исходным кодом:

README_zh-TW.md

@@ -37,7 +37,7 @@
 
 AstrBot 是一個開源的一站式 Agent 聊天機器人平台，可接入主流即時通訊軟體，為個人、開發者和團隊打造可靠、可擴展的對話式智慧基礎設施。無論是個人 AI 夥伴、智慧客服、自動化助手，還是企業知識庫，AstrBot 都能在您的即時通訊軟體平台的工作流程中快速構建生產可用的 AI 應用程式。
 
-<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
+![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba)
 
 ## 主要功能
 
@@ -45,7 +45,7 @@ AstrBot 是一個開源的一站式 Agent 聊天機器人平台，可接入主
 2. ✨ AI 大模型對話，多模態，Agent，MCP，Skills，知識庫，人格設定，自動壓縮對話。
 3. 🤖 支援接入 Dify、阿里雲百煉、Coze 等智慧體 (Agent) 平台。
 4. 🌐 多平台，支援 QQ、企業微信、飛書、釘釘、微信公眾號、Telegram、Slack 以及[更多](#支援的訊息平台)。
-5. 📦 插件擴展，已有近 800 個插件可一鍵安裝。
+5. 📦 插件擴展，已有 1000+ 個插件可一鍵安裝。
 6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) 隔離化環境，安全地執行任何代碼、調用 Shell、會話級資源複用。
 7. 💻 WebUI 支援。
 8. 🌈 Web ChatUI 支援，ChatUI 內置代理沙盒 (Agent Sandbox)、網頁搜尋等。
@@ -58,7 +58,7 @@ AstrBot 是一個開源的一站式 Agent 聊天機器人平台，可接入主
     <th>💙 角色扮演 & 情感陪伴</th>
     <th>✨ 主動式 Agent</th>
     <th>🚀 通用 Agentic 能力</th>
-    <th>🧩 900+ 社區外掛程式</th>
+    <th>🧩 1000+ 社區外掛程式</th>
   </tr>
   <tr>
     <td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
@@ -83,6 +83,16 @@ uv tool install astrbot
 astrbot
 ```
 
+#### 桌面應用部署（Tauri）
+
+桌面應用倉庫 [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop)。
+
+支援多系統架構，安裝包直接安裝，開箱即用，最適合新手和懶人的一鍵桌面部署方案，不推薦伺服器場景。
+
+#### 啟動器一鍵部署（AstrBot Launcher）
+
+快速部署和多開方案，實現環境隔離，進入 [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) 倉庫，在 Releases 頁最新版本下找到對應的系統安裝包安裝即可。
+
 #### 寶塔面板部署
 
 AstrBot 與寶塔面板合作，已上架至寶塔面板。
@@ -158,8 +168,9 @@ paru -S astrbot-git
 - Discord
 - Satori
 - Misskey
+- LINE
 - Whatsapp（即將支援）
-- LINE（即將支援）
+
 
 **社群維護**
 
@@ -252,7 +263,7 @@ pre-commit install
 特別感謝所有 Contributors 和外掛開發者對 AstrBot 的貢獻 ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
 </a>
 
 此外，本專案的誕生離不開以下開源專案的幫助：

astrbot/api/event/filter/__init__.py

@@ -24,6 +24,9 @@ from astrbot.core.star.register import (
     register_on_llm_tool_respond as on_llm_tool_respond,
 )
 from astrbot.core.star.register import register_on_platform_loaded as on_platform_loaded
+from astrbot.core.star.register import register_on_plugin_error as on_plugin_error
+from astrbot.core.star.register import register_on_plugin_loaded as on_plugin_loaded
+from astrbot.core.star.register import register_on_plugin_unloaded as on_plugin_unloaded
 from astrbot.core.star.register import register_on_using_llm_tool as on_using_llm_tool
 from astrbot.core.star.register import (
     register_on_waiting_llm_request as on_waiting_llm_request,
@@ -52,6 +55,9 @@ __all__ = [
     "on_decorating_result",
     "on_llm_request",
     "on_llm_response",
+    "on_plugin_error",
+    "on_plugin_loaded",
+    "on_plugin_unloaded",
     "on_platform_loaded",
     "on_waiting_llm_request",
     "permission_type",

astrbot/builtin_stars/builtin_commands/commands/conversation.py

@@ -4,6 +4,7 @@ from astrbot.api import sp, star
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 from astrbot.core.platform.astr_message_event import MessageSession
 from astrbot.core.platform.message_type import MessageType
+from astrbot.core.utils.active_event_registry import active_event_registry
 
 from .utils.rst_scene import RstScene
 
@@ -62,6 +63,7 @@ class ConversationCommands:
 
         agent_runner_type = cfg["provider_settings"]["agent_runner_type"]
         if agent_runner_type in THIRD_PARTY_AGENT_RUNNER_KEY:
+            active_event_registry.stop_all(umo, exclude=message)
             await sp.remove_async(
                 scope="umo",
                 scope_id=umo,
@@ -86,6 +88,8 @@ class ConversationCommands:
             )
             return
 
+        active_event_registry.stop_all(umo, exclude=message)
+
         await self.context.conversation_manager.update_conversation(
             umo,
             cid,
@@ -98,6 +102,30 @@ class ConversationCommands:
 
         message.set_result(MessageEventResult().message(ret))
 
+    async def stop(self, message: AstrMessageEvent) -> None:
+        """停止当前会话正在运行的 Agent"""
+        cfg = self.context.get_config(umo=message.unified_msg_origin)
+        agent_runner_type = cfg["provider_settings"]["agent_runner_type"]
+        umo = message.unified_msg_origin
+
+        if agent_runner_type in THIRD_PARTY_AGENT_RUNNER_KEY:
+            stopped_count = active_event_registry.stop_all(umo, exclude=message)
+        else:
+            stopped_count = active_event_registry.request_agent_stop_all(
+                umo,
+                exclude=message,
+            )
+
+        if stopped_count > 0:
+            message.set_result(
+                MessageEventResult().message(
+                    f"已请求停止 {stopped_count} 个运行中的任务。"
+                )
+            )
+            return
+
+        message.set_result(MessageEventResult().message("当前会话没有运行中的任务。"))
+
     async def his(self, message: AstrMessageEvent, page: int = 1) -> None:
         """查看对话记录"""
         if not self.context.get_using_provider(message.unified_msg_origin):
@@ -178,16 +206,33 @@ class ConversationCommands:
             _titles[conv.cid] = title
 
         """遍历分页后的对话生成列表显示"""
+        provider_settings = cfg.get("provider_settings", {})
+        platform_name = message.get_platform_name()
         for conv in conversations_paged:
-            persona_id = conv.persona_id
-            if not persona_id or persona_id == "[%None]":
-                persona = await self.context.persona_manager.get_default_persona_v3(
-                    umo=message.unified_msg_origin,
-                )
-                persona_id = persona["name"]
+            (
+                persona_id,
+                _,
+                force_applied_persona_id,
+                _,
+            ) = await self.context.persona_manager.resolve_selected_persona(
+                umo=message.unified_msg_origin,
+                conversation_persona_id=conv.persona_id,
+                platform_name=platform_name,
+                provider_settings=provider_settings,
+            )
+            if persona_id == "[%None]":
+                persona_name = "无"
+            elif persona_id:
+                persona_name = persona_id
+            else:
+                persona_name = "无"
+
+            if force_applied_persona_id:
+                persona_name = f"{persona_name} (自定义规则)"
+
             title = _titles.get(conv.cid, "新对话")
             parts.append(
-                f"{global_index}. {title}({conv.cid[:4]})\n  人格情景: {persona_id}\n  上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n"
+                f"{global_index}. {title}({conv.cid[:4]})\n  人格情景: {persona_name}\n  上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n"
             )
             global_index += 1
 
@@ -221,6 +266,7 @@ class ConversationCommands:
         cfg = self.context.get_config(umo=message.unified_msg_origin)
         agent_runner_type = cfg["provider_settings"]["agent_runner_type"]
         if agent_runner_type in THIRD_PARTY_AGENT_RUNNER_KEY:
+            active_event_registry.stop_all(message.unified_msg_origin, exclude=message)
             await sp.remove_async(
                 scope="umo",
                 scope_id=message.unified_msg_origin,
@@ -229,6 +275,7 @@ class ConversationCommands:
             message.set_result(MessageEventResult().message("已创建新对话。"))
             return
 
+        active_event_registry.stop_all(message.unified_msg_origin, exclude=message)
         cpersona = await self._get_current_persona_id(message.unified_msg_origin)
         cid = await self.context.conversation_manager.new_conversation(
             message.unified_msg_origin,
@@ -321,7 +368,8 @@ class ConversationCommands:
 
     async def del_conv(self, message: AstrMessageEvent) -> None:
         """删除当前对话"""
-        cfg = self.context.get_config(umo=message.unified_msg_origin)
+        umo = message.unified_msg_origin
+        cfg = self.context.get_config(umo=umo)
         is_unique_session = cfg["platform_settings"]["unique_session"]
         if message.get_group_id() and not is_unique_session and message.role != "admin":
             # 群聊，没开独立会话，发送人不是管理员
@@ -334,18 +382,17 @@ class ConversationCommands:
 
         agent_runner_type = cfg["provider_settings"]["agent_runner_type"]
         if agent_runner_type in THIRD_PARTY_AGENT_RUNNER_KEY:
+            active_event_registry.stop_all(umo, exclude=message)
             await sp.remove_async(
                 scope="umo",
-                scope_id=message.unified_msg_origin,
+                scope_id=umo,
                 key=THIRD_PARTY_AGENT_RUNNER_KEY[agent_runner_type],
             )
             message.set_result(MessageEventResult().message("重置对话成功。"))
             return
 
         session_curr_cid = (
-            await self.context.conversation_manager.get_curr_conversation_id(
-                message.unified_msg_origin,
-            )
+            await self.context.conversation_manager.get_curr_conversation_id(umo)
         )
 
         if not session_curr_cid:
@@ -356,8 +403,10 @@ class ConversationCommands:
             )
             return
 
+        active_event_registry.stop_all(umo, exclude=message)
+
         await self.context.conversation_manager.delete_conversation(
-            message.unified_msg_origin,
+            umo,
             session_curr_cid,
         )
 

astrbot/builtin_stars/builtin_commands/commands/persona.py

@@ -1,7 +1,7 @@
 import builtins
 from typing import TYPE_CHECKING
 
-from astrbot.api import sp, star
+from astrbot.api import star
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 
 if TYPE_CHECKING:
@@ -59,12 +59,7 @@ class PersonaCommands:
         default_persona = await self.context.persona_manager.get_default_persona_v3(
             umo=umo,
         )
-
-        force_applied_persona_id = (
-            await sp.get_async(
-                scope="umo", scope_id=umo, key="session_service_config", default={}
-            )
-        ).get("persona_id")
+        force_applied_persona_id = None
 
         curr_cid_title = "无"
         if cid:
@@ -80,10 +75,27 @@ class PersonaCommands:
                     ),
                 )
                 return
-            if not conv.persona_id and conv.persona_id != "[%None]":
-                curr_persona_name = default_persona["name"]
-            else:
-                curr_persona_name = conv.persona_id
+
+            provider_settings = self.context.get_config(umo=umo).get(
+                "provider_settings",
+                {},
+            )
+            (
+                persona_id,
+                _,
+                force_applied_persona_id,
+                _,
+            ) = await self.context.persona_manager.resolve_selected_persona(
+                umo=umo,
+                conversation_persona_id=conv.persona_id,
+                platform_name=message.get_platform_name(),
+                provider_settings=provider_settings,
+            )
+
+            if persona_id == "[%None]":
+                curr_persona_name = "无"
+            elif persona_id:
+                curr_persona_name = persona_id
 
             if force_applied_persona_id:
                 curr_persona_name = f"{curr_persona_name} (自定义规则)"

astrbot/builtin_stars/builtin_commands/main.py

@@ -132,6 +132,11 @@ class Main(star.Star):
         """重置 LLM 会话"""
         await self.conversation_c.reset(message)
 
+    @filter.command("stop")
+    async def stop(self, message: AstrMessageEvent) -> None:
+        """停止当前会话中正在运行的 Agent"""
+        await self.conversation_c.stop(message)
+
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("model")
     async def model_ls(

astrbot/builtin_stars/web_searcher/main.py

@@ -70,7 +70,7 @@ class Main(star.Star):
         header = HEADERS
         header.update({"User-Agent": random.choice(USER_AGENTS)})
         async with aiohttp.ClientSession(trust_env=True) as session:
-            async with session.get(url, headers=header, timeout=6) as response:
+            async with session.get(url, headers=header) as response:
                 html = await response.text(encoding="utf-8")
                 doc = Document(html)
                 ret = doc.summary(html_partial=True)
@@ -151,7 +151,6 @@ class Main(star.Star):
                 url,
                 json=payload,
                 headers=header,
-                timeout=6,
             ) as response:
                 if response.status != 200:
                     reason = await response.text()
@@ -183,7 +182,6 @@ class Main(star.Star):
                 url,
                 json=payload,
                 headers=header,
-                timeout=6,
             ) as response:
                 if response.status != 200:
                     reason = await response.text()
@@ -265,7 +263,7 @@ class Main(star.Star):
                 "transport": "sse",
                 "url": f"http://appbuilder.baidu.com/v2/ai_search/mcp/sse?api_key={key}",
                 "headers": {},
-                "timeout": 30,
+                "timeout": 600,
             },
         )
         self.baidu_initialized = True

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.15.0"
+__version__ = "4.18.3"

astrbot/core/agent/context/truncator.py

@@ -4,19 +4,60 @@ from ..message import Message
 class ContextTruncator:
     """Context truncator."""
 
+    def _has_tool_calls(self, message: Message) -> bool:
+        """Check if a message contains tool calls."""
+        return (
+            message.role == "assistant"
+            and message.tool_calls is not None
+            and len(message.tool_calls) > 0
+        )
+
     def fix_messages(self, messages: list[Message]) -> list[Message]:
-        fixed_messages = []
-        for message in messages:
-            if message.role == "tool":
-                # tool block 前面必须要有 user 和 assistant block
-                if len(fixed_messages) < 2:
-                    # 这种情况可能是上下文被截断导致的
-                    # 我们直接将之前的上下文都清空
-                    fixed_messages = []
-                else:
-                    fixed_messages.append(message)
-            else:
-                fixed_messages.append(message)
+        """修复消息列表，确保 tool call 和 tool response 的配对关系有效。
+
+        此方法确保：
+        1. 每个 `tool` 消息前面都有一个包含 tool_calls 的 `assistant` 消息
+        2. 每个包含 tool_calls 的 `assistant` 消息后面都有对应的 `tool` 响应
+
+        这是 OpenAI Chat Completions API 规范的要求（Gemini 对此执行严格检查）。
+        """
+        if not messages:
+            return messages
+
+        fixed_messages: list[Message] = []
+        pending_assistant: Message | None = None
+        pending_tools: list[Message] = []
+
+        def flush_pending_if_valid() -> None:
+            nonlocal pending_assistant, pending_tools
+            if pending_assistant is not None and pending_tools:
+                fixed_messages.append(pending_assistant)
+                fixed_messages.extend(pending_tools)
+            pending_assistant = None
+            pending_tools = []
+
+        for msg in messages:
+            if msg.role == "tool":
+                # 只有在有挂起的 assistant(tool_calls) 时才记录 tool 响应
+                if pending_assistant is not None:
+                    pending_tools.append(msg)
+                # else: 孤立的 tool 消息，直接忽略
+                continue
+
+            if self._has_tool_calls(msg):
+                # 遇到新的 assistant(tool_calls) 前，先处理旧的 pending 链
+                flush_pending_if_valid()
+                pending_assistant = msg
+                continue
+
+            # 非 tool，且不含 tool_calls 的消息
+            # 先结束任何 pending 链，再正常追加
+            flush_pending_if_valid()
+            fixed_messages.append(msg)
+
+        # 结束时处理最后一个 pending 链
+        flush_pending_if_valid()
+
         return fixed_messages
 
     def truncate_by_turns(

astrbot/core/agent/handoff.py

@@ -44,6 +44,19 @@ class HandoffTool(FunctionTool, Generic[TContext]):
                     "type": "string",
                     "description": "The input to be handed off to another agent. This should be a clear and concise request or task.",
                 },
+                "image_urls": {
+                    "type": "array",
+                    "items": {"type": "string"},
+                    "description": "Optional: An array of image sources (public HTTP URLs or local file paths) used as references in multimodal tasks such as video generation.",
+                },
+                "background_task": {
+                    "type": "boolean",
+                    "description": (
+                        "Defaults to false. "
+                        "Set to true if the task may take noticeable time, involves external tools, or the user does not need to wait. "
+                        "Use false only for quick, immediate tasks."
+                    ),
+                },
             },
         }
 

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -91,6 +91,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         custom_token_counter: TokenCounter | None = None,
         custom_compressor: ContextCompressor | None = None,
         tool_schema_mode: str | None = "full",
+        fallback_providers: list[Provider] | None = None,
         **kwargs: T.Any,
     ) -> None:
         self.req = request
@@ -120,11 +121,24 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         self.context_manager = ContextManager(self.context_config)
 
         self.provider = provider
+        self.fallback_providers: list[Provider] = []
+        seen_provider_ids: set[str] = {str(provider.provider_config.get("id", ""))}
+        for fallback_provider in fallback_providers or []:
+            fallback_id = str(fallback_provider.provider_config.get("id", ""))
+            if fallback_provider is provider:
+                continue
+            if fallback_id and fallback_id in seen_provider_ids:
+                continue
+            self.fallback_providers.append(fallback_provider)
+            if fallback_id:
+                seen_provider_ids.add(fallback_id)
         self.final_llm_resp = None
         self._state = AgentState.IDLE
         self.tool_executor = tool_executor
         self.agent_hooks = agent_hooks
         self.run_context = run_context
+        self._stop_requested = False
+        self._aborted = False
 
         # These two are used for tool schema mode handling
         # We now have two modes:
@@ -166,16 +180,19 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         self.stats = AgentStats()
         self.stats.start_time = time.time()
 
-    async def _iter_llm_responses(self) -> T.AsyncGenerator[LLMResponse, None]:
+    async def _iter_llm_responses(
+        self, *, include_model: bool = True
+    ) -> T.AsyncGenerator[LLMResponse, None]:
         """Yields chunks *and* a final LLMResponse."""
         payload = {
             "contexts": self.run_context.messages,  # list[Message]
             "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,
             "extra_user_content_parts": self.req.extra_user_content_parts,  # list[ContentPart]
         }
-
+        if include_model:
+            # For primary provider we keep explicit model selection if provided.
+            payload["model"] = self.req.model
         if self.streaming:
             stream = self.provider.text_chat_stream(**payload)
             async for resp in stream:  # type: ignore
@@ -183,6 +200,77 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         else:
             yield await self.provider.text_chat(**payload)
 
+    async def _iter_llm_responses_with_fallback(
+        self,
+    ) -> T.AsyncGenerator[LLMResponse, None]:
+        """Wrap _iter_llm_responses with provider fallback handling."""
+        candidates = [self.provider, *self.fallback_providers]
+        total_candidates = len(candidates)
+        last_exception: Exception | None = None
+        last_err_response: LLMResponse | None = None
+
+        for idx, candidate in enumerate(candidates):
+            candidate_id = candidate.provider_config.get("id", "<unknown>")
+            is_last_candidate = idx == total_candidates - 1
+            if idx > 0:
+                logger.warning(
+                    "Switched from %s to fallback chat provider: %s",
+                    self.provider.provider_config.get("id", "<unknown>"),
+                    candidate_id,
+                )
+            self.provider = candidate
+            has_stream_output = False
+            try:
+                async for resp in self._iter_llm_responses(include_model=idx == 0):
+                    if resp.is_chunk:
+                        has_stream_output = True
+                        yield resp
+                        continue
+
+                    if (
+                        resp.role == "err"
+                        and not has_stream_output
+                        and (not is_last_candidate)
+                    ):
+                        last_err_response = resp
+                        logger.warning(
+                            "Chat Model %s returns error response, trying fallback to next provider.",
+                            candidate_id,
+                        )
+                        break
+
+                    yield resp
+                    return
+
+                if has_stream_output:
+                    return
+            except Exception as exc:  # noqa: BLE001
+                last_exception = exc
+                logger.warning(
+                    "Chat Model %s request error: %s",
+                    candidate_id,
+                    exc,
+                    exc_info=True,
+                )
+                continue
+
+        if last_err_response:
+            yield last_err_response
+            return
+        if last_exception:
+            yield LLMResponse(
+                role="err",
+                completion_text=(
+                    "All chat models failed: "
+                    f"{type(last_exception).__name__}: {last_exception}"
+                ),
+            )
+            return
+        yield LLMResponse(
+            role="err",
+            completion_text="All available chat models are unavailable.",
+        )
+
     def _simple_print_message_role(self, tag: str = ""):
         roles = []
         for message in self.run_context.messages:
@@ -215,7 +303,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         )
         self._simple_print_message_role("[AftCompact]")
 
-        async for llm_response in self._iter_llm_responses():
+        async for llm_response in self._iter_llm_responses_with_fallback():
             if llm_response.is_chunk:
                 # update ttft
                 if self.stats.time_to_first_token == 0:
@@ -242,6 +330,14 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                             ),
                         ),
                     )
+                if self._stop_requested:
+                    llm_resp_result = LLMResponse(
+                        role="assistant",
+                        completion_text="[SYSTEM: User actively interrupted the response generation. Partial output before interruption is preserved.]",
+                        reasoning_content=llm_response.reasoning_content,
+                        reasoning_signature=llm_response.reasoning_signature,
+                    )
+                    break
                 continue
             llm_resp_result = llm_response
 
@@ -253,6 +349,48 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             break  # got final response
 
         if not llm_resp_result:
+            if self._stop_requested:
+                llm_resp_result = LLMResponse(role="assistant", completion_text="")
+            else:
+                return
+
+        if self._stop_requested:
+            logger.info("Agent execution was requested to stop by user.")
+            llm_resp = llm_resp_result
+            if llm_resp.role != "assistant":
+                llm_resp = LLMResponse(
+                    role="assistant",
+                    completion_text="[SYSTEM: User actively interrupted the response generation. Partial output before interruption is preserved.]",
+                )
+            self.final_llm_resp = llm_resp
+            self._aborted = True
+            self._transition_state(AgentState.DONE)
+            self.stats.end_time = time.time()
+
+            parts = []
+            if llm_resp.reasoning_content or llm_resp.reasoning_signature:
+                parts.append(
+                    ThinkPart(
+                        think=llm_resp.reasoning_content,
+                        encrypted=llm_resp.reasoning_signature,
+                    )
+                )
+            if llm_resp.completion_text:
+                parts.append(TextPart(text=llm_resp.completion_text))
+            if parts:
+                self.run_context.messages.append(
+                    Message(role="assistant", content=parts)
+                )
+
+            try:
+                await self.agent_hooks.on_agent_done(self.run_context, llm_resp)
+            except Exception as e:
+                logger.error(f"Error in on_agent_done hook: {e}", exc_info=True)
+
+            yield AgentResponse(
+                type="aborted",
+                data=AgentResponseData(chain=MessageChain(type="aborted")),
+            )
             return
 
         # 处理 LLM 响应
@@ -271,6 +409,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                     ),
                 ),
             )
+            return
 
         if not llm_resp.tools_call_name:
             # 如果没有工具调用，转换到完成状态
@@ -761,5 +900,11 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         """检查 Agent 是否已完成工作"""
         return self._state in (AgentState.DONE, AgentState.ERROR)
 
+    def request_stop(self) -> None:
+        self._stop_requested = True
+
+    def was_aborted(self) -> bool:
+        return self._aborted
+
     def get_final_llm_resp(self) -> LLMResponse | None:
         return self.final_llm_resp

astrbot/core/agent/tool.py

@@ -285,6 +285,9 @@ class ToolSet:
                     prop_value = convert_schema(value)
                     if "default" in prop_value:
                         del prop_value["default"]
+                    # see #5217
+                    if "additionalProperties" in prop_value:
+                        del prop_value["additionalProperties"]
                     properties[key] = prop_value
 
                 if properties:

astrbot/core/astr_agent_run_util.py

@@ -20,15 +20,81 @@ from astrbot.core.provider.provider import TTSProvider
 AgentRunner = ToolLoopAgentRunner[AstrAgentContext]
 
 
+def _should_stop_agent(astr_event) -> bool:
+    return astr_event.is_stopped() or bool(astr_event.get_extra("agent_stop_requested"))
+
+
+def _truncate_tool_result(text: str, limit: int = 70) -> str:
+    if limit <= 0:
+        return ""
+    if len(text) <= limit:
+        return text
+    if limit <= 3:
+        return text[:limit]
+    return f"{text[: limit - 3]}..."
+
+
+def _extract_chain_json_data(msg_chain: MessageChain) -> dict | None:
+    if not msg_chain.chain:
+        return None
+    first_comp = msg_chain.chain[0]
+    if isinstance(first_comp, Json) and isinstance(first_comp.data, dict):
+        return first_comp.data
+    return None
+
+
+def _record_tool_call_name(
+    tool_info: dict | None, tool_name_by_call_id: dict[str, str]
+) -> None:
+    if not isinstance(tool_info, dict):
+        return
+    tool_call_id = tool_info.get("id")
+    tool_name = tool_info.get("name")
+    if tool_call_id is None or tool_name is None:
+        return
+    tool_name_by_call_id[str(tool_call_id)] = str(tool_name)
+
+
+def _build_tool_call_status_message(tool_info: dict | None) -> str:
+    if tool_info:
+        return f"🔨 调用工具: {tool_info.get('name', 'unknown')}"
+    return "🔨 调用工具..."
+
+
+def _build_tool_result_status_message(
+    msg_chain: MessageChain, tool_name_by_call_id: dict[str, str]
+) -> str:
+    tool_name = "unknown"
+    tool_result = ""
+
+    result_data = _extract_chain_json_data(msg_chain)
+    if result_data:
+        tool_call_id = result_data.get("id")
+        if tool_call_id is not None:
+            tool_name = tool_name_by_call_id.pop(str(tool_call_id), "unknown")
+        tool_result = str(result_data.get("result", ""))
+
+    if not tool_result:
+        tool_result = msg_chain.get_plain_text(with_other_comps_mark=True)
+    tool_result = _truncate_tool_result(tool_result, 70)
+
+    status_msg = f"🔨 调用工具: {tool_name}"
+    if tool_result:
+        status_msg = f"{status_msg}\n📎 返回结果: {tool_result}"
+    return status_msg
+
+
 async def run_agent(
     agent_runner: AgentRunner,
     max_step: int = 30,
     show_tool_use: bool = True,
+    show_tool_call_result: bool = False,
     stream_to_general: bool = False,
     show_reasoning: bool = False,
 ) -> AsyncGenerator[MessageChain | None, None]:
     step_idx = 0
     astr_event = agent_runner.run_context.context.event
+    tool_name_by_call_id: dict[str, str] = {}
     while step_idx < max_step + 1:
         step_idx += 1
 
@@ -48,10 +114,28 @@ async def run_agent(
                     )
                 )
 
+        stop_watcher = asyncio.create_task(
+            _watch_agent_stop_signal(agent_runner, astr_event),
+        )
         try:
             async for resp in agent_runner.step():
-                if astr_event.is_stopped():
+                if _should_stop_agent(astr_event):
+                    agent_runner.request_stop()
+
+                if resp.type == "aborted":
+                    if not stop_watcher.done():
+                        stop_watcher.cancel()
+                        try:
+                            await stop_watcher
+                        except asyncio.CancelledError:
+                            pass
+                    astr_event.set_extra("agent_user_aborted", True)
+                    astr_event.set_extra("agent_stop_requested", False)
                     return
+
+                if _should_stop_agent(astr_event):
+                    continue
+
                 if resp.type == "tool_call_result":
                     msg_chain = resp.data["chain"]
 
@@ -68,6 +152,13 @@ async def run_agent(
                         continue
                     if astr_event.get_platform_id() == "webchat":
                         await astr_event.send(msg_chain)
+                    elif show_tool_use and show_tool_call_result:
+                        status_msg = _build_tool_result_status_message(
+                            msg_chain, tool_name_by_call_id
+                        )
+                        await astr_event.send(
+                            MessageChain(type="tool_call").message(status_msg)
+                        )
                     # 对于其他情况，暂时先不处理
                     continue
                 elif resp.type == "tool_call":
@@ -75,25 +166,22 @@ async def run_agent(
                         # 用来标记流式响应需要分节
                         yield MessageChain(chain=[], type="break")
 
-                    tool_info = None
-
-                    if resp.data["chain"].chain:
-                        json_comp = resp.data["chain"].chain[0]
-                        if isinstance(json_comp, Json):
-                            tool_info = json_comp.data
-                        astr_event.trace.record(
-                            "agent_tool_call",
-                            tool_name=tool_info if tool_info else "unknown",
-                        )
+                    tool_info = _extract_chain_json_data(resp.data["chain"])
+                    astr_event.trace.record(
+                        "agent_tool_call",
+                        tool_name=tool_info if tool_info else "unknown",
+                    )
+                    _record_tool_call_name(tool_info, tool_name_by_call_id)
 
                     if astr_event.get_platform_name() == "webchat":
                         await astr_event.send(resp.data["chain"])
                     elif show_tool_use:
-                        if tool_info:
-                            m = f"🔨 调用工具: {tool_info.get('name', 'unknown')}"
-                        else:
-                            m = "🔨 调用工具..."
-                        chain = MessageChain(type="tool_call").message(m)
+                        if show_tool_call_result and isinstance(tool_info, dict):
+                            # Delay tool status notification until tool_call_result.
+                            continue
+                        chain = MessageChain(type="tool_call").message(
+                            _build_tool_call_status_message(tool_info)
+                        )
                         await astr_event.send(chain)
                     continue
 
@@ -120,6 +208,12 @@ async def run_agent(
                         # display the reasoning content only when configured
                         continue
                     yield resp.data["chain"]  # MessageChain
+            if not stop_watcher.done():
+                stop_watcher.cancel()
+                try:
+                    await stop_watcher
+                except asyncio.CancelledError:
+                    pass
             if agent_runner.done():
                 # send agent stats to webchat
                 if astr_event.get_platform_name() == "webchat":
@@ -133,6 +227,12 @@ async def run_agent(
                 break
 
         except Exception as e:
+            if "stop_watcher" in locals() and not stop_watcher.done():
+                stop_watcher.cancel()
+                try:
+                    await stop_watcher
+                except asyncio.CancelledError:
+                    pass
             logger.error(traceback.format_exc())
 
             err_msg = f"\n\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {e!s}\n\n请在平台日志查看和分享错误详情。\n"
@@ -155,11 +255,20 @@ async def run_agent(
             return
 
 
+async def _watch_agent_stop_signal(agent_runner: AgentRunner, astr_event) -> None:
+    while not agent_runner.done():
+        if _should_stop_agent(astr_event):
+            agent_runner.request_stop()
+            return
+        await asyncio.sleep(0.5)
+
+
 async def run_live_agent(
     agent_runner: AgentRunner,
     tts_provider: TTSProvider | None = None,
     max_step: int = 30,
     show_tool_use: bool = True,
+    show_tool_call_result: bool = False,
     show_reasoning: bool = False,
 ) -> AsyncGenerator[MessageChain | None, None]:
     """Live Mode 的 Agent 运行器，支持流式 TTS
@@ -169,6 +278,7 @@ async def run_live_agent(
         tts_provider: TTS Provider 实例
         max_step: 最大步数
         show_tool_use: 是否显示工具使用
+        show_tool_call_result: 是否显示工具返回结果
         show_reasoning: 是否显示推理过程
 
     Yields:
@@ -180,6 +290,7 @@ async def run_live_agent(
             agent_runner,
             max_step=max_step,
             show_tool_use=show_tool_use,
+            show_tool_call_result=show_tool_call_result,
             stream_to_general=False,
             show_reasoning=show_reasoning,
         ):
@@ -208,7 +319,12 @@ async def run_live_agent(
     # 1. 启动 Agent Feeder 任务：负责运行 Agent 并将文本分句喂给 text_queue
     feeder_task = asyncio.create_task(
         _run_agent_feeder(
-            agent_runner, text_queue, max_step, show_tool_use, show_reasoning
+            agent_runner,
+            text_queue,
+            max_step,
+            show_tool_use,
+            show_tool_call_result,
+            show_reasoning,
         )
     )
 
@@ -294,6 +410,7 @@ async def _run_agent_feeder(
     text_queue: asyncio.Queue,
     max_step: int,
     show_tool_use: bool,
+    show_tool_call_result: bool,
     show_reasoning: bool,
 ) -> None:
     """运行 Agent 并将文本输出分句放入队列"""
@@ -303,6 +420,7 @@ async def _run_agent_feeder(
             agent_runner,
             max_step=max_step,
             show_tool_use=show_tool_use,
+            show_tool_call_result=show_tool_call_result,
             stream_to_general=False,
             show_reasoning=show_reasoning,
         ):

astrbot/core/astr_agent_tool_exec.py

@@ -17,6 +17,12 @@ from astrbot.core.agent.tool_executor import BaseFunctionToolExecutor
 from astrbot.core.astr_agent_context import AstrAgentContext
 from astrbot.core.astr_main_agent_resources import (
     BACKGROUND_TASK_RESULT_WOKE_SYSTEM_PROMPT,
+    EXECUTE_SHELL_TOOL,
+    FILE_DOWNLOAD_TOOL,
+    FILE_UPLOAD_TOOL,
+    LOCAL_EXECUTE_SHELL_TOOL,
+    LOCAL_PYTHON_TOOL,
+    PYTHON_TOOL,
     SEND_MESSAGE_TO_USER_TOOL,
 )
 from astrbot.core.cron.events import CronMessageEvent
@@ -45,6 +51,13 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
 
         """
         if isinstance(tool, HandoffTool):
+            is_bg = tool_args.pop("background_task", False)
+            if is_bg:
+                async for r in cls._execute_handoff_background(
+                    tool, run_context, **tool_args
+                ):
+                    yield r
+                return
             async for r in cls._execute_handoff(tool, run_context, **tool_args):
                 yield r
             return
@@ -84,6 +97,65 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
                 yield r
             return
 
+    @classmethod
+    def _get_runtime_computer_tools(cls, runtime: str) -> dict[str, FunctionTool]:
+        if runtime == "sandbox":
+            return {
+                EXECUTE_SHELL_TOOL.name: EXECUTE_SHELL_TOOL,
+                PYTHON_TOOL.name: PYTHON_TOOL,
+                FILE_UPLOAD_TOOL.name: FILE_UPLOAD_TOOL,
+                FILE_DOWNLOAD_TOOL.name: FILE_DOWNLOAD_TOOL,
+            }
+        if runtime == "local":
+            return {
+                LOCAL_EXECUTE_SHELL_TOOL.name: LOCAL_EXECUTE_SHELL_TOOL,
+                LOCAL_PYTHON_TOOL.name: LOCAL_PYTHON_TOOL,
+            }
+        return {}
+
+    @classmethod
+    def _build_handoff_toolset(
+        cls,
+        run_context: ContextWrapper[AstrAgentContext],
+        tools: list[str | FunctionTool] | None,
+    ) -> ToolSet | None:
+        ctx = run_context.context.context
+        event = run_context.context.event
+        cfg = ctx.get_config(umo=event.unified_msg_origin)
+        provider_settings = cfg.get("provider_settings", {})
+        runtime = str(provider_settings.get("computer_use_runtime", "local"))
+        runtime_computer_tools = cls._get_runtime_computer_tools(runtime)
+
+        # Keep persona semantics aligned with the main agent: tools=None means
+        # "all tools", including runtime computer-use tools.
+        if tools is None:
+            toolset = ToolSet()
+            for registered_tool in llm_tools.func_list:
+                if isinstance(registered_tool, HandoffTool):
+                    continue
+                if registered_tool.active:
+                    toolset.add_tool(registered_tool)
+            for runtime_tool in runtime_computer_tools.values():
+                toolset.add_tool(runtime_tool)
+            return None if toolset.empty() else toolset
+
+        if not tools:
+            return None
+
+        toolset = ToolSet()
+        for tool_name_or_obj in tools:
+            if isinstance(tool_name_or_obj, str):
+                registered_tool = llm_tools.get_func(tool_name_or_obj)
+                if registered_tool and registered_tool.active:
+                    toolset.add_tool(registered_tool)
+                    continue
+                runtime_tool = runtime_computer_tools.get(tool_name_or_obj)
+                if runtime_tool:
+                    toolset.add_tool(runtime_tool)
+            elif isinstance(tool_name_or_obj, FunctionTool):
+                toolset.add_tool(tool_name_or_obj)
+        return None if toolset.empty() else toolset
+
     @classmethod
     async def _execute_handoff(
         cls,
@@ -92,20 +164,10 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
         **tool_args,
     ):
         input_ = tool_args.get("input")
+        image_urls = tool_args.get("image_urls")
 
-        # make toolset for the agent
-        tools = tool.agent.tools
-        if tools:
-            toolset = ToolSet()
-            for t in tools:
-                if isinstance(t, str):
-                    _t = llm_tools.get_func(t)
-                    if _t:
-                        toolset.add_tool(_t)
-                elif isinstance(t, FunctionTool):
-                    toolset.add_tool(t)
-        else:
-            toolset = None
+        # Build handoff toolset from registered tools plus runtime computer tools.
+        toolset = cls._build_handoff_toolset(run_context, tool.agent.tools)
 
         ctx = run_context.context.context
         event = run_context.context.event
@@ -136,16 +198,98 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
             event=event,
             chat_provider_id=prov_id,
             prompt=input_,
+            image_urls=image_urls,
             system_prompt=tool.agent.instructions,
             tools=toolset,
             contexts=contexts,
             max_steps=30,
             run_hooks=tool.agent.run_hooks,
+            stream=ctx.get_config().get("provider_settings", {}).get("stream", False),
         )
         yield mcp.types.CallToolResult(
             content=[mcp.types.TextContent(type="text", text=llm_resp.completion_text)]
         )
 
+    @classmethod
+    async def _execute_handoff_background(
+        cls,
+        tool: HandoffTool,
+        run_context: ContextWrapper[AstrAgentContext],
+        **tool_args,
+    ):
+        """Execute a handoff as a background task.
+
+        Immediately yields a success response with a task_id, then runs
+        the subagent asynchronously.  When the subagent finishes, a
+        ``CronMessageEvent`` is created so the main LLM can inform the
+        user of the result – the same pattern used by
+        ``_execute_background`` for regular background tasks.
+        """
+        task_id = uuid.uuid4().hex
+
+        async def _run_handoff_in_background() -> None:
+            try:
+                await cls._do_handoff_background(
+                    tool=tool,
+                    run_context=run_context,
+                    task_id=task_id,
+                    **tool_args,
+                )
+            except Exception as e:  # noqa: BLE001
+                logger.error(
+                    f"Background handoff {task_id} ({tool.name}) failed: {e!s}",
+                    exc_info=True,
+                )
+
+        asyncio.create_task(_run_handoff_in_background())
+
+        text_content = mcp.types.TextContent(
+            type="text",
+            text=(
+                f"Background task dedicated to subagent '{tool.agent.name}' submitted. task_id={task_id}. "
+                f"The subagent '{tool.agent.name}' is working on the task on hehalf you. "
+                f"You will be notified when it finishes."
+            ),
+        )
+        yield mcp.types.CallToolResult(content=[text_content])
+
+    @classmethod
+    async def _do_handoff_background(
+        cls,
+        tool: HandoffTool,
+        run_context: ContextWrapper[AstrAgentContext],
+        task_id: str,
+        **tool_args,
+    ) -> None:
+        """Run the subagent handoff and, on completion, wake the main agent."""
+        result_text = ""
+        try:
+            async for r in cls._execute_handoff(tool, run_context, **tool_args):
+                if isinstance(r, mcp.types.CallToolResult):
+                    for content in r.content:
+                        if isinstance(content, mcp.types.TextContent):
+                            result_text += content.text + "\n"
+        except Exception as e:
+            result_text = (
+                f"error: Background task execution failed, internal error: {e!s}"
+            )
+
+        event = run_context.context.event
+
+        await cls._wake_main_agent_for_background_result(
+            run_context=run_context,
+            task_id=task_id,
+            tool_name=tool.name,
+            result_text=result_text,
+            tool_args=tool_args,
+            note=(
+                event.get_extra("background_note")
+                or f"Background task for subagent '{tool.agent.name}' finished."
+            ),
+            summary_name=f"Dedicated to subagent `{tool.agent.name}`",
+            extra_result_fields={"subagent_name": tool.agent.name},
+        )
+
     @classmethod
     async def _execute_background(
         cls,
@@ -154,12 +298,6 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
         task_id: str,
         **tool_args,
     ) -> None:
-        from astrbot.core.astr_main_agent import (
-            MainAgentBuildConfig,
-            _get_session_conv,
-            build_main_agent,
-        )
-
         # run the tool
         result_text = ""
         try:
@@ -177,21 +315,53 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
                 f"error: Background task execution failed, internal error: {e!s}"
             )
 
+        event = run_context.context.event
+
+        await cls._wake_main_agent_for_background_result(
+            run_context=run_context,
+            task_id=task_id,
+            tool_name=tool.name,
+            result_text=result_text,
+            tool_args=tool_args,
+            note=(
+                event.get_extra("background_note")
+                or f"Background task {tool.name} finished."
+            ),
+            summary_name=tool.name,
+        )
+
+    @classmethod
+    async def _wake_main_agent_for_background_result(
+        cls,
+        run_context: ContextWrapper[AstrAgentContext],
+        *,
+        task_id: str,
+        tool_name: str,
+        result_text: str,
+        tool_args: dict[str, T.Any],
+        note: str,
+        summary_name: str,
+        extra_result_fields: dict[str, T.Any] | None = None,
+    ) -> None:
+        from astrbot.core.astr_main_agent import (
+            MainAgentBuildConfig,
+            _get_session_conv,
+            build_main_agent,
+        )
+
         event = run_context.context.event
         ctx = run_context.context.context
 
-        note = (
-            event.get_extra("background_note")
-            or f"Background task {tool.name} finished."
-        )
-        extras = {
-            "background_task_result": {
-                "task_id": task_id,
-                "tool_name": tool.name,
-                "result": result_text or "",
-                "tool_args": tool_args,
-            }
+        task_result = {
+            "task_id": task_id,
+            "tool_name": tool_name,
+            "result": result_text or "",
+            "tool_args": tool_args,
         }
+        if extra_result_fields:
+            task_result.update(extra_result_fields)
+        extras = {"background_task_result": task_result}
+
         session = MessageSession.from_str(event.unified_msg_origin)
         cron_event = CronMessageEvent(
             context=ctx,
@@ -201,7 +371,12 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
             message_type=session.message_type,
         )
         cron_event.role = event.role
-        config = MainAgentBuildConfig(tool_call_timeout=3600)
+        config = MainAgentBuildConfig(
+            tool_call_timeout=3600,
+            streaming_response=ctx.get_config()
+            .get("provider_settings", {})
+            .get("stream", False),
+        )
 
         req = ProviderRequest()
         conv = await _get_session_conv(event=cron_event, plugin_context=ctx)
@@ -222,8 +397,11 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
         )
         req.prompt = (
             "Proceed according to your system instructions. "
-            "Output using same language as previous conversation."
-            " After completing your task, summarize and output your actions and results."
+            "Output using same language as previous conversation. "
+            "If you need to deliver the result to the user immediately, "
+            "you MUST use `send_message_to_user` tool to send the message directly to the user, "
+            "otherwise the user will not see the result. "
+            "After completing your task, summarize and output your actions and results. "
         )
         if not req.func_tool:
             req.func_tool = ToolSet()
@@ -233,7 +411,7 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
             event=cron_event, plugin_context=ctx, config=config, req=req
         )
         if not result:
-            logger.error("Failed to build main agent for background task job.")
+            logger.error(f"Failed to build main agent for background task {tool_name}.")
             return
 
         runner = result.agent_runner
@@ -243,7 +421,7 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
         llm_resp = runner.get_final_llm_resp()
         task_meta = extras.get("background_task_result", {})
         summary_note = (
-            f"[BackgroundTask] {task_meta.get('tool_name', tool.name)} "
+            f"[BackgroundTask] {summary_name} "
             f"(task_id={task_meta.get('task_id', task_id)}) finished. "
             f"Result: {task_meta.get('result') or result_text or 'no content'}"
         )

astrbot/core/astr_main_agent.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import builtins
 import copy
 import datetime
 import json
@@ -10,7 +9,6 @@ import zoneinfo
 from collections.abc import Coroutine
 from dataclasses import dataclass, field
 
-from astrbot.api import sp
 from astrbot.core import logger
 from astrbot.core.agent.handoff import HandoffTool
 from astrbot.core.agent.mcp_client import MCPTool
@@ -275,47 +273,26 @@ async def _ensure_persona_and_skills(
     if not req.conversation:
         return
 
-    # get persona ID
-
-    # 1. from session service config - highest priority
-    persona_id = (
-        await sp.get_async(
-            scope="umo",
-            scope_id=event.unified_msg_origin,
-            key="session_service_config",
-            default={},
-        )
-    ).get("persona_id")
-
-    if not persona_id:
-        # 2. from conversation setting - second priority
-        persona_id = req.conversation.persona_id
-
-        if persona_id == "[%None]":
-            # explicitly set to no persona
-            pass
-        elif persona_id is None:
-            # 3. from config default persona setting - last priority
-            persona_id = cfg.get("default_personality")
-
-    persona = next(
-        builtins.filter(
-            lambda persona: persona["name"] == persona_id,
-            plugin_context.persona_manager.personas_v3,
-        ),
-        None,
+    (
+        persona_id,
+        persona,
+        _,
+        use_webchat_special_default,
+    ) = await plugin_context.persona_manager.resolve_selected_persona(
+        umo=event.unified_msg_origin,
+        conversation_persona_id=req.conversation.persona_id,
+        platform_name=event.get_platform_name(),
+        provider_settings=cfg,
     )
+
     if persona:
         # Inject persona system prompt
         if prompt := persona["prompt"]:
             req.system_prompt += f"\n# Persona Instructions\n\n{prompt}\n"
         if begin_dialogs := copy.deepcopy(persona.get("_begin_dialogs_processed")):
             req.contexts[:0] = begin_dialogs
-    else:
-        # special handling for webchat persona
-        if event.get_platform_name() == "webchat" and persona_id != "[%None]":
-            persona_id = "_chatui_default_"
-            req.system_prompt += CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT
+    elif use_webchat_special_default:
+        req.system_prompt += CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT
 
     # Inject skills prompt
     runtime = cfg.get("computer_use_runtime", "local")
@@ -870,6 +847,41 @@ def _get_compress_provider(
     return provider
 
 
+def _get_fallback_chat_providers(
+    provider: Provider, plugin_context: Context, provider_settings: dict
+) -> list[Provider]:
+    fallback_ids = provider_settings.get("fallback_chat_models", [])
+    if not isinstance(fallback_ids, list):
+        logger.warning(
+            "fallback_chat_models setting is not a list, skip fallback providers."
+        )
+        return []
+
+    provider_id = str(provider.provider_config.get("id", ""))
+    seen_provider_ids: set[str] = {provider_id} if provider_id else set()
+    fallbacks: list[Provider] = []
+
+    for fallback_id in fallback_ids:
+        if not isinstance(fallback_id, str) or not fallback_id:
+            continue
+        if fallback_id in seen_provider_ids:
+            continue
+        fallback_provider = plugin_context.get_provider_by_id(fallback_id)
+        if fallback_provider is None:
+            logger.warning("Fallback chat provider `%s` not found, skip.", fallback_id)
+            continue
+        if not isinstance(fallback_provider, Provider):
+            logger.warning(
+                "Fallback chat provider `%s` is invalid type: %s, skip.",
+                fallback_id,
+                type(fallback_provider),
+            )
+            continue
+        fallbacks.append(fallback_provider)
+        seen_provider_ids.add(fallback_id)
+    return fallbacks
+
+
 async def build_main_agent(
     *,
     event: AstrMessageEvent,
@@ -1093,6 +1105,9 @@ async def build_main_agent(
         truncate_turns=config.dequeue_context_length,
         enforce_max_turns=config.max_context_length,
         tool_schema_mode=config.tool_schema_mode,
+        fallback_providers=_get_fallback_chat_providers(
+            provider, plugin_context, config.provider_settings
+        ),
     )
 
     if apply_reset:

astrbot/core/computer/tools/fs.py

@@ -11,6 +11,7 @@ from astrbot.core.message.components import File
 from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
 
 from ..computer_client import get_booter
+from .permissions import check_admin_permission
 
 # @dataclass
 # class CreateFileTool(FunctionTool):
@@ -102,6 +103,8 @@ class FileUploadTool(FunctionTool):
         context: ContextWrapper[AstrAgentContext],
         local_path: str,
     ) -> str | None:
+        if permission_error := check_admin_permission(context, "File upload/download"):
+            return permission_error
         sb = await get_booter(
             context.context.context,
             context.context.event.unified_msg_origin,
@@ -161,6 +164,8 @@ class FileDownloadTool(FunctionTool):
         remote_path: str,
         also_send_to_user: bool = True,
     ) -> ToolExecResult:
+        if permission_error := check_admin_permission(context, "File upload/download"):
+            return permission_error
         sb = await get_booter(
             context.context.context,
             context.context.event.unified_msg_origin,

astrbot/core/computer/tools/permissions.py

@@ -0,0 +1,19 @@
+from astrbot.core.agent.run_context import ContextWrapper
+from astrbot.core.astr_agent_context import AstrAgentContext
+
+
+def check_admin_permission(
+    context: ContextWrapper[AstrAgentContext], operation_name: str
+) -> str | None:
+    cfg = context.context.context.get_config(
+        umo=context.context.event.unified_msg_origin
+    )
+    provider_settings = cfg.get("provider_settings", {})
+    require_admin = provider_settings.get("computer_use_require_admin", True)
+    if require_admin and context.context.event.role != "admin":
+        return (
+            f"error: Permission denied. {operation_name} is only allowed for admin users. "
+            "Tell user to set admins in `AstrBot WebUI -> Config -> General Config` by adding their user ID to the admins list if they need this feature. "
+            f"User's ID is: {context.context.event.get_sender_id()}. User's ID can be found by using /sid command."
+        )
+    return None

astrbot/core/computer/tools/python.py

@@ -5,8 +5,10 @@ import mcp
 from astrbot.api import FunctionTool
 from astrbot.core.agent.run_context import ContextWrapper
 from astrbot.core.agent.tool import ToolExecResult
-from astrbot.core.astr_agent_context import AstrAgentContext
+from astrbot.core.astr_agent_context import AstrAgentContext, AstrMessageEvent
 from astrbot.core.computer.computer_client import get_booter, get_local_booter
+from astrbot.core.computer.tools.permissions import check_admin_permission
+from astrbot.core.message.message_event_result import MessageChain
 
 param_schema = {
     "type": "object",
@@ -25,7 +27,7 @@ param_schema = {
 }
 
 
-def handle_result(result: dict) -> ToolExecResult:
+async def handle_result(result: dict, event: AstrMessageEvent) -> ToolExecResult:
     data = result.get("data", {})
     output = data.get("output", {})
     error = data.get("error", "")
@@ -44,6 +46,9 @@ def handle_result(result: dict) -> ToolExecResult:
                     type="image", data=img["image/png"], mimeType="image/png"
                 )
             )
+
+            if event.get_platform_name() == "webchat":
+                await event.send(message=MessageChain().base64_image(img["image/png"]))
     if text:
         resp.content.append(mcp.types.TextContent(type="text", text=text))
 
@@ -62,13 +67,15 @@ class PythonTool(FunctionTool):
     async def call(
         self, context: ContextWrapper[AstrAgentContext], code: str, silent: bool = False
     ) -> ToolExecResult:
+        if permission_error := check_admin_permission(context, "Python execution"):
+            return permission_error
         sb = await get_booter(
             context.context.context,
             context.context.event.unified_msg_origin,
         )
         try:
             result = await sb.python.exec(code, silent=silent)
-            return handle_result(result)
+            return await handle_result(result, context.context.event)
         except Exception as e:
             return f"Error executing code: {str(e)}"
 
@@ -83,12 +90,11 @@ class LocalPythonTool(FunctionTool):
     async def call(
         self, context: ContextWrapper[AstrAgentContext], code: str, silent: bool = False
     ) -> ToolExecResult:
-        if context.context.event.role != "admin":
-            return "error: Permission denied. Local Python execution is only allowed for admin users. Tell user to set admins in AstrBot WebUI."
-
+        if permission_error := check_admin_permission(context, "Python execution"):
+            return permission_error
         sb = get_local_booter()
         try:
             result = await sb.python.exec(code, silent=silent)
-            return handle_result(result)
+            return await handle_result(result, context.context.event)
         except Exception as e:
             return f"Error executing code: {str(e)}"

astrbot/core/computer/tools/shell.py

@@ -7,6 +7,7 @@ from astrbot.core.agent.tool import ToolExecResult
 from astrbot.core.astr_agent_context import AstrAgentContext
 
 from ..computer_client import get_booter, get_local_booter
+from .permissions import check_admin_permission
 
 
 @dataclass
@@ -46,8 +47,8 @@ class ExecuteShellTool(FunctionTool):
         background: bool = False,
         env: dict = {},
     ) -> ToolExecResult:
-        if context.context.event.role != "admin":
-            return "error: Permission denied. Shell execution is only allowed for admin users. Tell user to Set admins in AstrBot WebUI."
+        if permission_error := check_admin_permission(context, "Shell execution"):
+            return permission_error
 
         if self.is_local:
             sb = get_local_booter()

astrbot/core/config/astrbot_config.py

@@ -52,6 +52,9 @@ class AstrBotConfig(dict):
 
         with open(config_path, encoding="utf-8-sig") as f:
             conf_str = f.read()
+            # Handle UTF-8 BOM if present
+            if conf_str.startswith("\ufeff"):
+                conf_str = conf_str[1:]
             conf = json.loads(conf_str)
 
         # 检查配置完整性，并插入

astrbot/core/config/default.py

@@ -5,7 +5,7 @@ from typing import Any, TypedDict
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.15.0"
+VERSION = "4.18.3"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -15,6 +15,7 @@ WEBHOOK_SUPPORTED_PLATFORMS = [
     "wecom_ai_bot",
     "slack",
     "lark",
+    "line",
 ]
 
 # 默认配置
@@ -67,6 +68,7 @@ DEFAULT_CONFIG = {
     "provider_settings": {
         "enable": True,
         "default_provider_id": "",
+        "fallback_chat_models": [],
         "default_image_caption_provider_id": "",
         "image_caption_prompt": "Please describe the image using Chinese.",
         "provider_pool": ["*"],  # "*" 表示使用所有可用的提供者
@@ -98,6 +100,7 @@ DEFAULT_CONFIG = {
         "dequeue_context_length": 1,
         "streaming_response": False,
         "show_tool_use_status": False,
+        "show_tool_call_result": False,
         "sanitize_context_by_modalities": False,
         "max_quoted_fallback_images": 20,
         "quoted_message_parser": {
@@ -126,6 +129,7 @@ DEFAULT_CONFIG = {
             "add_cron_tools": True,
         },
         "computer_use_runtime": "local",
+        "computer_use_require_admin": True,
         "sandbox": {
             "booter": "shipyard",
             "shipyard_endpoint": "",
@@ -194,6 +198,12 @@ DEFAULT_CONFIG = {
         "host": "0.0.0.0",
         "port": 6185,
         "disable_access_log": True,
+        "ssl": {
+            "enable": False,
+            "cert_file": "",
+            "key_file": "",
+            "ca_certs": "",
+        },
     },
     "platform": [],
     "platform_specific": {
@@ -415,6 +425,15 @@ CONFIG_METADATA_2 = {
                         "slack_webhook_port": 6197,
                         "slack_webhook_path": "/astrbot-slack-webhook/callback",
                     },
+                    "Line": {
+                        "id": "line",
+                        "type": "line",
+                        "enable": False,
+                        "channel_access_token": "",
+                        "channel_secret": "",
+                        "unified_webhook_mode": True,
+                        "webhook_uuid": "",
+                    },
                     "Satori": {
                         "id": "satori",
                         "type": "satori",
@@ -969,7 +988,7 @@ CONFIG_METADATA_2 = {
                         "api_base": "https://api.anthropic.com/v1",
                         "timeout": 120,
                         "proxy": "",
-                        "anth_thinking_config": {"budget": 0},
+                        "anth_thinking_config": {"type": "", "budget": 0, "effort": ""},
                     },
                     "Moonshot": {
                         "id": "moonshot",
@@ -1020,6 +1039,42 @@ CONFIG_METADATA_2 = {
                         "proxy": "",
                         "custom_headers": {},
                     },
+                    "AIHubMix": {
+                        "id": "aihubmix",
+                        "provider": "aihubmix",
+                        "type": "aihubmix_chat_completion",
+                        "provider_type": "chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "timeout": 120,
+                        "api_base": "https://aihubmix.com/v1",
+                        "proxy": "",
+                        "custom_headers": {},
+                    },
+                    "OpenRouter": {
+                        "id": "openrouter",
+                        "provider": "openrouter",
+                        "type": "openrouter_chat_completion",
+                        "provider_type": "chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "timeout": 120,
+                        "api_base": "https://openrouter.ai/v1",
+                        "proxy": "",
+                        "custom_headers": {},
+                    },
+                    "NVIDIA": {
+                        "id": "nvidia",
+                        "provider": "nvidia",
+                        "type": "openai_chat_completion",
+                        "provider_type": "chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "api_base": "https://integrate.api.nvidia.com/v1",
+                        "timeout": 120,
+                        "proxy": "",
+                        "custom_headers": {},
+                    },
                     "Azure OpenAI": {
                         "id": "azure_openai",
                         "provider": "azure",
@@ -1416,6 +1471,7 @@ CONFIG_METADATA_2 = {
                         "type": "openai_embedding",
                         "provider": "openai",
                         "provider_type": "embedding",
+                        "hint": "provider_group.provider.openai_embedding.hint",
                         "enable": True,
                         "embedding_api_key": "",
                         "embedding_api_base": "",
@@ -1429,6 +1485,7 @@ CONFIG_METADATA_2 = {
                         "type": "gemini_embedding",
                         "provider": "google",
                         "provider_type": "embedding",
+                        "hint": "provider_group.provider.gemini_embedding.hint",
                         "enable": True,
                         "embedding_api_key": "",
                         "embedding_api_base": "",
@@ -1918,13 +1975,25 @@ CONFIG_METADATA_2 = {
                         },
                     },
                     "anth_thinking_config": {
-                        "description": "Thinking Config",
+                        "description": "思考配置",
                         "type": "object",
                         "items": {
+                            "type": {
+                                "description": "思考类型",
+                                "type": "string",
+                                "options": ["", "adaptive"],
+                                "hint": "Opus 4.6+ / Sonnet 4.6+ 推荐设为 'adaptive'。留空则使用手动 budget 模式。参见: https://platform.claude.com/docs/en/build-with-claude/adaptive-thinking",
+                            },
                             "budget": {
-                                "description": "Thinking Budget",
+                                "description": "思考预算",
                                 "type": "int",
-                                "hint": "Anthropic thinking.budget_tokens param. Must >= 1024. See: https://platform.claude.com/docs/en/build-with-claude/extended-thinking",
+                                "hint": "手动 budget_tokens，需 >= 1024。仅在 type 为空时生效。Opus 4.6 / Sonnet 4.6 上已弃用。参见: https://platform.claude.com/docs/en/build-with-claude/extended-thinking",
+                            },
+                            "effort": {
+                                "description": "思考深度",
+                                "type": "string",
+                                "options": ["", "low", "medium", "high", "max"],
+                                "hint": "type 为 'adaptive' 时控制思考深度。默认 'high'。'max' 仅限 Opus 4.6。参见: https://platform.claude.com/docs/en/build-with-claude/effort",
                             },
                         },
                     },
@@ -2133,9 +2202,9 @@ CONFIG_METADATA_2 = {
                         "type": "string",
                     },
                     "proxy": {
-                        "description": "代理地址",
+                        "description": "provider_group.provider.proxy.description",
                         "type": "string",
-                        "hint": "HTTP/HTTPS 代理地址，格式如 http://127.0.0.1:7890。仅对该提供商的 API 请求生效，不影响 Docker 内网通信。",
+                        "hint": "provider_group.provider.proxy.hint",
                     },
                     "model": {
                         "description": "模型 ID",
@@ -2205,6 +2274,10 @@ CONFIG_METADATA_2 = {
                     "default_provider_id": {
                         "type": "string",
                     },
+                    "fallback_chat_models": {
+                        "type": "list",
+                        "items": {"type": "string"},
+                    },
                     "wake_prefix": {
                         "type": "string",
                     },
@@ -2244,6 +2317,9 @@ CONFIG_METADATA_2 = {
                     "show_tool_use_status": {
                         "type": "bool",
                     },
+                    "show_tool_call_result": {
+                        "type": "bool",
+                    },
                     "unsupported_streaming_strategy": {
                         "type": "string",
                     },
@@ -2399,6 +2475,19 @@ CONFIG_METADATA_2 = {
                 "type": "string",
                 "options": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
             },
+            "dashboard.ssl.enable": {"type": "bool"},
+            "dashboard.ssl.cert_file": {
+                "type": "string",
+                "condition": {"dashboard.ssl.enable": True},
+            },
+            "dashboard.ssl.key_file": {
+                "type": "string",
+                "condition": {"dashboard.ssl.enable": True},
+            },
+            "dashboard.ssl.ca_certs": {
+                "type": "string",
+                "condition": {"dashboard.ssl.enable": True},
+            },
             "log_file_enable": {"type": "bool"},
             "log_file_path": {"type": "string", "condition": {"log_file_enable": True}},
             "log_file_max_mb": {"type": "int", "condition": {"log_file_enable": True}},
@@ -2502,15 +2591,22 @@ CONFIG_METADATA_3 = {
             },
             "ai": {
                 "description": "模型",
-                "hint": "当使用非内置 Agent 执行器时，默认聊天模型和默认图片转述模型可能会无效，但某些插件会依赖此配置项来调用 AI 能力。",
+                "hint": "当使用非内置 Agent 执行器时，默认对话模型和默认图片转述模型可能会无效，但某些插件会依赖此配置项来调用 AI 能力。",
                 "type": "object",
                 "items": {
                     "provider_settings.default_provider_id": {
-                        "description": "默认聊天模型",
+                        "description": "默认对话模型",
                         "type": "string",
                         "_special": "select_provider",
                         "hint": "留空时使用第一个模型",
                     },
+                    "provider_settings.fallback_chat_models": {
+                        "description": "回退对话模型列表",
+                        "type": "list",
+                        "items": {"type": "string"},
+                        "_special": "select_providers",
+                        "hint": "主聊天模型请求失败时，按顺序切换到这些模型。",
+                    },
                     "provider_settings.default_image_caption_provider_id": {
                         "description": "默认图片转述模型",
                         "type": "string",
@@ -2680,6 +2776,11 @@ CONFIG_METADATA_3 = {
                         "labels": ["无", "本地", "沙箱"],
                         "hint": "选择 Computer Use 运行环境。",
                     },
+                    "provider_settings.computer_use_require_admin": {
+                        "description": "需要 AstrBot 管理员权限",
+                        "type": "bool",
+                        "hint": "开启后，需要 AstrBot 管理员权限才能调用使用电脑能力。在平台配置->管理员中可添加管理员。使用 /sid 指令查看管理员 ID。",
+                    },
                     "provider_settings.sandbox.booter": {
                         "description": "沙箱环境驱动器",
                         "type": "string",
@@ -2907,6 +3008,15 @@ CONFIG_METADATA_3 = {
                             "provider_settings.agent_runner_type": "local",
                         },
                     },
+                    "provider_settings.show_tool_call_result": {
+                        "description": "输出函数调用返回结果",
+                        "type": "bool",
+                        "hint": "仅在输出函数调用状态启用时生效，展示结果前 70 个字符。",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                            "provider_settings.show_tool_use_status": True,
+                        },
+                    },
                     "provider_settings.sanitize_context_by_modalities": {
                         "description": "按模型能力清理历史上下文",
                         "type": "bool",
@@ -3406,6 +3516,29 @@ CONFIG_METADATA_3_SYSTEM = {
                         "hint": "控制台输出日志的级别。",
                         "options": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
                     },
+                    "dashboard.ssl.enable": {
+                        "description": "启用 WebUI HTTPS",
+                        "type": "bool",
+                        "hint": "启用后，WebUI 将直接使用 HTTPS 提供服务。",
+                    },
+                    "dashboard.ssl.cert_file": {
+                        "description": "SSL 证书文件路径",
+                        "type": "string",
+                        "hint": "证书文件路径（PEM）。支持绝对路径和相对路径（相对于当前工作目录）。",
+                        "condition": {"dashboard.ssl.enable": True},
+                    },
+                    "dashboard.ssl.key_file": {
+                        "description": "SSL 私钥文件路径",
+                        "type": "string",
+                        "hint": "私钥文件路径（PEM）。支持绝对路径和相对路径（相对于当前工作目录）。",
+                        "condition": {"dashboard.ssl.enable": True},
+                    },
+                    "dashboard.ssl.ca_certs": {
+                        "description": "SSL CA 证书文件路径",
+                        "type": "string",
+                        "hint": "可选。用于指定 CA 证书文件路径。",
+                        "condition": {"dashboard.ssl.enable": True},
+                    },
                     "log_file_enable": {
                         "description": "启用文件日志",
                         "type": "bool",

astrbot/core/db/__init__.py

@@ -8,6 +8,7 @@ from deprecated import deprecated
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 
 from astrbot.core.db.po import (
+    ApiKey,
     Attachment,
     ChatUIProject,
     CommandConfig,
@@ -248,6 +249,55 @@ class BaseDatabase(abc.ABC):
         """
         ...
 
+    @abc.abstractmethod
+    async def create_api_key(
+        self,
+        name: str,
+        key_hash: str,
+        key_prefix: str,
+        scopes: list[str] | None,
+        created_by: str,
+        expires_at: datetime.datetime | None = None,
+    ) -> ApiKey:
+        """Create a new API key record."""
+        ...
+
+    @abc.abstractmethod
+    async def list_api_keys(self) -> list[ApiKey]:
+        """List all API keys."""
+        ...
+
+    @abc.abstractmethod
+    async def get_api_key_by_id(self, key_id: str) -> ApiKey | None:
+        """Get an API key by key_id."""
+        ...
+
+    @abc.abstractmethod
+    async def get_active_api_key_by_hash(self, key_hash: str) -> ApiKey | None:
+        """Get an active API key by hash (not revoked, not expired)."""
+        ...
+
+    @abc.abstractmethod
+    async def touch_api_key(self, key_id: str) -> None:
+        """Update last_used_at of an API key."""
+        ...
+
+    @abc.abstractmethod
+    async def revoke_api_key(self, key_id: str) -> bool:
+        """Revoke an API key.
+
+        Returns True when the key exists and is updated.
+        """
+        ...
+
+    @abc.abstractmethod
+    async def delete_api_key(self, key_id: str) -> bool:
+        """Delete an API key.
+
+        Returns True when the key exists and is deleted.
+        """
+        ...
+
     @abc.abstractmethod
     async def insert_persona(
         self,
@@ -608,6 +658,22 @@ class BaseDatabase(abc.ABC):
         """
         ...
 
+    @abc.abstractmethod
+    async def get_platform_sessions_by_creator_paginated(
+        self,
+        creator: str,
+        platform_id: str | None = None,
+        page: int = 1,
+        page_size: int = 20,
+        exclude_project_sessions: bool = False,
+    ) -> tuple[list[dict], int]:
+        """Get paginated platform sessions and total count for a creator.
+
+        Returns:
+            tuple[list[dict], int]: (sessions_with_project_info, total_count)
+        """
+        ...
+
     @abc.abstractmethod
     async def update_platform_session(
         self,

astrbot/core/db/po.py

@@ -288,6 +288,43 @@ class Attachment(TimestampMixin, SQLModel, table=True):
     )
 
 
+class ApiKey(TimestampMixin, SQLModel, table=True):
+    """API keys used by external developers to access Open APIs."""
+
+    __tablename__: str = "api_keys"
+
+    inner_id: int | None = Field(
+        primary_key=True,
+        sa_column_kwargs={"autoincrement": True},
+        default=None,
+    )
+    key_id: str = Field(
+        max_length=36,
+        nullable=False,
+        unique=True,
+        default_factory=lambda: str(uuid.uuid4()),
+    )
+    name: str = Field(max_length=255, nullable=False)
+    key_hash: str = Field(max_length=128, nullable=False, unique=True)
+    key_prefix: str = Field(max_length=24, nullable=False)
+    scopes: list | None = Field(default=None, sa_type=JSON)
+    created_by: str = Field(max_length=255, nullable=False)
+    last_used_at: datetime | None = Field(default=None)
+    expires_at: datetime | None = Field(default=None)
+    revoked_at: datetime | None = Field(default=None)
+
+    __table_args__ = (
+        UniqueConstraint(
+            "key_id",
+            name="uix_api_key_id",
+        ),
+        UniqueConstraint(
+            "key_hash",
+            name="uix_api_key_hash",
+        ),
+    )
+
+
 class ChatUIProject(TimestampMixin, SQLModel, table=True):
     """This class represents projects for organizing ChatUI conversations.
 

astrbot/core/db/sqlite.py

@@ -4,12 +4,13 @@ import typing as T
 from collections.abc import Awaitable, Callable
 from datetime import datetime, timedelta, timezone
 
-from sqlalchemy import CursorResult
+from sqlalchemy import CursorResult, Row
 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 (
+    ApiKey,
     Attachment,
     ChatUIProject,
     CommandConfig,
@@ -573,6 +574,100 @@ class SQLiteDatabase(BaseDatabase):
                 result = T.cast(CursorResult, await session.execute(query))
                 return result.rowcount
 
+    async def create_api_key(
+        self,
+        name: str,
+        key_hash: str,
+        key_prefix: str,
+        scopes: list[str] | None,
+        created_by: str,
+        expires_at: datetime | None = None,
+    ) -> ApiKey:
+        """Create a new API key record."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                api_key = ApiKey(
+                    name=name,
+                    key_hash=key_hash,
+                    key_prefix=key_prefix,
+                    scopes=scopes,
+                    created_by=created_by,
+                    expires_at=expires_at,
+                )
+                session.add(api_key)
+                await session.flush()
+                await session.refresh(api_key)
+                return api_key
+
+    async def list_api_keys(self) -> list[ApiKey]:
+        """List all API keys."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            result = await session.execute(
+                select(ApiKey).order_by(desc(ApiKey.created_at))
+            )
+            return list(result.scalars().all())
+
+    async def get_api_key_by_id(self, key_id: str) -> ApiKey | None:
+        """Get an API key by key_id."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            result = await session.execute(
+                select(ApiKey).where(ApiKey.key_id == key_id)
+            )
+            return result.scalar_one_or_none()
+
+    async def get_active_api_key_by_hash(self, key_hash: str) -> ApiKey | None:
+        """Get an active API key by hash (not revoked, not expired)."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            now = datetime.now(timezone.utc)
+            query = select(ApiKey).where(
+                ApiKey.key_hash == key_hash,
+                col(ApiKey.revoked_at).is_(None),
+                or_(col(ApiKey.expires_at).is_(None), col(ApiKey.expires_at) > now),
+            )
+            result = await session.execute(query)
+            return result.scalar_one_or_none()
+
+    async def touch_api_key(self, key_id: str) -> None:
+        """Update last_used_at of an API key."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                await session.execute(
+                    update(ApiKey)
+                    .where(col(ApiKey.key_id) == key_id)
+                    .values(last_used_at=datetime.now(timezone.utc)),
+                )
+
+    async def revoke_api_key(self, key_id: str) -> bool:
+        """Revoke an API key."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                query = (
+                    update(ApiKey)
+                    .where(col(ApiKey.key_id) == key_id)
+                    .values(revoked_at=datetime.now(timezone.utc))
+                )
+                result = T.cast(CursorResult, await session.execute(query))
+                return result.rowcount > 0
+
+    async def delete_api_key(self, key_id: str) -> bool:
+        """Delete an API key."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                result = T.cast(
+                    CursorResult,
+                    await session.execute(
+                        delete(ApiKey).where(col(ApiKey.key_id) == key_id)
+                    ),
+                )
+                return result.rowcount > 0
+
     async def insert_persona(
         self,
         persona_id,
@@ -1317,58 +1412,102 @@ class SQLiteDatabase(BaseDatabase):
 
         Returns a list of dicts containing session info and project info (if session belongs to a project).
         """
+        (
+            sessions_with_projects,
+            _,
+        ) = await self.get_platform_sessions_by_creator_paginated(
+            creator=creator,
+            platform_id=platform_id,
+            page=page,
+            page_size=page_size,
+            exclude_project_sessions=False,
+        )
+        return sessions_with_projects
+
+    @staticmethod
+    def _build_platform_sessions_query(
+        creator: str,
+        platform_id: str | None = None,
+        exclude_project_sessions: bool = False,
+    ):
+        query = (
+            select(
+                PlatformSession,
+                col(ChatUIProject.project_id),
+                col(ChatUIProject.title).label("project_title"),
+                col(ChatUIProject.emoji).label("project_emoji"),
+            )
+            .outerjoin(
+                SessionProjectRelation,
+                col(PlatformSession.session_id)
+                == col(SessionProjectRelation.session_id),
+            )
+            .outerjoin(
+                ChatUIProject,
+                col(SessionProjectRelation.project_id) == col(ChatUIProject.project_id),
+            )
+            .where(col(PlatformSession.creator) == creator)
+        )
+
+        if platform_id:
+            query = query.where(PlatformSession.platform_id == platform_id)
+        if exclude_project_sessions:
+            query = query.where(col(ChatUIProject.project_id).is_(None))
+
+        return query
+
+    @staticmethod
+    def _rows_to_session_dicts(rows: T.Sequence[Row[tuple]]) -> list[dict]:
+        sessions_with_projects = []
+        for row in rows:
+            platform_session = row[0]
+            project_id = row[1]
+            project_title = row[2]
+            project_emoji = row[3]
+
+            session_dict = {
+                "session": platform_session,
+                "project_id": project_id,
+                "project_title": project_title,
+                "project_emoji": project_emoji,
+            }
+            sessions_with_projects.append(session_dict)
+
+        return sessions_with_projects
+
+    async def get_platform_sessions_by_creator_paginated(
+        self,
+        creator: str,
+        platform_id: str | None = None,
+        page: int = 1,
+        page_size: int = 20,
+        exclude_project_sessions: bool = False,
+    ) -> tuple[list[dict], int]:
+        """Get paginated Platform sessions for a creator with total count."""
         async with self.get_db() as session:
             session: AsyncSession
             offset = (page - 1) * page_size
 
-            # LEFT JOIN with SessionProjectRelation and ChatUIProject to get project info
-            query = (
-                select(
-                    PlatformSession,
-                    col(ChatUIProject.project_id),
-                    col(ChatUIProject.title).label("project_title"),
-                    col(ChatUIProject.emoji).label("project_emoji"),
-                )
-                .outerjoin(
-                    SessionProjectRelation,
-                    col(PlatformSession.session_id)
-                    == col(SessionProjectRelation.session_id),
-                )
-                .outerjoin(
-                    ChatUIProject,
-                    col(SessionProjectRelation.project_id)
-                    == col(ChatUIProject.project_id),
-                )
-                .where(col(PlatformSession.creator) == creator)
+            base_query = self._build_platform_sessions_query(
+                creator=creator,
+                platform_id=platform_id,
+                exclude_project_sessions=exclude_project_sessions,
             )
 
-            if platform_id:
-                query = query.where(PlatformSession.platform_id == platform_id)
+            total_result = await session.execute(
+                select(func.count()).select_from(base_query.subquery())
+            )
+            total = int(total_result.scalar_one() or 0)
 
-            query = (
-                query.order_by(desc(PlatformSession.updated_at))
+            result_query = (
+                base_query.order_by(desc(PlatformSession.updated_at))
                 .offset(offset)
                 .limit(page_size)
             )
-            result = await session.execute(query)
+            result = await session.execute(result_query)
 
-            # Convert to list of dicts with session and project info
-            sessions_with_projects = []
-            for row in result.all():
-                platform_session = row[0]
-                project_id = row[1]
-                project_title = row[2]
-                project_emoji = row[3]
-
-                session_dict = {
-                    "session": platform_session,
-                    "project_id": project_id,
-                    "project_title": project_title,
-                    "project_emoji": project_emoji,
-                }
-                sessions_with_projects.append(session_dict)
-
-            return sessions_with_projects
+            sessions_with_projects = self._rows_to_session_dicts(result.all())
+            return sessions_with_projects, total
 
     async def update_platform_session(
         self,

astrbot/core/knowledge_base/kb_db_sqlite.py

@@ -13,16 +13,19 @@ from astrbot.core.knowledge_base.models import (
     KBMedia,
     KnowledgeBase,
 )
+from astrbot.core.utils.astrbot_path import get_astrbot_knowledge_base_path
 
 
 class KBSQLiteDatabase:
-    def __init__(self, db_path: str = "data/knowledge_base/kb.db") -> None:
+    def __init__(self, db_path: str | None = None) -> None:
         """初始化知识库数据库
 
         Args:
-            db_path: 数据库文件路径, 默认为 data/knowledge_base/kb.db
+            db_path: 数据库文件路径, 默认位于 AstrBot 数据目录下的 knowledge_base/kb.db
 
         """
+        if db_path is None:
+            db_path = str(Path(get_astrbot_knowledge_base_path()) / "kb.db")
         self.db_path = db_path
         self.DATABASE_URL = f"sqlite+aiosqlite:///{db_path}"
         self.inited = False
@@ -253,6 +256,46 @@ class KBSQLiteDatabase:
                 "knowledge_base": row[1],
             }
 
+    async def get_documents_with_metadata_batch(
+        self, doc_ids: set[str]
+    ) -> dict[str, dict]:
+        """批量获取文档及其所属知识库元数据
+
+        Args:
+            doc_ids: 文档 ID 集合
+
+        Returns:
+            dict: doc_id -> {"document": KBDocument, "knowledge_base": KnowledgeBase}
+
+        """
+        if not doc_ids:
+            return {}
+
+        metadata_map: dict[str, dict] = {}
+        # SQLite 参数上限为 999，分片查询避免超限
+        chunk_size = 900
+        doc_id_list = list(doc_ids)
+
+        async with self.get_db() as session:
+            for i in range(0, len(doc_id_list), chunk_size):
+                chunk = doc_id_list[i : i + chunk_size]
+                stmt = (
+                    select(KBDocument, KnowledgeBase)
+                    .join(
+                        KnowledgeBase,
+                        col(KBDocument.kb_id) == col(KnowledgeBase.kb_id),
+                    )
+                    .where(col(KBDocument.doc_id).in_(chunk))
+                )
+                result = await session.execute(stmt)
+                for row in result.all():
+                    metadata_map[row[0].doc_id] = {
+                        "document": row[0],
+                        "knowledge_base": row[1],
+                    }
+
+        return metadata_map
+
     async def delete_document_by_id(self, doc_id: str, vec_db: FaissVecDB) -> None:
         """删除单个文档及其相关数据"""
         # 在知识库表中删除

astrbot/core/knowledge_base/kb_mgr.py

@@ -3,6 +3,7 @@ from pathlib import Path
 
 from astrbot.core import logger
 from astrbot.core.provider.manager import ProviderManager
+from astrbot.core.utils.astrbot_path import get_astrbot_knowledge_base_path
 
 # from .chunking.fixed_size import FixedSizeChunker
 from .chunking.recursive import RecursiveCharacterChunker
@@ -13,7 +14,7 @@ from .retrieval.manager import RetrievalManager, RetrievalResult
 from .retrieval.rank_fusion import RankFusion
 from .retrieval.sparse_retriever import SparseRetriever
 
-FILES_PATH = "data/knowledge_base"
+FILES_PATH = get_astrbot_knowledge_base_path()
 DB_PATH = Path(FILES_PATH) / "kb.db"
 """Knowledge Base storage root directory"""
 CHUNKER = RecursiveCharacterChunker()
@@ -27,7 +28,7 @@ class KnowledgeBaseManager:
         self,
         provider_manager: ProviderManager,
     ) -> None:
-        Path(DB_PATH).parent.mkdir(parents=True, exist_ok=True)
+        DB_PATH.parent.mkdir(parents=True, exist_ok=True)
         self.provider_manager = provider_manager
         self._session_deleted_callback_registered = False
 

astrbot/core/knowledge_base/retrieval/manager.py

@@ -142,10 +142,13 @@ class RetrievalManager:
             f"Rank fusion took {time_end - time_start:.2f}s and returned {len(fused_results)} results.",
         )
 
-        # 4. 转换为 RetrievalResult (获取元数据)
+        # 4. 转换为 RetrievalResult (批量获取元数据)
+        doc_ids = {fr.doc_id for fr in fused_results}
+        metadata_map = await self.kb_db.get_documents_with_metadata_batch(doc_ids)
+
         retrieval_results = []
         for fr in fused_results:
-            metadata_dict = await self.kb_db.get_document_with_metadata(fr.doc_id)
+            metadata_dict = metadata_map.get(fr.doc_id)
             if metadata_dict:
                 retrieval_results.append(
                     RetrievalResult(

astrbot/core/log.py

@@ -1,24 +1,4 @@
-"""日志系统, 用于支持核心组件和插件的日志记录, 提供了日志订阅功能
-
-const:
-    CACHED_SIZE: 日志缓存大小, 用于限制缓存的日志数量
-    log_color_config: 日志颜色配置, 定义了不同日志级别的颜色
-
-class:
-    LogBroker: 日志代理类, 用于缓存和分发日志消息
-    LogQueueHandler: 日志处理器, 用于将日志消息发送到 LogBroker
-    LogManager: 日志管理器, 用于创建和配置日志记录器
-
-function:
-    is_plugin_path: 检查文件路径是否来自插件目录
-    get_short_level_name: 将日志级别名称转换为四个字母的缩写
-
-工作流程:
-1. 通过 LogManager.GetLogger() 获取日志器, 配置了控制台输出和多个格式化过滤器
-2. 通过 set_queue_handler() 设置日志处理器, 将日志消息发送到 LogBroker
-3. logBroker 维护一个订阅者列表, 负责将日志分发给所有订阅者
-4. 订阅者可以使用 register() 方法注册到 LogBroker, 订阅日志流
-"""
+"""日志系统，统一将标准 logging 输出转发到 loguru。"""
 
 import asyncio
 import logging
@@ -27,54 +7,59 @@ import sys
 import time
 from asyncio import Queue
 from collections import deque
-from logging.handlers import RotatingFileHandler
+from typing import TYPE_CHECKING
 
-import colorlog
+from loguru import logger as _raw_loguru_logger
 
 from astrbot.core.config.default import VERSION
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-# 日志缓存大小
 CACHED_SIZE = 500
-# 日志颜色配置
-log_color_config = {
-    "DEBUG": "green",
-    "INFO": "bold_cyan",
-    "WARNING": "bold_yellow",
-    "ERROR": "red",
-    "CRITICAL": "bold_red",
-    "RESET": "reset",
-    "asctime": "green",
-}
+
+if TYPE_CHECKING:
+    from loguru import Record
 
 
-def is_plugin_path(pathname):
-    """检查文件路径是否来自插件目录
+class _RecordEnricherFilter(logging.Filter):
+    """为 logging.LogRecord 注入 AstrBot 日志字段。"""
 
-    Args:
-        pathname (str): 文件路径
+    def filter(self, record: logging.LogRecord) -> bool:
+        record.plugin_tag = "[Plug]" if _is_plugin_path(record.pathname) else "[Core]"
+        record.short_levelname = _get_short_level_name(record.levelname)
+        record.astrbot_version_tag = (
+            f" [v{VERSION}]" if record.levelno >= logging.WARNING else ""
+        )
+        record.source_file = _build_source_file(record.pathname)
+        record.source_line = record.lineno
+        record.is_trace = record.name == "astrbot.trace"
+        return True
 
-    Returns:
-        bool: 如果路径来自插件目录，则返回 True，否则返回 False
 
-    """
+class _QueueAnsiColorFilter(logging.Filter):
+    """Attach ANSI color prefix for WebUI console rendering."""
+
+    _LEVEL_COLOR = {
+        "DEBUG": "\u001b[1;34m",
+        "INFO": "\u001b[1;36m",
+        "WARNING": "\u001b[1;33m",
+        "ERROR": "\u001b[31m",
+        "CRITICAL": "\u001b[1;31m",
+    }
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        record.ansi_prefix = self._LEVEL_COLOR.get(record.levelname, "\u001b[0m")
+        record.ansi_reset = "\u001b[0m"
+        return True
+
+
+def _is_plugin_path(pathname: str | None) -> bool:
     if not pathname:
         return False
-
     norm_path = os.path.normpath(pathname)
     return ("data/plugins" in norm_path) or ("astrbot/builtin_stars/" in norm_path)
 
 
-def get_short_level_name(level_name):
-    """将日志级别名称转换为四个字母的缩写
-
-    Args:
-        level_name (str): 日志级别名称, 如 "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"
-
-    Returns:
-        str: 四个字母的日志级别缩写
-
-    """
+def _get_short_level_name(level_name: str) -> str:
     level_map = {
         "DEBUG": "DBUG",
         "INFO": "INFO",
@@ -85,44 +70,75 @@ def get_short_level_name(level_name):
     return level_map.get(level_name, level_name[:4].upper())
 
 
-class LogBroker:
-    """日志代理类, 用于缓存和分发日志消息
+def _build_source_file(pathname: str | None) -> str:
+    if not pathname:
+        return "unknown"
+    dirname = os.path.dirname(pathname)
+    return (
+        os.path.basename(dirname) + "." + os.path.basename(pathname).replace(".py", "")
+    )
 
-    发布-订阅模式
-    """
+
+def _patch_record(record: "Record") -> None:
+    extra = record["extra"]
+    extra.setdefault("plugin_tag", "[Core]")
+    extra.setdefault("short_levelname", _get_short_level_name(record["level"].name))
+    level_no = record["level"].no
+    extra.setdefault("astrbot_version_tag", f" [v{VERSION}]" if level_no >= 30 else "")
+    extra.setdefault("source_file", _build_source_file(record["file"].path))
+    extra.setdefault("source_line", record["line"])
+    extra.setdefault("is_trace", False)
+
+
+_loguru = _raw_loguru_logger.patch(_patch_record)
+
+
+class _LoguruInterceptHandler(logging.Handler):
+    """将 logging 记录转发到 loguru。"""
+
+    def emit(self, record: logging.LogRecord) -> None:
+        try:
+            level: str | int = _loguru.level(record.levelname).name
+        except ValueError:
+            level = record.levelno
+
+        payload = {
+            "plugin_tag": getattr(record, "plugin_tag", "[Core]"),
+            "short_levelname": getattr(
+                record,
+                "short_levelname",
+                _get_short_level_name(record.levelname),
+            ),
+            "astrbot_version_tag": getattr(record, "astrbot_version_tag", ""),
+            "source_file": getattr(
+                record, "source_file", _build_source_file(record.pathname)
+            ),
+            "source_line": getattr(record, "source_line", record.lineno),
+            "is_trace": getattr(record, "is_trace", record.name == "astrbot.trace"),
+        }
+
+        _loguru.bind(**payload).opt(exception=record.exc_info).log(
+            level,
+            record.getMessage(),
+        )
+
+
+class LogBroker:
+    """日志代理类，用于缓存和分发日志消息。"""
 
     def __init__(self) -> None:
-        self.log_cache = deque(maxlen=CACHED_SIZE)  # 环形缓冲区, 保存最近的日志
-        self.subscribers: list[Queue] = []  # 订阅者列表
+        self.log_cache = deque(maxlen=CACHED_SIZE)
+        self.subscribers: list[Queue] = []
 
     def register(self) -> Queue:
-        """注册新的订阅者, 并给每个订阅者返回一个带有日志缓存的队列
-
-        Returns:
-            Queue: 订阅者的队列, 可用于接收日志消息
-
-        """
         q = Queue(maxsize=CACHED_SIZE + 10)
         self.subscribers.append(q)
         return q
 
     def unregister(self, q: Queue) -> None:
-        """取消订阅
-
-        Args:
-            q (Queue): 需要取消订阅的队列
-
-        """
         self.subscribers.remove(q)
 
     def publish(self, log_entry: dict) -> None:
-        """发布新日志到所有订阅者, 使用非阻塞方式投递, 避免一个订阅者阻塞整个系统
-
-        Args:
-            log_entry (dict): 日志消息, 包含日志级别和日志内容.
-                example: {"level": "INFO", "data": "This is a log message.", "time": "2023-10-01 12:00:00"}
-
-        """
         self.log_cache.append(log_entry)
         for q in self.subscribers:
             try:
@@ -132,23 +148,13 @@ class LogBroker:
 
 
 class LogQueueHandler(logging.Handler):
-    """日志处理器, 用于将日志消息发送到 LogBroker
-
-    继承自 logging.Handler
-    """
+    """日志处理器，用于将日志消息发送到 LogBroker。"""
 
     def __init__(self, log_broker: LogBroker) -> None:
         super().__init__()
         self.log_broker = log_broker
 
-    def emit(self, record) -> None:
-        """日志处理的入口方法, 接受一个日志记录, 转换为字符串后由 LogBroker 发布
-        这个方法会在每次日志记录时被调用
-
-        Args:
-            record (logging.LogRecord): 日志记录对象, 包含日志信息
-
-        """
+    def emit(self, record: logging.LogRecord) -> None:
         log_entry = self.format(record)
         self.log_broker.publish(
             {
@@ -160,117 +166,16 @@ class LogQueueHandler(logging.Handler):
 
 
 class LogManager:
-    """日志管理器, 用于创建和配置日志记录器
+    _LOGGER_HANDLER_FLAG = "_astrbot_loguru_handler"
+    _ENRICH_FILTER_FLAG = "_astrbot_enrich_filter"
 
-    提供了获取默认日志记录器logger和设置队列处理器的方法
-    """
-
-    _FILE_HANDLER_FLAG = "_astrbot_file_handler"
-    _TRACE_FILE_HANDLER_FLAG = "_astrbot_trace_file_handler"
-
-    @classmethod
-    def GetLogger(cls, log_name: str = "default"):
-        """获取指定名称的日志记录器logger
-
-        Args:
-            log_name (str): 日志记录器的名称, 默认为 "default"
-
-        Returns:
-            logging.Logger: 返回配置好的日志记录器
-
-        """
-        logger = logging.getLogger(log_name)
-        # 检查该logger或父级logger是否已经有处理器, 如果已经有处理器, 直接返回该logger, 避免重复配置
-        if logger.hasHandlers():
-            return logger
-        # 如果logger没有处理器
-        console_handler = logging.StreamHandler(
-            sys.stdout,
-        )  # 创建一个StreamHandler用于控制台输出
-        console_handler.setLevel(
-            logging.DEBUG,
-        )  # 将日志级别设置为DEBUG(最低级别, 显示所有日志), *如果插件没有设置级别, 默认为DEBUG
-
-        # 创建彩色日志格式化器, 输出日志格式为: [时间] [插件标签] [日志级别] [文件名:行号]: 日志消息
-        console_formatter = colorlog.ColoredFormatter(
-            fmt="%(log_color)s [%(asctime)s] %(plugin_tag)s [%(short_levelname)-4s]%(astrbot_version_tag)s [%(filename)s:%(lineno)d]: %(message)s %(reset)s",
-            datefmt="%H:%M:%S",
-            log_colors=log_color_config,
-        )
-
-        class PluginFilter(logging.Filter):
-            """插件过滤器类, 用于标记日志来源是插件还是核心组件"""
-
-            def filter(self, record) -> bool:
-                record.plugin_tag = (
-                    "[Plug]" if is_plugin_path(record.pathname) else "[Core]"
-                )
-                return True
-
-        class FileNameFilter(logging.Filter):
-            """文件名过滤器类, 用于修改日志记录的文件名格式
-            例如: 将文件路径 /path/to/file.py 转换为 file.<file> 格式
-            """
-
-            # 获取这个文件和父文件夹的名字：<folder>.<file> 并且去除 .py
-            def filter(self, record) -> bool:
-                dirname = os.path.dirname(record.pathname)
-                record.filename = (
-                    os.path.basename(dirname)
-                    + "."
-                    + os.path.basename(record.pathname).replace(".py", "")
-                )
-                return True
-
-        class LevelNameFilter(logging.Filter):
-            """短日志级别名称过滤器类, 用于将日志级别名称转换为四个字母的缩写"""
-
-            # 添加短日志级别名称
-            def filter(self, record) -> bool:
-                record.short_levelname = get_short_level_name(record.levelname)
-                return True
-
-        class AstrBotVersionTagFilter(logging.Filter):
-            """在 WARNING 及以上级别日志后追加当前 AstrBot 版本号。"""
-
-            def filter(self, record) -> bool:
-                if record.levelno >= logging.WARNING:
-                    record.astrbot_version_tag = f" [v{VERSION}]"
-                else:
-                    record.astrbot_version_tag = ""
-                return True
-
-        console_handler.setFormatter(console_formatter)  # 设置处理器的格式化器
-        logger.addFilter(PluginFilter())  # 添加插件过滤器
-        logger.addFilter(FileNameFilter())  # 添加文件名过滤器
-        logger.addFilter(LevelNameFilter())  # 添加级别名称过滤器
-        logger.addFilter(AstrBotVersionTagFilter())  # 追加版本号（WARNING 及以上）
-        logger.setLevel(logging.DEBUG)  # 设置日志级别为DEBUG
-        logger.addHandler(console_handler)  # 添加处理器到logger
-
-        return logger
-
-    @classmethod
-    def set_queue_handler(cls, logger: logging.Logger, log_broker: LogBroker) -> None:
-        """设置队列处理器, 用于将日志消息发送到 LogBroker
-
-        Args:
-            logger (logging.Logger): 日志记录器
-            log_broker (LogBroker): 日志代理类, 用于缓存和分发日志消息
-
-        """
-        handler = LogQueueHandler(log_broker)
-        handler.setLevel(logging.DEBUG)
-        if logger.handlers:
-            handler.setFormatter(logger.handlers[0].formatter)
-        else:
-            # 为队列处理器设置相同格式的formatter
-            handler.setFormatter(
-                logging.Formatter(
-                    "[%(asctime)s] [%(short_levelname)s] %(plugin_tag)s[%(filename)s:%(lineno)d]: %(message)s",
-                ),
-            )
-        logger.addHandler(handler)
+    _configured = False
+    _console_sink_id: int | None = None
+    _file_sink_id: int | None = None
+    _trace_sink_id: int | None = None
+    _NOISY_LOGGER_LEVELS: dict[str, int] = {
+        "aiosqlite": logging.WARNING,
+    }
 
     @classmethod
     def _default_log_path(cls) -> str:
@@ -285,79 +190,147 @@ class LogManager:
         return os.path.join(get_astrbot_data_path(), configured_path)
 
     @classmethod
-    def _get_file_handlers(cls, logger: logging.Logger) -> list[logging.Handler]:
-        return [
-            handler
-            for handler in logger.handlers
-            if getattr(handler, cls._FILE_HANDLER_FLAG, False)
-        ]
+    def _setup_loguru(cls) -> None:
+        if cls._configured:
+            return
 
-    @classmethod
-    def _get_trace_file_handlers(cls, logger: logging.Logger) -> list[logging.Handler]:
-        return [
-            handler
-            for handler in logger.handlers
-            if getattr(handler, cls._TRACE_FILE_HANDLER_FLAG, False)
-        ]
-
-    @classmethod
-    def _remove_file_handlers(cls, logger: logging.Logger) -> None:
-        for handler in cls._get_file_handlers(logger):
-            logger.removeHandler(handler)
-            try:
-                handler.close()
-            except Exception:
-                pass
-
-    @classmethod
-    def _remove_trace_file_handlers(cls, logger: logging.Logger) -> None:
-        for handler in cls._get_trace_file_handlers(logger):
-            logger.removeHandler(handler)
-            try:
-                handler.close()
-            except Exception:
-                pass
-
-    @classmethod
-    def _add_file_handler(
-        cls,
-        logger: logging.Logger,
-        file_path: str,
-        max_mb: int | None = None,
-        backup_count: int = 3,
-        trace: bool = False,
-    ) -> None:
-        os.makedirs(os.path.dirname(file_path) or ".", exist_ok=True)
-        max_bytes = 0
-        if max_mb and max_mb > 0:
-            max_bytes = max_mb * 1024 * 1024
-        if max_bytes > 0:
-            file_handler = RotatingFileHandler(
-                file_path,
-                maxBytes=max_bytes,
-                backupCount=backup_count,
-                encoding="utf-8",
-            )
-        else:
-            file_handler = logging.FileHandler(file_path, encoding="utf-8")
-        file_handler.setLevel(logger.level)
-        if trace:
-            formatter = logging.Formatter(
-                "[%(asctime)s] %(message)s",
-                datefmt="%Y-%m-%d %H:%M:%S",
-            )
-        else:
-            formatter = logging.Formatter(
-                "[%(asctime)s] %(plugin_tag)s [%(short_levelname)s]%(astrbot_version_tag)s [%(filename)s:%(lineno)d]: %(message)s",
-                datefmt="%Y-%m-%d %H:%M:%S",
-            )
-        file_handler.setFormatter(formatter)
-        setattr(
-            file_handler,
-            cls._TRACE_FILE_HANDLER_FLAG if trace else cls._FILE_HANDLER_FLAG,
-            True,
+        _loguru.remove()
+        cls._console_sink_id = _loguru.add(
+            sys.stdout,
+            level="DEBUG",
+            colorize=True,
+            filter=lambda record: not record["extra"].get("is_trace", False),
+            format=(
+                "<green>[{time:HH:mm:ss.SSS}]</green> {extra[plugin_tag]} "
+                "<level>[{extra[short_levelname]}]</level>{extra[astrbot_version_tag]} "
+                "[{extra[source_file]}:{extra[source_line]}]: <level>{message}</level>"
+            ),
+        )
+        cls._configured = True
+
+    @classmethod
+    def _setup_root_bridge(cls) -> None:
+        root_logger = logging.getLogger()
+
+        has_handler = any(
+            getattr(handler, cls._LOGGER_HANDLER_FLAG, False)
+            for handler in root_logger.handlers
+        )
+        if not has_handler:
+            handler = _LoguruInterceptHandler()
+            setattr(handler, cls._LOGGER_HANDLER_FLAG, True)
+            root_logger.addHandler(handler)
+        root_logger.setLevel(logging.DEBUG)
+        for name, level in cls._NOISY_LOGGER_LEVELS.items():
+            logging.getLogger(name).setLevel(level)
+
+    @classmethod
+    def _ensure_logger_enricher_filter(cls, logger: logging.Logger) -> None:
+        has_filter = any(
+            getattr(existing_filter, cls._ENRICH_FILTER_FLAG, False)
+            for existing_filter in logger.filters
+        )
+        if not has_filter:
+            enrich_filter = _RecordEnricherFilter()
+            setattr(enrich_filter, cls._ENRICH_FILTER_FLAG, True)
+            logger.addFilter(enrich_filter)
+
+    @classmethod
+    def _ensure_logger_intercept_handler(cls, logger: logging.Logger) -> None:
+        has_handler = any(
+            getattr(handler, cls._LOGGER_HANDLER_FLAG, False)
+            for handler in logger.handlers
+        )
+        if not has_handler:
+            handler = _LoguruInterceptHandler()
+            setattr(handler, cls._LOGGER_HANDLER_FLAG, True)
+            logger.addHandler(handler)
+
+    @classmethod
+    def GetLogger(cls, log_name: str = "default") -> logging.Logger:
+        cls._setup_loguru()
+        cls._setup_root_bridge()
+
+        logger = logging.getLogger(log_name)
+        cls._ensure_logger_enricher_filter(logger)
+        cls._ensure_logger_intercept_handler(logger)
+        logger.setLevel(logging.DEBUG)
+        logger.propagate = False
+        return logger
+
+    @classmethod
+    def set_queue_handler(cls, logger: logging.Logger, log_broker: LogBroker) -> None:
+        cls._ensure_logger_enricher_filter(logger)
+
+        for handler in logger.handlers:
+            if isinstance(handler, LogQueueHandler):
+                return
+
+        handler = LogQueueHandler(log_broker)
+        handler.setLevel(logging.DEBUG)
+        handler.addFilter(_QueueAnsiColorFilter())
+        handler.setFormatter(
+            logging.Formatter(
+                "%(ansi_prefix)s[%(asctime)s.%(msecs)03d] %(plugin_tag)s [%(short_levelname)s]%(astrbot_version_tag)s "
+                "[%(source_file)s:%(source_line)d]: %(message)s%(ansi_reset)s",
+                datefmt="%Y-%m-%d %H:%M:%S",
+            ),
+        )
+        logger.addHandler(handler)
+
+    @classmethod
+    def _remove_sink(cls, sink_id: int | None) -> None:
+        if sink_id is None:
+            return
+        try:
+            _loguru.remove(sink_id)
+        except ValueError:
+            pass
+
+    @classmethod
+    def _add_file_sink(
+        cls,
+        *,
+        file_path: str,
+        level: int,
+        max_mb: int | None,
+        backup_count: int,
+        trace: bool,
+    ) -> int:
+        os.makedirs(os.path.dirname(file_path) or ".", exist_ok=True)
+        rotation = f"{max_mb} MB" if max_mb and max_mb > 0 else None
+        retention = (
+            backup_count if rotation and backup_count and backup_count > 0 else None
+        )
+        if trace:
+            return _loguru.add(
+                file_path,
+                level="INFO",
+                format="[{time:YYYY-MM-DD HH:mm:ss.SSS}] {message}",
+                encoding="utf-8",
+                rotation=rotation,
+                retention=retention,
+                enqueue=True,
+                filter=lambda record: record["extra"].get("is_trace", False),
+            )
+
+        logging_level_name = logging.getLevelName(level)
+        if isinstance(logging_level_name, int):
+            logging_level_name = "INFO"
+        return _loguru.add(
+            file_path,
+            level=logging_level_name,
+            format=(
+                "[{time:YYYY-MM-DD HH:mm:ss.SSS}] {extra[plugin_tag]} "
+                "[{extra[short_levelname]}]{extra[astrbot_version_tag]} "
+                "[{extra[source_file]}:{extra[source_line]}]: {message}"
+            ),
+            encoding="utf-8",
+            rotation=rotation,
+            retention=retention,
+            enqueue=True,
+            filter=lambda record: not record["extra"].get("is_trace", False),
         )
-        logger.addHandler(file_handler)
 
     @classmethod
     def configure_logger(
@@ -366,13 +339,6 @@ class LogManager:
         config: dict | None,
         override_level: str | None = None,
     ) -> None:
-        """根据配置设置日志级别和文件日志。
-
-        Args:
-            logger: 需要配置的 logger
-            config: 配置字典
-            override_level: 若提供，将覆盖配置中的日志级别
-        """
         if not config:
             return
 
@@ -383,7 +349,6 @@ class LogManager:
             except Exception:
                 logger.setLevel(logging.INFO)
 
-        # 兼容旧版嵌套配置
         if "log_file" in config:
             file_conf = config.get("log_file") or {}
             enable_file = bool(file_conf.get("enable", False))
@@ -394,27 +359,25 @@ class LogManager:
             file_path = config.get("log_file_path")
             max_mb = config.get("log_file_max_mb")
 
-        file_path = cls._resolve_log_path(file_path)
+        cls._remove_sink(cls._file_sink_id)
+        cls._file_sink_id = None
 
-        existing = cls._get_file_handlers(logger)
         if not enable_file:
-            cls._remove_file_handlers(logger)
             return
 
-        # 如果已有文件处理器且路径一致，则仅同步级别
-        if existing:
-            handler = existing[0]
-            base = getattr(handler, "baseFilename", "")
-            if base and os.path.abspath(base) == os.path.abspath(file_path):
-                handler.setLevel(logger.level)
-                return
-            cls._remove_file_handlers(logger)
-
-        cls._add_file_handler(logger, file_path, max_mb=max_mb)
+        try:
+            cls._file_sink_id = cls._add_file_sink(
+                file_path=cls._resolve_log_path(file_path),
+                level=logger.level,
+                max_mb=max_mb,
+                backup_count=3,
+                trace=False,
+            )
+        except Exception as e:
+            logger.error(f"Failed to add file sink: {e}")
 
     @classmethod
     def configure_trace_logger(cls, config: dict | None) -> None:
-        """为 trace 事件配置独立的文件日志，不向控制台输出。"""
         if not config:
             return
 
@@ -429,28 +392,22 @@ class LogManager:
             path = path or legacy.get("trace_path")
             max_mb = max_mb or legacy.get("trace_max_mb")
 
-        if not enable:
-            trace_logger = logging.getLogger("astrbot.trace")
-            cls._remove_trace_file_handlers(trace_logger)
-            return
-
-        file_path = cls._resolve_log_path(path or "logs/astrbot.trace.log")
         trace_logger = logging.getLogger("astrbot.trace")
+        cls._ensure_logger_enricher_filter(trace_logger)
+        cls._ensure_logger_intercept_handler(trace_logger)
         trace_logger.setLevel(logging.INFO)
         trace_logger.propagate = False
 
-        existing = cls._get_trace_file_handlers(trace_logger)
-        if existing:
-            handler = existing[0]
-            base = getattr(handler, "baseFilename", "")
-            if base and os.path.abspath(base) == os.path.abspath(file_path):
-                handler.setLevel(trace_logger.level)
-                return
-            cls._remove_trace_file_handlers(trace_logger)
+        cls._remove_sink(cls._trace_sink_id)
+        cls._trace_sink_id = None
 
-        cls._add_file_handler(
-            trace_logger,
-            file_path,
+        if not enable:
+            return
+
+        cls._trace_sink_id = cls._add_file_sink(
+            file_path=cls._resolve_log_path(path or "logs/astrbot.trace.log"),
+            level=logging.INFO,
             max_mb=max_mb,
+            backup_count=3,
             trace=True,
         )

astrbot/core/message/components.py

@@ -25,10 +25,14 @@ import asyncio
 import base64
 import json
 import os
+import sys
 import uuid
 from enum import Enum
 
-from pydantic.v1 import BaseModel
+if sys.version_info >= (3, 14):
+    from pydantic import BaseModel
+else:
+    from pydantic.v1 import BaseModel
 
 from astrbot.core import astrbot_config, file_token_service, logger
 from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
@@ -85,7 +89,7 @@ class BaseMessageComponent(BaseModel):
 
 
 class Plain(BaseMessageComponent):
-    type = ComponentType.Plain
+    type: ComponentType = ComponentType.Plain
     text: str
     convert: bool | None = True
 
@@ -100,7 +104,7 @@ class Plain(BaseMessageComponent):
 
 
 class Face(BaseMessageComponent):
-    type = ComponentType.Face
+    type: ComponentType = ComponentType.Face
     id: int
 
     def __init__(self, **_) -> None:
@@ -108,13 +112,15 @@ class Face(BaseMessageComponent):
 
 
 class Record(BaseMessageComponent):
-    type = ComponentType.Record
+    type: ComponentType = ComponentType.Record
     file: str | None = ""
     magic: bool | None = False
     url: str | None = ""
     cache: bool | None = True
     proxy: bool | None = True
     timeout: int | None = 0
+    # Original text content (e.g. TTS source text), used as caption in fallback scenarios
+    text: str | None = None
     # 额外
     path: str | None
 
@@ -215,7 +221,7 @@ class Record(BaseMessageComponent):
 
 
 class Video(BaseMessageComponent):
-    type = ComponentType.Video
+    type: ComponentType = ComponentType.Video
     file: str
     cover: str | None = ""
     c: int | None = 2
@@ -301,7 +307,7 @@ class Video(BaseMessageComponent):
 
 
 class At(BaseMessageComponent):
-    type = ComponentType.At
+    type: ComponentType = ComponentType.At
     qq: int | str  # 此处str为all时代表所有人
     name: str | None = ""
 
@@ -323,28 +329,28 @@ class AtAll(At):
 
 
 class RPS(BaseMessageComponent):  # TODO
-    type = ComponentType.RPS
+    type: ComponentType = ComponentType.RPS
 
     def __init__(self, **_) -> None:
         super().__init__(**_)
 
 
 class Dice(BaseMessageComponent):  # TODO
-    type = ComponentType.Dice
+    type: ComponentType = ComponentType.Dice
 
     def __init__(self, **_) -> None:
         super().__init__(**_)
 
 
 class Shake(BaseMessageComponent):  # TODO
-    type = ComponentType.Shake
+    type: ComponentType = ComponentType.Shake
 
     def __init__(self, **_) -> None:
         super().__init__(**_)
 
 
 class Share(BaseMessageComponent):
-    type = ComponentType.Share
+    type: ComponentType = ComponentType.Share
     url: str
     title: str
     content: str | None = ""
@@ -355,7 +361,7 @@ class Share(BaseMessageComponent):
 
 
 class Contact(BaseMessageComponent):  # TODO
-    type = ComponentType.Contact
+    type: ComponentType = ComponentType.Contact
     _type: str  # type 字段冲突
     id: int | None = 0
 
@@ -364,7 +370,7 @@ class Contact(BaseMessageComponent):  # TODO
 
 
 class Location(BaseMessageComponent):  # TODO
-    type = ComponentType.Location
+    type: ComponentType = ComponentType.Location
     lat: float
     lon: float
     title: str | None = ""
@@ -375,7 +381,7 @@ class Location(BaseMessageComponent):  # TODO
 
 
 class Music(BaseMessageComponent):
-    type = ComponentType.Music
+    type: ComponentType = ComponentType.Music
     _type: str
     id: int | None = 0
     url: str | None = ""
@@ -392,7 +398,7 @@ class Music(BaseMessageComponent):
 
 
 class Image(BaseMessageComponent):
-    type = ComponentType.Image
+    type: ComponentType = ComponentType.Image
     file: str | None = ""
     _type: str | None = ""
     subType: int | None = 0
@@ -507,7 +513,7 @@ class Image(BaseMessageComponent):
 
 
 class Reply(BaseMessageComponent):
-    type = ComponentType.Reply
+    type: ComponentType = ComponentType.Reply
     id: str | int
     """所引用的消息 ID"""
     chain: list["BaseMessageComponent"] | None = []
@@ -543,7 +549,7 @@ class Poke(BaseMessageComponent):
 
 
 class Forward(BaseMessageComponent):
-    type = ComponentType.Forward
+    type: ComponentType = ComponentType.Forward
     id: str
 
     def __init__(self, **_) -> None:
@@ -553,7 +559,7 @@ class Forward(BaseMessageComponent):
 class Node(BaseMessageComponent):
     """群合并转发消息"""
 
-    type = ComponentType.Node
+    type: ComponentType = ComponentType.Node
     id: int | None = 0  # 忽略
     name: str | None = ""  # qq昵称
     uin: str | None = "0"  # qq号
@@ -605,7 +611,7 @@ class Node(BaseMessageComponent):
 
 
 class Nodes(BaseMessageComponent):
-    type = ComponentType.Nodes
+    type: ComponentType = ComponentType.Nodes
     nodes: list[Node]
 
     def __init__(self, nodes: list[Node], **_) -> None:
@@ -631,7 +637,7 @@ class Nodes(BaseMessageComponent):
 
 
 class Json(BaseMessageComponent):
-    type = ComponentType.Json
+    type: ComponentType = ComponentType.Json
     data: dict
 
     def __init__(self, data: str | dict, **_) -> None:
@@ -641,14 +647,14 @@ class Json(BaseMessageComponent):
 
 
 class Unknown(BaseMessageComponent):
-    type = ComponentType.Unknown
+    type: ComponentType = ComponentType.Unknown
     text: str
 
 
 class File(BaseMessageComponent):
     """文件消息段"""
 
-    type = ComponentType.File
+    type: ComponentType = ComponentType.File
     name: str | None = ""  # 名字
     file_: str | None = ""  # 本地路径
     url: str | None = ""  # url
@@ -714,13 +720,38 @@ class File(BaseMessageComponent):
         if allow_return_url and self.url:
             return self.url
 
-        if self.file_ and os.path.exists(self.file_):
-            return os.path.abspath(self.file_)
+        if self.file_:
+            path = self.file_
+            if path.startswith("file://"):
+                # 处理 file:// (2 slashes) 或 file:/// (3 slashes)
+                # pathlib.as_uri() 通常生成 file:///
+                path = path[7:]
+                # 兼容 Windows: file:///C:/path -> /C:/path -> C:/path
+                if (
+                    os.name == "nt"
+                    and len(path) > 2
+                    and path[0] == "/"
+                    and path[2] == ":"
+                ):
+                    path = path[1:]
+
+            if os.path.exists(path):
+                return os.path.abspath(path)
 
         if self.url:
             await self._download_file()
             if self.file_:
-                return os.path.abspath(self.file_)
+                path = self.file_
+                if path.startswith("file://"):
+                    path = path[7:]
+                    if (
+                        os.name == "nt"
+                        and len(path) > 2
+                        and path[0] == "/"
+                        and path[2] == ":"
+                    ):
+                        path = path[1:]
+                return os.path.abspath(path)
 
         return ""
 
@@ -783,7 +814,7 @@ class File(BaseMessageComponent):
 
 
 class WechatEmoji(BaseMessageComponent):
-    type = ComponentType.WechatEmoji
+    type: ComponentType = ComponentType.WechatEmoji
     md5: str | None = ""
     md5_len: int | None = 0
     cdnurl: str | None = ""

astrbot/core/persona_mgr.py

@@ -1,4 +1,5 @@
 from astrbot import logger
+from astrbot.api import sp
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.db import BaseDatabase
 from astrbot.core.db.po import Persona, PersonaFolder, Personality
@@ -58,6 +59,60 @@ class PersonaManager:
         except Exception:
             return DEFAULT_PERSONALITY
 
+    async def resolve_selected_persona(
+        self,
+        *,
+        umo: str | MessageSession,
+        conversation_persona_id: str | None,
+        platform_name: str,
+        provider_settings: dict | None = None,
+    ) -> tuple[str | None, Personality | None, str | None, bool]:
+        """解析当前会话最终生效的人格。
+
+        Returns:
+            tuple:
+                - selected persona_id
+                - selected persona object
+                - force applied persona_id from session rule
+                - whether use webchat special default persona
+        """
+        session_service_config = (
+            await sp.get_async(
+                scope="umo",
+                scope_id=str(umo),
+                key="session_service_config",
+                default={},
+            )
+            or {}
+        )
+
+        force_applied_persona_id = session_service_config.get("persona_id")
+        persona_id = force_applied_persona_id
+
+        if not persona_id:
+            persona_id = conversation_persona_id
+            if persona_id == "[%None]":
+                pass
+            elif persona_id is None:
+                persona_id = (provider_settings or {}).get("default_personality")
+
+        persona = next(
+            (item for item in self.personas_v3 if item["name"] == persona_id),
+            None,
+        )
+
+        use_webchat_special_default = False
+        if not persona and platform_name == "webchat" and persona_id != "[%None]":
+            persona_id = "_chatui_default_"
+            use_webchat_special_default = True
+
+        return (
+            persona_id,
+            persona,
+            force_applied_persona_id,
+            use_webchat_special_default,
+        )
+
     async def delete_persona(self, persona_id: str) -> None:
         """删除指定 persona"""
         if not await self.db.get_persona_by_id(persona_id):

astrbot/core/pipeline/__init__.py

@@ -1,30 +1,71 @@
+"""Pipeline package exports.
+
+This module intentionally avoids eager imports of all pipeline stage modules to
+prevent import-time cycles. Stage classes remain available via lazy attribute
+resolution for backward compatibility.
+"""
+
+from __future__ import annotations
+
+from importlib import import_module
+from typing import TYPE_CHECKING, Any
+
 from astrbot.core.message.message_event_result import (
     EventResultType,
     MessageEventResult,
 )
 
-from .content_safety_check.stage import ContentSafetyCheckStage
-from .preprocess_stage.stage import PreProcessStage
-from .process_stage.stage import ProcessStage
-from .rate_limit_check.stage import RateLimitStage
-from .respond.stage import RespondStage
-from .result_decorate.stage import ResultDecorateStage
-from .session_status_check.stage import SessionStatusCheckStage
-from .waking_check.stage import WakingCheckStage
-from .whitelist_check.stage import WhitelistCheckStage
+from .stage_order import STAGES_ORDER
 
-# 管道阶段顺序
-STAGES_ORDER = [
-    "WakingCheckStage",  # 检查是否需要唤醒
-    "WhitelistCheckStage",  # 检查是否在群聊/私聊白名单
-    "SessionStatusCheckStage",  # 检查会话是否整体启用
-    "RateLimitStage",  # 检查会话是否超过频率限制
-    "ContentSafetyCheckStage",  # 检查内容安全
-    "PreProcessStage",  # 预处理
-    "ProcessStage",  # 交由 Stars 处理（a.k.a 插件），或者 LLM 调用
-    "ResultDecorateStage",  # 处理结果，比如添加回复前缀、t2i、转换为语音 等
-    "RespondStage",  # 发送消息
-]
+if TYPE_CHECKING:
+    from .content_safety_check.stage import ContentSafetyCheckStage
+    from .preprocess_stage.stage import PreProcessStage
+    from .process_stage.stage import ProcessStage
+    from .rate_limit_check.stage import RateLimitStage
+    from .respond.stage import RespondStage
+    from .result_decorate.stage import ResultDecorateStage
+    from .session_status_check.stage import SessionStatusCheckStage
+    from .waking_check.stage import WakingCheckStage
+    from .whitelist_check.stage import WhitelistCheckStage
+
+_LAZY_EXPORTS = {
+    "ContentSafetyCheckStage": (
+        "astrbot.core.pipeline.content_safety_check.stage",
+        "ContentSafetyCheckStage",
+    ),
+    "PreProcessStage": (
+        "astrbot.core.pipeline.preprocess_stage.stage",
+        "PreProcessStage",
+    ),
+    "ProcessStage": (
+        "astrbot.core.pipeline.process_stage.stage",
+        "ProcessStage",
+    ),
+    "RateLimitStage": (
+        "astrbot.core.pipeline.rate_limit_check.stage",
+        "RateLimitStage",
+    ),
+    "RespondStage": (
+        "astrbot.core.pipeline.respond.stage",
+        "RespondStage",
+    ),
+    "ResultDecorateStage": (
+        "astrbot.core.pipeline.result_decorate.stage",
+        "ResultDecorateStage",
+    ),
+    "SessionStatusCheckStage": (
+        "astrbot.core.pipeline.session_status_check.stage",
+        "SessionStatusCheckStage",
+    ),
+    "WakingCheckStage": (
+        "astrbot.core.pipeline.waking_check.stage",
+        "WakingCheckStage",
+    ),
+    "WhitelistCheckStage": (
+        "astrbot.core.pipeline.whitelist_check.stage",
+        "WhitelistCheckStage",
+    ),
+}
 
 __all__ = [
     "ContentSafetyCheckStage",
@@ -36,6 +77,21 @@ __all__ = [
     "RespondStage",
     "ResultDecorateStage",
     "SessionStatusCheckStage",
+    "STAGES_ORDER",
     "WakingCheckStage",
     "WhitelistCheckStage",
 ]
+
+
+def __getattr__(name: str) -> Any:
+    if name not in _LAZY_EXPORTS:
+        raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+    module_path, attr_name = _LAZY_EXPORTS[name]
+    module = import_module(module_path)
+    value = getattr(module, attr_name)
+    globals()[name] = value
+    return value
+
+
+def __dir__() -> list[str]:
+    return sorted(set(globals()) | set(__all__))

astrbot/core/pipeline/bootstrap.py

@@ -0,0 +1,52 @@
+"""Pipeline bootstrap utilities."""
+
+from importlib import import_module
+
+from .stage import registered_stages
+
+_BUILTIN_STAGE_MODULES = (
+    "astrbot.core.pipeline.waking_check.stage",
+    "astrbot.core.pipeline.whitelist_check.stage",
+    "astrbot.core.pipeline.session_status_check.stage",
+    "astrbot.core.pipeline.rate_limit_check.stage",
+    "astrbot.core.pipeline.content_safety_check.stage",
+    "astrbot.core.pipeline.preprocess_stage.stage",
+    "astrbot.core.pipeline.process_stage.stage",
+    "astrbot.core.pipeline.result_decorate.stage",
+    "astrbot.core.pipeline.respond.stage",
+)
+
+_EXPECTED_STAGE_NAMES = {
+    "WakingCheckStage",
+    "WhitelistCheckStage",
+    "SessionStatusCheckStage",
+    "RateLimitStage",
+    "ContentSafetyCheckStage",
+    "PreProcessStage",
+    "ProcessStage",
+    "ResultDecorateStage",
+    "RespondStage",
+}
+
+_builtin_stages_registered = False
+
+
+def ensure_builtin_stages_registered() -> None:
+    """Ensure built-in pipeline stages are imported and registered."""
+    global _builtin_stages_registered
+
+    if _builtin_stages_registered:
+        return
+
+    stage_names = {stage_cls.__name__ for stage_cls in registered_stages}
+    if _EXPECTED_STAGE_NAMES.issubset(stage_names):
+        _builtin_stages_registered = True
+        return
+
+    for module_path in _BUILTIN_STAGE_MODULES:
+        import_module(module_path)
+
+    _builtin_stages_registered = True
+
+
+__all__ = ["ensure_builtin_stages_registered"]

astrbot/core/pipeline/context.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
+from typing import Any
 
 from astrbot.core.config import AstrBotConfig
-from astrbot.core.star import PluginManager
 
 from .context_utils import call_event_hook, call_handler
 
@@ -11,7 +13,7 @@ class PipelineContext:
     """上下文对象，包含管道执行所需的上下文信息"""
 
     astrbot_config: AstrBotConfig  # AstrBot 配置对象
-    plugin_manager: PluginManager  # 插件管理器对象
+    plugin_manager: Any  # 插件管理器对象
     astrbot_config_id: str
     call_handler = call_handler
     call_event_hook = call_event_hook

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

@@ -19,6 +19,7 @@ from astrbot.core.message.message_event_result import (
     MessageEventResult,
     ResultContentType,
 )
+from astrbot.core.pipeline.stage import Stage
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.provider.entities import (
     LLMResponse,
@@ -30,7 +31,6 @@ from astrbot.core.utils.session_lock import session_lock_manager
 
 from .....astr_agent_run_util import run_agent, run_live_agent
 from ....context import PipelineContext, call_event_hook
-from ...stage import Stage
 
 
 class InternalAgentSubStage(Stage):
@@ -54,6 +54,7 @@ class InternalAgentSubStage(Stage):
         if isinstance(self.max_step, bool):  # workaround: #2622
             self.max_step = 30
         self.show_tool_use: bool = settings.get("show_tool_use_status", True)
+        self.show_tool_call_result: bool = settings.get("show_tool_call_result", False)
         self.show_reasoning = settings.get("display_reasoning_text", False)
         self.sanitize_context_by_modalities: bool = settings.get(
             "sanitize_context_by_modalities",
@@ -240,6 +241,7 @@ class InternalAgentSubStage(Stage):
                                 tts_provider,
                                 self.max_step,
                                 self.show_tool_use,
+                                self.show_tool_call_result,
                                 show_reasoning=self.show_reasoning,
                             ),
                         ),
@@ -247,13 +249,16 @@ class InternalAgentSubStage(Stage):
                     yield
 
                     # 保存历史记录
-                    if not event.is_stopped() and agent_runner.done():
+                    if agent_runner.done() and (
+                        not event.is_stopped() or agent_runner.was_aborted()
+                    ):
                         await self._save_to_history(
                             event,
                             req,
                             agent_runner.get_final_llm_resp(),
                             agent_runner.run_context.messages,
                             agent_runner.stats,
+                            user_aborted=agent_runner.was_aborted(),
                         )
 
                 elif streaming_response and not stream_to_general:
@@ -266,6 +271,7 @@ class InternalAgentSubStage(Stage):
                                 agent_runner,
                                 self.max_step,
                                 self.show_tool_use,
+                                self.show_tool_call_result,
                                 show_reasoning=self.show_reasoning,
                             ),
                         ),
@@ -294,6 +300,7 @@ class InternalAgentSubStage(Stage):
                         agent_runner,
                         self.max_step,
                         self.show_tool_use,
+                        self.show_tool_call_result,
                         stream_to_general,
                         show_reasoning=self.show_reasoning,
                     ):
@@ -308,13 +315,14 @@ class InternalAgentSubStage(Stage):
                 )
 
                 # 检查事件是否被停止，如果被停止则不保存历史记录
-                if not event.is_stopped():
+                if not event.is_stopped() or agent_runner.was_aborted():
                     await self._save_to_history(
                         event,
                         req,
                         final_resp,
                         agent_runner.run_context.messages,
                         agent_runner.stats,
+                        user_aborted=agent_runner.was_aborted(),
                     )
 
             asyncio.create_task(
@@ -340,16 +348,29 @@ class InternalAgentSubStage(Stage):
         llm_response: LLMResponse | None,
         all_messages: list[Message],
         runner_stats: AgentStats | None,
+        user_aborted: bool = False,
     ) -> None:
-        if (
-            not req
-            or not req.conversation
-            or not llm_response
-            or llm_response.role != "assistant"
-        ):
+        if not req or not req.conversation:
             return
 
-        if not llm_response.completion_text and not req.tool_calls_result:
+        if not llm_response and not user_aborted:
+            return
+
+        if llm_response and llm_response.role != "assistant":
+            if not user_aborted:
+                return
+            llm_response = LLMResponse(
+                role="assistant",
+                completion_text=llm_response.completion_text or "",
+            )
+        elif llm_response is None:
+            llm_response = LLMResponse(role="assistant", completion_text="")
+
+        if (
+            not llm_response.completion_text
+            and not req.tool_calls_result
+            and not user_aborted
+        ):
             logger.debug("LLM 响应为空，不保存记录。")
             return
 
@@ -363,6 +384,14 @@ class InternalAgentSubStage(Stage):
                 continue
             message_to_save.append(message.model_dump())
 
+        # if user_aborted:
+        #     message_to_save.append(
+        #         Message(
+        #             role="assistant",
+        #             content="[User aborted this request. Partial output before abort was preserved.]",
+        #         ).model_dump()
+        #     )
+
         token_usage = None
         if runner_stats:
             # token_usage = runner_stats.token_usage.total

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

@@ -8,6 +8,7 @@ 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.astr_agent_hooks import MAIN_AGENT_HOOKS
 from astrbot.core.message.components import Image
 from astrbot.core.message.message_event_result import (
     MessageChain,
@@ -17,6 +18,7 @@ from astrbot.core.message.message_event_result import (
 
 if TYPE_CHECKING:
     from astrbot.core.agent.runners.base import BaseAgentRunner
+from astrbot.core.pipeline.stage import Stage
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.provider.entities import (
     ProviderRequest,
@@ -25,9 +27,7 @@ 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",

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

@@ -8,9 +8,9 @@ from astrbot.core import logger
 from astrbot.core.message.message_event_result import MessageEventResult
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.star.star import star_map
-from astrbot.core.star.star_handler import StarHandlerMetadata
+from astrbot.core.star.star_handler import EventType, StarHandlerMetadata
 
-from ...context import PipelineContext, call_handler
+from ...context import PipelineContext, call_event_hook, call_handler
 from ..stage import Stage
 
 
@@ -48,10 +48,20 @@ class StarRequestSubStage(Stage):
                     yield ret
                 event.clear_result()  # 清除上一个 handler 的结果
             except Exception as e:
-                logger.error(traceback.format_exc())
+                traceback_text = traceback.format_exc()
+                logger.error(traceback_text)
                 logger.error(f"Star {handler.handler_full_name} handle error: {e}")
 
-                if event.is_at_or_wake_command:
+                await call_event_hook(
+                    event,
+                    EventType.OnPluginErrorEvent,
+                    md.name,
+                    handler.handler_name,
+                    e,
+                    traceback_text,
+                )
+
+                if not event.is_stopped() and event.is_at_or_wake_command:
                     ret = f":(\n\n在调用插件 {md.name} 的处理函数 {handler.handler_name} 时出现异常：{e}"
                     event.set_result(MessageEventResult().message(ret))
                     yield

astrbot/core/pipeline/respond/stage.py

@@ -33,6 +33,21 @@ class RespondStage(Stage):
         Comp.Nodes: lambda comp: bool(comp.nodes),  # 多个转发节点
         Comp.File: lambda comp: bool(comp.file_ or comp.url),
         Comp.WechatEmoji: lambda comp: comp.md5 is not None,  # 微信表情
+        Comp.Json: lambda comp: bool(comp.data),  # Json 卡片
+        Comp.Share: lambda comp: bool(comp.url) or bool(comp.title),
+        Comp.Music: lambda comp: (
+            (comp.id and comp._type and comp._type != "custom")
+            or (comp._type == "custom" and comp.url and comp.audio and comp.title)
+        ),  # 音乐分享
+        Comp.Forward: lambda comp: bool(comp.id),  # 合并转发
+        Comp.Location: lambda comp: bool(
+            comp.lat is not None and comp.lon is not None
+        ),  # 位置
+        Comp.Contact: lambda comp: bool(comp._type and comp.id),  # 推荐好友 or 群
+        Comp.Shake: lambda _: True,  # 窗口抖动（戳一戳）
+        Comp.Dice: lambda _: True,  # 掷骰子魔法表情
+        Comp.RPS: lambda _: True,  # 猜拳魔法表情
+        Comp.Unknown: lambda comp: bool(comp.text and comp.text.strip()),
     }
 
     async def initialize(self, ctx: PipelineContext) -> None:

astrbot/core/pipeline/result_decorate/stage.py

@@ -315,6 +315,7 @@ class ResultDecorateStage(Stage):
                                 Record(
                                     file=url or audio_path,
                                     url=url or audio_path,
+                                    text=comp.text,
                                 ),
                             )
                             if dual_output:

astrbot/core/pipeline/scheduler.py

@@ -6,16 +6,19 @@ from astrbot.core.platform.sources.webchat.webchat_event import WebChatMessageEv
 from astrbot.core.platform.sources.wecom_ai_bot.wecomai_event import (
     WecomAIBotMessageEvent,
 )
+from astrbot.core.utils.active_event_registry import active_event_registry
 
-from . import STAGES_ORDER
+from .bootstrap import ensure_builtin_stages_registered
 from .context import PipelineContext
 from .stage import registered_stages
+from .stage_order import STAGES_ORDER
 
 
 class PipelineScheduler:
     """管道调度器，负责调度各个阶段的执行"""
 
     def __init__(self, context: PipelineContext) -> None:
+        ensure_builtin_stages_registered()
         registered_stages.sort(
             key=lambda x: STAGES_ORDER.index(x.__name__),
         )  # 按照顺序排序
@@ -79,10 +82,14 @@ class PipelineScheduler:
             event (AstrMessageEvent): 事件对象
 
         """
-        await self._process_stages(event)
+        active_event_registry.register(event)
+        try:
+            await self._process_stages(event)
 
-        # 如果没有发送操作, 则发送一个空消息, 以便于后续的处理
-        if isinstance(event, WebChatMessageEvent | WecomAIBotMessageEvent):
-            await event.send(None)
+            # 如果没有发送操作, 则发送一个空消息, 以便于后续的处理
+            if isinstance(event, WebChatMessageEvent | WecomAIBotMessageEvent):
+                await event.send(None)
 
-        logger.debug("pipeline 执行完毕。")
+            logger.debug("pipeline 执行完毕。")
+        finally:
+            active_event_registry.unregister(event)

astrbot/core/pipeline/stage_order.py

@@ -0,0 +1,15 @@
+"""Pipeline stage execution order."""
+
+STAGES_ORDER = [
+    "WakingCheckStage",  # 检查是否需要唤醒
+    "WhitelistCheckStage",  # 检查是否在群聊/私聊白名单
+    "SessionStatusCheckStage",  # 检查会话是否整体启用
+    "RateLimitStage",  # 检查会话是否超过频率限制
+    "ContentSafetyCheckStage",  # 检查内容安全
+    "PreProcessStage",  # 预处理
+    "ProcessStage",  # 交由 Stars 处理（a.k.a 插件），或者 LLM 调用
+    "ResultDecorateStage",  # 处理结果，比如添加回复前缀、t2i、转换为语音 等
+    "RespondStage",  # 发送消息
+]
+
+__all__ = ["STAGES_ORDER"]

astrbot/core/platform/astr_message_event.py

@@ -52,9 +52,19 @@ class AstrMessageEvent(abc.ABC):
         self.is_at_or_wake_command = False
         """是否是 At 机器人或者带有唤醒词或者是私聊(插件注册的事件监听器会让 is_wake 设为 True, 但是不会让这个属性置为 True)"""
         self._extras: dict[str, Any] = {}
+        message_type = getattr(message_obj, "type", None)
+        if not isinstance(message_type, MessageType):
+            try:
+                message_type = MessageType(str(message_type))
+            except (ValueError, TypeError, AttributeError):
+                logger.warning(
+                    f"Failed to convert message type {message_obj.type!r} to MessageType. "
+                    f"Falling back to FRIEND_MESSAGE."
+                )
+                message_type = MessageType.FRIEND_MESSAGE
         self.session = MessageSession(
             platform_name=platform_meta.id,
-            message_type=message_obj.type,
+            message_type=message_type,
             session_id=session_id,
         )
         # self.unified_msg_origin = str(self.session)
@@ -159,15 +169,18 @@ class AstrMessageEvent(abc.ABC):
 
         除了文本消息外，其他消息类型会被转换为对应的占位符。如图片消息会被转换为 [图片]。
         """
-        return self._outline_chain(self.message_obj.message)
+        return self._outline_chain(getattr(self.message_obj, "message", None))
 
     def get_messages(self) -> list[BaseMessageComponent]:
         """获取消息链。"""
-        return self.message_obj.message
+        return getattr(self.message_obj, "message", [])
 
     def get_message_type(self) -> MessageType:
         """获取消息类型。"""
-        return self.message_obj.type
+        message_type = getattr(self.message_obj, "type", None)
+        if isinstance(message_type, MessageType):
+            return message_type
+        return self.session.message_type
 
     def get_session_id(self) -> str:
         """获取会话id。"""
@@ -175,21 +188,30 @@ class AstrMessageEvent(abc.ABC):
 
     def get_group_id(self) -> str:
         """获取群组id。如果不是群组消息，返回空字符串。"""
-        return self.message_obj.group_id
+        return getattr(self.message_obj, "group_id", "")
 
     def get_self_id(self) -> str:
         """获取机器人自身的id。"""
-        return self.message_obj.self_id
+        return getattr(self.message_obj, "self_id", "")
 
     def get_sender_id(self) -> str:
         """获取消息发送者的id。"""
-        return self.message_obj.sender.user_id
+        sender = getattr(self.message_obj, "sender", None)
+        if sender and isinstance(getattr(sender, "user_id", None), str):
+            return sender.user_id
+        return ""
 
     def get_sender_name(self) -> str:
         """获取消息发送者的名称。(可能会返回空字符串)"""
-        if isinstance(self.message_obj.sender.nickname, str):
-            return self.message_obj.sender.nickname
-        return ""
+        sender = getattr(self.message_obj, "sender", None)
+        if not sender:
+            return ""
+        nickname = getattr(sender, "nickname", None)
+        if nickname is None:
+            return ""
+        if isinstance(nickname, str):
+            return nickname
+        return str(nickname)
 
     def set_extra(self, key, value) -> None:
         """设置额外的信息。"""
@@ -208,7 +230,7 @@ class AstrMessageEvent(abc.ABC):
 
     def is_private_chat(self) -> bool:
         """是否是私聊。"""
-        return self.message_obj.type.value == (MessageType.FRIEND_MESSAGE).value
+        return self.get_message_type() == MessageType.FRIEND_MESSAGE
 
     def is_wake_up(self) -> bool:
         """是否是唤醒机器人的事件。"""

astrbot/core/platform/manager.py

@@ -176,6 +176,10 @@ class PlatformManager:
                     from .sources.satori.satori_adapter import (
                         SatoriPlatformAdapter,  # noqa: F401
                     )
+                case "line":
+                    from .sources.line.line_adapter import (
+                        LinePlatformAdapter,  # noqa: F401
+                    )
         except (ImportError, ModuleNotFoundError) as e:
             logger.error(
                 f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。请检查依赖库是否安装。提示：可以在 管理面板->平台日志->安装Pip库 中安装依赖库。",

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

@@ -45,6 +45,19 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         if isinstance(segment, File):
             # For File segments, we need to handle the file differently
             d = await segment.to_dict()
+            file_val = d.get("data", {}).get("file", "")
+            if file_val:
+                import pathlib
+
+                try:
+                    # 使用 pathlib 处理路径，能更好地处理 Windows/Linux 差异
+                    path_obj = pathlib.Path(file_val)
+                    # 如果是绝对路径且不包含协议头 (://)，则转换为标准的 file: URI
+                    if path_obj.is_absolute() and "://" not in file_val:
+                        d["data"]["file"] = path_obj.as_uri()
+                except Exception:
+                    # 如果不是合法路径（例如已经是特定的特殊字符串），则跳过转换
+                    pass
             return d
         if isinstance(segment, Video):
             d = await segment.to_dict()

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

@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import itertools
 import logging
 import time
@@ -436,7 +437,42 @@ class AiocqhttpAdapter(Platform):
         return coro
 
     async def terminate(self) -> None:
-        self.shutdown_event.set()
+        if hasattr(self, "shutdown_event"):
+            self.shutdown_event.set()
+        await self._close_reverse_ws_connections()
+
+    async def _close_reverse_ws_connections(self) -> None:
+        api_clients = getattr(self.bot, "_wsr_api_clients", None)
+        event_clients = getattr(self.bot, "_wsr_event_clients", None)
+
+        ws_clients: set[Any] = set()
+        if isinstance(api_clients, dict):
+            ws_clients.update(api_clients.values())
+        if isinstance(event_clients, set):
+            ws_clients.update(event_clients)
+
+        close_tasks: list[Awaitable[Any]] = []
+        for ws in ws_clients:
+            close_func = getattr(ws, "close", None)
+            if not callable(close_func):
+                continue
+            try:
+                close_result = close_func(code=1000, reason="Adapter shutdown")
+            except TypeError:
+                close_result = close_func()
+            except Exception:
+                continue
+
+            if inspect.isawaitable(close_result):
+                close_tasks.append(close_result)
+
+        if close_tasks:
+            await asyncio.gather(*close_tasks, return_exceptions=True)
+
+        if isinstance(api_clients, dict):
+            api_clients.clear()
+        if isinstance(event_clients, set):
+            event_clients.clear()
 
     async def shutdown_trigger_placeholder(self) -> None:
         await self.shutdown_event.wait()

astrbot/core/platform/sources/line/line_adapter.py

@@ -0,0 +1,465 @@
+import asyncio
+import mimetypes
+import time
+import uuid
+from pathlib import Path
+from typing import Any, cast
+
+from astrbot.api import logger
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import At, File, Image, Plain, Record, Video
+from astrbot.api.platform import (
+    AstrBotMessage,
+    Group,
+    MessageMember,
+    MessageType,
+    Platform,
+    PlatformMetadata,
+)
+from astrbot.core.platform.astr_message_event import MessageSesion
+from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
+from astrbot.core.utils.webhook_utils import log_webhook_info
+
+from ...register import register_platform_adapter
+from .line_api import LineAPIClient
+from .line_event import LineMessageEvent
+
+LINE_CONFIG_METADATA = {
+    "channel_access_token": {
+        "description": "LINE Channel Access Token",
+        "type": "string",
+        "hint": "LINE Messaging API 的 channel access token。",
+    },
+    "channel_secret": {
+        "description": "LINE Channel Secret",
+        "type": "string",
+        "hint": "用于校验 LINE Webhook 签名。",
+    },
+}
+
+LINE_I18N_RESOURCES = {
+    "zh-CN": {
+        "channel_access_token": {
+            "description": "LINE Channel Access Token",
+            "hint": "LINE Messaging API 的 channel access token。",
+        },
+        "channel_secret": {
+            "description": "LINE Channel Secret",
+            "hint": "用于校验 LINE Webhook 签名。",
+        },
+    },
+    "en-US": {
+        "channel_access_token": {
+            "description": "LINE Channel Access Token",
+            "hint": "Channel access token for LINE Messaging API.",
+        },
+        "channel_secret": {
+            "description": "LINE Channel Secret",
+            "hint": "Used to verify LINE webhook signatures.",
+        },
+    },
+}
+
+
+@register_platform_adapter(
+    "line",
+    "LINE Messaging API 适配器",
+    support_streaming_message=False,
+    config_metadata=LINE_CONFIG_METADATA,
+    i18n_resources=LINE_I18N_RESOURCES,
+)
+class LinePlatformAdapter(Platform):
+    def __init__(
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
+    ) -> None:
+        super().__init__(platform_config, event_queue)
+        self.config["unified_webhook_mode"] = True
+        self.destination = "unknown"
+        self.settings = platform_settings
+        self._event_id_timestamps: dict[str, float] = {}
+        self.shutdown_event = asyncio.Event()
+
+        channel_access_token = str(platform_config.get("channel_access_token", ""))
+        channel_secret = str(platform_config.get("channel_secret", ""))
+        if not channel_access_token or not channel_secret:
+            raise ValueError(
+                "LINE 适配器需要 channel_access_token 和 channel_secret。",
+            )
+
+        self.line_api = LineAPIClient(
+            channel_access_token=channel_access_token,
+            channel_secret=channel_secret,
+        )
+
+    async def send_by_session(
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
+    ) -> None:
+        messages = await LineMessageEvent.build_line_messages(message_chain)
+        if messages:
+            await self.line_api.push_message(session.session_id, messages)
+        await super().send_by_session(session, message_chain)
+
+    def meta(self) -> PlatformMetadata:
+        return PlatformMetadata(
+            name="line",
+            description="LINE Messaging API 适配器",
+            id=cast(str, self.config.get("id", "line")),
+            support_streaming_message=False,
+        )
+
+    async def run(self) -> None:
+        webhook_uuid = self.config.get("webhook_uuid")
+        if webhook_uuid:
+            log_webhook_info(f"{self.meta().id}(LINE)", webhook_uuid)
+        else:
+            logger.warning("[LINE] webhook_uuid 为空，统一 Webhook 可能无法接收消息。")
+        await self.shutdown_event.wait()
+
+    async def terminate(self) -> None:
+        self.shutdown_event.set()
+        await self.line_api.close()
+
+    async def webhook_callback(self, request: Any) -> Any:
+        raw_body = await request.get_data()
+        signature = request.headers.get("x-line-signature")
+        if not self.line_api.verify_signature(raw_body, signature):
+            logger.warning("[LINE] invalid webhook signature")
+            return "invalid signature", 400
+
+        try:
+            payload = await request.get_json(force=True, silent=False)
+        except Exception as e:
+            logger.warning("[LINE] invalid webhook body: %s", e)
+            return "bad request", 400
+
+        if not isinstance(payload, dict):
+            return "bad request", 400
+
+        await self.handle_webhook_event(payload)
+        return "ok", 200
+
+    async def handle_webhook_event(self, payload: dict[str, Any]) -> None:
+        destination = str(payload.get("destination", "")).strip()
+        if destination:
+            self.destination = destination
+
+        events = payload.get("events")
+        if not isinstance(events, list):
+            return
+
+        for event in events:
+            if not isinstance(event, dict):
+                continue
+
+            event_id = str(event.get("webhookEventId", ""))
+            if event_id and self._is_duplicate_event(event_id):
+                logger.debug("[LINE] duplicate event skipped: %s", event_id)
+                continue
+
+            abm = await self.convert_message(event)
+            if abm is None:
+                continue
+            await self.handle_msg(abm)
+
+    async def convert_message(self, event: dict[str, Any]) -> AstrBotMessage | None:
+        if str(event.get("type", "")) != "message":
+            return None
+        if str(event.get("mode", "active")) == "standby":
+            return None
+
+        source = event.get("source", {})
+        if not isinstance(source, dict):
+            return None
+
+        message = event.get("message", {})
+        if not isinstance(message, dict):
+            return None
+
+        source_type = str(source.get("type", ""))
+        user_id = str(source.get("userId", "")).strip()
+        group_id = str(source.get("groupId", "")).strip()
+        room_id = str(source.get("roomId", "")).strip()
+
+        abm = AstrBotMessage()
+        abm.self_id = self.destination or self.meta().id
+        abm.message = []
+        abm.raw_message = event
+        abm.message_id = str(
+            message.get("id")
+            or event.get("webhookEventId")
+            or event.get("deliveryContext", {}).get("deliveryId", "")
+            or uuid.uuid4().hex
+        )
+
+        event_timestamp = event.get("timestamp")
+        if isinstance(event_timestamp, int):
+            abm.timestamp = (
+                event_timestamp // 1000
+                if event_timestamp > 1_000_000_000_000
+                else event_timestamp
+            )
+        else:
+            abm.timestamp = int(time.time())
+
+        if source_type in {"group", "room"}:
+            abm.type = MessageType.GROUP_MESSAGE
+            container_id = group_id or room_id
+            abm.group = Group(group_id=container_id, group_name=container_id)
+            abm.session_id = container_id
+            sender_id = user_id or container_id
+        elif source_type == "user":
+            abm.type = MessageType.FRIEND_MESSAGE
+            abm.session_id = user_id
+            sender_id = user_id
+        else:
+            abm.type = MessageType.OTHER_MESSAGE
+            abm.session_id = user_id or group_id or room_id or "unknown"
+            sender_id = abm.session_id
+
+        abm.sender = MessageMember(user_id=sender_id, nickname=sender_id[:8])
+
+        components = await self._parse_line_message_components(message)
+        if not components:
+            return None
+        abm.message = components
+        abm.message_str = self._build_message_str(components)
+        return abm
+
+    async def _parse_line_message_components(
+        self,
+        message: dict[str, Any],
+    ) -> list:
+        msg_type = str(message.get("type", ""))
+        message_id = str(message.get("id", "")).strip()
+
+        if msg_type == "text":
+            text = str(message.get("text", ""))
+            mention = message.get("mention")
+            if isinstance(mention, dict):
+                return self._parse_text_with_mentions(text, mention)
+            return [Plain(text=text)] if text else []
+
+        if msg_type == "image":
+            image_component = await self._build_image_component(message_id, message)
+            return [image_component] if image_component else [Plain(text="[image]")]
+
+        if msg_type == "video":
+            video_component = await self._build_video_component(message_id, message)
+            return [video_component] if video_component else [Plain(text="[video]")]
+
+        if msg_type == "audio":
+            audio_component = await self._build_audio_component(message_id, message)
+            return [audio_component] if audio_component else [Plain(text="[audio]")]
+
+        if msg_type == "file":
+            file_component = await self._build_file_component(message_id, message)
+            return [file_component] if file_component else [Plain(text="[file]")]
+
+        if msg_type == "sticker":
+            return [Plain(text="[sticker]")]
+
+        return [Plain(text=f"[{msg_type}]")]
+
+    def _parse_text_with_mentions(self, text: str, mention_obj: dict[str, Any]) -> list:
+        mentions = mention_obj.get("mentionees", [])
+        if not isinstance(mentions, list) or not mentions:
+            return [Plain(text=text)] if text else []
+
+        normalized = []
+        for item in mentions:
+            if not isinstance(item, dict):
+                continue
+            start = item.get("index")
+            length = item.get("length")
+            if not isinstance(start, int) or not isinstance(length, int):
+                continue
+            normalized.append((start, length, item))
+        normalized.sort(key=lambda x: x[0])
+
+        ret = []
+        cursor = 0
+        for start, length, item in normalized:
+            if start > cursor:
+                part = text[cursor:start]
+                if part:
+                    ret.append(Plain(text=part))
+
+            label = text[start : start + length] or "@user"
+            mention_type = str(item.get("type", ""))
+            if mention_type == "user":
+                target_id = str(item.get("userId", "")).strip()
+                ret.append(At(qq=target_id, name=label.lstrip("@")))
+            else:
+                ret.append(Plain(text=label))
+            cursor = max(cursor, start + length)
+
+        if cursor < len(text):
+            tail = text[cursor:]
+            if tail:
+                ret.append(Plain(text=tail))
+        return ret
+
+    async def _build_image_component(
+        self,
+        message_id: str,
+        message: dict[str, Any],
+    ) -> Image | None:
+        external_url = self._get_external_content_url(message)
+        if external_url:
+            return Image.fromURL(external_url)
+
+        content = await self.line_api.get_message_content(message_id)
+        if not content:
+            return None
+        content_bytes, _, _ = content
+        return Image.fromBytes(content_bytes)
+
+    async def _build_video_component(
+        self,
+        message_id: str,
+        message: dict[str, Any],
+    ) -> Video | None:
+        external_url = self._get_external_content_url(message)
+        if external_url:
+            return Video.fromURL(external_url)
+
+        content = await self.line_api.get_message_content(message_id)
+        if not content:
+            return None
+        content_bytes, content_type, _ = content
+        suffix = self._guess_suffix(content_type, ".mp4")
+        file_path = self._store_temp_content("video", message_id, content_bytes, suffix)
+        return Video(file=file_path, path=file_path)
+
+    async def _build_audio_component(
+        self,
+        message_id: str,
+        message: dict[str, Any],
+    ) -> Record | None:
+        external_url = self._get_external_content_url(message)
+        if external_url:
+            return Record.fromURL(external_url)
+
+        content = await self.line_api.get_message_content(message_id)
+        if not content:
+            return None
+        content_bytes, content_type, _ = content
+        suffix = self._guess_suffix(content_type, ".m4a")
+        file_path = self._store_temp_content("audio", message_id, content_bytes, suffix)
+        return Record(file=file_path, url=file_path)
+
+    async def _build_file_component(
+        self,
+        message_id: str,
+        message: dict[str, Any],
+    ) -> File | None:
+        content = await self.line_api.get_message_content(message_id)
+        if not content:
+            return None
+        content_bytes, content_type, filename = content
+        default_name = str(message.get("fileName", "")).strip() or f"{message_id}.bin"
+        suffix = Path(default_name).suffix or self._guess_suffix(content_type, ".bin")
+        final_name = filename or default_name
+        file_path = self._store_temp_content(
+            "file",
+            message_id,
+            content_bytes,
+            suffix,
+            original_name=final_name,
+        )
+        return File(name=final_name, file=file_path, url=file_path)
+
+    @staticmethod
+    def _get_external_content_url(message: dict[str, Any]) -> str:
+        provider = message.get("contentProvider")
+        if not isinstance(provider, dict):
+            return ""
+        if str(provider.get("type", "")) != "external":
+            return ""
+        return str(provider.get("originalContentUrl", "")).strip()
+
+    @staticmethod
+    def _guess_suffix(content_type: str | None, fallback: str) -> str:
+        if not content_type:
+            return fallback
+        base_type = content_type.split(";", 1)[0].strip().lower()
+        guessed = mimetypes.guess_extension(base_type)
+        if guessed:
+            return guessed
+        return fallback
+
+    @staticmethod
+    def _store_temp_content(
+        content_type: str,
+        message_id: str,
+        content: bytes,
+        suffix: str,
+        original_name: str = "",
+    ) -> str:
+        temp_dir = Path(get_astrbot_temp_path())
+        temp_dir.mkdir(parents=True, exist_ok=True)
+        name_prefix = f"line_{content_type}"
+        if original_name:
+            safe_stem = Path(original_name).stem.strip()
+            safe_stem = "".join(
+                ch if ch.isalnum() or ch in ("-", "_", ".") else "_" for ch in safe_stem
+            )
+            safe_stem = safe_stem.strip("._")
+            if safe_stem:
+                name_prefix = safe_stem[:64]
+        file_path = temp_dir / f"{name_prefix}_{message_id}_{uuid.uuid4().hex[:6]}"
+        file_path = file_path.with_suffix(suffix)
+        file_path.write_bytes(content)
+        return str(file_path.resolve())
+
+    @staticmethod
+    def _build_message_str(components: list) -> str:
+        parts: list[str] = []
+        for comp in components:
+            if isinstance(comp, Plain):
+                parts.append(comp.text)
+            elif isinstance(comp, At):
+                parts.append(f"@{comp.name or comp.qq}")
+            elif isinstance(comp, Image):
+                parts.append("[image]")
+            elif isinstance(comp, Video):
+                parts.append("[video]")
+            elif isinstance(comp, Record):
+                parts.append("[audio]")
+            elif isinstance(comp, File):
+                parts.append(str(comp.name or "[file]"))
+            else:
+                parts.append(f"[{comp.type}]")
+        return " ".join(i for i in parts if i).strip()
+
+    def _clean_expired_events(self) -> None:
+        current = time.time()
+        expired = [
+            event_id
+            for event_id, ts in self._event_id_timestamps.items()
+            if current - ts > 1800
+        ]
+        for event_id in expired:
+            del self._event_id_timestamps[event_id]
+
+    def _is_duplicate_event(self, event_id: str) -> bool:
+        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 handle_msg(self, abm: AstrBotMessage) -> None:
+        event = LineMessageEvent(
+            message_str=abm.message_str,
+            message_obj=abm,
+            platform_meta=self.meta(),
+            session_id=abm.session_id,
+            line_api=self.line_api,
+        )
+        self._event_queue.put_nowait(event)

astrbot/core/platform/sources/line/line_api.py

@@ -0,0 +1,203 @@
+import asyncio
+import base64
+import hmac
+import json
+from hashlib import sha256
+from typing import Any
+from urllib.parse import unquote
+
+import aiohttp
+
+from astrbot.api import logger
+
+
+class LineAPIClient:
+    def __init__(
+        self,
+        *,
+        channel_access_token: str,
+        channel_secret: str,
+        timeout_seconds: int = 30,
+    ) -> None:
+        self.channel_access_token = channel_access_token.strip()
+        self.channel_secret = channel_secret.strip()
+        self.timeout = aiohttp.ClientTimeout(total=timeout_seconds)
+        self._session: aiohttp.ClientSession | None = None
+
+    async def _get_session(self) -> aiohttp.ClientSession:
+        if self._session is None or self._session.closed:
+            self._session = aiohttp.ClientSession(timeout=self.timeout)
+        return self._session
+
+    async def close(self) -> None:
+        if self._session and not self._session.closed:
+            await self._session.close()
+
+    def verify_signature(self, raw_body: bytes, signature: str | None) -> bool:
+        if not signature:
+            return False
+        digest = hmac.new(
+            self.channel_secret.encode("utf-8"),
+            raw_body,
+            sha256,
+        ).digest()
+        expected = base64.b64encode(digest).decode("utf-8")
+        return hmac.compare_digest(expected, signature.strip())
+
+    @property
+    def _auth_headers(self) -> dict[str, str]:
+        return {"Authorization": f"Bearer {self.channel_access_token}"}
+
+    async def reply_message(
+        self,
+        reply_token: str,
+        messages: list[dict[str, Any]],
+        *,
+        notification_disabled: bool = False,
+    ) -> bool:
+        payload = {
+            "replyToken": reply_token,
+            "messages": messages[:5],
+            "notificationDisabled": notification_disabled,
+        }
+        return await self._post_json(
+            "https://api.line.me/v2/bot/message/reply",
+            payload=payload,
+            op_name="reply",
+        )
+
+    async def push_message(
+        self,
+        to: str,
+        messages: list[dict[str, Any]],
+        *,
+        notification_disabled: bool = False,
+    ) -> bool:
+        payload = {
+            "to": to,
+            "messages": messages[:5],
+            "notificationDisabled": notification_disabled,
+        }
+        return await self._post_json(
+            "https://api.line.me/v2/bot/message/push",
+            payload=payload,
+            op_name="push",
+        )
+
+    async def _post_json(
+        self,
+        url: str,
+        *,
+        payload: dict[str, Any],
+        op_name: str,
+    ) -> bool:
+        session = await self._get_session()
+        headers = {
+            **self._auth_headers,
+            "Content-Type": "application/json",
+        }
+        try:
+            async with session.post(url, json=payload, headers=headers) as resp:
+                if resp.status < 400:
+                    return True
+                body = await resp.text()
+                logger.error(
+                    "[LINE] %s message failed: status=%s body=%s",
+                    op_name,
+                    resp.status,
+                    body,
+                )
+                return False
+        except Exception as e:
+            logger.error("[LINE] %s message request failed: %s", op_name, e)
+            return False
+
+    async def get_message_content(
+        self,
+        message_id: str,
+    ) -> tuple[bytes, str | None, str | None] | None:
+        session = await self._get_session()
+        url = f"https://api-data.line.me/v2/bot/message/{message_id}/content"
+        headers = self._auth_headers
+
+        async with session.get(url, headers=headers) as resp:
+            if resp.status == 202:
+                if not await self._wait_for_transcoding(message_id):
+                    return None
+                async with session.get(url, headers=headers) as retry_resp:
+                    if retry_resp.status != 200:
+                        body = await retry_resp.text()
+                        logger.warning(
+                            "[LINE] get content retry failed: message_id=%s status=%s body=%s",
+                            message_id,
+                            retry_resp.status,
+                            body,
+                        )
+                        return None
+                    return await self._read_content_response(retry_resp)
+
+            if resp.status != 200:
+                body = await resp.text()
+                logger.warning(
+                    "[LINE] get content failed: message_id=%s status=%s body=%s",
+                    message_id,
+                    resp.status,
+                    body,
+                )
+                return None
+            return await self._read_content_response(resp)
+
+    async def _read_content_response(
+        self,
+        resp: aiohttp.ClientResponse,
+    ) -> tuple[bytes, str | None, str | None]:
+        content = await resp.read()
+        content_type = resp.headers.get("Content-Type")
+        disposition = resp.headers.get("Content-Disposition")
+        filename = self._extract_filename_from_disposition(disposition)
+        return content, content_type, filename
+
+    def _extract_filename_from_disposition(self, disposition: str | None) -> str | None:
+        if not disposition:
+            return None
+        for part in disposition.split(";"):
+            token = part.strip()
+            if token.startswith("filename*="):
+                val = token.split("=", 1)[1].strip().strip('"')
+                if val.lower().startswith("utf-8''"):
+                    val = val[7:]
+                return unquote(val)
+            if token.startswith("filename="):
+                return token.split("=", 1)[1].strip().strip('"')
+        return None
+
+    async def _wait_for_transcoding(
+        self,
+        message_id: str,
+        *,
+        max_attempts: int = 10,
+        interval_seconds: float = 1.0,
+    ) -> bool:
+        session = await self._get_session()
+        url = (
+            f"https://api-data.line.me/v2/bot/message/{message_id}/content/transcoding"
+        )
+        headers = self._auth_headers
+
+        for _ in range(max_attempts):
+            try:
+                async with session.get(url, headers=headers) as resp:
+                    if resp.status != 200:
+                        await asyncio.sleep(interval_seconds)
+                        continue
+                    body = await resp.text()
+                    data = json.loads(body)
+                    status = str(data.get("status", "")).lower()
+                    if status == "succeeded":
+                        return True
+                    if status == "failed":
+                        return False
+            except Exception:
+                pass
+            await asyncio.sleep(interval_seconds)
+        return False

astrbot/core/platform/sources/line/line_event.py

@@ -0,0 +1,285 @@
+import asyncio
+import os
+import re
+import uuid
+from collections.abc import AsyncGenerator
+from pathlib import Path
+
+from astrbot.api import logger
+from astrbot.api.event import AstrMessageEvent, MessageChain
+from astrbot.api.message_components import (
+    At,
+    BaseMessageComponent,
+    File,
+    Image,
+    Plain,
+    Record,
+    Video,
+)
+from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
+from astrbot.core.utils.media_utils import get_media_duration
+
+from .line_api import LineAPIClient
+
+
+class LineMessageEvent(AstrMessageEvent):
+    def __init__(
+        self,
+        message_str,
+        message_obj,
+        platform_meta,
+        session_id,
+        line_api: LineAPIClient,
+    ) -> None:
+        super().__init__(message_str, message_obj, platform_meta, session_id)
+        self.line_api = line_api
+
+    @staticmethod
+    async def _component_to_message_object(
+        segment: BaseMessageComponent,
+    ) -> dict | None:
+        if isinstance(segment, Plain):
+            text = segment.text.strip()
+            if not text:
+                return None
+            return {"type": "text", "text": text[:5000]}
+
+        if isinstance(segment, At):
+            name = str(segment.name or segment.qq or "").strip()
+            if not name:
+                return None
+            return {"type": "text", "text": f"@{name}"[:5000]}
+
+        if isinstance(segment, Image):
+            image_url = await LineMessageEvent._resolve_image_url(segment)
+            if not image_url:
+                return None
+            return {
+                "type": "image",
+                "originalContentUrl": image_url,
+                "previewImageUrl": image_url,
+            }
+
+        if isinstance(segment, Record):
+            audio_url = await LineMessageEvent._resolve_record_url(segment)
+            if not audio_url:
+                return None
+            duration = await LineMessageEvent._resolve_record_duration(segment)
+            return {
+                "type": "audio",
+                "originalContentUrl": audio_url,
+                "duration": duration,
+            }
+
+        if isinstance(segment, Video):
+            video_url = await LineMessageEvent._resolve_video_url(segment)
+            if not video_url:
+                return None
+            preview_url = await LineMessageEvent._resolve_video_preview_url(segment)
+            if not preview_url:
+                return None
+            return {
+                "type": "video",
+                "originalContentUrl": video_url,
+                "previewImageUrl": preview_url,
+            }
+
+        if isinstance(segment, File):
+            file_url = await LineMessageEvent._resolve_file_url(segment)
+            if not file_url:
+                return None
+            file_name = str(segment.name or "").strip() or "file.bin"
+            file_size = await LineMessageEvent._resolve_file_size(segment)
+            if file_size <= 0:
+                return None
+            return {
+                "type": "file",
+                "fileName": file_name,
+                "fileSize": file_size,
+                "originalContentUrl": file_url,
+            }
+
+        return None
+
+    @staticmethod
+    async def _resolve_image_url(segment: Image) -> str:
+        candidate = (segment.url or segment.file or "").strip()
+        if candidate.startswith("http://") or candidate.startswith("https://"):
+            return candidate
+        try:
+            return await segment.register_to_file_service()
+        except Exception as e:
+            logger.debug("[LINE] resolve image url failed: %s", e)
+            return ""
+
+    @staticmethod
+    async def _resolve_record_url(segment: Record) -> str:
+        candidate = (segment.url or segment.file or "").strip()
+        if candidate.startswith("http://") or candidate.startswith("https://"):
+            return candidate
+        try:
+            return await segment.register_to_file_service()
+        except Exception as e:
+            logger.debug("[LINE] resolve record url failed: %s", e)
+            return ""
+
+    @staticmethod
+    async def _resolve_record_duration(segment: Record) -> int:
+        try:
+            file_path = await segment.convert_to_file_path()
+            duration_ms = await get_media_duration(file_path)
+            if isinstance(duration_ms, int) and duration_ms > 0:
+                return duration_ms
+        except Exception as e:
+            logger.debug("[LINE] resolve record duration failed: %s", e)
+        return 1000
+
+    @staticmethod
+    async def _resolve_video_url(segment: Video) -> str:
+        candidate = (segment.file or "").strip()
+        if candidate.startswith("http://") or candidate.startswith("https://"):
+            return candidate
+        try:
+            return await segment.register_to_file_service()
+        except Exception as e:
+            logger.debug("[LINE] resolve video url failed: %s", e)
+            return ""
+
+    @staticmethod
+    async def _resolve_video_preview_url(segment: Video) -> str:
+        cover_candidate = (segment.cover or "").strip()
+        if cover_candidate.startswith("http://") or cover_candidate.startswith(
+            "https://"
+        ):
+            return cover_candidate
+
+        if cover_candidate:
+            try:
+                cover_seg = Image(file=cover_candidate)
+                return await cover_seg.register_to_file_service()
+            except Exception as e:
+                logger.debug("[LINE] resolve video cover failed: %s", e)
+
+        try:
+            video_path = await segment.convert_to_file_path()
+            temp_dir = Path(get_astrbot_temp_path())
+            temp_dir.mkdir(parents=True, exist_ok=True)
+            thumb_path = temp_dir / f"line_video_preview_{uuid.uuid4().hex}.jpg"
+
+            process = await asyncio.create_subprocess_exec(
+                "ffmpeg",
+                "-y",
+                "-ss",
+                "00:00:01",
+                "-i",
+                video_path,
+                "-frames:v",
+                "1",
+                str(thumb_path),
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+            )
+            await process.communicate()
+            if process.returncode != 0 or not thumb_path.exists():
+                return ""
+
+            cover_seg = Image.fromFileSystem(str(thumb_path))
+            return await cover_seg.register_to_file_service()
+        except Exception as e:
+            logger.debug("[LINE] generate video preview failed: %s", e)
+            return ""
+
+    @staticmethod
+    async def _resolve_file_url(segment: File) -> str:
+        if segment.url and segment.url.startswith(("http://", "https://")):
+            return segment.url
+        try:
+            return await segment.register_to_file_service()
+        except Exception as e:
+            logger.debug("[LINE] resolve file url failed: %s", e)
+            return ""
+
+    @staticmethod
+    async def _resolve_file_size(segment: File) -> int:
+        try:
+            file_path = await segment.get_file(allow_return_url=False)
+            if file_path and os.path.exists(file_path):
+                return int(os.path.getsize(file_path))
+        except Exception as e:
+            logger.debug("[LINE] resolve file size failed: %s", e)
+        return 0
+
+    @classmethod
+    async def build_line_messages(cls, message_chain: MessageChain) -> list[dict]:
+        messages: list[dict] = []
+        for segment in message_chain.chain:
+            obj = await cls._component_to_message_object(segment)
+            if obj:
+                messages.append(obj)
+
+        if not messages:
+            return []
+
+        if len(messages) > 5:
+            logger.warning(
+                "[LINE] message count exceeds 5, extra segments will be dropped."
+            )
+            messages = messages[:5]
+        return messages
+
+    async def send(self, message: MessageChain) -> None:
+        messages = await self.build_line_messages(message)
+        if not messages:
+            return
+
+        raw = self.message_obj.raw_message
+        reply_token = ""
+        if isinstance(raw, dict):
+            reply_token = str(raw.get("replyToken") or "")
+
+        sent = False
+        if reply_token:
+            sent = await self.line_api.reply_message(reply_token, messages)
+
+        if not sent:
+            target_id = self.get_group_id() or self.get_sender_id()
+            if target_id:
+                await self.line_api.push_message(target_id, messages)
+
+        await super().send(message)
+
+    async def send_streaming(
+        self,
+        generator: AsyncGenerator,
+        use_fallback: bool = False,
+    ):
+        if not use_fallback:
+            buffer = None
+            async for chain in generator:
+                if not buffer:
+                    buffer = chain
+                else:
+                    buffer.chain.extend(chain.chain)
+            if not buffer:
+                return None
+            buffer.squash_plain()
+            await self.send(buffer)
+            return await super().send_streaming(generator, use_fallback)
+
+        buffer = ""
+        pattern = re.compile(r"[^。？！~…]+[。？！~…]+")
+
+        async for chain in generator:
+            if isinstance(chain, MessageChain):
+                for comp in chain.chain:
+                    if isinstance(comp, Plain):
+                        buffer += comp.text
+                        if any(p in buffer for p in "。？！~…"):
+                            buffer = await self.process_buffer(buffer, pattern)
+                    else:
+                        await self.send(MessageChain(chain=[comp]))
+                        await asyncio.sleep(1.5)
+
+        if buffer.strip():
+            await self.send(MessageChain([Plain(buffer)]))
+        return await super().send_streaming(generator, use_fallback)

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

@@ -7,13 +7,14 @@ from typing import cast
 
 import aiofiles
 import botpy
+import botpy.errors
 import botpy.message
 import botpy.types
 import botpy.types.message
 from botpy import Client
 from botpy.http import Route
 from botpy.types import message
-from botpy.types.message import Media
+from botpy.types.message import MarkdownPayload, Media
 
 from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
@@ -24,7 +25,29 @@ from astrbot.core.utils.io import download_image_by_url, file_to_base64
 from astrbot.core.utils.tencent_record_helper import wav_to_tencent_silk
 
 
+def _patch_qq_botpy_formdata() -> None:
+    """Patch qq-botpy for aiohttp>=3.12 compatibility.
+
+    qq-botpy 1.2.1 defines botpy.http._FormData._gen_form_data() and expects
+    aiohttp.FormData to have a private flag named _is_processed, which is no
+    longer present in newer aiohttp versions.
+    """
+
+    try:
+        from botpy.http import _FormData  # type: ignore
+
+        if not hasattr(_FormData, "_is_processed"):
+            setattr(_FormData, "_is_processed", False)
+    except Exception:
+        logger.debug("[QQOfficial] Skip botpy FormData patch.")
+
+
+_patch_qq_botpy_formdata()
+
+
 class QQOfficialMessageEvent(AstrMessageEvent):
+    MARKDOWN_NOT_ALLOWED_ERROR = "不允许发送原生 markdown"
+
     def __init__(
         self,
         message_str: str,
@@ -114,7 +137,9 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             return None
 
         payload: dict = {
-            "content": plain_text,
+            # "content": plain_text,
+            "markdown": MarkdownPayload(content=plain_text) if plain_text else None,
+            "msg_type": 2,
             "msg_id": self.message_obj.message_id,
         }
 
@@ -137,6 +162,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
+                    payload.pop("markdown", None)
+                    payload["content"] = plain_text or None
                 if record_file_path:  # group record msg
                     media = await self.upload_group_and_c2c_record(
                         record_file_path,
@@ -145,9 +172,15 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
-                ret = await self.bot.api.post_group_message(
-                    group_openid=source.group_openid,
-                    **payload,
+                    payload.pop("markdown", None)
+                    payload["content"] = plain_text or None
+                ret = await self._send_with_markdown_fallback(
+                    send_func=lambda retry_payload: self.bot.api.post_group_message(
+                        group_openid=source.group_openid,  # type: ignore
+                        **retry_payload,
+                    ),
+                    payload=payload,
+                    plain_text=plain_text,
                 )
 
             case botpy.message.C2CMessage():
@@ -159,6 +192,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
+                    payload.pop("markdown", None)
+                    payload["content"] = plain_text or None
                 if record_file_path:  # c2c record
                     media = await self.upload_group_and_c2c_record(
                         record_file_path,
@@ -167,31 +202,56 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
+                    payload.pop("markdown", None)
+                    payload["content"] = plain_text or None
                 if stream:
-                    ret = await self.post_c2c_message(
-                        openid=source.author.user_openid,
-                        **payload,
-                        stream=stream,
+                    ret = await self._send_with_markdown_fallback(
+                        send_func=lambda retry_payload: self.post_c2c_message(
+                            openid=source.author.user_openid,
+                            **retry_payload,
+                            stream=stream,
+                        ),
+                        payload=payload,
+                        plain_text=plain_text,
                     )
                 else:
-                    ret = await self.post_c2c_message(
-                        openid=source.author.user_openid,
-                        **payload,
+                    ret = await self._send_with_markdown_fallback(
+                        send_func=lambda retry_payload: self.post_c2c_message(
+                            openid=source.author.user_openid,
+                            **retry_payload,
+                        ),
+                        payload=payload,
+                        plain_text=plain_text,
                     )
                 logger.debug(f"Message sent to C2C: {ret}")
 
             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,
+                # Guild text-channel send API (/channels/{channel_id}/messages) does not use v2 msg_type.
+                payload.pop("msg_type", None)
+                ret = await self._send_with_markdown_fallback(
+                    send_func=lambda retry_payload: self.bot.api.post_message(
+                        channel_id=source.channel_id,
+                        **retry_payload,
+                    ),
+                    payload=payload,
+                    plain_text=plain_text,
                 )
 
             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)
+                # Guild DM send API (/dms/{guild_id}/messages) does not use v2 msg_type.
+                payload.pop("msg_type", None)
+                ret = await self._send_with_markdown_fallback(
+                    send_func=lambda retry_payload: self.bot.api.post_dms(
+                        guild_id=source.guild_id,
+                        **retry_payload,
+                    ),
+                    payload=payload,
+                    plain_text=plain_text,
+                )
 
             case _:
                 pass
@@ -202,6 +262,32 @@ class QQOfficialMessageEvent(AstrMessageEvent):
 
         return ret
 
+    async def _send_with_markdown_fallback(
+        self,
+        send_func,
+        payload: dict,
+        plain_text: str,
+    ):
+        try:
+            return await send_func(payload)
+        except botpy.errors.ServerError as err:
+            if (
+                self.MARKDOWN_NOT_ALLOWED_ERROR not in str(err)
+                or not payload.get("markdown")
+                or not plain_text
+            ):
+                raise
+
+            logger.warning(
+                "[QQOfficial] markdown 发送被拒绝，回退到 content 模式重试。"
+            )
+            fallback_payload = payload.copy()
+            fallback_payload["markdown"] = None
+            fallback_payload["content"] = plain_text
+            if fallback_payload.get("msg_type") == 2:
+                fallback_payload["msg_type"] = 0
+            return await send_func(fallback_payload)
+
     async def upload_group_and_c2c_image(
         self,
         image_base64: str,

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

@@ -1,7 +1,9 @@
 import asyncio
+import os
 import re
 import sys
 import uuid
+from typing import cast
 
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from telegram import BotCommand, Update
@@ -25,6 +27,9 @@ from astrbot.core.star.filter.command import CommandFilter
 from astrbot.core.star.filter.command_group import CommandGroupFilter
 from astrbot.core.star.star import star_map
 from astrbot.core.star.star_handler import star_handlers_registry
+from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
+from astrbot.core.utils.io import download_file
+from astrbot.core.utils.media_utils import convert_audio_to_wav
 
 from .tg_event import TelegramPlatformEvent
 
@@ -174,14 +179,19 @@ class TelegramPlatformAdapter(Platform):
             if not handler_metadata.enabled:
                 continue
             for event_filter in handler_metadata.event_filters:
-                cmd_info = self._extract_command_info(
+                cmd_info_list = self._extract_command_info(
                     event_filter,
                     handler_metadata,
                     skip_commands,
                 )
-                if cmd_info:
-                    cmd_name, description = cmd_info
-                    command_dict.setdefault(cmd_name, description)
+                if cmd_info_list:
+                    for cmd_name, description in cmd_info_list:
+                        if cmd_name in command_dict:
+                            logger.warning(
+                                f"命令名 '{cmd_name}' 重复注册，将使用首次注册的定义: "
+                                f"'{command_dict[cmd_name]}'"
+                            )
+                        command_dict.setdefault(cmd_name, description)
 
         commands_a = sorted(command_dict.keys())
         return [BotCommand(cmd, command_dict[cmd]) for cmd in commands_a]
@@ -191,9 +201,9 @@ class TelegramPlatformAdapter(Platform):
         event_filter,
         handler_metadata,
         skip_commands: set,
-    ) -> tuple[str, str] | None:
-        """从事件过滤器中提取指令信息"""
-        cmd_name = None
+    ) -> list[tuple[str, str]] | None:
+        """从事件过滤器中提取指令信息，包括所有别名"""
+        cmd_names = []
         is_group = False
         if isinstance(event_filter, CommandFilter) and event_filter.command_name:
             if (
@@ -201,26 +211,32 @@ class TelegramPlatformAdapter(Platform):
                 and event_filter.parent_command_names != [""]
             ):
                 return None
-            cmd_name = event_filter.command_name
+            # 收集主命令名和所有别名
+            cmd_names = [event_filter.command_name]
+            if event_filter.alias:
+                cmd_names.extend(event_filter.alias)
         elif isinstance(event_filter, CommandGroupFilter):
             if event_filter.parent_group:
                 return None
-            cmd_name = event_filter.group_name
+            cmd_names = [event_filter.group_name]
             is_group = True
 
-        if not cmd_name or cmd_name in skip_commands:
-            return None
+        result = []
+        for cmd_name in cmd_names:
+            if not cmd_name or cmd_name in skip_commands:
+                continue
+            if not re.match(r"^[a-z0-9_]+$", cmd_name) or len(cmd_name) > 32:
+                continue
 
-        if not re.match(r"^[a-z0-9_]+$", cmd_name) or len(cmd_name) > 32:
-            return None
+            # Build description.
+            description = handler_metadata.desc or (
+                f"Command group: {cmd_name}" if is_group else f"Command: {cmd_name}"
+            )
+            if len(description) > 30:
+                description = description[:30] + "..."
+            result.append((cmd_name, description))
 
-        # Build description.
-        description = handler_metadata.desc or (
-            f"指令组: {cmd_name} (包含多个子指令)" if is_group else f"指令: {cmd_name}"
-        )
-        if len(description) > 30:
-            description = description[:30] + "..."
-        return cmd_name, description
+        return result if result else None
 
     async def start(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
         if not update.effective_chat:
@@ -364,8 +380,19 @@ class TelegramPlatformAdapter(Platform):
 
         elif update.message.voice:
             file = await update.message.voice.get_file()
+
+            file_basename = os.path.basename(cast(str, file.file_path))
+            temp_dir = get_astrbot_temp_path()
+            temp_path = os.path.join(temp_dir, file_basename)
+            await download_file(cast(str, file.file_path), path=temp_path)
+            path_wav = os.path.join(
+                temp_dir,
+                f"{file_basename}.wav",
+            )
+            path_wav = await convert_audio_to_wav(temp_path, path_wav)
+
             message.message = [
-                Comp.Record(file=file.file_path, url=file.file_path),
+                Comp.Record(file=path_wav, url=path_wav),
             ]
 
         elif update.message.photo:

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

@@ -6,6 +6,7 @@ from typing import Any, cast
 import telegramify_markdown
 from telegram import ReactionTypeCustomEmoji, ReactionTypeEmoji
 from telegram.constants import ChatAction
+from telegram.error import BadRequest
 from telegram.ext import ExtBot
 
 from astrbot import logger
@@ -17,6 +18,7 @@ from astrbot.api.message_components import (
     Plain,
     Record,
     Reply,
+    Video,
 )
 from astrbot.api.platform import AstrBotMessage, MessageType, PlatformMetadata
 
@@ -35,6 +37,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
     # 消息类型到 chat action 的映射，用于优先级判断
     ACTION_BY_TYPE: dict[type, str] = {
         Record: ChatAction.UPLOAD_VOICE,
+        Video: ChatAction.UPLOAD_VIDEO,
         File: ChatAction.UPLOAD_DOCUMENT,
         Image: ChatAction.UPLOAD_PHOTO,
         Plain: ChatAction.TYPING,
@@ -113,11 +116,82 @@ class TelegramPlatformEvent(AstrMessageEvent):
         **payload: Any,
     ) -> None:
         """发送媒体时显示 upload action，发送完成后恢复 typing"""
-        await cls._send_chat_action(client, user_name, upload_action, message_thread_id)
-        await send_coro(**payload)
-        await cls._send_chat_action(
-            client, user_name, ChatAction.TYPING, message_thread_id
+        effective_thread_id = message_thread_id or cast(
+            str | None, payload.get("message_thread_id")
         )
+        await cls._send_chat_action(
+            client, user_name, upload_action, effective_thread_id
+        )
+        send_payload = dict(payload)
+        if effective_thread_id and "message_thread_id" not in send_payload:
+            send_payload["message_thread_id"] = effective_thread_id
+        await send_coro(**send_payload)
+        await cls._send_chat_action(
+            client, user_name, ChatAction.TYPING, effective_thread_id
+        )
+
+    @classmethod
+    async def _send_voice_with_fallback(
+        cls,
+        client: ExtBot,
+        path: str,
+        payload: dict[str, Any],
+        *,
+        caption: str | None = None,
+        user_name: str = "",
+        message_thread_id: str | None = None,
+        use_media_action: bool = False,
+    ) -> None:
+        """Send a voice message, falling back to a document if the user's
+        privacy settings forbid voice messages (``BadRequest`` with
+        ``Voice_messages_forbidden``).
+
+        When *use_media_action* is ``True`` the helper wraps the send calls
+        with ``_send_media_with_action`` (used by the streaming path).
+        """
+        try:
+            if use_media_action:
+                media_payload = dict(payload)
+                if message_thread_id and "message_thread_id" not in media_payload:
+                    media_payload["message_thread_id"] = message_thread_id
+                await cls._send_media_with_action(
+                    client,
+                    ChatAction.UPLOAD_VOICE,
+                    client.send_voice,
+                    user_name=user_name,
+                    voice=path,
+                    **cast(Any, media_payload),
+                )
+            else:
+                await client.send_voice(voice=path, **cast(Any, payload))
+        except BadRequest as e:
+            # python-telegram-bot raises BadRequest for Voice_messages_forbidden;
+            # distinguish the voice-privacy case via the API error message.
+            if "Voice_messages_forbidden" not in e.message:
+                raise
+            logger.warning(
+                "User privacy settings prevent receiving voice messages, falling back to sending an audio file. "
+                "To enable voice messages, go to Telegram Settings → Privacy and Security → Voice Messages → set to 'Everyone'."
+            )
+            if use_media_action:
+                media_payload = dict(payload)
+                if message_thread_id and "message_thread_id" not in media_payload:
+                    media_payload["message_thread_id"] = message_thread_id
+                await cls._send_media_with_action(
+                    client,
+                    ChatAction.UPLOAD_DOCUMENT,
+                    client.send_document,
+                    user_name=user_name,
+                    document=path,
+                    caption=caption,
+                    **cast(Any, media_payload),
+                )
+            else:
+                await client.send_document(
+                    document=path,
+                    caption=caption,
+                    **cast(Any, payload),
+                )
 
     async def _ensure_typing(
         self,
@@ -211,7 +285,20 @@ class TelegramPlatformEvent(AstrMessageEvent):
                 )
             elif isinstance(i, Record):
                 path = await i.convert_to_file_path()
-                await client.send_voice(voice=path, **cast(Any, payload))
+                await cls._send_voice_with_fallback(
+                    client,
+                    path,
+                    payload,
+                    caption=i.text or None,
+                    use_media_action=False,
+                )
+            elif isinstance(i, Video):
+                path = await i.convert_to_file_path()
+                await client.send_video(
+                    video=path,
+                    caption=getattr(i, "text", None) or None,
+                    **cast(Any, payload),
+                )
 
     async def send(self, message: MessageChain) -> None:
         if self.get_message_type() == MessageType.GROUP_MESSAGE:
@@ -267,7 +354,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
             "chat_id": user_name,
         }
         if message_thread_id:
-            payload["reply_to_message_id"] = message_thread_id
+            payload["message_thread_id"] = message_thread_id
 
         delta = ""
         current_content = ""
@@ -309,7 +396,6 @@ class TelegramPlatformEvent(AstrMessageEvent):
                             ChatAction.UPLOAD_PHOTO,
                             self.client.send_photo,
                             user_name=user_name,
-                            message_thread_id=message_thread_id,
                             photo=image_path,
                             **cast(Any, payload),
                         )
@@ -322,7 +408,6 @@ class TelegramPlatformEvent(AstrMessageEvent):
                             ChatAction.UPLOAD_DOCUMENT,
                             self.client.send_document,
                             user_name=user_name,
-                            message_thread_id=message_thread_id,
                             document=path,
                             filename=name,
                             **cast(Any, payload),
@@ -330,13 +415,24 @@ class TelegramPlatformEvent(AstrMessageEvent):
                         continue
                     elif isinstance(i, Record):
                         path = await i.convert_to_file_path()
-                        await self._send_media_with_action(
+                        await self._send_voice_with_fallback(
                             self.client,
-                            ChatAction.UPLOAD_VOICE,
-                            self.client.send_voice,
+                            path,
+                            payload,
+                            caption=i.text or delta or None,
                             user_name=user_name,
                             message_thread_id=message_thread_id,
-                            voice=path,
+                            use_media_action=True,
+                        )
+                        continue
+                    elif isinstance(i, Video):
+                        path = await i.convert_to_file_path()
+                        await self._send_media_with_action(
+                            self.client,
+                            ChatAction.UPLOAD_VIDEO,
+                            self.client.send_video,
+                            user_name=user_name,
+                            video=path,
                             **cast(Any, payload),
                         )
                         continue

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

@@ -11,13 +11,13 @@ from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
 from .webchat_queue_mgr import webchat_queue_mgr
 
-imgs_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")
+attachments_dir = os.path.join(get_astrbot_data_path(), "attachments")
 
 
 class WebChatMessageEvent(AstrMessageEvent):
     def __init__(self, message_str, message_obj, platform_meta, session_id) -> None:
         super().__init__(message_str, message_obj, platform_meta, session_id)
-        os.makedirs(imgs_dir, exist_ok=True)
+        os.makedirs(attachments_dir, exist_ok=True)
 
     @staticmethod
     async def _send(
@@ -69,7 +69,7 @@ class WebChatMessageEvent(AstrMessageEvent):
             elif isinstance(comp, Image):
                 # save image to local
                 filename = f"{str(uuid.uuid4())}.jpg"
-                path = os.path.join(imgs_dir, filename)
+                path = os.path.join(attachments_dir, filename)
                 image_base64 = await comp.convert_to_base64()
                 with open(path, "wb") as f:
                     f.write(base64.b64decode(image_base64))
@@ -85,7 +85,7 @@ class WebChatMessageEvent(AstrMessageEvent):
             elif isinstance(comp, Record):
                 # save record to local
                 filename = f"{str(uuid.uuid4())}.wav"
-                path = os.path.join(imgs_dir, filename)
+                path = os.path.join(attachments_dir, filename)
                 record_base64 = await comp.convert_to_base64()
                 with open(path, "wb") as f:
                     f.write(base64.b64decode(record_base64))
@@ -104,7 +104,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                 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)
+                dest_path = os.path.join(attachments_dir, filename)
                 shutil.copy2(file_path, dest_path)
                 data = f"[FILE]{filename}"
                 await web_chat_back_queue.put(

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

@@ -1,13 +1,14 @@
 import asyncio
 import os
 import sys
+import time
 import uuid
-from collections.abc import Awaitable, Callable
+from collections.abc import Callable, Coroutine
 from typing import Any, cast
 
 import quart
 from requests import Response
-from wechatpy import WeChatClient, parse_message
+from wechatpy import WeChatClient, create_reply, parse_message
 from wechatpy.crypto import WeChatCrypto
 from wechatpy.exceptions import InvalidSignatureException
 from wechatpy.messages import BaseMessage, ImageMessage, TextMessage, VoiceMessage
@@ -38,7 +39,12 @@ else:
 
 
 class WeixinOfficialAccountServer:
-    def __init__(self, event_queue: asyncio.Queue, config: dict) -> None:
+    def __init__(
+        self,
+        event_queue: asyncio.Queue,
+        config: dict,
+        user_buffer: dict[Any, dict[str, Any]],
+    ) -> None:
         self.server = quart.Quart(__name__)
         self.port = int(cast(int | str, config.get("port")))
         self.callback_server_host = config.get("callback_server_host", "0.0.0.0")
@@ -59,9 +65,15 @@ class WeixinOfficialAccountServer:
 
         self.event_queue = event_queue
 
-        self.callback: Callable[[BaseMessage], Awaitable[None]] | None = None
+        self.callback: (
+            Callable[[BaseMessage], Coroutine[Any, Any, str | None]] | None
+        ) = None
         self.shutdown_event = asyncio.Event()
 
+        self._wx_msg_time_out = 4.0  # 微信服务器要求 5 秒内回复
+        self.user_buffer: dict[str, dict[str, Any]] = user_buffer  # from_user -> state
+        self.active_send_mode = False  # 是否启用主动发送模式，启用后 callback 将直接返回回复内容，无需等待微信回调
+
     async def verify(self):
         """内部服务器的 GET 验证入口"""
         return await self.handle_verify(quart.request)
@@ -98,6 +110,22 @@ class WeixinOfficialAccountServer:
         """内部服务器的 POST 回调入口"""
         return await self.handle_callback(quart.request)
 
+    def _maybe_encrypt(self, xml: str, nonce: str | None, timestamp: str | None) -> str:
+        if xml and "<Encrypt>" not in xml and nonce and timestamp:
+            return self.crypto.encrypt_message(xml, nonce, timestamp)
+        return xml or "success"
+
+    def _preview(self, msg: BaseMessage, limit: int = 24) -> str:
+        """生成消息预览文本，供占位符使用"""
+        if isinstance(msg, TextMessage):
+            t = cast(str, msg.content).strip()
+            return (t[:limit] + "...") if len(t) > limit else (t or "空消息")
+        if isinstance(msg, ImageMessage):
+            return "图片"
+        if isinstance(msg, VoiceMessage):
+            return "语音"
+        return getattr(msg, "type", "未知消息")
+
     async def handle_callback(self, request) -> str:
         """处理回调请求，可被统一 webhook 入口复用
 
@@ -123,14 +151,152 @@ class WeixinOfficialAccountServer:
                 raise
             logger.info(f"解析成功: {msg}")
 
-            if self.callback:
+            if not self.callback:
+                return "success"
+
+            # by pass passive reply logic and return active reply directly.
+            if self.active_send_mode:
                 result_xml = await self.callback(msg)
                 if not result_xml:
                     return "success"
                 if isinstance(result_xml, str):
                     return result_xml
 
-        return "success"
+            # passive reply
+            from_user = str(getattr(msg, "source", ""))
+            msg_id = str(cast(str | int, getattr(msg, "id", "")))
+            state = self.user_buffer.get(from_user)
+
+            def _reply_text(text: str) -> str:
+                reply_obj = create_reply(text, msg)
+                reply_xml = reply_obj if isinstance(reply_obj, str) else str(reply_obj)
+                return self._maybe_encrypt(reply_xml, nonce, timestamp)
+
+            # if in cached state, return cached result or placeholder
+            if state:
+                logger.debug(f"用户消息缓冲状态: user={from_user} state={state}")
+                cached = state.get("cached_xml")
+                # send one cached each time, if cached is empty after pop, remove the buffer
+                if cached and len(cached) > 0:
+                    logger.info(f"wx buffer hit on trigger: user={from_user}")
+                    cached_xml = cached.pop(0)
+                    if len(cached) == 0:
+                        self.user_buffer.pop(from_user, None)
+                        return _reply_text(cached_xml)
+                    else:
+                        return _reply_text(
+                            cached_xml
+                            + "\n【后续消息还在缓冲中，回复任意文字继续获取】"
+                        )
+
+                task: asyncio.Task | None = cast(asyncio.Task | None, state.get("task"))
+                placeholder = (
+                    f"【正在思考'{state.get('preview', '...')}'中，已思考"
+                    f"{int(time.monotonic() - state.get('started_at', time.monotonic()))}s，回复任意文字尝试获取回复】"
+                )
+
+                # same msgid => WeChat retry: wait a little; new msgid => user trigger: just placeholder
+                if task and state.get("msg_id") == msg_id:
+                    done, _ = await asyncio.wait(
+                        {task},
+                        timeout=self._wx_msg_time_out,
+                        return_when=asyncio.FIRST_COMPLETED,
+                    )
+                    if done:
+                        try:
+                            cached = state.get("cached_xml")
+                            # send one cached each time, if cached is empty after pop, remove the buffer
+                            if cached and len(cached) > 0:
+                                logger.info(
+                                    f"wx buffer hit on retry window: user={from_user}"
+                                )
+                                cached_xml = cached.pop(0)
+                                if len(cached) == 0:
+                                    self.user_buffer.pop(from_user, None)
+                                    logger.debug(
+                                        f"wx finished message sending in passive window: user={from_user} msg_id={msg_id} "
+                                    )
+                                    return _reply_text(cached_xml)
+                                else:
+                                    logger.debug(
+                                        f"wx finished message sending in passive window but not final: user={from_user} msg_id={msg_id} "
+                                    )
+                                    return _reply_text(
+                                        cached_xml
+                                        + "\n【后续消息还在缓冲中，回复任意文字继续获取】"
+                                    )
+                            logger.info(
+                                f"wx finished in window but not final; return placeholder: user={from_user} msg_id={msg_id} "
+                            )
+                            return _reply_text(placeholder)
+                        except Exception:
+                            logger.critical(
+                                "wx task failed in passive window", exc_info=True
+                            )
+                            self.user_buffer.pop(from_user, None)
+                            return _reply_text("处理消息失败，请稍后再试。")
+
+                    logger.info(
+                        f"wx passive window timeout: user={from_user} msg_id={msg_id}"
+                    )
+                    return _reply_text(placeholder)
+
+                logger.debug(f"wx trigger while thinking: user={from_user}")
+                return _reply_text(placeholder)
+
+            # create new trigger when state is empty, and store state in buffer
+            logger.debug(f"wx new trigger: user={from_user} msg_id={msg_id}")
+            preview = self._preview(msg)
+            placeholder = (
+                f"【正在思考'{preview}'中，已思考0s，回复任意文字尝试获取回复】"
+            )
+            logger.info(
+                f"wx start task: user={from_user} msg_id={msg_id} preview={preview}"
+            )
+
+            self.user_buffer[from_user] = state = {
+                "msg_id": msg_id,
+                "preview": preview,
+                "task": None,  # set later after task created
+                "cached_xml": [],  # for passive reply
+                "started_at": time.monotonic(),
+            }
+            self.user_buffer[from_user]["task"] = task = asyncio.create_task(
+                self.callback(msg)
+            )
+
+            # immediate return if done
+            done, _ = await asyncio.wait(
+                {task},
+                timeout=self._wx_msg_time_out,
+                return_when=asyncio.FIRST_COMPLETED,
+            )
+            if done:
+                try:
+                    cached = state.get("cached_xml", None)
+                    # send one cached each time, if cached is empty after pop, remove the buffer
+                    if cached and len(cached) > 0:
+                        logger.info(f"wx buffer hit immediately: user={from_user}")
+                        cached_xml = cached.pop(0)
+                        if len(cached) == 0:
+                            self.user_buffer.pop(from_user, None)
+                            return _reply_text(cached_xml)
+                        else:
+                            return _reply_text(
+                                cached_xml
+                                + "\n【后续消息还在缓冲中，回复任意文字继续获取】"
+                            )
+                    logger.info(
+                        f"wx not finished in first window; return placeholder: user={from_user} msg_id={msg_id} "
+                    )
+                    return _reply_text(placeholder)
+                except Exception:
+                    logger.critical("wx task failed in first window", exc_info=True)
+                    self.user_buffer.pop(from_user, None)
+                    return _reply_text("处理消息失败，请稍后再试。")
+
+            logger.info(f"wx first window timeout: user={from_user} msg_id={msg_id}")
+            return _reply_text(placeholder)
 
     async def start_polling(self) -> None:
         logger.info(
@@ -176,7 +342,10 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
         if not self.api_base_url.endswith("/"):
             self.api_base_url += "/"
 
-        self.server = WeixinOfficialAccountServer(self._event_queue, self.config)
+        self.user_buffer: dict[str, dict[str, Any]] = {}  # from_user -> state
+        self.server = WeixinOfficialAccountServer(
+            self._event_queue, self.config, self.user_buffer
+        )
 
         self.client = WeChatClient(
             self.config["appid"].strip(),
@@ -193,28 +362,33 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
             try:
                 if self.active_send_mode:
                     await self.convert_message(msg, None)
+                    return None
+
+                msg_id = str(cast(str | int, msg.id))
+                future = self.wexin_event_workers.get(msg_id)
+                if future:
+                    logger.debug(f"duplicate message id checked: {msg.id}")
                 else:
-                    if str(msg.id) in self.wexin_event_workers:
-                        future = self.wexin_event_workers[str(cast(str | int, 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
-                        await self.convert_message(msg, future)
+                    future = asyncio.get_event_loop().create_future()
+                    self.wexin_event_workers[msg_id] = future
+                    await self.convert_message(msg, future)
                     # I love shield so much!
                     result = await asyncio.wait_for(
                         asyncio.shield(future),
-                        60,
-                    )  # wait for 60s
-                    logger.debug(f"Got future result: {result}")
-                    self.wexin_event_workers.pop(str(cast(str | int, msg.id)), None)
-                    return result  # xml. see weixin_offacc_event.py
+                        180,
+                    )  # wait for 180s
+                logger.debug(f"Got future result: {result}")
+                return result
             except asyncio.TimeoutError:
-                pass
+                logger.info(f"callback 处理消息超时: message_id={msg.id}")
+                return create_reply("处理消息超时，请稍后再试。", msg)
             except Exception as e:
                 logger.error(f"转换消息时出现异常: {e}")
+            finally:
+                self.wexin_event_workers.pop(str(cast(str | int, msg.id)), None)
 
         self.server.callback = callback
+        self.server.active_send_mode = self.active_send_mode
 
     @override
     async def send_by_session(
@@ -336,12 +510,19 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
         await self.handle_msg(abm)
 
     async def handle_msg(self, message: AstrBotMessage) -> None:
+        buffer = self.user_buffer.get(message.sender.user_id, None)
+        if buffer is None:
+            logger.critical(
+                f"用户消息未找到缓冲状态，无法处理消息: user={message.sender.user_id} message_id={message.message_id}"
+            )
+            return
         message_event = WeixinOfficialAccountPlatformEvent(
             message_str=message.message_str,
             message_obj=message,
             platform_meta=self.meta(),
             session_id=message.session_id,
             client=self.client,
+            message_out=buffer,
         )
         self.commit_event(message_event)
 

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

@@ -1,9 +1,9 @@
 import asyncio
 import os
-from typing import cast
+from typing import Any, cast
 
 from wechatpy import WeChatClient
-from wechatpy.replies import ImageReply, TextReply, VoiceReply
+from wechatpy.replies import ImageReply, VoiceReply
 
 from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
@@ -20,9 +20,11 @@ class WeixinOfficialAccountPlatformEvent(AstrMessageEvent):
         platform_meta: PlatformMetadata,
         session_id: str,
         client: WeChatClient,
+        message_out: dict[Any, Any],
     ) -> None:
         super().__init__(message_str, message_obj, platform_meta, session_id)
         self.client = client
+        self.message_out = message_out
 
     @staticmethod
     async def send_with_client(
@@ -32,8 +34,8 @@ class WeixinOfficialAccountPlatformEvent(AstrMessageEvent):
     ) -> None:
         pass
 
-    async def split_plain(self, plain: str) -> list[str]:
-        """将长文本分割成多个小文本, 每个小文本长度不超过 2048 字符
+    async def split_plain(self, plain: str, max_length: int = 1024) -> list[str]:
+        """将长文本分割成多个小文本, 每个小文本长度不超过 max_length 字符
 
         Args:
             plain (str): 要分割的长文本
@@ -41,18 +43,18 @@ class WeixinOfficialAccountPlatformEvent(AstrMessageEvent):
             list[str]: 分割后的文本列表
 
         """
-        if len(plain) <= 2048:
+        if len(plain) <= max_length:
             return [plain]
         result = []
         start = 0
         while start < len(plain):
-            # 剩下的字符串长度<2048时结束
-            if start + 2048 >= len(plain):
+            # 剩下的字符串长度<max_length时结束
+            if start + max_length >= len(plain):
                 result.append(plain[start:])
                 break
 
             # 向前搜索分割标点符号
-            end = min(start + 2048, len(plain))
+            end = min(start + max_length, len(plain))
             cut_position = end
             for i in range(end, start, -1):
                 if i < len(plain) and plain[i - 1] in [
@@ -87,19 +89,15 @@ class WeixinOfficialAccountPlatformEvent(AstrMessageEvent):
             if isinstance(comp, Plain):
                 # Split long text messages if needed
                 plain_chunks = await self.split_plain(comp.text)
-                for chunk in plain_chunks:
-                    if active_send_mode:
+                if active_send_mode:
+                    for chunk in plain_chunks:
                         self.client.message.send_text(message_obj.sender.user_id, chunk)
-                    else:
-                        reply = TextReply(
-                            content=chunk,
-                            message=cast(dict, self.message_obj.raw_message)["message"],
-                        )
-                        xml = reply.render()
-                        future = cast(dict, self.message_obj.raw_message)["future"]
-                        assert isinstance(future, asyncio.Future)
-                        future.set_result(xml)
-                    await asyncio.sleep(0.5)  # Avoid sending too fast
+                else:
+                    # disable passive sending, just store the chunks in
+                    logger.debug(
+                        f"split plain into {len(plain_chunks)} chunks for passive reply. Message not sent."
+                    )
+                    self.message_out["cached_xml"] = plain_chunks
             elif isinstance(comp, Image):
                 img_path = await comp.convert_to_file_path()
 

astrbot/core/provider/manager.py

@@ -295,6 +295,16 @@ class ProviderManager:
                 from .sources.zhipu_source import ProviderZhipu as ProviderZhipu
             case "groq_chat_completion":
                 from .sources.groq_source import ProviderGroq as ProviderGroq
+            case "xai_chat_completion":
+                from .sources.xai_source import ProviderXAI as ProviderXAI
+            case "aihubmix_chat_completion":
+                from .sources.oai_aihubmix_source import (
+                    ProviderAIHubMix as ProviderAIHubMix,
+                )
+            case "openrouter_chat_completion":
+                from .sources.openrouter_source import (
+                    ProviderOpenRouter as ProviderOpenRouter,
+                )
             case "anthropic_chat_completion":
                 from .sources.anthropic_source import (
                     ProviderAnthropic as ProviderAnthropic,

astrbot/core/provider/sources/anthropic_source.py

@@ -33,20 +33,29 @@ class ProviderAnthropic(Provider):
         self,
         provider_config,
         provider_settings,
+        *,
+        use_api_key: bool = True,
     ) -> None:
         super().__init__(
             provider_config,
             provider_settings,
         )
 
-        self.chosen_api_key: str = ""
-        self.api_keys: list = super().get_keys()
-        self.chosen_api_key = self.api_keys[0] if len(self.api_keys) > 0 else ""
         self.base_url = provider_config.get("api_base", "https://api.anthropic.com")
         self.timeout = provider_config.get("timeout", 120)
         if isinstance(self.timeout, str):
             self.timeout = int(self.timeout)
+        self.thinking_config = provider_config.get("anth_thinking_config", {})
 
+        if use_api_key:
+            self._init_api_key(provider_config)
+
+        self.set_model(provider_config.get("model", "unknown"))
+
+    def _init_api_key(self, provider_config: dict) -> None:
+        self.chosen_api_key: str = ""
+        self.api_keys: list = super().get_keys()
+        self.chosen_api_key = self.api_keys[0] if len(self.api_keys) > 0 else ""
         self.client = AsyncAnthropic(
             api_key=self.chosen_api_key,
             timeout=self.timeout,
@@ -54,15 +63,27 @@ class ProviderAnthropic(Provider):
             http_client=self._create_http_client(provider_config),
         )
 
-        self.thinking_config = provider_config.get("anth_thinking_config", {})
-
-        self.set_model(provider_config.get("model", "unknown"))
-
     def _create_http_client(self, provider_config: dict) -> httpx.AsyncClient | None:
         """创建带代理的 HTTP 客户端"""
         proxy = provider_config.get("proxy", "")
         return create_proxy_client("Anthropic", proxy)
 
+    def _apply_thinking_config(self, payloads: dict) -> None:
+        thinking_type = self.thinking_config.get("type", "")
+        if thinking_type == "adaptive":
+            payloads["thinking"] = {"type": "adaptive"}
+            effort = self.thinking_config.get("effort", "")
+            output_cfg = dict(payloads.get("output_config", {}))
+            if effort:
+                output_cfg["effort"] = effort
+            if output_cfg:
+                payloads["output_config"] = output_cfg
+        elif not thinking_type and self.thinking_config.get("budget"):
+            payloads["thinking"] = {
+                "budget_tokens": self.thinking_config.get("budget"),
+                "type": "enabled",
+            }
+
     def _prepare_payload(self, messages: list[dict]):
         """准备 Anthropic API 的请求 payload
 
@@ -213,11 +234,7 @@ class ProviderAnthropic(Provider):
 
         if "max_tokens" not in payloads:
             payloads["max_tokens"] = 1024
-        if self.thinking_config.get("budget"):
-            payloads["thinking"] = {
-                "budget_tokens": self.thinking_config.get("budget"),
-                "type": "enabled",
-            }
+        self._apply_thinking_config(payloads)
 
         try:
             completion = await self.client.messages.create(
@@ -287,11 +304,7 @@ class ProviderAnthropic(Provider):
 
         if "max_tokens" not in payloads:
             payloads["max_tokens"] = 1024
-        if self.thinking_config.get("budget"):
-            payloads["thinking"] = {
-                "budget_tokens": self.thinking_config.get("budget"),
-                "type": "enabled",
-            }
+        self._apply_thinking_config(payloads)
 
         async with self.client.messages.stream(
             **payloads, extra_body=extra_body

astrbot/core/provider/sources/gemini_embedding_source.py

@@ -48,6 +48,9 @@ class GeminiEmbeddingProvider(EmbeddingProvider):
             result = await self.client.models.embed_content(
                 model=self.model,
                 contents=text,
+                config=types.EmbedContentConfig(
+                    output_dimensionality=self.get_dim(),
+                ),
             )
             assert result.embeddings is not None
             assert result.embeddings[0].values is not None
@@ -61,6 +64,9 @@ class GeminiEmbeddingProvider(EmbeddingProvider):
             result = await self.client.models.embed_content(
                 model=self.model,
                 contents=cast(types.ContentListUnion, text),
+                config=types.EmbedContentConfig(
+                    output_dimensionality=self.get_dim(),
+                ),
             )
             assert result.embeddings is not None
 

astrbot/core/provider/sources/oai_aihubmix_source.py

@@ -0,0 +1,17 @@
+from ..register import register_provider_adapter
+from .openai_source import ProviderOpenAIOfficial
+
+
+@register_provider_adapter(
+    "aihubmix_chat_completion", "AIHubMix Chat Completion Provider Adapter"
+)
+class ProviderAIHubMix(ProviderOpenAIOfficial):
+    def __init__(
+        self,
+        provider_config: dict,
+        provider_settings: dict,
+    ) -> None:
+        super().__init__(provider_config, provider_settings)
+        # Reference to: https://aihubmix.com/appstore
+        # Use this code can enjoy 10% off prices for AIHubMix API calls.
+        self.client._custom_headers["APP-Code"] = "KRLC5702"  # type: ignore

astrbot/core/provider/sources/openai_embedding_source.py

@@ -23,12 +23,16 @@ class OpenAIEmbeddingProvider(EmbeddingProvider):
         if proxy:
             logger.info(f"[OpenAI Embedding] 使用代理: {proxy}")
             http_client = httpx.AsyncClient(proxy=proxy)
+        api_base = provider_config.get("embedding_api_base", "").strip()
+        if not api_base:
+            api_base = "https://api.openai.com/v1"
+        else:
+            api_base = api_base.removesuffix("/")
+            if not api_base.endswith("/v1"):
+                api_base = f"{api_base}/v1"
         self.client = AsyncOpenAI(
             api_key=provider_config.get("embedding_api_key"),
-            base_url=provider_config.get(
-                "embedding_api_base",
-                "https://api.openai.com/v1",
-            ),
+            base_url=api_base,
             timeout=int(provider_config.get("timeout", 20)),
             http_client=http_client,
         )
@@ -36,12 +40,20 @@ class OpenAIEmbeddingProvider(EmbeddingProvider):
 
     async def get_embedding(self, text: str) -> list[float]:
         """获取文本的嵌入"""
-        embedding = await self.client.embeddings.create(input=text, model=self.model)
+        embedding = await self.client.embeddings.create(
+            input=text,
+            model=self.model,
+            dimensions=self.get_dim(),
+        )
         return embedding.data[0].embedding
 
     async def get_embeddings(self, text: list[str]) -> list[list[float]]:
         """批量获取文本的嵌入"""
-        embeddings = await self.client.embeddings.create(input=text, model=self.model)
+        embeddings = await self.client.embeddings.create(
+            input=text,
+            model=self.model,
+            dimensions=self.get_dim(),
+        )
         return [item.embedding for item in embeddings.data]
 
     def get_dim(self) -> int:

astrbot/core/provider/sources/openai_source.py

@@ -323,7 +323,8 @@ class ProviderOpenAIOfficial(Provider):
                 llm_response.reasoning_content = reasoning
                 _y = True
             if delta.content:
-                completion_text = delta.content
+                # Don't strip streaming chunks to preserve spaces between words
+                completion_text = self._normalize_content(delta.content, strip=False)
                 llm_response.result_chain = MessageChain(
                     chain=[Comp.Plain(completion_text)],
                 )
@@ -371,6 +372,96 @@ class ProviderOpenAIOfficial(Provider):
             output=completion_tokens,
         )
 
+    @staticmethod
+    def _normalize_content(raw_content: Any, strip: bool = True) -> str:
+        """Normalize content from various formats to plain string.
+
+        Some LLM providers return content as list[dict] format
+        like [{'type': 'text', 'text': '...'}] instead of
+        plain string. This method handles both formats.
+
+        Args:
+            raw_content: The raw content from LLM response, can be str, list, dict, or other.
+            strip: Whether to strip whitespace from the result. Set to False for
+                   streaming chunks to preserve spaces between words.
+
+        Returns:
+            Normalized plain text string.
+        """
+        # Handle dict format (e.g., {"type": "text", "text": "..."})
+        if isinstance(raw_content, dict):
+            if "text" in raw_content:
+                text_val = raw_content.get("text", "")
+                return str(text_val) if text_val is not None else ""
+            # For other dict formats, return empty string and log
+            logger.warning(f"Unexpected dict format content: {raw_content}")
+            return ""
+
+        if isinstance(raw_content, list):
+            # Check if this looks like OpenAI content-part format
+            # Only process if at least one item has {'type': 'text', 'text': ...} structure
+            has_content_part = any(
+                isinstance(part, dict) and part.get("type") == "text"
+                for part in raw_content
+            )
+            if has_content_part:
+                text_parts = []
+                for part in raw_content:
+                    if isinstance(part, dict) and part.get("type") == "text":
+                        text_val = part.get("text", "")
+                        # Coerce to str in case text is null or non-string
+                        text_parts.append(str(text_val) if text_val is not None else "")
+                return "".join(text_parts)
+            # Not content-part format, return string representation
+            return str(raw_content)
+
+        if isinstance(raw_content, str):
+            content = raw_content.strip() if strip else raw_content
+            # Check if the string is a JSON-encoded list (e.g., "[{'type': 'text', ...}]")
+            # This can happen when streaming concatenates content that was originally list format
+            # Only check if it looks like a complete JSON array (requires strip for check)
+            check_content = raw_content.strip()
+            if (
+                check_content.startswith("[")
+                and check_content.endswith("]")
+                and len(check_content) < 8192
+            ):
+                try:
+                    # First try standard JSON parsing
+                    parsed = json.loads(check_content)
+                except json.JSONDecodeError:
+                    # If that fails, try parsing as Python literal (handles single quotes)
+                    # This is safer than blind replace("'", '"') which corrupts apostrophes
+                    try:
+                        import ast
+
+                        parsed = ast.literal_eval(check_content)
+                    except (ValueError, SyntaxError):
+                        parsed = None
+
+                if isinstance(parsed, list):
+                    # Only convert if it matches OpenAI content-part schema
+                    # i.e., at least one item has {'type': 'text', 'text': ...}
+                    has_content_part = any(
+                        isinstance(part, dict) and part.get("type") == "text"
+                        for part in parsed
+                    )
+                    if has_content_part:
+                        text_parts = []
+                        for part in parsed:
+                            if isinstance(part, dict) and part.get("type") == "text":
+                                text_val = part.get("text", "")
+                                # Coerce to str in case text is null or non-string
+                                text_parts.append(
+                                    str(text_val) if text_val is not None else ""
+                                )
+                        if text_parts:
+                            return "".join(text_parts)
+            return content
+
+        # Fallback for other types (int, float, etc.)
+        return str(raw_content) if raw_content is not None else ""
+
     async def _parse_openai_completion(
         self, completion: ChatCompletion, tools: ToolSet | None
     ) -> LLMResponse:
@@ -383,8 +474,7 @@ class ProviderOpenAIOfficial(Provider):
 
         # parse the text completion
         if choice.message.content is not None:
-            # text completion
-            completion_text = str(choice.message.content).strip()
+            completion_text = self._normalize_content(choice.message.content)
             # specially, some providers may set <think> tags around reasoning content in the completion text,
             # we use regex to remove them, and store then in reasoning_content field
             reasoning_pattern = re.compile(r"<think>(.*?)</think>", re.DOTALL)
@@ -394,6 +484,8 @@ class ProviderOpenAIOfficial(Provider):
                     [match.strip() for match in matches],
                 )
                 completion_text = reasoning_pattern.sub("", completion_text).strip()
+            # Also clean up orphan </think> tags that may leak from some models
+            completion_text = re.sub(r"</think>\s*$", "", completion_text).strip()
             llm_response.result_chain = MessageChain().message(completion_text)
 
         # parse the reasoning content if any

astrbot/core/provider/sources/openrouter_source.py

@@ -0,0 +1,19 @@
+from ..register import register_provider_adapter
+from .openai_source import ProviderOpenAIOfficial
+
+
+@register_provider_adapter(
+    "openrouter_chat_completion", "OpenRouter Chat Completion Provider Adapter"
+)
+class ProviderOpenRouter(ProviderOpenAIOfficial):
+    def __init__(
+        self,
+        provider_config: dict,
+        provider_settings: dict,
+    ) -> None:
+        super().__init__(provider_config, provider_settings)
+        # Reference to: https://openrouter.ai/docs/api/reference/overview#headers
+        self.client._custom_headers["HTTP-Referer"] = (  # type: ignore
+            "https://github.com/AstrBotDevs/AstrBot"
+        )
+        self.client._custom_headers["X-TITLE"] = "AstrBot"  # type: ignore

astrbot/core/provider/sources/sensevoice_selfhosted_source.py

@@ -7,12 +7,14 @@ import asyncio
 import os
 import re
 from datetime import datetime
+from pathlib import Path
 from typing import cast
 
 from funasr_onnx import SenseVoiceSmall
 from funasr_onnx.utils.postprocess_utils import rich_transcription_postprocess
 
 from astrbot.core import logger
+from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
 from astrbot.core.utils.io import download_file
 from astrbot.core.utils.tencent_record_helper import tencent_silk_to_wav
 
@@ -50,7 +52,9 @@ class ProviderSenseVoiceSTTSelfHost(STTProvider):
 
     async def get_timestamped_path(self) -> str:
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        return os.path.join("data", "temp", f"{timestamp}")
+        temp_dir = Path(get_astrbot_temp_path())
+        temp_dir.mkdir(parents=True, exist_ok=True)
+        return str(temp_dir / timestamp)
 
     async def _is_silk_file(self, file_path) -> bool:
         silk_header = b"SILK"

astrbot/core/star/__init__.py

@@ -1,68 +1,19 @@
-from astrbot.core import html_renderer
+# 兼容导出: Provider 从 provider 模块重新导出
 from astrbot.core.provider import Provider
-from astrbot.core.star.star_tools import StarTools
-from astrbot.core.utils.command_parser import CommandParserMixin
-from astrbot.core.utils.plugin_kv_store import PluginKVStoreMixin
 
+from .base import Star
 from .context import Context
 from .star import StarMetadata, star_map, star_registry
 from .star_manager import PluginManager
+from .star_tools import StarTools
 
-
-class Star(CommandParserMixin, PluginKVStoreMixin):
-    """所有插件（Star）的父类，所有插件都应该继承于这个类"""
-
-    author: str
-    name: str
-
-    def __init__(self, context: Context, config: dict | None = None) -> None:
-        StarTools.initialize(context)
-        self.context = context
-
-    def __init_subclass__(cls, **kwargs):
-        super().__init_subclass__(**kwargs)
-        if not star_map.get(cls.__module__):
-            metadata = StarMetadata(
-                star_cls_type=cls,
-                module_path=cls.__module__,
-            )
-            star_map[cls.__module__] = metadata
-            star_registry.append(metadata)
-        else:
-            star_map[cls.__module__].star_cls_type = cls
-            star_map[cls.__module__].module_path = cls.__module__
-
-    async def text_to_image(self, text: str, return_url=True) -> str:
-        """将文本转换为图片"""
-        return await html_renderer.render_t2i(
-            text,
-            return_url=return_url,
-            template_name=self.context._config.get("t2i_active_template"),
-        )
-
-    async def html_render(
-        self,
-        tmpl: str,
-        data: dict,
-        return_url=True,
-        options: dict | None = None,
-    ) -> str:
-        """渲染 HTML"""
-        return await html_renderer.render_custom_template(
-            tmpl,
-            data,
-            return_url=return_url,
-            options=options,
-        )
-
-    async def initialize(self) -> None:
-        """当插件被激活时会调用这个方法"""
-
-    async def terminate(self) -> None:
-        """当插件被禁用、重载插件时会调用这个方法"""
-
-    def __del__(self) -> None:
-        """[Deprecated] 当插件被禁用、重载插件时会调用这个方法"""
-
-
-__all__ = ["Context", "PluginManager", "Provider", "Star", "StarMetadata", "StarTools"]
+__all__ = [
+    "Context",
+    "PluginManager",
+    "Provider",
+    "Star",
+    "StarMetadata",
+    "StarTools",
+    "star_map",
+    "star_registry",
+]

astrbot/core/star/base.py

@@ -0,0 +1,87 @@
+from __future__ import annotations
+
+import logging
+from typing import Any, Protocol
+
+from astrbot.core import html_renderer
+from astrbot.core.utils.command_parser import CommandParserMixin
+from astrbot.core.utils.plugin_kv_store import PluginKVStoreMixin
+
+from .star import StarMetadata, star_map, star_registry
+
+logger = logging.getLogger("astrbot")
+
+
+class Star(CommandParserMixin, PluginKVStoreMixin):
+    """所有插件（Star）的父类，所有插件都应该继承于这个类"""
+
+    author: str
+    name: str
+
+    class _ContextLike(Protocol):
+        def get_config(self, umo: str | None = None) -> Any: ...
+
+    def __init__(self, context: _ContextLike, config: dict | None = None) -> None:
+        self.context = context
+
+    def _get_context_config(self) -> Any:
+        get_config = getattr(self.context, "get_config", None)
+        if callable(get_config):
+            try:
+                return get_config()
+            except Exception as e:
+                logger.debug(f"get_config() failed: {e}")
+                return None
+        return getattr(self.context, "_config", None)
+
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        if not star_map.get(cls.__module__):
+            metadata = StarMetadata(
+                star_cls_type=cls,
+                module_path=cls.__module__,
+            )
+            star_map[cls.__module__] = metadata
+            star_registry.append(metadata)
+        else:
+            star_map[cls.__module__].star_cls_type = cls
+            star_map[cls.__module__].module_path = cls.__module__
+
+    async def text_to_image(self, text: str, return_url=True) -> str:
+        """将文本转换为图片"""
+        config_obj = self._get_context_config()
+        template_name = None
+        if hasattr(config_obj, "get"):
+            try:
+                template_name = config_obj.get("t2i_active_template")
+            except Exception:
+                template_name = None
+        return await html_renderer.render_t2i(
+            text,
+            return_url=return_url,
+            template_name=template_name,
+        )
+
+    async def html_render(
+        self,
+        tmpl: str,
+        data: dict,
+        return_url=True,
+        options: dict | None = None,
+    ) -> str:
+        """渲染 HTML"""
+        return await html_renderer.render_custom_template(
+            tmpl,
+            data,
+            return_url=return_url,
+            options=options,
+        )
+
+    async def initialize(self) -> None:
+        """当插件被激活时会调用这个方法"""
+
+    async def terminate(self) -> None:
+        """当插件被禁用、重载插件时会调用这个方法"""
+
+    def __del__(self) -> None:
+        """[Deprecated] 当插件被禁用、重载插件时会调用这个方法"""

astrbot/core/star/context.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 import logging
 from asyncio import Queue
 from collections.abc import Awaitable, Callable
-from typing import Any
+from typing import TYPE_CHECKING, Any, Protocol
 
 from deprecated import deprecated
 
@@ -12,14 +14,12 @@ from astrbot.core.agent.tool import ToolSet
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot.core.conversation_mgr import ConversationManager
-from astrbot.core.cron.manager import CronJobManager
 from astrbot.core.db import BaseDatabase
 from astrbot.core.knowledge_base.kb_mgr import KnowledgeBaseManager
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.persona_mgr import PersonaManager
 from astrbot.core.platform import Platform
 from astrbot.core.platform.astr_message_event import AstrMessageEvent, MessageSesion
-from astrbot.core.platform.manager import PlatformManager
 from astrbot.core.platform_message_history_mgr import PlatformMessageHistoryManager
 from astrbot.core.provider.entities import LLMResponse, ProviderRequest, ProviderType
 from astrbot.core.provider.func_tool_manager import FunctionTool, FunctionToolManager
@@ -45,6 +45,15 @@ from .star_handler import EventType, StarHandlerMetadata, star_handlers_registry
 
 logger = logging.getLogger("astrbot")
 
+if TYPE_CHECKING:
+    from astrbot.core.cron.manager import CronJobManager
+else:
+    CronJobManager = Any
+
+
+class PlatformManagerProtocol(Protocol):
+    platform_insts: list[Platform]
+
 
 class Context:
     """暴露给插件的接口上下文。"""
@@ -61,7 +70,7 @@ class Context:
         config: AstrBotConfig,
         db: BaseDatabase,
         provider_manager: ProviderManager,
-        platform_manager: PlatformManager,
+        platform_manager: PlatformManagerProtocol,
         conversation_manager: ConversationManager,
         message_history_manager: PlatformMessageHistoryManager,
         persona_manager: PersonaManager,
@@ -448,6 +457,9 @@ class Context:
             if platform.meta().id == session.platform_name:
                 await platform.send_by_session(session, message_chain)
                 return True
+        logger.warning(
+            f"cannot find platform for session {str(session)}, message not sent"
+        )
         return False
 
     def add_llm_tools(self, *tools: FunctionTool) -> None:

astrbot/core/star/filter/platform_adapter_type.py

@@ -11,6 +11,7 @@ class PlatformAdapterType(enum.Flag):
     QQOFFICIAL = enum.auto()
     TELEGRAM = enum.auto()
     WECOM = enum.auto()
+    WECOM_AI_BOT = enum.auto()
     LARK = enum.auto()
     DINGTALK = enum.auto()
     DISCORD = enum.auto()
@@ -20,11 +21,13 @@ class PlatformAdapterType(enum.Flag):
     WEIXIN_OFFICIAL_ACCOUNT = enum.auto()
     SATORI = enum.auto()
     MISSKEY = enum.auto()
+    LINE = enum.auto()
     ALL = (
         AIOCQHTTP
         | QQOFFICIAL
         | TELEGRAM
         | WECOM
+        | WECOM_AI_BOT
         | LARK
         | DINGTALK
         | DISCORD
@@ -34,6 +37,7 @@ class PlatformAdapterType(enum.Flag):
         | WEIXIN_OFFICIAL_ACCOUNT
         | SATORI
         | MISSKEY
+        | LINE
     )
 
 
@@ -42,6 +46,7 @@ ADAPTER_NAME_2_TYPE = {
     "qq_official": PlatformAdapterType.QQOFFICIAL,
     "telegram": PlatformAdapterType.TELEGRAM,
     "wecom": PlatformAdapterType.WECOM,
+    "wecom_ai_bot": PlatformAdapterType.WECOM_AI_BOT,
     "lark": PlatformAdapterType.LARK,
     "dingtalk": PlatformAdapterType.DINGTALK,
     "discord": PlatformAdapterType.DISCORD,
@@ -51,6 +56,7 @@ ADAPTER_NAME_2_TYPE = {
     "weixin_official_account": PlatformAdapterType.WEIXIN_OFFICIAL_ACCOUNT,
     "satori": PlatformAdapterType.SATORI,
     "misskey": PlatformAdapterType.MISSKEY,
+    "line": PlatformAdapterType.LINE,
 }
 
 

astrbot/core/star/register/__init__.py

@@ -13,6 +13,9 @@ from .star_handler import (
     register_on_llm_response,
     register_on_llm_tool_respond,
     register_on_platform_loaded,
+    register_on_plugin_error,
+    register_on_plugin_loaded,
+    register_on_plugin_unloaded,
     register_on_using_llm_tool,
     register_on_waiting_llm_request,
     register_permission_type,
@@ -32,6 +35,9 @@ __all__ = [
     "register_on_decorating_result",
     "register_on_llm_request",
     "register_on_llm_response",
+    "register_on_plugin_error",
+    "register_on_plugin_loaded",
+    "register_on_plugin_unloaded",
     "register_on_platform_loaded",
     "register_on_waiting_llm_request",
     "register_permission_type",

astrbot/core/star/register/star.py

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

astrbot/core/star/register/star_handler.py

@@ -11,7 +11,6 @@ from astrbot.core.agent.agent import Agent
 from astrbot.core.agent.handoff import HandoffTool
 from astrbot.core.agent.hooks import BaseAgentRunHooks
 from astrbot.core.agent.tool import FunctionTool
-from astrbot.core.astr_agent_context import AstrAgentContext
 from astrbot.core.message.message_event_result import MessageEventResult
 from astrbot.core.provider.func_tool_manager import PY_TO_JSON_TYPE, SUPPORTED_TYPES
 from astrbot.core.provider.register import llm_tools
@@ -339,6 +338,58 @@ def register_on_platform_loaded(**kwargs):
     return decorator
 
 
+def register_on_plugin_error(**kwargs):
+    """当插件处理消息异常时触发。
+
+    Hook 参数:
+        event, plugin_name, handler_name, error, traceback_text
+
+    说明:
+        在 hook 中调用 `event.stop_event()` 可屏蔽默认报错回显，
+        并由插件自行决定是否转发到其他会话。
+    """
+
+    def decorator(awaitable):
+        _ = get_handler_or_create(awaitable, EventType.OnPluginErrorEvent, **kwargs)
+        return awaitable
+
+    return decorator
+
+
+def register_on_plugin_loaded(**kwargs):
+    """当有插件加载完成时
+
+    Hook 参数:
+        metadata
+
+    说明:
+        当有插件加载完成时，触发该事件并获取到该插件的元数据
+    """
+
+    def decorator(awaitable):
+        _ = get_handler_or_create(awaitable, EventType.OnPluginLoadedEvent, **kwargs)
+        return awaitable
+
+    return decorator
+
+
+def register_on_plugin_unloaded(**kwargs):
+    """当有插件卸载完成时
+
+    Hook 参数:
+        metadata
+
+    说明:
+        当有插件卸载完成时，触发该事件并获取到该插件的元数据
+    """
+
+    def decorator(awaitable):
+        _ = get_handler_or_create(awaitable, EventType.OnPluginUnloadedEvent, **kwargs)
+        return awaitable
+
+    return decorator
+
+
 def register_on_waiting_llm_request(**kwargs):
     """当等待调用 LLM 时的通知事件（在获取锁之前）
 
@@ -565,7 +616,7 @@ class RegisteringAgent:
         kwargs["registering_agent"] = self
         return register_llm_tool(*args, **kwargs)
 
-    def __init__(self, agent: Agent[AstrAgentContext]) -> None:
+    def __init__(self, agent: Agent[Any]) -> None:
         self._agent = agent
 
 
@@ -573,7 +624,7 @@ def register_agent(
     name: str,
     instruction: str,
     tools: list[str | FunctionTool] | None = None,
-    run_hooks: BaseAgentRunHooks[AstrAgentContext] | None = None,
+    run_hooks: BaseAgentRunHooks[Any] | None = None,
 ):
     """注册一个 Agent
 
@@ -587,12 +638,12 @@ def register_agent(
     tools_ = tools or []
 
     def decorator(awaitable: Callable[..., Awaitable[Any]]):
-        AstrAgent = Agent[AstrAgentContext]
+        AstrAgent = Agent[Any]
         agent = AstrAgent(
             name=name,
             instructions=instruction,
             tools=tools_,
-            run_hooks=run_hooks or BaseAgentRunHooks[AstrAgentContext](),
+            run_hooks=run_hooks or BaseAgentRunHooks[Any](),
         )
         handoff_tool = HandoffTool(agent=agent)
         handoff_tool.handler = awaitable

astrbot/core/star/star.py

@@ -61,6 +61,12 @@ class StarMetadata:
     logo_path: str | None = None
     """插件 Logo 的路径"""
 
+    support_platforms: list[str] = field(default_factory=list)
+    """插件声明支持的平台适配器 ID 列表（对应 ADAPTER_NAME_2_TYPE 的 key）"""
+
+    astrbot_version: str | None = None
+    """插件要求的 AstrBot 版本范围（PEP 440 specifier，如 >=4.13.0,<4.17.0）"""
+
     def __str__(self) -> str:
         return f"Plugin {self.name} ({self.version}) by {self.author}: {self.desc}"
 

astrbot/core/star/star_handler.py

@@ -97,6 +97,30 @@ class StarHandlerRegistry(Generic[T]):
         plugins_name: list[str] | None = None,
     ) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
 
+    @overload
+    def get_handlers_by_event_type(
+        self,
+        event_type: Literal[EventType.OnPluginErrorEvent],
+        only_activated=True,
+        plugins_name: list[str] | None = None,
+    ) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
+
+    @overload
+    def get_handlers_by_event_type(
+        self,
+        event_type: Literal[EventType.OnPluginLoadedEvent],
+        only_activated=True,
+        plugins_name: list[str] | None = None,
+    ) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
+
+    @overload
+    def get_handlers_by_event_type(
+        self,
+        event_type: Literal[EventType.OnPluginUnloadedEvent],
+        only_activated=True,
+        plugins_name: list[str] | None = None,
+    ) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
+
     @overload
     def get_handlers_by_event_type(
         self,
@@ -136,6 +160,8 @@ class StarHandlerRegistry(Generic[T]):
                     not in (
                         EventType.OnAstrBotLoadedEvent,
                         EventType.OnPlatformLoadedEvent,
+                        EventType.OnPluginLoadedEvent,
+                        EventType.OnPluginUnloadedEvent,
                     )
                     and not plugin.reserved
                 ):
@@ -192,6 +218,9 @@ class EventType(enum.Enum):
     OnUsingLLMToolEvent = enum.auto()  # 使用 LLM 工具
     OnLLMToolRespondEvent = enum.auto()  # 调用函数工具后
     OnAfterMessageSentEvent = enum.auto()  # 发送消息后
+    OnPluginErrorEvent = enum.auto()  # 插件处理消息异常时
+    OnPluginLoadedEvent = enum.auto()  # 插件加载完成
+    OnPluginUnloadedEvent = enum.auto()  # 插件卸载完成
 
 
 H = TypeVar("H", bound=Callable[..., Any])

astrbot/core/star/star_manager.py

@@ -11,10 +11,13 @@ import traceback
 from types import ModuleType
 
 import yaml
+from packaging.specifiers import InvalidSpecifier, SpecifierSet
+from packaging.version import InvalidVersion, Version
 
 from astrbot.core import logger, pip_installer, sp
 from astrbot.core.agent.handoff import FunctionTool, HandoffTool
 from astrbot.core.config.astrbot_config import AstrBotConfig
+from astrbot.core.config.default import VERSION
 from astrbot.core.platform.register import unregister_platform_adapters_by_module
 from astrbot.core.provider.register import llm_tools
 from astrbot.core.utils.astrbot_path import (
@@ -30,7 +33,7 @@ from .command_management import sync_command_configs
 from .context import Context
 from .filter.permission import PermissionType, PermissionTypeFilter
 from .star import star_map, star_registry
-from .star_handler import star_handlers_registry
+from .star_handler import EventType, star_handlers_registry
 from .updator import PluginUpdator
 
 try:
@@ -40,12 +43,19 @@ except ImportError:
         logger.warning("未安装 watchfiles，无法实现插件的热重载。")
 
 
+class PluginVersionIncompatibleError(Exception):
+    """Raised when plugin astrbot_version is incompatible with current AstrBot."""
+
+
 class PluginManager:
     def __init__(self, context: Context, config: AstrBotConfig) -> None:
+        from .star_tools import StarTools
+
         self.updator = PluginUpdator()
 
         self.context = context
         self.context._star_manager = self  # type: ignore
+        StarTools.initialize(context)
 
         self.config = config
         self.plugin_store_path = get_astrbot_plugin_path()
@@ -62,6 +72,9 @@ class PluginManager:
         self._pm_lock = asyncio.Lock()
         """StarManager操作互斥锁"""
 
+        self.failed_plugin_dict = {}
+        """加载失败插件的信息，用于后续可能的热重载"""
+
         self.failed_plugin_info = ""
         if os.getenv("ASTRBOT_RELOAD", "0") == "1":
             asyncio.create_task(self._watch_plugins_changes())
@@ -265,10 +278,58 @@ class PluginManager:
                 version=metadata["version"],
                 repo=metadata["repo"] if "repo" in metadata else None,
                 display_name=metadata.get("display_name", None),
+                support_platforms=(
+                    [
+                        platform_id
+                        for platform_id in metadata["support_platforms"]
+                        if isinstance(platform_id, str)
+                    ]
+                    if isinstance(metadata.get("support_platforms"), list)
+                    else []
+                ),
+                astrbot_version=(
+                    metadata["astrbot_version"]
+                    if isinstance(metadata.get("astrbot_version"), str)
+                    else None
+                ),
             )
 
         return metadata
 
+    @staticmethod
+    def _validate_astrbot_version_specifier(
+        version_spec: str | None,
+    ) -> tuple[bool, str | None]:
+        if not version_spec:
+            return True, None
+
+        normalized_spec = version_spec.strip()
+        if not normalized_spec:
+            return True, None
+
+        try:
+            specifier = SpecifierSet(normalized_spec)
+        except InvalidSpecifier:
+            return (
+                False,
+                "astrbot_version 格式无效，请使用 PEP 440 版本范围格式，例如 >=4.16,<5。",
+            )
+
+        try:
+            current_version = Version(VERSION)
+        except InvalidVersion:
+            return (
+                False,
+                f"AstrBot 当前版本 {VERSION} 无法被解析，无法校验插件版本范围。",
+            )
+
+        if current_version not in specifier:
+            return (
+                False,
+                f"当前 AstrBot 版本为 {VERSION}，不满足插件要求的 astrbot_version: {normalized_spec}",
+            )
+        return True, None
+
     @staticmethod
     def _get_plugin_related_modules(
         plugin_root_dir: str,
@@ -327,6 +388,59 @@ class PluginManager:
                 except KeyError:
                     logger.warning(f"模块 {module_name} 未载入")
 
+    def _cleanup_plugin_state(self, dir_name: str) -> None:
+        plugin_root_name = "data.plugins."
+
+        # 清理 sys.modules
+        for key in list(sys.modules.keys()):
+            if key.startswith(f"{plugin_root_name}{dir_name}"):
+                logger.info(f"清除了插件{dir_name}中的{key}模块")
+                del sys.modules[key]
+
+        possible_paths = [
+            f"{plugin_root_name}{dir_name}.main",
+            f"{plugin_root_name}{dir_name}.{dir_name}",
+        ]
+
+        # 清理 handlers
+        for path in possible_paths:
+            handlers = star_handlers_registry.get_handlers_by_module_name(path)
+            for handler in handlers:
+                star_handlers_registry.remove(handler)
+                logger.info(f"清理处理器: {handler.handler_name}")
+
+        # 清理工具
+        for tool in list(llm_tools.func_list):
+            if tool.handler_module_path in possible_paths:
+                llm_tools.func_list.remove(tool)
+                logger.info(f"清理工具: {tool.name}")
+
+    async def reload_failed_plugin(self, dir_name):
+        """
+        重新加载未注册（加载失败）的插件
+        Args:
+            dir_name (str): 要重载的特定插件名称。
+        Returns:
+            tuple: 返回 load() 方法的结果，包含 (success, error_message)
+                - success (bool): 重载是否成功
+                - error_message (str|None): 错误信息，成功时为 None
+        """
+
+        async with self._pm_lock:
+            if dir_name not in self.failed_plugin_dict:
+                return False, "插件不存在于失败列表中"
+
+            self._cleanup_plugin_state(dir_name)
+
+            success, error = await self.load(specified_dir_name=dir_name)
+            if success:
+                self.failed_plugin_dict.pop(dir_name, None)
+                if not self.failed_plugin_dict:
+                    self.failed_plugin_info = ""
+                return success, None
+            else:
+                return False, error
+
     async def reload(self, specified_plugin_name=None):
         """重新加载插件
 
@@ -383,7 +497,12 @@ class PluginManager:
 
             return result
 
-    async def load(self, specified_module_path=None, specified_dir_name=None):
+    async def load(
+        self,
+        specified_module_path=None,
+        specified_dir_name=None,
+        ignore_version_check: bool = False,
+    ):
         """载入插件。
         当 specified_module_path 或者 specified_dir_name 不为 None 时，只载入指定的插件。
 
@@ -444,8 +563,19 @@ class PluginManager:
                         requirements_path=requirements_path,
                     )
                 except Exception as e:
-                    logger.error(traceback.format_exc())
+                    error_trace = traceback.format_exc()
+                    logger.error(error_trace)
                     logger.error(f"插件 {root_dir_name} 导入失败。原因：{e!s}")
+                    fail_rec += f"加载 {root_dir_name} 插件时出现问题，原因 {e!s}。\n"
+                    self.failed_plugin_dict[root_dir_name] = {
+                        "error": str(e),
+                        "traceback": error_trace,
+                    }
+                    if path in star_map:
+                        logger.info("失败插件依旧在插件列表中，正在清理...")
+                        metadata = star_map.pop(path)
+                        if metadata in star_registry:
+                            star_registry.remove(metadata)
                     continue
 
                 # 检查 _conf_schema.json
@@ -482,12 +612,37 @@ class PluginManager:
                             metadata.version = metadata_yaml.version
                             metadata.repo = metadata_yaml.repo
                             metadata.display_name = metadata_yaml.display_name
+                            metadata.support_platforms = metadata_yaml.support_platforms
+                            metadata.astrbot_version = metadata_yaml.astrbot_version
                     except Exception as e:
                         logger.warning(
                             f"插件 {root_dir_name} 元数据载入失败: {e!s}。使用默认元数据。",
                         )
+
+                    if not ignore_version_check:
+                        is_valid, error_message = (
+                            self._validate_astrbot_version_specifier(
+                                metadata.astrbot_version,
+                            )
+                        )
+                        if not is_valid:
+                            raise PluginVersionIncompatibleError(
+                                error_message
+                                or "The plugin is not compatible with the current AstrBot version."
+                            )
+
                     logger.info(metadata)
                     metadata.config = plugin_config
+                    p_name = (metadata.name or "unknown").lower().replace("/", "_")
+                    p_author = (metadata.author or "unknown").lower().replace("/", "_")
+                    plugin_id = f"{p_author}/{p_name}"
+
+                    # 在实例化前注入类属性，保证插件 __init__ 可读取这些值
+                    if metadata.star_cls_type:
+                        setattr(metadata.star_cls_type, "name", p_name)
+                        setattr(metadata.star_cls_type, "author", p_author)
+                        setattr(metadata.star_cls_type, "plugin_id", plugin_id)
+
                     if path not in inactivated_plugins:
                         # 只有没有禁用插件时才实例化插件类
                         if plugin_config and metadata.star_cls_type:
@@ -505,17 +660,10 @@ class PluginManager:
                                 context=self.context,
                             )
 
-                        p_name = (metadata.name or "unknown").lower().replace("/", "_")
-                        p_author = (
-                            (metadata.author or "unknown").lower().replace("/", "_")
-                        )
-                        setattr(metadata.star_cls, "name", p_name)
-                        setattr(metadata.star_cls, "author", p_author)
-                        setattr(
-                            metadata.star_cls,
-                            "plugin_id",
-                            f"{p_author}/{p_name}",
-                        )
+                        if metadata.star_cls:
+                            setattr(metadata.star_cls, "name", p_name)
+                            setattr(metadata.star_cls, "author", p_author)
+                            setattr(metadata.star_cls, "plugin_id", plugin_id)
                     else:
                         logger.info(f"插件 {metadata.name} 已被禁用。")
 
@@ -593,6 +741,19 @@ class PluginManager:
                     )
                     if not metadata:
                         raise Exception(f"无法找到插件 {plugin_dir_path} 的元数据。")
+
+                    if not ignore_version_check:
+                        is_valid, error_message = (
+                            self._validate_astrbot_version_specifier(
+                                metadata.astrbot_version,
+                            )
+                        )
+                        if not is_valid:
+                            raise PluginVersionIncompatibleError(
+                                error_message
+                                or "The plugin is not compatible with the current AstrBot version."
+                            )
+
                     metadata.star_cls = obj
                     metadata.config = plugin_config
                     metadata.module = module
@@ -656,6 +817,19 @@ class PluginManager:
                 if hasattr(metadata.star_cls, "initialize") and metadata.star_cls:
                     await metadata.star_cls.initialize()
 
+                # 触发插件加载事件
+                handlers = star_handlers_registry.get_handlers_by_event_type(
+                    EventType.OnPluginLoadedEvent,
+                )
+                for handler in handlers:
+                    try:
+                        logger.info(
+                            f"hook(on_plugin_loaded) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}",
+                        )
+                        await handler.handler(metadata)
+                    except Exception:
+                        logger.error(traceback.format_exc())
+
             except BaseException as e:
                 logger.error(f"----- 插件 {root_dir_name} 载入失败 -----")
                 errors = traceback.format_exc()
@@ -663,6 +837,16 @@ class PluginManager:
                     logger.error(f"| {line}")
                 logger.error("----------------------------------")
                 fail_rec += f"加载 {root_dir_name} 插件时出现问题，原因 {e!s}。\n"
+                self.failed_plugin_dict[root_dir_name] = {
+                    "error": str(e),
+                    "traceback": errors,
+                }
+                # 记录注册失败的插件名称，以便后续重载插件
+                if path in star_map:
+                    logger.info("失败插件依旧在插件列表中，正在清理...")
+                    metadata = star_map.pop(path)
+                    if metadata in star_registry:
+                        star_registry.remove(metadata)
 
         # 清除 pip.main 导致的多余的 logging handlers
         for handler in logging.root.handlers[:]:
@@ -721,7 +905,9 @@ class PluginManager:
                     f"清理安装失败插件配置失败: {plugin_config_path}，原因: {e!s}",
                 )
 
-    async def install_plugin(self, repo_url: str, proxy=""):
+    async def install_plugin(
+        self, repo_url: str, proxy: str = "", ignore_version_check: bool = False
+    ):
         """从仓库 URL 安装插件
 
         从指定的仓库 URL 下载并安装插件，然后加载该插件到系统中
@@ -755,7 +941,10 @@ class PluginManager:
 
                 # reload the plugin
                 dir_name = os.path.basename(plugin_path)
-                success, error_message = await self.load(specified_dir_name=dir_name)
+                success, error_message = await self.load(
+                    specified_dir_name=dir_name,
+                    ignore_version_check=ignore_version_check,
+                )
                 if not success:
                     raise Exception(
                         error_message
@@ -1033,6 +1222,19 @@ class PluginManager:
         elif "terminate" in star_metadata.star_cls_type.__dict__:
             await star_metadata.star_cls.terminate()
 
+        # 触发插件卸载事件
+        handlers = star_handlers_registry.get_handlers_by_event_type(
+            EventType.OnPluginUnloadedEvent,
+        )
+        for handler in handlers:
+            try:
+                logger.info(
+                    f"hook(on_plugin_unloaded) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}",
+                )
+                await handler.handler(star_metadata)
+            except Exception:
+                logger.error(traceback.format_exc())
+
     async def turn_on_plugin(self, plugin_name: str) -> None:
         plugin = self.context.get_registered_star(plugin_name)
         if plugin is None:
@@ -1059,7 +1261,9 @@ class PluginManager:
 
         await self.reload(plugin_name)
 
-    async def install_plugin_from_file(self, zip_file_path: str):
+    async def install_plugin_from_file(
+        self, zip_file_path: str, ignore_version_check: bool = False
+    ):
         dir_name = os.path.basename(zip_file_path).replace(".zip", "")
         dir_name = dir_name.removesuffix("-master").removesuffix("-main").lower()
         desti_dir = os.path.join(self.plugin_store_path, dir_name)
@@ -1115,7 +1319,10 @@ class PluginManager:
             except BaseException as e:
                 logger.warning(f"删除插件压缩包失败: {e!s}")
             # await self.reload()
-            success, error_message = await self.load(specified_dir_name=dir_name)
+            success, error_message = await self.load(
+                specified_dir_name=dir_name,
+                ignore_version_check=ignore_version_check,
+            )
             if not success:
                 raise Exception(
                     error_message

astrbot/core/tools/cron_tools.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Any
 
 from pydantic import Field
 from pydantic.dataclasses import dataclass
@@ -8,6 +9,14 @@ from astrbot.core.agent.tool import FunctionTool, ToolExecResult
 from astrbot.core.astr_agent_context import AstrAgentContext
 
 
+def _extract_job_session(job: Any) -> str | None:
+    payload = getattr(job, "payload", None)
+    if not isinstance(payload, dict):
+        return None
+    session = payload.get("session")
+    return str(session) if session is not None else None
+
+
 @dataclass
 class CreateActiveCronTool(FunctionTool[AstrAgentContext]):
     name: str = "create_future_task"
@@ -119,9 +128,15 @@ class DeleteCronJobTool(FunctionTool[AstrAgentContext]):
         cron_mgr = context.context.context.cron_manager
         if cron_mgr is None:
             return "error: cron manager is not available."
+        current_umo = context.context.event.unified_msg_origin
         job_id = kwargs.get("job_id")
         if not job_id:
             return "error: job_id is required."
+        job = await cron_mgr.db.get_cron_job(str(job_id))
+        if not job:
+            return f"error: cron job {job_id} not found."
+        if _extract_job_session(job) != current_umo:
+            return "error: you can only delete future tasks in the current umo."
         await cron_mgr.delete_job(str(job_id))
         return f"Deleted cron job {job_id}."
 
@@ -148,8 +163,13 @@ class ListCronJobsTool(FunctionTool[AstrAgentContext]):
         cron_mgr = context.context.context.cron_manager
         if cron_mgr is None:
             return "error: cron manager is not available."
+        current_umo = context.context.event.unified_msg_origin
         job_type = kwargs.get("job_type")
-        jobs = await cron_mgr.list_jobs(job_type)
+        jobs = [
+            job
+            for job in await cron_mgr.list_jobs(job_type)
+            if _extract_job_session(job) == current_umo
+        ]
         if not jobs:
             return "No cron jobs found."
         lines = []

astrbot/core/updator.py

@@ -148,8 +148,8 @@ class AstrBotUpdator(RepoZipUpdator):
         update_data = await self.fetch_release_info(self.ASTRBOT_RELEASE_API, latest)
         file_url = None
 
-        if os.environ.get("ASTRBOT_CLI"):
-            raise Exception("不支持更新CLI启动的AstrBot")  # 避免版本管理混乱
+        if os.environ.get("ASTRBOT_CLI") or os.environ.get("ASTRBOT_LAUNCHER"):
+            raise Exception("不支持更新此方式启动的AstrBot")  # 避免版本管理混乱
 
         if latest:
             latest_version = update_data[0]["tag_name"]

astrbot/core/utils/active_event_registry.py

@@ -0,0 +1,67 @@
+from __future__ import annotations
+
+from collections import defaultdict
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from astrbot.core.platform import AstrMessageEvent
+
+
+class ActiveEventRegistry:
+    """维护 unified_msg_origin 到活跃事件的映射。
+
+    用于在 reset 等场景下终止该会话正在处理的事件。
+    """
+
+    def __init__(self) -> None:
+        self._events: dict[str, set[AstrMessageEvent]] = defaultdict(set)
+
+    def register(self, event: AstrMessageEvent) -> None:
+        self._events[event.unified_msg_origin].add(event)
+
+    def unregister(self, event: AstrMessageEvent) -> None:
+        umo = event.unified_msg_origin
+        self._events[umo].discard(event)
+        if not self._events[umo]:
+            del self._events[umo]
+
+    def stop_all(
+        self,
+        umo: str,
+        exclude: AstrMessageEvent | None = None,
+    ) -> int:
+        """终止指定 UMO 的所有活跃事件。
+
+        Args:
+            umo: 统一消息来源标识符。
+            exclude: 需要排除的事件（通常是发起 reset 的事件本身）。
+
+        Returns:
+            被终止的事件数量。
+        """
+        count = 0
+        for event in list(self._events.get(umo, [])):
+            if event is not exclude:
+                event.stop_event()
+                count += 1
+        return count
+
+    def request_agent_stop_all(
+        self,
+        umo: str,
+        exclude: AstrMessageEvent | None = None,
+    ) -> int:
+        """请求停止指定 UMO 的所有活跃事件中的 Agent 运行。
+
+        与 stop_all 不同，这里不会调用 event.stop_event()，
+        因此不会中断事件传播，后续流程（如历史记录保存）仍可继续。
+        """
+        count = 0
+        for event in list(self._events.get(umo, [])):
+            if event is not exclude:
+                event.set_extra("agent_stop_requested", True)
+                count += 1
+        return count
+
+
+active_event_registry = ActiveEventRegistry()

astrbot/core/utils/astrbot_path.py

@@ -15,7 +15,7 @@ Skills 目录路径：固定为数据目录下的 skills 目录
 
 import os
 
-from astrbot.core.utils.runtime_env import is_packaged_electron_runtime
+from astrbot.core.utils.runtime_env import is_packaged_desktop_runtime
 
 
 def get_astrbot_path() -> str:
@@ -29,7 +29,7 @@ def get_astrbot_root() -> str:
     """获取Astrbot根目录路径"""
     if path := os.environ.get("ASTRBOT_ROOT"):
         return os.path.realpath(path)
-    if is_packaged_electron_runtime():
+    if is_packaged_desktop_runtime():
         return os.path.realpath(os.path.join(os.path.expanduser("~"), ".astrbot"))
     return os.path.realpath(os.getcwd())
 

astrbot/core/utils/pip_installer.py

@@ -12,7 +12,7 @@ import threading
 from collections import deque
 
 from astrbot.core.utils.astrbot_path import get_astrbot_site_packages_path
-from astrbot.core.utils.runtime_env import is_packaged_electron_runtime
+from astrbot.core.utils.runtime_env import is_packaged_desktop_runtime
 
 logger = logging.getLogger("astrbot")
 
@@ -35,7 +35,7 @@ def _get_pip_main():
                 "pip module is unavailable "
                 f"(sys.executable={sys.executable}, "
                 f"frozen={getattr(sys, 'frozen', False)}, "
-                f"ASTRBOT_ELECTRON_CLIENT={os.environ.get('ASTRBOT_ELECTRON_CLIENT')})"
+                f"ASTRBOT_DESKTOP_CLIENT={os.environ.get('ASTRBOT_DESKTOP_CLIENT')})"
             ) from exc
 
     return pip_main
@@ -556,7 +556,7 @@ class PipInstaller:
         args.extend(["--trusted-host", "mirrors.aliyun.com", "-i", index_url])
 
         target_site_packages = None
-        if is_packaged_electron_runtime():
+        if is_packaged_desktop_runtime():
             target_site_packages = get_astrbot_site_packages_path()
             os.makedirs(target_site_packages, exist_ok=True)
             _prepend_sys_path(target_site_packages)
@@ -582,7 +582,7 @@ class PipInstaller:
 
     def prefer_installed_dependencies(self, requirements_path: str) -> None:
         """优先使用已安装在插件 site-packages 中的依赖，不执行安装。"""
-        if not is_packaged_electron_runtime():
+        if not is_packaged_desktop_runtime():
             return
 
         target_site_packages = get_astrbot_site_packages_path()

astrbot/core/utils/quoted_message/chain_parser.py

@@ -19,7 +19,7 @@ from astrbot.core.message.components import (
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.utils.string_utils import normalize_and_dedupe_strings
 
-from .image_refs import looks_like_image_file_name, normalize_file_like_url
+from .image_refs import looks_like_image_file_name
 from .settings import SETTINGS, QuotedMessageParserSettings
 
 _FORWARD_PLACEHOLDER_PATTERN = re.compile(
@@ -296,11 +296,11 @@ def _parse_onebot_segments(
                 or "file"
             )
             text_parts.append(f"[File:{file_name}]")
-            candidate_url = seg_data.get("url")
+            candidate_url = seg_data.get("url", "")
             if (
                 isinstance(candidate_url, str)
                 and candidate_url.strip()
-                and looks_like_image_file_name(normalize_file_like_url(candidate_url))
+                and looks_like_image_file_name(candidate_url)
             ):
                 image_refs.append(candidate_url.strip())
             candidate_file = seg_data.get("file")
@@ -308,11 +308,7 @@ def _parse_onebot_segments(
                 isinstance(candidate_file, str)
                 and candidate_file.strip()
                 and looks_like_image_file_name(
-                    normalize_file_like_url(
-                        seg_data.get("name")
-                        or seg_data.get("file_name")
-                        or candidate_file
-                    )
+                    seg_data.get("name") or seg_data.get("file_name") or candidate_file
                 )
             ):
                 image_refs.append(candidate_file.strip())
@@ -368,7 +364,9 @@ def _extract_text_forward_ids_and_images_from_forward_nodes(
         if not isinstance(node, dict):
             continue
 
-        sender = node.get("sender") if isinstance(node.get("sender"), dict) else {}
+        sender = node.get("sender")
+        if not isinstance(sender, dict):
+            sender = {}
         sender_name = (
             sender.get("nickname")
             or sender.get("card")

astrbot/core/utils/quoted_message/onebot_client.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Any
+from collections.abc import Awaitable
+from typing import Any, Protocol
 
 from astrbot import logger
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
@@ -17,6 +18,10 @@ def _unwrap_action_response(ret: dict[str, Any] | None) -> dict[str, Any]:
     return ret
 
 
+class CallAction(Protocol):
+    def __call__(self, action: str, **params: Any) -> Awaitable[Any] | Any: ...
+
+
 class OneBotClient:
     def __init__(
         self,
@@ -27,7 +32,7 @@ class OneBotClient:
         self._settings = settings
 
     @staticmethod
-    def _resolve_call_action(event: AstrMessageEvent):
+    def _resolve_call_action(event: AstrMessageEvent) -> CallAction | None:
         bot = getattr(event, "bot", None)
         api = getattr(bot, "api", None)
         call_action = getattr(api, "call_action", None)

astrbot/core/utils/runtime_env.py

@@ -6,5 +6,5 @@ def is_frozen_runtime() -> bool:
     return bool(getattr(sys, "frozen", False))
 
 
-def is_packaged_electron_runtime() -> bool:
-    return is_frozen_runtime() and os.environ.get("ASTRBOT_ELECTRON_CLIENT") == "1"
+def is_packaged_desktop_runtime() -> bool:
+    return is_frozen_runtime() and os.environ.get("ASTRBOT_DESKTOP_CLIENT") == "1"

astrbot/core/utils/webhook_utils.py

@@ -1,3 +1,4 @@
+import os
 import uuid
 
 from astrbot.core import astrbot_config, logger
@@ -20,6 +21,20 @@ def _get_dashboard_port() -> int:
         return 6185
 
 
+def _is_dashboard_ssl_enabled() -> bool:
+    env_ssl = os.environ.get("DASHBOARD_SSL_ENABLE") or os.environ.get(
+        "ASTRBOT_DASHBOARD_SSL_ENABLE"
+    )
+    if env_ssl is not None:
+        return env_ssl.strip().lower() in {"1", "true", "yes", "on"}
+
+    try:
+        return bool(astrbot_config.get("dashboard", {}).get("ssl", {}).get("enable"))
+    except Exception as e:
+        logger.error(f"获取 dashboard SSL 配置失败: {e!s}")
+        return False
+
+
 def log_webhook_info(platform_name: str, webhook_uuid: str) -> None:
     """打印美观的 webhook 信息日志
 
@@ -38,12 +53,13 @@ def log_webhook_info(platform_name: str, webhook_uuid: str) -> None:
 
     callback_base = callback_base.rstrip("/")
     webhook_url = f"{callback_base}/api/platform/webhook/{webhook_uuid}"
+    scheme = "https" if _is_dashboard_ssl_enabled() else "http"
 
     display_log = (
         "\n====================\n"
         f"🔗 机器人平台 {platform_name} 已启用统一 Webhook 模式\n"
         f"📍 Webhook 回调地址: \n"
-        f"   ➜  http://<your-ip>:{_get_dashboard_port()}/api/platform/webhook/{webhook_uuid}\n"
+        f"   ➜  {scheme}://<your-ip>:{_get_dashboard_port()}/api/platform/webhook/{webhook_uuid}\n"
         f"   ➜  {webhook_url}\n"
         "====================\n"
     )

astrbot/dashboard/routes/__init__.py

@@ -1,3 +1,4 @@
+from .api_key import ApiKeyRoute
 from .auth import AuthRoute
 from .backup import BackupRoute
 from .chat import ChatRoute
@@ -9,6 +10,7 @@ from .cron import CronRoute
 from .file import FileRoute
 from .knowledge_base import KnowledgeBaseRoute
 from .log import LogRoute
+from .open_api import OpenApiRoute
 from .persona import PersonaRoute
 from .platform import PlatformRoute
 from .plugin import PluginRoute
@@ -21,6 +23,7 @@ from .tools import ToolsRoute
 from .update import UpdateRoute
 
 __all__ = [
+    "ApiKeyRoute",
     "AuthRoute",
     "BackupRoute",
     "ChatRoute",
@@ -32,6 +35,7 @@ __all__ = [
     "FileRoute",
     "KnowledgeBaseRoute",
     "LogRoute",
+    "OpenApiRoute",
     "PersonaRoute",
     "PlatformRoute",
     "PluginRoute",

astrbot/dashboard/routes/api_key.py

@@ -0,0 +1,146 @@
+import hashlib
+import secrets
+from datetime import datetime, timedelta, timezone
+
+from quart import g, request
+
+from astrbot.core.db import BaseDatabase
+
+from .route import Response, Route, RouteContext
+
+ALL_OPEN_API_SCOPES = ("chat", "config", "file", "im")
+
+
+class ApiKeyRoute(Route):
+    def __init__(self, context: RouteContext, db: BaseDatabase) -> None:
+        super().__init__(context)
+        self.db = db
+        self.routes = {
+            "/apikey/list": ("GET", self.list_api_keys),
+            "/apikey/create": ("POST", self.create_api_key),
+            "/apikey/revoke": ("POST", self.revoke_api_key),
+            "/apikey/delete": ("POST", self.delete_api_key),
+        }
+        self.register_routes()
+
+    @staticmethod
+    def _normalize_utc(dt: datetime | None) -> datetime | None:
+        if dt is None:
+            return None
+        if dt.tzinfo is None or dt.tzinfo.utcoffset(dt) is None:
+            return dt.replace(tzinfo=timezone.utc)
+        return dt.astimezone(timezone.utc)
+
+    @classmethod
+    def _serialize_datetime(cls, dt: datetime | None) -> str | None:
+        normalized = cls._normalize_utc(dt)
+        if normalized is None:
+            return None
+        return normalized.astimezone().isoformat()
+
+    @staticmethod
+    def _hash_key(raw_key: str) -> str:
+        return hashlib.pbkdf2_hmac(
+            "sha256",
+            raw_key.encode("utf-8"),
+            b"astrbot_api_key",
+            100_000,
+        ).hex()
+
+    @staticmethod
+    def _serialize_api_key(key) -> dict:
+        expires_at = ApiKeyRoute._normalize_utc(key.expires_at)
+        return {
+            "key_id": key.key_id,
+            "name": key.name,
+            "key_prefix": key.key_prefix,
+            "scopes": key.scopes or [],
+            "created_by": key.created_by,
+            "created_at": ApiKeyRoute._serialize_datetime(key.created_at),
+            "updated_at": ApiKeyRoute._serialize_datetime(key.updated_at),
+            "last_used_at": ApiKeyRoute._serialize_datetime(key.last_used_at),
+            "expires_at": ApiKeyRoute._serialize_datetime(key.expires_at),
+            "revoked_at": ApiKeyRoute._serialize_datetime(key.revoked_at),
+            "is_revoked": key.revoked_at is not None,
+            "is_expired": bool(expires_at and expires_at < datetime.now(timezone.utc)),
+        }
+
+    async def list_api_keys(self):
+        keys = await self.db.list_api_keys()
+        return (
+            Response().ok(data=[self._serialize_api_key(key) for key in keys]).__dict__
+        )
+
+    async def create_api_key(self):
+        post_data = await request.json or {}
+
+        name = str(post_data.get("name", "")).strip() or "Untitled API Key"
+        scopes = post_data.get("scopes")
+        if scopes is None:
+            normalized_scopes = list(ALL_OPEN_API_SCOPES)
+        elif isinstance(scopes, list):
+            normalized_scopes = [
+                scope
+                for scope in scopes
+                if isinstance(scope, str) and scope in ALL_OPEN_API_SCOPES
+            ]
+            normalized_scopes = list(dict.fromkeys(normalized_scopes))
+            if not normalized_scopes:
+                return Response().error("At least one valid scope is required").__dict__
+        else:
+            return Response().error("Invalid scopes").__dict__
+
+        expires_at = None
+        expires_in_days = post_data.get("expires_in_days")
+        if expires_in_days is not None:
+            try:
+                expires_in_days_int = int(expires_in_days)
+            except (TypeError, ValueError):
+                return Response().error("expires_in_days must be an integer").__dict__
+            if expires_in_days_int <= 0:
+                return (
+                    Response().error("expires_in_days must be greater than 0").__dict__
+                )
+            expires_at = datetime.now(timezone.utc) + timedelta(
+                days=expires_in_days_int
+            )
+
+        raw_key = f"abk_{secrets.token_urlsafe(32)}"
+        key_hash = self._hash_key(raw_key)
+        key_prefix = raw_key[:12]
+        created_by = g.get("username", "unknown")
+
+        api_key = await self.db.create_api_key(
+            name=name,
+            key_hash=key_hash,
+            key_prefix=key_prefix,
+            scopes=normalized_scopes,  # type: ignore
+            created_by=created_by,
+            expires_at=expires_at,
+        )
+
+        payload = self._serialize_api_key(api_key)
+        payload["api_key"] = raw_key
+        return Response().ok(data=payload).__dict__
+
+    async def revoke_api_key(self):
+        post_data = await request.json or {}
+        key_id = post_data.get("key_id")
+        if not key_id:
+            return Response().error("Missing key: key_id").__dict__
+
+        success = await self.db.revoke_api_key(key_id)
+        if not success:
+            return Response().error("API key not found").__dict__
+        return Response().ok().__dict__
+
+    async def delete_api_key(self):
+        post_data = await request.json or {}
+        key_id = post_data.get("key_id")
+        if not key_id:
+            return Response().error("Missing key: key_id").__dict__
+
+        success = await self.db.delete_api_key(key_id)
+        if not success:
+            return Response().error("API key not found").__dict__
+        return Response().ok().__dict__

astrbot/dashboard/routes/auth.py

@@ -64,11 +64,13 @@ class AuthRoute(Route):
         new_pwd = post_data.get("new_password", None)
         new_username = post_data.get("new_username", None)
         if not new_pwd and not new_username:
-            return (
-                Response().error("新用户名和新密码不能同时为空，你改了个寂寞").__dict__
-            )
+            return Response().error("新用户名和新密码不能同时为空").__dict__
 
+        # Verify password confirmation
         if new_pwd:
+            confirm_pwd = post_data.get("confirm_password", None)
+            if confirm_pwd != new_pwd:
+                return Response().error("两次输入的新密码不一致").__dict__
             self.config["dashboard"]["password"] = new_pwd
         if new_username:
             self.config["dashboard"]["username"] = new_username

astrbot/dashboard/routes/chat.py

@@ -13,7 +13,9 @@ from quart import g, make_response, request, send_file
 from astrbot.core import logger, sp
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.db import BaseDatabase
+from astrbot.core.platform.message_type import MessageType
 from astrbot.core.platform.sources.webchat.webchat_queue_mgr import webchat_queue_mgr
+from astrbot.core.utils.active_event_registry import active_event_registry
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
 from .route import Response, Route, RouteContext
@@ -41,6 +43,7 @@ class ChatRoute(Route):
             "/chat/new_session": ("GET", self.new_session),
             "/chat/sessions": ("GET", self.get_sessions),
             "/chat/get_session": ("GET", self.get_session),
+            "/chat/stop": ("POST", self.stop_session),
             "/chat/delete_session": ("GET", self.delete_webchat_session),
             "/chat/update_session_display_name": (
                 "POST",
@@ -52,8 +55,9 @@ class ChatRoute(Route):
         }
         self.core_lifecycle = core_lifecycle
         self.register_routes()
-        self.imgs_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")
-        os.makedirs(self.imgs_dir, exist_ok=True)
+        self.attachments_dir = os.path.join(get_astrbot_data_path(), "attachments")
+        self.legacy_img_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")
+        os.makedirs(self.attachments_dir, exist_ok=True)
 
         self.supported_imgs = ["jpg", "jpeg", "png", "gif", "webp"]
         self.conv_mgr = core_lifecycle.conversation_manager
@@ -69,9 +73,18 @@ class ChatRoute(Route):
             return Response().error("Missing key: filename").__dict__
 
         try:
-            file_path = os.path.join(self.imgs_dir, os.path.basename(filename))
+            file_path = os.path.join(self.attachments_dir, os.path.basename(filename))
             real_file_path = os.path.realpath(file_path)
-            real_imgs_dir = os.path.realpath(self.imgs_dir)
+            real_imgs_dir = os.path.realpath(self.attachments_dir)
+
+            if not os.path.exists(real_file_path):
+                # try legacy
+                file_path = os.path.join(
+                    self.legacy_img_dir, os.path.basename(filename)
+                )
+                if os.path.exists(file_path):
+                    real_file_path = os.path.realpath(file_path)
+                    real_imgs_dir = os.path.realpath(self.legacy_img_dir)
 
             if not real_file_path.startswith(real_imgs_dir):
                 return Response().error("Invalid file path").__dict__
@@ -125,7 +138,7 @@ class ChatRoute(Route):
         else:
             attach_type = "file"
 
-        path = os.path.join(self.imgs_dir, filename)
+        path = os.path.join(self.attachments_dir, filename)
         await file.save(path)
 
         # 创建 attachment 记录
@@ -202,8 +215,13 @@ class ChatRoute(Route):
             filename: 存储的文件名
             attach_type: 附件类型 (image, record, file, video)
         """
-        file_path = os.path.join(self.imgs_dir, os.path.basename(filename))
-        if not os.path.exists(file_path):
+        basename = os.path.basename(filename)
+        candidate_paths = [
+            os.path.join(self.attachments_dir, basename),
+            os.path.join(self.legacy_img_dir, basename),
+        ]
+        file_path = next((p for p in candidate_paths if os.path.exists(p)), None)
+        if not file_path:
             return None
 
         # guess mime type
@@ -317,10 +335,13 @@ class ChatRoute(Route):
         )
         return record
 
-    async def chat(self):
+    async def chat(self, post_data: dict | None = None):
         username = g.get("username", "guest")
 
-        post_data = await request.json
+        if post_data is None:
+            post_data = await request.json
+        if post_data is None:
+            return Response().error("Missing JSON body").__dict__
         if "message" not in post_data and "files" not in post_data:
             return Response().error("Missing key: message or files").__dict__
 
@@ -373,6 +394,14 @@ class ChatRoute(Route):
             agent_stats = {}
             refs = {}
             try:
+                # Emit session_id first so clients can bind the stream immediately.
+                session_info = {
+                    "type": "session_id",
+                    "data": None,
+                    "session_id": webchat_conv_id,
+                }
+                yield f"data: {json.dumps(session_info, ensure_ascii=False)}\n\n"
+
                 async with track_conversation(self.running_convs, webchat_conv_id):
                     while True:
                         try:
@@ -445,13 +474,13 @@ class ChatRoute(Route):
                                 if tc_id in tool_calls:
                                     tool_calls[tc_id]["result"] = tcr.get("result")
                                     tool_calls[tc_id]["finished_ts"] = tcr.get("ts")
-                                accumulated_parts.append(
-                                    {
-                                        "type": "tool_call",
-                                        "tool_calls": [tool_calls[tc_id]],
-                                    }
-                                )
-                                tool_calls.pop(tc_id, None)
+                                    accumulated_parts.append(
+                                        {
+                                            "type": "tool_call",
+                                            "tool_calls": [tool_calls[tc_id]],
+                                        }
+                                    )
+                                    tool_calls.pop(tc_id, None)
                             elif chain_type == "reasoning":
                                 accumulated_reasoning += result_text
                             elif streaming:
@@ -582,6 +611,36 @@ class ChatRoute(Route):
         response.timeout = None  # fix SSE auto disconnect issue
         return response
 
+    async def stop_session(self):
+        """Stop active agent runs for a session."""
+        post_data = await request.json
+        if post_data is None:
+            return Response().error("Missing JSON body").__dict__
+
+        session_id = post_data.get("session_id")
+        if not session_id:
+            return Response().error("Missing key: session_id").__dict__
+
+        username = g.get("username", "guest")
+        session = await self.db.get_platform_session_by_id(session_id)
+        if not session:
+            return Response().error(f"Session {session_id} not found").__dict__
+        if session.creator != username:
+            return Response().error("Permission denied").__dict__
+
+        message_type = (
+            MessageType.GROUP_MESSAGE.value
+            if session.is_group
+            else MessageType.FRIEND_MESSAGE.value
+        )
+        umo = (
+            f"{session.platform_id}:{message_type}:"
+            f"{session.platform_id}!{username}!{session_id}"
+        )
+        stopped_count = active_event_registry.request_agent_stop_all(umo)
+
+        return Response().ok(data={"stopped_count": stopped_count}).__dict__
+
     async def delete_webchat_session(self):
         """Delete a Platform session and all its related data."""
         session_id = request.args.get("session_id")
@@ -705,23 +764,18 @@ class ChatRoute(Route):
         # 获取可选的 platform_id 参数
         platform_id = request.args.get("platform_id")
 
-        sessions = await self.db.get_platform_sessions_by_creator(
+        sessions, _ = await self.db.get_platform_sessions_by_creator_paginated(
             creator=username,
             platform_id=platform_id,
             page=1,
             page_size=100,  # 暂时返回前100个
+            exclude_project_sessions=True,
         )
 
-        # 转换为字典格式，并添加项目信息
-        # get_platform_sessions_by_creator 现在返回 list[dict] 包含 session 和项目字段
+        # 转换为字典格式
         sessions_data = []
         for item in sessions:
             session = item["session"]
-            project_id = item["project_id"]
-
-            # 跳过属于项目的会话（在侧边栏对话列表中不显示）
-            if project_id is not None:
-                continue
 
             sessions_data.append(
                 {

astrbot/dashboard/routes/config.py

@@ -754,6 +754,22 @@ class ConfigRoute(Route):
             if not provider_type:
                 return Response().error("provider_config 缺少 type 字段").__dict__
 
+            # 首次添加某类提供商时，provider_cls_map 可能尚未注册该适配器
+            if provider_type not in provider_cls_map:
+                try:
+                    self.core_lifecycle.provider_manager.dynamic_import_provider(
+                        provider_type,
+                    )
+                except ImportError:
+                    logger.error(traceback.format_exc())
+                    return (
+                        Response()
+                        .error(
+                            "提供商适配器加载失败，请检查提供商类型配置或查看服务端日志"
+                        )
+                        .__dict__
+                    )
+
             # 获取对应的 provider 类
             if provider_type not in provider_cls_map:
                 return (
@@ -779,7 +795,7 @@ class ConfigRoute(Route):
             if inspect.iscoroutinefunction(init_fn):
                 await init_fn()
 
-            # 获取嵌入向量维度
+            # 通过实际请求验证当前 embedding_dimensions 是否可用
             vec = await inst.get_embedding("echo")
             dim = len(vec)
 

astrbot/dashboard/routes/conversation.py

@@ -148,7 +148,6 @@ class ConversationRoute(Route):
             user_id = data.get("user_id")
             cid = data.get("cid")
             title = data.get("title")
-            persona_id = data.get("persona_id", "")
 
             if not user_id or not cid:
                 return Response().error("缺少必要参数: user_id 和 cid").__dict__
@@ -158,6 +157,9 @@ class ConversationRoute(Route):
             )
             if not conversation:
                 return Response().error("对话不存在").__dict__
+
+            persona_id = data.get("persona_id", conversation.persona_id)
+
             if title is not None or persona_id is not None:
                 await self.conv_mgr.update_conversation(
                     unified_msg_origin=user_id,

astrbot/dashboard/routes/open_api.py

@@ -0,0 +1,388 @@
+from pathlib import Path
+from uuid import uuid4
+
+from quart import g, request
+
+from astrbot.core import logger
+from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
+from astrbot.core.db import BaseDatabase
+from astrbot.core.message.components import File, Image, Plain, Record, Reply, Video
+from astrbot.core.message.message_event_result import MessageChain
+from astrbot.core.platform.message_session import MessageSesion
+
+from .chat import ChatRoute
+from .route import Response, Route, RouteContext
+
+
+class OpenApiRoute(Route):
+    def __init__(
+        self,
+        context: RouteContext,
+        db: BaseDatabase,
+        core_lifecycle: AstrBotCoreLifecycle,
+        chat_route: ChatRoute,
+    ) -> None:
+        super().__init__(context)
+        self.db = db
+        self.core_lifecycle = core_lifecycle
+        self.platform_manager = core_lifecycle.platform_manager
+        self.chat_route = chat_route
+
+        self.routes = {
+            "/v1/chat": ("POST", self.chat_send),
+            "/v1/chat/sessions": ("GET", self.get_chat_sessions),
+            "/v1/configs": ("GET", self.get_chat_configs),
+            "/v1/file": ("POST", self.upload_file),
+            "/v1/im/message": ("POST", self.send_message),
+            "/v1/im/bots": ("GET", self.get_bots),
+        }
+        self.register_routes()
+
+    @staticmethod
+    def _resolve_open_username(
+        raw_username: str | None,
+    ) -> tuple[str | None, str | None]:
+        if raw_username is None:
+            return None, "Missing key: username"
+        username = str(raw_username).strip()
+        if not username:
+            return None, "username is empty"
+        return username, None
+
+    def _get_chat_config_list(self) -> list[dict]:
+        conf_list = self.core_lifecycle.astrbot_config_mgr.get_conf_list()
+
+        result = []
+        for conf_info in conf_list:
+            conf_id = str(conf_info.get("id", "")).strip()
+            result.append(
+                {
+                    "id": conf_id,
+                    "name": str(conf_info.get("name", "")).strip(),
+                    "path": str(conf_info.get("path", "")).strip(),
+                    "is_default": conf_id == "default",
+                }
+            )
+        return result
+
+    def _resolve_chat_config_id(self, post_data: dict) -> tuple[str | None, str | None]:
+        raw_config_id = post_data.get("config_id")
+        raw_config_name = post_data.get("config_name")
+        config_id = str(raw_config_id).strip() if raw_config_id is not None else ""
+        config_name = (
+            str(raw_config_name).strip() if raw_config_name is not None else ""
+        )
+
+        if not config_id and not config_name:
+            return None, None
+
+        conf_list = self._get_chat_config_list()
+        conf_map = {item["id"]: item for item in conf_list}
+
+        if config_id:
+            if config_id not in conf_map:
+                return None, f"config_id not found: {config_id}"
+            return config_id, None
+
+        if not config_name:
+            return None, "config_name is empty"
+
+        matched = [item for item in conf_list if item["name"] == config_name]
+        if not matched:
+            return None, f"config_name not found: {config_name}"
+        if len(matched) > 1:
+            return (
+                None,
+                f"config_name is ambiguous, please use config_id: {config_name}",
+            )
+
+        return matched[0]["id"], None
+
+    async def _ensure_chat_session(
+        self,
+        username: str,
+        session_id: str,
+    ) -> str | None:
+        session = await self.db.get_platform_session_by_id(session_id)
+        if session:
+            if session.creator != username:
+                return "session_id belongs to another username"
+            return None
+
+        try:
+            await self.db.create_platform_session(
+                creator=username,
+                platform_id="webchat",
+                session_id=session_id,
+                is_group=0,
+            )
+        except Exception as e:
+            # Handle rare race when same session_id is created concurrently.
+            existing = await self.db.get_platform_session_by_id(session_id)
+            if existing and existing.creator == username:
+                return None
+            logger.error("Failed to create chat session %s: %s", session_id, e)
+            return f"Failed to create session: {e}"
+
+        return None
+
+    async def chat_send(self):
+        post_data = await request.get_json(silent=True) or {}
+        effective_username, username_err = self._resolve_open_username(
+            post_data.get("username")
+        )
+        if username_err:
+            return Response().error(username_err).__dict__
+        if not effective_username:
+            return Response().error("Invalid username").__dict__
+
+        raw_session_id = post_data.get("session_id", post_data.get("conversation_id"))
+        session_id = str(raw_session_id).strip() if raw_session_id is not None else ""
+        if not session_id:
+            session_id = str(uuid4())
+            post_data["session_id"] = session_id
+        ensure_session_err = await self._ensure_chat_session(
+            effective_username,
+            session_id,
+        )
+        if ensure_session_err:
+            return Response().error(ensure_session_err).__dict__
+
+        config_id, resolve_err = self._resolve_chat_config_id(post_data)
+        if resolve_err:
+            return Response().error(resolve_err).__dict__
+
+        original_username = g.get("username", "guest")
+        g.username = effective_username
+        if config_id:
+            umo = f"webchat:FriendMessage:webchat!{effective_username}!{session_id}"
+            try:
+                if config_id == "default":
+                    await self.core_lifecycle.umop_config_router.delete_route(umo)
+                else:
+                    await self.core_lifecycle.umop_config_router.update_route(
+                        umo, config_id
+                    )
+            except Exception as e:
+                logger.error(
+                    "Failed to update chat config route for %s with %s: %s",
+                    umo,
+                    config_id,
+                    e,
+                    exc_info=True,
+                )
+                return (
+                    Response()
+                    .error(f"Failed to update chat config route: {e}")
+                    .__dict__
+                )
+        try:
+            return await self.chat_route.chat(post_data=post_data)
+        finally:
+            g.username = original_username
+
+    async def upload_file(self):
+        return await self.chat_route.post_file()
+
+    async def get_chat_sessions(self):
+        username, username_err = self._resolve_open_username(
+            request.args.get("username")
+        )
+        if username_err:
+            return Response().error(username_err).__dict__
+
+        assert username is not None  # for type checker
+
+        try:
+            page = int(request.args.get("page", 1))
+            page_size = int(request.args.get("page_size", 20))
+        except ValueError:
+            return Response().error("page and page_size must be integers").__dict__
+
+        if page < 1:
+            page = 1
+        if page_size < 1:
+            page_size = 1
+        if page_size > 100:
+            page_size = 100
+
+        platform_id = request.args.get("platform_id")
+
+        (
+            paginated_sessions,
+            total,
+        ) = await self.db.get_platform_sessions_by_creator_paginated(
+            creator=username,
+            platform_id=platform_id,
+            page=page,
+            page_size=page_size,
+            exclude_project_sessions=True,
+        )
+
+        sessions_data = []
+        for item in paginated_sessions:
+            session = item["session"]
+            sessions_data.append(
+                {
+                    "session_id": session.session_id,
+                    "platform_id": session.platform_id,
+                    "creator": session.creator,
+                    "display_name": session.display_name,
+                    "is_group": session.is_group,
+                    "created_at": session.created_at.astimezone().isoformat(),
+                    "updated_at": session.updated_at.astimezone().isoformat(),
+                }
+            )
+
+        return (
+            Response()
+            .ok(
+                data={
+                    "sessions": sessions_data,
+                    "page": page,
+                    "page_size": page_size,
+                    "total": total,
+                }
+            )
+            .__dict__
+        )
+
+    async def get_chat_configs(self):
+        conf_list = self._get_chat_config_list()
+        return Response().ok(data={"configs": conf_list}).__dict__
+
+    async def _build_message_chain_from_payload(
+        self,
+        message_payload: str | list,
+    ) -> MessageChain:
+        if isinstance(message_payload, str):
+            text = message_payload.strip()
+            if not text:
+                raise ValueError("Message is empty")
+            return MessageChain(chain=[Plain(text=text)])
+
+        if not isinstance(message_payload, list):
+            raise ValueError("message must be a string or list")
+
+        components = []
+        has_content = False
+
+        for part in message_payload:
+            if not isinstance(part, dict):
+                raise ValueError("message part must be an object")
+
+            part_type = str(part.get("type", "")).strip()
+            if part_type == "plain":
+                text = str(part.get("text", ""))
+                if text:
+                    has_content = True
+                    components.append(Plain(text=text))
+                continue
+
+            if part_type == "reply":
+                message_id = part.get("message_id")
+                if message_id is None:
+                    raise ValueError("reply part missing message_id")
+                components.append(
+                    Reply(
+                        id=str(message_id),
+                        message_str=str(part.get("selected_text", "")),
+                        chain=[],
+                    )
+                )
+                continue
+
+            if part_type not in {"image", "record", "file", "video"}:
+                raise ValueError(f"unsupported message part type: {part_type}")
+
+            has_content = True
+            file_path: Path | None = None
+            resolved_type = part_type
+            filename = str(part.get("filename", "")).strip()
+
+            attachment_id = part.get("attachment_id")
+            if attachment_id:
+                attachment = await self.db.get_attachment_by_id(str(attachment_id))
+                if not attachment:
+                    raise ValueError(f"attachment not found: {attachment_id}")
+                file_path = Path(attachment.path)
+                resolved_type = attachment.type
+                if not filename:
+                    filename = file_path.name
+            else:
+                raise ValueError(f"{part_type} part missing attachment_id")
+
+            if not file_path.exists():
+                raise ValueError(f"file not found: {file_path!s}")
+
+            file_path_str = str(file_path.resolve())
+            if resolved_type == "image":
+                components.append(Image.fromFileSystem(file_path_str))
+            elif resolved_type == "record":
+                components.append(Record.fromFileSystem(file_path_str))
+            elif resolved_type == "video":
+                components.append(Video.fromFileSystem(file_path_str))
+            else:
+                components.append(
+                    File(name=filename or file_path.name, file=file_path_str)
+                )
+
+        if not components or not has_content:
+            raise ValueError("Message content is empty (reply only is not allowed)")
+
+        return MessageChain(chain=components)
+
+    async def send_message(self):
+        post_data = await request.json or {}
+        message_payload = post_data.get("message", {})
+        umo = post_data.get("umo")
+
+        if message_payload is None:
+            return Response().error("Missing key: message").__dict__
+        if not umo:
+            return Response().error("Missing key: umo").__dict__
+
+        try:
+            session = MessageSesion.from_str(str(umo))
+        except Exception as e:
+            return Response().error(f"Invalid umo: {e}").__dict__
+
+        platform_id = session.platform_name
+        platform_inst = next(
+            (
+                inst
+                for inst in self.platform_manager.platform_insts
+                if inst.meta().id == platform_id
+            ),
+            None,
+        )
+        if not platform_inst:
+            return (
+                Response()
+                .error(f"Bot not found or not running for platform: {platform_id}")
+                .__dict__
+            )
+
+        try:
+            message_chain = await self._build_message_chain_from_payload(
+                message_payload
+            )
+            await platform_inst.send_by_session(session, message_chain)
+            return Response().ok().__dict__
+        except ValueError as e:
+            return Response().error(str(e)).__dict__
+        except Exception as e:
+            logger.error(f"Open API send_message failed: {e}", exc_info=True)
+            return Response().error(f"Failed to send message: {e}").__dict__
+
+    async def get_bots(self):
+        bot_ids = []
+        for platform in self.core_lifecycle.astrbot_config.get("platform", []):
+            platform_id = platform.get("id") if isinstance(platform, dict) else None
+            if (
+                isinstance(platform_id, str)
+                and platform_id
+                and platform_id not in bot_ids
+            ):
+                bot_ids.append(platform_id)
+        return Response().ok(data={"bot_ids": bot_ids}).__dict__

astrbot/dashboard/routes/plugin.py

@@ -19,8 +19,14 @@ from astrbot.core.star.filter.command_group import CommandGroupFilter
 from astrbot.core.star.filter.permission import PermissionTypeFilter
 from astrbot.core.star.filter.regex import RegexFilter
 from astrbot.core.star.star_handler import EventType, star_handlers_registry
-from astrbot.core.star.star_manager import PluginManager
-from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
+from astrbot.core.star.star_manager import (
+    PluginManager,
+    PluginVersionIncompatibleError,
+)
+from astrbot.core.utils.astrbot_path import (
+    get_astrbot_data_path,
+    get_astrbot_temp_path,
+)
 
 from .route import Response, Route, RouteContext
 
@@ -46,6 +52,7 @@ class PluginRoute(Route):
         super().__init__(context)
         self.routes = {
             "/plugin/get": ("GET", self.get_plugins),
+            "/plugin/check-compat": ("POST", self.check_plugin_compatibility),
             "/plugin/install": ("POST", self.install_plugin),
             "/plugin/install-upload": ("POST", self.install_plugin_upload),
             "/plugin/update": ("POST", self.update_plugin),
@@ -54,11 +61,13 @@ class PluginRoute(Route):
             "/plugin/market_list": ("GET", self.get_online_plugins),
             "/plugin/off": ("POST", self.off_plugin),
             "/plugin/on": ("POST", self.on_plugin),
+            "/plugin/reload-failed": ("POST", self.reload_failed_plugins),
             "/plugin/reload": ("POST", self.reload_plugins),
             "/plugin/readme": ("GET", self.get_plugin_readme),
             "/plugin/changelog": ("GET", self.get_plugin_changelog),
             "/plugin/source/get": ("GET", self.get_custom_source),
             "/plugin/source/save": ("POST", self.save_custom_source),
+            "/plugin/source/get-failed-plugins": ("GET", self.get_failed_plugins),
         }
         self.core_lifecycle = core_lifecycle
         self.plugin_manager = plugin_manager
@@ -71,10 +80,59 @@ class PluginRoute(Route):
             EventType.OnDecoratingResultEvent: "回复消息前",
             EventType.OnCallingFuncToolEvent: "函数工具",
             EventType.OnAfterMessageSentEvent: "发送消息后",
+            EventType.OnPluginErrorEvent: "插件报错时",
         }
 
         self._logo_cache = {}
 
+    async def check_plugin_compatibility(self):
+        try:
+            data = await request.get_json()
+            version_spec = data.get("astrbot_version", "")
+            is_valid, message = self.plugin_manager._validate_astrbot_version_specifier(
+                version_spec
+            )
+            return (
+                Response()
+                .ok(
+                    {
+                        "compatible": is_valid,
+                        "message": message,
+                        "astrbot_version": version_spec,
+                    }
+                )
+                .__dict__
+            )
+        except Exception as e:
+            return Response().error(str(e)).__dict__
+
+    async def reload_failed_plugins(self):
+        if DEMO_MODE:
+            return (
+                Response()
+                .error("You are not permitted to do this operation in demo mode")
+                .__dict__
+            )
+        try:
+            data = await request.get_json()
+            dir_name = data.get("dir_name")  # 这里拿的是目录名，不是插件名
+
+            if not dir_name:
+                return Response().error("缺少插件目录名").__dict__
+
+            # 调用 star_manager.py 中的函数
+            # 注意：传入的是目录名
+            success, err = await self.plugin_manager.reload_failed_plugin(dir_name)
+
+            if success:
+                return Response().ok(None, f"插件 {dir_name} 重载成功。").__dict__
+            else:
+                return Response().error(f"重载失败: {err}").__dict__
+
+        except Exception as e:
+            logger.error(f"/api/plugin/reload-failed: {traceback.format_exc()}")
+            return Response().error(str(e)).__dict__
+
     async def reload_plugins(self):
         if DEMO_MODE:
             return (
@@ -88,7 +146,7 @@ class PluginRoute(Route):
         try:
             success, message = await self.plugin_manager.reload(plugin_name)
             if not success:
-                return Response().error(message).__dict__
+                return Response().error(message or "插件重载失败").__dict__
             return Response().ok(None, "重载成功。").__dict__
         except Exception as e:
             logger.error(f"/api/plugin/reload: {traceback.format_exc()}")
@@ -166,10 +224,11 @@ class PluginRoute(Route):
 
     def _build_registry_source(self, custom_url: str | None) -> RegistrySource:
         """构建注册表源信息"""
+        data_dir = get_astrbot_data_path()
         if custom_url:
             # 对自定义URL生成一个安全的文件名
             url_hash = hashlib.md5(custom_url.encode()).hexdigest()[:8]
-            cache_file = f"data/plugins_custom_{url_hash}.json"
+            cache_file = os.path.join(data_dir, f"plugins_custom_{url_hash}.json")
 
             # 更安全的后缀处理方式
             if custom_url.endswith(".json"):
@@ -179,7 +238,7 @@ class PluginRoute(Route):
 
             urls = [custom_url]
         else:
-            cache_file = "data/plugins.json"
+            cache_file = os.path.join(data_dir, "plugins.json")
             md5_url = "https://api.soulter.top/astrbot/plugins-md5"
             urls = [
                 "https://api.soulter.top/astrbot/plugins",
@@ -315,6 +374,8 @@ class PluginRoute(Route):
                 ),
                 "display_name": plugin.display_name,
                 "logo": f"/api/file/{logo_url}" if logo_url else None,
+                "support_platforms": plugin.support_platforms,
+                "astrbot_version": plugin.astrbot_version,
             }
             # 检查是否为全空的幽灵插件
             if not any(
@@ -334,6 +395,10 @@ class PluginRoute(Route):
             .__dict__
         )
 
+    async def get_failed_plugins(self):
+        """专门获取加载失败的插件列表(字典格式)"""
+        return Response().ok(self.plugin_manager.failed_plugin_dict).__dict__
+
     async def get_plugin_handlers_info(self, handler_full_names: list[str]):
         """解析插件行为"""
         handlers = []
@@ -405,6 +470,7 @@ class PluginRoute(Route):
 
         post_data = await request.get_json()
         repo_url = post_data["url"]
+        ignore_version_check = bool(post_data.get("ignore_version_check", False))
 
         proxy: str = post_data.get("proxy", None)
         if proxy:
@@ -412,10 +478,23 @@ class PluginRoute(Route):
 
         try:
             logger.info(f"正在安装插件 {repo_url}")
-            plugin_info = await self.plugin_manager.install_plugin(repo_url, proxy)
+            plugin_info = await self.plugin_manager.install_plugin(
+                repo_url,
+                proxy,
+                ignore_version_check=ignore_version_check,
+            )
             # self.core_lifecycle.restart()
             logger.info(f"安装插件 {repo_url} 成功。")
             return Response().ok(plugin_info, "安装成功。").__dict__
+        except PluginVersionIncompatibleError as e:
+            return {
+                "status": "warning",
+                "message": str(e),
+                "data": {
+                    "warning_type": "astrbot_version_incompatible",
+                    "can_ignore": True,
+                },
+            }
         except Exception as e:
             logger.error(traceback.format_exc())
             return Response().error(str(e)).__dict__
@@ -431,16 +510,32 @@ class PluginRoute(Route):
         try:
             file = await request.files
             file = file["file"]
+            form_data = await request.form
+            ignore_version_check = (
+                str(form_data.get("ignore_version_check", "false")).lower() == "true"
+            )
             logger.info(f"正在安装用户上传的插件 {file.filename}")
             file_path = os.path.join(
                 get_astrbot_temp_path(),
                 f"plugin_upload_{file.filename}",
             )
             await file.save(file_path)
-            plugin_info = await self.plugin_manager.install_plugin_from_file(file_path)
+            plugin_info = await self.plugin_manager.install_plugin_from_file(
+                file_path,
+                ignore_version_check=ignore_version_check,
+            )
             # self.core_lifecycle.restart()
             logger.info(f"安装插件 {file.filename} 成功")
             return Response().ok(plugin_info, "安装成功。").__dict__
+        except PluginVersionIncompatibleError as e:
+            return {
+                "status": "warning",
+                "message": str(e),
+                "data": {
+                    "warning_type": "astrbot_version_incompatible",
+                    "can_ignore": True,
+                },
+            }
         except Exception as e:
             logger.error(traceback.format_exc())
             return Response().error(str(e)).__dict__
@@ -603,10 +698,16 @@ class PluginRoute(Route):
             logger.warning(f"插件 {plugin_name} 目录不存在")
             return Response().error(f"插件 {plugin_name} 目录不存在").__dict__
 
-        plugin_dir = os.path.join(
-            self.plugin_manager.plugin_store_path,
-            plugin_obj.root_dir_name or "",
-        )
+        if plugin_obj.reserved:
+            plugin_dir = os.path.join(
+                self.plugin_manager.reserved_plugin_path,
+                plugin_obj.root_dir_name,
+            )
+        else:
+            plugin_dir = os.path.join(
+                self.plugin_manager.plugin_store_path,
+                plugin_obj.root_dir_name,
+            )
 
         if not os.path.isdir(plugin_dir):
             logger.warning(f"无法找到插件目录: {plugin_dir}")
@@ -640,6 +741,7 @@ class PluginRoute(Route):
         logger.debug(f"正在获取插件 {plugin_name} 的更新日志")
 
         if not plugin_name:
+            logger.warning("插件名称为空")
             return Response().error("插件名称不能为空").__dict__
 
         # 查找插件
@@ -650,15 +752,27 @@ class PluginRoute(Route):
                 break
 
         if not plugin_obj:
+            logger.warning(f"插件 {plugin_name} 不存在")
             return Response().error(f"插件 {plugin_name} 不存在").__dict__
 
         if not plugin_obj.root_dir_name:
+            logger.warning(f"插件 {plugin_name} 目录不存在")
             return Response().error(f"插件 {plugin_name} 目录不存在").__dict__
 
-        plugin_dir = os.path.join(
-            self.plugin_manager.plugin_store_path,
-            plugin_obj.root_dir_name,
-        )
+        if plugin_obj.reserved:
+            plugin_dir = os.path.join(
+                self.plugin_manager.reserved_plugin_path,
+                plugin_obj.root_dir_name,
+            )
+        else:
+            plugin_dir = os.path.join(
+                self.plugin_manager.plugin_store_path,
+                plugin_obj.root_dir_name,
+            )
+
+        if not os.path.isdir(plugin_dir):
+            logger.warning(f"无法找到插件目录: {plugin_dir}")
+            return Response().error(f"无法找到插件 {plugin_name} 的目录").__dict__
 
         # 尝试多种可能的文件名
         changelog_names = ["CHANGELOG.md", "changelog.md", "CHANGELOG", "changelog"]
@@ -678,6 +792,7 @@ class PluginRoute(Route):
                     return Response().error(f"读取更新日志失败: {e!s}").__dict__
 
         # 没有找到 changelog 文件，返回 ok 但 content 为 null
+        logger.warning(f"插件 {plugin_name} 没有更新日志文件")
         return Response().ok({"content": None}, "该插件没有更新日志文件").__dict__
 
     async def get_custom_source(self):

astrbot/dashboard/routes/stat.py

@@ -295,14 +295,15 @@ class StatRoute(Route):
             if locale:
                 candidates.append(base_path / f"FIRST_NOTICE.{locale}.md")
                 if locale.lower().startswith("zh"):
+                    candidates.append(base_path / "FIRST_NOTICE.md")
                     candidates.append(base_path / "FIRST_NOTICE.zh-CN.md")
                 elif locale.lower().startswith("en"):
                     candidates.append(base_path / "FIRST_NOTICE.en-US.md")
 
             candidates.extend(
                 [
-                    base_path / "FIRST_NOTICE.en-US.md",
                     base_path / "FIRST_NOTICE.md",
+                    base_path / "FIRST_NOTICE.en-US.md",
                 ],
             )