docs: revise description for AstrBot in README.md

.dockerignore

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

.envrc

@@ -1,2 +0,0 @@
-git pull
-git status

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,40 +1,42 @@
 
-name: '🎉 Feature Request / 功能建议'
+name: '🎉 功能建议'
 title: "[Feature]"
-description: Submit a suggestion to help us improve. / 提交建议帮助我们改进。
+description: 提交建议帮助我们改进。
 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 / 描述
-      description: Please describe the feature you want to be added in detail. / 请详细描述您希望添加的功能。
+      label: 描述
+      description: 简短描述您的功能建议。
 
   - type: textarea
     attributes:
-      label: Use Case / 使用场景
-      description: Please describe the use case for this feature. / 请描述这个功能的使用场景。
+      label: 使用场景
+      description: 你想要发生什么？
+      placeholder: >
+        一个清晰且具体的描述这个功能的使用场景。
 
   - type: checkboxes
     attributes:
-      label: Willing to Submit PR? / 是否愿意提交PR？
+      label: 你愿意提交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: Yes, I am willing to submit a PR. / 是的，我愿意提交 PR。
+        - label: 是的, 我愿意提交PR!
 
   - type: checkboxes
     attributes:
       label: Code of Conduct
       options:
         - label: >
-            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). /
+            我已阅读并同意遵守该项目的 [行为准则](https://docs.github.com/zh/site-policy/github-terms/github-community-code-of-conduct)。
           required: true
 
   - type: markdown
     attributes:
-      value: "Thank you for filling out our form!"
+      value: "感谢您填写我们的表单！"

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,8 +3,8 @@
 
 ### Modifications / 改动点
 
-<!--Please summarize your changes: What core files were modified? What functionality was implemented?-->
 <!--请总结你的改动：哪些核心文件被修改了？实现了什么功能？-->
+<!--Please summarize your changes: What core files were modified? What functionality was implemented?-->
 
 - [x] This is NOT a breaking change. / 这不是一个破坏性变更。
 <!-- If your changes is a breaking change, please uncheck the checkbox above -->
@@ -21,14 +21,7 @@
 <!--If merged, your code will serve tens of thousands of users! Please double-check the following items before submitting.-->
 <!--如果分支被合并，您的代码将服务于数万名用户！在提交前，请核查一下几点内容。-->
 
-- [ ] 😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc. 
-  / 如果 PR 中有新加入的功能，已经通过 Issue / 邮件等方式和作者讨论过。
-
-- [ ] 👀 My changes have been well-tested, **and "Verification Steps" and "Screenshots" have been provided above**.
-  / 我的更改经过了良好的测试，**并已在上方提供了“验证步骤”和“运行截图”**。
-
-- [ ] 🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in `requirements.txt` and `pyproject.toml`.
-  / 我确保没有引入新依赖库，或者引入了新依赖库的同时将其添加到 `requirements.txt` 和 `pyproject.toml` 文件相应位置。
-
-- [ ] 😮 My changes do not introduce malicious code.
-  / 我的更改没有引入恶意代码。
+- [ ] 😊 如果 PR 中有新加入的功能，已经通过 Issue / 邮件等方式和作者讨论过。/ If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
+- [ ] 👀 我的更改经过了良好的测试，**并已在上方提供了“验证步骤”和“运行截图”**。/ My changes have been well-tested, **and "Verification Steps" and "Screenshots" have been provided above**.
+- [ ] 🤓 我确保没有引入新依赖库，或者引入了新依赖库的同时将其添加到了 `requirements.txt` 和 `pyproject.toml` 文件相应位置。/ I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in `requirements.txt` and `pyproject.toml`.
+- [ ] 😮 我的更改没有引入恶意代码。/ My changes do not introduce malicious code.

.github/workflows/auto_release.yml

@@ -0,0 +1,92 @@
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+name: Auto Release
+
+jobs:
+  build-and-publish-to-github-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Dashboard Build
+        run: |
+          cd dashboard
+          npm install
+          npm run build
+          echo "COMMIT_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo ${{ github.ref_name }} > dist/assets/version
+          zip -r dist.zip dist
+      
+      - name: Upload to Cloudflare R2
+        env:
+          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          R2_BUCKET_NAME: "astrbot"
+          R2_OBJECT_NAME: "astrbot-webui-latest.zip"
+          VERSION_TAG: ${{ github.ref_name }}
+        run: |
+          echo "Installing rclone..."
+          curl https://rclone.org/install.sh | sudo bash
+
+          echo "Configuring rclone remote..."
+          mkdir -p ~/.config/rclone
+          cat <<EOF > ~/.config/rclone/rclone.conf
+          [r2]
+          type = s3
+          provider = Cloudflare
+          access_key_id = $R2_ACCESS_KEY_ID
+          secret_access_key = $R2_SECRET_ACCESS_KEY
+          endpoint = https://${R2_ACCOUNT_ID}.r2.cloudflarestorage.com
+          EOF
+
+          echo "Uploading dist.zip to R2 bucket: $R2_BUCKET_NAME/$R2_OBJECT_NAME"
+          mv dashboard/dist.zip dashboard/$R2_OBJECT_NAME
+          rclone copy dashboard/$R2_OBJECT_NAME r2:$R2_BUCKET_NAME --progress
+          mv dashboard/$R2_OBJECT_NAME dashboard/astrbot-webui-${VERSION_TAG}.zip
+          rclone copy dashboard/astrbot-webui-${VERSION_TAG}.zip r2:$R2_BUCKET_NAME --progress
+          mv dashboard/astrbot-webui-${VERSION_TAG}.zip dashboard/dist.zip
+
+      - name: Fetch Changelog
+        run: |
+          echo "changelog=changelogs/${{github.ref_name}}.md" >> "$GITHUB_ENV"
+
+      - name: Create GitHub Release
+        uses: ncipollo/release-action@v1
+        with:
+          bodyFile: ${{ env.changelog }}
+          artifacts: "dashboard/dist.zip"
+      
+  build-and-publish-to-pypi:
+    # 构建并发布到 PyPI
+    runs-on: ubuntu-latest
+    needs: build-and-publish-to-github-release
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.10'
+
+      - name: Install uv
+        run: |
+          python -m pip install uv
+
+      - name: Build package
+        run: |
+          uv build
+
+      - name: Publish to PyPI
+        env:
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          uv publish

.github/workflows/build-docs.yml

@@ -1,43 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest # 运行环境
-    steps:
-      - name: checkout
-        uses: actions/checkout@v6
-      - name: nodejs installation
-        uses: actions/setup-node@v6
-        with:
-          node-version: "18"
-      - name: npm install
-        run: npm add -D vitepress
-        working-directory: './docs' # working-directory 指定 shell 命令运行目录
-      - name: npm run build
-        run: npm run docs:build
-        working-directory: './docs'
-      - name: scp
-        uses: appleboy/scp-action@v1.0.0
-        with:
-          host: ${{ secrets.HOST_NEKO }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORDNEKO }}
-          source: 'docs/.vitepress/dist/*'
-          target: '/tmp/'
-      - name: script
-        uses: appleboy/ssh-action@v1.2.5
-        with:
-          host: ${{ secrets.HOST_NEKO }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORDNEKO }}
-          script: |
-            mkdir -p /root/docker_data/caddy/caddy_data/static_site/abv4/
-            rm -rf /root/docker_data/caddy/caddy_data/static_site/abv4/*
-            mv /tmp/docs/.vitepress/dist/* /root/docker_data/caddy/caddy_data/static_site/abv4/
-            rm -rf /tmp/docs/

.github/workflows/code-format.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: '3.12'
+        python-version: '3.10'
         
     - 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=astrbot -v -o log_cli=true -o log_level=DEBUG
+          pytest --cov=. -v -o log_cli=true -o log_level=DEBUG
 
       - name: Upload results to Codecov
         uses: codecov/codecov-action@v5

.github/workflows/dashboard_ci.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '24.13.0'
+          node-version: 'latest'
 
       - name: npm install, build
         run: |
@@ -36,7 +36,7 @@ jobs:
           zip -r dist.zip dist
 
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: dist-without-markdown
           path: |
@@ -45,11 +45,11 @@ jobs:
 
       - name: Create GitHub Release
         if: github.event_name == 'push'
-        uses: ncipollo/release-action@v1.21.0
+        uses: ncipollo/release-action@v1
         with:
           tag: release-${{ github.sha }}
           owner: AstrBotDevs
           repo: astrbot-release-harbour
           body: "Automated release from commit ${{ github.sha }}"
           token: ${{ secrets.ASTRBOT_HARBOUR_TOKEN }}
-          artifacts: "dashboard/dist.zip"
+          artifacts: "dashboard/dist.zip"

.github/workflows/deploy-dashboard.yml

@@ -1,53 +0,0 @@
-name: Deploy Dashboard to GitHub Pages
-
-on:
-  schedule:
-    - cron: '0 0 * * *'  # Runs daily at midnight UTC
-  workflow_dispatch:      # Allow manual triggering
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Only allow one concurrent deployment at a time
-concurrency:
-  group: pages
-  cancel-in-progress: false
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-
-      - name: Install dependencies
-        working-directory: dashboard
-        run: bun install
-
-      - name: Build dashboard
-        working-directory: dashboard
-        run: bun run build
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: dashboard/dist
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.github/workflows/docker-image.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-      GHCR_OWNER: astrbotdevs
+      GHCR_OWNER: soulter
       HAS_GHCR_TOKEN: ${{ secrets.GHCR_GITHUB_TOKEN != '' }}
 
     steps:
@@ -64,20 +64,20 @@ jobs:
           echo "build_date=$build_date" >> $GITHUB_OUTPUT
 
       - name: Set QEMU
-        uses: docker/setup-qemu-action@v4.0.0
+        uses: docker/setup-qemu-action@v3
 
       - name: Set Docker Buildx
-        uses: docker/setup-buildx-action@v4.0.0
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to DockerHub
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: Login to GitHub Container Registry
         if: env.HAS_GHCR_TOKEN == 'true'
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_OWNER }}
@@ -98,7 +98,7 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Build and Push Nightly Image
-        uses: docker/build-push-action@v7.0.0
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64
@@ -113,7 +113,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-      GHCR_OWNER: astrbotdevs
+      GHCR_OWNER: soulter
       HAS_GHCR_TOKEN: ${{ secrets.GHCR_GITHUB_TOKEN != '' }}
 
     steps:
@@ -163,27 +163,27 @@ jobs:
           cp -r dashboard/dist data/
 
       - name: Set QEMU
-        uses: docker/setup-qemu-action@v4.0.0
+        uses: docker/setup-qemu-action@v3
 
       - name: Set Docker Buildx
-        uses: docker/setup-buildx-action@v4.0.0
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to DockerHub
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: Login to GitHub Container Registry
         if: env.HAS_GHCR_TOKEN == 'true'
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_OWNER }}
           password: ${{ secrets.GHCR_GITHUB_TOKEN }}
 
       - name: Build and Push Release Image
-        uses: docker/build-push-action@v7.0.0
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/pr-title-check.yml

@@ -1,53 +0,0 @@
-name: PR Title Check
-
-on:
-  pull_request_target:
-    types: [opened, edited, reopened, synchronize]
-
-jobs:
-  title-format:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      issues: write
-
-    steps:
-      - name: Validate PR title
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const title = (context.payload.pull_request.title || "").trim();
-            // allow only:
-            // feat: xxx
-            // feat(scope): xxx
-            const pattern = /^(feat)(\([a-z0-9-]+\))?:\s.+$/i;
-            const isValid = pattern.test(title);
-            const isSameRepo =
-              context.payload.pull_request.head.repo.full_name === context.payload.repository.full_name;
-
-            if (!isValid) {
-              if (isSameRepo) {
-                try {
-                  await github.rest.issues.createComment({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    issue_number: context.payload.pull_request.number,
-                    body: [
-                      "⚠️ PR title format check failed.",
-                      "Required formats:",
-                      "- `feat: xxx`",
-                      "- `feat(scope): xxx`",
-                      "Please update your PR title and push again."
-                    ].join("\n")
-                  });
-                } catch (e) {
-                  core.warning(`Failed to post PR title comment: ${e.message}`);
-                }
-              } else {
-                core.warning("Fork PR: comment permission is restricted; skip posting review comment.");
-              }
-            }
-
-            if (!isValid) {
-              core.setFailed("Invalid PR title. Expected format: feat: xxx or feat(scope): xxx.");
-            }

.github/workflows/release.yml

@@ -1,245 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - "v*"
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: "Git ref to build (branch/tag/SHA)"
-        required: false
-        default: "master"
-      tag:
-        description: "Release tag to publish assets to (for example: v4.14.6)"
-        required: false
-
-permissions:
-  contents: write
-
-jobs:
-  build-dashboard:
-    name: Build Dashboard
-    runs-on: ubuntu-24.04
-    env:
-      R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
-      R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
-      R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-    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 pnpm
-        uses: pnpm/action-setup@v4.4.0
-        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
-
-      - name: Build dashboard dist
-        shell: bash
-        run: |
-          pnpm --dir dashboard install --frozen-lockfile
-          pnpm --dir dashboard run build
-          echo "${{ steps.tag.outputs.tag }}" > dashboard/dist/assets/version
-          cd dashboard
-          zip -r "AstrBot-${{ steps.tag.outputs.tag }}-dashboard.zip" dist
-
-      - name: Upload dashboard artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: Dashboard-${{ steps.tag.outputs.tag }}
-          if-no-files-found: error
-          path: dashboard/AstrBot-${{ steps.tag.outputs.tag }}-dashboard.zip
-
-      - name: Upload dashboard package to Cloudflare R2
-        if: ${{ env.R2_ACCOUNT_ID != '' && env.R2_ACCESS_KEY_ID != '' && env.R2_SECRET_ACCESS_KEY != '' }}
-        env:
-          R2_BUCKET_NAME: "astrbot"
-          R2_OBJECT_NAME: "astrbot-webui-latest.zip"
-          VERSION_TAG: ${{ steps.tag.outputs.tag }}
-        shell: bash
-        run: |
-          curl https://rclone.org/install.sh | sudo bash
-
-          mkdir -p ~/.config/rclone
-          cat <<EOF > ~/.config/rclone/rclone.conf
-          [r2]
-          type = s3
-          provider = Cloudflare
-          access_key_id = $R2_ACCESS_KEY_ID
-          secret_access_key = $R2_SECRET_ACCESS_KEY
-          endpoint = https://${R2_ACCOUNT_ID}.r2.cloudflarestorage.com
-          EOF
-
-          cp "dashboard/AstrBot-${VERSION_TAG}-dashboard.zip" "dashboard/${R2_OBJECT_NAME}"
-          rclone copy "dashboard/${R2_OBJECT_NAME}" "r2:${R2_BUCKET_NAME}" --progress
-          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
-
-  publish-release:
-    name: Publish GitHub Release
-    runs-on: ubuntu-24.04
-    needs:
-      - build-dashboard
-    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: Download dashboard artifact
-        uses: actions/download-artifact@v8
-        with:
-          name: Dashboard-${{ steps.tag.outputs.tag }}
-          path: release-assets
-
-
-      - name: Resolve release notes
-        id: notes
-        shell: bash
-        run: |
-          note_file="changelogs/${{ steps.tag.outputs.tag }}.md"
-          if [ ! -f "$note_file" ]; then
-            note_file="$(mktemp)"
-            echo "Release ${{ steps.tag.outputs.tag }}" > "$note_file"
-          fi
-          echo "file=$note_file" >> "$GITHUB_OUTPUT"
-
-      - name: Ensure release exists
-        env:
-          GH_TOKEN: ${{ github.token }}
-        shell: bash
-        run: |
-          tag="${{ steps.tag.outputs.tag }}"
-          if ! gh release view "$tag" >/dev/null 2>&1; then
-            gh release create "$tag" --title "$tag" --notes-file "${{ steps.notes.outputs.file }}"
-          fi
-
-      - name: Remove stale assets from release
-        env:
-          GH_TOKEN: ${{ github.token }}
-        shell: bash
-        run: |
-          tag="${{ steps.tag.outputs.tag }}"
-          while IFS= read -r asset; do
-            case "$asset" in
-              *.AppImage|*.dmg|*.zip|*.exe|*.blockmap)
-                gh release delete-asset "$tag" "$asset" -y || true
-                ;;
-            esac
-          done < <(gh release view "$tag" --json assets --jq '.assets[].name')
-
-      - name: Upload assets to release
-        env:
-          GH_TOKEN: ${{ github.token }}
-        shell: bash
-        run: |
-          tag="${{ steps.tag.outputs.tag }}"
-          gh release upload "$tag" release-assets/* --clobber
-
-  publish-pypi:
-    name: Publish PyPI
-    runs-on: ubuntu-24.04
-    needs:
-      - publish-release
-    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: Download dashboard artifact
-        uses: actions/download-artifact@v8
-        with:
-          name: Dashboard-${{ steps.tag.outputs.tag }}
-          path: dashboard-artifact
-
-      - name: Unpack dashboard dist into package tree
-        shell: bash
-        run: |
-          mkdir -p astrbot/dashboard/dist
-          unzip -q "dashboard-artifact/AstrBot-${{ steps.tag.outputs.tag }}-dashboard.zip" -d dashboard-artifact/unpacked
-          cp -r dashboard-artifact/unpacked/dist/. astrbot/dashboard/dist/
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.10"
-
-      - name: Install uv
-        shell: bash
-        run: python -m pip install uv
-
-      - name: Build package
-        shell: bash
-        # Dashboard assets are already in astrbot/dashboard/dist/;
-        # ASTRBOT_BUILD_DASHBOARD is intentionally unset so the hatch hook skips npm.
-        run: uv build
-
-      - name: Publish to PyPI
-        env:
-          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
-        shell: bash
-        run: uv publish

.github/workflows/smoke_test.yml

@@ -5,9 +5,9 @@ on:
     branches:
       - master
     paths-ignore:
-      - "README*.md"
-      - "changelogs/**"
-      - "dashboard/**"
+      - 'README*.md'
+      - 'changelogs/**'
+      - 'dashboard/**'
   pull_request:
   workflow_dispatch:
 
@@ -16,7 +16,7 @@ jobs:
     name: Run smoke tests
     runs-on: ubuntu-latest
     timeout-minutes: 10
-
+    
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -26,8 +26,8 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.12"
-
+          python-version: '3.12'
+      
       - name: Install UV package manager
         run: |
           pip install uv
@@ -40,9 +40,6 @@ jobs:
       - name: Run smoke tests
         run: |
           uv run main.py &
-          # uv tool install -e . --force
-          # astrbot init -y 
-          # astrbot run --backend-only &
           APP_PID=$!
 
           echo "Waiting for application to start..."

.github/workflows/sync-wiki.yml

@@ -1,68 +0,0 @@
-name: sync wiki
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-    paths:
-      - '.github/workflows/sync-wiki.yml'
-      - 'docs/scripts/sync_docs_to_wiki.py'
-      - 'docs/tests/test_sync_docs_to_wiki.py'
-      - 'docs/zh/**'
-      - 'docs/en/**'
-
-concurrency:
-  group: sync-wiki-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Validate manual ref
-        if: github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master'
-        run: |
-          echo "This workflow only publishes from refs/heads/master. Re-run it from the master branch."
-          exit 1
-
-      - name: Check out docs repository
-        uses: actions/checkout@v6
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-
-      - name: Run sync unit tests
-        working-directory: docs
-        run: python -m unittest discover -s tests -p 'test_sync_docs_to_wiki.py' -v
-
-      - name: Validate internal doc links
-        run: python docs/scripts/sync_docs_to_wiki.py --source-root docs --check-links-only
-
-      - name: Clone AstrBot wiki
-        env:
-          WIKI_TOKEN: ${{ secrets.ASTRBOT_WIKI_TOKEN }}
-        run: |
-          test -n "$WIKI_TOKEN"
-          git clone "https://x-access-token:${WIKI_TOKEN}@github.com/AstrBotDevs/AstrBot.wiki.git" wiki
-
-      - name: Generate wiki pages
-        run: python docs/scripts/sync_docs_to_wiki.py --source-root docs --wiki-root wiki
-
-      - name: Commit and push wiki changes
-        working-directory: wiki
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add .
-          if git diff --cached --quiet; then
-            echo "No wiki changes to push"
-            exit 0
-          fi
-          git commit -m "docs: sync wiki from AstrBot-1/docs"
-          git push

.gitignore

@@ -32,13 +32,10 @@ tests/astrbot_plugin_openai
 # Dashboard
 dashboard/node_modules/
 dashboard/dist/
-.pnpm-store/
 package-lock.json
+package.json
 yarn.lock
 
-# Bundled dashboard dist (generated by hatch_build.py during pip wheel build)
-astrbot/dashboard/dist/
-
 # Operating System
 **/.DS_Store
 .DS_Store
@@ -56,10 +53,4 @@ IFLOW.md
 
 # genie_tts data
 CharacterModels/
-GenieData/
-.agent/
-.codex/
-.opencode/
-.kilocode/
-.serena
-.worktrees/
+GenieData/

.python-version

@@ -1 +1 @@
-3.12
+3.10

AGENTS.md

@@ -3,10 +3,8 @@
 ### Core
 
 ```
-uv tool install -e . --force
-astrbot init
-astrbot run # start the bot 
-astrbot run --backend-only # start the backend only
+uv sync
+uv run main.py
 ```
 
 Exposed an API server on `http://localhost:6185` by default.
@@ -15,8 +13,8 @@ Exposed an API server on `http://localhost:6185` by default.
 
 ```
 cd dashboard
-bun install # First time only.
-bun dev
+pnpm install # First time only. Use npm install -g pnpm if pnpm is not installed.
+pnpm dev
 ```
 
 Runs on `http://localhost:3000` by default.
@@ -28,9 +26,6 @@ Runs on `http://localhost:3000` by default.
 3. After finishing, use `ruff format .` and `ruff check .` to format and check the code.
 4. When committing, ensure to use conventional commits messages, such as `feat: add new agent for data analysis` or `fix: resolve bug in provider manager`.
 5. Use English for all new comments.
-6. For path handling, use `pathlib.Path` instead of string paths, and use `astrbot.core.utils.path_utils` to get the AstrBot data and temp directory.
-7. Use Python 3.12+ type hinting syntax (e.g., `list[str]` over `List[str]`, `int | None` over `Optional[int]`). Avoid using `Any` and ensure comprehensive type annotations are provided.
-
 
 ## PR instructions
 

CONTRIBUTING.md

@@ -46,32 +46,6 @@ ruff check .
 
 如果您使用 VSCode，可以安装 `Ruff` 插件。
 
-##### PR 功能完整性验证（推荐）
-
-如果您希望在本地做一套接近 CI 的完整验证，可使用：
-
-```bash
-make pr-test-neo
-```
-
-该命令会执行：
-- `uv sync --group dev`
-- `ruff format --check .` 与 `ruff check .`
-- Neo 相关关键测试
-- `main.py` 启动 smoke test（检测 `http://localhost:6185`）
-
-需要全量验证时可使用：
-
-```bash
-make pr-test-full
-```
-
-如果只想快速重复执行（跳过依赖同步和 dashboard 构建）：
-
-```bash
-make pr-test-full-fast
-```
-
 
 ## Contributing Guide
 
@@ -114,29 +88,3 @@ We use Ruff as our code formatter and static analysis tool. Before submitting yo
 ruff format .
 ruff check .
 ```
-
-##### PR completeness checks (recommended)
-
-To run a local validation flow close to CI, use:
-
-```bash
-make pr-test-neo
-```
-
-This command runs:
-- `uv sync --group dev`
-- `ruff format --check .` and `ruff check .`
-- Neo-related critical tests
-- a startup smoke test against `http://localhost:6185`
-
-For full validation, use:
-
-```bash
-make pr-test-full
-```
-
-For faster repeated runs (skip dependency sync and dashboard build), use:
-
-```bash
-make pr-test-full-fast
-```

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-slim
+FROM python:3.11-slim
 WORKDIR /AstrBot
 
 COPY . /AstrBot/
@@ -15,17 +15,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
     gnupg \
     git \
-    && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN apt-get update && apt-get install -y curl gnupg \
+    && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
+    && apt-get install -y nodejs
+
 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
+    && echo "3.11" > .python-version
+RUN uv pip install -r requirements.txt --no-cache-dir --system
+RUN uv pip install socksio uv pilk --no-cache-dir --system
 
 EXPOSE 6185
 

FIRST_NOTICE.en-US.md

@@ -1,14 +0,0 @@
-## Welcome to AstrBot
-
-🌟 Thank you for using AstrBot!
-
-AstrBot is an Agentic AI assistant for personal and group chats, with support for multiple IM platforms and a wide range of built-in features. We hope it brings you an efficient and enjoyable experience. ❤️
-
-Important notice:
-
-AstrBot is a **free and open-source software project** protected by the AGPLv3 license. You can find the full source code and related resources on our [**official website**](https://astrbot.app) and [**GitHub**](https://github.com/astrbotdevs/astrbot).
-As of now, AstrBot has **no commercial services of any kind**, and the official team **will never charge users any fees** under any name.
-
-If anyone asks you to pay while using AstrBot, **you are likely being scammed**. Please request a refund immediately and report it to us by email.
-
-📮 Official email: [community@astrbot.app](mailto:community@astrbot.app)

FIRST_NOTICE.md

@@ -1,14 +0,0 @@
-## 欢迎使用 AstrBot
-
-🌟 感谢您使用 AstrBot！
-
-AstrBot 是一款可接入多种 IM 平台的 Agentic AI 个人 / 群聊助手，内置多项强大功能，希望能为您带来高效、愉快的使用体验。❤️
-
-我们想特别说明：
-
-AstrBot 是受 AGPLv3 开源协议保护的**免费开源软件项目**，您可以在[**官方网站**](https://astrbot.app)、[**GitHub**](https://github.com/astrbotdevs/astrbot) 上找到 AstrBot 的全部源代码及相关资源。
-截至目前，AstrBot 项目**未开展任何形式的商业化服务**，官方**不会以任何名义向用户收取费用**。
-
-如果您在使用 AstrBot 的过程中被要求付费，**表明您已经遭遇诈骗行为**。请立即向相关方申请退款，并及时通过邮件向我们反馈。
-
-📮 官方邮箱：[community@astrbot.app](mailto:community@astrbot.app)

Makefile

@@ -1,4 +1,4 @@
-.PHONY: worktree worktree-add worktree-rm pr-test-neo pr-test-full pr-test-full-fast
+.PHONY: worktree worktree-add worktree-rm
 
 WORKTREE_DIR ?= ../astrbot_worktree
 BRANCH ?= $(word 2,$(MAKECMDGOALS))
@@ -27,15 +27,6 @@ endif
 		echo "Worktree $(WORKTREE_DIR)/$(BRANCH) not found."; \
 	fi
 
-pr-test-neo:
-	./scripts/pr_test_env.sh --profile neo
-
-pr-test-full:
-	./scripts/pr_test_env.sh --profile full
-
-pr-test-full-fast:
-	./scripts/pr_test_env.sh --profile full --skip-sync --no-dashboard
-
 # Swallow extra args (branch/base) so make doesn't treat them as targets
 %:
 	@true

README.md

@@ -2,9 +2,10 @@
 
 <div align="center">
 
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
+
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
 
@@ -19,47 +20,44 @@
 <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%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTk0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%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%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
 <a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20Plugins&label=Marketplace&cacheSeconds=3600">
+<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600">
 <img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
 </div>
 
 <br>
 
-<a href="https://astrbot.app/">Home</a> ｜
-<a href="https://astrbot.app/">Docs</a> ｜
+<a href="https://astrbot.app/">文档</a> ｜
 <a href="https://blog.astrbot.app/">Blog</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">Roadmap</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/issues">Issues</a>
-<a href="mailto:community@astrbot.app">Email</a>
-
+<a href="https://astrbot.featurebase.app/roadmap">路线图</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/issues">问题提交</a>
 </div>
 
-AstrBot is an open-source, all-in-one Agentic personal and group chat assistant that can be deployed on dozens of mainstream instant messaging platforms such as QQ, Telegram, WeCom, Lark, DingTalk, Slack, and more. It also features a built-in lightweight ChatUI similar to OpenWebUI, creating a reliable and scalable conversational AI infrastructure for individuals, developers, and teams. Whether it's a personal AI companion, smart customer service, automated assistant, or enterprise knowledge base, AstrBot enables you to quickly build AI applications within the workflow of your instant messaging platforms.
+AstrBot 是一个易用、高性能的 AI Agentic 个人 / 群聊助手。可在 QQ、Telegram、企业微信、飞书、钉钉、Slack、等数十款主流即时通讯软件上部署，此外还内置类似 OpenWebUI 的轻量化 ChatUI，为个人、开发者和团队打造可靠、可扩展的对话式智能基础设施。无论是个人 AI 伙伴、智能客服、自动化助手，还是企业知识库，AstrBot 都能在你的即时通讯软件平台的工作流中快速构建 AI 应用。
 
-![landingpage](https://github.com/user-attachments/assets/45fc5699-cddf-4e21-af35-13040706f6c0)
+![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba)
 
-## Key Features
+## 主要功能
 
-1. 💯 Free & Open Source.
-2. ✨ Large Language Model (LLM) dialogue, Multimodal, Agent, MCP, Skills, Knowledge Base, Persona settings, automatic dialogue compression.
-3. 🤖 Supports integration with agent platforms such as Dify, Alibaba Bailian, Coze, etc.
-4. 🌐 Multi-platform support: QQ, WeCom, Lark, DingTalk, WeChat Official Account, Telegram, Slack, and [more](#supported-message-platforms).
-5. 📦 Plugin extension: 1000+ plugins available for one-click installation.
-6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html): Isolated environment for safely executing any code, calling Shell commands, and reusing session-level resources.
-7. 💻 WebUI support.
-8. 🌈 Web ChatUI support: Built-in proxy sandbox, web search, etc. within ChatUI.
-9. 🌐 Internationalization (i18n) support.
+1. 💯 免费 & 开源。
+1. ✨ AI 大模型对话，多模态，Agent，MCP，Skills，知识库，人格设定，自动压缩对话。
+2. 🤖 支持接入 Dify、阿里云百炼、Coze 等智能体平台。
+2. 🌐 多平台，支持 QQ、企业微信、飞书、钉钉、微信公众号、Telegram、Slack 以及[更多](#支持的消息平台)。
+3. 📦 插件扩展，已有近 800 个插件可一键安装。
+5. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) 隔离化环境，安全地执行任何代码、调用 Shell、会话级资源复用。
+6. 💻 WebUI 支持。
+7. 🌈 Web ChatUI 支持，ChatUI 内置代理沙盒、网页搜索等。
+8. 🌐 国际化（i18n）支持。
 
 <br>
 
 <table align="center">
   <tr align="center">
-    <th>💙 Roleplay & Companionship</th>
-    <th>✨ Proactive Agent</th>
-    <th>🚀 General Agentic Capabilities</th>
-    <th>🧩 1000+ Community Plugins</th>
+    <th>💙 角色扮演 & 情感陪伴</th>
+    <th>✨ 主动式 Agent</th>
+    <th>🚀 通用 Agentic 能力</th>
+    <th>🧩 900+ 社区插件</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>
@@ -69,220 +67,192 @@ AstrBot is an open-source, all-in-one Agentic personal and group chat assistant
   </tr>
 </table>
 
-## Quick Start
+## 快速开始
 
-### One-Click Deployment
+#### Docker 部署(推荐 🥳)
 
-For users who want to experience AstrBot quickly, are familiar with the command line, and can install the `uv` environment themselves, we recommend using `uv` for one-click deployment ⚡️.
+推荐使用 Docker / Docker Compose 方式部署 AstrBot。
+
+请参阅官方文档 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) 。
+
+#### uv 部署
 
 ```bash
-uv tool install astrbot
-astrbot init # Execute this command only for the first time to initialize the environment
-astrbot run # astrbot run --backend-only starts only the backend service
-
-# Install development version (more fixes and new features, but less stable; suitable for developers)
-uv tool install git+https://github.com/AstrBotDevs/AstrBot@dev
+uvx astrbot
 ```
 
-> Requires [uv](https://docs.astral.sh/uv/) installed.
+#### 宝塔面板部署
 
-> [!NOTE]
-> For macOS users: Due to macOS security checks, the first execution of the `astrbot` command may take a longer time (about 10-20 seconds).
+AstrBot 与宝塔面板合作，已上架至宝塔面板。
 
-Update `astrbot`:
+请参阅官方文档 [宝塔面板部署](https://astrbot.app/deploy/astrbot/btpanel.html) 。
 
-```bash
-uv tool upgrade astrbot
-```
+#### 1Panel 部署
 
-### Docker Deployment
+AstrBot 已由 1Panel 官方上架至 1Panel 面板。
 
-For users familiar with containers who prefer a more stable deployment suitable for production environments, we recommend using Docker / Docker Compose to deploy AstrBot.
+请参阅官方文档 [1Panel 部署](https://astrbot.app/deploy/astrbot/1panel.html) 。
 
-Please refer to the official documentation [Deploy AstrBot with Docker](https://astrbot.app/deploy/astrbot/docker.html).
+#### 在 雨云 上部署
 
-### Deploy on RainYun
-
-For users who want to deploy AstrBot with one click and do not want to manage servers themselves, we recommend RainYun's one-click cloud deployment service ☁️:
+AstrBot 已由雨云官方上架至云应用平台，可一键部署。
 
 [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
 
-### Desktop Client Deployment
+#### 在 Replit 上部署
 
-For users who wish to use AstrBot on the desktop with ChatUI as the main interface, we recommend using the AstrBot App.
-
-Go to [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop) to download and install; this method is intended for desktop use and is not recommended for server scenarios.
-
-### Launcher Deployment
-
-Also for desktop, users who want quick deployment and isolated environments for multiple instances can use the AstrBot Launcher.
-
-Go to [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) to download and install.
-
-### Deploy on Replit
-
-Replit deployment is maintained by the community, suitable for online demos and lightweight trials.
+社区贡献的部署方式。
 
 [![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
 
-### AUR
+#### Windows 一键安装器部署
 
-The AUR method is for Arch Linux users who wish to install AstrBot via the system package manager.
+请参阅官方文档 [使用 Windows 一键安装器部署 AstrBot](https://astrbot.app/deploy/astrbot/windows.html) 。
 
-Execute the following command in the terminal to install the `astrbot-git` package. You can start using it after installation completes.
+#### CasaOS 部署
+
+社区贡献的部署方式。
+
+请参阅官方文档 [CasaOS 部署](https://astrbot.app/deploy/astrbot/casaos.html) 。
+
+#### 手动部署
+
+首先安装 uv：
 
 ```bash
-yay -S astrbot-git
+pip install uv
 ```
 
-**More Deployment Methods**
+通过 Git Clone 安装 AstrBot：
 
-If you need panel-based or highly customized deployment, you can refer to [BT Panel](https://astrbot.app/deploy/astrbot/btpanel.html) (BT Panel App Store), [1Panel](https://astrbot.app/deploy/astrbot/1panel.html) (1Panel App Store), [CasaOS](https://astrbot.app/deploy/astrbot/casaos.html) (NAS / Home Server visual deployment), and [Manual Deployment](https://astrbot.app/deploy/astrbot/cli.html) (Full custom installation based on source code and `uv`).
+```bash
+git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
+uv run main.py
+```
 
-## Supported Message Platforms
+或者请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html) 。
 
-Connect AstrBot to your favorite chat platforms.
+## 支持的消息平台
 
-| Platform | Maintainer |
-|---------|---------------|
-| **QQ** | Official |
-| **OneBot v11** | Official |
-| **Telegram** | Official |
-| **WeCom App & Bot** | Official |
-| **WeChat Customer Service & Official Account** | Official |
-| **Lark (Feishu)** | Official |
-| **DingTalk** | Official |
-| **Slack** | Official |
-| **Discord** | Official |
-| **LINE** | Official |
-| **Satori** | Official |
-| **Misskey** | Official |
-| **Whatsapp (Coming Soon)** | Official |
-| [**Matrix**](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Community |
-| [**KOOK**](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Community |
-| [**VoceChat**](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Community |
+**官方维护**
 
-## Supported Model Providers
+- QQ (官方平台 & OneBot)
+- Telegram
+- 企微应用 & 企微智能机器人
+- 微信客服 & 微信公众号
+- 飞书
+- 钉钉
+- Slack
+- Discord
+- Satori
+- Misskey
+- Whatsapp (将支持)
+- LINE (将支持)
 
-| Provider | Type |
-|---------|---------------|
-| Custom | Any OpenAI API compatible service |
-| OpenAI | LLM |
-| Anthropic | LLM |
-| Google Gemini | LLM |
-| Moonshot AI | LLM |
-| Zhipu AI | LLM |
-| DeepSeek | LLM |
-| Ollama (Local) | LLM |
-| LM Studio (Local) | LLM |
-| [AIHubMix](https://aihubmix.com/?aff=4bfH) | LLM (API Gateway, supports all models) |
-| [Compshare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM (API Gateway, supports all models) |
-| [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM (API Gateway, supports all models)  |
-| [PPIO](https://ppio.com/user/register?invited_by=AIOONE) | LLM (API Gateway, supports all models) |
-| [302.AI](https://share.302.ai/rr1M3l) | LLM (API Gateway, supports all models)|
-| [TokenPony](https://www.tokenpony.cn/3YPyf) | LLM (API Gateway, supports all models)|
-| ModelScope | LLM |
-| OneAPI | LLM |
-| Dify | LLMOps Platform |
-| Alibaba Bailian | LLMOps Platform |
-| Coze | LLMOps Platform |
-| OpenAI Whisper | Speech-to-Text |
-| SenseVoice | Speech-to-Text |
-| OpenAI TTS | Text-to-Speech |
-| Gemini TTS | Text-to-Speech |
-| GPT-Sovits-Inference | Text-to-Speech |
-| GPT-Sovits | Text-to-Speech |
-| FishAudio | Text-to-Speech |
-| Edge TTS | Text-to-Speech |
-| Alibaba Bailian TTS | Text-to-Speech |
-| Azure TTS | Text-to-Speech |
-| Minimax TTS | Text-to-Speech |
-| Volcano Engine TTS | Text-to-Speech |
+**社区维护**
 
-## ❤️ Contribution
+- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter)
+- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
+- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
 
-Welcome any Issues/Pull Requests! Just submit your changes to this project :)
+## 支持的模型服务
 
-### How to Contribute
+**大模型服务**
 
-You can contribute by viewing issues or helping to review PRs (Pull Requests). Any issues or PRs are welcome to promote community contribution. Of course, these are just suggestions; you can contribute in any way. For new feature additions, please discuss via Issue first.
-It is recommended to merge functional PRs into the `dev` branch, which will be merged into the main branch and released as a new version after testing.
-To reduce conflicts, we suggest:
-1.  Create your working branch based on the `dev` branch, avoid working directly on the `main` branch.
-2.  When submitting a PR, select the `dev` branch as the target.
-3.  Regularly sync the `dev` branch to your local environment; use `git pull` frequently.
+- OpenAI 及兼容服务
+- Anthropic
+- Google Gemini
+- Moonshot AI
+- 智谱 AI
+- DeepSeek
+- Ollama (本地部署)
+- LM Studio (本地部署)
+- [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
+- [302.AI](https://share.302.ai/rr1M3l)
+- [小马算力](https://www.tokenpony.cn/3YPyf)
+- [硅基流动](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot)
+- [PPIO 派欧云](https://ppio.com/user/register?invited_by=AIOONE)
+- ModelScope
+- OneAPI
 
-### Development Environment
+**LLMOps 平台**
 
-AstrBot uses `ruff` for code formatting and checking.
+- Dify
+- 阿里云百炼应用
+- Coze
+
+**语音转文本服务**
+
+- OpenAI Whisper
+- SenseVoice
+
+**文本转语音服务**
+
+- OpenAI TTS
+- Gemini TTS
+- GPT-Sovits-Inference
+- GPT-Sovits
+- FishAudio
+- Edge TTS
+- 阿里云百炼 TTS
+- Azure TTS
+- Minimax TTS
+- 火山引擎 TTS
+
+## ❤️ 贡献
+
+欢迎任何 Issues/Pull Requests！只需要将你的更改提交到此项目 ：)
+
+### 如何贡献
+
+你可以通过查看问题或帮助审核 PR（拉取请求）来贡献。任何问题或 PR 都欢迎参与，以促进社区贡献。当然，这些只是建议，你可以以任何方式进行贡献。对于新功能的添加，请先通过 Issue 讨论。
+
+### 开发环境
+
+AstrBot 使用 `ruff` 进行代码格式化和检查。
 
 ```bash
 git clone https://github.com/AstrBotDevs/AstrBot
-git switch dev # Switch to dev branch
-pip install pre-commit # or uv tool install pre-commit
+pip install pre-commit
 pre-commit install
 ```
 
-We recommend using `uv` for local installation and testing:
+## 🌍 社区
 
-```bash
-uv tool install -e . --force
-astrbot init 
-astrbot run
-```
+### QQ 群组
 
-Frontend Debugging:
+- 1 群：322154837
+- 3 群：630166526
+- 5 群：822130018
+- 6 群：753075035
+- 7 群：743746109
+- 8 群：1030353265
+- 开发者群：975206796
 
-```bash
-astrbot run --backend-only
-cd dashboard
-bun install # or pnpm, etc.
-bun dev
-```
+### Telegram 群组
 
-### QQ Groups
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 
-- Group 9: 1076659624 (New)
-- Group 10: 1078079676 (New)
-- Group 1: 322154837
-- Group 3: 630166526
-- Group 5: 822130018
-- Group 6: 753075035
-- Group 7: 743746109
-- Group 8: 1030353265
-- Developer Group (Casual): 975206796
-- Developer Group (Official): 1039761811
+### Discord 群组
 
-### Discord Channel
-
-- [Discord](https://discord.gg/hAVk6tgV36)
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 
 ## ❤️ Special Thanks
 
-Special thanks to all Contributors and plugin developers for their contributions to AstrBot ❤️
+特别感谢所有 Contributors 和插件开发者对 AstrBot 的贡献 ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
 </a>
 
-In addition, the birth of this project cannot be separated from the help of the following open-source projects:
+此外，本项目的诞生离不开以下开源项目的帮助：
 
-- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - Great Cat Framework
-
-Open Source Project Friendly Links:
-
-- [NoneBot2](https://github.com/nonebot/nonebot2) - Excellent Python Asynchronous ChatBot Framework
-- [Koishi](https://github.com/koishijs/koishi) - Excellent Node.js ChatBot Framework
-- [MaiBot](https://github.com/Mai-with-u/MaiBot) - Excellent Anthropomorphic AI ChatBot
-- [nekro-agent](https://github.com/KroMiose/nekro-agent) - Excellent Agent ChatBot
-- [LangBot](https://github.com/langbot-app/LangBot) - Excellent Multi-platform AI ChatBot
-- [ChatLuna](https://github.com/ChatLunaLab/chatluna) - Excellent Multi-platform AI ChatBot Koishi Plugin
-- [Operit AI](https://github.com/AAswordman/Operit) - Excellent AI Assistant Android APP
+- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 伟大的猫猫框架
 
 ## ⭐ Star History
 
 > [!TIP]
-> If this project helps your life/work, or you are concerned about the future development of this project, please Star the project. This is our motivation to maintain this open-source project <3
+> 如果本项目对您的生活 / 工作产生了帮助，或者您关注本项目的未来发展，请给项目 Star，这是我们维护这个开源项目的动力 <3
 
 <div align="center">
 
@@ -290,12 +260,12 @@ Open Source Project Friendly Links:
 
 </div>
 
-<div align="center">
+</details>
 
-_Companionship and capability should never be opposites. We hope to create a robot that can both understand emotions, provide companionship, and reliably complete tasks._
+<div align="center">
 
 _私は、高性能ですから!_
 
-<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
+陪伴与能力从来不应该是对立面。我们希望创造的是一个既能理解情绪、给予陪伴，也能可靠完成工作的机器人。
+
 
-</div>

README_en.md

@@ -0,0 +1,255 @@
+![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
+
+<div align="center">
+
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
+
+<br>
+
+<div>
+<a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+<a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+</div>
+
+<br>
+
+<div>
+<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
+<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
+<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
+<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
+<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20plugins&label=Marketplace&cacheSeconds=3600">
+<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
+</div>
+
+<br>
+
+<a href="https://astrbot.app/">Documentation</a> ｜
+<a href="https://blog.astrbot.app/">Blog</a> ｜
+<a href="https://astrbot.featurebase.app/roadmap">Roadmap</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/issues">Issue Tracker</a>
+</div>
+
+AstrBot is an open-source all-in-one Agent chatbot platform that integrates with mainstream instant messaging apps. It provides reliable and scalable conversational AI infrastructure for individuals, developers, and teams. Whether you're building a personal AI companion, intelligent customer service, automation assistant, or enterprise knowledge base, AstrBot enables you to quickly build production-ready AI applications within your IM platform workflows.
+
+![070d50ba43ea3c96980787127bbbe552](https://github.com/user-attachments/assets/6fe147c5-68d9-4f47-a8de-252e63fdcbd8)
+
+## Key Features
+
+1. 💯 Free & Open Source.
+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.
+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.
+9. 🌐 Internationalization (i18n) Support.
+
+## Quick Start
+
+#### Docker Deployment (Recommended 🥳)
+
+We recommend deploying AstrBot using Docker or Docker Compose.
+
+Please refer to the official documentation: [Deploy AstrBot with Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
+
+#### uv Deployment
+
+```bash
+uvx astrbot
+```
+
+#### BT-Panel Deployment
+
+AstrBot has partnered with BT-Panel and is now available in their marketplace.
+
+Please refer to the official documentation: [BT-Panel Deployment](https://astrbot.app/deploy/astrbot/btpanel.html).
+
+#### 1Panel Deployment
+
+AstrBot has been officially listed on the 1Panel marketplace.
+
+Please refer to the official documentation: [1Panel Deployment](https://astrbot.app/deploy/astrbot/1panel.html).
+
+#### Deploy on RainYun
+
+AstrBot has been officially listed on RainYun's cloud application platform with one-click deployment.
+
+[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
+
+#### Deploy on Replit
+
+Community-contributed deployment method.
+
+[![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
+
+#### Windows One-Click Installer
+
+Please refer to the official documentation: [Deploy AstrBot with Windows One-Click Installer](https://astrbot.app/deploy/astrbot/windows.html).
+
+#### CasaOS Deployment
+
+Community-contributed deployment method.
+
+Please refer to the official documentation: [CasaOS Deployment](https://astrbot.app/deploy/astrbot/casaos.html).
+
+#### Manual Deployment
+
+First, install uv:
+
+```bash
+pip install uv
+```
+
+Install AstrBot via Git Clone:
+
+```bash
+git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
+uv run main.py
+```
+
+Or refer to the official documentation: [Deploy AstrBot from Source](https://astrbot.app/deploy/astrbot/cli.html).
+
+## Supported Messaging Platforms
+
+**Officially Maintained**
+
+- QQ (Official Platform & OneBot)
+- Telegram
+- WeChat Work Application & WeChat Work Intelligent Bot
+- WeChat Customer Service & WeChat Official Accounts
+- Feishu (Lark)
+- DingTalk
+- Slack
+- Discord
+- Satori
+- Misskey
+- WhatsApp (Coming Soon)
+- LINE (Coming Soon)
+
+**Community Maintained**
+
+- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter)
+- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
+- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
+
+## Supported Model Services
+
+**LLM Services**
+
+- OpenAI and Compatible Services
+- Anthropic
+- Google Gemini
+- Moonshot AI
+- Zhipu AI
+- DeepSeek
+- Ollama (Self-hosted)
+- LM Studio (Self-hosted)
+- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
+- [302.AI](https://share.302.ai/rr1M3l)
+- [TokenPony](https://www.tokenpony.cn/3YPyf)
+- [SiliconFlow](https://docs.siliconflow.cn/cn/usecases/use-siliconcloud-in-astrbot)
+- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE)
+- ModelScope
+- OneAPI
+
+**LLMOps Platforms**
+
+- Dify
+- Alibaba Cloud Bailian Applications
+- Coze
+
+**Speech-to-Text Services**
+
+- OpenAI Whisper
+- SenseVoice
+
+**Text-to-Speech Services**
+
+- OpenAI TTS
+- Gemini TTS
+- GPT-Sovits-Inference
+- GPT-Sovits
+- FishAudio
+- Edge TTS
+- Alibaba Cloud Bailian TTS
+- Azure TTS
+- Minimax TTS
+- Volcano Engine TTS
+
+## ❤️ Contributing
+
+Issues and Pull Requests are always welcome! Feel free to submit your changes to this project :)
+
+### How to Contribute
+
+You can contribute by reviewing issues or helping with pull request reviews. Any issues or PRs are welcome to encourage community participation. Of course, these are just suggestions—you can contribute in any way you like. For adding new features, please discuss through an Issue first.
+
+### Development Environment
+
+AstrBot uses `ruff` for code formatting and linting.
+
+```bash
+git clone https://github.com/AstrBotDevs/AstrBot
+pip install pre-commit
+pre-commit install
+```
+
+## 🌍 Community
+
+### QQ Groups
+
+- Group 1: 322154837
+- Group 3: 630166526
+- Group 5: 822130018
+- Group 6: 753075035
+- Group 7: 743746109
+- Group 8: 1030353265
+- Developer Group: 975206796
+
+### Telegram Group
+
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+### Discord Server
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+## ❤️ Special Thanks
+
+Special thanks to all Contributors and plugin developers for their contributions to AstrBot ❤️
+
+<a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
+</a>
+
+Additionally, the birth of this project would not have been possible without the help of the following open-source projects:
+
+- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - The amazing cat framework
+
+## ⭐ Star History
+
+> [!TIP]
+> If this project has helped you in your life or work, or if you're interested in its future development, please give the project a Star. It's the driving force behind maintaining this open-source project <3
+
+<div align="center">
+
+[![Star History Chart](https://api.star-history.com/svg?repos=astrbotdevs/astrbot&type=Date)](https://star-history.com/#astrbotdevs/astrbot&Date)
+
+</div>
+
+</details>
+
+<div align="center">
+
+_私は、高性能ですから!_
+
+<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
+</div>

README_fr.md

@@ -1,12 +1,10 @@
 ![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
 
+</p>
+
 <div align="center">
 
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">简体中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
+<br>
 
 <div>
 <a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
@@ -16,269 +14,226 @@
 <br>
 
 <div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
-<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTk4IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%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=%20Plugins&label=Marketplace&cacheSeconds=3600">
-<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
+<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
+<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
+<a href="https://qm.qq.com/cgi-bin/qm/qr?k=wtbaNx7EioxeaqS9z7RQWVXPIxg2zYr7&jump_from=webapi&authKey=vlqnv/AV2DbJEvGIcxdlNSpfxVy+8vVqijgreRdnVKOaydpc+YSw4MctmEbr0k5"><img alt="QQ_community" src="https://img.shields.io/badge/QQ群-775869627-purple?style=for-the-badge&color=76bad9"></a>
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20plugins&style=for-the-badge&label=Marketplace&cacheSeconds=3600">
 </div>
 
 <br>
 
-<a href="https://astrbot.app/">Accueil</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
+
 <a href="https://astrbot.app/">Documentation</a> ｜
 <a href="https://blog.astrbot.app/">Blog</a> ｜
 <a href="https://astrbot.featurebase.app/roadmap">Feuille de route</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/issues">Signaler un problème</a>
-<a href="mailto:community@astrbot.app">Email</a>
-
 </div>
 
-AstrBot est un assistant de chat personnel et de groupe Agentic tout-en-un et open-source, qui peut être déployé sur des dizaines de logiciels de messagerie instantanée grand public tels que QQ, Telegram, WeCom (WeChat Entreprise), Lark (Feishu), DingTalk, Slack, etc. Il intègre également une interface de chat légère similaire à OpenWebUI, créant ainsi une infrastructure conversationnelle intelligente fiable et extensible pour les particuliers, les développeurs et les équipes. Qu'il s'agisse d'un compagnon IA personnel, d'un service client intelligent, d'un assistant automatisé ou d'une base de connaissances d'entreprise, AstrBot vous permet de construire rapidement des applications IA au sein du flux de travail de vos plateformes de messagerie instantanée.
+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.
 
-![landingpage](https://github.com/user-attachments/assets/45fc5699-cddf-4e21-af35-13040706f6c0)
+<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
 
-## Fonctionnalités Principales
+## Fonctionnalités principales
 
 1. 💯 Gratuit & Open Source.
-2. ✨ Dialogue avec de grands modèles d'IA (LLM), multimodal, Agent, MCP, Compétences (Skills), base de connaissances, définition de persona, compression automatique des dialogues.
-3. 🤖 Prend en charge l'intégration avec des plateformes d'agents comme Dify, Alibaba Bailian, Coze, etc.
-4. 🌐 Multiplateforme, prend en charge QQ, WeCom, Lark, DingTalk, Compte Officiel WeChat, Telegram, Slack et [plus encore](#plateformes-de-messagerie-prises-en-charge).
-5. 📦 Extension par plugins, plus de 1000 plugins disponibles pour une installation en un clic.
-6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) : environnement isolé pour exécuter n'importe quel code, appeler le Shell et réutiliser les ressources au niveau de la session en toute sécurité.
-7. 💻 Support WebUI.
-8. 🌈 Support Web ChatUI, avec sandbox de proxy intégré, recherche web, etc.
-9. 🌐 Support de l'internationalisation (i18n).
+2. ✨ Conversations avec LLM IA, Multimodal, Agent, MCP, Base de connaissances, Paramètres de personnalité.
+3. 🤖 Prise en charge de l'intégration avec Dify, Alibaba Cloud Bailian, Coze et autres plateformes d'agents.
+4. 🌐 Multi-plateforme : QQ, WeChat Work, Feishu, DingTalk, Comptes officiels WeChat, Telegram, Slack, et [plus encore](#plateformes-de-messagerie-prises-en-charge).
+5. 📦 Extensions de plugins avec près de 800 plugins disponibles pour une installation en un clic.
+6. 💻 Support WebUI.
+7. 🌐 Support de l'internationalisation (i18n).
 
-<br>
+## Démarrage rapide
 
-<table align="center">
-  <tr align="center">
-    <th>💙 Jeu de rôle & Accompagnement émotionnel</th>
-    <th>✨ Agent Proactif</th>
-    <th>🚀 Capacités Agentic Génériques</th>
-    <th>🧩 1000+ Plugins Communautaires</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>
-    <td align="center"><p align="center"><img width="976" height="1612" alt="c449acd838c41d0915cc08a3824025b1" src="https://github.com/user-attachments/assets/f75368b4-e022-41dc-a9e0-131c3e73e32e" /></p></td>
-    <td align="center"><p align="center"><img width="974" height="1732" alt="image" src="https://github.com/user-attachments/assets/e22a3968-87d7-4708-a7cd-e7f198c7c32e" /></p></td>
-    <td align="center"><p align="center"><img width="976" height="1734" alt="image" src="https://github.com/user-attachments/assets/0952b395-6b4a-432a-8a50-c294b7f89750" /></p></td>
-  </tr>
-</table>
+#### Déploiement Docker (Recommandé 🥳)
 
-## Démarrage Rapide
+Nous recommandons de déployer AstrBot en utilisant Docker ou Docker Compose.
 
-### Déploiement en un clic
+Veuillez consulter la documentation officielle : [Déployer AstrBot avec Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
 
-Pour les utilisateurs qui souhaitent essayer AstrBot rapidement, qui sont familiers avec la ligne de commande et capables d'installer l'environnement `uv` par eux-mêmes, nous recommandons la méthode de déploiement en un clic avec `uv` ⚡️.
+#### Déploiement uv
 
 ```bash
-uv tool install astrbot
-astrbot init # Exécutez cette commande uniquement la première fois pour initialiser l'environnement
-astrbot run # astrbot run --backend-only démarre uniquement le service backend
-
-# Installer la version de développement (plus de correctifs, nouvelles fonctionnalités, mais moins stable, adapté aux développeurs)
-uv tool install git+https://github.com/AstrBotDevs/AstrBot@dev
+uvx astrbot
 ```
 
-> Nécessite l'installation de [uv](https://docs.astral.sh/uv/).
+#### Déploiement BT-Panel
 
-> [!NOTE]
-> Pour les utilisateurs de macOS : en raison des contrôles de sécurité de macOS, la première exécution de la commande `astrbot` peut prendre un certain temps (environ 10-20 secondes).
+AstrBot s'est associé à BT-Panel et est maintenant disponible sur leur marketplace.
 
-Mettre à jour `astrbot` :
+Veuillez consulter la documentation officielle : [Déploiement BT-Panel](https://astrbot.app/deploy/astrbot/btpanel.html).
 
-```bash
-uv tool upgrade astrbot
-```
+#### Déploiement 1Panel
 
-### Déploiement Docker
+AstrBot a été officiellement listé sur le marketplace 1Panel.
 
-Pour les utilisateurs familiers avec les conteneurs et souhaitant une méthode de déploiement plus stable et adaptée aux environnements de production, nous recommandons d'utiliser Docker / Docker Compose pour déployer AstrBot.
+Veuillez consulter la documentation officielle : [Déploiement 1Panel](https://astrbot.app/deploy/astrbot/1panel.html).
 
-Veuillez vous référer à la documentation officielle [Déployer AstrBot avec Docker](https://astrbot.app/deploy/astrbot/docker.html).
+#### Déployer sur RainYun
 
-### Déploiement sur RainYun
-
-Pour les utilisateurs souhaitant déployer AstrBot en un clic sans gérer de serveur, nous recommandons le service de déploiement cloud en un clic de RainYun ☁️ :
+AstrBot a été officiellement listé sur la plateforme d'applications cloud de RainYun avec un déploiement en un clic.
 
 [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
 
-### Déploiement Client Bureau
+#### Déployer sur Replit
 
-Pour les utilisateurs souhaitant utiliser AstrBot sur ordinateur de bureau et utiliser principalement ChatUI comme point d'entrée, nous recommandons l'application AstrBot App.
-
-Rendez-vous sur [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop) pour télécharger et installer ; cette méthode est destinée à un usage bureautique et n'est pas recommandée pour les scénarios serveur.
-
-### Déploiement Launcher
-
-Également pour une utilisation sur bureau, pour les utilisateurs souhaitant un déploiement rapide et une isolation de l'environnement pour plusieurs instances, nous recommandons AstrBot Launcher.
-
-Rendez-vous sur [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) pour télécharger et installer.
-
-### Déploiement sur Replit
-
-Le déploiement sur Replit est maintenu par la communauté et convient aux démonstrations en ligne et aux scénarios d'essai légers.
+Méthode de déploiement contribuée par la communauté.
 
 [![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
 
-### AUR
+#### Installateur Windows en un clic
 
-La méthode AUR est destinée aux utilisateurs d'Arch Linux souhaitant installer AstrBot via le gestionnaire de paquets du système.
+Veuillez consulter la documentation officielle : [Déployer AstrBot avec l'installateur Windows en un clic](https://astrbot.app/deploy/astrbot/windows.html).
 
-Exécutez la commande ci-dessous dans le terminal pour installer le paquet `astrbot-git`. Une fois l'installation terminée, vous pouvez le lancer.
+#### Déploiement CasaOS
+
+Méthode de déploiement contribuée par la communauté.
+
+Veuillez consulter la documentation officielle : [Déploiement CasaOS](https://astrbot.app/deploy/astrbot/casaos.html).
+
+#### Déploiement manuel
+
+Tout d'abord, installez uv :
 
 ```bash
-yay -S astrbot-git
+pip install uv
 ```
 
-**Plus de méthodes de déploiement**
+Installez AstrBot via Git Clone :
 
-Si vous avez besoin d'un déploiement via panneau de contrôle ou hautement personnalisé, vous pouvez consulter [BT Panel](https://astrbot.app/deploy/astrbot/btpanel.html) (installation via le magasin d'applications BT Panel), [1Panel](https://astrbot.app/deploy/astrbot/1panel.html) (installation via le magasin d'applications 1Panel), [CasaOS](https://astrbot.app/deploy/astrbot/casaos.html) (déploiement visuel pour NAS / serveur domestique) et [Déploiement Manuel](https://astrbot.app/deploy/astrbot/cli.html) (installation personnalisée complète basée sur le code source et `uv`).
+```bash
+git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
+uv run main.py
+```
 
-## Plateformes de Messagerie Prises en Charge
+Ou consultez la documentation officielle : [Déployer AstrBot depuis les sources](https://astrbot.app/deploy/astrbot/cli.html).
 
-Connectez AstrBot à vos plateformes de chat préférées.
+## Plateformes de messagerie prises en charge
 
-| Plateforme | Mainteneur |
-|---------|---------------|
-| **QQ** | Officiel |
-| **OneBot v11** | Officiel |
-| **Telegram** | Officiel |
-| **WeCom (App & Smart Bot)** | Officiel |
-| **WeChat (Service Client & Compte Officiel)** | Officiel |
-| **Lark (Feishu)** | Officiel |
-| **DingTalk** | Officiel |
-| **Slack** | Officiel |
-| **Discord** | Officiel |
-| **LINE** | Officiel |
-| **Satori** | Officiel |
-| **Misskey** | Officiel |
-| **Whatsapp (Bientôt)** | Officiel |
-| [**Matrix**](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Communauté |
-| [**KOOK**](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Communauté |
-| [**VoceChat**](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Communauté |
+**Maintenues officiellement**
 
-## Fournisseurs de Modèles Pris en Charge
+- QQ (Plateforme officielle & OneBot)
+- Telegram
+- Application WeChat Work & Bot intelligent WeChat Work
+- Service client WeChat & Comptes officiels WeChat
+- Feishu (Lark)
+- DingTalk
+- Slack
+- Discord
+- Satori
+- Misskey
+- WhatsApp (Bientôt disponible)
+- LINE (Bientôt disponible)
 
-| Fournisseur | Type |
-|---------|---------------|
-| Personnalisé | Tout service compatible avec l'API OpenAI |
-| OpenAI | LLM |
-| Anthropic | LLM |
-| Google Gemini | LLM |
-| Moonshot AI | LLM |
-| Zhipu AI | LLM |
-| DeepSeek | LLM |
-| Ollama (Local) | LLM |
-| LM Studio (Local) | LLM |
-| [AIHubMix](https://aihubmix.com/?aff=4bfH) | LLM (Passerelle API, supporte tous les modèles) |
-| [Uyun AI](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM (Passerelle API, supporte tous les modèles) |
-| [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM (Passerelle API, supporte tous les modèles)  |
-| [PPIO](https://ppio.com/user/register?invited_by=AIOONE) | LLM (Passerelle API, supporte tous les modèles) |
-| [302.AI](https://share.302.ai/rr1M3l) | LLM (Passerelle API, supporte tous les modèles)|
-| [TokenPony](https://www.tokenpony.cn/3YPyf) | LLM (Passerelle API, supporte tous les modèles)|
-| ModelScope | LLM |
-| OneAPI | LLM |
-| Dify | Plateforme LLMOps |
-| Alibaba Bailian | Plateforme LLMOps |
-| Coze | Plateforme LLMOps |
-| OpenAI Whisper | Synthèse vocale (Speech-to-Text) |
-| SenseVoice | Synthèse vocale (Speech-to-Text) |
-| OpenAI TTS | Synthèse vocale (Text-to-Speech) |
-| Gemini TTS | Synthèse vocale (Text-to-Speech) |
-| GPT-Sovits-Inference | Synthèse vocale (Text-to-Speech) |
-| GPT-Sovits | Synthèse vocale (Text-to-Speech) |
-| FishAudio | Synthèse vocale (Text-to-Speech) |
-| Edge TTS | Synthèse vocale (Text-to-Speech) |
-| Alibaba Bailian TTS | Synthèse vocale (Text-to-Speech) |
-| Azure TTS | Synthèse vocale (Text-to-Speech) |
-| Minimax TTS | Synthèse vocale (Text-to-Speech) |
-| Volcengine TTS | Synthèse vocale (Text-to-Speech) |
+**Maintenues par la communauté**
 
-## ❤️ Contribution
+- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter)
+- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
+- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
 
-Les Issues et Pull Requests sont les bienvenus ! Soumettez simplement vos modifications à ce projet :)
+## Services de modèles pris en charge
 
-### Comment Contribuer
+**Services LLM**
 
-Vous pouvez contribuer en examinant les problèmes ou en aidant à réviser les PR (Pull Requests). Tout problème ou PR est le bienvenu pour promouvoir la contribution communautaire. Bien sûr, ce ne sont que des suggestions, vous pouvez contribuer de n'importe quelle manière. Pour l'ajout de nouvelles fonctionnalités, veuillez d'abord en discuter via une Issue.
-Il est recommandé de fusionner les PR fonctionnels dans la branche `dev`, qui sera fusionnée dans la branche principale et publiée en tant que nouvelle version après test des modifications.
-Pour réduire les conflits, nous suggérons :
-1. Créez votre branche de travail basée sur la branche `dev`, évitez de travailler directement sur la branche `main`.
-2. Lors de la soumission d'une PR, sélectionnez la branche `dev` comme cible.
-3. Synchronisez régulièrement la branche `dev` en local, utilisez souvent `git pull`.
+- OpenAI et services compatibles
+- Anthropic
+- Google Gemini
+- Moonshot AI
+- Zhipu AI
+- DeepSeek
+- Ollama (Auto-hébergé)
+- LM Studio (Auto-hébergé)
+- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
+- [302.AI](https://share.302.ai/rr1M3l)
+- [TokenPony](https://www.tokenpony.cn/3YPyf)
+- [SiliconFlow](https://docs.siliconflow.cn/cn/usecases/use-siliconcloud-in-astrbot)
+- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE)
+- ModelScope
+- OneAPI
 
-### Environnement de Développement
+**Plateformes LLMOps**
 
-AstrBot utilise `ruff` pour le formatage et la vérification du code.
+- Dify
+- Applications Alibaba Cloud Bailian
+- Coze
+
+**Services de reconnaissance vocale**
+
+- OpenAI Whisper
+- SenseVoice
+
+**Services de synthèse vocale**
+
+- OpenAI TTS
+- Gemini TTS
+- GPT-Sovits-Inference
+- GPT-Sovits
+- FishAudio
+- Edge TTS
+- Alibaba Cloud Bailian TTS
+- Azure TTS
+- Minimax TTS
+- Volcano Engine TTS
+
+## ❤️ Contribuer
+
+Les Issues et Pull Requests sont toujours les bienvenues ! N'hésitez pas à soumettre vos modifications à ce projet :)
+
+### Comment contribuer
+
+Vous pouvez contribuer en examinant les issues ou en aidant à la revue des pull requests. Toutes les issues ou PRs sont les bienvenues pour encourager la participation de la communauté. Bien sûr, ce ne sont que des suggestions - vous pouvez contribuer de la manière que vous souhaitez. Pour l'ajout de nouvelles fonctionnalités, veuillez d'abord en discuter via une Issue.
+
+### Environnement de développement
+
+AstrBot utilise `ruff` pour le formatage et le linting du code.
 
 ```bash
 git clone https://github.com/AstrBotDevs/AstrBot
-git switch dev # Basculer vers la branche de développement
-pip install pre-commit # ou uv tool install pre-commit
+pip install pre-commit
 pre-commit install
 ```
-Il est recommandé d'utiliser `uv` pour l'installation locale et les tests.
-```bash
-uv tool install -e . --force
-astrbot init 
-astrbot run
-```
-Débogage frontend
-```bash
-astrbot run --backend-only
-cd dashboard
-bun install # ou pnpm, etc.
-bun dev
-```
+
+## 🌍 Communauté
 
 ### Groupes QQ
 
-- Groupe 9 : 1076659624 (Nouveau)
-- Groupe 10 : 1078079676 (Nouveau)
 - Groupe 1 : 322154837
 - Groupe 3 : 630166526
 - Groupe 5 : 822130018
 - Groupe 6 : 753075035
-- Groupe 7 : 743746109
-- Groupe 8 : 1030353265
-- Groupe Développeurs (Discussion libre) : 975206796
-- Groupe Développeurs (Officiel) : 1039761811
+- Groupe développeurs : 975206796
 
-### Canal Discord
+### Groupe Telegram
 
-- [Discord](https://discord.gg/hAVk6tgV36)
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 
-## ❤️ Remerciements Spéciaux
+### Serveur Discord
 
-Un grand merci à tous les Contributeurs et développeurs de plugins pour leur contribution à AstrBot ❤️
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+## ❤️ Remerciements spéciaux
+
+Un grand merci à tous les contributeurs et développeurs de plugins pour leurs contributions à AstrBot ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
 </a>
 
 De plus, la naissance de ce projet n'aurait pas été possible sans l'aide des projets open source suivants :
 
-- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - Le grand framework félin
+- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - L'incroyable framework chat
 
-Liens amicaux vers des projets open source :
-
-- [NoneBot2](https://github.com/nonebot/nonebot2) - Excellent framework de ChatBot asynchrone en Python
-- [Koishi](https://github.com/koishijs/koishi) - Excellent framework de ChatBot en Node.js
-- [MaiBot](https://github.com/Mai-with-u/MaiBot) - Excellent ChatBot IA anthropomorphe
-- [nekro-agent](https://github.com/KroMiose/nekro-agent) - Excellent ChatBot Agent
-- [LangBot](https://github.com/langbot-app/LangBot) - Excellent ChatBot IA multiplateforme
-- [ChatLuna](https://github.com/ChatLunaLab/chatluna) - Excellent plugin Koishi de ChatBot IA multiplateforme
-- [Operit AI](https://github.com/AAswordman/Operit) - Excellente application Android d'assistant intelligent IA
-
-## ⭐ Historique des Étoiles
+## ⭐ Historique des étoiles
 
 > [!TIP]
-> Si ce projet vous a été utile dans votre vie ou votre travail, ou si vous vous intéressez à son développement futur, merci de lui donner une Étoile. C'est notre motivation pour maintenir ce projet open source <3
+> Si ce projet vous a aidé dans votre vie ou votre travail, ou si vous êtes intéressé par son développement futur, veuillez donner une étoile au projet. C'est la force motrice derrière la maintenance de ce projet open source <3
 
 <div align="center">
 
@@ -286,12 +241,7 @@ Liens amicaux vers des projets open source :
 
 </div>
 
-<div align="center">
+</details>
 
-_La compagnie et la compétence ne devraient jamais être opposées. Nous espérons créer un robot capable à la fois de comprendre les émotions, d'offrir de la compagnie et d'accomplir des tâches de manière fiable._
+_私は、高性能ですから!_
 
-_私は、高性能ですから!_ (Je suis performant !)
-
-<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
-
-</div>

README_ja.md

@@ -1,12 +1,10 @@
 ![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
 
+</p>
+
 <div align="center">
 
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">简体中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
+<br>
 
 <div>
 <a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
@@ -16,269 +14,227 @@
 <br>
 
 <div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
-<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E5%80%8B&label=%E3%83%97%E3%83%A9%E3%82%B0%E3%82%A4%E3%83%B3%E3%82%B9%E3%83%88%E3%82%A2&cacheSeconds=3600">
-<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
+<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
+<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
+<a href="https://qm.qq.com/cgi-bin/qm/qr?k=wtbaNx7EioxeaqS9z7RQWVXPIxg2zYr7&jump_from=webapi&authKey=vlqnv/AV2DbJEvGIcxdlNSpfxVy+8vVqijgreRdnVKOaydpc+YSw4MctmEbr0k5"><img alt="QQ_community" src="https://img.shields.io/badge/QQ群-775869627-purple?style=for-the-badge&color=76bad9"></a>
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E5%80%8B&style=for-the-badge&label=%E3%83%97%E3%83%A9%E3%82%B0%E3%82%A4%E3%83%B3&cacheSeconds=3600">
 </div>
 
 <br>
 
-<a href="https://astrbot.app/">ホーム</a> ｜
-<a href="https://astrbot.app/">ドキュメント</a> ｜
-<a href="https://blog.astrbot.app/">ブログ</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">ロードマップ</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/issues">課題の提出</a>
-<a href="mailto:community@astrbot.app">Email</a>
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
 
+<a href="https://astrbot.app/">ドキュメント</a> ｜
+<a href="https://blog.astrbot.app/">Blog</a> ｜
+<a href="https://astrbot.featurebase.app/roadmap">ロードマップ</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/issues">Issue</a>
 </div>
 
-AstrBotは、オープンソースのオールインワンAgentic個人およびグループチャットアシスタントです。QQ、Telegram、WeCom（企業微信）、Lark（飛書）、DingTalk（釘釘）、Slackなど、数十種類の主要なインスタントメッセージングソフトウェアに導入できます。さらに、OpenWebUIに似た軽量のChatUIも組み込まれており、個人、開発者、チーム向けに信頼性が高く拡張可能な会話型AIインフラストラクチャを提供します。個人のAIパートナー、インテリジェントなカスタマーサービス、自動化アシスタント、または企業のナレッジベースであっても、AstrBotはインスタントメッセージングプラットフォームのワークフロー内でAIアプリケーションを迅速に構築することを可能にします。
+AstrBot は、主要なインスタントメッセージングアプリと統合できるオープンソースのオールインワン Agent チャットボットプラットフォームです。個人、開発者、チームに信頼性が高くスケーラブルな会話型 AI インフラストラクチャを提供します。パーソナル AI コンパニオン、インテリジェントカスタマーサービス、オートメーションアシスタント、エンタープライズナレッジベースなど、AstrBot を使用すると、IM プラットフォームのワークフロー内で本番環境対応の AI アプリケーションを迅速に構築できます。
 
-![landingpage](https://github.com/user-attachments/assets/45fc5699-cddf-4e21-af35-13040706f6c0)
+<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
 
 ## 主な機能
 
 1. 💯 無料 & オープンソース。
-2. ✨ AI大規模モデル対話、マルチモーダル、エージェント、MCP、スキル、ナレッジベース、人格設定、対話の自動圧縮。
-3. 🤖 Dify、Alibaba Bailian（阿里雲百煉）、Cozeなどのエージェントプラットフォームとの連携をサポート。
-4. 🌐 マルチプラットフォーム対応：QQ、WeCom、Lark、DingTalk、WeChat公式アカウント、Telegram、Slack、その他[多数](#対応メッセージングプラットフォーム)。
-5. 📦 プラグイン拡張：1000以上のプラグインがワンクリックでインストール可能。
-6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html)：隔離された環境で、あらゆるコードの安全な実行、シェル呼び出し、セッションレベルのリソース再利用が可能。
-7. 💻 WebUIサポート。
-8. 🌈 Web ChatUIサポート：ChatUIにはプロキシサンドボックス、Web検索などが組み込まれています。
-9. 🌐 国際化（i18n）サポート。
-
-<br>
-
-<table align="center">
-  <tr align="center">
-    <th>💙 ロールプレイ & 感情的な付き添い</th>
-    <th>✨ 能動的エージェント</th>
-    <th>🚀 汎用Agentic能力</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>
-    <td align="center"><p align="center"><img width="976" height="1612" alt="c449acd838c41d0915cc08a3824025b1" src="https://github.com/user-attachments/assets/f75368b4-e022-41dc-a9e0-131c3e73e32e" /></p></td>
-    <td align="center"><p align="center"><img width="974" height="1732" alt="image" src="https://github.com/user-attachments/assets/e22a3968-87d7-4708-a7cd-e7f198c7c32e" /></p></td>
-    <td align="center"><p align="center"><img width="976" height="1734" alt="image" src="https://github.com/user-attachments/assets/0952b395-6b4a-432a-8a50-c294b7f89750" /></p></td>
-  </tr>
-</table>
+2. ✨ AI 大規模言語モデル対話、マルチモーダル、Agent、MCP、ナレッジベース、ペルソナ設定。
+3. 🤖 Dify、Alibaba Cloud 百炼、Coze などの Agent プラットフォームとの統合をサポート。
+4. 🌐 マルチプラットフォーム：QQ、WeChat Work、Feishu、DingTalk、WeChat 公式アカウント、Telegram、Slack、[その他](#サポートされているメッセージプラットフォーム)。
+5. 📦 約800個のプラグインをワンクリックでインストール可能なプラグイン拡張機能。
+6. 💻 WebUI サポート。
+7. 🌐 国際化（i18n）サポート。
 
 ## クイックスタート
 
-### ワンクリックデプロイ
+#### Docker デプロイ（推奨 🥳）
 
-AstrBotをすぐに試してみたい方で、コマンドラインに慣れており、`uv`環境を自分でインストールできる方には、`uv`を使用したワンクリックデプロイをお勧めします⚡️。
+Docker / Docker Compose を使用した AstrBot のデプロイを推奨します。
+
+公式ドキュメント [Docker を使用した AstrBot のデプロイ](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) をご参照ください。
+
+#### uv デプロイ
 
 ```bash
-uv tool install astrbot
-astrbot init # 初回のみ環境初期化のために実行
-astrbot run # astrbot run --backend-only バックエンドサービスのみ起動
-
-# 開発版のインストール（修正や新機能が多いですが、不安定な場合があります。開発者向け）
-uv tool install git+https://github.com/AstrBotDevs/AstrBot@dev
+uvx astrbot
 ```
 
-> [uv](https://docs.astral.sh/uv/)のインストールが必要です。
+#### 宝塔パネルデプロイ
 
-> [!NOTE]
-> macOSユーザーの場合：macOSのセキュリティチェックにより、`astrbot`コマンドの初回実行に時間がかかる場合があります（約10〜20秒）。
+AstrBot は宝塔パネルと提携し、宝塔パネルに公開されています。
 
-`astrbot`の更新：
+公式ドキュメント [宝塔パネルデプロイ](https://astrbot.app/deploy/astrbot/btpanel.html) をご参照ください。
 
-```bash
-uv tool upgrade astrbot
-```
+#### 1Panel デプロイ
 
-### Dockerデプロイ
+AstrBot は 1Panel 公式により 1Panel パネルに公開されています。
 
-コンテナに精通しており、より安定的で本番環境に適したデプロイ方法を好むユーザーには、Docker / Docker Composeを使用したAstrBotのデプロイをお勧めします。
+公式ドキュメント [1Panel デプロイ](https://astrbot.app/deploy/astrbot/1panel.html) をご参照ください。
 
-公式ドキュメントの[Dockerを使用してAstrBotをデプロイする](https://astrbot.app/deploy/astrbot/docker.html)を参照してください。
+#### 雨云でのデプロイ
 
-### RainYun（雨云）でのデプロイ
-
-サーバーを自分で管理せずにAstrBotをワンクリックでデプロイしたいユーザーには、RainYunのワンクリッククラウドデプロイサービスをお勧めします☁️：
+AstrBot は雨云公式によりクラウドアプリケーションプラットフォームに公開され、ワンクリックでデプロイ可能です。
 
 [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
 
-### デスクトップクライアントデプロイ
+#### Replit でのデプロイ
 
-デスクトップでAstrBotを使用し、主にChatUIを入り口として使用したいユーザーには、AstrBot Appをお勧めします。
-
-[AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop)にアクセスしてダウンロードおよびインストールしてください。この方法はデスクトップ利用向けであり、サーバーシナリオには推奨されません。
-
-### ランチャーデプロイ
-
-同じくデスクトップ向けで、迅速にデプロイし、環境を分離して複数起動したいユーザーには、AstrBot Launcherをお勧めします。
-
-[AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher)にアクセスしてダウンロードおよびインストールしてください。
-
-### Replitでのデプロイ
-
-Replitデプロイはコミュニティによって維持されており、オンラインデモや軽量な試用シナリオに適しています。
+コミュニティ貢献によるデプロイ方法。
 
 [![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
 
-### AUR
+#### Windows ワンクリックインストーラーデプロイ
 
-AUR方式はArch Linuxユーザー向けで、システムパッケージマネージャーを通じてAstrBotをインストールしたい場合に適しています。
+公式ドキュメント [Windows ワンクリックインストーラーを使用した AstrBot のデプロイ](https://astrbot.app/deploy/astrbot/windows.html) をご参照ください。
 
-ターミナルで以下のコマンドを実行して`astrbot-git`パッケージをインストールすると、起動して使用できます。
+#### CasaOS デプロイ
+
+コミュニティ貢献によるデプロイ方法。
+
+公式ドキュメント [CasaOS デプロイ](https://astrbot.app/deploy/astrbot/casaos.html) をご参照ください。
+
+#### 手動デプロイ
+
+まず uv をインストールします:
 
 ```bash
-yay -S astrbot-git
+pip install uv
 ```
 
-**その他のデプロイ方法**
+Git Clone で AstrBot をインストール:
 
-パネル化や高度なカスタマイズデプロイが必要な場合は、[BT Panel（宝塔パネル）](https://astrbot.app/deploy/astrbot/btpanel.html)（BT Panelアプリストアインストール）、[1Panel](https://astrbot.app/deploy/astrbot/1panel.html)（1Panelアプリストアインストール）、[CasaOS](https://astrbot.app/deploy/astrbot/casaos.html)（NAS / ホームサーバーの視覚的デプロイ）、および[手動デプロイ](https://astrbot.app/deploy/astrbot/cli.html)（ソースコードと`uv`に基づく完全なカスタムインストール）を参照してください。
+```bash
+git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
+uv run main.py
+```
 
-## 対応メッセージングプラットフォーム
+または、公式ドキュメント [ソースコードから AstrBot をデプロイ](https://astrbot.app/deploy/astrbot/cli.html) をご参照ください。
 
-AstrBotを普段使用しているチャットプラットフォームに接続しましょう。
+## サポートされているメッセージプラットフォーム
 
-| プラットフォーム | 管理者 |
-|---------|---------------|
-| **QQ** | 公式管理 |
-| **OneBot v11** | 公式管理 |
-| **Telegram** | 公式管理 |
-| **WeComアプリ & WeComボット** | 公式管理 |
-| **WeChatカスタマーサービス & WeChat公式アカウント** | 公式管理 |
-| **Lark (飛書)** | 公式管理 |
-| **DingTalk (釘釘)** | 公式管理 |
-| **Slack** | 公式管理 |
-| **Discord** | 公式管理 |
-| **LINE** | 公式管理 |
-| **Satori** | 公式管理 |
-| **Misskey** | 公式管理 |
-| **Whatsapp (対応予定)** | 公式管理 |
-| [**Matrix**](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | コミュニティ管理 |
-| [**KOOK**](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | コミュニティ管理 |
-| [**VoceChat**](https://github.com/HikariFroya/astrbot_plugin_vocechat) | コミュニティ管理 |
+**公式メンテナンス**
 
-## 対応モデルプロバイダー
+- QQ (公式プラットフォーム & OneBot)
+- Telegram
+- WeChat Work アプリケーション & WeChat Work インテリジェントボット
+- WeChat カスタマーサービス & WeChat 公式アカウント
+- Feishu (Lark)
+- DingTalk
+- Slack
+- Discord
+- Satori
+- Misskey
+- WhatsApp (近日対応予定)
+- LINE (近日対応予定)
 
-| プロバイダー | タイプ |
-|---------|---------------|
-| カスタム | OpenAI API互換の任意のサービス |
-| OpenAI | LLM |
-| Anthropic | LLM |
-| Google Gemini | LLM |
-| Moonshot AI | LLM |
-| Zhipu AI (智譜AI) | LLM |
-| DeepSeek | LLM |
-| Ollama (ローカル) | LLM |
-| LM Studio (ローカル) | LLM |
-| [AIHubMix](https://aihubmix.com/?aff=4bfH) | LLM (APIゲートウェイ, 全モデル対応) |
-| [Uyun AI (優雲智算)](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM (APIゲートウェイ, 全モデル対応) |
-| [SiliconFlow (硅基流動)](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM (APIゲートウェイ, 全モデル対応)  |
-| [PPIO](https://ppio.com/user/register?invited_by=AIOONE) | LLM (APIゲートウェイ, 全モデル対応) |
-| [302.AI](https://share.302.ai/rr1M3l) | LLM (APIゲートウェイ, 全モデル対応)|
-| [TokenPony (小馬算力)](https://www.tokenpony.cn/3YPyf) | LLM (APIゲートウェイ, 全モデル対応)|
-| ModelScope | LLM |
-| OneAPI | LLM |
-| Dify | LLMOpsプラットフォーム |
-| Alibaba Bailian (阿里雲百煉) | LLMOpsプラットフォーム |
-| Coze | LLMOpsプラットフォーム |
-| OpenAI Whisper | 音声認識 (STT) |
-| SenseVoice | 音声認識 (STT) |
-| OpenAI TTS | 音声合成 (TTS) |
-| Gemini TTS | 音声合成 (TTS) |
-| GPT-Sovits-Inference | 音声合成 (TTS) |
-| GPT-Sovits | 音声合成 (TTS) |
-| FishAudio | 音声合成 (TTS) |
-| Edge TTS | 音声合成 (TTS) |
-| Alibaba Bailian TTS | 音声合成 (TTS) |
-| Azure TTS | 音声合成 (TTS) |
-| Minimax TTS | 音声合成 (TTS) |
-| Volcengine TTS (火山エンジン) | 音声合成 (TTS) |
+**コミュニティメンテナンス**
 
-## ❤️ 貢献
+- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter)
+- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
+- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
 
-IssueやPull Requestは大歓迎です！変更をこのプロジェクトに送信してください :)
 
-### 貢献方法
+## サポートされているモデルサービス
 
-問題の確認やPR（プルリクエスト）のレビューを通じて貢献できます。コミュニティの貢献を促進するために、あらゆる問題やPRへの参加を歓迎します。もちろん、これらは提案に過ぎず、どのような方法で貢献しても構いません。新機能の追加については、まずIssueで議論してください。
-機能的なPRは`dev`ブランチにマージすることをお勧めします。テスト修正後にメインブランチにマージされ、新しいバージョンとしてリリースされます。
-コンフリクトを減らすために、以下のことを推奨します：
-1. 作業ブランチは`dev`ブランチに基づいて作成し、`main`ブランチで直接作業することは避けてください。
-2. PRを送信する際は、ターゲットブランチとして`dev`ブランチを選択してください。
-3. 定期的に`dev`ブランチをローカルに同期し、`git pull`を頻繁に使用してください。
+**大規模言語モデルサービス**
+
+- OpenAI および互換サービス
+- Anthropic
+- Google Gemini
+- Moonshot AI
+- 智谱 AI
+- DeepSeek
+- Ollama (セルフホスト)
+- LM Studio (セルフホスト)
+- [優云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
+- [302.AI](https://share.302.ai/rr1M3l)
+- [小馬算力](https://www.tokenpony.cn/3YPyf)
+- [硅基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot)
+- [PPIO 派欧云](https://ppio.com/user/register?invited_by=AIOONE)
+- ModelScope
+- OneAPI
+
+**LLMOps プラットフォーム**
+
+- Dify
+- Alibaba Cloud 百炼アプリケーション
+- Coze
+
+**音声認識サービス**
+
+- OpenAI Whisper
+- SenseVoice
+
+**音声合成サービス**
+
+- OpenAI TTS
+- Gemini TTS
+- GPT-Sovits-Inference
+- GPT-Sovits
+- FishAudio
+- Edge TTS
+- Alibaba Cloud 百炼 TTS
+- Azure TTS
+- Minimax TTS
+- Volcano Engine TTS
+
+## ❤️ コントリビューション
+
+Issue や Pull Request は大歓迎です!このプロジェクトに変更を送信してください :)
+
+### コントリビュート方法
+
+Issue を確認したり、PR(プルリクエスト)のレビューを手伝うことで貢献できます。どんな Issue や PR への参加も歓迎され、コミュニティ貢献を促進します。もちろん、これらは提案に過ぎず、どんな方法でも貢献できます。新機能の追加については、まず Issue で議論してください。
 
 ### 開発環境
 
-AstrBotはコードのフォーマットとチェックに`ruff`を使用しています。
+AstrBot はコードのフォーマットとチェックに `ruff` を使用しています。
 
 ```bash
 git clone https://github.com/AstrBotDevs/AstrBot
-git switch dev # 開発ブランチに切り替え
-pip install pre-commit # または uv tool install pre-commit
+pip install pre-commit
 pre-commit install
 ```
-ローカルでのインストールとテストには`uv`の使用をお勧めします。
-```bash
-uv tool install -e . --force
-astrbot init 
-astrbot run
-```
-フロントエンドのデバッグ
-```bash
-astrbot run --backend-only
-cd dashboard
-bun install # または pnpm など
-bun dev
-```
 
-### QQグループ
+## 🌍 コミュニティ
 
-- 9群: 1076659624 (新)
-- 10群: 1078079676 (新)
-- 1群：322154837
-- 3群：630166526
-- 5群：822130018
-- 6群：753075035
-- 7群：743746109
-- 8群：1030353265
-- 開発者群（雑談）：975206796
-- 開発者群（公式）：1039761811
+### QQ グループ
 
-### Discordチャンネル
+- 1群: 322154837
+- 3群: 630166526
+- 5群: 822130018
+- 6群: 753075035
+- 開発者群: 975206796
 
-- [Discord](https://discord.gg/hAVk6tgV36)
+### Telegram グループ
+
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+### Discord サーバー
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 
 ## ❤️ Special Thanks
 
-AstrBotに貢献してくださったすべてのコントリビューターとプラグイン開発者に感謝します ❤️
+AstrBot への貢献をしていただいたすべてのコントリビューターとプラグイン開発者に特別な感謝を ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
 </a>
 
-さらに、このプロジェクトの誕生は、以下のオープンソースプロジェクトの助けなしにはあり得ませんでした：
+また、このプロジェクトの誕生は以下のオープンソースプロジェクトの助けなしには実現できませんでした:
 
-- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 偉大な猫フレームワーク
-
-オープンソースプロジェクトのフレンドリーリンク：
-
-- [NoneBot2](https://github.com/nonebot/nonebot2) - 優れたPython非同期チャットボットフレームワーク
-- [Koishi](https://github.com/koishijs/koishi) - 優れたNode.jsチャットボットフレームワーク
-- [MaiBot](https://github.com/Mai-with-u/MaiBot) - 優れた擬人化AIチャットボット
-- [nekro-agent](https://github.com/KroMiose/nekro-agent) - 優れたエージェントチャットボット
-- [LangBot](https://github.com/langbot-app/LangBot) - 優れたマルチプラットフォームAIチャットボット
-- [ChatLuna](https://github.com/ChatLunaLab/chatluna) - 優れたマルチプラットフォームAIチャットボットKoishiプラグイン
-- [Operit AI](https://github.com/AAswordman/Operit) - 優れたAIインテリジェントアシスタントAndroidアプリ
+- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 素晴らしい猫猫フレームワーク
 
 ## ⭐ Star History
 
 > [!TIP]
-> もしこのプロジェクトがあなたの生活や仕事の助けになったなら、あるいはこのプロジェクトの将来の発展に関心があるなら、プロジェクトにStarを付けてください。これは私たちがこのオープンソースプロジェクトを維持するための原動力となります <3
+> このプロジェクトがあなたの生活や仕事に役立ったり、このプロジェクトの今後の発展に関心がある場合は、プロジェクトに Star をください。これがこのオープンソースプロジェクトを維持する原動力です <3
 
 <div align="center">
 
@@ -286,12 +242,6 @@ AstrBotに貢献してくださったすべてのコントリビューターと
 
 </div>
 
-<div align="center">
-
-_付き添いと能力は決して対立するものであってはなりません。私たちが創造したいのは、感情を理解し、寄り添いながらも、確実に仕事を遂行できるロボットです。_
+</details>
 
 _私は、高性能ですから!_
-
-<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
-
-</div>

README_ru.md

@@ -1,12 +1,10 @@
 ![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
 
+</p>
+
 <div align="center">
 
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">简体中文</a>
+<br>
 
 <div>
 <a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
@@ -16,269 +14,226 @@
 <br>
 
 <div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
-<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20Plugins&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">
+<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
+<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
+<a href="https://qm.qq.com/cgi-bin/qm/qr?k=wtbaNx7EioxeaqS9z7RQWVXPIxg2zYr7&jump_from=webapi&authKey=vlqnv/AV2DbJEvGIcxdlNSpfxVy+8vVqijgreRdnVKOaydpc+YSw4MctmEbr0k5"><img alt="QQ_community" src="https://img.shields.io/badge/QQ群-775869627-purple?style=for-the-badge&color=76bad9"></a>
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20%D0%BF%D0%BB%D0%B0%D0%B3%D0%B8%D0%BD%D0%BE%D0%B2&style=for-the-badge&label=%D0%9C%D0%B0%D0%B3%D0%B0%D0%B7%D0%B8%D0%BD&cacheSeconds=3600">
 </div>
 
 <br>
 
-<a href="https://astrbot.app/">Главная</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
+
 <a href="https://astrbot.app/">Документация</a> ｜
 <a href="https://blog.astrbot.app/">Блог</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">Roadmap</a> ｜
+<a href="https://astrbot.featurebase.app/roadmap">Дорожная карта</a> ｜
 <a href="https://github.com/AstrBotDevs/AstrBot/issues">Сообщить о проблеме</a>
-<a href="mailto:community@astrbot.app">Email</a>
-
 </div>
 
-AstrBot — это универсальный агентский помощник для личных и групповых чатов с открытым исходным кодом. Он может быть развернут в десятках популярных мессенджеров, таких как QQ, Telegram, WeCom (Enterprise WeChat), Lark (Feishu), DingTalk, Slack и других. Кроме того, он имеет встроенный легковесный веб-интерфейс чата (ChatUI), похожий на OpenWebUI, создавая надежную и масштабируемую диалоговую интеллектуальную инфраструктуру для частных лиц, разработчиков и команд. Будь то личный AI-компаньон, интеллектуальная служба поддержки, автоматизированный помощник или корпоративная база знаний, AstrBot позволяет быстро создавать AI-приложения в рабочем процессе ваших платформ обмена мгновенными сообщениями.
+AstrBot — это универсальная платформа Agent-чатботов с открытым исходным кодом, которая интегрируется с основными приложениями для обмена мгновенными сообщениями. Она предоставляет надёжную и масштабируемую инфраструктуру разговорного ИИ для частных лиц, разработчиков и команд. Будь то персональный ИИ-компаньон, интеллектуальная служба поддержки, автоматизированный помощник или корпоративная база знаний — AstrBot позволяет быстро создавать готовые к использованию ИИ-приложения в рабочих процессах вашей платформы обмена сообщениями.
 
-![landingpage](https://github.com/user-attachments/assets/45fc5699-cddf-4e21-af35-13040706f6c0)
+<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
 
 ## Основные возможности
 
 1. 💯 Бесплатно и с открытым исходным кодом.
-2. ✨ Поддержка диалога с большими языковыми моделями (LLM), мультимодальность, Агенты, MCP, Навыки (Skills), База знаний, Персонализация, автоматическое сжатие диалога.
-3. 🤖 Поддержка интеграции с платформами агентов, такими как Dify, Alibaba Bailian, Coze и др.
-4. 🌐 Мультиплатформенность: поддержка QQ, WeCom, Lark, DingTalk, WeChat Official Account, Telegram, Slack и [других](#поддерживаемые-платформы-сообщений).
-5. 📦 Расширение плагинами: доступно более 1000 плагинов для установки в один клик.
-6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html): Изолированная среда для безопасного выполнения любого кода, вызова Shell и повторного использования ресурсов на уровне сессии.
-7. 💻 Поддержка WebUI.
-8. 🌈 Поддержка Web ChatUI: встроенная прокси-песочница, веб-поиск и многое другое внутри ChatUI.
-9. 🌐 Поддержка интернационализации (i18n).
-
-<br>
-
-<table align="center">
-  <tr align="center">
-    <th>💙 Ролевые игры и Эмоциональное общение</th>
-    <th>✨ Проактивный Агент</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>
-    <td align="center"><p align="center"><img width="976" height="1612" alt="c449acd838c41d0915cc08a3824025b1" src="https://github.com/user-attachments/assets/f75368b4-e022-41dc-a9e0-131c3e73e32e" /></p></td>
-    <td align="center"><p align="center"><img width="974" height="1732" alt="image" src="https://github.com/user-attachments/assets/e22a3968-87d7-4708-a7cd-e7f198c7c32e" /></p></td>
-    <td align="center"><p align="center"><img width="976" height="1734" alt="image" src="https://github.com/user-attachments/assets/0952b395-6b4a-432a-8a50-c294b7f89750" /></p></td>
-  </tr>
-</table>
+2. ✨ ИИ-диалоги с LLM, мультимодальность, Agent, MCP, база знаний, настройки личности.
+3. 🤖 Поддержка интеграции с Dify, Alibaba Cloud Bailian, Coze и другими платформами агентов.
+4. 🌐 Мультиплатформенность: QQ, WeChat Work, Feishu, DingTalk, официальные аккаунты WeChat, Telegram, Slack и [другие](#поддерживаемые-платформы-обмена-сообщениями).
+5. 📦 Расширения плагинов с почти 800 плагинами, доступными для установки в один клик.
+6. 💻 Поддержка WebUI.
+7. 🌐 Поддержка интернационализации (i18n).
 
 ## Быстрый старт
 
-### Развертывание в один клик
+#### Развёртывание Docker (Рекомендуется 🥳)
 
-Для пользователей, которые хотят быстро протестировать AstrBot, знакомы с командной строкой и могут самостоятельно установить среду `uv`, мы рекомендуем метод развертывания в один клик с помощью `uv` ⚡️.
+Мы рекомендуем развёртывать AstrBot с помощью Docker или Docker Compose.
+
+См. официальную документацию: [Развёртывание AstrBot с Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
+
+#### Развёртывание uv
 
 ```bash
-uv tool install astrbot
-astrbot init # Выполните эту команду только в первый раз для инициализации среды
-astrbot run # astrbot run --backend-only запускает только бэкенд сервис
-
-# Установка версии для разработчиков (больше исправлений и новых функций, но менее стабильна; подходит для разработчиков)
-uv tool install git+https://github.com/AstrBotDevs/AstrBot@dev
+uvx astrbot
 ```
 
-> Требуется установленный [uv](https://docs.astral.sh/uv/).
+#### Развёртывание BT-Panel
 
-> [!NOTE]
-> Для пользователей macOS: Из-за проверок безопасности macOS первый запуск команды `astrbot` может занять длительное время (около 10-20 секунд).
+AstrBot в партнёрстве с BT-Panel теперь доступен на их маркетплейсе.
 
-Обновление `astrbot`:
+См. официальную документацию: [Развёртывание BT-Panel](https://astrbot.app/deploy/astrbot/btpanel.html).
 
-```bash
-uv tool upgrade astrbot
-```
+#### Развёртывание 1Panel
 
-### Развертывание через Docker
+AstrBot официально размещён на маркетплейсе 1Panel.
 
-Для пользователей, знакомых с контейнерами и предпочитающих более стабильный метод развертывания, подходящий для производственных сред, мы рекомендуем использовать Docker / Docker Compose для развертывания AstrBot.
+См. официальную документацию: [Развёртывание 1Panel](https://astrbot.app/deploy/astrbot/1panel.html).
 
-Пожалуйста, обратитесь к официальной документации [Развертывание AstrBot с помощью Docker](https://astrbot.app/deploy/astrbot/docker.html).
+#### Развёртывание на RainYun
 
-### Развертывание на RainYun
-
-Для пользователей, которые хотят развернуть AstrBot в один клик и не хотят самостоятельно управлять серверами, мы рекомендуем облачный сервис развертывания в один клик от RainYun ☁️:
+AstrBot официально размещён на облачной платформе приложений RainYun с развёртыванием в один клик.
 
 [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
 
-### Развертывание настольного клиента
+#### Развёртывание на Replit
 
-Для пользователей, желающих использовать AstrBot на рабочем столе и использовать ChatUI в качестве основного интерфейса, мы рекомендуем приложение AstrBot App.
-
-Перейдите на [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop) для загрузки и установки; этот метод предназначен для использования на рабочем столе и не рекомендуется для серверных сценариев.
-
-### Развертывание через лаунчер
-
-Также для настольных компьютеров, для пользователей, которым требуется быстрое развертывание и изоляция среды для нескольких экземпляров, мы рекомендуем AstrBot Launcher.
-
-Перейдите на [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) для загрузки и установки.
-
-### Развертывание на Replit
-
-Развертывание на Replit поддерживается сообществом и подходит для онлайн-демонстраций и легких тестовых сценариев.
+Метод развёртывания от сообщества.
 
 [![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
 
-### AUR
+#### Установщик Windows в один клик
 
-Метод AUR предназначен для пользователей Arch Linux, желающих установить AstrBot через системный менеджер пакетов.
+См. официальную документацию: [Развёртывание AstrBot с установщиком Windows в один клик](https://astrbot.app/deploy/astrbot/windows.html).
 
-Выполните приведенную ниже команду в терминале, чтобы установить пакет `astrbot-git`. После завершения установки вы сможете запустить его.
+#### Развёртывание CasaOS
+
+Метод развёртывания от сообщества.
+
+См. официальную документацию: [Развёртывание CasaOS](https://astrbot.app/deploy/astrbot/casaos.html).
+
+#### Ручное развёртывание
+
+Сначала установите uv:
 
 ```bash
-yay -S astrbot-git
+pip install uv
 ```
 
-**Другие методы развертывания**
+Установите AstrBot через Git Clone:
 
-Если вам требуется панельное управление или более кастомизированное развертывание, вы можете обратиться к [BT Panel](https://astrbot.app/deploy/astrbot/btpanel.html) (установка через магазин приложений BT Panel), [1Panel](https://astrbot.app/deploy/astrbot/1panel.html) (установка через магазин приложений 1Panel), [CasaOS](https://astrbot.app/deploy/astrbot/casaos.html) (визуальное развертывание для NAS / домашнего сервера) и [Ручное развертывание](https://astrbot.app/deploy/astrbot/cli.html) (полная пользовательская установка на основе исходного кода и `uv`).
+```bash
+git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
+uv run main.py
+```
 
-## Поддерживаемые платформы сообщений
+Или см. официальную документацию: [Развёртывание AstrBot из исходного кода](https://astrbot.app/deploy/astrbot/cli.html).
 
-Подключите AstrBot к вашим любимым платформам чата.
+## Поддерживаемые платформы обмена сообщениями
 
-| Платформа | Поддержка |
-|---------|---------------|
-| **QQ** | Официальная |
-| **OneBot v11** | Официальная |
-| **Telegram** | Официальная |
-| **WeCom (Приложение & Смарт-бот)** | Официальная |
-| **WeChat (Служба поддержки & Официальный аккаунт)** | Официальная |
-| **Lark (Feishu)** | Официальная |
-| **DingTalk** | Официальная |
-| **Slack** | Официальная |
-| **Discord** | Официальная |
-| **LINE** | Официальная |
-| **Satori** | Официальная |
-| **Misskey** | Официальная |
-| **Whatsapp (Скоро)** | Официальная |
-| [**Matrix**](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Сообщество |
-| [**KOOK**](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Сообщество |
-| [**VoceChat**](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Сообщество |
+**Официально поддерживаемые**
 
-## Поддерживаемые провайдеры моделей
+- QQ (Официальная платформа и OneBot)
+- Telegram
+- Приложение WeChat Work и интеллектуальный бот WeChat Work
+- Служба поддержки WeChat и официальные аккаунты WeChat
+- Feishu (Lark)
+- DingTalk
+- Slack
+- Discord
+- Satori
+- Misskey
+- WhatsApp (Скоро)
+- LINE (Скоро)
 
-| Провайдер | Тип |
-|---------|---------------|
-| Пользовательский | Любой сервис, совместимый с OpenAI API |
-| OpenAI | LLM |
-| Anthropic | LLM |
-| Google Gemini | LLM |
-| Moonshot AI | LLM |
-| Zhipu AI | LLM |
-| DeepSeek | LLM |
-| Ollama (Локально) | LLM |
-| LM Studio (Локально) | LLM |
-| [AIHubMix](https://aihubmix.com/?aff=4bfH) | LLM (API шлюз, поддерживает все модели) |
-| [Uyun AI](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM (API шлюз, поддерживает все модели) |
-| [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM (API шлюз, поддерживает все модели)  |
-| [PPIO](https://ppio.com/user/register?invited_by=AIOONE) | LLM (API шлюз, поддерживает все модели) |
-| [302.AI](https://share.302.ai/rr1M3l) | LLM (API шлюз, поддерживает все модели)|
-| [TokenPony](https://www.tokenpony.cn/3YPyf) | LLM (API шлюз, поддерживает все модели)|
-| ModelScope | LLM |
-| OneAPI | LLM |
-| Dify | Платформа LLMOps |
-| Alibaba Bailian | Платформа LLMOps |
-| Coze | Платформа LLMOps |
-| OpenAI Whisper | Распознавание речи (STT) |
-| SenseVoice | Распознавание речи (STT) |
-| OpenAI TTS | Синтез речи (TTS) |
-| Gemini TTS | Синтез речи (TTS) |
-| GPT-Sovits-Inference | Синтез речи (TTS) |
-| GPT-Sovits | Синтез речи (TTS) |
-| FishAudio | Синтез речи (TTS) |
-| Edge TTS | Синтез речи (TTS) |
-| Alibaba Bailian TTS | Синтез речи (TTS) |
-| Azure TTS | Синтез речи (TTS) |
-| Minimax TTS | Синтез речи (TTS) |
-| Volcengine TTS | Синтез речи (TTS) |
+**Поддерживаемые сообществом**
+
+- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter)
+- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
+- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
+
+## Поддерживаемые сервисы моделей
+
+**Сервисы LLM**
+
+- OpenAI и совместимые сервисы
+- Anthropic
+- Google Gemini
+- Moonshot AI
+- Zhipu AI
+- DeepSeek
+- Ollama (Самостоятельное размещение)
+- LM Studio (Самостоятельное размещение)
+- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
+- [302.AI](https://share.302.ai/rr1M3l)
+- [TokenPony](https://www.tokenpony.cn/3YPyf)
+- [SiliconFlow](https://docs.siliconflow.cn/cn/usecases/use-siliconcloud-in-astrbot)
+- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE)
+- ModelScope
+- OneAPI
+
+**Платформы LLMOps**
+
+- Dify
+- Приложения Alibaba Cloud Bailian
+- Coze
+
+**Сервисы распознавания речи**
+
+- OpenAI Whisper
+- SenseVoice
+
+**Сервисы синтеза речи**
+
+- OpenAI TTS
+- Gemini TTS
+- GPT-Sovits-Inference
+- GPT-Sovits
+- FishAudio
+- Edge TTS
+- Alibaba Cloud Bailian TTS
+- Azure TTS
+- Minimax TTS
+- Volcano Engine TTS
 
 ## ❤️ Вклад в проект
 
-Мы приветствуем любые Issues и Pull Requests! Просто отправьте свои изменения в этот проект :)
+Issues и Pull Request всегда приветствуются! Не стесняйтесь отправлять свои изменения в этот проект :)
 
 ### Как внести вклад
 
-Вы можете внести свой вклад, просматривая проблемы (Issues) или помогая проверять PR (Pull Requests). Любая проблема или PR приветствуются для поощрения участия сообщества. Конечно, это всего лишь предложения, вы можете внести свой вклад любым способом. Для добавления новых функций, пожалуйста, сначала обсудите это через Issue.
-Рекомендуется объединять функциональные PR в ветку `dev`, которая будет объединена с основной веткой (`main`) и выпущена как новая версия после тестирования изменений.
-Для уменьшения конфликтов мы рекомендуем:
-1. Создавайте рабочую ветку на основе ветки `dev`, избегайте работы напрямую в ветке `main`.
-2. При отправке PR выбирайте ветку `dev` в качестве целевой.
-3. Регулярно синхронизируйте ветку `dev` с локальной средой, чаще используйте `git pull`.
+Вы можете внести вклад, просматривая issues или помогая с ревью pull request. Любые issues или PR приветствуются для поощрения участия сообщества. Конечно, это лишь предложения — вы можете вносить вклад любым удобным для вас способом. Для добавления новых функций сначала обсудите это через Issue.
 
 ### Среда разработки
 
-AstrBot использует `ruff` для форматирования и проверки кода.
+AstrBot использует `ruff` для форматирования и линтинга кода.
 
 ```bash
 git clone https://github.com/AstrBotDevs/AstrBot
-git switch dev # Переключиться на ветку разработки
-pip install pre-commit # или uv tool install pre-commit
+pip install pre-commit
 pre-commit install
 ```
-Рекомендуется использовать `uv` для локальной установки и тестирования:
-```bash
-uv tool install -e . --force
-astrbot init 
-astrbot run
-```
-Отладка фронтенда:
-```bash
-astrbot run --backend-only
-cd dashboard
-bun install # или pnpm и т.д.
-bun dev
-```
+
+## 🌍 Сообщество
 
 ### Группы QQ
 
-- Группа 9: 1076659624 (Новая)
-- Группа 10: 1078079676 (Новая)
 - Группа 1: 322154837
 - Группа 3: 630166526
 - Группа 5: 822130018
 - Группа 6: 753075035
-- Группа 7: 743746109
-- Группа 8: 1030353265
-- Группа разработчиков (Неформальное общение): 975206796
-- Группа разработчиков (Официальная): 1039761811
+- Группа разработчиков: 975206796
 
-### Канал Discord
+### Группа Telegram
 
-- [Discord](https://discord.gg/hAVk6tgV36)
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+### Сервер Discord
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 
 ## ❤️ Особая благодарность
 
 Особая благодарность всем контрибьюторам и разработчикам плагинов за их вклад в AstrBot ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
 </a>
 
-Кроме того, рождение этого проекта было бы невозможным без помощи следующих проектов с открытым исходным кодом:
+Кроме того, рождение этого проекта было бы невозможно без помощи следующих проектов с открытым исходным кодом:
 
-- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - Великий кошачий фреймворк
+- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - Замечательный кошачий фреймворк
 
-Дружественные ссылки на проекты с открытым исходным кодом:
-
-- [NoneBot2](https://github.com/nonebot/nonebot2) - Отличный асинхронный фреймворк ChatBot на Python
-- [Koishi](https://github.com/koishijs/koishi) - Отличный фреймворк ChatBot на Node.js
-- [MaiBot](https://github.com/Mai-with-u/MaiBot) - Отличный антропоморфный AI ChatBot
-- [nekro-agent](https://github.com/KroMiose/nekro-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) - Отличное Android-приложение интеллектуального AI-помощника
-
-## ⭐ История звезд
+## ⭐ История звёзд
 
 > [!TIP]
-> Если этот проект помог вам в жизни или работе, или если вы заинтересованы в будущем развитии этого проекта, пожалуйста, поставьте проекту звезду (Star). Это наша мотивация поддерживать этот проект с открытым исходным кодом <3
+> Если этот проект помог вам в жизни или работе, или если вас интересует его будущее развитие, пожалуйста, поставьте проекту звезду. Это движущая сила поддержки этого проекта с открытым исходным кодом <3
 
 <div align="center">
 
@@ -286,12 +241,7 @@ bun dev
 
 </div>
 
-<div align="center">
+</details>
 
-_Компаньонство и способности никогда не должны быть противоположностями. Мы надеемся создать робота, который сможет одновременно понимать эмоции, быть компаньоном и надежно выполнять работу._
+_私は、高性能ですから!_
 
-_私は、高性能ですから!_ (Я высокопроизводительный!)
-
-<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
-
-</div>

README_zh-TW.md

@@ -1,12 +1,10 @@
 ![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
 
+</p>
+
 <div align="center">
 
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">简体中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
+<br>
 
 <div>
 <a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
@@ -16,269 +14,226 @@
 <br>
 
 <div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
-<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E5%80%8B&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%A0%B4&cacheSeconds=3600">
-<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
+<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?style=for-the-badge&color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
+<img src="https://img.shields.io/badge/python-3.10+-blue.svg?style=for-the-badge&color=76bad9" alt="python">
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?style=for-the-badge&color=76bad9"/></a>
+<a href="https://qm.qq.com/cgi-bin/qm/qr?k=wtbaNx7EioxeaqS9z7RQWVXPIxg2zYr7&jump_from=webapi&authKey=vlqnv/AV2DbJEvGIcxdlNSpfxVy+8vVqijgreRdnVKOaydpc+YSw4MctmEbr0k5"><img alt="QQ_community" src="https://img.shields.io/badge/QQ群-775869627-purple?style=for-the-badge&color=76bad9"></a>
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E5%80%8B&style=for-the-badge&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%A0%B4&cacheSeconds=3600">
 </div>
 
 <br>
 
-<a href="https://astrbot.app/">首頁</a> ｜
-<a href="https://astrbot.app/">文檔</a> ｜
-<a href="https://blog.astrbot.app/">博客</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">路線圖</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/issues">問題提交</a>
-<a href="mailto:community@astrbot.app">Email</a>
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">简体中文</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
 
+<a href="https://astrbot.app/">文件</a> ｜
+<a href="https://blog.astrbot.app/">Blog</a> ｜
+<a href="https://astrbot.featurebase.app/roadmap">路線圖</a> ｜
+<a href="https://github.com/AstrBotDevs/AstrBot/issues">問題回報</a>
 </div>
 
-AstrBot 是一個開源的一站式 Agentic 個人和群聊助手，可在 QQ、Telegram、企業微信、飛書、釘钉、Slack 等數十款主流即時通訊軟件上部署，此外還內置類似 OpenWebUI 的輕量化 ChatUI，為個人、開發者和團隊打造可靠、可擴展的對話式智能基礎設施。無論是個人 AI 夥伴、智能客服、自動化助手，還是企業知識庫，AstrBot 都能在你的即時通訊軟件平台的工作流中快速構建 AI 應用。
+AstrBot 是一個開源的一站式 Agent 聊天機器人平台，可接入主流即時通訊軟體，為個人、開發者和團隊打造可靠、可擴展的對話式智慧基礎設施。無論是個人 AI 夥伴、智慧客服、自動化助手，還是企業知識庫，AstrBot 都能在您的即時通訊軟體平台的工作流程中快速構建生產可用的 AI 應用程式。
 
-![landingpage](https://github.com/user-attachments/assets/45fc5699-cddf-4e21-af35-13040706f6c0)
+<img width="1776" height="1080" alt="image" src="https://github.com/user-attachments/assets/00782c4c-4437-4d97-aabc-605e3738da5c" />
 
 ## 主要功能
 
 1. 💯 免費 & 開源。
-2. ✨ AI 大模型對話，多模態，Agent，MCP，Skills，知識庫，人格設定，自動壓縮對話。
-3. 🤖 支持接入 Dify、阿里雲百煉、Coze 等智能體平台。
-4. 🌐 多平台，支持 QQ、企業微信、飛書、釘釘、微信公眾號、Telegram、Slack 以及[更多](#支持的消息平台)。
-5. 📦 插件擴展，已有 1000+ 個插件可一鍵安裝。
-6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) 隔離化環境，安全地執行任何代碼、調用 Shell、會話級資源複用。
-7. 💻 WebUI 支持。
-8. 🌈 Web ChatUI 支持，ChatUI 內置代理沙盒、網頁搜索等。
-9. 🌐 國際化（i18n）支持。
-
-<br>
-
-<table align="center">
-  <tr align="center">
-    <th>💙 角色扮演 & 情感陪伴</th>
-    <th>✨ 主動式 Agent</th>
-    <th>🚀 通用 Agentic 能力</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>
-    <td align="center"><p align="center"><img width="976" height="1612" alt="c449acd838c41d0915cc08a3824025b1" src="https://github.com/user-attachments/assets/f75368b4-e022-41dc-a9e0-131c3e73e32e" /></p></td>
-    <td align="center"><p align="center"><img width="974" height="1732" alt="image" src="https://github.com/user-attachments/assets/e22a3968-87d7-4708-a7cd-e7f198c7c32e" /></p></td>
-    <td align="center"><p align="center"><img width="976" height="1734" alt="image" src="https://github.com/user-attachments/assets/0952b395-6b4a-432a-8a50-c294b7f89750" /></p></td>
-  </tr>
-</table>
+2. ✨ AI 大型模型對話，多模態，Agent，MCP，知識庫，人格設定。
+3. 🤖 支援接入 Dify、阿里雲百煉、Coze 等智慧體平台。
+4. 🌐 多平台：QQ、企業微信、飛書、釘釘、微信公眾號、Telegram、Slack 以及[更多](#支援的訊息平台)。
+5. 📦 外掛擴充，已有近 800 個外掛可一鍵安裝。
+6. 💻 WebUI 支援。
+7. 🌐 國際化（i18n）支援。
 
 ## 快速開始
 
-### 一鍵部署
+#### Docker 部署（推薦 🥳）
 
-對於想快速體驗 AstrBot、且熟悉命令行並能夠自行安裝 `uv` 環境的用戶，我們推薦使用 `uv` 一鍵部署方式 ⚡️。
+推薦使用 Docker / Docker Compose 方式部署 AstrBot。
+
+請參閱官方文件 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot)。
+
+#### uv 部署
 
 ```bash
-uv tool install astrbot
-astrbot init # 僅首次執行此命令以初始化環境
-astrbot run # astrbot run --backend-only 僅啟動後端服務
-
-# 安裝開發版本（更多修復，新功能，但不夠穩定，適合開發者）
-uv tool install git+https://github.com/AstrBotDevs/AstrBot@dev
+uvx astrbot
 ```
 
-> 需要安裝 [uv](https://docs.astral.sh/uv/)。
+#### 寶塔面板部署
 
-> [!NOTE]
-> 對於 macOS 用戶：由於 macOS 安全檢查，首次運行 `astrbot` 命令可能需要較長時間（約 10-20 秒）。
+AstrBot 與寶塔面板合作，已上架至寶塔面板。
 
-更新 `astrbot`：
+請參閱官方文件 [寶塔面板部署](https://astrbot.app/deploy/astrbot/btpanel.html)。
 
-```bash
-uv tool upgrade astrbot
-```
+#### 1Panel 部署
 
-### Docker 部署
+AstrBot 已由 1Panel 官方上架至 1Panel 面板。
 
-對於熟悉容器、希望獲得更穩定且更適合生產環境部署方式的用戶，我們推薦使用 Docker / Docker Compose 部署 AstrBot。
+請參閱官方文件 [1Panel 部署](https://astrbot.app/deploy/astrbot/1panel.html)。
 
-請參考官方文檔 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot)。
+#### 在雨雲上部署
 
-### 在 雨雲 上部署
-
-對於希望一鍵部署 AstrBot 且不想自行管理服務器的用戶，我們推薦使用雨雲的一鍵雲部署服務 ☁️：
+AstrBot 已由雨雲官方上架至雲端應用程式平台，可一鍵部署。
 
 [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
 
-### 桌面客戶端部署
+#### 在 Replit 上部署
 
-對於希望在桌面端使用 AstrBot、並以 ChatUI 為主要入口的用戶，我們推薦使用 AstrBot App。
-
-前往 [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop) 下載並安裝；該方式面向桌面使用，不推薦服務器場景。
-
-### 啟動器部署
-
-同樣在桌面端，希望快速部署並實現環境隔離多開的用戶，我們推薦使用 AstrBot Launcher。
-
-前往 [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) 下載並安裝。
-
-### 在 Replit 上部署
-
-Replit 部署由社區維護，適合在線演示和輕量試用場景。
+社群貢獻的部署方式。
 
 [![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
 
-### AUR
+#### Windows 一鍵安裝器部署
 
-AUR 方式面向 Arch Linux 用戶，適合希望通過系統包管理器安裝 AstrBot 的場景。
+請參閱官方文件 [使用 Windows 一鍵安裝器部署 AstrBot](https://astrbot.app/deploy/astrbot/windows.html)。
 
-在終端執行下方命令安裝 `astrbot-git` 包，安裝完成後即可啟動使用。
+#### CasaOS 部署
+
+社群貢獻的部署方式。
+
+請參閱官方文件 [CasaOS 部署](https://astrbot.app/deploy/astrbot/casaos.html)。
+
+#### 手動部署
+
+首先安裝 uv：
 
 ```bash
-yay -S astrbot-git
+pip install uv
 ```
 
-**更多部署方式**
+透過 Git Clone 安裝 AstrBot：
 
-若你需要面板化或更高自定義部署，可參考 [寶塔面板](https://astrbot.app/deploy/astrbot/btpanel.html)（BT Panel 應用商店安裝）、[1Panel](https://astrbot.app/deploy/astrbot/1panel.html)（1Panel 應用商店安裝）、[CasaOS](https://astrbot.app/deploy/astrbot/casaos.html)（NAS / 家庭服務器可視化部署）和 [手動部署](https://astrbot.app/deploy/astrbot/cli.html)（基於源碼與 `uv` 的完整自定義安裝）。
+```bash
+git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
+uv run main.py
+```
 
-## 支持的消息平台
+或者請參閱官方文件 [透過原始碼部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html)。
 
-將 AstrBot 連接到你常用的聊天平台。
+## 支援的訊息平台
 
-| 平台 | 維護方 |
-|---------|---------------|
-| **QQ** | 官方維護 |
-| **OneBot v11** | 官方維護 |
-| **Telegram** | 官方維護 |
-| **企微應用 & 企微智能機器人** | 官方維護 |
-| **微信客服 & 微信公眾號** | 官方維護 |
-| **飛書** | 官方維護 |
-| **釘釘** | 官方維護 |
-| **Slack** | 官方維護 |
-| **Discord** | 官方維護 |
-| **LINE** | 官方維護 |
-| **Satori** | 官方維護 |
-| **Misskey** | 官方維護 |
-| **Whatsapp (將支持)** | 官方維護 |
-| [**Matrix**](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | 社區維護 |
-| [**KOOK**](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | 社區維護 |
-| [**VoceChat**](https://github.com/HikariFroya/astrbot_plugin_vocechat) | 社區維護 |
+**官方維護**
 
-## 支持的模型提供商
+- QQ（官方平台 & OneBot）
+- Telegram
+- 企微應用 & 企微智慧機器人
+- 微信客服 & 微信公眾號
+- 飛書
+- 釘釘
+- Slack
+- Discord
+- Satori
+- Misskey
+- Whatsapp（即將支援）
+- LINE（即將支援）
 
-| 提供商 | 類型 |
-|---------|---------------|
-| 自定義 | 任何 OpenAI API 兼容的服務 |
-| OpenAI | LLM |
-| Anthropic | LLM |
-| Google Gemini | LLM |
-| Moonshot AI | LLM |
-| 智譜 AI | LLM |
-| DeepSeek | LLM |
-| Ollama (本地部署) | LLM |
-| LM Studio (本地部署) | LLM |
-| [AIHubMix](https://aihubmix.com/?aff=4bfH) | LLM (API 網關, 支持所有模型) |
-| [優雲智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM (API 網關, 支持所有模型) |
-| [硅基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM (API 網關, 支持所有模型)  |
-| [PPIO 派歐雲](https://ppio.com/user/register?invited_by=AIOONE) | LLM (API 網關, 支持所有模型) |
-| [302.AI](https://share.302.ai/rr1M3l) | LLM (API 網關, 支持所有模型)|
-| [小馬算力](https://www.tokenpony.cn/3YPyf) | LLM (API 網關, 支持所有模型)|
-| ModelScope | LLM |
-| OneAPI | LLM |
-| Dify | LLMOps 平台 |
-| 阿里雲百煉應用 | LLMOps 平台 |
-| Coze | LLMOps 平台 |
-| OpenAI Whisper | 語音轉文本 |
-| SenseVoice | 語音轉文本 |
-| OpenAI TTS | 文本轉語音 |
-| Gemini TTS | 文本轉語音 |
-| GPT-Sovits-Inference | 文本轉語音 |
-| GPT-Sovits | 文本轉語音 |
-| FishAudio | 文本轉語音 |
-| Edge TTS | 文本轉語音 |
-| 阿里雲百煉 TTS | 文本轉語音 |
-| Azure TTS | 文本轉語音 |
-| Minimax TTS | 文本轉語音 |
-| 火山引擎 TTS | 文本轉語音 |
+**社群維護**
+
+- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter)
+- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
+- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
+
+## 支援的模型服務
+
+**大型模型服務**
+
+- OpenAI 及相容服務
+- Anthropic
+- Google Gemini
+- Moonshot AI
+- 智譜 AI
+- DeepSeek
+- Ollama（本機部署）
+- LM Studio（本機部署）
+- [優雲智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
+- [302.AI](https://share.302.ai/rr1M3l)
+- [小馬算力](https://www.tokenpony.cn/3YPyf)
+- [矽基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot)
+- [PPIO 派歐雲](https://ppio.com/user/register?invited_by=AIOONE)
+- ModelScope
+- OneAPI
+
+**LLMOps 平台**
+
+- Dify
+- 阿里雲百煉應用
+- Coze
+
+**語音轉文字服務**
+
+- OpenAI Whisper
+- SenseVoice
+
+**文字轉語音服務**
+
+- OpenAI TTS
+- Gemini TTS
+- GPT-Sovits-Inference
+- GPT-Sovits
+- FishAudio
+- Edge TTS
+- 阿里雲百煉 TTS
+- Azure TTS
+- Minimax TTS
+- 火山引擎 TTS
 
 ## ❤️ 貢獻
 
-歡迎任何 Issues/Pull Requests！只需要將你的更改提交到此項目 ：)
+歡迎任何 Issues/Pull Requests！只需要將您的變更提交到此專案 ：)
 
 ### 如何貢獻
 
-你可以通過查看問題或幫助審核 PR（拉取請求）來貢獻。任何問題或 PR 都歡迎參與，以促進社區貢獻。當然，這些只是建議，你可以以任何方式進行貢獻。對於新功能的添加，請先通過 Issue 討論。
-建議將功能性PR合併至dev分支，將在測試修改後合併到主分支並發布新版本。
-為了減少衝突，建議如下：
-1. 工作分支最好基於 `dev` 分支創建，避免直接在 `main` 分支上工作。
-2. 提交 PR 時，選擇 `dev` 分支作為目標分支。
-3. 定期同步 `dev` 分支到本地，多使用git pull。
+您可以透過檢視問題或協助審核 PR（拉取請求）來貢獻。任何問題或 PR 都歡迎參與，以促進社群貢獻。當然，這些只是建議，您可以以任何方式進行貢獻。對於新功能的新增，請先透過 Issue 討論。
 
 ### 開發環境
 
-AstrBot 使用 `ruff` 進行代碼格式化和檢查。
+AstrBot 使用 `ruff` 進行程式碼格式化和檢查。
 
 ```bash
 git clone https://github.com/AstrBotDevs/AstrBot
-git switch dev # 切換到開發分支
-pip install pre-commit # 或者uv tool install pre-commit
+pip install pre-commit
 pre-commit install
 ```
-推薦使用uv本地安裝，進行測試
-```bash
-uv tool install -e . --force
-astrbot init 
-astrbot run
-```
-調試前端
-```bash
-astrbot run --backend-only
-cd dashboard
-bun install # 或者pnpm 等
-bun dev
-```
+
+## 🌍 社群
 
 ### QQ 群組
 
-- 9 群: 1076659624 (新)
-- 10 群: 1078079676 (新)
 - 1 群：322154837
 - 3 群：630166526
 - 5 群：822130018
 - 6 群：753075035
-- 7 群：743746109
-- 8 群：1030353265
-- 開發者群（偏閒聊吹水）：975206796
-- 開發者群（正式）：1039761811
+- 開發者群：975206796
 
-### Discord 頻道
+### Telegram 群組
 
-- [Discord](https://discord.gg/hAVk6tgV36)
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+### Discord 群組
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 
 ## ❤️ Special Thanks
 
-特別感謝所有 Contributors 和插件開發者對 AstrBot 的貢獻 ❤️
+特別感謝所有 Contributors 和外掛開發者對 AstrBot 的貢獻 ❤️
 
 <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
+  <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
 </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]
-> 如果本項目對您的生活 / 工作產生了幫助，或者您關注本項目的未來發展，請給項目 Star，這是我們維護這個開源項目的動力 <3
+> 如果本專案對您的生活 / 工作產生了幫助，或者您關注本專案的未來發展，請給專案 Star，這是我們維護這個開源專案的動力 <3
 
 <div align="center">
 
@@ -286,12 +241,7 @@ bun dev
 
 </div>
 
-<div align="center">
-
-_陪伴與能力從來不應該是對立面。我們希望創造的是一個既能理解情緒、給予陪伴，也能可靠完成工作的機器人。_
+</details>
 
 _私は、高性能ですから!_
 
-<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
-
-</div>

README_zh.md

@@ -1,297 +0,0 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
-
-<div align="center">
-
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
-
-<div>
-<a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-<a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-</div>
-
-<br>
-
-<div>
-<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
-<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
-<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
-<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
-<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600">
-<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
-</div>
-
-<br>
-
-<a href="https://astrbot.app/">主页</a> ｜
-<a href="https://astrbot.app/">文档</a> ｜
-<a href="https://blog.astrbot.app/">博客</a> ｜
-<a href="https://astrbot.featurebase.app/roadmap">路线图</a> ｜
-<a href="https://github.com/AstrBotDevs/AstrBot/issues">问题提交</a>
-<a href="mailto:community@astrbot.app">Email</a>
-
-</div>
-
-AstrBot 是一个开源的一站式 Agentic 个人和群聊助手，可在 QQ、Telegram、企业微信、飞书、钉钉、Slack、等数十款主流即时通讯软件上部署，此外还内置类似 OpenWebUI 的轻量化 ChatUI，为个人、开发者和团队打造可靠、可扩展的对话式智能基础设施。无论是个人 AI 伙伴、智能客服、自动化助手，还是企业知识库，AstrBot 都能在你的即时通讯软件平台的工作流中快速构建 AI 应用。
-
-![landingpage](https://github.com/user-attachments/assets/45fc5699-cddf-4e21-af35-13040706f6c0)
-
-## 主要功能
-
-1. 💯 免费 & 开源。
-2. ✨ AI 大模型对话，多模态，Agent，MCP，Skills，知识库，人格设定，自动压缩对话。
-3. 🤖 支持接入 Dify、阿里云百炼、Coze 等智能体平台。
-4. 🌐 多平台，支持 QQ、企业微信、飞书、钉钉、微信公众号、Telegram、Slack 以及[更多](#支持的消息平台)。
-5. 📦 插件扩展，已有 1000+ 个插件可一键安装。
-6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) 隔离化环境，安全地执行任何代码、调用 Shell、会话级资源复用。
-7. 💻 WebUI 支持。
-8. 🌈 Web ChatUI 支持，ChatUI 内置代理沙盒、网页搜索等。
-9. 🌐 国际化（i18n）支持。
-
-<br>
-
-<table align="center">
-  <tr align="center">
-    <th>💙 角色扮演 & 情感陪伴</th>
-    <th>✨ 主动式 Agent</th>
-    <th>🚀 通用 Agentic 能力</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>
-    <td align="center"><p align="center"><img width="976" height="1612" alt="c449acd838c41d0915cc08a3824025b1" src="https://github.com/user-attachments/assets/f75368b4-e022-41dc-a9e0-131c3e73e32e" /></p></td>
-    <td align="center"><p align="center"><img width="974" height="1732" alt="image" src="https://github.com/user-attachments/assets/e22a3968-87d7-4708-a7cd-e7f198c7c32e" /></p></td>
-    <td align="center"><p align="center"><img width="976" height="1734" alt="image" src="https://github.com/user-attachments/assets/0952b395-6b4a-432a-8a50-c294b7f89750" /></p></td>
-  </tr>
-</table>
-
-## 快速开始
-
-### 一键部署
-
-对于想快速体验 AstrBot、且熟悉命令行并能够自行安装 `uv` 环境的用户，我们推荐使用 `uv` 一键部署方式 ⚡️。
-
-```bash
-uv tool install astrbot
-astrbot init # 仅首次执行此命令以初始化环境
-astrbot run # astrbot run --backend-only 仅启动后端服务
-
-# 安装开发版本（更多修复，新功能，但不够稳定，适合开发者）
-uv tool install git+https://github.com/AstrBotDevs/AstrBot@dev
-```
-
-> 需要安装 [uv](https://docs.astral.sh/uv/)。
-
-> [!NOTE]
-> 对于 macOS 用户：由于 macOS 安全检查，首次运行 `astrbot` 命令可能需要较长时间（约 10-20 秒）。
-
-更新 `astrbot`：
-
-```bash
-uv tool upgrade astrbot
-```
-
-### Docker 部署
-
-对于熟悉容器、希望获得更稳定且更适合生产环境部署方式的用户，我们推荐使用 Docker / Docker Compose 部署 AstrBot。
-
-请参考官方文档 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot)。
-
-### 在 雨云 上部署
-
-对于希望一键部署 AstrBot 且不想自行管理服务器的用户，我们推荐使用雨云的一键云部署服务 ☁️：
-
-[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
-
-### 桌面客户端部署
-
-对于希望在桌面端使用 AstrBot、并以 ChatUI 为主要入口的用户，我们推荐使用 AstrBot App。
-
-前往 [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop) 下载并安装；该方式面向桌面使用，不推荐服务器场景。
-
-### 启动器部署
-
-同样在桌面端，希望快速部署并实现环境隔离多开的用户，我们推荐使用 AstrBot Launcher。
-
-前往 [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) 下载并安装。
-
-### 在 Replit 上部署
-
-Replit 部署由社区维护，适合在线演示和轻量试用场景。
-
-[![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
-
-### AUR
-
-AUR 方式面向 Arch Linux 用户，适合希望通过系统包管理器安装 AstrBot 的场景。
-
-在终端执行下方命令安装 `astrbot-git` 包，安装完成后即可启动使用。
-
-```bash
-yay -S astrbot-git
-```
-
-**更多部署方式**
-
-若你需要面板化或更高自定义部署，可参考 [宝塔面板](https://astrbot.app/deploy/astrbot/btpanel.html)（BT Panel 应用商店安装）、[1Panel](https://astrbot.app/deploy/astrbot/1panel.html)（1Panel 应用商店安装）、[CasaOS](https://astrbot.app/deploy/astrbot/casaos.html)（NAS / 家庭服务器可视化部署）和 [手动部署](https://astrbot.app/deploy/astrbot/cli.html)（基于源码与 `uv` 的完整自定义安装）。
-
-## 支持的消息平台
-
-将 AstrBot 连接到你常用的聊天平台。
-
-| 平台 | 维护方 |
-|---------|---------------|
-| **QQ** | 官方维护 |
-| **OneBot v11** | 官方维护 |
-| **Telegram** | 官方维护 |
-| **企微应用 & 企微智能机器人** | 官方维护 |
-| **微信客服 & 微信公众号** | 官方维护 |
-| **飞书** | 官方维护 |
-| **钉钉** | 官方维护 |
-| **Slack** | 官方维护 |
-| **Discord** | 官方维护 |
-| **LINE** | 官方维护 |
-| **Satori** | 官方维护 |
-| **Misskey** | 官方维护 |
-| **Whatsapp (将支持)** | 官方维护 |
-| [**Matrix**](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | 社区维护 |
-| [**KOOK**](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | 社区维护 |
-| [**VoceChat**](https://github.com/HikariFroya/astrbot_plugin_vocechat) | 社区维护 |
-
-## 支持的模型提供商
-
-| 提供商 | 类型 |
-|---------|---------------|
-| 自定义 | 任何 OpenAI API 兼容的服务 |
-| OpenAI | LLM |
-| Anthropic | LLM |
-| Google Gemini | LLM |
-| Moonshot AI | LLM |
-| 智谱 AI | LLM |
-| DeepSeek | LLM |
-| Ollama (本地部署) | LLM |
-| LM Studio (本地部署) | LLM |
-| [AIHubMix](https://aihubmix.com/?aff=4bfH) | LLM (API 网关, 支持所有模型) |
-| [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM (API 网关, 支持所有模型) |
-| [硅基流动](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM (API 网关, 支持所有模型)  |
-| [PPIO 派欧云](https://ppio.com/user/register?invited_by=AIOONE) | LLM (API 网关, 支持所有模型) |
-| [302.AI](https://share.302.ai/rr1M3l) | LLM (API 网关, 支持所有模型)|
-| [小马算力](https://www.tokenpony.cn/3YPyf) | LLM (API 网关, 支持所有模型)|
-| ModelScope | LLM |
-| OneAPI | LLM |
-| Dify | LLMOps 平台 |
-| 阿里云百炼应用 | LLMOps 平台 |
-| Coze | LLMOps 平台 |
-| OpenAI Whisper | 语音转文本 |
-| SenseVoice | 语音转文本 |
-| OpenAI TTS | 文本转语音 |
-| Gemini TTS | 文本转语音 |
-| GPT-Sovits-Inference | 文本转语音 |
-| GPT-Sovits | 文本转语音 |
-| FishAudio | 文本转语音 |
-| Edge TTS | 文本转语音 |
-| 阿里云百炼 TTS | 文本转语音 |
-| Azure TTS | 文本转语音 |
-| Minimax TTS | 文本转语音 |
-| 火山引擎 TTS | 文本转语音 |
-
-## ❤️ 贡献
-
-欢迎任何 Issues/Pull Requests！只需要将你的更改提交到此项目 ：)
-
-### 如何贡献
-
-你可以通过查看问题或帮助审核 PR（拉取请求）来贡献。任何问题或 PR 都欢迎参与，以促进社区贡献。当然，这些只是建议，你可以以任何方式进行贡献。对于新功能的添加，请先通过 Issue 讨论。
-建议将功能性PR合并至dev分支，将在测试修改后合并到主分支并发布新版本。
-为了减少冲突，建议如下：
-1. 工作分支最好基于 `dev` 分支创建，避免直接在 `main` 分支上工作。
-2. 提交 PR 时，选择 `dev` 分支作为目标分支。
-3. 定期同步 `dev` 分支到本地，多使用git pull。
-
-### 开发环境
-
-AstrBot 使用 `ruff` 进行代码格式化和检查。
-
-```bash
-git clone https://github.com/AstrBotDevs/AstrBot
-git switch dev # 切换到开发分支
-pip install pre-commit # 或者uv tool install pre-commit
-pre-commit install
-```
-推荐使用uv本地安装，进行测试
-```bash
-uv tool install -e . --force
-astrbot init 
-astrbot run
-```
-调试前端
-```bash
-astrbot run --backend-only
-cd dashboard
-bun install # 或者pnpm 等
-bun dev
-```
-
-### QQ 群组
-
-- 9 群: 1076659624 (新)
-- 10 群: 1078079676 (新)
-- 1 群：322154837
-- 3 群：630166526
-- 5 群：822130018
-- 6 群：753075035
-- 7 群：743746109
-- 8 群：1030353265
-- 开发者群（偏闲聊吹水）：975206796
-- 开发者群（正式）：1039761811
-
-### Discord 频道
-
-- [Discord](https://discord.gg/hAVk6tgV36)
-
-## ❤️ Special Thanks
-
-特别感谢所有 Contributors 和插件开发者对 AstrBot 的贡献 ❤️
-
-<a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
-  <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]
-> 如果本项目对您的生活 / 工作产生了帮助，或者您关注本项目的未来发展，请给项目 Star，这是我们维护这个开源项目的动力 <3
-
-<div align="center">
-
-[![Star History Chart](https://api.star-history.com/svg?repos=astrbotdevs/astrbot&type=Date)](https://star-history.com/#astrbotdevs/astrbot&Date)
-
-</div>
-
-<div align="center">
-
-_陪伴与能力从来不应该是对立面。我们希望创造的是一个既能理解情绪、给予陪伴，也能可靠完成工作的机器人。_
-
-_私は、高性能ですから!_
-
-<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
-
-</div>

astrbot/api/event/filter/__init__.py

@@ -24,9 +24,6 @@ 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,
@@ -55,9 +52,6 @@ __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/astrbot/long_term_memory.py

@@ -17,7 +17,7 @@ from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 
 
 class LongTermMemory:
-    def __init__(self, acm: AstrBotConfigManager, context: star.Context) -> None:
+    def __init__(self, acm: AstrBotConfigManager, context: star.Context):
         self.acm = acm
         self.context = context
         self.session_chats = defaultdict(list)
@@ -111,7 +111,7 @@ class LongTermMemory:
 
         return False
 
-    async def handle_message(self, event: AstrMessageEvent) -> None:
+    async def handle_message(self, event: AstrMessageEvent):
         """仅支持群聊"""
         if event.get_message_type() == MessageType.GROUP_MESSAGE:
             datetime_str = datetime.datetime.now().strftime("%H:%M:%S")
@@ -148,7 +148,7 @@ class LongTermMemory:
             if len(self.session_chats[event.unified_msg_origin]) > cfg["max_cnt"]:
                 self.session_chats[event.unified_msg_origin].pop(0)
 
-    async def on_req_llm(self, event: AstrMessageEvent, req: ProviderRequest) -> None:
+    async def on_req_llm(self, event: AstrMessageEvent, req: ProviderRequest):
         """当触发 LLM 请求前，调用此方法修改 req"""
         if event.unified_msg_origin not in self.session_chats:
             return
@@ -171,9 +171,7 @@ class LongTermMemory:
             )
             req.system_prompt += chats_str
 
-    async def after_req_llm(
-        self, event: AstrMessageEvent, llm_resp: LLMResponse
-    ) -> None:
+    async def after_req_llm(self, event: AstrMessageEvent, llm_resp: LLMResponse):
         if event.unified_msg_origin not in self.session_chats:
             return
 

astrbot/builtin_stars/astrbot/main.py

@@ -85,9 +85,7 @@ class Main(star.Star):
                     logger.error(f"主动回复失败: {e}")
 
     @filter.on_llm_request()
-    async def decorate_llm_req(
-        self, event: AstrMessageEvent, req: ProviderRequest
-    ) -> None:
+    async def decorate_llm_req(self, event: AstrMessageEvent, req: ProviderRequest):
         """在请求 LLM 前注入人格信息、Identifier、时间、回复内容等 System Prompt"""
         if self.ltm and self.ltm_enabled(event):
             try:
@@ -96,9 +94,7 @@ class Main(star.Star):
                 logger.error(f"ltm: {e}")
 
     @filter.on_llm_response()
-    async def record_llm_resp_to_ltm(
-        self, event: AstrMessageEvent, resp: LLMResponse
-    ) -> None:
+    async def record_llm_resp_to_ltm(self, event: AstrMessageEvent, resp: LLMResponse):
         """在 LLM 响应后记录对话"""
         if self.ltm and self.ltm_enabled(event):
             try:
@@ -107,7 +103,7 @@ class Main(star.Star):
                 logger.error(f"ltm: {e}")
 
     @filter.after_message_sent()
-    async def after_message_sent(self, event: AstrMessageEvent) -> None:
+    async def after_message_sent(self, event: AstrMessageEvent):
         """消息发送后处理"""
         if self.ltm and self.ltm_enabled(event):
             try:

astrbot/builtin_stars/builtin_commands/commands/admin.py

@@ -5,10 +5,10 @@ from astrbot.core.utils.io import download_dashboard
 
 
 class AdminCommands:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def op(self, event: AstrMessageEvent, admin_id: str = "") -> None:
+    async def op(self, event: AstrMessageEvent, admin_id: str = ""):
         """授权管理员。op <admin_id>"""
         if not admin_id:
             event.set_result(
@@ -21,7 +21,7 @@ class AdminCommands:
         self.context.get_config().save_config()
         event.set_result(MessageEventResult().message("授权成功。"))
 
-    async def deop(self, event: AstrMessageEvent, admin_id: str = "") -> None:
+    async def deop(self, event: AstrMessageEvent, admin_id: str = ""):
         """取消授权管理员。deop <admin_id>"""
         if not admin_id:
             event.set_result(
@@ -39,7 +39,7 @@ class AdminCommands:
                 MessageEventResult().message("此用户 ID 不在管理员名单内。"),
             )
 
-    async def wl(self, event: AstrMessageEvent, sid: str = "") -> None:
+    async def wl(self, event: AstrMessageEvent, sid: str = ""):
         """添加白名单。wl <sid>"""
         if not sid:
             event.set_result(
@@ -53,7 +53,7 @@ class AdminCommands:
         cfg.save_config()
         event.set_result(MessageEventResult().message("添加白名单成功。"))
 
-    async def dwl(self, event: AstrMessageEvent, sid: str = "") -> None:
+    async def dwl(self, event: AstrMessageEvent, sid: str = ""):
         """删除白名单。dwl <sid>"""
         if not sid:
             event.set_result(
@@ -70,7 +70,7 @@ class AdminCommands:
         except ValueError:
             event.set_result(MessageEventResult().message("此 SID 不在白名单内。"))
 
-    async def update_dashboard(self, event: AstrMessageEvent) -> None:
+    async def update_dashboard(self, event: AstrMessageEvent):
         """更新管理面板"""
         await event.send(MessageChain().message("正在尝试更新管理面板..."))
         await download_dashboard(version=f"v{VERSION}", latest=False)

astrbot/builtin_stars/builtin_commands/commands/alter_cmd.py

@@ -11,10 +11,10 @@ from .utils.rst_scene import RstScene
 
 
 class AlterCmdCommands(CommandParserMixin):
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def update_reset_permission(self, scene_key: str, perm_type: str) -> None:
+    async def update_reset_permission(self, scene_key: str, perm_type: str):
         """更新reset命令在特定场景下的权限设置"""
         from astrbot.api import sp
 
@@ -26,7 +26,7 @@ class AlterCmdCommands(CommandParserMixin):
         alter_cmd_cfg["astrbot"] = plugin_cfg
         await sp.global_put("alter_cmd", alter_cmd_cfg)
 
-    async def alter_cmd(self, event: AstrMessageEvent) -> None:
+    async def alter_cmd(self, event: AstrMessageEvent):
         token = self.parse_commands(event.message_str)
         if token.len < 3:
             await event.send(

astrbot/builtin_stars/builtin_commands/commands/conversation.py

@@ -2,13 +2,8 @@ import datetime
 
 from astrbot.api import sp, star
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
-from astrbot.core.agent.runners.deerflow.constants import (
-    DEERFLOW_PROVIDER_TYPE,
-    DEERFLOW_THREAD_ID_KEY,
-)
 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
 
@@ -16,13 +11,12 @@ THIRD_PARTY_AGENT_RUNNER_KEY = {
     "dify": "dify_conversation_id",
     "coze": "coze_conversation_id",
     "dashscope": "dashscope_conversation_id",
-    DEERFLOW_PROVIDER_TYPE: DEERFLOW_THREAD_ID_KEY,
 }
 THIRD_PARTY_AGENT_RUNNER_STR = ", ".join(THIRD_PARTY_AGENT_RUNNER_KEY.keys())
 
 
 class ConversationCommands:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
     async def _get_current_persona_id(self, session_id):
@@ -39,7 +33,7 @@ class ConversationCommands:
             return None
         return conv.persona_id
 
-    async def reset(self, message: AstrMessageEvent) -> None:
+    async def reset(self, message: AstrMessageEvent):
         """重置 LLM 会话"""
         umo = message.unified_msg_origin
         cfg = self.context.get_config(umo=message.unified_msg_origin)
@@ -68,7 +62,6 @@ 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,
@@ -93,8 +86,6 @@ class ConversationCommands:
             )
             return
 
-        active_event_registry.stop_all(umo, exclude=message)
-
         await self.context.conversation_manager.update_conversation(
             umo,
             cid,
@@ -107,31 +98,7 @@ 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:
+    async def his(self, message: AstrMessageEvent, page: int = 1):
         """查看对话记录"""
         if not self.context.get_using_provider(message.unified_msg_origin):
             message.set_result(
@@ -174,7 +141,7 @@ class ConversationCommands:
 
         message.set_result(MessageEventResult().message(ret).use_t2i(False))
 
-    async def convs(self, message: AstrMessageEvent, page: int = 1) -> None:
+    async def convs(self, message: AstrMessageEvent, page: int = 1):
         """查看对话列表"""
         cfg = self.context.get_config(umo=message.unified_msg_origin)
         agent_runner_type = cfg["provider_settings"]["agent_runner_type"]
@@ -211,33 +178,16 @@ 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,
-                _,
-                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} (自定义规则)"
-
+            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"]
             title = _titles.get(conv.cid, "新对话")
             parts.append(
-                f"{global_index}. {title}({conv.cid[:4]})\n  人格情景: {persona_name}\n  上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n"
+                f"{global_index}. {title}({conv.cid[:4]})\n  人格情景: {persona_id}\n  上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n"
             )
             global_index += 1
 
@@ -266,12 +216,11 @@ class ConversationCommands:
         message.set_result(MessageEventResult().message(ret).use_t2i(False))
         return
 
-    async def new_conv(self, message: AstrMessageEvent) -> None:
+    async def new_conv(self, message: AstrMessageEvent):
         """创建新对话"""
         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,
@@ -280,7 +229,6 @@ 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,
@@ -294,7 +242,7 @@ class ConversationCommands:
             MessageEventResult().message(f"切换到新对话: 新对话({cid[:4]})。"),
         )
 
-    async def groupnew_conv(self, message: AstrMessageEvent, sid: str = "") -> None:
+    async def groupnew_conv(self, message: AstrMessageEvent, sid: str = ""):
         """创建新群聊对话"""
         if sid:
             session = str(
@@ -325,7 +273,7 @@ class ConversationCommands:
         self,
         message: AstrMessageEvent,
         index: int | None = None,
-    ) -> None:
+    ):
         """通过 /ls 前面的序号切换对话"""
         if not isinstance(index, int):
             message.set_result(
@@ -360,7 +308,7 @@ class ConversationCommands:
                 ),
             )
 
-    async def rename_conv(self, message: AstrMessageEvent, new_name: str = "") -> None:
+    async def rename_conv(self, message: AstrMessageEvent, new_name: str = ""):
         """重命名对话"""
         if not new_name:
             message.set_result(MessageEventResult().message("请输入新的对话名称。"))
@@ -371,10 +319,9 @@ class ConversationCommands:
         )
         message.set_result(MessageEventResult().message("重命名对话成功。"))
 
-    async def del_conv(self, message: AstrMessageEvent) -> None:
+    async def del_conv(self, message: AstrMessageEvent):
         """删除当前对话"""
-        umo = message.unified_msg_origin
-        cfg = self.context.get_config(umo=umo)
+        cfg = self.context.get_config(umo=message.unified_msg_origin)
         is_unique_session = cfg["platform_settings"]["unique_session"]
         if message.get_group_id() and not is_unique_session and message.role != "admin":
             # 群聊，没开独立会话，发送人不是管理员
@@ -387,17 +334,18 @@ 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,
+                scope_id=message.unified_msg_origin,
                 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(umo)
+            await self.context.conversation_manager.get_curr_conversation_id(
+                message.unified_msg_origin,
+            )
         )
 
         if not session_curr_cid:
@@ -408,10 +356,8 @@ class ConversationCommands:
             )
             return
 
-        active_event_registry.stop_all(umo, exclude=message)
-
         await self.context.conversation_manager.delete_conversation(
-            umo,
+            message.unified_msg_origin,
             session_curr_cid,
         )
 

astrbot/builtin_stars/builtin_commands/commands/help.py

@@ -8,7 +8,7 @@ from astrbot.core.utils.io import get_dashboard_version
 
 
 class HelpCommand:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
     async def _query_astrbot_notice(self):
@@ -34,7 +34,7 @@ class HelpCommand:
         lines: list[str] = []
         hidden_commands = {"set", "unset", "websearch"}
 
-        def walk(items: list[dict], indent: int = 0) -> None:
+        def walk(items: list[dict], indent: int = 0):
             for item in items:
                 if not item.get("reserved") or not item.get("enabled"):
                     continue
@@ -62,7 +62,7 @@ class HelpCommand:
         walk(commands)
         return lines
 
-    async def help(self, event: AstrMessageEvent) -> None:
+    async def help(self, event: AstrMessageEvent):
         """查看帮助"""
         notice = ""
         try:

astrbot/builtin_stars/builtin_commands/commands/llm.py

@@ -3,10 +3,10 @@ from astrbot.api.event import AstrMessageEvent, MessageChain
 
 
 class LLMCommands:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def llm(self, event: AstrMessageEvent) -> None:
+    async def llm(self, event: AstrMessageEvent):
         """开启/关闭 LLM"""
         cfg = self.context.get_config(umo=event.unified_msg_origin)
         enable = cfg["provider_settings"].get("enable", True)

astrbot/builtin_stars/builtin_commands/commands/persona.py

@@ -1,7 +1,7 @@
 import builtins
 from typing import TYPE_CHECKING
 
-from astrbot.api import star
+from astrbot.api import sp, star
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 
 if TYPE_CHECKING:
@@ -9,7 +9,7 @@ if TYPE_CHECKING:
 
 
 class PersonaCommands:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
     def _build_tree_output(
@@ -50,7 +50,7 @@ class PersonaCommands:
 
         return lines
 
-    async def persona(self, message: AstrMessageEvent) -> None:
+    async def persona(self, message: AstrMessageEvent):
         l = message.message_str.split(" ")  # noqa: E741
         umo = message.unified_msg_origin
 
@@ -59,7 +59,12 @@ class PersonaCommands:
         default_persona = await self.context.persona_manager.get_default_persona_v3(
             umo=umo,
         )
-        force_applied_persona_id = None
+
+        force_applied_persona_id = (
+            await sp.get_async(
+                scope="umo", scope_id=umo, key="session_service_config", default={}
+            )
+        ).get("persona_id")
 
         curr_cid_title = "无"
         if cid:
@@ -75,27 +80,10 @@ class PersonaCommands:
                     ),
                 )
                 return
-
-            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 not conv.persona_id and conv.persona_id != "[%None]":
+                curr_persona_name = default_persona["name"]
+            else:
+                curr_persona_name = conv.persona_id
 
             if force_applied_persona_id:
                 curr_persona_name = f"{curr_persona_name} (自定义规则)"

astrbot/builtin_stars/builtin_commands/commands/plugin.py

@@ -8,10 +8,10 @@ from astrbot.core.star.star_manager import PluginManager
 
 
 class PluginCommands:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def plugin_ls(self, event: AstrMessageEvent) -> None:
+    async def plugin_ls(self, event: AstrMessageEvent):
         """获取已经安装的插件列表。"""
         parts = ["已加载的插件：\n"]
         for plugin in self.context.get_all_stars():
@@ -30,7 +30,7 @@ class PluginCommands:
             MessageEventResult().message(f"{plugin_list_info}").use_t2i(False),
         )
 
-    async def plugin_off(self, event: AstrMessageEvent, plugin_name: str = "") -> None:
+    async def plugin_off(self, event: AstrMessageEvent, plugin_name: str = ""):
         """禁用插件"""
         if DEMO_MODE:
             event.set_result(MessageEventResult().message("演示模式下无法禁用插件。"))
@@ -43,7 +43,7 @@ class PluginCommands:
         await self.context._star_manager.turn_off_plugin(plugin_name)  # type: ignore
         event.set_result(MessageEventResult().message(f"插件 {plugin_name} 已禁用。"))
 
-    async def plugin_on(self, event: AstrMessageEvent, plugin_name: str = "") -> None:
+    async def plugin_on(self, event: AstrMessageEvent, plugin_name: str = ""):
         """启用插件"""
         if DEMO_MODE:
             event.set_result(MessageEventResult().message("演示模式下无法启用插件。"))
@@ -56,7 +56,7 @@ class PluginCommands:
         await self.context._star_manager.turn_on_plugin(plugin_name)  # type: ignore
         event.set_result(MessageEventResult().message(f"插件 {plugin_name} 已启用。"))
 
-    async def plugin_get(self, event: AstrMessageEvent, plugin_repo: str = "") -> None:
+    async def plugin_get(self, event: AstrMessageEvent, plugin_repo: str = ""):
         """安装插件"""
         if DEMO_MODE:
             event.set_result(MessageEventResult().message("演示模式下无法安装插件。"))
@@ -77,7 +77,7 @@ class PluginCommands:
                 event.set_result(MessageEventResult().message(f"安装插件失败: {e}"))
                 return
 
-    async def plugin_help(self, event: AstrMessageEvent, plugin_name: str = "") -> None:
+    async def plugin_help(self, event: AstrMessageEvent, plugin_name: str = ""):
         """获取插件帮助"""
         if not plugin_name:
             event.set_result(

astrbot/builtin_stars/builtin_commands/commands/provider.py

@@ -1,262 +1,15 @@
-from __future__ import annotations
-
 import asyncio
-import time
-from collections.abc import Sequence
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
+import re
 
 from astrbot import logger
 from astrbot.api import star
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 from astrbot.core.provider.entities import ProviderType
-from astrbot.core.utils.error_redaction import safe_error
-
-if TYPE_CHECKING:
-    from astrbot.core.provider.provider import Provider
-
-
-MODEL_LIST_CACHE_TTL_SECONDS_DEFAULT = 30.0
-MODEL_LOOKUP_MAX_CONCURRENCY_DEFAULT = 4
-MODEL_LOOKUP_MAX_CONCURRENCY_UPPER_BOUND = 16
-MODEL_LIST_CACHE_TTL_KEY = "model_list_cache_ttl_seconds"
-MODEL_LOOKUP_MAX_CONCURRENCY_KEY = "model_lookup_max_concurrency"
-MODEL_CACHE_MAX_ENTRIES = 512
-
-
-@dataclass(frozen=True)
-class _ModelLookupConfig:
-    umo: str | None
-    cache_ttl_seconds: float
-    max_concurrency: int
-
-
-class _ModelCache:
-    def __init__(self) -> None:
-        self._store: dict[tuple[str, str | None], tuple[float, list[str]]] = {}
-
-    def get(self, provider_id: str, umo: str | None, ttl: float) -> list[str] | None:
-        if ttl <= 0:
-            return None
-        entry = self._store.get((provider_id, umo))
-        if not entry:
-            return None
-        timestamp, models = entry
-        if time.monotonic() - timestamp > ttl:
-            self._store.pop((provider_id, umo), None)
-            return None
-        return models
-
-    def set(
-        self, provider_id: str, umo: str | None, models: list[str], ttl: float
-    ) -> None:
-        if ttl <= 0:
-            return
-        self._store[(provider_id, umo)] = (time.monotonic(), list(models))
-        self._evict_if_needed()
-
-    def _evict_if_needed(self) -> None:
-        if len(self._store) <= MODEL_CACHE_MAX_ENTRIES:
-            return
-        # Drop oldest entries first when cache grows too large.
-        overflow = len(self._store) - MODEL_CACHE_MAX_ENTRIES
-        for key, _ in sorted(
-            self._store.items(),
-            key=lambda item: item[1][0],
-        )[:overflow]:
-            self._store.pop(key, None)
-
-    def invalidate(
-        self, provider_id: str | None = None, *, umo: str | None = None
-    ) -> None:
-        if provider_id is None:
-            self._store.clear()
-            return
-        if umo is not None:
-            self._store.pop((provider_id, umo), None)
-            return
-        stale_keys = [
-            cache_key for cache_key in self._store if cache_key[0] == provider_id
-        ]
-        for cache_key in stale_keys:
-            self._store.pop(cache_key, None)
 
 
 class ProviderCommands:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
-        self._model_cache = _ModelCache()
-        self._register_provider_change_hook()
-
-    def _register_provider_change_hook(self) -> None:
-        set_change_callback = getattr(
-            self.context.provider_manager,
-            "set_provider_change_callback",
-            None,
-        )
-        if callable(set_change_callback):
-            set_change_callback(self._on_provider_manager_changed)
-            return
-        register_change_hook = getattr(
-            self.context.provider_manager,
-            "register_provider_change_hook",
-            None,
-        )
-        if callable(register_change_hook):
-            register_change_hook(self._on_provider_manager_changed)
-
-    def invalidate_provider_models_cache(
-        self, provider_id: str | None = None, *, umo: str | None = None
-    ) -> None:
-        """Public hook for cache invalidation on external provider config changes."""
-        self._model_cache.invalidate(provider_id, umo=umo)
-
-    def _on_provider_manager_changed(
-        self,
-        provider_id: str,
-        provider_type: ProviderType,
-        umo: str | None,
-    ) -> None:
-        if provider_type == ProviderType.CHAT_COMPLETION:
-            self.invalidate_provider_models_cache(provider_id, umo=umo)
-
-    def _get_provider_settings(self, umo: str | None) -> dict:
-        if not umo:
-            return {}
-        try:
-            return self.context.get_config(umo).get("provider_settings", {}) or {}
-        except Exception as e:
-            logger.debug(
-                "读取 provider_settings 失败，使用默认值: %s",
-                safe_error("", e),
-            )
-            return {}
-
-    def _get_model_cache_ttl(self, umo: str | None) -> float:
-        settings = self._get_provider_settings(umo)
-        raw = settings.get(
-            MODEL_LIST_CACHE_TTL_KEY,
-            MODEL_LIST_CACHE_TTL_SECONDS_DEFAULT,
-        )
-        try:
-            return max(float(raw), 0.0)
-        except Exception as e:
-            logger.debug(
-                "读取 %s 失败，回退默认值 %r: %s",
-                MODEL_LIST_CACHE_TTL_KEY,
-                MODEL_LIST_CACHE_TTL_SECONDS_DEFAULT,
-                safe_error("", e),
-            )
-            return MODEL_LIST_CACHE_TTL_SECONDS_DEFAULT
-
-    def _get_model_lookup_concurrency(self, umo: str | None) -> int:
-        settings = self._get_provider_settings(umo)
-        raw = settings.get(
-            MODEL_LOOKUP_MAX_CONCURRENCY_KEY,
-            MODEL_LOOKUP_MAX_CONCURRENCY_DEFAULT,
-        )
-        try:
-            value = int(raw)
-        except Exception as e:
-            logger.debug(
-                "读取 %s 失败，回退默认值 %r: %s",
-                MODEL_LOOKUP_MAX_CONCURRENCY_KEY,
-                MODEL_LOOKUP_MAX_CONCURRENCY_DEFAULT,
-                safe_error("", e),
-            )
-            value = MODEL_LOOKUP_MAX_CONCURRENCY_DEFAULT
-        return min(max(value, 1), MODEL_LOOKUP_MAX_CONCURRENCY_UPPER_BOUND)
-
-    def _get_model_lookup_config(self, umo: str | None) -> _ModelLookupConfig:
-        return _ModelLookupConfig(
-            umo=umo,
-            cache_ttl_seconds=self._get_model_cache_ttl(umo),
-            max_concurrency=self._get_model_lookup_concurrency(umo),
-        )
-
-    def _resolve_model_name(
-        self,
-        model_name: str,
-        models: Sequence[str],
-    ) -> str | None:
-        """Resolve model name with precedence:
-        exact > case-insensitive > provider-qualified suffix.
-        """
-        requested = model_name.strip()
-        if not requested:
-            return None
-
-        requested_norm = requested.casefold()
-
-        # exact / case-insensitive match
-        for candidate in models:
-            if candidate == requested or candidate.casefold() == requested_norm:
-                return candidate
-
-        # provider-qualified suffix match:
-        # e.g. candidate `openai/gpt-4o` should match requested `gpt-4o`.
-        for candidate in models:
-            cand_norm = candidate.casefold()
-            if cand_norm.endswith(f"/{requested_norm}") or cand_norm.endswith(
-                f":{requested_norm}"
-            ):
-                return candidate
-
-        return None
-
-    def _apply_model(
-        self, prov: Provider, model_name: str, *, umo: str | None = None
-    ) -> str:
-        prov.set_model(model_name)
-        self.invalidate_provider_models_cache(prov.meta().id, umo=umo)
-        return f"切换模型成功。当前提供商: [{prov.meta().id}] 当前模型: [{prov.get_model()}]"
-
-    async def _get_provider_models(
-        self,
-        provider: Provider,
-        *,
-        config: _ModelLookupConfig,
-        use_cache: bool = True,
-    ) -> list[str]:
-        provider_id = provider.meta().id
-        ttl_seconds = config.cache_ttl_seconds
-        umo = config.umo
-        if use_cache:
-            cached = self._model_cache.get(provider_id, umo, ttl_seconds)
-            if cached is not None:
-                return cached
-
-        models = list(await provider.get_models())
-        if use_cache:
-            self._model_cache.set(provider_id, umo, models, ttl_seconds)
-        return models
-
-    async def _get_models_or_reply_error(
-        self,
-        message: AstrMessageEvent,
-        prov: Provider,
-        config: _ModelLookupConfig,
-        *,
-        error_prefix: str,
-        disable_t2i: bool = False,
-        warning_log: str | None = None,
-    ) -> list[str] | None:
-        try:
-            return await self._get_provider_models(prov, config=config)
-        except asyncio.CancelledError:
-            raise
-        except Exception as e:
-            if warning_log is not None:
-                logger.warning(
-                    warning_log,
-                    prov.meta().id,
-                    safe_error("", e),
-                )
-            result = MessageEventResult().message(safe_error(error_prefix, e))
-            if disable_t2i:
-                result = result.use_t2i(False)
-            message.set_result(result)
-            return None
 
     def _log_reachability_failure(
         self,
@@ -264,7 +17,7 @@ class ProviderCommands:
         provider_capability_type: ProviderType | None,
         err_code: str,
         err_reason: str,
-    ) -> None:
+    ):
         """记录不可达原因到日志。"""
         meta = provider.meta()
         logger.warning(
@@ -285,102 +38,18 @@ class ProviderCommands:
             return True, None, None
         except Exception as e:
             err_code = "TEST_FAILED"
-            err_reason = safe_error("", e)
+            err_reason = str(e)
             self._log_reachability_failure(
                 provider, provider_capability_type, err_code, err_reason
             )
             return False, err_code, err_reason
 
-    async def _find_provider_for_model(
-        self,
-        model_name: str,
-        *,
-        exclude_provider_id: str | None = None,
-        config: _ModelLookupConfig,
-        use_cache: bool = True,
-    ) -> tuple[Provider | None, str | None]:
-        all_providers = []
-        for provider in self.context.get_all_providers():
-            provider_meta = provider.meta()
-            if provider_meta.provider_type != ProviderType.CHAT_COMPLETION:
-                continue
-            if (
-                exclude_provider_id is not None
-                and provider_meta.id == exclude_provider_id
-            ):
-                continue
-            all_providers.append(provider)
-        if not all_providers:
-            return None, None
-
-        semaphore = asyncio.Semaphore(config.max_concurrency)
-
-        async def fetch_models(
-            provider: Provider,
-        ) -> tuple[Provider, list[str] | None, str | None]:
-            async with semaphore:
-                try:
-                    models = await self._get_provider_models(
-                        provider,
-                        config=config,
-                        use_cache=use_cache,
-                    )
-                    return provider, models, None
-                except asyncio.CancelledError:
-                    raise
-                except Exception as e:
-                    err = safe_error("", e)
-                    logger.debug(
-                        "跨提供商查找模型 %s 获取 %s 模型列表失败: %s",
-                        model_name,
-                        provider.meta().id,
-                        err,
-                    )
-                    return provider, None, err
-
-        results = await asyncio.gather(
-            *(fetch_models(provider) for provider in all_providers)
-        )
-        failed_provider_errors: list[tuple[str, str]] = []
-        for provider, models, err in results:
-            if err is not None:
-                failed_provider_errors.append((provider.meta().id, err))
-                continue
-            if models is None:
-                continue
-
-            matched_model_name = self._resolve_model_name(model_name, models)
-            if matched_model_name is not None:
-                return provider, matched_model_name
-
-        if failed_provider_errors and len(failed_provider_errors) == len(all_providers):
-            failed_ids = ",".join(
-                provider_id for provider_id, _ in failed_provider_errors
-            )
-            logger.error(
-                "跨提供商查找模型 %s 时，所有 %d 个提供商的 get_models() 均失败: %s。请检查配置或网络",
-                model_name,
-                len(all_providers),
-                failed_ids,
-            )
-        elif failed_provider_errors:
-            logger.debug(
-                "跨提供商查找模型 %s 时有 %d 个提供商获取模型失败: %s",
-                model_name,
-                len(failed_provider_errors),
-                ",".join(
-                    f"{provider_id}({error})"
-                    for provider_id, error in failed_provider_errors
-                ),
-            )
-        return None, None
-
     async def provider(
         self,
         event: AstrMessageEvent,
         idx: str | int | None = None,
         idx2: int | None = None,
-    ) -> None:
+    ):
         """查看或者切换 LLM Provider"""
         umo = event.unified_msg_origin
         cfg = self.context.get_config(umo).get("provider_settings", {})
@@ -423,15 +92,13 @@ class ProviderCommands:
                 id_ = meta.id
                 error_code = None
 
-                if isinstance(reachable, asyncio.CancelledError):
-                    raise reachable
                 if isinstance(reachable, Exception):
                     # 异常情况下兜底处理，避免单个 provider 导致列表失败
                     self._log_reachability_failure(
                         p,
                         None,
                         reachable.__class__.__name__,
-                        safe_error("", reachable),
+                        str(reachable),
                     )
                     reachable_flag = False
                     error_code = reachable.__class__.__name__
@@ -557,78 +224,11 @@ class ProviderCommands:
         else:
             event.set_result(MessageEventResult().message("无效的参数。"))
 
-    async def _switch_model_by_name(
-        self, message: AstrMessageEvent, model_name: str, prov: Provider
-    ) -> None:
-        model_name = model_name.strip()
-        if not model_name:
-            message.set_result(MessageEventResult().message("模型名不能为空。"))
-            return
-
-        umo = message.unified_msg_origin
-        config = self._get_model_lookup_config(umo)
-        curr_provider_id = prov.meta().id
-
-        models = await self._get_models_or_reply_error(
-            message,
-            prov,
-            config,
-            error_prefix="获取当前提供商模型列表失败: ",
-            warning_log="获取当前提供商 %s 模型列表失败，停止跨提供商查找: %s",
-        )
-        if models is None:
-            return
-
-        matched_model_name = self._resolve_model_name(model_name, models)
-        if matched_model_name is not None:
-            message.set_result(
-                MessageEventResult().message(
-                    self._apply_model(prov, matched_model_name, umo=umo)
-                ),
-            )
-            return
-
-        target_prov, matched_target_model_name = await self._find_provider_for_model(
-            model_name,
-            exclude_provider_id=curr_provider_id,
-            config=config,
-        )
-
-        if target_prov is None or matched_target_model_name is None:
-            message.set_result(
-                MessageEventResult().message(
-                    f"模型 [{model_name}] 未在任何已配置的提供商中找到，或所有提供商模型列表获取失败，请检查配置或网络后重试。",
-                ),
-            )
-            return
-
-        target_id = target_prov.meta().id
-        try:
-            await self.context.provider_manager.set_provider(
-                provider_id=target_id,
-                provider_type=ProviderType.CHAT_COMPLETION,
-                umo=umo,
-            )
-            self._apply_model(target_prov, matched_target_model_name, umo=umo)
-            message.set_result(
-                MessageEventResult().message(
-                    f"检测到模型 [{matched_target_model_name}] 属于提供商 [{target_id}]，已自动切换提供商并设置模型。",
-                ),
-            )
-        except asyncio.CancelledError:
-            raise
-        except Exception as e:
-            message.set_result(
-                MessageEventResult().message(
-                    safe_error("跨提供商切换并设置模型失败: ", e)
-                ),
-            )
-
     async def model_ls(
         self,
         message: AstrMessageEvent,
         idx_or_name: int | str | None = None,
-    ) -> None:
+    ):
         """查看或者切换模型"""
         prov = self.context.get_using_provider(message.unified_msg_origin)
         if not prov:
@@ -636,17 +236,20 @@ class ProviderCommands:
                 MessageEventResult().message("未找到任何 LLM 提供商。请先配置。"),
             )
             return
-        config = self._get_model_lookup_config(message.unified_msg_origin)
+        # 定义正则表达式匹配 API 密钥
+        api_key_pattern = re.compile(r"key=[^&'\" ]+")
 
         if idx_or_name is None:
-            models = await self._get_models_or_reply_error(
-                message,
-                prov,
-                config,
-                error_prefix="获取模型列表失败: ",
-                disable_t2i=True,
-            )
-            if models is None:
+            models = []
+            try:
+                models = await prov.get_models()
+            except BaseException as e:
+                err_msg = api_key_pattern.sub("key=***", str(e))
+                message.set_result(
+                    MessageEventResult()
+                    .message("获取模型列表失败: " + err_msg)
+                    .use_t2i(False),
+                )
                 return
             parts = ["下面列出了此模型提供商可用模型:"]
             for i, model in enumerate(models, 1):
@@ -655,45 +258,42 @@ class ProviderCommands:
             curr_model = prov.get_model() or "无"
             parts.append(f"\n当前模型: [{curr_model}]")
             parts.append(
-                "\nTips: 使用 /model <模型名/编号> 切换模型。输入模型名时可自动跨提供商查找并切换；跨提供商也可使用 /provider 切换。"
+                "\nTips: 使用 /model <模型名/编号>，即可实时更换模型。如目标模型不存在于上表，请输入模型名。"
             )
 
             ret = "".join(parts)
             message.set_result(MessageEventResult().message(ret).use_t2i(False))
         elif isinstance(idx_or_name, int):
-            models = await self._get_models_or_reply_error(
-                message,
-                prov,
-                config,
-                error_prefix="获取模型列表失败: ",
-            )
-            if models is None:
+            models = []
+            try:
+                models = await prov.get_models()
+            except BaseException as e:
+                message.set_result(
+                    MessageEventResult().message("获取模型列表失败: " + str(e)),
+                )
                 return
             if idx_or_name > len(models) or idx_or_name < 1:
                 message.set_result(MessageEventResult().message("模型序号错误。"))
             else:
                 try:
                     new_model = models[idx_or_name - 1]
+                    prov.set_model(new_model)
+                except BaseException as e:
                     message.set_result(
-                        MessageEventResult().message(
-                            self._apply_model(
-                                prov,
-                                new_model,
-                                umo=message.unified_msg_origin,
-                            )
-                        ),
+                        MessageEventResult().message("切换模型未知错误: " + str(e)),
                     )
-                except Exception as e:
-                    message.set_result(
-                        MessageEventResult().message(
-                            safe_error("切换模型未知错误: ", e)
-                        ),
-                    )
-                    return
+                message.set_result(
+                    MessageEventResult().message(
+                        f"切换模型成功。当前提供商: [{prov.meta().id}] 当前模型: [{prov.get_model()}]",
+                    ),
+                )
         else:
-            await self._switch_model_by_name(message, idx_or_name, prov)
+            prov.set_model(idx_or_name)
+            message.set_result(
+                MessageEventResult().message(f"切换模型到 {prov.get_model()}。"),
+            )
 
-    async def key(self, message: AstrMessageEvent, index: int | None = None) -> None:
+    async def key(self, message: AstrMessageEvent, index: int | None = None):
         prov = self.context.get_using_provider(message.unified_msg_origin)
         if not prov:
             message.set_result(
@@ -722,15 +322,8 @@ class ProviderCommands:
                 try:
                     new_key = keys_data[index - 1]
                     prov.set_key(new_key)
-                    self.invalidate_provider_models_cache(
-                        prov.meta().id,
-                        umo=message.unified_msg_origin,
-                    )
-                    message.set_result(MessageEventResult().message("切换 Key 成功。"))
-                except Exception as e:
+                except BaseException as e:
                     message.set_result(
-                        MessageEventResult().message(
-                            safe_error("切换 Key 未知错误: ", e)
-                        ),
+                        MessageEventResult().message(f"切换 Key 未知错误: {e!s}"),
                     )
-                    return
+                message.set_result(MessageEventResult().message("切换 Key 成功。"))

astrbot/builtin_stars/builtin_commands/commands/setunset.py

@@ -3,10 +3,10 @@ from astrbot.api.event import AstrMessageEvent, MessageEventResult
 
 
 class SetUnsetCommands:
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def set_variable(self, event: AstrMessageEvent, key: str, value: str) -> None:
+    async def set_variable(self, event: AstrMessageEvent, key: str, value: str):
         """设置会话变量"""
         uid = event.unified_msg_origin
         session_var = await sp.session_get(uid, "session_variables", {})
@@ -19,7 +19,7 @@ class SetUnsetCommands:
             ),
         )
 
-    async def unset_variable(self, event: AstrMessageEvent, key: str) -> None:
+    async def unset_variable(self, event: AstrMessageEvent, key: str):
         """移除会话变量"""
         uid = event.unified_msg_origin
         session_var = await sp.session_get(uid, "session_variables", {})

astrbot/builtin_stars/builtin_commands/commands/sid.py

@@ -7,10 +7,10 @@ from astrbot.api.event import AstrMessageEvent, MessageEventResult
 class SIDCommand:
     """会话ID命令类"""
 
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def sid(self, event: AstrMessageEvent) -> None:
+    async def sid(self, event: AstrMessageEvent):
         """获取消息来源信息"""
         sid = event.unified_msg_origin
         user_id = str(event.get_sender_id())

astrbot/builtin_stars/builtin_commands/commands/t2i.py

@@ -7,10 +7,10 @@ from astrbot.api.event import AstrMessageEvent, MessageEventResult
 class T2ICommand:
     """文本转图片命令类"""
 
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def t2i(self, event: AstrMessageEvent) -> None:
+    async def t2i(self, event: AstrMessageEvent):
         """开关文本转图片"""
         config = self.context.get_config(umo=event.unified_msg_origin)
         if config["t2i"]:

astrbot/builtin_stars/builtin_commands/commands/tts.py

@@ -8,10 +8,10 @@ from astrbot.core.star.session_llm_manager import SessionServiceManager
 class TTSCommand:
     """文本转语音命令类"""
 
-    def __init__(self, context: star.Context) -> None:
+    def __init__(self, context: star.Context):
         self.context = context
 
-    async def tts(self, event: AstrMessageEvent) -> None:
+    async def tts(self, event: AstrMessageEvent):
         """开关文本转语音（会话级别）"""
         umo = event.unified_msg_origin
         ses_tts = await SessionServiceManager.is_tts_enabled_for_session(umo)

astrbot/builtin_stars/builtin_commands/main.py

@@ -35,84 +35,84 @@ class Main(star.Star):
         self.sid_c = SIDCommand(self.context)
 
     @filter.command("help")
-    async def help(self, event: AstrMessageEvent) -> None:
+    async def help(self, event: AstrMessageEvent):
         """查看帮助"""
         await self.help_c.help(event)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("llm")
-    async def llm(self, event: AstrMessageEvent) -> None:
+    async def llm(self, event: AstrMessageEvent):
         """开启/关闭 LLM"""
         await self.llm_c.llm(event)
 
     @filter.command_group("plugin")
-    def plugin(self) -> None:
+    def plugin(self):
         """插件管理"""
 
     @plugin.command("ls")
-    async def plugin_ls(self, event: AstrMessageEvent) -> None:
+    async def plugin_ls(self, event: AstrMessageEvent):
         """获取已经安装的插件列表。"""
         await self.plugin_c.plugin_ls(event)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @plugin.command("off")
-    async def plugin_off(self, event: AstrMessageEvent, plugin_name: str = "") -> None:
+    async def plugin_off(self, event: AstrMessageEvent, plugin_name: str = ""):
         """禁用插件"""
         await self.plugin_c.plugin_off(event, plugin_name)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @plugin.command("on")
-    async def plugin_on(self, event: AstrMessageEvent, plugin_name: str = "") -> None:
+    async def plugin_on(self, event: AstrMessageEvent, plugin_name: str = ""):
         """启用插件"""
         await self.plugin_c.plugin_on(event, plugin_name)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @plugin.command("get")
-    async def plugin_get(self, event: AstrMessageEvent, plugin_repo: str = "") -> None:
+    async def plugin_get(self, event: AstrMessageEvent, plugin_repo: str = ""):
         """安装插件"""
         await self.plugin_c.plugin_get(event, plugin_repo)
 
     @plugin.command("help")
-    async def plugin_help(self, event: AstrMessageEvent, plugin_name: str = "") -> None:
+    async def plugin_help(self, event: AstrMessageEvent, plugin_name: str = ""):
         """获取插件帮助"""
         await self.plugin_c.plugin_help(event, plugin_name)
 
     @filter.command("t2i")
-    async def t2i(self, event: AstrMessageEvent) -> None:
+    async def t2i(self, event: AstrMessageEvent):
         """开关文本转图片"""
         await self.t2i_c.t2i(event)
 
     @filter.command("tts")
-    async def tts(self, event: AstrMessageEvent) -> None:
+    async def tts(self, event: AstrMessageEvent):
         """开关文本转语音（会话级别）"""
         await self.tts_c.tts(event)
 
     @filter.command("sid")
-    async def sid(self, event: AstrMessageEvent) -> None:
+    async def sid(self, event: AstrMessageEvent):
         """获取会话 ID 和 管理员 ID"""
         await self.sid_c.sid(event)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("op")
-    async def op(self, event: AstrMessageEvent, admin_id: str = "") -> None:
+    async def op(self, event: AstrMessageEvent, admin_id: str = ""):
         """授权管理员。op <admin_id>"""
         await self.admin_c.op(event, admin_id)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("deop")
-    async def deop(self, event: AstrMessageEvent, admin_id: str) -> None:
+    async def deop(self, event: AstrMessageEvent, admin_id: str):
         """取消授权管理员。deop <admin_id>"""
         await self.admin_c.deop(event, admin_id)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("wl")
-    async def wl(self, event: AstrMessageEvent, sid: str = "") -> None:
+    async def wl(self, event: AstrMessageEvent, sid: str = ""):
         """添加白名单。wl <sid>"""
         await self.admin_c.wl(event, sid)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("dwl")
-    async def dwl(self, event: AstrMessageEvent, sid: str) -> None:
+    async def dwl(self, event: AstrMessageEvent, sid: str):
         """删除白名单。dwl <sid>"""
         await self.admin_c.dwl(event, sid)
 
@@ -123,96 +123,89 @@ class Main(star.Star):
         event: AstrMessageEvent,
         idx: str | int | None = None,
         idx2: int | None = None,
-    ) -> None:
+    ):
         """查看或者切换 LLM Provider"""
         await self.provider_c.provider(event, idx, idx2)
 
     @filter.command("reset")
-    async def reset(self, message: AstrMessageEvent) -> None:
+    async def reset(self, message: AstrMessageEvent):
         """重置 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(
         self,
         message: AstrMessageEvent,
         idx_or_name: int | str | None = None,
-    ) -> None:
+    ):
         """查看或者切换模型"""
         await self.provider_c.model_ls(message, idx_or_name)
 
     @filter.command("history")
-    async def his(self, message: AstrMessageEvent, page: int = 1) -> None:
+    async def his(self, message: AstrMessageEvent, page: int = 1):
         """查看对话记录"""
         await self.conversation_c.his(message, page)
 
     @filter.command("ls")
-    async def convs(self, message: AstrMessageEvent, page: int = 1) -> None:
+    async def convs(self, message: AstrMessageEvent, page: int = 1):
         """查看对话列表"""
         await self.conversation_c.convs(message, page)
 
     @filter.command("new")
-    async def new_conv(self, message: AstrMessageEvent) -> None:
+    async def new_conv(self, message: AstrMessageEvent):
         """创建新对话"""
         await self.conversation_c.new_conv(message)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("groupnew")
-    async def groupnew_conv(self, message: AstrMessageEvent, sid: str) -> None:
+    async def groupnew_conv(self, message: AstrMessageEvent, sid: str):
         """创建新群聊对话"""
         await self.conversation_c.groupnew_conv(message, sid)
 
     @filter.command("switch")
-    async def switch_conv(
-        self, message: AstrMessageEvent, index: int | None = None
-    ) -> None:
+    async def switch_conv(self, message: AstrMessageEvent, index: int | None = None):
         """通过 /ls 前面的序号切换对话"""
         await self.conversation_c.switch_conv(message, index)
 
     @filter.command("rename")
-    async def rename_conv(self, message: AstrMessageEvent, new_name: str) -> None:
+    async def rename_conv(self, message: AstrMessageEvent, new_name: str):
         """重命名对话"""
         await self.conversation_c.rename_conv(message, new_name)
 
     @filter.command("del")
-    async def del_conv(self, message: AstrMessageEvent) -> None:
+    async def del_conv(self, message: AstrMessageEvent):
         """删除当前对话"""
         await self.conversation_c.del_conv(message)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("key")
-    async def key(self, message: AstrMessageEvent, index: int | None = None) -> None:
+    async def key(self, message: AstrMessageEvent, index: int | None = None):
         """查看或者切换 Key"""
         await self.provider_c.key(message, index)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("persona")
-    async def persona(self, message: AstrMessageEvent) -> None:
+    async def persona(self, message: AstrMessageEvent):
         """查看或者切换 Persona"""
         await self.persona_c.persona(message)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("dashboard_update")
-    async def update_dashboard(self, event: AstrMessageEvent) -> None:
+    async def update_dashboard(self, event: AstrMessageEvent):
         """更新管理面板"""
         await self.admin_c.update_dashboard(event)
 
     @filter.command("set")
-    async def set_variable(self, event: AstrMessageEvent, key: str, value: str) -> None:
+    async def set_variable(self, event: AstrMessageEvent, key: str, value: str):
         await self.setunset_c.set_variable(event, key, value)
 
     @filter.command("unset")
-    async def unset_variable(self, event: AstrMessageEvent, key: str) -> None:
+    async def unset_variable(self, event: AstrMessageEvent, key: str):
         await self.setunset_c.unset_variable(event, key)
 
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("alter_cmd", alias={"alter"})
-    async def alter_cmd(self, event: AstrMessageEvent) -> None:
+    async def alter_cmd(self, event: AstrMessageEvent):
         """修改命令权限"""
         await self.alter_cmd_c.alter_cmd(event)

astrbot/builtin_stars/session_controller/main.py

@@ -17,11 +17,11 @@ from astrbot.core.utils.session_waiter import (
 class Main(Star):
     """会话控制"""
 
-    def __init__(self, context: Context) -> None:
+    def __init__(self, context: Context):
         super().__init__(context)
 
     @filter.event_message_type(filter.EventMessageType.ALL, priority=maxsize)
-    async def handle_session_control_agent(self, event: AstrMessageEvent) -> None:
+    async def handle_session_control_agent(self, event: AstrMessageEvent):
         """会话控制代理"""
         for session_filter in FILTERS:
             session_id = session_filter.filter(event)
@@ -90,7 +90,7 @@ class Main(Star):
                     async def empty_mention_waiter(
                         controller: SessionController,
                         event: AstrMessageEvent,
-                    ) -> None:
+                    ):
                         event.message_obj.message.insert(
                             0,
                             Comp.At(qq=event.get_self_id(), name=event.get_self_id()),

astrbot/builtin_stars/web_searcher/engines/__init__.py

@@ -49,7 +49,7 @@ class SearchEngine:
     def _set_selector(self, selector: str) -> str:
         raise NotImplementedError
 
-    async def _get_next_page(self, query: str) -> str:
+    def _get_next_page(self, query: str):
         raise NotImplementedError
 
     async def _get_html(self, url: str, data: dict | None = None) -> str:

astrbot/builtin_stars/web_searcher/main.py

@@ -8,7 +8,7 @@ from bs4 import BeautifulSoup
 from readability import Document
 
 from astrbot.api import AstrBotConfig, llm_tool, logger, sp, star
-from astrbot.api.event import AstrMessageEvent, filter
+from astrbot.api.event import AstrMessageEvent, MessageEventResult, filter
 from astrbot.api.provider import ProviderRequest
 from astrbot.core.provider.func_tool_manager import FunctionToolManager
 
@@ -23,7 +23,6 @@ class Main(star.Star):
         "fetch_url",
         "web_search_tavily",
         "tavily_extract_web_page",
-        "web_search_bocha",
     ]
 
     def __init__(self, context: star.Context) -> None:
@@ -31,9 +30,6 @@ class Main(star.Star):
         self.tavily_key_index = 0
         self.tavily_key_lock = asyncio.Lock()
 
-        self.bocha_key_index = 0
-        self.bocha_key_lock = asyncio.Lock()
-
         # 将 str 类型的 key 迁移至 list[str]，并保存
         cfg = self.context.get_config()
         provider_settings = cfg.get("provider_settings")
@@ -49,14 +45,6 @@ class Main(star.Star):
                     provider_settings["websearch_tavily_key"] = []
                 cfg.save_config()
 
-            bocha_key = provider_settings.get("websearch_bocha_key")
-            if isinstance(bocha_key, str):
-                if bocha_key:
-                    provider_settings["websearch_bocha_key"] = [bocha_key]
-                else:
-                    provider_settings["websearch_bocha_key"] = []
-                cfg.save_config()
-
         self.bing_search = Bing()
         self.sogo_search = Sogo()
         self.baidu_initialized = False
@@ -70,7 +58,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) as response:
+            async with session.get(url, headers=header, timeout=6) as response:
                 html = await response.text(encoding="utf-8")
                 doc = Document(html)
                 ret = doc.summary(html_partial=True)
@@ -151,6 +139,7 @@ class Main(star.Star):
                 url,
                 json=payload,
                 headers=header,
+                timeout=6,
             ) as response:
                 if response.status != 200:
                     reason = await response.text()
@@ -182,6 +171,7 @@ class Main(star.Star):
                 url,
                 json=payload,
                 headers=header,
+                timeout=6,
             ) as response:
                 if response.status != 200:
                     reason = await response.text()
@@ -196,6 +186,15 @@ class Main(star.Star):
                     )
                 return results
 
+    @filter.command("websearch")
+    async def websearch(self, event: AstrMessageEvent, oper: str | None = None):
+        """网页搜索指令（已废弃）"""
+        event.set_result(
+            MessageEventResult().message(
+                "此指令已经被废弃，请在 WebUI 中开启或关闭网页搜索功能。",
+            ),
+        )
+
     @llm_tool(name="web_search")
     async def search_from_search_engine(
         self,
@@ -235,7 +234,7 @@ class Main(star.Star):
 
         return ret
 
-    async def ensure_baidu_ai_search_mcp(self, umo: str | None = None) -> None:
+    async def ensure_baidu_ai_search_mcp(self, umo: str | None = None):
         if self.baidu_initialized:
             return
         cfg = self.context.get_config(umo=umo)
@@ -254,7 +253,7 @@ class Main(star.Star):
                 "transport": "sse",
                 "url": f"http://appbuilder.baidu.com/v2/ai_search/mcp/sse?api_key={key}",
                 "headers": {},
-                "timeout": 600,
+                "timeout": 30,
             },
         )
         self.baidu_initialized = True
@@ -342,7 +341,7 @@ class Main(star.Star):
                 }
             )
             if result.favicon:
-                sp.temporary_cache["_ws_favicon"][result.url] = result.favicon
+                sp.temorary_cache["_ws_favicon"][result.url] = result.favicon
         # ret = "\n".join(ret_ls)
         ret = json.dumps({"results": ret_ls}, ensure_ascii=False)
         return ret
@@ -383,166 +382,12 @@ class Main(star.Star):
             return "Error: Tavily web searcher does not return any results."
         return ret
 
-    async def _get_bocha_key(self, cfg: AstrBotConfig) -> str:
-        """并发安全的从列表中获取并轮换BoCha API密钥。"""
-        bocha_keys = cfg.get("provider_settings", {}).get("websearch_bocha_key", [])
-        if not bocha_keys:
-            raise ValueError("错误：BoCha API密钥未在AstrBot中配置。")
-
-        async with self.bocha_key_lock:
-            key = bocha_keys[self.bocha_key_index]
-            self.bocha_key_index = (self.bocha_key_index + 1) % len(bocha_keys)
-            return key
-
-    async def _web_search_bocha(
-        self,
-        cfg: AstrBotConfig,
-        payload: dict,
-    ) -> list[SearchResult]:
-        """使用 BoCha 搜索引擎进行搜索"""
-        bocha_key = await self._get_bocha_key(cfg)
-        url = "https://api.bochaai.com/v1/web-search"
-        header = {
-            "Authorization": f"Bearer {bocha_key}",
-            "Content-Type": "application/json",
-        }
-        async with aiohttp.ClientSession(trust_env=True) as session:
-            async with session.post(
-                url,
-                json=payload,
-                headers=header,
-            ) as response:
-                if response.status != 200:
-                    reason = await response.text()
-                    raise Exception(
-                        f"BoCha web search failed: {reason}, status: {response.status}",
-                    )
-                data = await response.json()
-                data = data["data"]["webPages"]["value"]
-                results = []
-                for item in data:
-                    result = SearchResult(
-                        title=item.get("name"),
-                        url=item.get("url"),
-                        snippet=item.get("snippet"),
-                        favicon=item.get("siteIcon"),
-                    )
-                    results.append(result)
-                return results
-
-    @llm_tool("web_search_bocha")
-    async def search_from_bocha(
-        self,
-        event: AstrMessageEvent,
-        query: str,
-        freshness: str = "noLimit",
-        summary: bool = False,
-        include: str = "",
-        exclude: str = "",
-        count: int = 10,
-    ) -> str:
-        """
-        A web search tool based on Bocha Search API, used to retrieve web pages
-        related to the user's query.
-
-        Args:
-            query (string): Required. User's search query.
-
-            freshness (string): Optional. Specifies the time range of the search.
-                Supported values:
-                - "noLimit": No time limit (default, recommended).
-                - "oneDay": Within one day.
-                - "oneWeek": Within one week.
-                - "oneMonth": Within one month.
-                - "oneYear": Within one year.
-                - "YYYY-MM-DD..YYYY-MM-DD": Search within a specific date range.
-                  Example: "2025-01-01..2025-04-06".
-                - "YYYY-MM-DD": Search on a specific date.
-                  Example: "2025-04-06".
-                It is recommended to use "noLimit", as the search algorithm will
-                automatically optimize time relevance. Manually restricting the
-                time range may result in no search results.
-
-            summary (boolean): Optional. Whether to include a text summary
-                for each search result.
-                - True: Include summary.
-                - False: Do not include summary (default).
-
-            include (string): Optional. Specifies the domains to include in
-                the search. Multiple domains can be separated by "|" or ",".
-                A maximum of 100 domains is allowed.
-                Examples:
-                - "qq.com"
-                - "qq.com|m.163.com"
-
-            exclude (string): Optional. Specifies the domains to exclude from
-                the search. Multiple domains can be separated by "|" or ",".
-                A maximum of 100 domains is allowed.
-                Examples:
-                - "qq.com"
-                - "qq.com|m.163.com"
-
-            count (number): Optional. Number of search results to return.
-                - Range: 1–50
-                - Default: 10
-                The actual number of returned results may be less than the
-                specified count.
-        """
-        logger.info(f"web_searcher - search_from_bocha: {query}")
-        cfg = self.context.get_config(umo=event.unified_msg_origin)
-        # websearch_link = cfg["provider_settings"].get("web_search_link", False)
-        if not cfg.get("provider_settings", {}).get("websearch_bocha_key", []):
-            raise ValueError("Error: BoCha API key is not configured in AstrBot.")
-
-        # build payload
-        payload = {
-            "query": query,
-            "count": count,
-        }
-
-        # freshness：时间范围
-        if freshness:
-            payload["freshness"] = freshness
-
-        # 是否返回摘要
-        payload["summary"] = summary
-
-        # include：限制搜索域
-        if include:
-            payload["include"] = include
-
-        # exclude：排除搜索域
-        if exclude:
-            payload["exclude"] = exclude
-
-        results = await self._web_search_bocha(cfg, payload)
-        if not results:
-            return "Error: BoCha web searcher does not return any results."
-
-        ret_ls = []
-        ref_uuid = str(uuid.uuid4())[:4]
-        for idx, result in enumerate(results, 1):
-            index = f"{ref_uuid}.{idx}"
-            ret_ls.append(
-                {
-                    "title": f"{result.title}",
-                    "url": f"{result.url}",
-                    "snippet": f"{result.snippet}",
-                    "index": index,
-                }
-            )
-            if result.favicon:
-                sp.temporary_cache["_ws_favicon"][result.url] = result.favicon
-        # ret = "\n".join(ret_ls)
-        ret = json.dumps({"results": ret_ls}, ensure_ascii=False)
-        return ret
-
     @filter.on_llm_request(priority=-10000)
     async def edit_web_search_tools(
         self,
         event: AstrMessageEvent,
         req: ProviderRequest,
-    ) -> None:
+    ):
         """Get the session conversation for the given event."""
         cfg = self.context.get_config(umo=event.unified_msg_origin)
         prov_settings = cfg.get("provider_settings", {})
@@ -574,7 +419,6 @@ class Main(star.Star):
             tool_set.remove_tool("web_search_tavily")
             tool_set.remove_tool("tavily_extract_web_page")
             tool_set.remove_tool("AIsearch")
-            tool_set.remove_tool("web_search_bocha")
         elif provider == "tavily":
             web_search_tavily = func_tool_mgr.get_func("web_search_tavily")
             tavily_extract_web_page = func_tool_mgr.get_func("tavily_extract_web_page")
@@ -585,7 +429,6 @@ class Main(star.Star):
             tool_set.remove_tool("web_search")
             tool_set.remove_tool("fetch_url")
             tool_set.remove_tool("AIsearch")
-            tool_set.remove_tool("web_search_bocha")
         elif provider == "baidu_ai_search":
             try:
                 await self.ensure_baidu_ai_search_mcp(event.unified_msg_origin)
@@ -597,15 +440,5 @@ class Main(star.Star):
                 tool_set.remove_tool("fetch_url")
                 tool_set.remove_tool("web_search_tavily")
                 tool_set.remove_tool("tavily_extract_web_page")
-                tool_set.remove_tool("web_search_bocha")
             except Exception as e:
                 logger.error(f"Cannot Initialize Baidu AI Search MCP Server: {e}")
-        elif provider == "bocha":
-            web_search_bocha = func_tool_mgr.get_func("web_search_bocha")
-            if web_search_bocha:
-                tool_set.add_tool(web_search_bocha)
-            tool_set.remove_tool("web_search")
-            tool_set.remove_tool("fetch_url")
-            tool_set.remove_tool("AIsearch")
-            tool_set.remove_tool("web_search_tavily")
-            tool_set.remove_tool("tavily_extract_web_page")

astrbot/cli/__init__.py

@@ -1,6 +1 @@
-from importlib import metadata
-
-try:
-    __version__ = metadata.version("AstrBot")
-except metadata.PackageNotFoundError:
-    __version__ = "unknown"
+__version__ = "4.14.4"

astrbot/cli/__main__.py

@@ -1,11 +1,11 @@
-"""AstrBot CLI entry point"""
+"""AstrBot CLI入口"""
 
 import sys
 
 import click
 
 from . import __version__
-from .commands import bk, conf, init, plug, run, uninstall
+from .commands import conf, init, plug, run
 
 logo_tmpl = r"""
      ___           _______.___________..______      .______     ______   .___________.
@@ -29,23 +29,23 @@ def cli() -> None:
 @click.command()
 @click.argument("command_name", required=False, type=str)
 def help(command_name: str | None) -> None:
-    """Display help information for commands
+    """显示命令的帮助信息
 
-    If COMMAND_NAME is provided, display detailed help for that command.
-    Otherwise, display general help information.
+    如果提供了 COMMAND_NAME，则显示该命令的详细帮助信息。
+    否则，显示通用帮助信息。
     """
     ctx = click.get_current_context()
     if command_name:
-        # Find the specified command
+        # 查找指定命令
         command = cli.get_command(ctx, command_name)
         if command:
-            # Display help for the specific command
+            # 显示特定命令的帮助信息
             click.echo(command.get_help(ctx))
         else:
             click.echo(f"Unknown command: {command_name}")
             sys.exit(1)
     else:
-        # Display general help information
+        # 显示通用帮助信息
         click.echo(cli.get_help(ctx))
 
 
@@ -54,8 +54,6 @@ cli.add_command(run)
 cli.add_command(help)
 cli.add_command(plug)
 cli.add_command(conf)
-cli.add_command(uninstall)
-cli.add_command(bk)
 
 if __name__ == "__main__":
     cli()

astrbot/cli/commands/__init__.py

@@ -1,8 +1,6 @@
-from .cmd_bk import bk
 from .cmd_conf import conf
 from .cmd_init import init
 from .cmd_plug import plug
 from .cmd_run import run
-from .cmd_uninstall import uninstall
 
-__all__ = ["conf", "init", "plug", "run", "uninstall", "bk"]
+__all__ = ["conf", "init", "plug", "run"]

astrbot/cli/commands/cmd_bk.py

@@ -1,376 +0,0 @@
-import asyncio
-import hashlib
-import shutil
-import subprocess
-from pathlib import Path
-
-import click
-
-from astrbot.core import astrbot_config, db_helper
-from astrbot.core.backup import AstrBotExporter, AstrBotImporter
-
-# Try importing KnowledgeBaseManager to support KB backup
-try:
-    from astrbot.core.knowledge.kb_manager import KnowledgeBaseManager
-except ImportError:
-    try:
-        from astrbot.core.knowledge_base.kb_manager import KnowledgeBaseManager
-    except ImportError:
-        KnowledgeBaseManager = None
-
-
-async def _get_kb_manager():
-    if KnowledgeBaseManager is None:
-        return None
-
-    try:
-        # Best effort initialization
-        kb_mgr = KnowledgeBaseManager(astrbot_config, db_helper)
-        # If there are async load methods, we might need to call them
-        if hasattr(kb_mgr, "load_kbs_from_db"):
-            await kb_mgr.load_kbs_from_db()
-        elif hasattr(kb_mgr, "load_all"):
-            await kb_mgr.load_all()
-        return kb_mgr
-    except Exception:
-        # If KB manager fails to load (e.g. missing dependencies), return None
-        # so we can still backup other data
-        return None
-
-
-@click.group(name="bk")
-def bk():
-    """Backup management (Export/Import)"""
-    pass
-
-
-@bk.command(name="export")
-@click.option("--output", "-o", help="Output directory", default=None)
-@click.option(
-    "--gpg-sign", "-S", is_flag=True, help="Sign backup with GPG default private key"
-)
-@click.option(
-    "--gpg-encrypt",
-    "-E",
-    help="Encrypt for GPG recipient (Asymmetric)",
-    metavar="RECIPIENT",
-)
-@click.option(
-    "--gpg-symmetric", "-C", is_flag=True, help="Encrypt with symmetric cipher (GPG)"
-)
-@click.option(
-    "--digest",
-    "-d",
-    type=click.Choice(["md5", "sha1", "sha256", "sha512"]),
-    help="Generate digital digest",
-)
-def export_data(
-    output: str | None,
-    gpg_sign: bool,
-    gpg_encrypt: str | None,
-    gpg_symmetric: bool,
-    digest: str | None,
-):
-    """Export all AstrBot data to a backup archive.
-
-    If any GPG option (-S, -E, -C) is used, the output file will be processed by GPG
-    and saved with a .gpg extension.
-
-    Examples:
-
-    \b
-    1. Standard Export:
-       astrbot bk export
-       -> Generates a plain .zip file.
-
-    \b
-    2. Signed Backup (Integrity Check):
-       astrbot bk export -S
-       -> Generates a .zip.gpg file containing the backup and your signature.
-       -> NOT ENCRYPTED, but packaged in OpenPGP format.
-       -> Use 'astrbot bk import' or 'gpg --verify' to check integrity.
-
-    \b
-    3. Password Protected (Symmetric Encryption):
-       astrbot bk export -C
-       -> Generates an encrypted .zip.gpg file.
-       -> Prompts for a passphrase.
-       -> Only accessible with the passphrase.
-
-    \b
-    4. Encrypted for Recipient (Asymmetric Encryption):
-       astrbot bk export -E "alice@example.com"
-       -> Generates an encrypted .zip.gpg file for Alice.
-       -> Only Alice's private key can decrypt it.
-
-    \b
-    5. Signed and Encrypted with Digest:
-       astrbot bk export -S -E "bob@example.com" -d sha256
-       -> Signs, encrypts for Bob, and generates a SHA256 checksum file.
-    """
-
-    # Handle case where -E consumes the next flag (e.g. -E -S)
-    if gpg_encrypt and gpg_encrypt.startswith("-"):
-        consumed_flag = gpg_encrypt
-        click.echo(
-            click.style(
-                f"Warning: Flag '{consumed_flag}' was interpreted as the recipient for -E.",
-                fg="yellow",
-            )
-        )
-
-        # Recover flags
-        if consumed_flag == "-S":
-            gpg_sign = True
-            click.echo("Recovered flag -S (Sign).")
-        elif consumed_flag == "-C":
-            gpg_symmetric = True
-            click.echo("Recovered flag -C (Symmetric).")
-
-        # Prompt for the actual recipient
-        gpg_encrypt = click.prompt("Please enter the GPG recipient (email or key ID)")
-
-    async def _run():
-        if gpg_sign or gpg_encrypt or gpg_symmetric:
-            if not shutil.which("gpg"):
-                raise click.ClickException(
-                    "GPG tool not found. Please install GnuPG to use encryption/signing features."
-                )
-
-        kb_mgr = await _get_kb_manager()
-        exporter = AstrBotExporter(db_helper, kb_mgr)
-
-        async def on_progress(stage, current, total, message):
-            click.echo(f"[{stage}] {message}")
-
-        try:
-            path_str = await exporter.export_all(output, progress_callback=on_progress)
-            final_path = Path(path_str)
-            click.echo(
-                click.style(f"\nRaw backup exported to: {final_path}", fg="green")
-            )
-
-            # GPG Operations
-            if gpg_sign or gpg_encrypt or gpg_symmetric:
-                # Construct GPG command
-                # output file usually ends with .gpg
-                gpg_output = final_path.with_name(final_path.name + ".gpg")
-                cmd = ["gpg", "--output", str(gpg_output), "--yes"]
-
-                if gpg_symmetric:
-                    if gpg_encrypt:
-                        click.echo(
-                            click.style(
-                                "Warning: Symmetric encryption selected, ignoring asymmetric recipient.",
-                                fg="yellow",
-                            )
-                        )
-                    cmd.append("--symmetric")
-                    # No --batch to allow interactive passphrase entry on TTY
-                else:
-                    # Asymmetric or just Sign
-                    # Note: If encrypting, -s adds signature to the encrypted packet.
-                    if gpg_encrypt:
-                        cmd.extend(["--encrypt", "--recipient", gpg_encrypt])
-
-                    if gpg_sign:
-                        cmd.append("--sign")
-
-                cmd.append(str(final_path))
-
-                click.echo(f"Running GPG: {' '.join(cmd)}")
-
-                # Replace subprocess.run with asyncio.create_subprocess_exec to avoid blocking the event loop
-                process = await asyncio.create_subprocess_exec(*cmd)
-                await process.wait()
-
-                if process.returncode != 0:
-                    raise subprocess.CalledProcessError(process.returncode or 1, cmd)
-
-                # Clean up original file
-                final_path.unlink()
-                final_path = gpg_output
-                click.echo(
-                    click.style(f"Processed backup created: {final_path}", fg="green")
-                )
-
-            # Digest Generation
-            if digest:
-                click.echo(f"Calculating {digest} digest...")
-                hash_func = getattr(hashlib, digest)()
-                # Read file in chunks
-                with open(final_path, "rb") as f:
-                    while chunk := f.read(8192):
-                        hash_func.update(chunk)
-
-                digest_val = hash_func.hexdigest()
-                digest_file = final_path.with_name(final_path.name + f".{digest}")
-                digest_file.write_text(
-                    f"{digest_val} *{final_path.name}\n", encoding="utf-8"
-                )
-                click.echo(click.style(f"Digest generated: {digest_file}", fg="green"))
-
-        except subprocess.CalledProcessError as e:
-            click.echo(click.style(f"\nGPG process failed: {e}", fg="red"), err=True)
-        except Exception as e:
-            click.echo(click.style(f"\nExport failed: {e}", fg="red"), err=True)
-
-    asyncio.run(_run())
-
-
-@bk.command(name="import")
-@click.argument("backup_file")
-@click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompts")
-def import_data_command(backup_file: str, yes: bool):
-    """Import AstrBot data from a backup archive.
-
-    Automatically handles .zip files and .gpg files (signed or encrypted).
-    If the file is encrypted, you will be prompted for the passphrase.
-    If a digest file (.sha256, .md5, etc.) exists, it will be verified automatically.
-    """
-    backup_path = Path(backup_file)
-    if not backup_path.exists():
-        raise click.ClickException(f"Backup file not found: {backup_file}")
-
-    # 1. Verify Digest if exists
-    def _verify_digest(file_path: Path) -> bool:
-        supported_digests = ["sha256", "sha512", "md5", "sha1"]
-        digest_verified = True  # Default true if no digest file found
-
-        for algo in supported_digests:
-            digest_file = file_path.with_name(f"{file_path.name}.{algo}")
-            if digest_file.exists():
-                click.echo(f"Found digest file: {digest_file.name}")
-                try:
-                    # Parse digest file
-                    content = digest_file.read_text(encoding="utf-8").strip()
-                    # Format: "digest *filename" or "digest  filename"
-                    # We expect the hash to be the first part
-                    if " " in content:
-                        expected_digest = content.split()[0].lower()
-                    else:
-                        expected_digest = content.lower()
-
-                    click.echo(f"Verifying {algo} digest...")
-                    hash_func = getattr(hashlib, algo)()
-                    with open(file_path, "rb") as f:
-                        while chunk := f.read(8192):
-                            hash_func.update(chunk)
-
-                    calculated_digest = hash_func.hexdigest().lower()
-
-                    if calculated_digest == expected_digest:
-                        click.echo(
-                            click.style("Digest verification PASSED.", fg="green")
-                        )
-                    else:
-                        click.echo(
-                            click.style(
-                                "Digest verification FAILED!", fg="red", bold=True
-                            )
-                        )
-                        click.echo(f"  Expected: {expected_digest}")
-                        click.echo(f"  Actual:   {calculated_digest}")
-                        digest_verified = False
-                except Exception as e:
-                    click.echo(click.style(f"Error checking digest: {e}", fg="red"))
-                    digest_verified = False
-
-        return digest_verified
-
-    if not _verify_digest(backup_path):
-        if not yes:
-            if not click.confirm(
-                "Digest verification failed. Abort import?", default=True, abort=True
-            ):
-                pass
-        else:
-            click.echo(
-                click.style(
-                    "Warning: Digest verification failed. Continuing due to --yes.",
-                    fg="yellow",
-                )
-            )
-
-    if not yes:
-        click.confirm(
-            "This will OVERWRITE all current data (DB, Config, Plugins). Continue?",
-            abort=True,
-            default=False,
-        )
-
-    async def _run():
-        zip_path = backup_path
-        is_temp_file = False
-
-        # Handle GPG encrypted files
-        if backup_path.suffix == ".gpg":
-            if not shutil.which("gpg"):
-                raise click.ClickException(
-                    "GPG tool not found. Cannot decrypt .gpg file."
-                )
-
-            # Remove .gpg extension for output
-            decrypted_path = backup_path.with_suffix("")
-            # If it doesn't look like a zip after stripping .gpg, maybe append .zip?
-            # But the exporter creates .zip.gpg, so stripping .gpg gives .zip.
-
-            click.echo(f"Processing GPG file {backup_path}...")
-            try:
-                cmd = [
-                    "gpg",
-                    "--output",
-                    str(decrypted_path),
-                    "--decrypt",  # This handles both decryption and signature verification/extraction
-                    str(backup_path),
-                ]
-                # Allow interactive passphrase
-                process = await asyncio.create_subprocess_exec(*cmd)
-                await process.wait()
-
-                if process.returncode != 0:
-                    raise subprocess.CalledProcessError(process.returncode or 1, cmd)
-
-                zip_path = decrypted_path
-                is_temp_file = True
-            except subprocess.CalledProcessError:
-                click.echo(
-                    click.style(
-                        "GPG processing failed. Verify signature or decryption key.",
-                        fg="red",
-                    ),
-                    err=True,
-                )
-                return
-
-        kb_mgr = await _get_kb_manager()
-        importer = AstrBotImporter(db_helper, kb_mgr)
-
-        async def on_progress(stage, current, total, message):
-            click.echo(f"[{stage}] {message}")
-
-        try:
-            result = await importer.import_all(
-                str(zip_path), progress_callback=on_progress
-            )
-
-            if result.errors:
-                click.echo(
-                    click.style("\nImport failed with errors:", fg="red"), err=True
-                )
-                for err in result.errors:
-                    click.echo(f"  - {err}", err=True)
-            else:
-                click.echo(click.style("\nImport completed successfully!", fg="green"))
-
-            if result.warnings:
-                click.echo(click.style("\nWarnings:", fg="yellow"))
-                for warn in result.warnings:
-                    click.echo(f"  - {warn}")
-
-        finally:
-            if is_temp_file and zip_path.exists():
-                zip_path.unlink()
-                click.echo(f"Cleaned up temporary file: {zip_path}")
-
-    asyncio.run(_run())

astrbot/cli/commands/cmd_conf.py

@@ -6,67 +6,61 @@ from typing import Any
 
 import click
 
-from astrbot.core.utils.astrbot_path import astrbot_paths
-
-from ..utils import check_astrbot_root
+from ..utils import check_astrbot_root, get_astrbot_root
 
 
 def _validate_log_level(value: str) -> str:
-    """Validate log level"""
+    """验证日志级别"""
     value = value.upper()
     if value not in ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]:
         raise click.ClickException(
-            "Log level must be one of DEBUG/INFO/WARNING/ERROR/CRITICAL",
+            "日志级别必须是 DEBUG/INFO/WARNING/ERROR/CRITICAL 之一",
         )
     return value
 
 
 def _validate_dashboard_port(value: str) -> int:
-    """Validate Dashboard port"""
+    """验证 Dashboard 端口"""
     try:
         port = int(value)
         if port < 1 or port > 65535:
-            raise click.ClickException("Port must be in range 1-65535")
+            raise click.ClickException("端口必须在 1-65535 范围内")
         return port
     except ValueError:
-        raise click.ClickException("Port must be a number")
+        raise click.ClickException("端口必须是数字")
 
 
 def _validate_dashboard_username(value: str) -> str:
-    """Validate Dashboard username"""
+    """验证 Dashboard 用户名"""
     if not value:
-        raise click.ClickException("Username cannot be empty")
+        raise click.ClickException("用户名不能为空")
     return value
 
 
 def _validate_dashboard_password(value: str) -> str:
-    """Validate Dashboard password"""
+    """验证 Dashboard 密码"""
     if not value:
-        raise click.ClickException("Password cannot be empty")
+        raise click.ClickException("密码不能为空")
     return hashlib.md5(value.encode()).hexdigest()
 
 
 def _validate_timezone(value: str) -> str:
-    """Validate timezone"""
+    """验证时区"""
     try:
         zoneinfo.ZoneInfo(value)
     except Exception:
-        raise click.ClickException(
-            f"Invalid timezone: {value}. Please use a valid IANA timezone name"
-        )
+        raise click.ClickException(f"无效的时区: {value}，请使用有效的IANA时区名称")
     return value
 
 
 def _validate_callback_api_base(value: str) -> str:
-    """Validate callback API base URL"""
+    """验证回调接口基址"""
     if not value.startswith("http://") and not value.startswith("https://"):
-        raise click.ClickException(
-            "Callback API base must start with http:// or https://"
-        )
+        raise click.ClickException("回调接口基址必须以 http:// 或 https:// 开头")
     return value
 
 
-# Configuration items settable via CLI, mapping config keys to validator functions
+# 可通过CLI设置的配置项，配置键到验证器函数的映射
 CONFIG_VALIDATORS: dict[str, Callable[[str], Any]] = {
     "timezone": _validate_timezone,
     "log_level": _validate_log_level,
@@ -78,14 +72,14 @@ CONFIG_VALIDATORS: dict[str, Callable[[str], Any]] = {
 
 
 def _load_config() -> dict[str, Any]:
-    """Load or initialize config file"""
-    root = astrbot_paths.root
+    """加载或初始化配置文件"""
+    root = get_astrbot_root()
     if not check_astrbot_root(root):
         raise click.ClickException(
-            f"{root} is not a valid AstrBot root directory. Use 'astrbot init' to initialize",
+            f"{root}不是有效的 AstrBot 根目录，如需初始化请使用 astrbot init",
         )
 
-    config_path = astrbot_paths.data / "cmd_config.json"
+    config_path = root / "data" / "cmd_config.json"
     if not config_path.exists():
         from astrbot.core.config.default import DEFAULT_CONFIG
 
@@ -97,12 +91,12 @@ def _load_config() -> dict[str, Any]:
     try:
         return json.loads(config_path.read_text(encoding="utf-8-sig"))
     except json.JSONDecodeError as e:
-        raise click.ClickException(f"Failed to parse config file: {e!s}")
+        raise click.ClickException(f"配置文件解析失败: {e!s}")
 
 
 def _save_config(config: dict[str, Any]) -> None:
-    """Save config file"""
-    config_path = astrbot_paths.data / "cmd_config.json"
+    """保存配置文件"""
+    config_path = get_astrbot_root() / "data" / "cmd_config.json"
 
     config_path.write_text(
         json.dumps(config, ensure_ascii=False, indent=2),
@@ -111,21 +105,21 @@ def _save_config(config: dict[str, Any]) -> None:
 
 
 def _set_nested_item(obj: dict[str, Any], path: str, value: Any) -> None:
-    """Set a value in a nested dictionary"""
+    """设置嵌套字典中的值"""
     parts = path.split(".")
     for part in parts[:-1]:
         if part not in obj:
             obj[part] = {}
         elif not isinstance(obj[part], dict):
             raise click.ClickException(
-                f"Config path conflict: {'.'.join(parts[: parts.index(part) + 1])} is not a dict",
+                f"配置路径冲突: {'.'.join(parts[: parts.index(part) + 1])} 不是字典",
             )
         obj = obj[part]
     obj[parts[-1]] = value
 
 
 def _get_nested_item(obj: dict[str, Any], path: str) -> Any:
-    """Get a value from a nested dictionary"""
+    """获取嵌套字典中的值"""
     parts = path.split(".")
     for part in parts:
         obj = obj[part]
@@ -133,32 +127,32 @@ def _get_nested_item(obj: dict[str, Any], path: str) -> Any:
 
 
 @click.group(name="conf")
-def conf() -> None:
-    """Configuration management commands
+def conf():
+    """配置管理命令
 
-    Supported config keys:
+    支持的配置项:
 
-    - timezone: Timezone setting (e.g. Asia/Shanghai)
+    - timezone: 时区设置 (例如: Asia/Shanghai)
 
-    - log_level: Log level (DEBUG/INFO/WARNING/ERROR/CRITICAL)
+    - log_level: 日志级别 (DEBUG/INFO/WARNING/ERROR/CRITICAL)
 
-    - dashboard.port: Dashboard port
+    - dashboard.port: Dashboard 端口
 
-    - dashboard.username: Dashboard username
+    - dashboard.username: Dashboard 用户名
 
-    - dashboard.password: Dashboard password
+    - dashboard.password: Dashboard 密码
 
-    - callback_api_base: Callback API base URL
+    - callback_api_base: 回调接口基址
     """
 
 
 @conf.command(name="set")
 @click.argument("key")
 @click.argument("value")
-def set_config(key: str, value: str) -> None:
-    """Set the value of a config item"""
+def set_config(key: str, value: str):
+    """设置配置项的值"""
     if key not in CONFIG_VALIDATORS:
-        raise click.ClickException(f"Unsupported config key: {key}")
+        raise click.ClickException(f"不支持的配置项: {key}")
 
     config = _load_config()
 
@@ -168,29 +162,29 @@ def set_config(key: str, value: str) -> None:
         _set_nested_item(config, key, validated_value)
         _save_config(config)
 
-        click.echo(f"Config updated: {key}")
+        click.echo(f"配置已更新: {key}")
         if key == "dashboard.password":
-            click.echo("  Old value: ********")
-            click.echo("  New value: ********")
+            click.echo("  原值: ********")
+            click.echo("  新值: ********")
         else:
-            click.echo(f"  Old value: {old_value}")
-            click.echo(f"  New value: {validated_value}")
+            click.echo(f"  原值: {old_value}")
+            click.echo(f"  新值: {validated_value}")
 
     except KeyError:
-        raise click.ClickException(f"Unknown config key: {key}")
+        raise click.ClickException(f"未知的配置项: {key}")
     except Exception as e:
-        raise click.UsageError(f"Failed to set config: {e!s}")
+        raise click.UsageError(f"设置配置失败: {e!s}")
 
 
 @conf.command(name="get")
 @click.argument("key", required=False)
-def get_config(key: str | None = None) -> None:
-    """Get the value of a config item. If no key is provided, show all configurable items"""
+def get_config(key: str | None = None):
+    """获取配置项的值，不提供key则显示所有可配置项"""
     config = _load_config()
 
     if key:
         if key not in CONFIG_VALIDATORS:
-            raise click.ClickException(f"Unsupported config key: {key}")
+            raise click.ClickException(f"不支持的配置项: {key}")
 
         try:
             value = _get_nested_item(config, key)
@@ -198,11 +192,11 @@ def get_config(key: str | None = None) -> None:
                 value = "********"
             click.echo(f"{key}: {value}")
         except KeyError:
-            raise click.ClickException(f"Unknown config key: {key}")
+            raise click.ClickException(f"未知的配置项: {key}")
         except Exception as e:
-            raise click.UsageError(f"Failed to get config: {e!s}")
+            raise click.UsageError(f"获取配置失败: {e!s}")
     else:
-        click.echo("Current config:")
+        click.echo("当前配置:")
         for key in CONFIG_VALIDATORS:
             try:
                 value = (

astrbot/cli/commands/cmd_init.py

@@ -1,47 +1,23 @@
 import asyncio
-import platform
-import shutil
-import subprocess
 from pathlib import Path
 
 import click
 from filelock import FileLock, Timeout
 
-from astrbot.core.utils.astrbot_path import astrbot_paths
-
-from ..utils import check_dashboard
-
-SYSTEMD_SERVICE = r"""
-# user service
-[Unit]
-Description=AstrBot Service
-Documentation=https://github.com/AstrBotDevs/AstrBot
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-WorkingDirectory=%h/.local/share/astrbot
-ExecStart=/usr/bin/sh -c '/usr/bin/astrbot run || { /usr/bin/astrbot init && /usr/bin/astrbot run; }'
-Restart=on-failure
-RestartSec=5
-StandardOutput=journal
-StandardError=journal
-SyslogIdentifier=astrbot-%u
-Environment=PYTHONUNBUFFERED=1
-
-[Install]
-WantedBy=default.target
-"""
+from ..utils import check_dashboard, get_astrbot_root
 
 
-async def initialize_astrbot(astrbot_root: Path, *, yes: bool) -> None:
-    """Execute AstrBot initialization logic"""
+async def initialize_astrbot(astrbot_root: Path) -> None:
+    """执行 AstrBot 初始化逻辑"""
     dot_astrbot = astrbot_root / ".astrbot"
 
     if not dot_astrbot.exists():
-        if yes or click.confirm(
-            f"Install AstrBot to this directory? {astrbot_root}",
+        click.echo(f"Current Directory: {astrbot_root}")
+        click.echo(
+            "如果你确认这是 Astrbot root directory, 你需要在当前目录下创建一个 .astrbot 文件标记该目录为 AstrBot 的数据目录。",
+        )
+        if click.confirm(
+            f"请检查当前目录是否正确，确认正确请回车: {astrbot_root}",
             default=True,
             abort=True,
         ):
@@ -57,60 +33,24 @@ async def initialize_astrbot(astrbot_root: Path, *, yes: bool) -> None:
 
     for name, path in paths.items():
         path.mkdir(parents=True, exist_ok=True)
-        click.echo(
-            f"{'Created' if not path.exists() else f'{name} Directory exists'}: {path}"
-        )
-    if yes or click.confirm(
-        "是否需要集成式 WebUI？（个人电脑推荐，服务器不推荐）",
-        default=True,
-    ):
-        await check_dashboard(astrbot_root)
-    else:
-        click.echo("你可以使用在线面版（v4.14.4+），填写后端地址的方式来控制。")
+        click.echo(f"{'Created' if not path.exists() else 'Directory exists'}: {path}")
+
+    await check_dashboard(astrbot_root / "data")
 
 
 @click.command()
-@click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompts")
-def init(yes: bool) -> None:
-    """Initialize AstrBot"""
+def init() -> None:
+    """初始化 AstrBot"""
     click.echo("Initializing AstrBot...")
-
-    # 检查当前系统是否为 Linux 且存在 systemd
-    if platform.system() == "Linux" and shutil.which("systemctl"):
-        if yes or click.confirm(
-            "Detected Linux with systemd. Install AstrBot user service?", default=True
-        ):
-            user_config_dir = Path.home() / ".config" / "systemd" / "user"
-            user_config_dir.mkdir(parents=True, exist_ok=True)
-
-            service_path = user_config_dir / "astrbot.service"
-
-            service_path.write_text(SYSTEMD_SERVICE)
-            click.echo(f"Created service file at {service_path}")
-
-            try:
-                subprocess.run(["systemctl", "--user", "daemon-reload"], check=True)
-                click.echo("Systemd daemon reloaded.")
-                click.echo("Management commands:")
-                click.echo("  Start:  systemctl --user start astrbot")
-                click.echo("  Stop:   systemctl --user stop astrbot")
-                click.echo("  Enable: systemctl --user enable astrbot")
-                click.echo("  Log:    journalctl --user -u astrbot -f")
-            except subprocess.CalledProcessError as e:
-                click.echo(f"Failed to reload systemd daemon: {e}", err=True)
-
-    astrbot_root = astrbot_paths.root
+    astrbot_root = get_astrbot_root()
     lock_file = astrbot_root / "astrbot.lock"
     lock = FileLock(lock_file, timeout=5)
 
     try:
         with lock.acquire():
-            asyncio.run(initialize_astrbot(astrbot_root, yes=yes))
-            click.echo("Done! You can now run 'astrbot run' to start AstrBot")
+            asyncio.run(initialize_astrbot(astrbot_root))
     except Timeout:
-        raise click.ClickException(
-            "Cannot acquire lock file. Please check if another instance is running"
-        )
+        raise click.ClickException("无法获取锁文件，请检查是否有其他实例正在运行")
 
     except Exception as e:
-        raise click.ClickException(f"Initialization failed: {e!s}")
+        raise click.ClickException(f"初始化失败: {e!s}")

astrbot/cli/commands/cmd_plug.py

@@ -4,38 +4,35 @@ from pathlib import Path
 
 import click
 
-from astrbot.core.utils.astrbot_path import astrbot_paths
-
 from ..utils import (
     PluginStatus,
     build_plug_list,
     check_astrbot_root,
+    get_astrbot_root,
     get_git_repo,
     manage_plugin,
 )
 
 
 @click.group()
-def plug() -> None:
-    """Plugin management"""
+def plug():
+    """插件管理"""
 
 
 def _get_data_path() -> Path:
-    base = astrbot_paths.root
+    base = get_astrbot_root()
     if not check_astrbot_root(base):
         raise click.ClickException(
-            f"{base} is not a valid AstrBot root directory. Use 'astrbot init' to initialize",
+            f"{base}不是有效的 AstrBot 根目录，如需初始化请使用 astrbot init",
         )
-    return astrbot_paths.data.resolve()
+    return (base / "data").resolve()
 
 
-def display_plugins(plugins, title=None, color=None) -> None:
+def display_plugins(plugins, title=None, color=None):
     if title:
         click.echo(click.style(title, fg=color, bold=True))
 
-    click.echo(
-        f"{'Name':<20} {'Version':<10} {'Status':<10} {'Author':<15} {'Description':<30}"
-    )
+    click.echo(f"{'名称':<20} {'版本':<10} {'状态':<10} {'作者':<15} {'描述':<30}")
     click.echo("-" * 85)
 
     for p in plugins:
@@ -48,31 +45,31 @@ def display_plugins(plugins, title=None, color=None) -> None:
 
 @plug.command()
 @click.argument("name")
-def new(name: str) -> None:
-    """Create a new plugin"""
+def new(name: str):
+    """创建新插件"""
     base_path = _get_data_path()
     plug_path = base_path / "plugins" / name
 
     if plug_path.exists():
-        raise click.ClickException(f"Plugin {name} already exists")
+        raise click.ClickException(f"插件 {name} 已存在")
 
-    author = click.prompt("Enter plugin author", type=str)
-    desc = click.prompt("Enter plugin description", type=str)
-    version = click.prompt("Enter plugin version", type=str)
+    author = click.prompt("请输入插件作者", type=str)
+    desc = click.prompt("请输入插件描述", type=str)
+    version = click.prompt("请输入插件版本", type=str)
     if not re.match(r"^\d+\.\d+(\.\d+)?$", version.lower().lstrip("v")):
-        raise click.ClickException("Version must be in x.y or x.y.z format")
-    repo = click.prompt("Enter plugin repository URL:", type=str)
+        raise click.ClickException("版本号必须为 x.y 或 x.y.z 格式")
+    repo = click.prompt("请输入插件仓库：", type=str)
     if not repo.startswith("http"):
-        raise click.ClickException("Repository URL must start with http")
+        raise click.ClickException("仓库地址必须以 http 开头")
 
-    click.echo("Downloading plugin template...")
+    click.echo("下载插件模板...")
     get_git_repo(
         "https://github.com/Soulter/helloworld",
         plug_path,
     )
 
-    click.echo("Rewriting plugin metadata...")
-    # Rewrite metadata.yaml
+    click.echo("重写插件信息...")
+    # 重写 metadata.yaml
     with open(plug_path / "metadata.yaml", "w", encoding="utf-8") as f:
         f.write(
             f"name: {name}\n"
@@ -82,13 +79,11 @@ def new(name: str) -> None:
             f"repo: {repo}\n",
         )
 
-    # Rewrite README.md
+    # 重写 README.md
     with open(plug_path / "README.md", "w", encoding="utf-8") as f:
-        f.write(
-            f"# {name}\n\n{desc}\n\n# Support\n\n[Documentation](https://astrbot.app)\n"
-        )
+        f.write(f"# {name}\n\n{desc}\n\n# 支持\n\n[帮助文档](https://astrbot.app)\n")
 
-    # Rewrite main.py
+    # 重写 main.py
     with open(plug_path / "main.py", encoding="utf-8") as f:
         content = f.read()
 
@@ -100,54 +95,54 @@ def new(name: str) -> None:
     with open(plug_path / "main.py", "w", encoding="utf-8") as f:
         f.write(new_content)
 
-    click.echo(f"Plugin {name} created successfully")
+    click.echo(f"插件 {name} 创建成功")
 
 
 @plug.command()
-@click.option("--all", "-a", is_flag=True, help="List uninstalled plugins")
-def list(all: bool) -> None:
-    """List plugins"""
+@click.option("--all", "-a", is_flag=True, help="列出未安装的插件")
+def list(all: bool):
+    """列出插件"""
     base_path = _get_data_path()
     plugins = build_plug_list(base_path / "plugins")
 
-    # Unpublished plugins
+    # 未发布的插件
     not_published_plugins = [
         p for p in plugins if p["status"] == PluginStatus.NOT_PUBLISHED
     ]
     if not_published_plugins:
-        display_plugins(not_published_plugins, "Unpublished Plugins", "red")
+        display_plugins(not_published_plugins, "未发布的插件", "red")
 
-    # Plugins needing update
+    # 需要更新的插件
     need_update_plugins = [
         p for p in plugins if p["status"] == PluginStatus.NEED_UPDATE
     ]
     if need_update_plugins:
-        display_plugins(need_update_plugins, "Plugins Needing Update", "yellow")
+        display_plugins(need_update_plugins, "需要更新的插件", "yellow")
 
-    # Installed plugins
+    # 已安装的插件
     installed_plugins = [p for p in plugins if p["status"] == PluginStatus.INSTALLED]
     if installed_plugins:
-        display_plugins(installed_plugins, "Installed Plugins", "green")
+        display_plugins(installed_plugins, "已安装的插件", "green")
 
-    # Uninstalled plugins
+    # 未安装的插件
     not_installed_plugins = [
         p for p in plugins if p["status"] == PluginStatus.NOT_INSTALLED
     ]
     if not_installed_plugins and all:
-        display_plugins(not_installed_plugins, "Uninstalled Plugins", "blue")
+        display_plugins(not_installed_plugins, "未安装的插件", "blue")
 
     if (
         not any([not_published_plugins, need_update_plugins, installed_plugins])
         and not all
     ):
-        click.echo("No plugins installed")
+        click.echo("未安装任何插件")
 
 
 @plug.command()
 @click.argument("name")
-@click.option("--proxy", help="Proxy server address")
-def install(name: str, proxy: str | None) -> None:
-    """Install a plugin"""
+@click.option("--proxy", help="代理服务器地址")
+def install(name: str, proxy: str | None):
+    """安装插件"""
     base_path = _get_data_path()
     plug_path = base_path / "plugins"
     plugins = build_plug_list(base_path / "plugins")
@@ -162,40 +157,38 @@ def install(name: str, proxy: str | None) -> None:
     )
 
     if not plugin:
-        raise click.ClickException(f"Plugin {name} not found or already installed")
+        raise click.ClickException(f"未找到可安装的插件 {name}，可能是不存在或已安装")
 
     manage_plugin(plugin, plug_path, is_update=False, proxy=proxy)
 
 
 @plug.command()
 @click.argument("name")
-def remove(name: str) -> None:
-    """Uninstall a plugin"""
+def remove(name: str):
+    """卸载插件"""
     base_path = _get_data_path()
     plugins = build_plug_list(base_path / "plugins")
     plugin = next((p for p in plugins if p["name"] == name), None)
 
     if not plugin or not plugin.get("local_path"):
-        raise click.ClickException(f"Plugin {name} does not exist or is not installed")
+        raise click.ClickException(f"插件 {name} 不存在或未安装")
 
     plugin_path = plugin["local_path"]
 
-    click.confirm(
-        f"Are you sure you want to uninstall plugin {name}?", default=False, abort=True
-    )
+    click.confirm(f"确定要卸载插件 {name} 吗?", default=False, abort=True)
 
     try:
         shutil.rmtree(plugin_path)
-        click.echo(f"Plugin {name} has been uninstalled")
+        click.echo(f"插件 {name} 已卸载")
     except Exception as e:
-        raise click.ClickException(f"Failed to uninstall plugin {name}: {e}")
+        raise click.ClickException(f"卸载插件 {name} 失败: {e}")
 
 
 @plug.command()
 @click.argument("name", required=False)
-@click.option("--proxy", help="GitHub proxy address")
-def update(name: str, proxy: str | None) -> None:
-    """Update plugins"""
+@click.option("--proxy", help="Github代理地址")
+def update(name: str, proxy: str | None):
+    """更新插件"""
     base_path = _get_data_path()
     plug_path = base_path / "plugins"
     plugins = build_plug_list(base_path / "plugins")
@@ -211,9 +204,7 @@ def update(name: str, proxy: str | None) -> None:
         )
 
         if not plugin:
-            raise click.ClickException(
-                f"Plugin {name} does not need updating or cannot be updated"
-            )
+            raise click.ClickException(f"插件 {name} 不需要更新或无法更新")
 
         manage_plugin(plugin, plug_path, is_update=True, proxy=proxy)
     else:
@@ -222,20 +213,20 @@ def update(name: str, proxy: str | None) -> None:
         ]
 
         if not need_update_plugins:
-            click.echo("No plugins need updating")
+            click.echo("没有需要更新的插件")
             return
 
-        click.echo(f"Found {len(need_update_plugins)} plugin(s) needing update")
+        click.echo(f"发现 {len(need_update_plugins)} 个插件需要更新")
         for plugin in need_update_plugins:
             plugin_name = plugin["name"]
-            click.echo(f"Updating plugin {plugin_name}...")
+            click.echo(f"正在更新插件 {plugin_name}...")
             manage_plugin(plugin, plug_path, is_update=True, proxy=proxy)
 
 
 @plug.command()
 @click.argument("query")
-def search(query: str) -> None:
-    """Search for plugins"""
+def search(query: str):
+    """搜索插件"""
     base_path = _get_data_path()
     plugins = build_plug_list(base_path / "plugins")
 
@@ -248,7 +239,7 @@ def search(query: str) -> None:
     ]
 
     if not matched_plugins:
-        click.echo(f"No plugins matching '{query}' found")
+        click.echo(f"未找到匹配 '{query}' 的插件")
         return
 
-    display_plugins(matched_plugins, f"Search results: '{query}'", "cyan")
+    display_plugins(matched_plugins, f"搜索结果: '{query}'", "cyan")

astrbot/cli/commands/cmd_run.py

@@ -7,21 +7,15 @@ from pathlib import Path
 import click
 from filelock import FileLock, Timeout
 
-from astrbot.core.utils.astrbot_path import astrbot_paths
-
-from ..utils import check_astrbot_root, check_dashboard
+from ..utils import check_astrbot_root, check_dashboard, get_astrbot_root
 
 
-async def run_astrbot(astrbot_root: Path) -> None:
-    """Run AstrBot"""
+async def run_astrbot(astrbot_root: Path):
+    """运行 AstrBot"""
     from astrbot.core import LogBroker, LogManager, db_helper, logger
     from astrbot.core.initial_loader import InitialLoader
 
-    if (
-        os.environ.get("ASTRBOT_DASHBOARD_ENABLE", os.environ.get("DASHBOARD_ENABLE"))
-        == "True"
-    ):
-        await check_dashboard(astrbot_root)
+    await check_dashboard(astrbot_root / "data")
 
     log_broker = LogBroker()
     LogManager.set_queue_handler(logger, log_broker)
@@ -32,49 +26,28 @@ async def run_astrbot(astrbot_root: Path) -> None:
     await core_lifecycle.start()
 
 
-@click.option("--reload", "-r", is_flag=True, help="Auto-reload plugins")
-@click.option("--host", "-H", help="AstrBot Dashboard Host", required=False, type=str)
-@click.option("--port", "-p", help="AstrBot Dashboard port", required=False, type=str)
-@click.option(
-    "--backend-only",
-    is_flag=True,
-    default=False,
-    help="Disable WebUI, run backend only",
-)
-@click.option(
-    "--log-level",
-    help="Log level",
-    required=False,
-    type=str,
-    default="INFO",
-)
+@click.option("--reload", "-r", is_flag=True, help="插件自动重载")
+@click.option("--port", "-p", help="Astrbot Dashboard端口", required=False, type=str)
 @click.command()
-def run(reload: bool, host: str, port: str, backend_only: bool, log_level: str) -> None:
-    """Run AstrBot"""
+def run(reload: bool, port: str) -> None:
+    """运行 AstrBot"""
     try:
         os.environ["ASTRBOT_CLI"] = "1"
-        astrbot_root = astrbot_paths.root
+        astrbot_root = get_astrbot_root()
 
         if not check_astrbot_root(astrbot_root):
             raise click.ClickException(
-                f"{astrbot_root} is not a valid AstrBot root directory. Use 'astrbot init' to initialize",
+                f"{astrbot_root}不是有效的 AstrBot 根目录，如需初始化请使用 astrbot init",
             )
 
         os.environ["ASTRBOT_ROOT"] = str(astrbot_root)
         sys.path.insert(0, str(astrbot_root))
 
-        if port is not None:
-            os.environ["ASTRBOT_DASHBOARD_PORT"] = port
-            os.environ["DASHBOARD_PORT"] = port  # 今后应该移除
-        if host is not None:
-            os.environ["ASTRBOT_DASHBOARD_HOST"] = host
-            os.environ["DASHBOARD_HOST"] = host  # 今后应该移除
-        os.environ["ASTRBOT_DASHBOARD_ENABLE"] = str(not backend_only)
-        os.environ["DASHBOARD_ENABLE"] = str(not backend_only)  # 今后应该移除
-        os.environ["ASTRBOT_LOG_LEVEL"] = log_level
+        if port:
+            os.environ["DASHBOARD_PORT"] = port
 
         if reload:
-            click.echo("Plugin auto-reload enabled")
+            click.echo("启用插件自动重载")
             os.environ["ASTRBOT_RELOAD"] = "1"
 
         lock_file = astrbot_root / "astrbot.lock"
@@ -82,10 +55,8 @@ def run(reload: bool, host: str, port: str, backend_only: bool, log_level: str)
         with lock.acquire():
             asyncio.run(run_astrbot(astrbot_root))
     except KeyboardInterrupt:
-        click.echo("AstrBot has been shut down.")
+        click.echo("AstrBot 已关闭...")
     except Timeout:
-        raise click.ClickException(
-            "Cannot acquire lock file. Please check if another instance is running"
-        )
+        raise click.ClickException("无法获取锁文件，请检查是否有其他实例正在运行")
     except Exception as e:
-        raise click.ClickException(f"Runtime error: {e}\n{traceback.format_exc()}")
+        raise click.ClickException(f"运行时出现错误: {e}\n{traceback.format_exc()}")

astrbot/cli/commands/cmd_uninstall.py

@@ -1,91 +0,0 @@
-import platform
-import shutil
-import subprocess
-from pathlib import Path
-
-import click
-
-from astrbot.core.utils.astrbot_path import astrbot_paths
-
-
-@click.command()
-@click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompts")
-@click.option(
-    "--keep-data", is_flag=True, help="Keep data directory (config, plugins, etc.)"
-)
-def uninstall(yes: bool, keep_data: bool) -> None:
-    """Uninstall AstrBot systemd service and cleanup data"""
-
-    # 1. Remove Systemd Service
-    if platform.system() == "Linux" and shutil.which("systemctl"):
-        service_path = Path.home() / ".config" / "systemd" / "user" / "astrbot.service"
-
-        if service_path.exists():
-            if yes or click.confirm(
-                "Detected AstrBot systemd service. Stop and remove it?",
-                default=True,
-            ):
-                try:
-                    click.echo("Stopping AstrBot service...")
-                    subprocess.run(
-                        ["systemctl", "--user", "stop", "astrbot"], check=False
-                    )
-
-                    click.echo("Disabling AstrBot service...")
-                    subprocess.run(
-                        ["systemctl", "--user", "disable", "astrbot"], check=False
-                    )
-
-                    click.echo(f"Removing service file: {service_path}")
-                    service_path.unlink()
-
-                    click.echo("Reloading systemd daemon...")
-                    subprocess.run(["systemctl", "--user", "daemon-reload"], check=True)
-                    click.echo("Systemd service uninstalled.")
-
-                except subprocess.CalledProcessError as e:
-                    click.echo(f"Failed to remove systemd service: {e}", err=True)
-                except Exception as e:
-                    click.echo(
-                        f"An error occurred during service removal: {e}", err=True
-                    )
-
-    # 2. Remove Data
-    if keep_data:
-        click.echo("Skipping data removal as requested.")
-        return
-
-    # Helper paths
-    dot_astrbot = astrbot_paths.root / ".astrbot"
-    lock_file = astrbot_paths.root / "astrbot.lock"
-    data_dir = astrbot_paths.data
-
-    # Check if this looks like an AstrBot root before blowing things up
-    if not dot_astrbot.exists() and not data_dir.exists():
-        click.echo("No AstrBot initialization found in current directory.")
-        return
-
-    if yes or click.confirm(
-        f"Are you sure you want to remove AstrBot data at {astrbot_paths.root}? \n"
-        f"This will delete:\n"
-        f" - {data_dir} (Config, Plugins, Database)\n"
-        f" - {dot_astrbot}\n"
-        f" - {lock_file}",
-        default=False,
-        abort=True,
-    ):
-        if data_dir.exists():
-            click.echo(f"Removing directory: {data_dir}")
-            shutil.rmtree(data_dir)
-
-        if dot_astrbot.exists():
-            click.echo(f"Removing file: {dot_astrbot}")
-            dot_astrbot.unlink()
-
-        if lock_file.exists():
-            click.echo(f"Removing file: {lock_file}")
-            lock_file.unlink()
-
-        click.echo("AstrBot data removed successfully.")
-        click.echo("uv: uv tool uninstall astrbot")
-        click.echo("paru/yay: paru -R astrbot")

astrbot/cli/utils/basic.py

@@ -1,17 +1,10 @@
-from importlib import resources
 from pathlib import Path
 
 import click
 
-from astrbot.core.utils.astrbot_path import astrbot_paths
-
-# Static assets bundled inside the installed wheel (built by hatch_build.py).
-# _BUNDLED_DIST = Path(__file__).parent.parent.parent / "dashboard" / "dist"
-_BUNDLED_DIST = resources.files("astrbot") / "dashboard" / "dist"
-
 
 def check_astrbot_root(path: str | Path) -> bool:
-    """Check if the path is an AstrBot root directory"""
+    """检查路径是否为 AstrBot 根目录"""
     if not isinstance(path, Path):
         path = Path(path)
     if not path.exists() or not path.is_dir():
@@ -22,70 +15,62 @@ def check_astrbot_root(path: str | Path) -> bool:
 
 
 def get_astrbot_root() -> Path:
-    """Get the AstrBot root directory path"""
-    return astrbot_paths.root
+    """获取Astrbot根目录路径"""
+    return Path.cwd()
 
 
 async def check_dashboard(astrbot_root: Path) -> None:
-    """Check if the dashboard is installed"""
+    """检查是否安装了dashboard"""
     from astrbot.core.config.default import VERSION
     from astrbot.core.utils.io import download_dashboard, get_dashboard_version
 
     from .version_comparator import VersionComparator
 
-    # If the wheel ships bundled dashboard assets, no network download is needed.
-    if _BUNDLED_DIST.is_dir():
-        click.echo("Dashboard is bundled with the package – skipping download.")
-        return
-
     try:
         dashboard_version = await get_dashboard_version()
         match dashboard_version:
             case None:
-                click.echo("Dashboard is not installed")
+                click.echo("未安装管理面板")
                 if click.confirm(
-                    "Install dashboard?",
+                    "是否安装管理面板？",
                     default=True,
                     abort=True,
                 ):
-                    click.echo("Installing dashboard...")
-                    try:
-                        await download_dashboard(
-                            path="data/dashboard.zip",
-                            extract_path=str(astrbot_root / "data"),
-                            version=f"v{VERSION}",
-                            latest=False,
-                        )
-                        click.echo("Dashboard installed successfully")
-                    except Exception as e:
-                        click.echo(f"Failed to install dashboard: {e}")
+                    click.echo("正在安装管理面板...")
+                    await download_dashboard(
+                        path="data/dashboard.zip",
+                        extract_path=str(astrbot_root),
+                        version=f"v{VERSION}",
+                        latest=False,
+                    )
+                    click.echo("管理面板安装完成")
 
             case str():
                 if VersionComparator.compare_version(VERSION, dashboard_version) <= 0:
-                    click.echo("Dashboard is already up to date")
+                    click.echo("管理面板已是最新版本")
                     return
                 try:
                     version = dashboard_version.split("v")[1]
-                    click.echo(f"Dashboard version: {version}")
+                    click.echo(f"管理面板版本: {version}")
                     await download_dashboard(
                         path="data/dashboard.zip",
-                        extract_path=str(astrbot_root / "data"),
+                        extract_path=str(astrbot_root),
                         version=f"v{VERSION}",
                         latest=False,
                     )
                 except Exception as e:
-                    click.echo(f"Failed to download dashboard: {e}")
+                    click.echo(f"下载管理面板失败: {e}")
                     return
     except FileNotFoundError:
-        click.echo("Initializing dashboard directory...")
+        click.echo("初始化管理面板目录...")
         try:
             await download_dashboard(
-                path=str(astrbot_root / "data" / "dashboard.zip"),
-                extract_path=str(astrbot_root / "data"),
+                path=str(astrbot_root / "dashboard.zip"),
+                extract_path=str(astrbot_root),
                 version=f"v{VERSION}",
                 latest=False,
             )
-            click.echo("Dashboard initialized successfully")
+            click.echo("管理面板初始化完成")
         except Exception as e:
-            click.echo(f"Failed to download dashboard: {e}")
+            click.echo(f"下载管理面板失败: {e}")
             return

astrbot/cli/utils/plugin.py

@@ -13,22 +13,22 @@ from .version_comparator import VersionComparator
 
 
 class PluginStatus(str, Enum):
-    INSTALLED = "installed"
-    NEED_UPDATE = "needs-update"
-    NOT_INSTALLED = "not-installed"
-    NOT_PUBLISHED = "unpublished"
+    INSTALLED = "已安装"
+    NEED_UPDATE = "需更新"
+    NOT_INSTALLED = "未安装"
+    NOT_PUBLISHED = "未发布"
 
 
-def get_git_repo(url: str, target_path: Path, proxy: str | None = None) -> None:
-    """Download code from a Git repository and extract to the specified path"""
+def get_git_repo(url: str, target_path: Path, proxy: str | None = None):
+    """从 Git 仓库下载代码并解压到指定路径"""
     temp_dir = Path(tempfile.mkdtemp())
     try:
-        # Parse repository info
+        # 解析仓库信息
         repo_namespace = url.split("/")[-2:]
         author = repo_namespace[0]
         repo = repo_namespace[1]
 
-        # Try to get the latest release
+        # 尝试获取最新的 release
         release_url = f"https://api.github.com/repos/{author}/{repo}/releases"
         try:
             with httpx.Client(
@@ -40,21 +40,21 @@ def get_git_repo(url: str, target_path: Path, proxy: str | None = None) -> None:
                 releases = resp.json()
 
                 if releases:
-                    # Use the latest release
+                    # 使用最新的 release
                     download_url = releases[0]["zipball_url"]
                 else:
-                    # No release found, use default branch
-                    click.echo(f"Downloading {author}/{repo} from default branch")
+                    # 没有 release，使用默认分支
+                    click.echo(f"正在从默认分支下载 {author}/{repo}")
                     download_url = f"https://github.com/{author}/{repo}/archive/refs/heads/master.zip"
         except Exception as e:
-            click.echo(f"Failed to get release info: {e}. Using provided URL directly")
+            click.echo(f"获取 release 信息失败: {e}，将直接使用提供的 URL")
             download_url = url
 
-        # Apply proxy
+        # 应用代理
         if proxy:
             download_url = f"{proxy}/{download_url}"
 
-        # Download and extract
+        # 下载并解压
         with httpx.Client(
             proxy=proxy if proxy else None,
             follow_redirects=True,
@@ -65,7 +65,7 @@ def get_git_repo(url: str, target_path: Path, proxy: str | None = None) -> None:
                 and "archive/refs/heads/master.zip" in download_url
             ):
                 alt_url = download_url.replace("master.zip", "main.zip")
-                click.echo("Branch 'master' not found, trying 'main' branch")
+                click.echo("master 分支不存在，尝试下载 main 分支")
                 resp = client.get(alt_url)
                 resp.raise_for_status()
             else:
@@ -84,13 +84,13 @@ def get_git_repo(url: str, target_path: Path, proxy: str | None = None) -> None:
 
 
 def load_yaml_metadata(plugin_dir: Path) -> dict:
-    """Load plugin metadata from metadata.yaml file
+    """从 metadata.yaml 文件加载插件元数据
 
     Args:
-        plugin_dir: Plugin directory path
+        plugin_dir: 插件目录路径
 
     Returns:
-        dict: Dictionary containing metadata, or empty dict if loading fails
+        dict: 包含元数据的字典，如果读取失败则返回空字典
 
     """
     yaml_path = plugin_dir / "metadata.yaml"
@@ -98,33 +98,33 @@ def load_yaml_metadata(plugin_dir: Path) -> dict:
         try:
             return yaml.safe_load(yaml_path.read_text(encoding="utf-8")) or {}
         except Exception as e:
-            click.echo(f"Failed to read {yaml_path}: {e}", err=True)
+            click.echo(f"读取 {yaml_path} 失败: {e}", err=True)
     return {}
 
 
 def build_plug_list(plugins_dir: Path) -> list:
-    """Build plugin list containing local and online plugin information
+    """构建插件列表，包含本地和在线插件信息
 
     Args:
-        plugins_dir (Path): Plugin directory path
+        plugins_dir (Path): 插件目录路径
 
     Returns:
-        list: List of dicts containing plugin information
+        list: 包含插件信息的字典列表
 
     """
-    # Get local plugin info
+    # 获取本地插件信息
     result = []
     if plugins_dir.exists():
         for plugin_name in [d.name for d in plugins_dir.glob("*") if d.is_dir()]:
             plugin_dir = plugins_dir / plugin_name
 
-            # Load metadata from metadata.yaml
+            # 从 metadata.yaml 加载元数据
             metadata = load_yaml_metadata(plugin_dir)
 
             if "desc" not in metadata and "description" in metadata:
                 metadata["desc"] = metadata["description"]
 
-            # If metadata loaded successfully, add to result list
+            # 如果成功加载元数据，添加到结果列表
             if metadata and all(
                 k in metadata for k in ["name", "desc", "version", "author", "repo"]
             ):
@@ -140,7 +140,7 @@ def build_plug_list(plugins_dir: Path) -> list:
                     },
                 )
 
-    # Get online plugin list
+    # 获取在线插件列表
     online_plugins = []
     try:
         with httpx.Client() as client:
@@ -160,13 +160,13 @@ def build_plug_list(plugins_dir: Path) -> list:
                     },
                 )
     except Exception as e:
-        click.echo(f"Failed to get online plugin list: {e}", err=True)
+        click.echo(f"获取在线插件列表失败: {e}", err=True)
 
-    # Compare with online plugins and update status
+    # 与在线插件比对，更新状态
     online_plugin_names = {plugin["name"] for plugin in online_plugins}
     for local_plugin in result:
         if local_plugin["name"] in online_plugin_names:
-            # Find the corresponding online plugin
+            # 查找对应的在线插件
             online_plugin = next(
                 p for p in online_plugins if p["name"] == local_plugin["name"]
             )
@@ -179,10 +179,10 @@ def build_plug_list(plugins_dir: Path) -> list:
             ):
                 local_plugin["status"] = PluginStatus.NEED_UPDATE
         else:
-            # Local plugin is not published online
+            # 本地插件未在线上发布
             local_plugin["status"] = PluginStatus.NOT_PUBLISHED
 
-    # Add uninstalled online plugins
+    # 添加未安装的在线插件
     for online_plugin in online_plugins:
         if not any(plugin["name"] == online_plugin["name"] for plugin in result):
             result.append(online_plugin)
@@ -196,19 +196,19 @@ def manage_plugin(
     is_update: bool = False,
     proxy: str | None = None,
 ) -> None:
-    """Install or update a plugin
+    """安装或更新插件
 
     Args:
-        plugin (dict): Plugin info dict
-        plugins_dir (Path): Plugins directory
-        is_update (bool, optional): Whether this is an update operation. Defaults to False
-        proxy (str, optional): Proxy server address
+        plugin (dict): 插件信息字典
+        plugins_dir (Path): 插件目录
+        is_update (bool, optional): 是否为更新操作. 默认为 False
+        proxy (str, optional): 代理服务器地址
 
     """
     plugin_name = plugin["name"]
     repo_url = plugin["repo"]
 
-    # If updating and local path exists, use it directly
+    # 如果是更新且有本地路径，直接使用本地路径
     if is_update and plugin.get("local_path"):
         target_path = Path(plugin["local_path"])
     else:
@@ -216,13 +216,11 @@ def manage_plugin(
 
     backup_path = Path(f"{target_path}_backup") if is_update else None
 
-    # Check if plugin exists
+    # 检查插件是否存在
     if is_update and not target_path.exists():
-        raise click.ClickException(
-            f"Plugin {plugin_name} is not installed and cannot be updated"
-        )
+        raise click.ClickException(f"插件 {plugin_name} 未安装，无法更新")
 
-    # Backup existing plugin
+    # 备份现有插件
     if is_update and backup_path is not None and backup_path.exists():
         shutil.rmtree(backup_path)
     if is_update and backup_path is not None:
@@ -230,21 +228,19 @@ def manage_plugin(
 
     try:
         click.echo(
-            f"{'Updating' if is_update else 'Downloading'} plugin {plugin_name} from {repo_url}...",
+            f"正在从 {repo_url} {'更新' if is_update else '下载'}插件 {plugin_name}...",
         )
         get_git_repo(repo_url, target_path, proxy)
 
-        # Update succeeded, delete backup
+        # 更新成功，删除备份
         if is_update and backup_path is not None and backup_path.exists():
             shutil.rmtree(backup_path)
-        click.echo(
-            f"Plugin {plugin_name} {'updated' if is_update else 'installed'} successfully"
-        )
+        click.echo(f"插件 {plugin_name} {'更新' if is_update else '安装'}成功")
     except Exception as e:
         if target_path.exists():
             shutil.rmtree(target_path, ignore_errors=True)
         if is_update and backup_path is not None and backup_path.exists():
             shutil.move(backup_path, target_path)
         raise click.ClickException(
-            f"Error {'updating' if is_update else 'installing'} plugin {plugin_name}: {e}",
+            f"{'更新' if is_update else '安装'}插件 {plugin_name} 时出错: {e}",
         )

astrbot/cli/utils/version_comparator.py

@@ -1,4 +1,4 @@
-"""Copied from astrbot.core.utils.version_comparator"""
+"""拷贝自 astrbot.core.utils.version_comparator"""
 
 import re
 
@@ -6,11 +6,11 @@ import re
 class VersionComparator:
     @staticmethod
     def compare_version(v1: str, v2: str) -> int:
-        """Compare version numbers according to Semver semantics. Supports version numbers with more than 3 digits and handles pre-release tags.
+        """根据 Semver 语义版本规范来比较版本号的大小。支持不仅局限于 3 个数字的版本号，并处理预发布标签。
 
-        Reference: https://semver.org/
+        参考: https://semver.org/lang/zh-CN/
 
-        Returns 1 if v1 > v2, -1 if v1 < v2, 0 if v1 == v2.
+        返回 1 表示 v1 > v2，返回 -1 表示 v1 < v2，返回 0 表示 v1 = v2。
         """
         v1 = v1.lower().replace("v", "")
         v2 = v2.lower().replace("v", "")
@@ -24,7 +24,7 @@ class VersionComparator:
                 return [], None
             major_minor_patch = match.group(1).split(".")
             prerelease = match.group(2)
-            # buildmetadata = match.group(3)  # Build metadata is ignored in comparison
+            # buildmetadata = match.group(3) # 构建元数据在比较时忽略
             parts = [int(x) for x in major_minor_patch]
             prerelease = VersionComparator._split_prerelease(prerelease)
             return parts, prerelease
@@ -32,7 +32,7 @@ class VersionComparator:
         v1_parts, v1_prerelease = split_version(v1)
         v2_parts, v2_prerelease = split_version(v2)
 
-        # Compare numeric parts
+        # 比较数字部分
         length = max(len(v1_parts), len(v2_parts))
         v1_parts.extend([0] * (length - len(v1_parts)))
         v2_parts.extend([0] * (length - len(v2_parts)))
@@ -43,11 +43,11 @@ class VersionComparator:
             if v1_parts[i] < v2_parts[i]:
                 return -1
 
-        # Compare pre-release tags
+        # 比较预发布标签
         if v1_prerelease is None and v2_prerelease is not None:
-            return 1  # Version without pre-release tag is higher than one with it
+            return 1  # 没有预发布标签的版本高于有预发布标签的版本
         if v1_prerelease is not None and v2_prerelease is None:
-            return -1  # Version with pre-release tag is lower than one without it
+            return -1  # 有预发布标签的版本低于没有预发布标签的版本
         if v1_prerelease is not None and v2_prerelease is not None:
             len_pre = max(len(v1_prerelease), len(v2_prerelease))
             for i in range(len_pre):
@@ -72,9 +72,9 @@ class VersionComparator:
                         return 1
                     if p1 < p2:
                         return -1
-            return 0  # Pre-release tags are identical
+            return 0  # 预发布标签完全相同
 
-        return 0  # Both numeric parts and pre-release tags are equal
+        return 0  # 数字部分和预发布标签都相同
 
     @staticmethod
     def _split_prerelease(prerelease):

astrbot/core/__init__.py

@@ -4,21 +4,7 @@ from astrbot.core.config import AstrBotConfig
 from astrbot.core.config.default import DB_PATH
 from astrbot.core.db.sqlite import SQLiteDatabase
 from astrbot.core.file_token_service import FileTokenService
-from astrbot.core.utils.pip_installer import (
-    DependencyConflictError as DependencyConflictError,
-)
-from astrbot.core.utils.pip_installer import (
-    PipInstaller,
-)
-from astrbot.core.utils.requirements_utils import (
-    RequirementsPrecheckFailed as RequirementsPrecheckFailed,
-)
-from astrbot.core.utils.requirements_utils import (
-    find_missing_requirements as find_missing_requirements,
-)
-from astrbot.core.utils.requirements_utils import (
-    find_missing_requirements_or_raise as find_missing_requirements_or_raise,
-)
+from astrbot.core.utils.pip_installer import PipInstaller
 from astrbot.core.utils.shared_preferences import SharedPreferences
 from astrbot.core.utils.t2i.renderer import HtmlRenderer
 
@@ -28,15 +14,13 @@ from .utils.astrbot_path import get_astrbot_data_path
 # 初始化数据存储文件夹
 os.makedirs(get_astrbot_data_path(), exist_ok=True)
 
-DEMO_MODE = os.getenv("DEMO_MODE", "False").strip().lower() in ("true", "1", "t")
+DEMO_MODE = os.getenv("DEMO_MODE", False)
 
 astrbot_config = AstrBotConfig()
 t2i_base_url = astrbot_config.get("t2i_endpoint", "https://t2i.soulter.top/text2img")
 html_renderer = HtmlRenderer(t2i_base_url)
 logger = LogManager.GetLogger(log_name="astrbot")
-LogManager.configure_logger(
-    logger, astrbot_config, override_level=os.getenv("ASTRBOT_LOG_LEVEL")
-)
+LogManager.configure_logger(logger, astrbot_config)
 LogManager.configure_trace_logger(astrbot_config)
 db_helper = SQLiteDatabase(DB_PATH)
 # 简单的偏好设置存储, 这里后续应该存储到数据库中, 一些部分可以存储到配置中

astrbot/core/agent/context/compressor.py

@@ -57,9 +57,7 @@ class TruncateByTurnsCompressor:
     Truncates the message list by removing older turns.
     """
 
-    def __init__(
-        self, truncate_turns: int = 1, compression_threshold: float = 0.82
-    ) -> None:
+    def __init__(self, truncate_turns: int = 1, compression_threshold: float = 0.82):
         """Initialize the truncate by turns compressor.
 
         Args:
@@ -154,7 +152,7 @@ class LLMSummaryCompressor:
         keep_recent: int = 4,
         instruction_text: str | None = None,
         compression_threshold: float = 0.82,
-    ) -> None:
+    ):
         """Initialize the LLM summary compressor.
 
         Args:

astrbot/core/agent/context/manager.py

@@ -13,7 +13,7 @@ class ContextManager:
     def __init__(
         self,
         config: ContextConfig,
-    ) -> None:
+    ):
         """Initialize the context manager.
 
         There are two strategies to handle context limit reached:

astrbot/core/agent/context/truncator.py

@@ -4,60 +4,19 @@ 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]:
-        """修复消息列表，确保 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()
-
+        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)
         return fixed_messages
 
     def truncate_by_turns(

astrbot/core/agent/handoff.py

@@ -14,7 +14,9 @@ class HandoffTool(FunctionTool, Generic[TContext]):
         parameters: dict | None = None,
         tool_description: str | None = None,
         **kwargs,
-    ) -> None:
+    ):
+        self.agent = agent
+
         # Avoid passing duplicate `description` to the FunctionTool dataclass.
         # Some call sites (e.g. SubAgentOrchestrator) pass `description` via kwargs
         # to override what the main agent sees, while we also compute a default
@@ -32,8 +34,6 @@ class HandoffTool(FunctionTool, Generic[TContext]):
         # Optional provider override for this subagent. When set, the handoff
         # execution will use this chat provider id instead of the global/default.
         self.provider_id: str | None = None
-        # Note: Must assign after super().__init__() to prevent parent class from overriding this attribute
-        self.agent = agent
 
     def default_parameters(self) -> dict:
         return {
@@ -43,22 +43,9 @@ 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."
-                    ),
-                },
             },
         }
 
     def default_description(self, agent_name: str | None) -> str:
         agent_name = agent_name or "another"
-        return f"Delegate tasks to {agent_name} agent to handle the request."
+        return f"Delegate tasks to {self.name} agent to handle the request."

astrbot/core/agent/hooks.py

@@ -9,22 +9,22 @@ from .run_context import ContextWrapper, TContext
 
 
 class BaseAgentRunHooks(Generic[TContext]):
-    async def on_agent_begin(self, run_context: ContextWrapper[TContext]) -> None: ...
+    async def on_agent_begin(self, run_context: ContextWrapper[TContext]): ...
     async def on_tool_start(
         self,
         run_context: ContextWrapper[TContext],
         tool: FunctionTool,
         tool_args: dict | None,
-    ) -> None: ...
+    ): ...
     async def on_tool_end(
         self,
         run_context: ContextWrapper[TContext],
         tool: FunctionTool,
         tool_args: dict | None,
         tool_result: mcp.types.CallToolResult | None,
-    ) -> None: ...
+    ): ...
     async def on_agent_done(
         self,
         run_context: ContextWrapper[TContext],
         llm_response: LLMResponse,
-    ) -> None: ...
+    ): ...

astrbot/core/agent/mcp_client.py

@@ -108,7 +108,7 @@ async def _quick_test_mcp_connection(config: dict) -> tuple[bool, str]:
 
 
 class MCPClient:
-    def __init__(self) -> None:
+    def __init__(self):
         # Initialize session and client objects
         self.session: mcp.ClientSession | None = None
         self.exit_stack = AsyncExitStack()
@@ -126,7 +126,7 @@ class MCPClient:
         self._reconnect_lock = asyncio.Lock()  # Lock for thread-safe reconnection
         self._reconnecting: bool = False  # For logging and debugging
 
-    async def connect_to_server(self, mcp_server_config: dict, name: str) -> None:
+    async def connect_to_server(self, mcp_server_config: dict, name: str):
         """Connect to MCP server
 
         If `url` parameter exists:
@@ -144,14 +144,10 @@ class MCPClient:
 
         cfg = _prepare_config(mcp_server_config.copy())
 
-        def logging_callback(
-            msg: str | mcp.types.LoggingMessageNotificationParams,
-        ) -> None:
+        def logging_callback(msg: str):
             # Handle MCP service error logs
-            if isinstance(msg, mcp.types.LoggingMessageNotificationParams):
-                if msg.level in ("warning", "error", "critical", "alert", "emergency"):
-                    log_msg = f"[{msg.level.upper()}] {str(msg.data)}"
-                    self.server_errlogs.append(log_msg)
+            print(f"MCP Server {name} Error: {msg}")
+            self.server_errlogs.append(msg)
 
         if "url" in cfg:
             success, error_msg = await _quick_test_mcp_connection(cfg)
@@ -218,24 +214,15 @@ class MCPClient:
                 **cfg,
             )
 
-            def callback(msg: str | mcp.types.LoggingMessageNotificationParams) -> None:
+            def callback(msg: str):
                 # Handle MCP service error logs
-                if isinstance(msg, mcp.types.LoggingMessageNotificationParams):
-                    if msg.level in (
-                        "warning",
-                        "error",
-                        "critical",
-                        "alert",
-                        "emergency",
-                    ):
-                        log_msg = f"[{msg.level.upper()}] {str(msg.data)}"
-                        self.server_errlogs.append(log_msg)
+                self.server_errlogs.append(msg)
 
             stdio_transport = await self.exit_stack.enter_async_context(
                 mcp.stdio_client(
                     server_params,
                     errlog=LogPipe(
-                        level=logging.INFO,
+                        level=logging.ERROR,
                         logger=logger,
                         identifier=f"MCPServer-{name}",
                         callback=callback,
@@ -356,7 +343,7 @@ class MCPClient:
 
         return await _call_with_retry()
 
-    async def cleanup(self) -> None:
+    async def cleanup(self):
         """Clean up resources including old exit stacks from reconnections"""
         # Close current exit stack
         try:
@@ -378,7 +365,7 @@ class MCPTool(FunctionTool, Generic[TContext]):
 
     def __init__(
         self, mcp_tool: mcp.Tool, mcp_client: MCPClient, mcp_server_name: str, **kwargs
-    ) -> None:
+    ):
         super().__init__(
             name=mcp_tool.name,
             description=mcp_tool.description or "",
@@ -387,7 +374,6 @@ class MCPTool(FunctionTool, Generic[TContext]):
         self.mcp_tool = mcp_tool
         self.mcp_client = mcp_client
         self.mcp_server_name = mcp_server_name
-        self.source = "mcp"
 
     async def call(
         self, context: ContextWrapper[TContext], **kwargs

astrbot/core/agent/message.py

@@ -3,13 +3,7 @@
 
 from typing import Any, ClassVar, Literal, cast
 
-from pydantic import (
-    BaseModel,
-    GetCoreSchemaHandler,
-    PrivateAttr,
-    model_serializer,
-    model_validator,
-)
+from pydantic import BaseModel, GetCoreSchemaHandler, model_serializer, model_validator
 from pydantic_core import core_schema
 
 
@@ -184,8 +178,6 @@ class Message(BaseModel):
     tool_call_id: str | None = None
     """The ID of the tool call."""
 
-    _no_save: bool = PrivateAttr(default=False)
-
     @model_validator(mode="after")
     def check_content_required(self):
         # assistant + tool_calls is not None: allow content to be None

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

@@ -10,7 +10,7 @@ from astrbot.core import logger
 
 
 class CozeAPIClient:
-    def __init__(self, api_key: str, api_base: str = "https://api.coze.cn") -> None:
+    def __init__(self, api_key: str, api_base: str = "https://api.coze.cn"):
         self.api_key = api_key
         self.api_base = api_base
         self.session = None
@@ -277,7 +277,7 @@ class CozeAPIClient:
             logger.error(f"获取Coze消息列表失败: {e!s}")
             raise Exception(f"获取Coze消息列表失败: {e!s}")
 
-    async def close(self) -> None:
+    async def close(self):
         """关闭会话"""
         if self.session:
             await self.session.close()
@@ -288,7 +288,7 @@ if __name__ == "__main__":
     import asyncio
     import os
 
-    async def test_coze_api_client() -> None:
+    async def test_coze_api_client():
         api_key = os.getenv("COZE_API_KEY", "")
         bot_id = os.getenv("COZE_BOT_ID", "")
         client = CozeAPIClient(api_key=api_key)

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

@@ -67,7 +67,7 @@ class DashscopeAgentRunner(BaseAgentRunner[TContext]):
         if isinstance(self.timeout, str):
             self.timeout = int(self.timeout)
 
-    def has_rag_options(self) -> bool:
+    def has_rag_options(self):
         """判断是否有 RAG 选项
 
         Returns:
@@ -302,7 +302,7 @@ class DashscopeAgentRunner(BaseAgentRunner[TContext]):
 
         while True:
             try:
-                item_type, item_data = await asyncio.get_running_loop().run_in_executor(
+                item_type, item_data = await asyncio.get_event_loop().run_in_executor(
                     None, response_queue.get, True, 1
                 )
             except queue.Empty:
@@ -388,7 +388,7 @@ class DashscopeAgentRunner(BaseAgentRunner[TContext]):
 
         # 发起请求
         partial = functools.partial(Application.call, **payload)
-        response = await asyncio.get_running_loop().run_in_executor(None, partial)
+        response = await asyncio.get_event_loop().run_in_executor(None, partial)
 
         async for resp in self._handle_streaming_response(response, session_id):
             yield resp

astrbot/core/agent/runners/deerflow/constants.py

@@ -1,4 +0,0 @@
-DEERFLOW_PROVIDER_TYPE = "deerflow"
-DEERFLOW_THREAD_ID_KEY = "deerflow_thread_id"
-DEERFLOW_SESSION_PREFIX = "deerflow-ephemeral"
-DEERFLOW_AGENT_RUNNER_PROVIDER_ID_KEY = "deerflow_agent_runner_provider_id"

astrbot/core/agent/runners/deerflow/deerflow_agent_runner.py

@@ -1,693 +0,0 @@
-import asyncio
-import hashlib
-import json
-import sys
-import typing as T
-from collections import deque
-from dataclasses import dataclass, field
-from uuid import uuid4
-
-import astrbot.core.message.components as Comp
-from astrbot import logger
-from astrbot.core import sp
-from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.provider.entities import (
-    LLMResponse,
-    ProviderRequest,
-)
-from astrbot.core.utils.config_number import coerce_int_config
-
-from ...hooks import BaseAgentRunHooks
-from ...response import AgentResponseData
-from ...run_context import ContextWrapper, TContext
-from ..base import AgentResponse, AgentState, BaseAgentRunner
-from .constants import DEERFLOW_SESSION_PREFIX, DEERFLOW_THREAD_ID_KEY
-from .deerflow_api_client import DeerFlowAPIClient
-from .deerflow_content_mapper import (
-    build_chain_from_ai_content,
-    build_user_content,
-    image_component_from_url,
-)
-from .deerflow_stream_utils import (
-    build_task_failure_summary,
-    extract_ai_delta_from_event_data,
-    extract_clarification_from_event_data,
-    extract_latest_ai_message,
-    extract_latest_ai_text,
-    extract_latest_clarification_text,
-    extract_messages_from_values_data,
-    extract_task_failures_from_custom_event,
-    get_message_id,
-)
-
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
-
-class DeerFlowAgentRunner(BaseAgentRunner[TContext]):
-    """DeerFlow Agent Runner via LangGraph HTTP API."""
-
-    _MAX_VALUES_HISTORY = 200
-
-    @dataclass(frozen=True)
-    class _RunnerConfig:
-        api_base: str
-        api_key: str
-        auth_header: str
-        proxy: str
-        assistant_id: str
-        model_name: str
-        thinking_enabled: bool
-        plan_mode: bool
-        subagent_enabled: bool
-        max_concurrent_subagents: int
-        timeout: int
-        recursion_limit: int
-
-    @dataclass
-    class _StreamState:
-        latest_text: str = ""
-        prev_text_for_streaming: str = ""
-        clarification_text: str = ""
-        task_failures: list[str] = field(default_factory=list)
-        seen_message_ids: set[str] = field(default_factory=set)
-        seen_message_order: deque[str] = field(default_factory=deque)
-        # Fallback tracking for backends that omit message ids in values events.
-        no_id_message_fingerprints: dict[int, str] = field(default_factory=dict)
-        baseline_initialized: bool = False
-        has_values_text: bool = False
-        run_values_messages: list[dict[str, T.Any]] = field(default_factory=list)
-        timed_out: bool = False
-
-    @dataclass(frozen=True)
-    class _FinalResult:
-        chain: MessageChain
-        role: str
-
-    def _format_exception(self, err: Exception) -> str:
-        err_type = type(err).__name__
-        detail = str(err).strip()
-
-        if isinstance(err, (asyncio.TimeoutError, TimeoutError)):
-            timeout_text = (
-                f"{self.timeout}s"
-                if isinstance(getattr(self, "timeout", None), (int, float))
-                else "configured timeout"
-            )
-            return (
-                f"{err_type}: request timed out after {timeout_text}. "
-                "Please check DeerFlow service health and backend logs."
-            )
-
-        if detail:
-            if detail.startswith(f"{err_type}:"):
-                return detail
-            return f"{err_type}: {detail}"
-
-        return f"{err_type}: no detailed error message provided."
-
-    async def close(self) -> None:
-        """Explicit cleanup hook for long-lived workers."""
-        api_client = getattr(self, "api_client", None)
-        if isinstance(api_client, DeerFlowAPIClient) and not api_client.is_closed:
-            try:
-                await api_client.close()
-            except Exception as e:
-                logger.warning(
-                    "Failed to close DeerFlowAPIClient during runner shutdown: %s",
-                    e,
-                    exc_info=True,
-                )
-
-    async def _notify_agent_done_hook(self) -> None:
-        if not self.final_llm_resp:
-            return
-        try:
-            await self.agent_hooks.on_agent_done(self.run_context, self.final_llm_resp)
-        except Exception as e:
-            logger.error(f"Error in on_agent_done hook: {e}", exc_info=True)
-
-    async def _finish_with_result(
-        self, chain: MessageChain, role: str
-    ) -> AgentResponse:
-        self.final_llm_resp = LLMResponse(
-            role=role,
-            result_chain=chain,
-        )
-        self._transition_state(AgentState.DONE)
-        await self._notify_agent_done_hook()
-        return AgentResponse(
-            type="llm_result",
-            data=AgentResponseData(chain=chain),
-        )
-
-    async def _finish_with_error(self, err_msg: str) -> AgentResponse:
-        err_text = f"DeerFlow request failed: {err_msg}"
-        err_chain = MessageChain().message(err_text)
-        self.final_llm_resp = LLMResponse(
-            role="err",
-            completion_text=err_text,
-            result_chain=err_chain,
-        )
-        self._transition_state(AgentState.ERROR)
-        await self._notify_agent_done_hook()
-        return AgentResponse(
-            type="err",
-            data=AgentResponseData(
-                chain=err_chain,
-            ),
-        )
-
-    def _parse_runner_config(self, provider_config: dict) -> _RunnerConfig:
-        api_base = provider_config.get("deerflow_api_base", "http://127.0.0.1:2026")
-        if not isinstance(api_base, str) or not api_base.startswith(
-            ("http://", "https://"),
-        ):
-            raise ValueError(
-                "DeerFlow API Base URL format is invalid. It must start with http:// or https://.",
-            )
-
-        proxy = provider_config.get("proxy", "")
-        normalized_proxy = proxy.strip() if isinstance(proxy, str) else ""
-
-        return self._RunnerConfig(
-            api_base=api_base,
-            api_key=provider_config.get("deerflow_api_key", ""),
-            auth_header=provider_config.get("deerflow_auth_header", ""),
-            proxy=normalized_proxy,
-            assistant_id=provider_config.get("deerflow_assistant_id", "lead_agent"),
-            model_name=provider_config.get("deerflow_model_name", ""),
-            thinking_enabled=bool(
-                provider_config.get("deerflow_thinking_enabled", False),
-            ),
-            plan_mode=bool(provider_config.get("deerflow_plan_mode", False)),
-            subagent_enabled=bool(
-                provider_config.get("deerflow_subagent_enabled", False),
-            ),
-            max_concurrent_subagents=coerce_int_config(
-                provider_config.get("deerflow_max_concurrent_subagents", 3),
-                default=3,
-                min_value=1,
-                field_name="deerflow_max_concurrent_subagents",
-                source="DeerFlow config",
-            ),
-            timeout=coerce_int_config(
-                provider_config.get("timeout", 300),
-                default=300,
-                min_value=1,
-                field_name="timeout",
-                source="DeerFlow config",
-            ),
-            recursion_limit=coerce_int_config(
-                provider_config.get("deerflow_recursion_limit", 1000),
-                default=1000,
-                min_value=1,
-                field_name="deerflow_recursion_limit",
-                source="DeerFlow config",
-            ),
-        )
-
-    async def _load_config_and_client(self, provider_config: dict) -> None:
-        config = self._parse_runner_config(provider_config)
-
-        self.api_base = config.api_base
-        self.api_key = config.api_key
-        self.auth_header = config.auth_header
-        self.proxy = config.proxy
-        self.assistant_id = config.assistant_id
-        self.model_name = config.model_name
-        self.thinking_enabled = config.thinking_enabled
-        self.plan_mode = config.plan_mode
-        self.subagent_enabled = config.subagent_enabled
-        self.max_concurrent_subagents = config.max_concurrent_subagents
-        self.timeout = config.timeout
-        self.recursion_limit = config.recursion_limit
-
-        new_client_signature = (
-            config.api_base,
-            config.api_key,
-            config.auth_header,
-            config.proxy,
-        )
-        old_client = getattr(self, "api_client", None)
-        old_signature = getattr(self, "_api_client_signature", None)
-
-        if (
-            isinstance(old_client, DeerFlowAPIClient)
-            and old_signature == new_client_signature
-            and not old_client.is_closed
-        ):
-            self.api_client = old_client
-            return
-
-        if isinstance(old_client, DeerFlowAPIClient):
-            try:
-                await old_client.close()
-            except Exception as e:
-                logger.warning(
-                    f"Failed to close previous DeerFlow API client cleanly: {e}"
-                )
-
-        self.api_client = DeerFlowAPIClient(
-            api_base=config.api_base,
-            api_key=config.api_key,
-            auth_header=config.auth_header,
-            proxy=config.proxy,
-        )
-        self._api_client_signature = new_client_signature
-
-    @override
-    async def reset(
-        self,
-        request: ProviderRequest,
-        run_context: ContextWrapper[TContext],
-        agent_hooks: BaseAgentRunHooks[TContext],
-        provider_config: dict,
-        **kwargs: T.Any,
-    ) -> None:
-        self.req = request
-        self.streaming = kwargs.get("streaming", False)
-        self.final_llm_resp = None
-        self._state = AgentState.IDLE
-        self.agent_hooks = agent_hooks
-        self.run_context = run_context
-
-        await self._load_config_and_client(provider_config)
-
-    @override
-    async def step(self):
-        if not self.req:
-            raise ValueError("Request is not set. Please call reset() first.")
-        if self.done():
-            return
-
-        if self._state == AgentState.IDLE:
-            try:
-                await self.agent_hooks.on_agent_begin(self.run_context)
-            except Exception as e:
-                logger.error(f"Error in on_agent_begin hook: {e}", exc_info=True)
-
-        self._transition_state(AgentState.RUNNING)
-
-        try:
-            async for response in self._execute_deerflow_request():
-                yield response
-        except asyncio.CancelledError:
-            # Let caller manage cancellation semantics.
-            raise
-        except Exception as e:
-            err_msg = self._format_exception(e)
-            logger.error(f"DeerFlow request failed: {err_msg}", exc_info=True)
-            yield await self._finish_with_error(err_msg)
-
-    @override
-    async def step_until_done(
-        self, max_step: int = 30
-    ) -> T.AsyncGenerator[AgentResponse, None]:
-        if max_step <= 0:
-            raise ValueError("max_step must be greater than 0")
-
-        step_count = 0
-        while not self.done() and step_count < max_step:
-            step_count += 1
-            async for resp in self.step():
-                yield resp
-
-        if not self.done():
-            raise RuntimeError(
-                f"DeerFlow agent reached max_step ({max_step}) without completion."
-            )
-
-    def _extract_new_messages_from_values(
-        self,
-        values_messages: list[T.Any],
-        state: _StreamState,
-    ) -> list[dict[str, T.Any]]:
-        new_messages: list[dict[str, T.Any]] = []
-        no_id_indexes_seen: set[int] = set()
-        for idx, msg in enumerate(values_messages):
-            if not isinstance(msg, dict):
-                continue
-            msg_id = get_message_id(msg)
-            if msg_id:
-                if msg_id in state.seen_message_ids:
-                    continue
-                self._remember_seen_message_id(state, msg_id)
-                new_messages.append(msg)
-                continue
-
-            no_id_indexes_seen.add(idx)
-            msg_fingerprint = self._fingerprint_message(msg)
-            if state.no_id_message_fingerprints.get(idx) == msg_fingerprint:
-                continue
-            state.no_id_message_fingerprints[idx] = msg_fingerprint
-            new_messages.append(msg)
-
-        # Keep no-id index state aligned with latest values payload shape.
-        for idx in list(state.no_id_message_fingerprints.keys()):
-            if idx not in no_id_indexes_seen:
-                state.no_id_message_fingerprints.pop(idx, None)
-        return new_messages
-
-    def _fingerprint_message(self, message: dict[str, T.Any]) -> str:
-        try:
-            raw = json.dumps(message, sort_keys=True, ensure_ascii=False, default=str)
-        except (TypeError, ValueError):
-            raw = repr(message)
-        return hashlib.sha1(raw.encode("utf-8", errors="ignore")).hexdigest()
-
-    def _remember_seen_message_id(self, state: _StreamState, msg_id: str) -> None:
-        if not msg_id or msg_id in state.seen_message_ids:
-            return
-
-        state.seen_message_ids.add(msg_id)
-        state.seen_message_order.append(msg_id)
-        while len(state.seen_message_order) > self._MAX_VALUES_HISTORY:
-            dropped = state.seen_message_order.popleft()
-            state.seen_message_ids.discard(dropped)
-
-    async def _ensure_thread_id(self, session_id: str) -> str:
-        thread_id = await sp.get_async(
-            scope="umo",
-            scope_id=session_id,
-            key=DEERFLOW_THREAD_ID_KEY,
-            default="",
-        )
-        if thread_id:
-            return thread_id
-
-        thread = await self.api_client.create_thread(timeout=min(30, self.timeout))
-        thread_id = thread.get("thread_id", "")
-        if not thread_id:
-            raise Exception(
-                f"DeerFlow create thread returned invalid payload: {thread}"
-            )
-
-        await sp.put_async(
-            scope="umo",
-            scope_id=session_id,
-            key=DEERFLOW_THREAD_ID_KEY,
-            value=thread_id,
-        )
-        return thread_id
-
-    def _build_messages(
-        self,
-        prompt: str,
-        image_urls: list[str],
-        system_prompt: str | None,
-    ) -> list[dict[str, T.Any]]:
-        messages: list[dict[str, T.Any]] = []
-        if system_prompt:
-            messages.append({"role": "system", "content": system_prompt})
-        messages.append(
-            {
-                "role": "user",
-                "content": build_user_content(prompt, image_urls),
-            },
-        )
-        return messages
-
-    def _build_runtime_context(self, thread_id: str) -> dict[str, T.Any]:
-        runtime_context: dict[str, T.Any] = {
-            "thread_id": thread_id,
-            "thinking_enabled": self.thinking_enabled,
-            "is_plan_mode": self.plan_mode,
-            "subagent_enabled": self.subagent_enabled,
-        }
-        if self.subagent_enabled:
-            runtime_context["max_concurrent_subagents"] = self.max_concurrent_subagents
-        if self.model_name:
-            runtime_context["model_name"] = self.model_name
-        return runtime_context
-
-    def _build_payload(
-        self,
-        thread_id: str,
-        prompt: str,
-        image_urls: list[str],
-        system_prompt: str | None,
-    ) -> dict[str, T.Any]:
-        return {
-            "assistant_id": self.assistant_id,
-            "input": {
-                "messages": self._build_messages(prompt, image_urls, system_prompt),
-            },
-            "stream_mode": ["values", "messages-tuple", "custom"],
-            # LangGraph 0.6+ prefers context instead of configurable.
-            "context": self._build_runtime_context(thread_id),
-            "config": {
-                "recursion_limit": self.recursion_limit,
-            },
-        }
-
-    def _update_text_and_maybe_stream(
-        self,
-        *,
-        state: _StreamState,
-        new_full_text: str | None = None,
-        delta_text: str | None = None,
-    ) -> list[AgentResponse]:
-        if new_full_text:
-            state.latest_text = new_full_text
-            if not self.streaming:
-                return []
-
-            if new_full_text.startswith(state.prev_text_for_streaming):
-                delta = new_full_text[len(state.prev_text_for_streaming) :]
-            else:
-                delta = new_full_text
-
-            if not delta:
-                return []
-
-            state.prev_text_for_streaming = new_full_text
-            return [
-                AgentResponse(
-                    type="streaming_delta",
-                    data=AgentResponseData(chain=MessageChain().message(delta)),
-                )
-            ]
-
-        if delta_text:
-            state.latest_text += delta_text
-            if self.streaming:
-                return [
-                    AgentResponse(
-                        type="streaming_delta",
-                        data=AgentResponseData(
-                            chain=MessageChain().message(delta_text)
-                        ),
-                    )
-                ]
-
-        return []
-
-    def _handle_values_event(
-        self,
-        data: T.Any,
-        state: _StreamState,
-    ) -> list[AgentResponse]:
-        responses: list[AgentResponse] = []
-        values_messages = extract_messages_from_values_data(data)
-        if not values_messages:
-            return responses
-
-        new_messages: list[dict[str, T.Any]] = []
-        if not state.baseline_initialized:
-            state.baseline_initialized = True
-            for idx, msg in enumerate(values_messages):
-                if not isinstance(msg, dict):
-                    continue
-                new_messages.append(msg)
-                msg_id = get_message_id(msg)
-                if msg_id:
-                    self._remember_seen_message_id(state, msg_id)
-                    continue
-                state.no_id_message_fingerprints[idx] = self._fingerprint_message(msg)
-        else:
-            new_messages = self._extract_new_messages_from_values(
-                values_messages,
-                state,
-            )
-        latest_text = ""
-        if new_messages:
-            state.run_values_messages.extend(new_messages)
-            if len(state.run_values_messages) > self._MAX_VALUES_HISTORY:
-                state.run_values_messages = state.run_values_messages[
-                    -self._MAX_VALUES_HISTORY :
-                ]
-            latest_text = extract_latest_ai_text(state.run_values_messages)
-            if latest_text:
-                state.has_values_text = True
-            latest_clarification = extract_latest_clarification_text(
-                state.run_values_messages,
-            )
-            if latest_clarification:
-                state.clarification_text = latest_clarification
-
-        responses.extend(
-            self._update_text_and_maybe_stream(
-                state=state,
-                new_full_text=latest_text or None,
-            )
-        )
-        return responses
-
-    def _handle_message_event(
-        self,
-        data: T.Any,
-        state: _StreamState,
-    ) -> AgentResponse | None:
-        delta = extract_ai_delta_from_event_data(data)
-
-        responses: list[AgentResponse] = []
-        if delta and not state.has_values_text:
-            responses.extend(
-                self._update_text_and_maybe_stream(
-                    state=state,
-                    delta_text=delta,
-                )
-            )
-
-        maybe_clarification = extract_clarification_from_event_data(data)
-        if maybe_clarification:
-            state.clarification_text = maybe_clarification
-        return responses[0] if responses else None
-
-    def _build_final_result(self, state: _StreamState) -> _FinalResult:
-        failures_only = False
-
-        if state.clarification_text:
-            final_chain = MessageChain(chain=[Comp.Plain(state.clarification_text)])
-        else:
-            final_chain = MessageChain()
-            latest_ai_message = extract_latest_ai_message(state.run_values_messages)
-            if latest_ai_message:
-                final_chain = build_chain_from_ai_content(
-                    latest_ai_message.get("content"),
-                    image_component_from_url,
-                )
-
-            if not final_chain.chain and state.latest_text:
-                final_chain = MessageChain(chain=[Comp.Plain(state.latest_text)])
-
-            if not final_chain.chain:
-                failure_text = build_task_failure_summary(state.task_failures)
-                if failure_text:
-                    final_chain = MessageChain(chain=[Comp.Plain(failure_text)])
-                    failures_only = True
-
-        if not final_chain.chain:
-            logger.warning("DeerFlow returned no text content in stream events.")
-            final_chain = MessageChain(
-                chain=[Comp.Plain("DeerFlow returned an empty response.")],
-            )
-
-        if state.timed_out:
-            timeout_note = (
-                f"DeerFlow stream timed out after {self.timeout}s. "
-                "Returning partial result."
-            )
-            if final_chain.chain and isinstance(final_chain.chain[-1], Comp.Plain):
-                last_text = final_chain.chain[-1].text
-                final_chain.chain[-1].text = (
-                    f"{last_text}\n\n{timeout_note}" if last_text else timeout_note
-                )
-            else:
-                final_chain.chain.append(Comp.Plain(timeout_note))
-
-        role = "err" if (state.timed_out or failures_only) else "assistant"
-        return self._FinalResult(chain=final_chain, role=role)
-
-    def _emit_non_plain_components_at_end(
-        self,
-        final_chain: MessageChain,
-    ) -> AgentResponse | None:
-        non_plain_components = [
-            component
-            for component in final_chain.chain
-            if not isinstance(component, Comp.Plain)
-        ]
-        if not non_plain_components:
-            return None
-        return AgentResponse(
-            type="streaming_delta",
-            data=AgentResponseData(
-                chain=MessageChain(chain=non_plain_components),
-            ),
-        )
-
-    async def _execute_deerflow_request(self):
-        prompt = self.req.prompt or ""
-        session_id = self.req.session_id or f"{DEERFLOW_SESSION_PREFIX}-{uuid4()}"
-        image_urls = self.req.image_urls or []
-        system_prompt = self.req.system_prompt
-
-        thread_id = await self._ensure_thread_id(session_id)
-        payload = self._build_payload(
-            thread_id=thread_id,
-            prompt=prompt,
-            image_urls=image_urls,
-            system_prompt=system_prompt,
-        )
-        state = self._StreamState()
-
-        try:
-            async for event in self.api_client.stream_run(
-                thread_id=thread_id,
-                payload=payload,
-                timeout=self.timeout,
-            ):
-                event_type = event.get("event")
-                data = event.get("data")
-
-                if event_type == "values":
-                    for response in self._handle_values_event(data, state):
-                        yield response
-                    continue
-
-                if event_type in {"messages-tuple", "messages", "message"}:
-                    response = self._handle_message_event(data, state)
-                    if response:
-                        yield response
-                    continue
-
-                if event_type == "custom":
-                    state.task_failures.extend(
-                        extract_task_failures_from_custom_event(data),
-                    )
-                    continue
-
-                if event_type == "error":
-                    raise Exception(f"DeerFlow stream returned error event: {data}")
-
-                if event_type == "end":
-                    break
-        except (asyncio.TimeoutError, TimeoutError):
-            logger.warning(
-                "DeerFlow stream timed out after %ss for thread_id=%s; returning partial result.",
-                self.timeout,
-                thread_id,
-            )
-            state.timed_out = True
-
-        final_result = self._build_final_result(state)
-
-        if self.streaming:
-            extra_response = self._emit_non_plain_components_at_end(final_result.chain)
-            if extra_response:
-                yield extra_response
-
-        yield await self._finish_with_result(final_result.chain, final_result.role)
-
-    @override
-    def done(self) -> bool:
-        """Check whether the agent has finished or failed."""
-        return self._state in (AgentState.DONE, AgentState.ERROR)
-
-    @override
-    def get_final_llm_resp(self) -> LLMResponse | None:
-        return self.final_llm_resp

astrbot/core/agent/runners/deerflow/deerflow_api_client.py

@@ -1,245 +0,0 @@
-import codecs
-import json
-from collections.abc import AsyncGenerator
-from typing import Any
-
-from aiohttp import ClientResponse, ClientSession, ClientTimeout
-
-from astrbot.core import logger
-
-SSE_MAX_BUFFER_CHARS = 1_048_576
-
-
-def _normalize_sse_newlines(text: str) -> str:
-    """Normalize CRLF/CR to LF so SSE block splitting works reliably."""
-    return text.replace("\r\n", "\n").replace("\r", "\n")
-
-
-def _parse_sse_data_lines(data_lines: list[str]) -> Any:
-    raw_data = "\n".join(data_lines)
-    try:
-        return json.loads(raw_data)
-    except json.JSONDecodeError:
-        # Some LangGraph-compatible servers emit multiple JSON fragments
-        # in one SSE event using repeated data lines (e.g. tuple payloads).
-        parsed_lines: list[Any] = []
-        can_parse_all = True
-        for line in data_lines:
-            line = line.strip()
-            if not line:
-                continue
-            try:
-                parsed_lines.append(json.loads(line))
-            except json.JSONDecodeError:
-                can_parse_all = False
-                break
-        if can_parse_all and parsed_lines:
-            return parsed_lines[0] if len(parsed_lines) == 1 else parsed_lines
-        return raw_data
-
-
-def _parse_sse_block(block: str) -> dict[str, Any] | None:
-    if not block.strip():
-        return None
-
-    event_name = "message"
-    data_lines: list[str] = []
-    for line in block.splitlines():
-        if line.startswith("event:"):
-            event_name = line[6:].strip()
-        elif line.startswith("data:"):
-            data_lines.append(line[5:].lstrip())
-
-    if not data_lines:
-        return None
-    return {"event": event_name, "data": _parse_sse_data_lines(data_lines)}
-
-
-async def _stream_sse(resp: ClientResponse) -> AsyncGenerator[dict[str, Any], None]:
-    """Parse SSE response blocks into event/data dictionaries."""
-    # Use a forgiving decoder at network boundaries so malformed bytes do not abort stream parsing.
-    decoder = codecs.getincrementaldecoder("utf-8")("replace")
-    buffer = ""
-
-    async for chunk in resp.content.iter_chunked(8192):
-        buffer += _normalize_sse_newlines(decoder.decode(chunk))
-
-        while "\n\n" in buffer:
-            block, buffer = buffer.split("\n\n", 1)
-            parsed = _parse_sse_block(block)
-            if parsed is not None:
-                yield parsed
-
-        if len(buffer) > SSE_MAX_BUFFER_CHARS:
-            logger.warning(
-                "DeerFlow SSE parser buffer exceeded %d chars without delimiter; "
-                "flushing oversized block to prevent unbounded memory growth.",
-                SSE_MAX_BUFFER_CHARS,
-            )
-            parsed = _parse_sse_block(buffer)
-            if parsed is not None:
-                yield parsed
-            buffer = ""
-
-    # flush any remaining buffered text
-    buffer += _normalize_sse_newlines(decoder.decode(b"", final=True))
-    while "\n\n" in buffer:
-        block, buffer = buffer.split("\n\n", 1)
-        parsed = _parse_sse_block(block)
-        if parsed is not None:
-            yield parsed
-
-    if buffer.strip():
-        parsed = _parse_sse_block(buffer)
-        if parsed is not None:
-            yield parsed
-
-
-class DeerFlowAPIClient:
-    """HTTP client for DeerFlow LangGraph API.
-
-    Lifecycle is explicitly managed by callers (runner/stage). `__del__` is only a
-    fallback diagnostic and must not be relied on for cleanup.
-    """
-
-    def __init__(
-        self,
-        api_base: str = "http://127.0.0.1:2026",
-        api_key: str = "",
-        auth_header: str = "",
-        proxy: str | None = None,
-    ) -> None:
-        self.api_base = api_base.rstrip("/")
-        self._session: ClientSession | None = None
-        self._closed = False
-        self.proxy = proxy.strip() if isinstance(proxy, str) else None
-        if self.proxy == "":
-            self.proxy = None
-        self.headers: dict[str, str] = {}
-        if auth_header:
-            self.headers["Authorization"] = auth_header
-        elif api_key:
-            self.headers["Authorization"] = f"Bearer {api_key}"
-
-    def _get_session(self) -> ClientSession:
-        if self._closed:
-            raise RuntimeError("DeerFlowAPIClient is already closed.")
-        if self._session is None or self._session.closed:
-            self._session = ClientSession(trust_env=True)
-        return self._session
-
-    async def __aenter__(self) -> "DeerFlowAPIClient":
-        return self
-
-    async def __aexit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc: BaseException | None,
-        tb: object | None,
-    ) -> None:
-        await self.close()
-
-    async def create_thread(self, timeout: float = 20) -> dict[str, Any]:
-        session = self._get_session()
-        url = f"{self.api_base}/api/langgraph/threads"
-        payload = {"metadata": {}}
-        async with session.post(
-            url,
-            json=payload,
-            headers=self.headers,
-            timeout=timeout,
-            proxy=self.proxy,
-        ) as resp:
-            if resp.status not in (200, 201):
-                text = await resp.text()
-                raise Exception(
-                    f"DeerFlow create thread failed: {resp.status}. {text}",
-                )
-            return await resp.json()
-
-    async def stream_run(
-        self,
-        thread_id: str,
-        payload: dict[str, Any],
-        timeout: float = 120,
-    ) -> AsyncGenerator[dict[str, Any], None]:
-        session = self._get_session()
-        url = f"{self.api_base}/api/langgraph/threads/{thread_id}/runs/stream"
-        input_payload = payload.get("input")
-        message_count = 0
-        if isinstance(input_payload, dict) and isinstance(
-            input_payload.get("messages"), list
-        ):
-            message_count = len(input_payload["messages"])
-        # Log only a minimal summary to avoid exposing sensitive user content.
-        logger.debug(
-            "deerflow stream_run payload summary: thread_id=%s, keys=%s, message_count=%d, stream_mode=%s",
-            thread_id,
-            list(payload.keys()),
-            message_count,
-            payload.get("stream_mode"),
-        )
-        # For long-running SSE streams, avoid aiohttp total timeout.
-        # Use socket read timeout so active heartbeats/chunks can keep the stream alive.
-        stream_timeout = ClientTimeout(
-            total=None,
-            connect=min(timeout, 30),
-            sock_connect=min(timeout, 30),
-            sock_read=timeout,
-        )
-        async with session.post(
-            url,
-            json=payload,
-            headers={
-                **self.headers,
-                "Accept": "text/event-stream",
-                "Content-Type": "application/json",
-            },
-            timeout=stream_timeout,
-            proxy=self.proxy,
-        ) as resp:
-            if resp.status != 200:
-                text = await resp.text()
-                raise Exception(
-                    f"DeerFlow runs/stream request failed: {resp.status}. {text}",
-                )
-            async for event in _stream_sse(resp):
-                yield event
-
-    async def close(self) -> None:
-        session = self._session
-        if session is None:
-            self._closed = True
-            return
-
-        if session.closed:
-            self._session = None
-            self._closed = True
-            return
-
-        try:
-            await session.close()
-        except Exception as e:
-            logger.warning(
-                "Failed to close DeerFlowAPIClient session cleanly: %s",
-                e,
-                exc_info=True,
-            )
-        finally:
-            # Cleanup is best-effort and should not make teardown paths fail loudly.
-            self._session = None
-            self._closed = True
-
-    def __del__(self) -> None:
-        session = getattr(self, "_session", None)
-        closed = bool(getattr(self, "_closed", False))
-        if closed or session is None or session.closed:
-            return
-        logger.warning(
-            "DeerFlowAPIClient garbage collected with unclosed session; "
-            "explicit close() should be called by runner lifecycle (or `async with`)."
-        )
-
-    @property
-    def is_closed(self) -> bool:
-        return self._closed

astrbot/core/agent/runners/deerflow/deerflow_content_mapper.py

@@ -1,190 +0,0 @@
-import base64
-from collections.abc import Callable
-from typing import Any
-
-import astrbot.core.message.components as Comp
-from astrbot import logger
-from astrbot.core.message.message_event_result import MessageChain
-
-from .deerflow_stream_utils import extract_text
-
-
-def is_likely_base64_image(value: str) -> bool:
-    if " " in value:
-        return False
-
-    compact = value.replace("\n", "").replace("\r", "")
-    if not compact or len(compact) < 32 or len(compact) % 4 != 0:
-        return False
-
-    base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
-    if any(ch not in base64_chars for ch in compact):
-        return False
-    try:
-        base64.b64decode(compact, validate=True)
-    except Exception:
-        return False
-    return True
-
-
-def build_user_content(prompt: str, image_urls: list[str]) -> Any:
-    if not image_urls:
-        return prompt
-
-    content: list[dict[str, Any]] = []
-    skipped_invalid_images = 0
-    any_valid_image = False
-    if prompt:
-        content.append({"type": "text", "text": prompt})
-
-    for image_url in image_urls:
-        url = image_url
-        if not isinstance(url, str):
-            skipped_invalid_images += 1
-            logger.debug(
-                "Skipped DeerFlow image input because value is not a string: %r",
-                type(image_url).__name__,
-            )
-            continue
-        url = url.strip()
-        if not url:
-            skipped_invalid_images += 1
-            logger.debug("Skipped DeerFlow image input because value is empty.")
-            continue
-        if url.startswith(("http://", "https://", "data:")):
-            content.append({"type": "image_url", "image_url": {"url": url}})
-            any_valid_image = True
-            continue
-        if not is_likely_base64_image(url):
-            skipped_invalid_images += 1
-            logger.debug(
-                "Skipped DeerFlow image input because it is neither URL/data URI nor valid base64."
-            )
-            continue
-        compact_base64 = url.replace("\n", "").replace("\r", "")
-        content.append(
-            {
-                "type": "image_url",
-                "image_url": {"url": f"data:image/png;base64,{compact_base64}"},
-            },
-        )
-        any_valid_image = True
-
-    if skipped_invalid_images:
-        note_text = (
-            "Note: some images could not be processed and were ignored."
-            if any_valid_image
-            else "Note: none of the provided images could be processed."
-        )
-        content.insert(0, {"type": "text", "text": note_text})
-        if not any_valid_image:
-            logger.warning(
-                "All %d provided DeerFlow image inputs were rejected as invalid or unsupported.",
-                skipped_invalid_images,
-            )
-        else:
-            logger.info(
-                "%d DeerFlow image input(s) were rejected as invalid or unsupported.",
-                skipped_invalid_images,
-            )
-        logger.debug(
-            "Skipped %d DeerFlow image inputs that were neither URL/data URI nor valid base64.",
-            skipped_invalid_images,
-        )
-    return content
-
-
-def image_component_from_url(url: Any) -> Comp.Image | None:
-    if not isinstance(url, str):
-        return None
-
-    normalized = url.strip()
-    if not normalized:
-        return None
-
-    if normalized.startswith(("http://", "https://")):
-        try:
-            return Comp.Image.fromURL(normalized)
-        except Exception:
-            return None
-
-    if not normalized.startswith("data:"):
-        return None
-
-    header, sep, payload = normalized.partition(",")
-    if not sep:
-        return None
-    if ";base64" not in header.lower():
-        return None
-
-    compact_payload = payload.replace("\n", "").replace("\r", "").strip()
-    if not compact_payload:
-        return None
-    try:
-        base64.b64decode(compact_payload, validate=True)
-    except Exception:
-        return None
-    return Comp.Image.fromBase64(compact_payload)
-
-
-def append_components_from_content(
-    content: Any,
-    components: list[Comp.BaseMessageComponent],
-    image_resolver: Callable[[Any], Comp.Image | None],
-) -> None:
-    if isinstance(content, str):
-        if content:
-            components.append(Comp.Plain(content))
-        return
-
-    if isinstance(content, list):
-        for item in content:
-            append_components_from_content(item, components, image_resolver)
-        return
-
-    if not isinstance(content, dict):
-        return
-
-    item_type = str(content.get("type", "")).lower()
-    if item_type == "text" and isinstance(content.get("text"), str):
-        text = content["text"]
-        if text:
-            components.append(Comp.Plain(text))
-        return
-
-    if item_type == "image_url":
-        image_payload = content.get("image_url")
-        image_url: Any = image_payload
-        if isinstance(image_payload, dict):
-            image_url = image_payload.get("url")
-        image_comp = image_resolver(image_url)
-        if image_comp is not None:
-            components.append(image_comp)
-        return
-
-    if "content" in content:
-        append_components_from_content(
-            content.get("content"), components, image_resolver
-        )
-        return
-
-    kwargs = content.get("kwargs")
-    if isinstance(kwargs, dict) and "content" in kwargs:
-        append_components_from_content(
-            kwargs.get("content"), components, image_resolver
-        )
-
-
-def build_chain_from_ai_content(
-    content: Any,
-    image_resolver: Callable[[Any], Comp.Image | None],
-) -> MessageChain:
-    components: list[Comp.BaseMessageComponent] = []
-    append_components_from_content(content, components, image_resolver)
-    if components:
-        return MessageChain(chain=components)
-
-    fallback_text = extract_text(content)
-    if fallback_text:
-        return MessageChain(chain=[Comp.Plain(fallback_text)])
-    return MessageChain()

astrbot/core/agent/runners/deerflow/deerflow_stream_utils.py

@@ -1,201 +0,0 @@
-import typing as T
-from collections.abc import Iterable
-
-
-def extract_text(content: T.Any) -> str:
-    if isinstance(content, str):
-        return content
-    if isinstance(content, dict):
-        if isinstance(content.get("text"), str):
-            return content["text"]
-        if "content" in content:
-            return extract_text(content.get("content"))
-        if "kwargs" in content and isinstance(content["kwargs"], dict):
-            return extract_text(content["kwargs"].get("content"))
-    if isinstance(content, list):
-        parts: list[str] = []
-        for item in content:
-            if isinstance(item, str):
-                parts.append(item)
-            elif isinstance(item, dict):
-                item_type = item.get("type")
-                if item_type == "text" and isinstance(item.get("text"), str):
-                    parts.append(item["text"])
-                elif "content" in item:
-                    parts.append(extract_text(item["content"]))
-        return "\n".join([p for p in parts if p]).strip()
-    return str(content) if content is not None else ""
-
-
-def extract_messages_from_values_data(data: T.Any) -> list[T.Any]:
-    """Extract messages list from possible values event payload shapes."""
-    candidates: list[T.Any] = []
-    if isinstance(data, dict):
-        candidates.append(data)
-        if isinstance(data.get("values"), dict):
-            candidates.append(data["values"])
-    elif isinstance(data, list):
-        candidates.extend([x for x in data if isinstance(x, dict)])
-
-    for item in candidates:
-        messages = item.get("messages")
-        if isinstance(messages, list):
-            return messages
-    return []
-
-
-def is_ai_message(message: dict[str, T.Any]) -> bool:
-    role = str(message.get("role", "")).lower()
-    if role in {"assistant", "ai"}:
-        return True
-
-    msg_type = str(message.get("type", "")).lower()
-    if msg_type in {"ai", "assistant", "aimessage", "aimessagechunk"}:
-        return True
-    if "ai" in msg_type and all(
-        token not in msg_type for token in ("human", "tool", "system")
-    ):
-        return True
-    return False
-
-
-def extract_latest_ai_text(messages: Iterable[T.Any]) -> str:
-    # Scan backwards to get the latest assistant/ai message text.
-    if isinstance(messages, (list, tuple)):
-        iterable = reversed(messages)
-    else:
-        # Fallback for generic iterables (e.g. generators).
-        iterable = reversed(list(messages))
-
-    for msg in iterable:
-        if not isinstance(msg, dict):
-            continue
-        if is_ai_message(msg):
-            text = extract_text(msg.get("content"))
-            if text:
-                return text
-    return ""
-
-
-def extract_latest_ai_message(messages: Iterable[T.Any]) -> dict[str, T.Any] | None:
-    if isinstance(messages, (list, tuple)):
-        iterable = reversed(messages)
-    else:
-        iterable = reversed(list(messages))
-
-    for msg in iterable:
-        if not isinstance(msg, dict):
-            continue
-        if is_ai_message(msg):
-            return msg
-    return None
-
-
-def is_clarification_tool_message(message: dict[str, T.Any]) -> bool:
-    msg_type = str(message.get("type", "")).lower()
-    tool_name = str(message.get("name", "")).lower()
-    return msg_type == "tool" and tool_name == "ask_clarification"
-
-
-def extract_latest_clarification_text(messages: Iterable[T.Any]) -> str:
-    if isinstance(messages, (list, tuple)):
-        iterable = reversed(messages)
-    else:
-        iterable = reversed(list(messages))
-
-    for msg in iterable:
-        if not isinstance(msg, dict):
-            continue
-        if is_clarification_tool_message(msg):
-            text = extract_text(msg.get("content"))
-            if text:
-                return text
-    return ""
-
-
-def get_message_id(message: T.Any) -> str:
-    if not isinstance(message, dict):
-        return ""
-    msg_id = message.get("id")
-    return msg_id if isinstance(msg_id, str) else ""
-
-
-def extract_event_message_obj(data: T.Any) -> dict[str, T.Any] | None:
-    msg_obj = data
-    if isinstance(data, (list, tuple)) and data:
-        msg_obj = data[0]
-    if isinstance(msg_obj, dict) and isinstance(msg_obj.get("data"), dict):
-        # Some servers wrap message body in {"data": {...}}
-        msg_obj = msg_obj["data"]
-    return msg_obj if isinstance(msg_obj, dict) else None
-
-
-def extract_ai_delta_from_event_data(data: T.Any) -> str:
-    # LangGraph messages-tuple events usually carry either:
-    # - {"type": "ai", "content": "..."}
-    # - [message_obj, metadata]
-    msg_obj = extract_event_message_obj(data)
-    if not msg_obj:
-        return ""
-    if is_ai_message(msg_obj):
-        return extract_text(msg_obj.get("content"))
-    return ""
-
-
-def extract_clarification_from_event_data(data: T.Any) -> str:
-    msg_obj = extract_event_message_obj(data)
-    if not msg_obj:
-        return ""
-    if is_clarification_tool_message(msg_obj):
-        return extract_text(msg_obj.get("content"))
-    return ""
-
-
-def _iter_custom_event_items(data: T.Any) -> list[dict[str, T.Any]]:
-    items: list[dict[str, T.Any]] = []
-    if isinstance(data, dict):
-        return [data]
-    if isinstance(data, list):
-        for item in data:
-            if isinstance(item, dict):
-                items.append(item)
-            elif isinstance(item, (list, tuple)):
-                for nested in item:
-                    if isinstance(nested, dict):
-                        items.append(nested)
-    return items
-
-
-def extract_task_failures_from_custom_event(data: T.Any) -> list[str]:
-    failures: list[str] = []
-    for item in _iter_custom_event_items(data):
-        event_type = str(item.get("type", "")).lower()
-        if event_type not in {"task_failed", "task_timed_out"}:
-            continue
-
-        task_id = str(item.get("task_id", "")).strip()
-        error_text = extract_text(item.get("error")).strip()
-        if task_id and error_text:
-            failures.append(f"{task_id}: {error_text}")
-        elif error_text:
-            failures.append(error_text)
-        elif task_id:
-            failures.append(f"{task_id}: unknown error")
-        else:
-            failures.append("unknown task failure")
-    return failures
-
-
-def build_task_failure_summary(failures: list[str]) -> str:
-    if not failures:
-        return ""
-    deduped: list[str] = []
-    seen: set[str] = set()
-    for failure in failures:
-        if failure not in seen:
-            seen.add(failure)
-            deduped.append(failure)
-    if len(deduped) == 1:
-        return f"DeerFlow subtask failed: {deduped[0]}"
-    joined = "\n".join([f"- {item}" for item in deduped[:5]])
-    return f"DeerFlow subtasks failed:\n{joined}"

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

@@ -10,7 +10,7 @@ from astrbot.core.provider.entities import (
     LLMResponse,
     ProviderRequest,
 )
-from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 from astrbot.core.utils.io import download_file
 
 from ...hooks import BaseAgentRunHooks
@@ -291,8 +291,8 @@ class DifyAgentRunner(BaseAgentRunner[TContext]):
                     return Comp.Image(file=item["url"], url=item["url"])
                 case "audio":
                     # 仅支持 wav
-                    temp_dir = get_astrbot_temp_path()
-                    path = os.path.join(temp_dir, f"dify_{item['filename']}.wav")
+                    temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+                    path = os.path.join(temp_dir, f"{item['filename']}.wav")
                     await download_file(item["url"], path)
                     return Comp.Image(file=item["url"], url=item["url"])
                 case "video":

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

@@ -31,7 +31,7 @@ async def _stream_sse(resp: ClientResponse) -> AsyncGenerator[dict, None]:
 
 
 class DifyAPIClient:
-    def __init__(self, api_key: str, api_base: str = "https://api.dify.ai/v1") -> None:
+    def __init__(self, api_key: str, api_base: str = "https://api.dify.ai/v1"):
         self.api_key = api_key
         self.api_base = api_base
         self.session = ClientSession(trust_env=True)
@@ -155,7 +155,7 @@ class DifyAPIClient:
                 raise Exception(f"Dify 文件上传失败：{resp.status}. {text}")
             return await resp.json()  # {"id": "xxx", ...}
 
-    async def close(self) -> None:
+    async def close(self):
         await self.session.close()
 
     async def get_chat_convs(self, user: str, limit: int = 20):

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -1,10 +1,8 @@
-import asyncio
 import copy
 import sys
 import time
 import traceback
 import typing as T
-from dataclasses import dataclass, field
 
 from mcp.types import (
     BlobResourceContents,
@@ -16,16 +14,12 @@ from mcp.types import (
 )
 
 from astrbot import logger
-from astrbot.core.agent.message import ImageURLPart, TextPart, ThinkPart
+from astrbot.core.agent.message import TextPart, ThinkPart
 from astrbot.core.agent.tool import ToolSet
-from astrbot.core.agent.tool_image_cache import tool_image_cache
 from astrbot.core.message.components import Json
 from astrbot.core.message.message_event_result import (
     MessageChain,
 )
-from astrbot.core.persona_error_reply import (
-    extract_persona_custom_error_message_from_event,
-)
 from astrbot.core.provider.entities import (
     LLMResponse,
     ProviderRequest,
@@ -50,42 +44,7 @@ else:
     from typing_extensions import override
 
 
-@dataclass(slots=True)
-class _HandleFunctionToolsResult:
-    kind: T.Literal["message_chain", "tool_call_result_blocks", "cached_image"]
-    message_chain: MessageChain | None = None
-    tool_call_result_blocks: list[ToolCallMessageSegment] | None = None
-    cached_image: T.Any = None
-
-    @classmethod
-    def from_message_chain(cls, chain: MessageChain) -> "_HandleFunctionToolsResult":
-        return cls(kind="message_chain", message_chain=chain)
-
-    @classmethod
-    def from_tool_call_result_blocks(
-        cls, blocks: list[ToolCallMessageSegment]
-    ) -> "_HandleFunctionToolsResult":
-        return cls(kind="tool_call_result_blocks", tool_call_result_blocks=blocks)
-
-    @classmethod
-    def from_cached_image(cls, image: T.Any) -> "_HandleFunctionToolsResult":
-        return cls(kind="cached_image", cached_image=image)
-
-
-@dataclass(slots=True)
-class FollowUpTicket:
-    seq: int
-    text: str
-    consumed: bool = False
-    resolved: asyncio.Event = field(default_factory=asyncio.Event)
-
-
 class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
-    def _get_persona_custom_error_message(self) -> str | None:
-        """Read persona-level custom error message from event extras when available."""
-        event = getattr(self.run_context.context, "event", None)
-        return extract_persona_custom_error_message_from_event(event)
-
     @override
     async def reset(
         self,
@@ -108,7 +67,6 @@ 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
@@ -138,26 +96,11 @@ 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
-        self._pending_follow_ups: list[FollowUpTicket] = []
-        self._follow_up_seq = 0
 
         # These two are used for tool schema mode handling
         # We now have two modes:
@@ -182,10 +125,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         messages = []
         # append existing messages in the run context
         for msg in request.contexts:
-            m = Message.model_validate(msg)
-            if isinstance(msg, dict) and msg.get("_no_save"):
-                m._no_save = True
-            messages.append(m)
+            messages.append(Message.model_validate(msg))
         if request.prompt is not None:
             m = await request.assemble_context()
             messages.append(Message.model_validate(m))
@@ -199,19 +139,16 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         self.stats = AgentStats()
         self.stats.start_time = time.time()
 
-    async def _iter_llm_responses(
-        self, *, include_model: bool = True
-    ) -> T.AsyncGenerator[LLMResponse, None]:
+    async def _iter_llm_responses(self) -> 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
@@ -219,132 +156,6 @@ 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:
-            roles.append(message.role)
-        logger.debug(f"{tag} RunCtx.messages -> [{len(roles)}] {','.join(roles)}")
-
-    def follow_up(
-        self,
-        *,
-        message_text: str,
-    ) -> FollowUpTicket | None:
-        """Queue a follow-up message for the next tool result."""
-        if self.done():
-            return None
-        text = (message_text or "").strip()
-        if not text:
-            return None
-        ticket = FollowUpTicket(seq=self._follow_up_seq, text=text)
-        self._follow_up_seq += 1
-        self._pending_follow_ups.append(ticket)
-        return ticket
-
-    def _resolve_unconsumed_follow_ups(self) -> None:
-        if not self._pending_follow_ups:
-            return
-        follow_ups = self._pending_follow_ups
-        self._pending_follow_ups = []
-        for ticket in follow_ups:
-            ticket.resolved.set()
-
-    def _consume_follow_up_notice(self) -> str:
-        if not self._pending_follow_ups:
-            return ""
-        follow_ups = self._pending_follow_ups
-        self._pending_follow_ups = []
-        for ticket in follow_ups:
-            ticket.consumed = True
-            ticket.resolved.set()
-        follow_up_lines = "\n".join(
-            f"{idx}. {ticket.text}" for idx, ticket in enumerate(follow_ups, start=1)
-        )
-        return (
-            "\n\n[SYSTEM NOTICE] User sent follow-up messages while tool execution "
-            "was in progress. Prioritize these follow-up instructions in your next "
-            "actions. In your very next action, briefly acknowledge to the user "
-            "that their follow-up message(s) were received before continuing.\n"
-            f"{follow_up_lines}"
-        )
-
-    def _merge_follow_up_notice(self, content: str) -> str:
-        notice = self._consume_follow_up_notice()
-        if not notice:
-            return content
-        return f"{content}{notice}"
-
     @override
     async def step(self):
         """Process a single step of the agent.
@@ -365,13 +176,11 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
 
         # do truncate and compress
         token_usage = self.req.conversation.token_usage if self.req.conversation else 0
-        self._simple_print_message_role("[BefCompact]")
         self.run_context.messages = await self.context_manager.process(
             self.run_context.messages, trusted_token_usage=token_usage
         )
-        self._simple_print_message_role("[AftCompact]")
 
-        async for llm_response in self._iter_llm_responses_with_fallback():
+        async for llm_response in self._iter_llm_responses():
             if llm_response.is_chunk:
                 # update ttft
                 if self.stats.time_to_first_token == 0:
@@ -398,14 +207,6 @@ 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
 
@@ -417,49 +218,6 @@ 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")),
-            )
-            self._resolve_unconsumed_follow_ups()
             return
 
         # 处理 LLM 响应
@@ -470,18 +228,14 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             self.final_llm_resp = llm_resp
             self.stats.end_time = time.time()
             self._transition_state(AgentState.ERROR)
-            self._resolve_unconsumed_follow_ups()
-            custom_error_message = self._get_persona_custom_error_message()
-            error_text = custom_error_message or (
-                f"LLM 响应错误: {llm_resp.completion_text or '未知错误'}"
-            )
             yield AgentResponse(
                 type="err",
                 data=AgentResponseData(
-                    chain=MessageChain().message(error_text),
+                    chain=MessageChain().message(
+                        f"LLM 响应错误: {llm_resp.completion_text or '未知错误'}",
+                    ),
                 ),
             )
-            return
 
         if not llm_resp.tools_call_name:
             # 如果没有工具调用，转换到完成状态
@@ -500,10 +254,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                 )
             if llm_resp.completion_text:
                 parts.append(TextPart(text=llm_resp.completion_text))
-            if len(parts) == 0:
-                logger.warning(
-                    "LLM returned empty assistant message with no tool calls."
-                )
             self.run_context.messages.append(Message(role="assistant", content=parts))
 
             # call the on_agent_done hook
@@ -511,7 +261,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                 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)
-            self._resolve_unconsumed_follow_ups()
 
         # 返回 LLM 结果
         if llm_resp.result_chain:
@@ -533,27 +282,20 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                 llm_resp, _ = await self._resolve_tool_exec(llm_resp)
 
             tool_call_result_blocks = []
-            cached_images = []  # Collect cached images for LLM visibility
             async for result in self._handle_function_tools(self.req, llm_resp):
-                if result.kind == "tool_call_result_blocks":
-                    if result.tool_call_result_blocks is not None:
-                        tool_call_result_blocks = result.tool_call_result_blocks
-                elif result.kind == "cached_image":
-                    if result.cached_image is not None:
-                        # Collect cached image info
-                        cached_images.append(result.cached_image)
-                elif result.kind == "message_chain":
-                    chain = result.message_chain
-                    if chain is None or chain.type is None:
+                if isinstance(result, list):
+                    tool_call_result_blocks = result
+                elif isinstance(result, MessageChain):
+                    if result.type is None:
                         # should not happen
                         continue
-                    if chain.type == "tool_direct_result":
+                    if result.type == "tool_direct_result":
                         ar_type = "tool_call_result"
                     else:
-                        ar_type = chain.type
+                        ar_type = result.type
                     yield AgentResponse(
                         type=ar_type,
-                        data=AgentResponseData(chain=chain),
+                        data=AgentResponseData(chain=result),
                     )
 
             # 将结果添加到上下文中
@@ -567,8 +309,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                 )
             if llm_resp.completion_text:
                 parts.append(TextPart(text=llm_resp.completion_text))
-            if len(parts) == 0:
-                parts = None
             tool_calls_result = ToolCallsResult(
                 tool_calls_info=AssistantMessageSegment(
                     tool_calls=llm_resp.to_openai_to_calls_model(),
@@ -581,41 +321,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                 tool_calls_result.to_openai_messages_model()
             )
 
-            # If there are cached images and the model supports image input,
-            # append a user message with images so LLM can see them
-            if cached_images:
-                modalities = self.provider.provider_config.get("modalities", [])
-                supports_image = "image" in modalities
-                if supports_image:
-                    # Build user message with images for LLM to review
-                    image_parts = []
-                    for cached_img in cached_images:
-                        img_data = tool_image_cache.get_image_base64_by_path(
-                            cached_img.file_path, cached_img.mime_type
-                        )
-                        if img_data:
-                            base64_data, mime_type = img_data
-                            image_parts.append(
-                                TextPart(
-                                    text=f"[Image from tool '{cached_img.tool_name}', path='{cached_img.file_path}']"
-                                )
-                            )
-                            image_parts.append(
-                                ImageURLPart(
-                                    image_url=ImageURLPart.ImageURL(
-                                        url=f"data:{mime_type};base64,{base64_data}",
-                                        id=cached_img.file_path,
-                                    )
-                                )
-                            )
-                    if image_parts:
-                        self.run_context.messages.append(
-                            Message(role="user", content=image_parts)
-                        )
-                        logger.debug(
-                            f"Appended {len(cached_images)} cached image(s) to context for LLM review"
-                        )
-
             self.req.append_tool_calls_result(tool_calls_result)
 
     async def step_until_done(
@@ -651,65 +356,29 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         self,
         req: ProviderRequest,
         llm_response: LLMResponse,
-    ) -> T.AsyncGenerator[_HandleFunctionToolsResult, None]:
+    ) -> T.AsyncGenerator[MessageChain | list[ToolCallMessageSegment], None]:
         """处理函数工具调用。"""
         tool_call_result_blocks: list[ToolCallMessageSegment] = []
         logger.info(f"Agent 使用工具: {llm_response.tools_call_name}")
 
-        def _append_tool_call_result(tool_call_id: str, content: str) -> None:
-            tool_call_result_blocks.append(
-                ToolCallMessageSegment(
-                    role="tool",
-                    tool_call_id=tool_call_id,
-                    content=self._merge_follow_up_notice(content),
-                ),
-            )
-
-        def _handle_image_content(
-            base64_data: str,
-            mime_type: str,
-            tool_call_id: str,
-            tool_name: str,
-            content_index: int,
-        ) -> _HandleFunctionToolsResult:
-            """Helper to cache image and return result for LLM visibility."""
-            cached_img = tool_image_cache.save_image(
-                base64_data=base64_data,
-                tool_call_id=tool_call_id,
-                tool_name=tool_name,
-                index=content_index,
-                mime_type=mime_type,
-            )
-            _append_tool_call_result(
-                tool_call_id,
-                (
-                    f"Image returned and cached at path='{cached_img.file_path}'. "
-                    f"Review the image below. Use send_message_to_user to send it to the user if satisfied, "
-                    f"with type='image' and path='{cached_img.file_path}'."
-                ),
-            )
-            return _HandleFunctionToolsResult.from_cached_image(cached_img)
-
         # 执行函数调用
         for func_tool_name, func_tool_args, func_tool_id in zip(
             llm_response.tools_call_name,
             llm_response.tools_call_args,
             llm_response.tools_call_ids,
         ):
-            yield _HandleFunctionToolsResult.from_message_chain(
-                MessageChain(
-                    type="tool_call",
-                    chain=[
-                        Json(
-                            data={
-                                "id": func_tool_id,
-                                "name": func_tool_name,
-                                "args": func_tool_args,
-                                "ts": time.time(),
-                            }
-                        )
-                    ],
-                )
+            yield MessageChain(
+                type="tool_call",
+                chain=[
+                    Json(
+                        data={
+                            "id": func_tool_id,
+                            "name": func_tool_name,
+                            "args": func_tool_args,
+                            "ts": time.time(),
+                        }
+                    )
+                ],
             )
             try:
                 if not req.func_tool:
@@ -729,9 +398,12 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
 
                 if not func_tool:
                     logger.warning(f"未找到指定的工具: {func_tool_name}，将跳过。")
-                    _append_tool_call_result(
-                        func_tool_id,
-                        f"error: Tool {func_tool_name} not found.",
+                    tool_call_result_blocks.append(
+                        ToolCallMessageSegment(
+                            role="tool",
+                            tool_call_id=func_tool_id,
+                            content=f"error: Tool {func_tool_name} not found.",
+                        ),
                     )
                     continue
 
@@ -783,47 +455,58 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                     if isinstance(resp, CallToolResult):
                         res = resp
                         _final_resp = resp
-                        # Process all content items in the result
-                        for content_index, content in enumerate(res.content):
-                            if isinstance(content, TextContent):
-                                _append_tool_call_result(
-                                    func_tool_id,
-                                    content.text,
-                                )
-                            elif isinstance(content, ImageContent):
-                                # Cache the image instead of sending directly
-                                yield _handle_image_content(
-                                    base64_data=content.data,
-                                    mime_type=content.mimeType or "image/png",
+                        if isinstance(res.content[0], TextContent):
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
                                     tool_call_id=func_tool_id,
-                                    tool_name=func_tool_name,
-                                    content_index=content_index,
-                                )
-                            elif isinstance(content, EmbeddedResource):
-                                resource = content.resource
-                                if isinstance(resource, TextResourceContents):
-                                    _append_tool_call_result(
-                                        func_tool_id,
-                                        resource.text,
-                                    )
-                                elif (
-                                    isinstance(resource, BlobResourceContents)
-                                    and resource.mimeType
-                                    and resource.mimeType.startswith("image/")
-                                ):
-                                    # Cache the image instead of sending directly
-                                    yield _handle_image_content(
-                                        base64_data=resource.blob,
-                                        mime_type=resource.mimeType,
+                                    content=res.content[0].text,
+                                ),
+                            )
+                        elif isinstance(res.content[0], ImageContent):
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
+                                    tool_call_id=func_tool_id,
+                                    content="The tool has successfully returned an image and sent directly to the user. You can describe it in your next response.",
+                                ),
+                            )
+                            yield MessageChain(type="tool_direct_result").base64_image(
+                                res.content[0].data,
+                            )
+                        elif isinstance(res.content[0], EmbeddedResource):
+                            resource = res.content[0].resource
+                            if isinstance(resource, TextResourceContents):
+                                tool_call_result_blocks.append(
+                                    ToolCallMessageSegment(
+                                        role="tool",
                                         tool_call_id=func_tool_id,
-                                        tool_name=func_tool_name,
-                                        content_index=content_index,
-                                    )
-                                else:
-                                    _append_tool_call_result(
-                                        func_tool_id,
-                                        "The tool has returned a data type that is not supported.",
-                                    )
+                                        content=resource.text,
+                                    ),
+                                )
+                            elif (
+                                isinstance(resource, BlobResourceContents)
+                                and resource.mimeType
+                                and resource.mimeType.startswith("image/")
+                            ):
+                                tool_call_result_blocks.append(
+                                    ToolCallMessageSegment(
+                                        role="tool",
+                                        tool_call_id=func_tool_id,
+                                        content="The tool has successfully returned an image and sent directly to the user. You can describe it in your next response.",
+                                    ),
+                                )
+                                yield MessageChain(
+                                    type="tool_direct_result",
+                                ).base64_image(resource.blob)
+                            else:
+                                tool_call_result_blocks.append(
+                                    ToolCallMessageSegment(
+                                        role="tool",
+                                        tool_call_id=func_tool_id,
+                                        content="The tool has returned a data type that is not supported.",
+                                    ),
+                                )
 
                     elif resp is None:
                         # Tool 直接请求发送消息给用户
@@ -834,18 +517,24 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                         )
                         self._transition_state(AgentState.DONE)
                         self.stats.end_time = time.time()
-                        _append_tool_call_result(
-                            func_tool_id,
-                            "The tool has no return value, or has sent the result directly to the user.",
+                        tool_call_result_blocks.append(
+                            ToolCallMessageSegment(
+                                role="tool",
+                                tool_call_id=func_tool_id,
+                                content="The tool has no return value, or has sent the result directly to the user.",
+                            ),
                         )
                     else:
                         # 不应该出现其他类型
                         logger.warning(
                             f"Tool 返回了不支持的类型: {type(resp)}。",
                         )
-                        _append_tool_call_result(
-                            func_tool_id,
-                            "*The tool has returned an unsupported type. Please tell the user to check the definition and implementation of this tool.*",
+                        tool_call_result_blocks.append(
+                            ToolCallMessageSegment(
+                                role="tool",
+                                tool_call_id=func_tool_id,
+                                content="*The tool has returned an unsupported type. Please tell the user to check the definition and implementation of this tool.*",
+                            ),
                         )
 
                 try:
@@ -859,35 +548,34 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                     logger.error(f"Error in on_tool_end hook: {e}", exc_info=True)
             except Exception as e:
                 logger.warning(traceback.format_exc())
-                _append_tool_call_result(
-                    func_tool_id,
-                    f"error: {e!s}",
+                tool_call_result_blocks.append(
+                    ToolCallMessageSegment(
+                        role="tool",
+                        tool_call_id=func_tool_id,
+                        content=f"error: {e!s}",
+                    ),
                 )
 
         # yield the last tool call result
         if tool_call_result_blocks:
             last_tcr_content = str(tool_call_result_blocks[-1].content)
-            yield _HandleFunctionToolsResult.from_message_chain(
-                MessageChain(
-                    type="tool_call_result",
-                    chain=[
-                        Json(
-                            data={
-                                "id": func_tool_id,
-                                "ts": time.time(),
-                                "result": last_tcr_content,
-                            }
-                        )
-                    ],
-                )
+            yield MessageChain(
+                type="tool_call_result",
+                chain=[
+                    Json(
+                        data={
+                            "id": func_tool_id,
+                            "ts": time.time(),
+                            "result": last_tcr_content,
+                        }
+                    )
+                ],
             )
             logger.info(f"Tool `{func_tool_name}` Result: {last_tcr_content}")
 
         # 处理函数调用响应
         if tool_call_result_blocks:
-            yield _HandleFunctionToolsResult.from_tool_call_result_blocks(
-                tool_call_result_blocks
-            )
+            yield tool_call_result_blocks
 
     def _build_tool_requery_context(
         self, tool_names: list[str]
@@ -958,11 +646,5 @@ 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

@@ -63,13 +63,8 @@ class FunctionTool(ToolSchema, Generic[TContext]):
     Declare this tool as a background task. Background tasks return immediately
     with a task identifier while the real work continues asynchronously.
     """
-    source: str = "plugin"
-    """
-    Origin of this tool: 'plugin' (from star plugins), 'internal' (AstrBot built-in),
-    or 'mcp' (from MCP servers). Used by WebUI for display grouping.
-    """
 
-    def __repr__(self) -> str:
+    def __repr__(self):
         return f"FuncTool(name={self.name}, parameters={self.parameters}, description={self.description})"
 
     async def call(self, context: ContextWrapper[TContext], **kwargs) -> ToolExecResult:
@@ -93,7 +88,7 @@ class ToolSet:
         """Check if the tool set is empty."""
         return len(self.tools) == 0
 
-    def add_tool(self, tool: FunctionTool) -> None:
+    def add_tool(self, tool: FunctionTool):
         """Add a tool to the set."""
         # 检查是否已存在同名工具
         for i, existing_tool in enumerate(self.tools):
@@ -102,19 +97,10 @@ class ToolSet:
                 return
         self.tools.append(tool)
 
-    def remove_tool(self, name: str) -> None:
+    def remove_tool(self, name: str):
         """Remove a tool by its name."""
         self.tools = [tool for tool in self.tools if tool.name != name]
 
-    def normalize(self) -> None:
-        """Sort tools by name for deterministic serialization.
-
-        This ensures the serialized tool schema sent to the LLM is
-        identical across requests regardless of registration/injection
-        order, enabling LLM provider prefix cache hits.
-        """
-        self.tools.sort(key=lambda t: t.name)
-
     def get_tool(self, name: str) -> FunctionTool | None:
         """Get a tool by its name."""
         for tool in self.tools:
@@ -170,7 +156,7 @@ class ToolSet:
         func_args: list,
         desc: str,
         handler: Callable[..., Awaitable[Any]],
-    ) -> None:
+    ):
         """Add a function tool to the set."""
         params = {
             "type": "object",  # hard-coded here
@@ -190,7 +176,7 @@ class ToolSet:
         self.add_tool(_func)
 
     @deprecated(reason="Use remove_tool() instead", version="4.0.0")
-    def remove_func(self, name: str) -> None:
+    def remove_func(self, name: str):
         """Remove a function tool by its name."""
         self.remove_tool(name)
 
@@ -260,18 +246,8 @@ class ToolSet:
 
             result = {}
 
-            # Avoid side effects by not modifying the original schema
-            origin_type = schema.get("type")
-            target_type = origin_type
-
-            # Compatibility fix: Gemini API expects 'type' to be a string (enum),
-            # but standard JSON Schema (MCP) allows lists (e.g. ["string", "null"]).
-            # We fallback to the first non-null type.
-            if isinstance(origin_type, list):
-                target_type = next((t for t in origin_type if t != "null"), "string")
-
-            if target_type in supported_types:
-                result["type"] = target_type
+            if "type" in schema and schema["type"] in supported_types:
+                result["type"] = schema["type"]
                 if "format" in schema and schema["format"] in supported_formats.get(
                     result["type"],
                     set(),
@@ -299,9 +275,6 @@ 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:
@@ -342,22 +315,22 @@ class ToolSet:
         """获取所有工具的名称列表"""
         return [tool.name for tool in self.tools]
 
-    def merge(self, other: "ToolSet") -> None:
+    def merge(self, other: "ToolSet"):
         """Merge another ToolSet into this one."""
         for tool in other.tools:
             self.add_tool(tool)
 
-    def __len__(self) -> int:
+    def __len__(self):
         return len(self.tools)
 
-    def __bool__(self) -> bool:
+    def __bool__(self):
         return len(self.tools) > 0
 
     def __iter__(self):
         return iter(self.tools)
 
-    def __repr__(self) -> str:
+    def __repr__(self):
         return f"ToolSet(tools={self.tools})"
 
-    def __str__(self) -> str:
+    def __str__(self):
         return f"ToolSet(tools={self.tools})"

astrbot/core/agent/tool_image_cache.py

@@ -1,162 +0,0 @@
-"""Tool image cache module for storing and retrieving images returned by tools.
-
-This module allows LLM to review images before deciding whether to send them to users.
-"""
-
-import base64
-import os
-import time
-from dataclasses import dataclass, field
-from typing import ClassVar
-
-from astrbot import logger
-from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
-
-
-@dataclass
-class CachedImage:
-    """Represents a cached image from a tool call."""
-
-    tool_call_id: str
-    """The tool call ID that produced this image."""
-    tool_name: str
-    """The name of the tool that produced this image."""
-    file_path: str
-    """The file path where the image is stored."""
-    mime_type: str
-    """The MIME type of the image."""
-    created_at: float = field(default_factory=time.time)
-    """Timestamp when the image was cached."""
-
-
-class ToolImageCache:
-    """Manages cached images from tool calls.
-
-    Images are stored in data/temp/tool_images/ and can be retrieved by file path.
-    """
-
-    _instance: ClassVar["ToolImageCache | None"] = None
-    CACHE_DIR_NAME: ClassVar[str] = "tool_images"
-    # Cache expiry time in seconds (1 hour)
-    CACHE_EXPIRY: ClassVar[int] = 3600
-
-    def __new__(cls) -> "ToolImageCache":
-        if cls._instance is None:
-            cls._instance = super().__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
-    def __init__(self) -> None:
-        if self._initialized:
-            return
-        self._initialized = True
-        self._cache_dir = os.path.join(get_astrbot_temp_path(), self.CACHE_DIR_NAME)
-        os.makedirs(self._cache_dir, exist_ok=True)
-        logger.debug(f"ToolImageCache initialized, cache dir: {self._cache_dir}")
-
-    def _get_file_extension(self, mime_type: str) -> str:
-        """Get file extension from MIME type."""
-        mime_to_ext = {
-            "image/png": ".png",
-            "image/jpeg": ".jpg",
-            "image/jpg": ".jpg",
-            "image/gif": ".gif",
-            "image/webp": ".webp",
-            "image/bmp": ".bmp",
-            "image/svg+xml": ".svg",
-        }
-        return mime_to_ext.get(mime_type.lower(), ".png")
-
-    def save_image(
-        self,
-        base64_data: str,
-        tool_call_id: str,
-        tool_name: str,
-        index: int = 0,
-        mime_type: str = "image/png",
-    ) -> CachedImage:
-        """Save an image to cache and return the cached image info.
-
-        Args:
-            base64_data: Base64 encoded image data.
-            tool_call_id: The tool call ID that produced this image.
-            tool_name: The name of the tool that produced this image.
-            index: The index of the image (for multiple images from same tool call).
-            mime_type: The MIME type of the image.
-
-        Returns:
-            CachedImage object with file path.
-        """
-        ext = self._get_file_extension(mime_type)
-        file_name = f"{tool_call_id}_{index}{ext}"
-        file_path = os.path.join(self._cache_dir, file_name)
-
-        # Decode and save the image
-        try:
-            image_bytes = base64.b64decode(base64_data)
-            with open(file_path, "wb") as f:
-                f.write(image_bytes)
-            logger.debug(f"Saved tool image to: {file_path}")
-        except Exception as e:
-            logger.error(f"Failed to save tool image: {e}")
-            raise
-
-        return CachedImage(
-            tool_call_id=tool_call_id,
-            tool_name=tool_name,
-            file_path=file_path,
-            mime_type=mime_type,
-        )
-
-    def get_image_base64_by_path(
-        self, file_path: str, mime_type: str = "image/png"
-    ) -> tuple[str, str] | None:
-        """Read an image file and return its base64 encoded data.
-
-        Args:
-            file_path: The file path of the cached image.
-            mime_type: The MIME type of the image.
-
-        Returns:
-            Tuple of (base64_data, mime_type) if found, None otherwise.
-        """
-        if not os.path.exists(file_path):
-            return None
-
-        try:
-            with open(file_path, "rb") as f:
-                image_bytes = f.read()
-            base64_data = base64.b64encode(image_bytes).decode("utf-8")
-            return base64_data, mime_type
-        except Exception as e:
-            logger.error(f"Failed to read cached image {file_path}: {e}")
-            return None
-
-    def cleanup_expired(self) -> int:
-        """Clean up expired cached images.
-
-        Returns:
-            Number of images cleaned up.
-        """
-        now = time.time()
-        cleaned = 0
-
-        try:
-            for file_name in os.listdir(self._cache_dir):
-                file_path = os.path.join(self._cache_dir, file_name)
-                if os.path.isfile(file_path):
-                    file_age = now - os.path.getmtime(file_path)
-                    if file_age > self.CACHE_EXPIRY:
-                        os.remove(file_path)
-                        cleaned += 1
-        except Exception as e:
-            logger.warning(f"Error during cache cleanup: {e}")
-
-        if cleaned:
-            logger.info(f"Cleaned up {cleaned} expired cached images")
-
-        return cleaned
-
-
-# Global singleton instance
-tool_image_cache = ToolImageCache()

astrbot/core/astr_agent_hooks.py

@@ -12,7 +12,7 @@ from astrbot.core.star.star_handler import EventType
 
 
 class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
-    async def on_agent_done(self, run_context, llm_response) -> None:
+    async def on_agent_done(self, run_context, llm_response):
         # 执行事件钩子
         if llm_response and llm_response.reasoning_content:
             # we will use this in result_decorate stage to inject reasoning content to chain
@@ -31,7 +31,7 @@ class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
         run_context: ContextWrapper[AstrAgentContext],
         tool: FunctionTool[Any],
         tool_args: dict | None,
-    ) -> None:
+    ):
         await call_event_hook(
             run_context.context.event,
             EventType.OnUsingLLMToolEvent,
@@ -45,7 +45,7 @@ class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
         tool: FunctionTool[Any],
         tool_args: dict | None,
         tool_result: CallToolResult | None,
-    ) -> None:
+    ):
         run_context.context.event.clear_result()
         await call_event_hook(
             run_context.context.event,
@@ -59,7 +59,7 @@ class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
         platform_name = run_context.context.event.get_platform_name()
         if (
             platform_name == "webchat"
-            and tool.name in ["web_search_tavily", "web_search_bocha"]
+            and tool.name == "web_search_tavily"
             and len(run_context.messages) > 0
             and tool_result
             and len(tool_result.content)

astrbot/core/astr_agent_run_util.py

@@ -14,105 +14,21 @@ from astrbot.core.message.message_event_result import (
     MessageEventResult,
     ResultContentType,
 )
-from astrbot.core.persona_error_reply import (
-    extract_persona_custom_error_message_from_event,
-)
 from astrbot.core.provider.entities import LLMResponse
 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
-
-
-def _extract_final_streaming_chain(msg_chain: MessageChain) -> MessageChain | None:
-    if not msg_chain.chain:
-        return None
-
-    final_chain: list[BaseMessageComponent] = []
-    for comp in msg_chain.chain:
-        if isinstance(comp, Plain):
-            continue
-        final_chain.append(comp)
-
-    if not final_chain:
-        return None
-    return MessageChain(chain=final_chain, type=msg_chain.type)
-
-
 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
 
@@ -132,28 +48,10 @@ 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 _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)
+                if astr_event.is_stopped():
                     return
-
-                if _should_stop_agent(astr_event):
-                    continue
-
                 if resp.type == "tool_call_result":
                     msg_chain = resp.data["chain"]
 
@@ -170,13 +68,6 @@ 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":
@@ -184,22 +75,25 @@ async def run_agent(
                         # 用来标记流式响应需要分节
                         yield MessageChain(chain=[], type="break")
 
-                    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)
+                    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",
+                        )
 
                     if astr_event.get_platform_name() == "webchat":
                         await astr_event.send(resp.data["chain"])
                     elif show_tool_use:
-                        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)
-                        )
+                        if tool_info:
+                            m = f"🔨 调用工具: {tool_info.get('name', 'unknown')}"
+                        else:
+                            m = "🔨 调用工具..."
+                        chain = MessageChain(type="tool_call").message(m)
                         await astr_event.send(chain)
                     continue
 
@@ -226,17 +120,6 @@ async def run_agent(
                         # display the reasoning content only when configured
                         continue
                     yield resp.data["chain"]  # MessageChain
-                elif resp.type == "llm_result":
-                    if final_chain := _extract_final_streaming_chain(
-                        resp.data["chain"]
-                    ):
-                        yield final_chain
-            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":
@@ -250,25 +133,9 @@ 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())
 
-            custom_error_message = extract_persona_custom_error_message_from_event(
-                astr_event
-            )
-            if custom_error_message:
-                err_msg = custom_error_message
-            else:
-                err_msg = (
-                    f"Error occurred during AI execution.\n"
-                    f"Error Type: {type(e).__name__}\n"
-                    f"Error Message: {str(e)}"
-                )
+            err_msg = f"\n\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {e!s}\n\n请在平台日志查看和分享错误详情。\n"
 
             error_llm_response = LLMResponse(
                 role="err",
@@ -288,20 +155,11 @@ 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
@@ -311,7 +169,6 @@ async def run_live_agent(
         tts_provider: TTS Provider 实例
         max_step: 最大步数
         show_tool_use: 是否显示工具使用
-        show_tool_call_result: 是否显示工具返回结果
         show_reasoning: 是否显示推理过程
 
     Yields:
@@ -323,7 +180,6 @@ 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,
         ):
@@ -352,12 +208,7 @@ 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_tool_call_result,
-            show_reasoning,
+            agent_runner, text_queue, max_step, show_tool_use, show_reasoning
         )
     )
 
@@ -443,9 +294,8 @@ 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 并将文本输出分句放入队列"""
     buffer = ""
     try:
@@ -453,7 +303,6 @@ 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,
         ):
@@ -503,7 +352,7 @@ async def _safe_tts_stream_wrapper(
     tts_provider: TTSProvider,
     text_queue: asyncio.Queue[str | None],
     audio_queue: "asyncio.Queue[bytes | tuple[str, bytes] | None]",
-) -> None:
+):
     """包装原生流式 TTS 确保异常处理和队列关闭"""
     try:
         await tts_provider.get_audio_stream(text_queue, audio_queue)
@@ -517,7 +366,7 @@ async def _simulated_stream_tts(
     tts_provider: TTSProvider,
     text_queue: asyncio.Queue[str | None],
     audio_queue: "asyncio.Queue[bytes | tuple[str, bytes] | None]",
-) -> None:
+):
     """模拟流式 TTS 分句生成音频"""
     try:
         while True:

astrbot/core/astr_agent_tool_exec.py

@@ -4,8 +4,6 @@ import json
 import traceback
 import typing as T
 import uuid
-from collections.abc import Sequence
-from collections.abc import Set as AbstractSet
 
 import mcp
 
@@ -17,8 +15,11 @@ from astrbot.core.agent.run_context import ContextWrapper
 from astrbot.core.agent.tool import FunctionTool, ToolSet
 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,
+    SEND_MESSAGE_TO_USER_TOOL,
+)
 from astrbot.core.cron.events import CronMessageEvent
-from astrbot.core.message.components import Image
 from astrbot.core.message.message_event_result import (
     CommandResult,
     MessageChain,
@@ -27,92 +28,10 @@ from astrbot.core.message.message_event_result import (
 from astrbot.core.platform.message_session import MessageSession
 from astrbot.core.provider.entites import ProviderRequest
 from astrbot.core.provider.register import llm_tools
-from astrbot.core.tools.prompts import (
-    BACKGROUND_TASK_RESULT_WOKE_SYSTEM_PROMPT,
-    BACKGROUND_TASK_WOKE_USER_PROMPT,
-    CONVERSATION_HISTORY_INJECT_PREFIX,
-)
-from astrbot.core.tools.send_message import SEND_MESSAGE_TO_USER_TOOL
-from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
 from astrbot.core.utils.history_saver import persist_agent_history
-from astrbot.core.utils.image_ref_utils import is_supported_image_ref
-from astrbot.core.utils.string_utils import normalize_and_dedupe_strings
 
 
 class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
-    @classmethod
-    def _collect_image_urls_from_args(cls, image_urls_raw: T.Any) -> list[str]:
-        if image_urls_raw is None:
-            return []
-
-        if isinstance(image_urls_raw, str):
-            return [image_urls_raw]
-
-        if isinstance(image_urls_raw, (Sequence, AbstractSet)) and not isinstance(
-            image_urls_raw, (str, bytes, bytearray)
-        ):
-            return [item for item in image_urls_raw if isinstance(item, str)]
-
-        logger.debug(
-            "Unsupported image_urls type in handoff tool args: %s",
-            type(image_urls_raw).__name__,
-        )
-        return []
-
-    @classmethod
-    async def _collect_image_urls_from_message(
-        cls, run_context: ContextWrapper[AstrAgentContext]
-    ) -> list[str]:
-        urls: list[str] = []
-        event = getattr(run_context.context, "event", None)
-        message_obj = getattr(event, "message_obj", None)
-        message = getattr(message_obj, "message", None)
-        if message:
-            for idx, component in enumerate(message):
-                if not isinstance(component, Image):
-                    continue
-                try:
-                    path = await component.convert_to_file_path()
-                    if path:
-                        urls.append(path)
-                except Exception as e:
-                    logger.error(
-                        "Failed to convert handoff image component at index %d: %s",
-                        idx,
-                        e,
-                        exc_info=True,
-                    )
-        return urls
-
-    @classmethod
-    async def _collect_handoff_image_urls(
-        cls,
-        run_context: ContextWrapper[AstrAgentContext],
-        image_urls_raw: T.Any,
-    ) -> list[str]:
-        candidates: list[str] = []
-        candidates.extend(cls._collect_image_urls_from_args(image_urls_raw))
-        candidates.extend(await cls._collect_image_urls_from_message(run_context))
-
-        normalized = normalize_and_dedupe_strings(candidates)
-        extensionless_local_roots = (get_astrbot_temp_path(),)
-        sanitized = [
-            item
-            for item in normalized
-            if is_supported_image_ref(
-                item,
-                allow_extensionless_existing_local_file=True,
-                extensionless_local_roots=extensionless_local_roots,
-            )
-        ]
-        dropped_count = len(normalized) - len(sanitized)
-        if dropped_count > 0:
-            logger.debug(
-                "Dropped %d invalid image_urls entries in handoff image inputs.",
-                dropped_count,
-            )
-        return sanitized
-
     @classmethod
     async def execute(cls, tool, run_context, **tool_args):
         """执行函数调用。
@@ -126,13 +45,6 @@ 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
@@ -145,7 +57,7 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
         elif tool.is_background_task:
             task_id = uuid.uuid4().hex
 
-            async def _run_in_background() -> None:
+            async def _run_in_background():
                 try:
                     await cls._execute_background(
                         tool=tool,
@@ -168,169 +80,32 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
 
             return
         else:
-            # Guard: reject sandbox tools whose capability is unavailable.
-            # Tools are always injected (for schema stability / prefix caching),
-            # but execution is blocked when the sandbox lacks the capability.
-            rejection = cls._check_sandbox_capability(tool, run_context)
-            if rejection is not None:
-                yield rejection
-                return
-
             async for r in cls._execute_local(tool, run_context, **tool_args):
                 yield r
             return
 
-    # Browser tool names that require the "browser" sandbox capability.
-    _BROWSER_TOOL_NAMES: frozenset[str] = frozenset(
-        {
-            "astrbot_execute_browser",
-            "astrbot_execute_browser_batch",
-            "astrbot_run_browser_skill",
-        }
-    )
-
-    @classmethod
-    def _check_sandbox_capability(
-        cls,
-        tool: FunctionTool,
-        run_context: ContextWrapper[AstrAgentContext],
-    ) -> mcp.types.CallToolResult | None:
-        """Return a rejection result if the tool requires a sandbox capability
-        that is not available, or None if the tool may proceed."""
-        if tool.name not in cls._BROWSER_TOOL_NAMES:
-            return None
-
-        from astrbot.core.computer.computer_client import get_sandbox_capabilities
-
-        session_id = run_context.context.event.unified_msg_origin
-        caps = get_sandbox_capabilities(session_id)
-
-        # Sandbox not yet booted — allow through (boot will happen on first
-        # shell/python call; browser tools will fail naturally if truly unavailable).
-        if caps is None:
-            return None
-
-        if "browser" not in caps:
-            msg = (
-                f"Tool '{tool.name}' requires browser capability, but the current "
-                f"sandbox profile does not include it (capabilities: {list(caps)}). "
-                "Please ask the administrator to switch to a sandbox profile with "
-                "browser support, or use shell/python tools instead."
-            )
-            logger.warning(
-                "[ToolExec] capability_rejected tool=%s caps=%s", tool.name, list(caps)
-            )
-            return mcp.types.CallToolResult(
-                content=[mcp.types.TextContent(type="text", text=msg)],
-                isError=True,
-            )
-
-        return None
-
-    @classmethod
-    def _get_runtime_computer_tools(
-        cls,
-        runtime: str,
-        sandbox_cfg: dict | None = None,
-        session_id: str = "",
-    ) -> dict[str, FunctionTool]:
-        from astrbot.core.computer.computer_tool_provider import ComputerToolProvider
-        from astrbot.core.tool_provider import ToolProviderContext
-
-        provider = ComputerToolProvider()
-        ctx = ToolProviderContext(
-            computer_use_runtime=runtime,
-            sandbox_cfg=sandbox_cfg,
-            session_id=session_id,
-        )
-        tools = provider.get_tools(ctx)
-        result = {tool.name: tool for tool in tools}
-        logger.info(
-            "[Computer] sandbox_tool_binding target=subagent runtime=%s tools=%d session=%s",
-            runtime,
-            len(result),
-            session_id,
-        )
-        return result
-
-    @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"))
-        sandbox_cfg = provider_settings.get("sandbox", {})
-        runtime_computer_tools = cls._get_runtime_computer_tools(
-            runtime,
-            sandbox_cfg=sandbox_cfg,
-            session_id=event.unified_msg_origin,
-        )
-
-        # 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,
         tool: HandoffTool,
         run_context: ContextWrapper[AstrAgentContext],
-        *,
-        image_urls_prepared: bool = False,
-        **tool_args: T.Any,
+        **tool_args,
     ):
-        tool_args = dict(tool_args)
         input_ = tool_args.get("input")
-        if image_urls_prepared:
-            prepared_image_urls = tool_args.get("image_urls")
-            if isinstance(prepared_image_urls, list):
-                image_urls = prepared_image_urls
-            else:
-                logger.debug(
-                    "Expected prepared handoff image_urls as list[str], got %s.",
-                    type(prepared_image_urls).__name__,
-                )
-                image_urls = []
-        else:
-            image_urls = await cls._collect_handoff_image_urls(
-                run_context,
-                tool_args.get("image_urls"),
-            )
-        tool_args["image_urls"] = image_urls
 
-        # Build handoff toolset from registered tools plus runtime computer tools.
-        toolset = cls._build_handoff_toolset(run_context, tool.agent.tools)
+        # 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
 
         ctx = run_context.context.context
         event = run_context.context.event
@@ -357,114 +132,20 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
                 except Exception:
                     continue
 
-        prov_settings: dict = ctx.get_config(umo=umo).get("provider_settings", {})
-        agent_max_step = int(prov_settings.get("max_agent_step", 30))
-        stream = prov_settings.get("streaming_response", False)
         llm_resp = await ctx.tool_loop_agent(
             event=event,
             chat_provider_id=prov_id,
             prompt=input_,
-            image_urls=image_urls,
             system_prompt=tool.agent.instructions,
             tools=toolset,
             contexts=contexts,
-            max_steps=agent_max_step,
-            stream=stream,
+            max_steps=30,
+            run_hooks=tool.agent.run_hooks,
         )
         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 behalf of 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 = ""
-        tool_args = dict(tool_args)
-        tool_args["image_urls"] = await cls._collect_handoff_image_urls(
-            run_context,
-            tool_args.get("image_urls"),
-        )
-        try:
-            async for r in cls._execute_handoff(
-                tool,
-                run_context,
-                image_urls_prepared=True,
-                **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,
@@ -472,7 +153,13 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
         run_context: ContextWrapper[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:
@@ -490,53 +177,21 @@ 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
 
-        task_result = {
-            "task_id": task_id,
-            "tool_name": tool_name,
-            "result": result_text or "",
-            "tool_args": tool_args,
+        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,
+            }
         }
-        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,
@@ -546,15 +201,7 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
             message_type=session.message_type,
         )
         cron_event.role = event.role
-        from astrbot.core.computer.computer_tool_provider import ComputerToolProvider
-
-        config = MainAgentBuildConfig(
-            tool_call_timeout=3600,
-            streaming_response=ctx.get_config()
-            .get("provider_settings", {})
-            .get("stream", False),
-            tool_providers=[ComputerToolProvider()],
-        )
+        config = MainAgentBuildConfig(tool_call_timeout=3600)
 
         req = ProviderRequest()
         conv = await _get_session_conv(event=cron_event, plugin_context=ctx)
@@ -564,13 +211,20 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
             req.contexts = context
             context_dump = req._print_friendly_context()
             req.contexts = []
-            req.system_prompt += CONVERSATION_HISTORY_INJECT_PREFIX + context_dump
+            req.system_prompt += (
+                "\n\nBellow is you and user previous conversation history:\n"
+                f"{context_dump}"
+            )
 
         bg = json.dumps(extras["background_task_result"], ensure_ascii=False)
         req.system_prompt += BACKGROUND_TASK_RESULT_WOKE_SYSTEM_PROMPT.format(
             background_task_result=bg
         )
-        req.prompt = BACKGROUND_TASK_WOKE_USER_PROMPT
+        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."
+        )
         if not req.func_tool:
             req.func_tool = ToolSet()
         req.func_tool.add_tool(SEND_MESSAGE_TO_USER_TOOL)
@@ -579,7 +233,7 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
             event=cron_event, plugin_context=ctx, config=config, req=req
         )
         if not result:
-            logger.error(f"Failed to build main agent for background task {tool_name}.")
+            logger.error("Failed to build main agent for background task job.")
             return
 
         runner = result.agent_runner
@@ -589,7 +243,7 @@ class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
         llm_resp = runner.get_final_llm_resp()
         task_meta = extras.get("background_task_result", {})
         summary_note = (
-            f"[BackgroundTask] {summary_name} "
+            f"[BackgroundTask] {task_meta.get('tool_name', tool.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,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import builtins
 import copy
 import datetime
 import json
@@ -9,7 +10,8 @@ import zoneinfo
 from collections.abc import Coroutine
 from dataclasses import dataclass, field
 
-from astrbot.core import logger, sp
+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
 from astrbot.core.agent.message import TextPart
@@ -18,49 +20,38 @@ from astrbot.core.astr_agent_context import AgentContextWrapper, AstrAgentContex
 from astrbot.core.astr_agent_hooks import MAIN_AGENT_HOOKS
 from astrbot.core.astr_agent_run_util import AgentRunner
 from astrbot.core.astr_agent_tool_exec import FunctionToolExecutor
+from astrbot.core.astr_main_agent_resources import (
+    CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT,
+    EXECUTE_SHELL_TOOL,
+    FILE_DOWNLOAD_TOOL,
+    FILE_UPLOAD_TOOL,
+    KNOWLEDGE_BASE_QUERY_TOOL,
+    LIVE_MODE_SYSTEM_PROMPT,
+    LLM_SAFETY_MODE_SYSTEM_PROMPT,
+    LOCAL_EXECUTE_SHELL_TOOL,
+    LOCAL_PYTHON_TOOL,
+    PYTHON_TOOL,
+    SANDBOX_MODE_PROMPT,
+    SEND_MESSAGE_TO_USER_TOOL,
+    TOOL_CALL_PROMPT,
+    TOOL_CALL_PROMPT_SKILLS_LIKE_MODE,
+    retrieve_knowledge_base,
+)
 from astrbot.core.conversation_mgr import Conversation
 from astrbot.core.message.components import File, Image, Reply
-from astrbot.core.persona_error_reply import (
-    extract_persona_custom_error_message_from_persona,
-    set_persona_custom_error_message_on_event,
-)
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.provider import Provider
 from astrbot.core.provider.entities import ProviderRequest
 from astrbot.core.skills.skill_manager import SkillManager, build_skills_prompt
 from astrbot.core.star.context import Context
 from astrbot.core.star.star_handler import star_map
-from astrbot.core.tool_provider import ToolProvider, ToolProviderContext
-from astrbot.core.tools.kb_query import (
-    KNOWLEDGE_BASE_QUERY_TOOL,
-    retrieve_knowledge_base,
+from astrbot.core.tools.cron_tools import (
+    CREATE_CRON_JOB_TOOL,
+    DELETE_CRON_JOB_TOOL,
+    LIST_CRON_JOBS_TOOL,
 )
-from astrbot.core.tools.prompts import (
-    CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT,
-    COMPUTER_USE_DISABLED_PROMPT,
-    FILE_EXTRACT_CONTEXT_TEMPLATE,
-    IMAGE_CAPTION_DEFAULT_PROMPT,
-    LIVE_MODE_SYSTEM_PROMPT,
-    LLM_SAFETY_MODE_SYSTEM_PROMPT,
-    TOOL_CALL_PROMPT,
-    TOOL_CALL_PROMPT_SKILLS_LIKE_MODE,
-    WEBCHAT_TITLE_GENERATOR_SYSTEM_PROMPT,
-    WEBCHAT_TITLE_GENERATOR_USER_PROMPT,
-)
-from astrbot.core.tools.send_message import SEND_MESSAGE_TO_USER_TOOL
 from astrbot.core.utils.file_extract import extract_file_moonshotai
 from astrbot.core.utils.llm_metadata import LLM_METADATAS
-from astrbot.core.utils.quoted_message.settings import (
-    SETTINGS as DEFAULT_QUOTED_MESSAGE_SETTINGS,
-)
-from astrbot.core.utils.quoted_message.settings import (
-    QuotedMessageParserSettings,
-)
-from astrbot.core.utils.quoted_message_parser import (
-    extract_quoted_message_images,
-    extract_quoted_message_text,
-)
-from astrbot.core.utils.string_utils import normalize_and_dedupe_strings
 
 
 @dataclass(slots=True)
@@ -112,16 +103,11 @@ class MainAgentBuildConfig:
     computer_use_runtime: str = "local"
     """The runtime for agent computer use: none, local, or sandbox."""
     sandbox_cfg: dict = field(default_factory=dict)
-    tool_providers: list[ToolProvider] = field(default_factory=list)
-    """Decoupled tool providers injected by the caller.
-    Each provider is queried for tools and system-prompt addons at build time."""
     add_cron_tools: bool = True
     """This will add cron job management tools to the main agent for proactive cron job execution."""
     provider_settings: dict = field(default_factory=dict)
     subagent_orchestrator: dict = field(default_factory=dict)
     timezone: str | None = None
-    max_quoted_fallback_images: int = 20
-    """Maximum number of images injected from quoted-message fallback extraction."""
 
 
 @dataclass(slots=True)
@@ -241,9 +227,9 @@ async def _apply_file_extract(
         req.contexts.append(
             {
                 "role": "system",
-                "content": FILE_EXTRACT_CONTEXT_TEMPLATE.format(
-                    file_content=file_content,
-                    file_name=file_name or "Unknown",
+                "content": (
+                    "File Extract Results of user uploaded files:\n"
+                    f"{file_content}\nFile Name: {file_name or 'Unknown'}"
                 ),
             },
         )
@@ -259,8 +245,11 @@ def _apply_prompt_prefix(req: ProviderRequest, cfg: dict) -> None:
         req.prompt = f"{prefix}{req.prompt}"
 
 
-# Computer-use tools are now provided by ComputerToolProvider.
-# See astrbot.core.computer.computer_tool_provider for details.
+def _apply_local_env_tools(req: ProviderRequest) -> None:
+    if req.func_tool is None:
+        req.func_tool = ToolSet()
+    req.func_tool.add_tool(LOCAL_EXECUTE_SHELL_TOOL)
+    req.func_tool.add_tool(LOCAL_PYTHON_TOOL)
 
 
 async def _ensure_persona_and_skills(
@@ -273,30 +262,47 @@ async def _ensure_persona_and_skills(
     if not req.conversation:
         return
 
-    (
-        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,
-    )
+    # get persona ID
 
-    set_persona_custom_error_message_on_event(
-        event, extract_persona_custom_error_message_from_persona(persona)
-    )
+    # 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,
+    )
     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
-    elif use_webchat_special_default:
-        req.system_prompt += CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT
+    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
 
     # Inject skills prompt
     runtime = cfg.get("computer_use_runtime", "local")
@@ -313,27 +319,13 @@ async def _ensure_persona_and_skills(
         if skills:
             req.system_prompt += f"\n{build_skills_prompt(skills)}\n"
             if runtime == "none":
-                req.system_prompt += COMPUTER_USE_DISABLED_PROMPT
+                req.system_prompt += (
+                    "User has not enabled the Computer Use feature. "
+                    "You cannot use shell or Python to perform skills. "
+                    "If you need to use these capabilities, ask the user to enable Computer Use in the AstrBot WebUI -> Config."
+                )
     tmgr = plugin_context.get_llm_tool_manager()
 
-    # inject toolset in the persona
-    if (persona and persona.get("tools") is None) or not persona:
-        persona_toolset = tmgr.get_full_tool_set()
-        for tool in list(persona_toolset):
-            if not tool.active:
-                persona_toolset.remove_tool(tool.name)
-    else:
-        persona_toolset = ToolSet()
-        if persona["tools"]:
-            for tool_name in persona["tools"]:
-                tool = tmgr.get_func(tool_name)
-                if tool and tool.active:
-                    persona_toolset.add_tool(tool)
-    if not req.func_tool:
-        req.func_tool = persona_toolset
-    else:
-        req.func_tool.merge(persona_toolset)
-
     # sub agents integration
     orch_cfg = plugin_context.get_config().get("subagent_orchestrator", {})
     so = plugin_context.subagent_orchestrator
@@ -351,9 +343,14 @@ async def _ensure_persona_and_skills(
                 persona_tools = None
                 pid = a.get("persona_id")
                 if pid:
-                    persona = plugin_context.persona_manager.get_persona_v3_by_id(pid)
-                    if persona is not None:
-                        persona_tools = persona.get("tools")
+                    persona_tools = next(
+                        (
+                            p.get("tools")
+                            for p in plugin_context.persona_manager.personas_v3
+                            if p["name"] == pid
+                        ),
+                        None,
+                    )
                 tools = a.get("tools", [])
                 if persona_tools is not None:
                     tools = persona_tools
@@ -374,19 +371,22 @@ async def _ensure_persona_and_skills(
                         assigned_tools.add(name)
 
         if req.func_tool is None:
-            req.func_tool = ToolSet()
+            toolset = ToolSet()
+        else:
+            toolset = req.func_tool
 
         # add subagent handoff tools
         for tool in so.handoffs:
-            req.func_tool.add_tool(tool)
+            toolset.add_tool(tool)
 
         # check duplicates
         if remove_dup:
-            handoff_names = {tool.name for tool in so.handoffs}
+            names = toolset.names()
             for tool_name in assigned_tools:
-                if tool_name in handoff_names:
-                    continue
-                req.func_tool.remove_tool(tool_name)
+                if tool_name in names:
+                    toolset.remove_tool(tool_name)
+
+        req.func_tool = toolset
 
         router_prompt = (
             plugin_context.get_config()
@@ -395,14 +395,32 @@ async def _ensure_persona_and_skills(
         ).strip()
         if router_prompt:
             req.system_prompt += f"\n{router_prompt}\n"
+        return
+
+    # inject toolset in the persona
+    if (persona and persona.get("tools") is None) or not persona:
+        toolset = tmgr.get_full_tool_set()
+        for tool in list(toolset):
+            if not tool.active:
+                toolset.remove_tool(tool.name)
+    else:
+        toolset = ToolSet()
+        if persona["tools"]:
+            for tool_name in persona["tools"]:
+                tool = tmgr.get_func(tool_name)
+                if tool and tool.active:
+                    toolset.add_tool(tool)
+    if not req.func_tool:
+        req.func_tool = toolset
+    else:
+        req.func_tool.merge(toolset)
     try:
         event.trace.record(
-            "sel_persona",
-            persona_id=persona_id,
-            persona_toolset=persona_toolset.names(),
+            "sel_persona", persona_id=persona_id, persona_toolset=toolset.names()
         )
     except Exception:
         pass
+    logger.debug("Tool set for persona %s: %s", persona_id, toolset.names())
 
 
 async def _request_img_caption(
@@ -423,7 +441,7 @@ async def _request_img_caption(
 
     img_cap_prompt = cfg.get(
         "image_caption_prompt",
-        IMAGE_CAPTION_DEFAULT_PROMPT,
+        "Please describe the image.",
     )
     logger.debug("Processing image caption with provider: %s", provider_id)
     llm_resp = await prov.text_chat(
@@ -455,29 +473,11 @@ async def _ensure_img_caption(
         logger.error("处理图片描述失败: %s", exc)
 
 
-def _append_quoted_image_attachment(req: ProviderRequest, image_path: str) -> None:
-    req.extra_user_content_parts.append(
-        TextPart(text=f"[Image Attachment in quoted message: path {image_path}]")
-    )
-
-
-def _get_quoted_message_parser_settings(
-    provider_settings: dict[str, object] | None,
-) -> QuotedMessageParserSettings:
-    if not isinstance(provider_settings, dict):
-        return DEFAULT_QUOTED_MESSAGE_SETTINGS
-    overrides = provider_settings.get("quoted_message_parser")
-    if not isinstance(overrides, dict):
-        return DEFAULT_QUOTED_MESSAGE_SETTINGS
-    return DEFAULT_QUOTED_MESSAGE_SETTINGS.with_overrides(overrides)
-
-
 async def _process_quote_message(
     event: AstrMessageEvent,
     req: ProviderRequest,
     img_cap_prov_id: str,
     plugin_context: Context,
-    quoted_message_settings: QuotedMessageParserSettings = DEFAULT_QUOTED_MESSAGE_SETTINGS,
 ) -> None:
     quote = None
     for comp in event.message_obj.message:
@@ -489,15 +489,7 @@ async def _process_quote_message(
 
     content_parts = []
     sender_info = f"({quote.sender_nickname}): " if quote.sender_nickname else ""
-    message_str = (
-        await extract_quoted_message_text(
-            event,
-            quote,
-            settings=quoted_message_settings,
-        )
-        or quote.message_str
-        or "[Empty Text]"
-    )
+    message_str = quote.message_str or "[Empty Text]"
     content_parts.append(f"{sender_info}{message_str}")
 
     image_seg = None
@@ -517,7 +509,7 @@ async def _process_quote_message(
 
             if prov and isinstance(prov, Provider):
                 llm_resp = await prov.text_chat(
-                    prompt=IMAGE_CAPTION_DEFAULT_PROMPT,
+                    prompt="Please describe the image content.",
                     image_urls=[await image_seg.convert_to_file_path()],
                 )
                 if llm_resp.completion_text:
@@ -603,13 +595,11 @@ async def _decorate_llm_request(
             )
 
     img_cap_prov_id = cfg.get("default_image_caption_provider_id") or ""
-    quoted_message_settings = _get_quoted_message_parser_settings(cfg)
     await _process_quote_message(
         event,
         req,
         img_cap_prov_id,
         plugin_context,
-        quoted_message_settings,
     )
 
     tz = config.timezone
@@ -719,38 +709,6 @@ def _sanitize_context_by_modalities(
     req.contexts = sanitized_contexts
 
 
-def _model_outputs_image(provider: Provider, req: ProviderRequest) -> bool:
-    model = req.model or provider.get_model()
-    if not model:
-        return False
-    model_info = LLM_METADATAS.get(model)
-    if not model_info:
-        return False
-    output_modalities = model_info.get("modalities", {}).get("output", [])
-    return "image" in output_modalities
-
-
-def _should_disable_streaming_for_webchat_output(
-    event: AstrMessageEvent,
-    provider: Provider,
-    req: ProviderRequest,
-) -> bool:
-    if event.get_platform_name() != "webchat":
-        return False
-
-    provider_cfg = provider.provider_config
-    provider_type = provider_cfg.get("type", "")
-    if provider_type == "googlegenai_chat_completion" and provider_cfg.get(
-        "gm_resp_image_modal", False
-    ):
-        return True
-
-    if _model_outputs_image(provider, req):
-        return not bool(provider_cfg.get("supports_streaming_output_modalities", False))
-
-    return False
-
-
 def _plugin_tool_fix(event: AstrMessageEvent, req: ProviderRequest) -> None:
     """根据事件中的插件设置，过滤请求中的工具列表。
 
@@ -766,14 +724,9 @@ def _plugin_tool_fix(event: AstrMessageEvent, req: ProviderRequest) -> None:
                 continue
             mp = tool.handler_module_path
             if not mp:
-                # 没有 plugin 归属信息的工具（如 subagent transfer_to_*）
-                # 不应受到会话插件过滤影响。
-                new_tool_set.add_tool(tool)
                 continue
             plugin = star_map.get(mp)
             if not plugin:
-                # 无法解析插件归属时，保守保留工具，避免误过滤。
-                new_tool_set.add_tool(tool)
                 continue
             if plugin.name in event.plugins_name or plugin.reserved:
                 new_tool_set.add_tool(tool)
@@ -792,18 +745,17 @@ async def _handle_webchat(
     if not user_prompt or not chatui_session_id or not session or session.display_name:
         return
 
-    try:
-        llm_resp = await prov.text_chat(
-            system_prompt=WEBCHAT_TITLE_GENERATOR_SYSTEM_PROMPT,
-            prompt=WEBCHAT_TITLE_GENERATOR_USER_PROMPT.format(user_prompt=user_prompt),
-        )
-    except Exception as e:
-        logger.exception(
-            "Failed to generate webchat title for session %s: %s",
-            chatui_session_id,
-            e,
-        )
-        return
+    llm_resp = await prov.text_chat(
+        system_prompt=(
+            "You are a conversation title generator. "
+            "Generate a concise title in the same language as the user’s input, "
+            "no more than 10 words, capturing only the core topic."
+            "If the input is a greeting, small talk, or has no clear topic, "
+            "(e.g., “hi”, “hello”, “haha”), return <None>. "
+            "Output only the title itself or <None>, with no explanations."
+        ),
+        prompt=f"Generate a concise title for the following user query:\n{user_prompt}",
+    )
     if llm_resp and llm_resp.completion_text:
         title = llm_resp.completion_text.strip()
         if not title or "<None>" in title:
@@ -819,7 +771,9 @@ async def _handle_webchat(
 
 def _apply_llm_safety_mode(config: MainAgentBuildConfig, req: ProviderRequest) -> None:
     if config.safety_mode_strategy == "system_prompt":
-        req.system_prompt = f"{LLM_SAFETY_MODE_SYSTEM_PROMPT}\n\n{req.system_prompt}"
+        req.system_prompt = (
+            f"{LLM_SAFETY_MODE_SYSTEM_PROMPT}\n\n{req.system_prompt or ''}"
+        )
     else:
         logger.warning(
             "Unsupported llm_safety_mode strategy: %s.",
@@ -827,8 +781,32 @@ def _apply_llm_safety_mode(config: MainAgentBuildConfig, req: ProviderRequest) -
         )
 
 
-# _apply_sandbox_tools has been moved to ComputerToolProvider.
-# See astrbot.core.computer.computer_tool_provider for details.
+def _apply_sandbox_tools(
+    config: MainAgentBuildConfig, req: ProviderRequest, session_id: str
+) -> None:
+    if req.func_tool is None:
+        req.func_tool = ToolSet()
+    if config.sandbox_cfg.get("booter") == "shipyard":
+        ep = config.sandbox_cfg.get("shipyard_endpoint", "")
+        at = config.sandbox_cfg.get("shipyard_access_token", "")
+        if not ep or not at:
+            logger.error("Shipyard sandbox configuration is incomplete.")
+            return
+        os.environ["SHIPYARD_ENDPOINT"] = ep
+        os.environ["SHIPYARD_ACCESS_TOKEN"] = at
+    req.func_tool.add_tool(EXECUTE_SHELL_TOOL)
+    req.func_tool.add_tool(PYTHON_TOOL)
+    req.func_tool.add_tool(FILE_UPLOAD_TOOL)
+    req.func_tool.add_tool(FILE_DOWNLOAD_TOOL)
+    req.system_prompt += f"\n{SANDBOX_MODE_PROMPT}\n"
+
+
+def _proactive_cron_job_tools(req: ProviderRequest) -> None:
+    if req.func_tool is None:
+        req.func_tool = ToolSet()
+    req.func_tool.add_tool(CREATE_CRON_JOB_TOOL)
+    req.func_tool.add_tool(DELETE_CRON_JOB_TOOL)
+    req.func_tool.add_tool(LIST_CRON_JOBS_TOOL)
 
 
 def _get_compress_provider(
@@ -854,41 +832,6 @@ 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,
@@ -927,8 +870,6 @@ async def build_main_agent(
                 return None
 
             req.prompt = event.message_str[len(config.provider_wake_prefix) :]
-
-            # media files attachments
             for comp in event.message_obj.message:
                 if isinstance(comp, Image):
                     image_path = await comp.convert_to_file_path()
@@ -944,81 +885,6 @@ async def build_main_agent(
                             text=f"[File Attachment: name {file_name}, path {file_path}]"
                         )
                     )
-            # quoted message attachments
-            reply_comps = [
-                comp for comp in event.message_obj.message if isinstance(comp, Reply)
-            ]
-            quoted_message_settings = _get_quoted_message_parser_settings(
-                config.provider_settings
-            )
-            fallback_quoted_image_count = 0
-            for comp in reply_comps:
-                has_embedded_image = False
-                if comp.chain:
-                    for reply_comp in comp.chain:
-                        if isinstance(reply_comp, Image):
-                            has_embedded_image = True
-                            image_path = await reply_comp.convert_to_file_path()
-                            req.image_urls.append(image_path)
-                            _append_quoted_image_attachment(req, image_path)
-                        elif isinstance(reply_comp, File):
-                            file_path = await reply_comp.get_file()
-                            file_name = reply_comp.name or os.path.basename(file_path)
-                            req.extra_user_content_parts.append(
-                                TextPart(
-                                    text=(
-                                        f"[File Attachment in quoted message: "
-                                        f"name {file_name}, path {file_path}]"
-                                    )
-                                )
-                            )
-
-                # Fallback quoted image extraction for reply-id-only payloads, or when
-                # embedded reply chain only contains placeholders (e.g. [Forward Message], [Image]).
-                if not has_embedded_image:
-                    try:
-                        fallback_images = normalize_and_dedupe_strings(
-                            await extract_quoted_message_images(
-                                event,
-                                comp,
-                                settings=quoted_message_settings,
-                            )
-                        )
-                        remaining_limit = max(
-                            config.max_quoted_fallback_images
-                            - fallback_quoted_image_count,
-                            0,
-                        )
-                        if remaining_limit <= 0 and fallback_images:
-                            logger.warning(
-                                "Skip quoted fallback images due to limit=%d for umo=%s",
-                                config.max_quoted_fallback_images,
-                                event.unified_msg_origin,
-                            )
-                            continue
-                        if len(fallback_images) > remaining_limit:
-                            logger.warning(
-                                "Truncate quoted fallback images for umo=%s, reply_id=%s from %d to %d",
-                                event.unified_msg_origin,
-                                getattr(comp, "id", None),
-                                len(fallback_images),
-                                remaining_limit,
-                            )
-                            fallback_images = fallback_images[:remaining_limit]
-                        for image_ref in fallback_images:
-                            if image_ref in req.image_urls:
-                                continue
-                            req.image_urls.append(image_ref)
-                            fallback_quoted_image_count += 1
-                            _append_quoted_image_attachment(req, image_ref)
-                    except Exception as exc:  # noqa: BLE001
-                        logger.warning(
-                            "Failed to resolve fallback quoted images for umo=%s, reply_id=%s: %s",
-                            event.unified_msg_origin,
-                            getattr(comp, "id", None),
-                            exc,
-                            exc_info=True,
-                        )
 
             conversation = await _get_session_conv(event, plugin_context)
             req.conversation = conversation
@@ -1027,7 +893,6 @@ async def build_main_agent(
 
     if isinstance(req.contexts, str):
         req.contexts = json.loads(req.contexts)
-    req.image_urls = normalize_and_dedupe_strings(req.image_urls)
 
     if config.file_extract_enabled:
         try:
@@ -1055,31 +920,10 @@ async def build_main_agent(
     if config.llm_safety_mode:
         _apply_llm_safety_mode(config, req)
 
-    # Decoupled tool providers — each provider injects its tools and prompt addons
-    if config.tool_providers:
-        _provider_ctx = ToolProviderContext(
-            computer_use_runtime=config.computer_use_runtime,
-            sandbox_cfg=config.sandbox_cfg,
-            session_id=req.session_id or "",
-        )
-        # Respect WebUI tool enable/disable settings.
-        # Internal tools (source='internal') bypass this check — they are
-        # not user-togglable in the WebUI, so legacy entries must not block them.
-        _inactivated: set[str] = set(
-            sp.get("inactivated_llm_tools", [], scope="global", scope_id="global")
-        )
-        for _tp in config.tool_providers:
-            _tp_tools = _tp.get_tools(_provider_ctx)
-            if _tp_tools:
-                if req.func_tool is None:
-                    req.func_tool = ToolSet()
-                for _tool in _tp_tools:
-                    is_internal = getattr(_tool, "source", "") == "internal"
-                    if is_internal or _tool.name not in _inactivated:
-                        req.func_tool.add_tool(_tool)
-            _tp_addon = _tp.get_system_prompt_addon(_provider_ctx)
-            if _tp_addon:
-                req.system_prompt = f"{req.system_prompt or ''}{_tp_addon}"
+    if config.computer_use_runtime == "sandbox":
+        _apply_sandbox_tools(config, req, req.session_id)
+    elif config.computer_use_runtime == "local":
+        _apply_local_env_tools(req)
 
     agent_runner = AgentRunner()
     astr_agent_ctx = AstrAgentContext(
@@ -1087,6 +931,9 @@ async def build_main_agent(
         event=event,
     )
 
+    if config.add_cron_tools:
+        _proactive_cron_job_tools(req)
+
     if event.platform_meta.support_proactive_message:
         if req.func_tool is None:
             req.func_tool = ToolSet()
@@ -1103,10 +950,6 @@ async def build_main_agent(
         asyncio.create_task(_handle_webchat(event, req, provider))
 
     if req.func_tool and req.func_tool.tools:
-        # Sort tools by name for deterministic serialization so that
-        # LLM provider prefix caching can match across requests.
-        req.func_tool.normalize()
-
         tool_prompt = (
             TOOL_CALL_PROMPT
             if config.tool_schema_mode == "full"
@@ -1118,17 +961,6 @@ async def build_main_agent(
     if action_type == "live":
         req.system_prompt += f"\n{LIVE_MODE_SYSTEM_PROMPT}\n"
 
-    streaming_response = config.streaming_response
-    if streaming_response and _should_disable_streaming_for_webchat_output(
-        event, provider, req
-    ):
-        logger.info(
-            "Disable streaming for webchat direct media output. provider=%s model=%s",
-            provider.provider_config.get("id", "unknown"),
-            req.model or provider.get_model(),
-        )
-        streaming_response = False
-
     reset_coro = agent_runner.reset(
         provider=provider,
         request=req,
@@ -1138,16 +970,13 @@ async def build_main_agent(
         ),
         tool_executor=FunctionToolExecutor(),
         agent_hooks=MAIN_AGENT_HOOKS,
-        streaming=streaming_response,
+        streaming=config.streaming_response,
         llm_compress_instruction=config.llm_compress_instruction,
         llm_compress_keep_recent=config.llm_compress_keep_recent,
         llm_compress_provider=_get_compress_provider(config, plugin_context),
         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/astr_main_agent_resources.py

@@ -1,7 +1,6 @@
 import base64
 import json
 import os
-import uuid
 
 from pydantic import Field
 from pydantic.dataclasses import dataclass
@@ -13,25 +12,11 @@ from astrbot.core.agent.tool import FunctionTool, ToolExecResult
 from astrbot.core.astr_agent_context import AstrAgentContext
 from astrbot.core.computer.computer_client import get_booter
 from astrbot.core.computer.tools import (
-    AnnotateExecutionTool,
-    BrowserBatchExecTool,
-    BrowserExecTool,
-    CreateSkillCandidateTool,
-    CreateSkillPayloadTool,
-    EvaluateSkillCandidateTool,
     ExecuteShellTool,
     FileDownloadTool,
     FileUploadTool,
-    GetExecutionHistoryTool,
-    GetSkillPayloadTool,
-    ListSkillCandidatesTool,
-    ListSkillReleasesTool,
     LocalPythonTool,
-    PromoteSkillCandidateTool,
     PythonTool,
-    RollbackSkillReleaseTool,
-    RunBrowserSkillTool,
-    SyncSkillReleaseTool,
 )
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.platform.message_session import MessageSession
@@ -188,12 +173,7 @@ class KnowledgeBaseQueryTool(FunctionTool[AstrAgentContext]):
 @dataclass
 class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
     name: str = "send_message_to_user"
-    description: str = (
-        "Send message to the user. "
-        "Supports various message types including `plain`, `image`, `record`, `video`, `file`, and `mention_user`. "
-        "Use this tool to send media files (`image`, `record`, `video`, `file`), "
-        "or when you need to proactively message the user(such as cron job). For normal text replies, you can output directly."
-    )
+    description: str = "Directly send message to the user. Only use this tool when you need to proactively message the user. Otherwise you can directly output the reply in the conversation."
 
     parameters: dict = Field(
         default_factory=lambda: {
@@ -209,7 +189,7 @@ class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
                                 "type": "string",
                                 "description": (
                                     "Component type. One of: "
-                                    "plain, image, record, video, file, mention_user. Record is voice message."
+                                    "plain, image, record, file, mention_user"
                                 ),
                             },
                             "text": {
@@ -260,9 +240,7 @@ class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
             if "_&exists_" in json.dumps(result):
                 # Download the file from sandbox
                 name = os.path.basename(path)
-                local_path = os.path.join(
-                    get_astrbot_temp_path(), f"sandbox_{uuid.uuid4().hex[:4]}_{name}"
-                )
+                local_path = os.path.join(get_astrbot_temp_path(), name)
                 await sb.download_file(path, local_path)
                 logger.info(f"Downloaded file from sandbox: {path} -> {local_path}")
                 return local_path, True
@@ -325,19 +303,6 @@ class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
                         components.append(Comp.Record.fromURL(url=url))
                     else:
                         return f"error: messages[{idx}] must include path or url for record component."
-                elif msg_type == "video":
-                    path = msg.get("path")
-                    url = msg.get("url")
-                    if path:
-                        (
-                            local_path,
-                            file_from_sandbox,
-                        ) = await self._resolve_path_from_sandbox(context, path)
-                        components.append(Comp.Video.fromFileSystem(path=local_path))
-                    elif url:
-                        components.append(Comp.Video.fromURL(url=url))
-                    else:
-                        return f"error: messages[{idx}] must include path or url for video component."
                 elif msg_type == "file":
                     path = msg.get("path")
                     url = msg.get("url")
@@ -387,11 +352,11 @@ class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
             MessageChain(chain=components),
         )
 
-        # if file_from_sandbox:
-        #     try:
-        #         os.remove(local_path)
-        #     except Exception as e:
-        #         logger.error(f"Error removing temp file {local_path}: {e}")
+        if file_from_sandbox:
+            try:
+                os.remove(local_path)
+            except Exception as e:
+                logger.error(f"Error removing temp file {local_path}: {e}")
 
         return f"Message sent to session {target_session}"
 
@@ -481,20 +446,6 @@ PYTHON_TOOL = PythonTool()
 LOCAL_PYTHON_TOOL = LocalPythonTool()
 FILE_UPLOAD_TOOL = FileUploadTool()
 FILE_DOWNLOAD_TOOL = FileDownloadTool()
-BROWSER_EXEC_TOOL = BrowserExecTool()
-BROWSER_BATCH_EXEC_TOOL = BrowserBatchExecTool()
-RUN_BROWSER_SKILL_TOOL = RunBrowserSkillTool()
-GET_EXECUTION_HISTORY_TOOL = GetExecutionHistoryTool()
-ANNOTATE_EXECUTION_TOOL = AnnotateExecutionTool()
-CREATE_SKILL_PAYLOAD_TOOL = CreateSkillPayloadTool()
-GET_SKILL_PAYLOAD_TOOL = GetSkillPayloadTool()
-CREATE_SKILL_CANDIDATE_TOOL = CreateSkillCandidateTool()
-LIST_SKILL_CANDIDATES_TOOL = ListSkillCandidatesTool()
-EVALUATE_SKILL_CANDIDATE_TOOL = EvaluateSkillCandidateTool()
-PROMOTE_SKILL_CANDIDATE_TOOL = PromoteSkillCandidateTool()
-LIST_SKILL_RELEASES_TOOL = ListSkillReleasesTool()
-ROLLBACK_SKILL_RELEASE_TOOL = RollbackSkillReleaseTool()
-SYNC_SKILL_RELEASE_TOOL = SyncSkillReleaseTool()
 
 # we prevent astrbot from connecting to known malicious hosts
 # these hosts are base64 encoded

astrbot/core/astrbot_config_mgr.py

@@ -36,7 +36,7 @@ class AstrBotConfigManager:
         default_config: AstrBotConfig,
         ucr: UmopConfigRouter,
         sp: SharedPreferences,
-    ) -> None:
+    ):
         self.sp = sp
         self.ucr = ucr
         self.confs: dict[str, AstrBotConfig] = {}
@@ -56,7 +56,7 @@ class AstrBotConfigManager:
             )
         return self.abconf_data
 
-    def _load_all_configs(self) -> None:
+    def _load_all_configs(self):
         """Load all configurations from the shared preferences."""
         abconf_data = self._get_abconf_data()
         self.abconf_data = abconf_data

astrbot/core/backup/constants.py

@@ -11,7 +11,6 @@ from astrbot.core.db.po import (
     CommandConflict,
     ConversationV2,
     Persona,
-    PersonaFolder,
     PlatformMessageHistory,
     PlatformSession,
     PlatformStat,
@@ -40,7 +39,6 @@ MAIN_DB_MODELS: dict[str, type[SQLModel]] = {
     "platform_stats": PlatformStat,
     "conversations": ConversationV2,
     "personas": Persona,
-    "persona_folders": PersonaFolder,
     "preferences": Preference,
     "platform_message_history": PlatformMessageHistory,
     "platform_sessions": PlatformSession,

astrbot/core/backup/exporter.py

@@ -59,7 +59,7 @@ class AstrBotExporter:
         main_db: BaseDatabase,
         kb_manager: "KnowledgeBaseManager | None" = None,
         config_path: str = CMD_CONFIG_FILE_PATH,
-    ) -> None:
+    ):
         self.main_db = main_db
         self.kb_manager = kb_manager
         self.config_path = config_path

astrbot/core/backup/importer.py

@@ -12,7 +12,7 @@ import os
 import shutil
 import zipfile
 from dataclasses import dataclass, field
-from datetime import datetime, timezone
+from datetime import datetime
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
@@ -61,69 +61,6 @@ def _get_major_version(version_str: str) -> str:
 
 CMD_CONFIG_FILE_PATH = os.path.join(get_astrbot_data_path(), "cmd_config.json")
 KB_PATH = get_astrbot_knowledge_base_path()
-DEFAULT_PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT = 5
-PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT_ENV = (
-    "ASTRBOT_PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT"
-)
-
-
-def _load_platform_stats_invalid_count_warn_limit() -> int:
-    raw_value = os.getenv(PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT_ENV)
-    if raw_value is None:
-        return DEFAULT_PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT
-
-    try:
-        value = int(raw_value)
-        if value < 0:
-            raise ValueError("negative")
-        return value
-    except (TypeError, ValueError):
-        logger.warning(
-            "Invalid env %s=%r, fallback to default %d",
-            PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT_ENV,
-            raw_value,
-            DEFAULT_PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT,
-        )
-        return DEFAULT_PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT
-
-
-PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT = (
-    _load_platform_stats_invalid_count_warn_limit()
-)
-
-
-class _InvalidCountWarnLimiter:
-    """Rate-limit warnings for invalid platform_stats count values."""
-
-    def __init__(self, limit: int) -> None:
-        self.limit = limit
-        self._count = 0
-        self._suppression_logged = False
-
-    def warn_invalid_count(self, value: Any, key_for_log: tuple[Any, ...]) -> None:
-        if self.limit > 0:
-            if self._count < self.limit:
-                logger.warning(
-                    "platform_stats count 非法，已按 0 处理: value=%r, key=%s",
-                    value,
-                    key_for_log,
-                )
-                self._count += 1
-                if self._count == self.limit and not self._suppression_logged:
-                    logger.warning(
-                        "platform_stats 非法 count 告警已达到上限 (%d)，后续将抑制",
-                        self.limit,
-                    )
-                    self._suppression_logged = True
-            return
-
-        if not self._suppression_logged:
-            # limit <= 0: emit only one suppression warning.
-            logger.warning(
-                "platform_stats 非法 count 告警已达到上限 (%d)，后续将抑制",
-                self.limit,
-            )
-            self._suppression_logged = True
 
 
 @dataclass
@@ -173,7 +110,7 @@ class ImportPreCheckResult:
 class ImportResult:
     """导入结果"""
 
-    def __init__(self) -> None:
+    def __init__(self):
         self.success = True
         self.imported_tables: dict[str, int] = {}
         self.imported_files: dict[str, int] = {}
@@ -201,10 +138,6 @@ class ImportResult:
         }
 
 
-class DatabaseClearError(RuntimeError):
-    """Raised when clearing the main database in replace mode fails."""
-
-
 class AstrBotImporter:
     """AstrBot 数据导入器
 
@@ -228,7 +161,7 @@ class AstrBotImporter:
         kb_manager: "KnowledgeBaseManager | None" = None,
         config_path: str = CMD_CONFIG_FILE_PATH,
         kb_root_dir: str = KB_PATH,
-    ) -> None:
+    ):
         self.main_db = main_db
         self.kb_manager = kb_manager
         self.config_path = config_path
@@ -409,9 +342,6 @@ class AstrBotImporter:
 
                     imported = await self._import_main_database(main_data)
                     result.imported_tables.update(imported)
-                except DatabaseClearError as e:
-                    result.add_error(f"清空主数据库失败: {e}")
-                    return result
                 except Exception as e:
                     result.add_error(f"导入主数据库失败: {e}")
                     return result
@@ -522,9 +452,7 @@ class AstrBotImporter:
                         await session.execute(delete(model_class))
                         logger.debug(f"已清空表 {table_name}")
                     except Exception as e:
-                        raise DatabaseClearError(
-                            f"清空表 {table_name} 失败: {e}"
-                        ) from e
+                        logger.warning(f"清空表 {table_name} 失败: {e}")
 
     async def _clear_kb_data(self) -> None:
         """清空知识库数据"""
@@ -566,10 +494,9 @@ class AstrBotImporter:
                     if not model_class:
                         logger.warning(f"未知的表: {table_name}")
                         continue
-                    normalized_rows = self._preprocess_main_table_rows(table_name, rows)
 
                     count = 0
-                    for row in normalized_rows:
+                    for row in rows:
                         try:
                             # 转换 datetime 字符串为 datetime 对象
                             row = self._convert_datetime_fields(row, model_class)
@@ -584,118 +511,6 @@ class AstrBotImporter:
 
         return imported
 
-    def _preprocess_main_table_rows(
-        self, table_name: str, rows: list[dict[str, Any]]
-    ) -> list[dict[str, Any]]:
-        if table_name == "platform_stats":
-            normalized_rows = self._merge_platform_stats_rows(rows)
-            duplicate_count = len(rows) - len(normalized_rows)
-            if duplicate_count > 0:
-                logger.warning(
-                    "检测到 %s 重复键 %d 条，已在导入前聚合",
-                    table_name,
-                    duplicate_count,
-                )
-            return normalized_rows
-        return rows
-
-    def _merge_platform_stats_rows(
-        self, rows: list[dict[str, Any]]
-    ) -> list[dict[str, Any]]:
-        """Merge duplicate platform_stats rows by normalized timestamp/platform key.
-
-        Note:
-        - Invalid/empty timestamps are kept as distinct rows to avoid accidental merging.
-        - Non-string platform_id/platform_type are kept as distinct rows.
-        - Invalid count warnings are rate-limited per function invocation.
-        """
-        merged: dict[tuple[str, str, str], dict[str, Any]] = {}
-        result: list[dict[str, Any]] = []
-        warn_limiter = _InvalidCountWarnLimiter(PLATFORM_STATS_INVALID_COUNT_WARN_LIMIT)
-
-        for row in rows:
-            normalized_row, normalized_timestamp, count = (
-                self._normalize_platform_stats_entry(row, warn_limiter)
-            )
-            platform_id = normalized_row.get("platform_id")
-            platform_type = normalized_row.get("platform_type")
-
-            if (
-                normalized_timestamp is None
-                or not isinstance(platform_id, str)
-                or not isinstance(platform_type, str)
-            ):
-                result.append(normalized_row)
-                continue
-
-            merge_key = (normalized_timestamp, platform_id, platform_type)
-            existing = merged.get(merge_key)
-            if existing is None:
-                merged[merge_key] = normalized_row
-                result.append(normalized_row)
-            else:
-                existing["count"] += count
-
-        return result
-
-    def _normalize_platform_stats_entry(
-        self,
-        row: dict[str, Any],
-        warn_limiter: _InvalidCountWarnLimiter,
-    ) -> tuple[dict[str, Any], str | None, int]:
-        normalized_row = dict(row)
-        raw_timestamp = normalized_row.get("timestamp")
-        normalized_timestamp = self._normalize_platform_stats_timestamp(raw_timestamp)
-
-        if normalized_timestamp is not None:
-            normalized_row["timestamp"] = normalized_timestamp
-        elif isinstance(raw_timestamp, str):
-            normalized_row["timestamp"] = raw_timestamp.strip()
-        elif raw_timestamp is None:
-            normalized_row["timestamp"] = ""
-        else:
-            normalized_row["timestamp"] = str(raw_timestamp)
-
-        raw_count = normalized_row.get("count", 0)
-        try:
-            count = int(raw_count)
-        except (TypeError, ValueError):
-            key_for_log = (
-                normalized_row.get("timestamp"),
-                repr(normalized_row.get("platform_id")),
-                repr(normalized_row.get("platform_type")),
-            )
-            warn_limiter.warn_invalid_count(raw_count, key_for_log)
-            count = 0
-
-        normalized_row["count"] = count
-        return normalized_row, normalized_timestamp, count
-
-    def _normalize_platform_stats_timestamp(self, value: Any) -> str | None:
-        if isinstance(value, datetime):
-            dt = value
-            if dt.tzinfo is None:
-                dt = dt.replace(tzinfo=timezone.utc)
-            else:
-                dt = dt.astimezone(timezone.utc)
-            return dt.isoformat()
-        if isinstance(value, str):
-            timestamp = value.strip()
-            if not timestamp:
-                return None
-            if timestamp.endswith("Z"):
-                timestamp = f"{timestamp[:-1]}+00:00"
-            try:
-                dt = datetime.fromisoformat(timestamp)
-                if dt.tzinfo is None:
-                    dt = dt.replace(tzinfo=timezone.utc)
-                else:
-                    dt = dt.astimezone(timezone.utc)
-                return dt.isoformat()
-            except ValueError:
-                return None
-        return None
-
     async def _import_knowledge_bases(
         self,
         zf: zipfile.ZipFile,

astrbot/core/computer/booters/base.py

@@ -1,16 +1,4 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from ..olayer import (
-    BrowserComponent,
-    FileSystemComponent,
-    PythonComponent,
-    ShellComponent,
-)
-
-if TYPE_CHECKING:
-    from astrbot.core.agent.tool import FunctionTool
+from ..olayer import FileSystemComponent, PythonComponent, ShellComponent
 
 
 class ComputerBooter:
@@ -23,19 +11,6 @@ class ComputerBooter:
     @property
     def shell(self) -> ShellComponent: ...
 
-    @property
-    def capabilities(self) -> tuple[str, ...] | None:
-        """Sandbox capabilities (e.g. ('python', 'shell', 'filesystem', 'browser')).
-
-        Returns None if the booter doesn't support capability introspection
-        (backward-compatible default).  Subclasses override after boot.
-        """
-        return None
-
-    @property
-    def browser(self) -> BrowserComponent | None:
-        return None
-
     async def boot(self, session_id: str) -> None: ...
 
     async def shutdown(self) -> None: ...
@@ -47,25 +22,10 @@ class ComputerBooter:
         """
         ...
 
-    async def download_file(self, remote_path: str, local_path: str) -> None:
+    async def download_file(self, remote_path: str, local_path: str):
         """Download file from the computer."""
         ...
 
     async def available(self) -> bool:
         """Check if the computer is available."""
         ...
-
-    @classmethod
-    def get_default_tools(cls) -> list[FunctionTool]:
-        """Conservative full tool list (no instance needed, pre-boot)."""
-        return []
-
-    def get_tools(self) -> list[FunctionTool]:
-        """Capability-filtered tool list (post-boot).
-        Defaults to get_default_tools()."""
-        return self.__class__.get_default_tools()
-
-    @classmethod
-    def get_system_prompt_parts(cls) -> list[str]:
-        """Booter-specific system prompt fragments (static text, no instance needed)."""
-        return []

astrbot/core/computer/booters/bay_manager.py

@@ -1,259 +0,0 @@
-"""Manage Bay container lifecycle for zero-config Shipyard Neo integration.
-
-When no Bay endpoint is configured, AstrBot can automatically start a Bay
-container using the Docker socket (like BoxliteBooter does for Ship
-containers).
-"""
-
-from __future__ import annotations
-
-import asyncio
-import io
-import json
-import tarfile
-from typing import Any
-
-import aiodocker
-import aiohttp
-
-from astrbot.api import logger
-
-# ---------------------------------------------------------------------------
-# Constants
-# ---------------------------------------------------------------------------
-
-BAY_IMAGE = "ghcr.io/astrbotdevs/shipyard-neo-bay:latest"
-BAY_CONTAINER_NAME = "astrbot-bay"
-BAY_LABEL = "astrbot.bay.managed"
-BAY_PORT = 8114
-HEALTH_TIMEOUT_S = 60
-HEALTH_POLL_INTERVAL_S = 2
-
-
-class BayContainerManager:
-    """Start / reuse / stop a Bay container via Docker Engine API."""
-
-    def __init__(
-        self,
-        image: str = BAY_IMAGE,
-        host_port: int = BAY_PORT,
-    ) -> None:
-        self._image = image
-        self._host_port = host_port
-        self._docker: aiodocker.Docker | None = None
-        self._container: Any = None
-
-    # ------------------------------------------------------------------
-    # Public API
-    # ------------------------------------------------------------------
-
-    async def ensure_running(self) -> str:
-        """Make sure a Bay container is running. Returns the endpoint URL.
-
-        If a container labelled ``astrbot.bay.managed`` already exists
-        and is running, it will be reused.  Otherwise a new container is
-        created from *self._image*.
-        """
-        try:
-            self._docker = aiodocker.Docker()
-        except Exception as exc:
-            raise RuntimeError(
-                "Failed to connect to Docker daemon. "
-                "Ensure Docker is installed and running, or configure "
-                "an explicit Bay endpoint instead of auto-start mode."
-            ) from exc
-
-        # 1. Look for an existing managed container
-        existing = await self._find_managed_container()
-        if existing is not None:
-            state = existing["State"]
-            if state.get("Running"):
-                cid = existing["Id"][:12]
-                logger.info("[BayManager] Reusing existing Bay container: %s", cid)
-                self._container = await self._docker.containers.get(existing["Id"])
-                return f"http://127.0.0.1:{self._host_port}"
-            else:
-                # Container exists but stopped — restart it
-                logger.info("[BayManager] Restarting stopped Bay container")
-                container = await self._docker.containers.get(existing["Id"])
-                await container.start()
-                self._container = container
-                return f"http://127.0.0.1:{self._host_port}"
-
-        # 2. Pull image if needed
-        await self._pull_image_if_needed()
-
-        # 3. Create and start container
-        logger.info(
-            "[BayManager] Starting Bay container: image=%s, port=%d",
-            self._image,
-            self._host_port,
-        )
-        config = {
-            "Image": self._image,
-            "Labels": {BAY_LABEL: "true"},
-            "Env": [
-                "BAY_SERVER__HOST=0.0.0.0",
-                f"BAY_SERVER__PORT={BAY_PORT}",
-                "BAY_DATA_DIR=/app/data",
-                # allow_anonymous=false → auto-provisions API key
-                "BAY_SECURITY__ALLOW_ANONYMOUS=false",
-            ],
-            "HostConfig": {
-                "PortBindings": {
-                    f"{BAY_PORT}/tcp": [{"HostPort": str(self._host_port)}],
-                },
-                "Binds": [
-                    # Bay needs Docker socket to create sandbox containers
-                    "/var/run/docker.sock:/var/run/docker.sock",
-                ],
-                "RestartPolicy": {"Name": "unless-stopped"},
-            },
-        }
-        self._container = await self._docker.containers.create_or_replace(
-            BAY_CONTAINER_NAME, config
-        )
-        await self._container.start()
-        logger.info("[BayManager] Bay container started: %s", BAY_CONTAINER_NAME)
-
-        return f"http://127.0.0.1:{self._host_port}"
-
-    async def wait_healthy(self, timeout: int = HEALTH_TIMEOUT_S) -> None:
-        """Block until Bay's ``/health`` endpoint returns 200."""
-        url = f"http://127.0.0.1:{self._host_port}/health"
-        loop = asyncio.get_running_loop()
-        deadline = loop.time() + timeout
-        last_error: str = ""
-
-        async with aiohttp.ClientSession() as session:
-            while loop.time() < deadline:
-                try:
-                    async with session.get(
-                        url, timeout=aiohttp.ClientTimeout(total=3)
-                    ) as resp:
-                        if resp.status == 200:
-                            logger.info("[BayManager] Bay is healthy")
-                            return
-                        last_error = f"HTTP {resp.status}"
-                except Exception as exc:
-                    last_error = str(exc)
-
-                await asyncio.sleep(HEALTH_POLL_INTERVAL_S)
-
-        raise TimeoutError(
-            f"Bay did not become healthy within {timeout}s (last error: {last_error})"
-        )
-
-    async def read_credentials(self) -> str:
-        """Read auto-provisioned API key from Bay container.
-
-        Bay writes ``credentials.json`` to its data directory when
-        ``allow_anonymous=false`` and no explicit API key is set.
-        """
-        if self._container is None:
-            return ""
-
-        try:
-            # Read credentials.json from container filesystem
-            tar_stream = await self._container.get_archive("/app/data/credentials.json")
-            # get_archive returns (tar_data, stat)
-            tar_data = tar_stream
-
-            if isinstance(tar_data, dict):
-                raw = tar_data.get("data", b"")
-            elif isinstance(tar_data, tuple):
-                # (stream, stat_info)
-                raw = b""
-                stream = tar_data[0]
-                if hasattr(stream, "read"):
-                    raw = await stream.read()
-                elif isinstance(stream, bytes):
-                    raw = stream
-                else:
-                    # It might be a chunked response
-                    chunks = []
-                    async for chunk in stream:
-                        chunks.append(chunk)
-                    raw = b"".join(chunks)
-            else:
-                raw = tar_data if isinstance(tar_data, bytes) else b""
-
-            if not raw:
-                logger.debug("[BayManager] Empty tar response from container")
-                return ""
-
-            tario = io.BytesIO(raw)
-            with tarfile.open(fileobj=tario) as tar:
-                for member in tar.getmembers():
-                    f = tar.extractfile(member)
-                    if f:
-                        creds = json.loads(f.read().decode("utf-8"))
-                        api_key = creds.get("api_key", "")
-                        if api_key:
-                            masked = (
-                                f"{api_key[:8]}..."
-                                if len(api_key) >= 10
-                                else "redacted"
-                            )
-                            logger.info(
-                                "[BayManager] Auto-discovered Bay API key: %s",
-                                masked,
-                            )
-                        return api_key
-        except Exception as exc:
-            logger.debug(
-                "[BayManager] Failed to read credentials from container: %s", exc
-            )
-
-        return ""
-
-    async def close_client(self) -> None:
-        """Close the Docker client without stopping the container.
-
-        The Bay container stays running for reuse by future sessions.
-        """
-        if self._docker is not None:
-            await self._docker.close()
-            self._docker = None
-
-    async def stop(self) -> None:
-        """Stop and remove the managed Bay container."""
-        if self._container is not None:
-            try:
-                await self._container.stop()
-                await self._container.delete(force=True)
-                logger.info("[BayManager] Bay container stopped and removed")
-            except Exception as exc:
-                logger.debug("[BayManager] Error stopping Bay container: %s", exc)
-            finally:
-                self._container = None
-
-        await self.close_client()
-
-    # ------------------------------------------------------------------
-    # Private helpers
-    # ------------------------------------------------------------------
-
-    async def _find_managed_container(self) -> dict | None:
-        """Find an existing container with our management label."""
-        assert self._docker is not None
-        containers = await self._docker.containers.list(
-            all=True,
-            filters=json.dumps({"label": [f"{BAY_LABEL}=true"]}),
-        )
-        if containers:
-            # Inspect first match to get full state
-            return await containers[0].show()
-        return None
-
-    async def _pull_image_if_needed(self) -> None:
-        """Pull the Bay image if it doesn't exist locally."""
-        assert self._docker is not None
-        try:
-            await self._docker.images.inspect(self._image)
-            logger.debug("[BayManager] Image %s already exists", self._image)
-        except aiodocker.exceptions.DockerError:
-            logger.info("[BayManager] Pulling image %s ...", self._image)
-            # Pull with progress logging
-            await self._docker.images.pull(self._image)
-            logger.info("[BayManager] Image %s pulled successfully", self._image)

astrbot/core/computer/booters/boxlite.py

@@ -1,9 +1,6 @@
-from __future__ import annotations
-
 import asyncio
-import functools
 import random
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import aiohttp
 import boxlite
@@ -13,9 +10,6 @@ from shipyard.shell import ShellComponent as ShipyardShellComponent
 
 from astrbot.api import logger
 
-if TYPE_CHECKING:
-    from astrbot.core.agent.tool import FunctionTool
-
 from ..olayer import FileSystemComponent, PythonComponent, ShellComponent
 from .base import ComputerBooter
 
@@ -70,10 +64,6 @@ class MockShipyardSandboxClient:
             async with aiohttp.ClientSession(timeout=timeout) as session:
                 async with session.post(url, data=data) as response:
                     if response.status == 200:
-                        logger.info(
-                            "[Computer] file_upload booter=boxlite remote_path=%s",
-                            remote_path,
-                        )
                         return {
                             "success": True,
                             "message": "File uploaded successfully",
@@ -81,11 +71,6 @@ class MockShipyardSandboxClient:
                         }
                     else:
                         error_text = await response.text()
-                        logger.warning(
-                            "[Computer] file_upload_failed booter=boxlite error=http_status status=%s remote_path=%s",
-                            response.status,
-                            remote_path,
-                        )
                         return {
                             "success": False,
                             "error": f"Server returned {response.status}: {error_text}",
@@ -93,39 +78,30 @@ class MockShipyardSandboxClient:
                         }
 
         except aiohttp.ClientError as e:
-            logger.error("[Computer] file_upload_failed booter=boxlite error=%s", e)
+            logger.error(f"Failed to upload file: {e}")
             return {
                 "success": False,
                 "error": f"Connection error: {str(e)}",
                 "message": "File upload failed",
             }
         except asyncio.TimeoutError:
-            logger.warning(
-                "[Computer] file_upload_failed booter=boxlite error=timeout remote_path=%s",
-                remote_path,
-            )
             return {
                 "success": False,
                 "error": "File upload timeout",
                 "message": "File upload failed",
             }
         except FileNotFoundError:
-            logger.error(
-                "[Computer] file_upload_failed booter=boxlite error=file_not_found path=%s",
-                path,
-            )
+            logger.error(f"File not found: {path}")
             return {
                 "success": False,
                 "error": f"File not found: {path}",
                 "message": "File upload failed",
             }
-        except Exception as exc:
-            logger.exception(
-                "[Computer] file_upload_failed booter=boxlite error=unexpected"
-            )
+        except Exception as e:
+            logger.error(f"Unexpected error uploading file: {e}")
             return {
                 "success": False,
-                "error": f"Internal error: {str(exc)}",
+                "error": f"Internal error: {str(e)}",
                 "message": "File upload failed",
             }
 
@@ -134,42 +110,24 @@ class MockShipyardSandboxClient:
         loop = 60
         while loop > 0:
             try:
-                logger.debug(
-                    "[Computer] health_check booter=boxlite ship_id=%s session=%s endpoint=%s attempt=%s healthy=pending",
-                    ship_id,
-                    session_id,
-                    self.sb_url,
-                    61 - loop,
+                logger.info(
+                    f"Checking health for sandbox {ship_id} on {self.sb_url}..."
                 )
                 url = f"{self.sb_url}/health"
                 async with aiohttp.ClientSession() as session:
                     async with session.get(url) as response:
                         if response.status == 200:
-                            logger.debug(
-                                "[Computer] health_check booter=boxlite ship_id=%s session=%s endpoint=%s healthy=true",
-                                ship_id,
-                                session_id,
-                                self.sb_url,
-                            )
-                            return
-                await asyncio.sleep(1)
-                loop -= 1
+                            logger.info(f"Sandbox {ship_id} is healthy")
+                return
             except Exception:
                 await asyncio.sleep(1)
                 loop -= 1
-        logger.warning(
-            "[Computer] health_check_timeout booter=boxlite ship_id=%s session=%s endpoint=%s",
-            ship_id,
-            session_id,
-            self.sb_url,
-        )
 
 
 class BoxliteBooter(ComputerBooter):
     async def boot(self, session_id: str) -> None:
         logger.info(
-            "[Computer] booter_boot booter=boxlite session=%s status=starting",
-            session_id,
+            f"Booting(Boxlite) for session: {session_id}, this may take a while..."
         )
         random_port = random.randint(20000, 30000)
         self.box = boxlite.SimpleBox(
@@ -184,11 +142,7 @@ class BoxliteBooter(ComputerBooter):
             ],
         )
         await self.box.start()
-        logger.info(
-            "[Computer] booter_boot booter=boxlite session=%s status=ready ship_id=%s",
-            session_id,
-            self.box.id,
-        )
+        logger.info(f"Boxlite booter started for session: {session_id}")
         self.mocked = MockShipyardSandboxClient(
             sb_url=f"http://127.0.0.1:{random_port}"
         )
@@ -211,15 +165,9 @@ class BoxliteBooter(ComputerBooter):
         await self.mocked.wait_healthy(self.box.id, session_id)
 
     async def shutdown(self) -> None:
-        logger.info(
-            "[Computer] booter_shutdown booter=boxlite ship_id=%s status=starting",
-            self.box.id,
-        )
+        logger.info(f"Shutting down Boxlite booter for ship: {self.box.id}")
         self.box.shutdown()
-        logger.info(
-            "[Computer] booter_shutdown booter=boxlite ship_id=%s status=done",
-            self.box.id,
-        )
+        logger.info(f"Boxlite booter for ship: {self.box.id} stopped")
 
     @property
     def fs(self) -> FileSystemComponent:
@@ -236,24 +184,3 @@ class BoxliteBooter(ComputerBooter):
     async def upload_file(self, path: str, file_name: str) -> dict:
         """Upload file to sandbox"""
         return await self.mocked.upload_file(path, file_name)
-
-    @classmethod
-    @functools.cache
-    def _default_tools(cls) -> tuple[FunctionTool, ...]:
-        from astrbot.core.computer.tools import (
-            ExecuteShellTool,
-            FileDownloadTool,
-            FileUploadTool,
-            PythonTool,
-        )
-
-        return (
-            ExecuteShellTool(),
-            PythonTool(),
-            FileUploadTool(),
-            FileDownloadTool(),
-        )
-
-    @classmethod
-    def get_default_tools(cls) -> list[FunctionTool]:
-        return list(cls._default_tools())

astrbot/core/computer/booters/constants.py

@@ -1,3 +0,0 @@
-BOOTER_SHIPYARD = "shipyard"
-BOOTER_SHIPYARD_NEO = "shipyard_neo"
-BOOTER_BOXLITE = "boxlite"

astrbot/core/computer/booters/local.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import locale
 import os
 import shutil
 import subprocess
@@ -53,31 +52,6 @@ def _ensure_safe_path(path: str) -> str:
     return abs_path
 
 
-def _decode_shell_output(output: bytes | None) -> str:
-    if output is None:
-        return ""
-
-    preferred = locale.getpreferredencoding(False) or "utf-8"
-    try:
-        return output.decode("utf-8")
-    except (LookupError, UnicodeDecodeError):
-        pass
-
-    if os.name == "nt":
-        for encoding in ("mbcs", "cp936", "gbk", "gb18030"):
-            try:
-                return output.decode(encoding)
-            except (LookupError, UnicodeDecodeError):
-                continue
-
-    try:
-        return output.decode(preferred)
-    except (LookupError, UnicodeDecodeError):
-        pass
-
-    return output.decode("utf-8", errors="replace")
-
-
 @dataclass
 class LocalShellComponent(ShellComponent):
     async def exec(
@@ -98,32 +72,28 @@ class LocalShellComponent(ShellComponent):
                 run_env.update({str(k): str(v) for k, v in env.items()})
             working_dir = _ensure_safe_path(cwd) if cwd else get_astrbot_root()
             if background:
-                # `command` is intentionally executed through the current shell so
-                # local computer-use behavior matches existing tool semantics.
-                # Safety relies on `_is_safe_command()` and the allowed-root checks.
-                proc = subprocess.Popen(  # noqa: S602  # nosemgrep: python.lang.security.audit.dangerous-subprocess-use-audit
+                proc = subprocess.Popen(
                     command,
                     shell=shell,
                     cwd=working_dir,
                     env=run_env,
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
                 )
                 return {"pid": proc.pid, "stdout": "", "stderr": "", "exit_code": None}
-            # `command` is intentionally executed through the current shell so
-            # local computer-use behavior matches existing tool semantics.
-            # Safety relies on `_is_safe_command()` and the allowed-root checks.
-            result = subprocess.run(  # noqa: S602  # nosemgrep: python.lang.security.audit.dangerous-subprocess-use-audit
+            result = subprocess.run(
                 command,
                 shell=shell,
                 cwd=working_dir,
                 env=run_env,
                 timeout=timeout,
                 capture_output=True,
+                text=True,
             )
             return {
-                "stdout": _decode_shell_output(result.stdout),
-                "stderr": _decode_shell_output(result.stderr),
+                "stdout": result.stdout,
+                "stderr": result.stderr,
                 "exit_code": result.returncode,
             }
 
@@ -255,7 +225,7 @@ class LocalBooter(ComputerBooter):
             "LocalBooter does not support upload_file operation. Use shell instead."
         )
 
-    async def download_file(self, remote_path: str, local_path: str) -> None:
+    async def download_file(self, remote_path: str, local_path: str):
         raise NotImplementedError(
             "LocalBooter does not support download_file operation. Use shell instead."
         )

astrbot/core/computer/booters/shipyard.py

@@ -1,41 +1,12 @@
-from __future__ import annotations
-
-import functools
-from typing import TYPE_CHECKING
-
 from shipyard import ShipyardClient, Spec
 
 from astrbot.api import logger
 
-if TYPE_CHECKING:
-    from astrbot.core.agent.tool import FunctionTool
-
 from ..olayer import FileSystemComponent, PythonComponent, ShellComponent
 from .base import ComputerBooter
 
 
 class ShipyardBooter(ComputerBooter):
-    @classmethod
-    @functools.cache
-    def _default_tools(cls) -> tuple[FunctionTool, ...]:
-        from astrbot.core.computer.tools import (
-            ExecuteShellTool,
-            FileDownloadTool,
-            FileUploadTool,
-            PythonTool,
-        )
-
-        return (
-            ExecuteShellTool(),
-            PythonTool(),
-            FileUploadTool(),
-            FileDownloadTool(),
-        )
-
-    @classmethod
-    def get_default_tools(cls) -> list[FunctionTool]:
-        return list(cls._default_tools())
-
     def __init__(
         self,
         endpoint_url: str,
@@ -56,15 +27,11 @@ class ShipyardBooter(ComputerBooter):
             max_session_num=self._session_num,
             session_id=session_id,
         )
-        logger.info(
-            "[Computer] sandbox_created booter=shipyard ship_id=%s session=%s",
-            ship.id,
-            session_id,
-        )
+        logger.info(f"Got sandbox ship: {ship.id} for session: {session_id}")
         self._ship = ship
 
     async def shutdown(self) -> None:
-        logger.info("[Computer] booter_shutdown booter=shipyard status=done")
+        pass
 
     @property
     def fs(self) -> FileSystemComponent:
@@ -80,22 +47,11 @@ class ShipyardBooter(ComputerBooter):
 
     async def upload_file(self, path: str, file_name: str) -> dict:
         """Upload file to sandbox"""
-        result = await self._ship.upload_file(path, file_name)
-        logger.info(
-            "[Computer] file_upload booter=shipyard remote_path=%s",
-            file_name,
-        )
-        return result
+        return await self._ship.upload_file(path, file_name)
 
     async def download_file(self, remote_path: str, local_path: str):
         """Download file from sandbox."""
-        result = await self._ship.download_file(remote_path, local_path)
-        logger.info(
-            "[Computer] file_download booter=shipyard remote_path=%s local_path=%s",
-            remote_path,
-            local_path,
-        )
-        return result
+        return await self._ship.download_file(remote_path, local_path)
 
     async def available(self) -> bool:
         """Check if the sandbox is available."""
@@ -103,21 +59,9 @@ class ShipyardBooter(ComputerBooter):
             ship_id = self._ship.id
             data = await self._sandbox_client.get_ship(ship_id)
             if not data:
-                logger.debug(
-                    "[Computer] health_check booter=shipyard ship_id=%s healthy=false reason=no_data",
-                    ship_id,
-                )
                 return False
             health = bool(data.get("status", 0) == 1)
-            logger.debug(
-                "[Computer] health_check booter=shipyard ship_id=%s healthy=%s",
-                ship_id,
-                health,
-            )
             return health
-        except Exception:
-            logger.exception(
-                "[Computer] health_check_failed booter=shipyard ship_id=%s",
-                getattr(getattr(self, "_ship", None), "id", "unknown"),
-            )
+        except Exception as e:
+            logger.error(f"Error checking Shipyard sandbox availability: {e}")
             return False

astrbot/core/computer/booters/shipyard_neo.py

@@ -1,608 +0,0 @@
-from __future__ import annotations
-
-import functools
-import os
-import shlex
-from typing import TYPE_CHECKING, Any, cast
-
-from astrbot.api import logger
-
-if TYPE_CHECKING:
-    from astrbot.core.agent.tool import FunctionTool
-
-from ..olayer import (
-    BrowserComponent,
-    FileSystemComponent,
-    PythonComponent,
-    ShellComponent,
-)
-from .base import ComputerBooter
-
-
-def _maybe_model_dump(value: Any) -> dict[str, Any]:
-    if isinstance(value, dict):
-        return value
-    if hasattr(value, "model_dump"):
-        dumped = value.model_dump()
-        if isinstance(dumped, dict):
-            return dumped
-    return {}
-
-
-class NeoPythonComponent(PythonComponent):
-    def __init__(self, sandbox: Any) -> None:
-        self._sandbox = sandbox
-
-    async def exec(
-        self,
-        code: str,
-        kernel_id: str | None = None,
-        timeout: int = 30,
-        silent: bool = False,
-    ) -> dict[str, Any]:
-        _ = kernel_id  # Bay runtime does not expose kernel_id in current SDK.
-        result = await self._sandbox.python.exec(code, timeout=timeout)
-        payload = _maybe_model_dump(result)
-
-        output_text = payload.get("output", "") or ""
-        error_text = payload.get("error", "") or ""
-        data = payload.get("data") if isinstance(payload.get("data"), dict) else {}
-        rich_output = data.get("output") if isinstance(data.get("output"), dict) else {}
-        if not isinstance(rich_output.get("images"), list):
-            rich_output["images"] = []
-        if "text" not in rich_output:
-            rich_output["text"] = output_text
-
-        if silent:
-            rich_output["text"] = ""
-
-        return {
-            "success": bool(payload.get("success", error_text == "")),
-            "data": {
-                "output": rich_output,
-                "error": error_text,
-            },
-            "execution_id": payload.get("execution_id"),
-            "execution_time_ms": payload.get("execution_time_ms"),
-            "code": payload.get("code"),
-            "output": output_text,
-            "error": error_text,
-        }
-
-
-class NeoShellComponent(ShellComponent):
-    def __init__(self, sandbox: Any) -> None:
-        self._sandbox = sandbox
-
-    async def exec(
-        self,
-        command: str,
-        cwd: str | None = None,
-        env: dict[str, str] | None = None,
-        timeout: int | None = 30,
-        shell: bool = True,
-        background: bool = False,
-    ) -> dict[str, Any]:
-        if not shell:
-            return {
-                "stdout": "",
-                "stderr": "error: only shell mode is supported in shipyard_neo booter.",
-                "exit_code": 2,
-                "success": False,
-            }
-
-        run_command = command
-        if env:
-            env_prefix = " ".join(
-                f"{k}={shlex.quote(str(v))}" for k, v in sorted(env.items())
-            )
-            run_command = f"{env_prefix} {run_command}"
-
-        if background:
-            run_command = f"nohup sh -lc {shlex.quote(run_command)} >/tmp/astrbot_bg.log 2>&1 & echo $!"
-
-        result = await self._sandbox.shell.exec(
-            run_command,
-            timeout=timeout or 30,
-            cwd=cwd,
-        )
-        payload = _maybe_model_dump(result)
-
-        stdout = payload.get("output", "") or ""
-        stderr = payload.get("error", "") or ""
-        exit_code = payload.get("exit_code")
-        if background:
-            pid: int | None = None
-            try:
-                pid = int(stdout.strip().splitlines()[-1])
-            except Exception:
-                pid = None
-            return {
-                "pid": pid,
-                "stdout": stdout,
-                "stderr": stderr,
-                "exit_code": exit_code,
-                "success": bool(payload.get("success", not stderr)),
-                "execution_id": payload.get("execution_id"),
-                "execution_time_ms": payload.get("execution_time_ms"),
-                "command": payload.get("command"),
-            }
-
-        return {
-            "stdout": stdout,
-            "stderr": stderr,
-            "exit_code": exit_code,
-            "success": bool(payload.get("success", not stderr)),
-            "execution_id": payload.get("execution_id"),
-            "execution_time_ms": payload.get("execution_time_ms"),
-            "command": payload.get("command"),
-        }
-
-
-class NeoFileSystemComponent(FileSystemComponent):
-    def __init__(self, sandbox: Any) -> None:
-        self._sandbox = sandbox
-
-    async def create_file(
-        self,
-        path: str,
-        content: str = "",
-        mode: int = 0o644,
-    ) -> dict[str, Any]:
-        _ = mode
-        await self._sandbox.filesystem.write_file(path, content)
-        return {"success": True, "path": path}
-
-    async def read_file(self, path: str, encoding: str = "utf-8") -> dict[str, Any]:
-        _ = encoding
-        content = await self._sandbox.filesystem.read_file(path)
-        return {"success": True, "path": path, "content": content}
-
-    async def write_file(
-        self,
-        path: str,
-        content: str,
-        mode: str = "w",
-        encoding: str = "utf-8",
-    ) -> dict[str, Any]:
-        _ = mode
-        _ = encoding
-        await self._sandbox.filesystem.write_file(path, content)
-        return {"success": True, "path": path}
-
-    async def delete_file(self, path: str) -> dict[str, Any]:
-        await self._sandbox.filesystem.delete(path)
-        return {"success": True, "path": path}
-
-    async def list_dir(
-        self,
-        path: str = ".",
-        show_hidden: bool = False,
-    ) -> dict[str, Any]:
-        entries = await self._sandbox.filesystem.list_dir(path)
-        data = []
-        for entry in entries:
-            item = _maybe_model_dump(entry)
-            if not show_hidden and str(item.get("name", "")).startswith("."):
-                continue
-            data.append(item)
-        return {"success": True, "path": path, "entries": data}
-
-
-class NeoBrowserComponent(BrowserComponent):
-    def __init__(self, sandbox: Any) -> None:
-        self._sandbox = sandbox
-
-    async def exec(
-        self,
-        cmd: str,
-        timeout: int = 30,
-        description: str | None = None,
-        tags: str | None = None,
-        learn: bool = False,
-        include_trace: bool = False,
-    ) -> dict[str, Any]:
-        result = await self._sandbox.browser.exec(
-            cmd,
-            timeout=timeout,
-            description=description,
-            tags=tags,
-            learn=learn,
-            include_trace=include_trace,
-        )
-        return _maybe_model_dump(result)
-
-    async def exec_batch(
-        self,
-        commands: list[str],
-        timeout: int = 60,
-        stop_on_error: bool = True,
-        description: str | None = None,
-        tags: str | None = None,
-        learn: bool = False,
-        include_trace: bool = False,
-    ) -> dict[str, Any]:
-        result = await self._sandbox.browser.exec_batch(
-            commands,
-            timeout=timeout,
-            stop_on_error=stop_on_error,
-            description=description,
-            tags=tags,
-            learn=learn,
-            include_trace=include_trace,
-        )
-        return _maybe_model_dump(result)
-
-    async def run_skill(
-        self,
-        skill_key: str,
-        timeout: int = 60,
-        stop_on_error: bool = True,
-        include_trace: bool = False,
-        description: str | None = None,
-        tags: str | None = None,
-    ) -> dict[str, Any]:
-        result = await self._sandbox.browser.run_skill(
-            skill_key=skill_key,
-            timeout=timeout,
-            stop_on_error=stop_on_error,
-            include_trace=include_trace,
-            description=description,
-            tags=tags,
-        )
-        return _maybe_model_dump(result)
-
-
-class ShipyardNeoBooter(ComputerBooter):
-    """Booter backed by Shipyard Neo (Bay).
-
-    If *endpoint_url* is empty or set to ``"__auto__"``, Bay will be
-    started automatically as a Docker container (like Boxlite does for
-    Ship containers).
-    """
-
-    AUTO_SENTINEL = "__auto__"
-    DEFAULT_PROFILE = "python-default"
-
-    def __init__(
-        self,
-        endpoint_url: str,
-        access_token: str,
-        profile: str = DEFAULT_PROFILE,
-        ttl: int = 3600,
-    ) -> None:
-        self._endpoint_url = endpoint_url
-        self._access_token = access_token
-        self._profile = profile
-        self._ttl = ttl
-        self._client: Any = None
-        self._sandbox: Any = None
-        self._bay_manager: Any = None  # BayContainerManager when auto-started
-        self._fs: FileSystemComponent | None = None
-        self._python: PythonComponent | None = None
-        self._shell: ShellComponent | None = None
-        self._browser: BrowserComponent | None = None
-
-    @property
-    def bay_client(self) -> Any:
-        return self._client
-
-    @property
-    def sandbox(self) -> Any:
-        return self._sandbox
-
-    @property
-    def capabilities(self) -> tuple[str, ...] | None:
-        """Sandbox capabilities from the Bay profile.
-
-        Returns an immutable tuple after :meth:`boot`; ``None`` before boot.
-        """
-        if self._sandbox is None:
-            return None
-        caps = getattr(self._sandbox, "capabilities", None)
-        return tuple(caps) if caps is not None else None
-
-    @property
-    def is_auto_mode(self) -> bool:
-        """True when Bay should be auto-started."""
-        ep = (self._endpoint_url or "").strip()
-        return not ep or ep == self.AUTO_SENTINEL
-
-    async def boot(self, session_id: str) -> None:
-        _ = session_id
-
-        # --- Auto-start Bay if needed ---
-        if self.is_auto_mode:
-            from .bay_manager import BayContainerManager
-
-            # Clean up previous manager if re-booting
-            if self._bay_manager is not None:
-                await self._bay_manager.close_client()
-
-            logger.info("[Computer] bay_autostart status=starting")
-            self._bay_manager = BayContainerManager()
-            self._endpoint_url = await self._bay_manager.ensure_running()
-            await self._bay_manager.wait_healthy()
-            # Read auto-provisioned credentials
-            if not self._access_token:
-                self._access_token = await self._bay_manager.read_credentials()
-            logger.info(
-                "[Computer] bay_autostart status=ready endpoint=%s",
-                self._endpoint_url,
-            )
-
-        if not self._endpoint_url or not self._access_token:
-            if self._bay_manager is not None:
-                raise ValueError(
-                    "Bay container started but credentials could not be read. "
-                    "Ensure Bay generated credentials.json, or set access_token manually."
-                )
-            raise ValueError(
-                "Shipyard Neo sandbox configuration is incomplete. "
-                "Set endpoint (default http://127.0.0.1:8114) and access token, "
-                "or ensure Bay's credentials.json is accessible for auto-discovery."
-            )
-
-        from shipyard_neo import BayClient
-
-        self._client = BayClient(
-            endpoint_url=self._endpoint_url,
-            access_token=self._access_token,
-        )
-        await self._client.__aenter__()
-
-        # Resolve profile: user-specified > smart selection > default
-        resolved_profile = await self._resolve_profile(self._client)
-
-        self._sandbox = await self._client.create_sandbox(
-            profile=resolved_profile,
-            ttl=self._ttl,
-        )
-
-        self._fs = NeoFileSystemComponent(self._sandbox)
-        self._python = NeoPythonComponent(self._sandbox)
-        self._shell = NeoShellComponent(self._sandbox)
-
-        caps = self.capabilities or ()
-        self._browser = (
-            NeoBrowserComponent(self._sandbox) if "browser" in caps else None
-        )
-
-        logger.info(
-            "[Computer] sandbox_created booter=shipyard_neo sandbox_id=%s profile=%s capabilities=%s auto=%s",
-            self._sandbox.id,
-            resolved_profile,
-            list(caps),
-            bool(self._bay_manager),
-        )
-
-    async def _resolve_profile(self, client: Any) -> str:
-        """Pick the best profile for this session.
-
-        Resolution order:
-        1. User-specified profile (non-empty, non-default) → use as-is.
-        2. Query ``GET /v1/profiles`` and pick the profile with the most
-           capabilities, preferring profiles that include ``"browser"``.
-        3. Fall back to :attr:`DEFAULT_PROFILE`.
-
-        Auth errors (401/403) are re-raised immediately — they indicate a
-        misconfigured token, and silently falling back would just delay the
-        real failure to ``create_sandbox``.
-        """
-        # User explicitly set a profile → honour it
-        if self._profile and self._profile != self.DEFAULT_PROFILE:
-            logger.info(
-                "[Computer] profile_selected mode=user profile=%s",
-                self._profile,
-            )
-            return self._profile
-
-        # Query Bay for available profiles
-        from shipyard_neo.errors import ForbiddenError, UnauthorizedError
-
-        try:
-            profile_list = await client.list_profiles()
-            profiles = profile_list.items
-        except (UnauthorizedError, ForbiddenError):
-            raise  # auth errors must not be silenced
-        except Exception as exc:
-            logger.warning(
-                "[Computer] profile_selection_fallback reason=query_failed fallback=%s error=%s",
-                self.DEFAULT_PROFILE,
-                exc,
-            )
-            return self.DEFAULT_PROFILE
-
-        if not profiles:
-            return self.DEFAULT_PROFILE
-
-        def _score(p: Any) -> tuple[int, int]:
-            """(has_browser, capability_count) — higher is better."""
-            caps = getattr(p, "capabilities", []) or []
-            return (1 if "browser" in caps else 0, len(caps))
-
-        best = max(profiles, key=_score)
-        chosen = getattr(best, "id", self.DEFAULT_PROFILE)
-
-        if chosen != self.DEFAULT_PROFILE:
-            caps = getattr(best, "capabilities", [])
-            logger.info(
-                "[Computer] profile_selected mode=auto profile=%s capabilities=%s",
-                chosen,
-                caps,
-            )
-
-        return chosen
-
-    async def shutdown(self) -> None:
-        if self._client is not None:
-            sandbox_id = getattr(self._sandbox, "id", "unknown")
-            logger.info(
-                "[Computer] booter_shutdown booter=shipyard_neo sandbox_id=%s status=starting",
-                sandbox_id,
-            )
-            await self._client.__aexit__(None, None, None)
-            self._client = None
-            self._sandbox = None
-            logger.info(
-                "[Computer] booter_shutdown booter=shipyard_neo sandbox_id=%s status=done",
-                sandbox_id,
-            )
-
-        # NOTE: We intentionally do NOT stop the Bay container here.
-        # It stays running for reuse by future sessions.  The user can
-        # stop it manually or via ``BayContainerManager.stop()``.
-        if self._bay_manager is not None:
-            await self._bay_manager.close_client()
-
-    @property
-    def fs(self) -> FileSystemComponent:
-        if self._fs is None:
-            raise RuntimeError("ShipyardNeoBooter is not initialized.")
-        return self._fs
-
-    @property
-    def python(self) -> PythonComponent:
-        if self._python is None:
-            raise RuntimeError("ShipyardNeoBooter is not initialized.")
-        return self._python
-
-    @property
-    def shell(self) -> ShellComponent:
-        if self._shell is None:
-            raise RuntimeError("ShipyardNeoBooter is not initialized.")
-        return self._shell
-
-    @property
-    def browser(self) -> BrowserComponent | None:
-        return self._browser
-
-    async def upload_file(self, path: str, file_name: str) -> dict:
-        if self._sandbox is None:
-            raise RuntimeError("ShipyardNeoBooter is not initialized.")
-        with open(path, "rb") as f:
-            content = f.read()
-        remote_path = file_name.lstrip("/")
-        await self._sandbox.filesystem.upload(remote_path, content)
-        logger.info(
-            "[Computer] file_upload booter=shipyard_neo remote_path=%s",
-            remote_path,
-        )
-        return {
-            "success": True,
-            "message": "File uploaded successfully",
-            "file_path": remote_path,
-        }
-
-    async def download_file(self, remote_path: str, local_path: str) -> None:
-        if self._sandbox is None:
-            raise RuntimeError("ShipyardNeoBooter is not initialized.")
-        content = await self._sandbox.filesystem.download(remote_path.lstrip("/"))
-        local_dir = os.path.dirname(local_path)
-        if local_dir:
-            os.makedirs(local_dir, exist_ok=True)
-        with open(local_path, "wb") as f:
-            f.write(cast(bytes, content))
-        logger.info(
-            "[Computer] file_download booter=shipyard_neo remote_path=%s local_path=%s",
-            remote_path,
-            local_path,
-        )
-
-    async def available(self) -> bool:
-        if self._sandbox is None:
-            return False
-        try:
-            await self._sandbox.refresh()
-            status = getattr(self._sandbox.status, "value", str(self._sandbox.status))
-            healthy = status not in {"failed", "expired"}
-            logger.debug(
-                "[Computer] health_check booter=shipyard_neo sandbox_id=%s status=%s healthy=%s",
-                getattr(self._sandbox, "id", "unknown"),
-                status,
-                healthy,
-            )
-            return healthy
-        except Exception:
-            logger.exception(
-                "[Computer] health_check_failed booter=shipyard_neo sandbox_id=%s",
-                getattr(self._sandbox, "id", "unknown"),
-            )
-            return False
-
-    # ── Tool / prompt self-description ────────────────────────────
-
-    @classmethod
-    @functools.cache
-    def _base_tools(cls) -> tuple[FunctionTool, ...]:
-        """4 base + 11 Neo lifecycle = 15 tools (all Neo profiles)."""
-        from astrbot.core.computer.tools import (
-            AnnotateExecutionTool,
-            CreateSkillCandidateTool,
-            CreateSkillPayloadTool,
-            EvaluateSkillCandidateTool,
-            ExecuteShellTool,
-            FileDownloadTool,
-            FileUploadTool,
-            GetExecutionHistoryTool,
-            GetSkillPayloadTool,
-            ListSkillCandidatesTool,
-            ListSkillReleasesTool,
-            PromoteSkillCandidateTool,
-            PythonTool,
-            RollbackSkillReleaseTool,
-            SyncSkillReleaseTool,
-        )
-
-        return (
-            ExecuteShellTool(),
-            PythonTool(),
-            FileUploadTool(),
-            FileDownloadTool(),
-            GetExecutionHistoryTool(),
-            AnnotateExecutionTool(),
-            CreateSkillPayloadTool(),
-            GetSkillPayloadTool(),
-            CreateSkillCandidateTool(),
-            ListSkillCandidatesTool(),
-            EvaluateSkillCandidateTool(),
-            PromoteSkillCandidateTool(),
-            ListSkillReleasesTool(),
-            RollbackSkillReleaseTool(),
-            SyncSkillReleaseTool(),
-        )
-
-    @classmethod
-    @functools.cache
-    def _browser_tools(cls) -> tuple[FunctionTool, ...]:
-        from astrbot.core.computer.tools import (
-            BrowserBatchExecTool,
-            BrowserExecTool,
-            RunBrowserSkillTool,
-        )
-
-        return (BrowserExecTool(), BrowserBatchExecTool(), RunBrowserSkillTool())
-
-    @classmethod
-    def get_default_tools(cls) -> list[FunctionTool]:
-        """Pre-boot: conservative full list (including browser)."""
-        return list(cls._base_tools()) + list(cls._browser_tools())
-
-    def get_tools(self) -> list[FunctionTool]:
-        """Post-boot: capability-filtered list."""
-        caps = self.capabilities
-        if caps is None:
-            return self.__class__.get_default_tools()
-        tools = list(self._base_tools())
-        if "browser" in caps:
-            tools.extend(self._browser_tools())
-        return tools
-
-    @classmethod
-    def get_system_prompt_parts(cls) -> list[str]:
-        from astrbot.core.computer.prompts import (
-            NEO_FILE_PATH_PROMPT,
-            NEO_SKILL_LIFECYCLE_PROMPT,
-        )
-
-        return [NEO_FILE_PATH_PROMPT, NEO_SKILL_LIFECYCLE_PROMPT]

astrbot/core/computer/computer_client.py

@@ -1,14 +1,10 @@
-from __future__ import annotations
-
-import json
 import os
 import shutil
 import uuid
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 from astrbot.api import logger
-from astrbot.core.skills.skill_manager import SANDBOX_SKILLS_ROOT, SkillManager
+from astrbot.core.skills.skill_manager import SANDBOX_SKILLS_ROOT
 from astrbot.core.star.context import Context
 from astrbot.core.utils.astrbot_path import (
     get_astrbot_skills_path,
@@ -16,426 +12,51 @@ from astrbot.core.utils.astrbot_path import (
 )
 
 from .booters.base import ComputerBooter
-from .booters.constants import BOOTER_BOXLITE, BOOTER_SHIPYARD, BOOTER_SHIPYARD_NEO
 from .booters.local import LocalBooter
 
-if TYPE_CHECKING:
-    from astrbot.core.agent.tool import FunctionTool
-
 session_booter: dict[str, ComputerBooter] = {}
 local_booter: ComputerBooter | None = None
-_MANAGED_SKILLS_FILE = ".astrbot_managed_skills.json"
-
-
-def _list_local_skill_dirs(skills_root: Path) -> list[Path]:
-    skills: list[Path] = []
-    for entry in sorted(skills_root.iterdir()):
-        if not entry.is_dir():
-            continue
-        skill_md = entry / "SKILL.md"
-        if skill_md.exists():
-            skills.append(entry)
-    return skills
-
-
-def _discover_bay_credentials(endpoint: str) -> str:
-    """Try to auto-discover Bay API key from credentials.json.
-
-    Search order:
-    1. BAY_DATA_DIR env var
-    2. Mono-repo relative path: ../pkgs/bay/ (dev layout)
-    3. Current working directory
-
-    Returns:
-        API key string, or empty string if not found.
-    """
-    candidates: list[Path] = []
-
-    # 1. BAY_DATA_DIR env var
-    bay_data_dir = os.environ.get("BAY_DATA_DIR")
-    if bay_data_dir:
-        candidates.append(Path(bay_data_dir) / "credentials.json")
-
-    # 2. Mono-repo layout: AstrBot/../pkgs/bay/credentials.json
-    astrbot_root = Path(__file__).resolve().parents[3]  # astrbot/core/computer/ → root
-    candidates.append(astrbot_root.parent / "pkgs" / "bay" / "credentials.json")
-
-    # 3. Current working directory
-    candidates.append(Path.cwd() / "credentials.json")
-
-    for cred_path in candidates:
-        if not cred_path.is_file():
-            continue
-        try:
-            data = json.loads(cred_path.read_text())
-            api_key = data.get("api_key", "")
-            if api_key:
-                # Optionally verify endpoint matches
-                cred_endpoint = data.get("endpoint", "")
-                if (
-                    cred_endpoint
-                    and endpoint
-                    and cred_endpoint.rstrip("/") != endpoint.rstrip("/")
-                ):
-                    logger.warning(
-                        "[Computer] bay_credentials_mismatch file_endpoint=%s configured_endpoint=%s action=use_key",
-                        cred_endpoint,
-                        endpoint,
-                    )
-                masked_key = f"{api_key[:4]}..." if len(api_key) >= 6 else "redacted"
-                logger.info(
-                    "[Computer] bay_credentials_lookup status=found path=%s key_prefix=%s",
-                    cred_path,
-                    masked_key,
-                )
-                return api_key
-        except (json.JSONDecodeError, OSError) as exc:
-            logger.debug(
-                "[Computer] bay_credentials_read_failed path=%s error=%s",
-                cred_path,
-                exc,
-            )
-
-    logger.debug("[Computer] bay_credentials_lookup status=not_found")
-    return ""
-
-
-def _build_python_exec_command(script: str) -> str:
-    return (
-        "if command -v python3 >/dev/null 2>&1; then PYBIN=python3; "
-        "elif command -v python >/dev/null 2>&1; then PYBIN=python; "
-        "else echo 'python not found in sandbox' >&2; exit 127; fi; "
-        "$PYBIN - <<'PY'\n"
-        f"{script}\n"
-        "PY"
-    )
-
-
-def _build_apply_sync_command() -> str:
-    """Build shell command for sync stage only.
-
-    This stage mutates sandbox files (managed skill replacement) but does not scan
-    metadata. Keeping it separate allows callers to preserve old behavior while
-    reusing the apply step independently.
-    """
-    script = f"""
-import json
-import shutil
-import zipfile
-from pathlib import Path
-
-root = Path({SANDBOX_SKILLS_ROOT!r})
-zip_path = root / "skills.zip"
-tmp_extract = Path(f"{{root}}_tmp_extract")
-managed_file = root / {_MANAGED_SKILLS_FILE!r}
-
-
-def remove_tree(path: Path) -> None:
-    if not path.exists():
-        return
-    if path.is_dir():
-        shutil.rmtree(path, ignore_errors=True)
-    else:
-        path.unlink(missing_ok=True)
-
-
-def load_managed_skills() -> list[str]:
-    if not managed_file.exists():
-        return []
-    try:
-        payload = json.loads(managed_file.read_text(encoding="utf-8"))
-    except Exception:
-        return []
-    if not isinstance(payload, dict):
-        return []
-    items = payload.get("managed_skills", [])
-    if not isinstance(items, list):
-        return []
-    result: list[str] = []
-    for item in items:
-        if isinstance(item, str) and item.strip():
-            result.append(item.strip())
-    return result
-
-
-root.mkdir(parents=True, exist_ok=True)
-for managed_name in load_managed_skills():
-    remove_tree(root / managed_name)
-
-current_managed: list[str] = []
-if zip_path.exists():
-    remove_tree(tmp_extract)
-    tmp_extract.mkdir(parents=True, exist_ok=True)
-    with zipfile.ZipFile(zip_path) as zf:
-        zf.extractall(tmp_extract)
-    for entry in sorted(tmp_extract.iterdir()):
-        if not entry.is_dir():
-            continue
-        target = root / entry.name
-        remove_tree(target)
-        shutil.copytree(entry, target)
-        current_managed.append(entry.name)
-
-remove_tree(tmp_extract)
-remove_tree(zip_path)
-managed_file.write_text(
-    json.dumps({{"managed_skills": current_managed}}, ensure_ascii=False, indent=2),
-    encoding="utf-8",
-)
-print(json.dumps({{"managed_skills": current_managed}}, ensure_ascii=False))
-""".strip()
-    return _build_python_exec_command(script)
-
-
-def _build_scan_command() -> str:
-    """Build shell command for scan stage only.
-
-    This stage is read-oriented: it scans SKILL.md metadata and returns the
-    historical payload shape consumed by cache update logic.
-
-    The scan resolves the absolute path of the skills root at runtime so
-    that the LLM can reliably ``cat`` skill files regardless of cwd.
-    Only the ``description`` field is extracted from frontmatter.
-    """
-    script = f"""
-import json
-from pathlib import Path
-
-root = Path({SANDBOX_SKILLS_ROOT!r})
-managed_file = root / {_MANAGED_SKILLS_FILE!r}
-
-# Resolve absolute path at runtime so prompts always have a reliable path
-root_abs = str(root.resolve())
-
-
-# NOTE: This parser mirrors skill_manager._parse_frontmatter_description.
-# Keep the two implementations in sync when changing parsing logic.
-def parse_description(text: str) -> str:
-    if not text.startswith("---"):
-        return ""
-    lines = text.splitlines()
-    if not lines or lines[0].strip() != "---":
-        return ""
-    end_idx = None
-    for i in range(1, len(lines)):
-        if lines[i].strip() == "---":
-            end_idx = i
-            break
-    if end_idx is None:
-        return ""
-
-    frontmatter = "\n".join(lines[1:end_idx])
-    try:
-        import yaml
-    except ImportError:
-        return ""
-
-    try:
-        payload = yaml.safe_load(frontmatter) or dict()
-    except yaml.YAMLError:
-        return ""
-    if not isinstance(payload, dict):
-        return ""
-
-    description = payload.get("description", "")
-    if not isinstance(description, str):
-        return ""
-    return description.strip()
-
-
-def load_managed_skills() -> list[str]:
-    if not managed_file.exists():
-        return []
-    try:
-        payload = json.loads(managed_file.read_text(encoding="utf-8"))
-    except Exception:
-        return []
-    if not isinstance(payload, dict):
-        return []
-    items = payload.get("managed_skills", [])
-    if not isinstance(items, list):
-        return []
-    result: list[str] = []
-    for item in items:
-        if isinstance(item, str) and item.strip():
-            result.append(item.strip())
-    return result
-
-
-def collect_skills() -> list[dict[str, str]]:
-    skills: list[dict[str, str]] = []
-    if not root.exists():
-        return skills
-    for skill_dir in sorted(root.iterdir()):
-        if not skill_dir.is_dir():
-            continue
-        skill_md = skill_dir / "SKILL.md"
-        if not skill_md.is_file():
-            continue
-        description = ""
-        try:
-            text = skill_md.read_text(encoding="utf-8")
-            description = parse_description(text)
-        except Exception:
-            description = ""
-        skills.append(
-            {{
-                "name": skill_dir.name,
-                "description": description,
-                "path": f"{{root_abs}}/{{skill_dir.name}}/SKILL.md",
-            }}
-        )
-    return skills
-
-
-print(
-    json.dumps(
-        {{
-            "managed_skills": load_managed_skills(),
-            "skills": collect_skills(),
-        }},
-        ensure_ascii=False,
-    )
-)
-""".strip()
-    return _build_python_exec_command(script)
-
-
-def _shell_exec_succeeded(result: dict) -> bool:
-    if "success" in result:
-        return bool(result.get("success"))
-    exit_code = result.get("exit_code")
-    return exit_code in (0, None)
-
-
-def _format_exec_error_detail(result: dict) -> str:
-    """Format shell execution details for better observability.
-
-    Keep the message compact while still surfacing exit code and stderr/stdout.
-    """
-    exit_code = result.get("exit_code")
-    stderr = str(result.get("stderr", "") or "").strip()
-    stdout = str(result.get("stdout", "") or "").strip()
-    stderr_text = stderr[:500]
-    stdout_text = stdout[:300]
-    return f"exit_code={exit_code}, stderr={stderr_text!r}, stdout_tail={stdout_text!r}"
-
-
-def _decode_sync_payload(stdout: str) -> dict | None:
-    text = stdout.strip()
-    if not text:
-        return None
-    candidates = [text]
-    candidates.extend([line.strip() for line in text.splitlines() if line.strip()])
-    for candidate in reversed(candidates):
-        try:
-            payload = json.loads(candidate)
-        except Exception:
-            continue
-        if isinstance(payload, dict):
-            return payload
-    return None
-
-
-def _update_sandbox_skills_cache(payload: dict | None) -> None:
-    if not isinstance(payload, dict):
-        return
-    skills = payload.get("skills", [])
-    if not isinstance(skills, list):
-        return
-    SkillManager().set_sandbox_skills_cache(skills)
-
-
-async def _apply_skills_to_sandbox(booter: ComputerBooter) -> None:
-    """Apply local skill bundle to sandbox filesystem only.
-
-    This function is intentionally limited to file mutation. Metadata scanning is
-    executed in a separate phase to keep failure domains clear.
-    """
-    logger.info("[Computer] sandbox_sync phase=apply status=start")
-    apply_result = await booter.shell.exec(_build_apply_sync_command())
-    if not _shell_exec_succeeded(apply_result):
-        detail = _format_exec_error_detail(apply_result)
-        logger.error(
-            "[Computer] sandbox_sync phase=apply status=failed detail=%s", detail
-        )
-        raise RuntimeError(f"Failed to apply sandbox skill sync strategy: {detail}")
-    logger.info("[Computer] sandbox_sync phase=apply status=done")
-
-
-async def _scan_sandbox_skills(booter: ComputerBooter) -> dict | None:
-    """Scan sandbox skills and return normalized payload for cache update."""
-    logger.info("[Computer] sandbox_sync phase=scan status=start")
-    scan_result = await booter.shell.exec(_build_scan_command())
-    if not _shell_exec_succeeded(scan_result):
-        detail = _format_exec_error_detail(scan_result)
-        logger.error(
-            "[Computer] sandbox_sync phase=scan status=failed detail=%s", detail
-        )
-        raise RuntimeError(f"Failed to scan sandbox skills after sync: {detail}")
-
-    payload = _decode_sync_payload(str(scan_result.get("stdout", "") or ""))
-    if payload is None:
-        logger.warning("[Computer] sandbox_sync phase=scan status=empty_payload")
-    else:
-        logger.info("[Computer] sandbox_sync phase=scan status=done")
-    return payload
 
 
 async def _sync_skills_to_sandbox(booter: ComputerBooter) -> None:
-    """Sync local skills to sandbox and refresh cache.
-
-    Backward-compatible orchestrator: keep historical behavior while internally
-    splitting into `apply` and `scan` phases.
-    """
-    skills_root = Path(get_astrbot_skills_path())
-    if not skills_root.is_dir():
+    skills_root = get_astrbot_skills_path()
+    if not os.path.isdir(skills_root):
+        return
+    if not any(Path(skills_root).iterdir()):
         return
-    local_skill_dirs = _list_local_skill_dirs(skills_root)
 
-    temp_dir = Path(get_astrbot_temp_path())
-    temp_dir.mkdir(parents=True, exist_ok=True)
-    zip_base = temp_dir / "skills_bundle"
-    zip_path = zip_base.with_suffix(".zip")
+    temp_dir = get_astrbot_temp_path()
+    os.makedirs(temp_dir, exist_ok=True)
+    zip_base = os.path.join(temp_dir, "skills_bundle")
+    zip_path = f"{zip_base}.zip"
 
     try:
-        if local_skill_dirs:
-            if zip_path.exists():
-                zip_path.unlink()
-            shutil.make_archive(str(zip_base), "zip", str(skills_root))
-            remote_zip = Path(SANDBOX_SKILLS_ROOT) / "skills.zip"
-            logger.info("[Computer] sandbox_sync phase=upload status=start")
-            await booter.shell.exec(f"mkdir -p {SANDBOX_SKILLS_ROOT}")
-            upload_result = await booter.upload_file(str(zip_path), str(remote_zip))
-            if not upload_result.get("success", False):
-                logger.error("[Computer] sandbox_sync phase=upload status=failed")
-                raise RuntimeError("Failed to upload skills bundle to sandbox.")
-            logger.info("[Computer] sandbox_sync phase=upload status=done")
-        else:
-            logger.info(
-                "[Computer] sandbox_sync phase=upload status=skipped reason=no_local_skills"
-            )
-            await booter.shell.exec(f"rm -f {SANDBOX_SKILLS_ROOT}/skills.zip")
-
-        # Keep backward-compatible behavior while splitting lifecycle into two
-        # observable phases: apply (filesystem mutation) + scan (metadata read).
-        await _apply_skills_to_sandbox(booter)
-        payload = await _scan_sandbox_skills(booter)
-        _update_sandbox_skills_cache(payload)
-        managed = payload.get("managed_skills", []) if isinstance(payload, dict) else []
-        logger.info(
-            "[Computer] sandbox_sync phase=overall status=done managed=%d",
-            len(managed),
+        if os.path.exists(zip_path):
+            os.remove(zip_path)
+        shutil.make_archive(zip_base, "zip", skills_root)
+        remote_zip = Path(SANDBOX_SKILLS_ROOT) / "skills.zip"
+        logger.info("Uploading skills bundle to sandbox...")
+        await booter.shell.exec(f"mkdir -p {SANDBOX_SKILLS_ROOT}")
+        upload_result = await booter.upload_file(zip_path, str(remote_zip))
+        if not upload_result.get("success", False):
+            raise RuntimeError("Failed to upload skills bundle to sandbox.")
+        # Use -n flag to never overwrite existing files, fallback to Python if unzip unavailable
+        await booter.shell.exec(
+            f"unzip -n {remote_zip} -d {SANDBOX_SKILLS_ROOT} || "
+            f"python3 -c \"import zipfile, os, pathlib; z=zipfile.ZipFile('{remote_zip}'); "
+            f"[z.extract(m, '{SANDBOX_SKILLS_ROOT}') for m in z.namelist() "
+            f"if not os.path.exists(os.path.join('{SANDBOX_SKILLS_ROOT}', m))]\" || "
+            f"python -c \"import zipfile, os, pathlib; z=zipfile.ZipFile('{remote_zip}'); "
+            f"[z.extract(m, '{SANDBOX_SKILLS_ROOT}') for m in z.namelist() "
+            f"if not os.path.exists(os.path.join('{SANDBOX_SKILLS_ROOT}', m))]\"; "
+            f"rm -f {remote_zip}"
         )
     finally:
-        if zip_path.exists():
+        if os.path.exists(zip_path):
             try:
-                zip_path.unlink()
+                os.remove(zip_path)
             except Exception:
-                logger.warning(
-                    "[Computer] sandbox_sync phase=cleanup status=failed path=%s",
-                    zip_path,
-                )
+                logger.warning(f"Failed to remove temp skills zip: {zip_path}")
 
 
 async def get_booter(
@@ -444,14 +65,8 @@ async def get_booter(
 ) -> ComputerBooter:
     config = context.get_config(umo=session_id)
 
-    runtime = config.get("provider_settings", {}).get("computer_use_runtime", "local")
-    if runtime == "local":
-        return get_local_booter()
-    elif runtime == "none":
-        raise RuntimeError("Sandbox runtime is disabled by configuration.")
-
     sandbox_cfg = config.get("provider_settings", {}).get("sandbox", {})
-    booter_type = sandbox_cfg.get("booter", "shipyard_neo")
+    booter_type = sandbox_cfg.get("booter", "shipyard")
 
     if session_id in session_booter:
         booter = session_booter[session_id]
@@ -460,11 +75,6 @@ async def get_booter(
             session_booter.pop(session_id, None)
     if session_id not in session_booter:
         uuid_str = uuid.uuid5(uuid.NAMESPACE_DNS, session_id).hex
-        logger.info(
-            "[Computer] booter_init booter=%s session=%s",
-            booter_type,
-            session_id,
-        )
         if booter_type == "shipyard":
             from .booters.shipyard import ShipyardBooter
 
@@ -476,27 +86,6 @@ async def get_booter(
             client = ShipyardBooter(
                 endpoint_url=ep, access_token=token, ttl=ttl, session_num=max_sessions
             )
-        elif booter_type == "shipyard_neo":
-            from .booters.shipyard_neo import ShipyardNeoBooter
-
-            ep = sandbox_cfg.get("shipyard_neo_endpoint", "")
-            token = sandbox_cfg.get("shipyard_neo_access_token", "")
-            ttl = sandbox_cfg.get("shipyard_neo_ttl", 3600)
-            profile = sandbox_cfg.get("shipyard_neo_profile", "python-default")
-
-            # Auto-discover token from Bay's credentials.json if not configured
-            if not token:
-                token = _discover_bay_credentials(ep)
-
-            logger.info(
-                f"[Computer] Shipyard Neo config: endpoint={ep}, profile={profile}, ttl={ttl}"
-            )
-            client = ShipyardNeoBooter(
-                endpoint_url=ep,
-                access_token=token,
-                profile=profile,
-                ttl=ttl,
-            )
         elif booter_type == "boxlite":
             from .booters.boxlite import BoxliteBooter
 
@@ -506,137 +95,17 @@ async def get_booter(
 
         try:
             await client.boot(uuid_str)
-            logger.info(
-                "[Computer] booter_ready booter=%s session=%s",
-                booter_type,
-                session_id,
-            )
             await _sync_skills_to_sandbox(client)
-        except Exception:
-            logger.exception(
-                "[Computer] booter_init_failed booter=%s session=%s",
-                booter_type,
-                session_id,
-            )
-            raise
+        except Exception as e:
+            logger.error(f"Error booting sandbox for session {session_id}: {e}")
+            raise e
 
         session_booter[session_id] = client
     return session_booter[session_id]
 
 
-async def sync_skills_to_active_sandboxes() -> None:
-    """Best-effort skills synchronization for all active sandbox sessions."""
-    logger.info(
-        "[Computer] sandbox_sync scope=active sessions=%d",
-        len(session_booter),
-    )
-    for session_id, booter in list(session_booter.items()):
-        try:
-            if not await booter.available():
-                continue
-            await _sync_skills_to_sandbox(booter)
-        except Exception:
-            logger.exception(
-                "[Computer] sandbox_sync_failed session=%s booter=%s",
-                session_id,
-                booter.__class__.__name__,
-            )
-
-
 def get_local_booter() -> ComputerBooter:
     global local_booter
     if local_booter is None:
         local_booter = LocalBooter()
     return local_booter
-
-
-# ---------------------------------------------------------------------------
-# Unified query API — used by ComputerToolProvider and subagent tool exec
-# ---------------------------------------------------------------------------
-
-
-def _get_booter_class(booter_type: str) -> type[ComputerBooter] | None:
-    """Map booter_type string to class (lazy import)."""
-    if booter_type == BOOTER_SHIPYARD:
-        from .booters.shipyard import ShipyardBooter
-
-        return ShipyardBooter
-    elif booter_type == BOOTER_SHIPYARD_NEO:
-        from .booters.shipyard_neo import ShipyardNeoBooter
-
-        return ShipyardNeoBooter
-    elif booter_type == BOOTER_BOXLITE:
-        from .booters.boxlite import BoxliteBooter
-
-        return BoxliteBooter
-    logger.warning(
-        "[Computer] booter_class_lookup booter=%s found=false",
-        booter_type,
-    )
-    return None
-
-
-def get_sandbox_tools(session_id: str) -> list[FunctionTool]:
-    """Return precise tool list from a booted session, or [] if not booted."""
-    booter = session_booter.get(session_id)
-    if booter is None:
-        logger.debug(
-            "[Computer] sandbox_tools source=booted session=%s booter=none tools=0 capabilities=none",
-            session_id,
-        )
-        return []
-    tools = booter.get_tools()
-    caps = getattr(booter, "capabilities", None)
-    logger.debug(
-        "[Computer] sandbox_tools source=booted session=%s booter=%s tools=%d capabilities=%s",
-        session_id,
-        booter.__class__.__name__,
-        len(tools),
-        list(caps) if caps is not None else None,
-    )
-    return tools
-
-
-def get_sandbox_capabilities(session_id: str) -> tuple[str, ...] | None:
-    """Return capability tuple from a booted session, or None if unavailable."""
-    booter = session_booter.get(session_id)
-    if booter is None:
-        logger.debug(
-            "[Computer] sandbox_capabilities session=%s booter=none capabilities=none",
-            session_id,
-        )
-        return None
-    caps = getattr(booter, "capabilities", None)
-    logger.debug(
-        "[Computer] sandbox_capabilities session=%s booter=%s capabilities=%s",
-        session_id,
-        booter.__class__.__name__,
-        list(caps) if caps is not None else None,
-    )
-    return caps
-
-
-def get_default_sandbox_tools(sandbox_cfg: dict) -> list[FunctionTool]:
-    """Return conservative (pre-boot) tool list based on config. No instance needed."""
-    booter_type = sandbox_cfg.get("booter", BOOTER_SHIPYARD_NEO)
-    cls = _get_booter_class(booter_type)
-    tools = cls.get_default_tools() if cls else []
-    logger.debug(
-        "[Computer] sandbox_tools source=default booter=%s tools=%d capabilities=unknown",
-        booter_type,
-        len(tools),
-    )
-    return tools
-
-
-def get_sandbox_prompt_parts(sandbox_cfg: dict) -> list[str]:
-    """Return booter-specific system prompt fragments based on config."""
-    booter_type = sandbox_cfg.get("booter", BOOTER_SHIPYARD_NEO)
-    cls = _get_booter_class(booter_type)
-    prompt_parts = cls.get_system_prompt_parts() if cls else []
-    logger.debug(
-        "[Computer] sandbox_prompts booter=%s parts=%d",
-        booter_type,
-        len(prompt_parts),
-    )
-    return prompt_parts

astrbot/core/computer/computer_tool_provider.py

@@ -1,222 +0,0 @@
-"""ComputerToolProvider — decoupled tool injection for computer-use runtimes.
-
-Encapsulates all sandbox / local tool injection logic previously hardcoded in
-``astr_main_agent.py``.  The main agent now calls
-``provider.get_tools(ctx)`` / ``provider.get_system_prompt_addon(ctx)``
-without knowing about specific tool classes.
-
-Tool lists are delegated to booter subclasses via ``get_default_tools()``
-and ``get_tools()`` (see ``booters/base.py``), so adding a new booter type
-does not require changes here.
-"""
-
-from __future__ import annotations
-
-import platform
-from typing import TYPE_CHECKING
-
-from astrbot.api import logger
-from astrbot.core.tool_provider import ToolProviderContext
-
-if TYPE_CHECKING:
-    from astrbot.core.agent.tool import FunctionTool
-
-
-# ---------------------------------------------------------------------------
-# Lazy local-mode tool cache
-# ---------------------------------------------------------------------------
-
-_LOCAL_TOOLS_CACHE: list[FunctionTool] | None = None
-
-
-def _get_local_tools() -> list[FunctionTool]:
-    global _LOCAL_TOOLS_CACHE
-    if _LOCAL_TOOLS_CACHE is None:
-        from astrbot.core.computer.tools import ExecuteShellTool, LocalPythonTool
-
-        _LOCAL_TOOLS_CACHE = [
-            ExecuteShellTool(is_local=True),
-            LocalPythonTool(),
-        ]
-    return list(_LOCAL_TOOLS_CACHE)
-
-
-# ---------------------------------------------------------------------------
-# System-prompt helpers
-# ---------------------------------------------------------------------------
-
-SANDBOX_MODE_PROMPT = (
-    "You have access to a sandboxed environment and can execute "
-    "shell commands and Python code securely."
-)
-
-
-def _build_local_mode_prompt() -> str:
-    system_name = platform.system() or "Unknown"
-    shell_hint = (
-        "The runtime shell is Windows Command Prompt (cmd.exe). "
-        "Use cmd-compatible commands and do not assume Unix commands like cat/ls/grep are available."
-        if system_name.lower() == "windows"
-        else "The runtime shell is Unix-like. Use POSIX-compatible shell commands."
-    )
-    return (
-        "You have access to the host local environment and can execute shell commands and Python code. "
-        f"Current operating system: {system_name}. "
-        f"{shell_hint}"
-    )
-
-
-# ---------------------------------------------------------------------------
-# ComputerToolProvider
-# ---------------------------------------------------------------------------
-
-
-class ComputerToolProvider:
-    """Provides computer-use tools (local / sandbox) based on session context.
-
-    Sandbox tool lists are delegated to booter subclasses so that each booter
-    declares its own capabilities.  ``get_tools`` prefers the precise
-    post-boot tool list from a running session; when the sandbox has not yet
-    been booted it falls back to the conservative pre-boot default.
-    """
-
-    @staticmethod
-    def get_all_tools() -> list[FunctionTool]:
-        """Return ALL computer-use tools across all runtimes for registration.
-
-        Creates **fresh instances** separate from the runtime caches so that
-        setting ``active=False`` on them does not affect runtime behaviour.
-        These registration-only instances let the WebUI display and assign
-        tools without injecting them into actual LLM requests.
-
-        At request time, ``get_tools(ctx)`` provides the real, active
-        instances filtered by runtime.
-        """
-        from astrbot.core.computer.tools import (
-            AnnotateExecutionTool,
-            BrowserBatchExecTool,
-            BrowserExecTool,
-            CreateSkillCandidateTool,
-            CreateSkillPayloadTool,
-            EvaluateSkillCandidateTool,
-            ExecuteShellTool,
-            FileDownloadTool,
-            FileUploadTool,
-            GetExecutionHistoryTool,
-            GetSkillPayloadTool,
-            ListSkillCandidatesTool,
-            ListSkillReleasesTool,
-            LocalPythonTool,
-            PromoteSkillCandidateTool,
-            PythonTool,
-            RollbackSkillReleaseTool,
-            RunBrowserSkillTool,
-            SyncSkillReleaseTool,
-        )
-
-        all_tools: list[FunctionTool] = [
-            ExecuteShellTool(),
-            PythonTool(),
-            FileUploadTool(),
-            FileDownloadTool(),
-            LocalPythonTool(),
-            BrowserExecTool(),
-            BrowserBatchExecTool(),
-            RunBrowserSkillTool(),
-            GetExecutionHistoryTool(),
-            AnnotateExecutionTool(),
-            CreateSkillPayloadTool(),
-            GetSkillPayloadTool(),
-            CreateSkillCandidateTool(),
-            ListSkillCandidatesTool(),
-            EvaluateSkillCandidateTool(),
-            PromoteSkillCandidateTool(),
-            ListSkillReleasesTool(),
-            RollbackSkillReleaseTool(),
-            SyncSkillReleaseTool(),
-        ]
-
-        # De-duplicate by name and mark inactive so they are visible
-        # in WebUI but never sent to the LLM via func_list.
-        seen: set[str] = set()
-        result: list[FunctionTool] = []
-        for tool in all_tools:
-            if tool.name not in seen:
-                tool.active = False
-                result.append(tool)
-                seen.add(tool.name)
-        return result
-
-    def get_tools(self, ctx: ToolProviderContext) -> list[FunctionTool]:
-        runtime = ctx.computer_use_runtime
-        if runtime == "none":
-            return []
-
-        if runtime == "local":
-            return _get_local_tools()
-
-        if runtime == "sandbox":
-            return self._sandbox_tools(ctx)
-
-        logger.warning("[ComputerToolProvider] Unknown runtime: %s", runtime)
-        return []
-
-    def get_system_prompt_addon(self, ctx: ToolProviderContext) -> str:
-        runtime = ctx.computer_use_runtime
-        if runtime == "none":
-            return ""
-
-        if runtime == "local":
-            return f"\n{_build_local_mode_prompt()}\n"
-
-        if runtime == "sandbox":
-            return self._sandbox_prompt_addon(ctx)
-
-        return ""
-
-    # -- sandbox helpers ----------------------------------------------------
-
-    def _sandbox_tools(self, ctx: ToolProviderContext) -> list[FunctionTool]:
-        """Collect tools for sandbox mode.
-
-        Always returns the full (pre-boot default) tool set declared by the
-        booter class, regardless of whether the sandbox is already booted.
-
-        This ensures the tool schema sent to the LLM is stable across the
-        entire conversation lifecycle (pre-boot and post-boot produce the
-        same set), enabling LLM prefix cache hits.  Tools whose underlying
-        capability is unavailable at runtime are rejected by the executor
-        with a descriptive error message instead of being omitted from the
-        schema.
-        """
-        from astrbot.core.computer.computer_client import get_default_sandbox_tools
-
-        booter_type = ctx.sandbox_cfg.get("booter", "shipyard_neo")
-
-        # Validate shipyard (non-neo) config
-        if booter_type == "shipyard":
-            ep = ctx.sandbox_cfg.get("shipyard_endpoint", "")
-            at = ctx.sandbox_cfg.get("shipyard_access_token", "")
-            if not ep or not at:
-                logger.error("Shipyard sandbox configuration is incomplete.")
-                return []
-
-        # Always return the full tool set for schema stability
-        return get_default_sandbox_tools(ctx.sandbox_cfg)
-
-    def _sandbox_prompt_addon(self, ctx: ToolProviderContext) -> str:
-        """Build system-prompt addon for sandbox mode."""
-        from astrbot.core.computer.computer_client import get_sandbox_prompt_parts
-
-        parts = get_sandbox_prompt_parts(ctx.sandbox_cfg)
-        parts.append(f"\n{SANDBOX_MODE_PROMPT}\n")
-        return "".join(parts)
-
-
-def get_all_tools() -> list[FunctionTool]:
-    """Module-level entry point for ``FunctionToolManager.register_internal_tools()``.
-
-    Delegates to ``ComputerToolProvider.get_all_tools()`` which collects
-    tools from all runtimes (local, sandbox, browser, neo).
-    """
-    return ComputerToolProvider.get_all_tools()

astrbot/core/computer/olayer/__init__.py

@@ -1,11 +1,5 @@
-from .browser import BrowserComponent
 from .filesystem import FileSystemComponent
 from .python import PythonComponent
 from .shell import ShellComponent
 
-__all__ = [
-    "PythonComponent",
-    "ShellComponent",
-    "FileSystemComponent",
-    "BrowserComponent",
-]
+__all__ = ["PythonComponent", "ShellComponent", "FileSystemComponent"]