Rebase to v4.26.8 with respect_env_proxy and MCP trust_env

.github/workflows/build-docs.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           version: 10.28.2
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: "24.13.0"
           cache: "pnpm"

.github/workflows/code-format.yml

@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v7
 
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: '3.12'
 
@@ -27,8 +27,8 @@ jobs:
 
     - name: Check code formatting with ruff
       run: |
-        uv run ruff format --check .
+        uvx --from ruff==0.15.22 ruff format --check .
 
     - name: Check code style with ruff
       run: |
-        uv run ruff check .
+        uvx --from ruff==0.15.22 ruff check .

.github/workflows/coverage_test.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
 
       - name: Install dependencies
         run: |

.github/workflows/dashboard_ci.yml

@@ -20,7 +20,7 @@ jobs:
           version: 10.28.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: '24.13.0'
           cache: "pnpm"

.github/workflows/docker-build.yml

@@ -0,0 +1,178 @@
+name: Publish Docker image to GHCR
+
+on:
+  push:
+    branches:
+      - '**'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  publish:
+    name: Build and push image (${{ matrix.arch }})
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-latest
+            platform: linux/amd64
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64
+
+    steps:
+      - name: Check out source
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          fetch-depth: 1
+
+      - name: Prepare build metadata
+        id: build
+        shell: bash
+        run: |
+          BASE_VERSION=$(python3 <<'PY'
+          import tomllib
+
+          with open("pyproject.toml", "rb") as file:
+              print(tomllib.load(file)["project"]["version"])
+          PY
+          )
+          if [ -z "$BASE_VERSION" ]; then
+            echo "::error::pyproject.toml must contain project.version"
+            exit 1
+          fi
+
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          BUILD_VERSION="${BASE_VERSION}-${SHORT_SHA}"
+
+          echo "short_sha=$SHORT_SHA" >> "$GITHUB_OUTPUT"
+          echo "version=$BUILD_VERSION" >> "$GITHUB_OUTPUT"
+          echo "revision=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+
+      - name: Set up pnpm
+        uses: pnpm/action-setup@v6.0.9
+        with:
+          version: 10.28.2
+
+      - name: Set up 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
+        working-directory: dashboard
+        run: |
+          pnpm install --frozen-lockfile
+          pnpm build
+          mkdir -p dist/assets
+          echo "v${{ steps.build.outputs.version }}" > dist/assets/version
+
+      - name: Copy dashboard into image context
+        run: |
+          rm -rf astrbot/dashboard/dist
+          mkdir -p astrbot/dashboard
+          cp -r dashboard/dist astrbot/dashboard/dist
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2a # v4.2.0
+
+      - name: Log in to GHCR
+        uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        with:
+          context: .
+          platforms: ${{ matrix.platform }}
+          push: true
+          tags: ghcr.io/team-s2/astrbot:${{ steps.build.outputs.short_sha }}-${{ matrix.arch }}
+          labels: |
+            org.opencontainers.image.source=https://github.com/team-s2/AstrBot
+            org.opencontainers.image.revision=${{ steps.build.outputs.revision }}
+            org.opencontainers.image.version=${{ steps.build.outputs.version }}
+          cache-from: type=gha,scope=astrbot-${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=astrbot-${{ matrix.arch }}
+          provenance: mode=max
+          sbom: true
+
+      - name: Publish summary
+        env:
+          SHORT_SHA: ${{ steps.build.outputs.short_sha }}
+          VERSION: ${{ steps.build.outputs.version }}
+          ARCH: ${{ matrix.arch }}
+          PLATFORM: ${{ matrix.platform }}
+        run: echo "Published \`$SHORT_SHA-$ARCH\` with VERSION \`$VERSION\` for \`$PLATFORM\`." >> "$GITHUB_STEP_SUMMARY"
+
+  manifest:
+    name: Publish multi-platform manifest
+    needs: publish
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out source
+        uses: actions/checkout@9c091bb21b7c1d1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          fetch-depth: 1
+
+      - name: Prepare build metadata
+        id: build
+        shell: bash
+        run: |
+          BASE_VERSION=$(python3 <<'PY'
+          import tomllib
+
+          with open("pyproject.toml", "rb") as file:
+              print(tomllib.load(file)["project"]["version"])
+          PY
+          )
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          BUILD_VERSION="${BASE_VERSION}-${SHORT_SHA}"
+
+          echo "short_sha=$SHORT_SHA" >> "$GITHUB_OUTPUT"
+          echo "version=$BUILD_VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2a # v4.2.0
+
+      - name: Log in to GHCR
+        uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create commit manifest
+        env:
+          SHORT_SHA: ${{ steps.build.outputs.short_sha }}
+        run: |
+          docker buildx imagetools create \
+            --tag "ghcr.io/team-s2/astrbot:${SHORT_SHA}" \
+            "ghcr.io/team-s2/astrbot:${SHORT_SHA}-amd64" \
+            "ghcr.io/team-s2/astrbot:${SHORT_SHA}-arm64"
+
+      - name: Create latest manifest
+        if: github.ref == 'refs/heads/master'
+        env:
+          SHORT_SHA: ${{ steps.build.outputs.short_sha }}
+        run: |
+          docker buildx imagetools create \
+            --tag ghcr.io/team-s2/astrbot:latest \
+            "ghcr.io/team-s2/astrbot:${SHORT_SHA}-amd64" \
+            "ghcr.io/team-s2/astrbot:${SHORT_SHA}-arm64"
+
+      - name: Publish summary
+        env:
+          SHORT_SHA: ${{ steps.build.outputs.short_sha }}
+          VERSION: ${{ steps.build.outputs.version }}
+        run: echo "Published multi-platform manifest \`$SHORT_SHA\` with VERSION \`$VERSION\`." >> "$GITHUB_STEP_SUMMARY"

.github/workflows/docker-image.yml

@@ -77,14 +77,14 @@ jobs:
         uses: docker/setup-buildx-action@v4.2.0
 
       - name: Log in to DockerHub
-        uses: docker/login-action@v4.4.0
+        uses: docker/login-action@v4.5.1
         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.4.0
+        uses: docker/login-action@v4.5.1
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_OWNER }}
@@ -177,14 +177,14 @@ jobs:
         uses: docker/setup-buildx-action@v4.2.0
 
       - name: Log in to DockerHub
-        uses: docker/login-action@v4.4.0
+        uses: docker/login-action@v4.5.1
         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.4.0
+        uses: docker/login-action@v4.5.1
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_OWNER }}

.github/workflows/release.yml

@@ -56,7 +56,7 @@ jobs:
           version: 10.28.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: '24.13.0'
           cache: "pnpm"
@@ -244,7 +244,7 @@ jobs:
           cp -r dashboard-artifact/unpacked/dist/. astrbot/dashboard/dist/
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.10"
 

.github/workflows/smoke_test.yml

@@ -37,7 +37,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

.github/workflows/sync-wiki.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.11'
 

.github/workflows/unit_tests.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.12'
 

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ ci:
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.14.1
+  rev: v0.15.22
   hooks:
     # Run the linter.
     - id: ruff-check

AGENTS.md

@@ -1,3 +1,20 @@
+本仓库是上游 `AstrBotDevs/AstrBot` 的 fork。
+
+分支说明：
+
+- `master`：以最新的上游 release tag 为基线进行 rebase，保留 team-s2 仍然需要的增量修改，并由 GitHub Actions 构建 `ghcr.io/team-s2/astrbot`。
+
+本仓库的例行维护流程：
+
+- 检查上游是否有更新的 release tag
+- 将本 fork rebase 到最新的上游 tag
+  - 保留本 fork 的增量变更
+  - 当上游实现了本 fork 的增量变更时，直接使用上游的实现
+- 运行相关的后端、前端测试或构建
+- 提交并 force push
+
+需要将本仓库的变更提交到上游时，应当为相关变更创建独立的分支，避免将不必要的变更提交到上游。
+
 ## Setup commands
 
 ### Core
@@ -37,7 +54,7 @@ ruff format .
 ruff check .
 ```
 
-> **Note:** If you use VSCode, install the `Ruff` extension for real-time formatting and linting in the editor.
+> **Note**: If you use VSCode, install the `Ruff` extension for real-time formatting and linting in the editor.
 
 ## Dev environment tips
 
@@ -133,4 +150,4 @@ For one-off release candidate branches, delete the release branch after the tag
 ```bash
 git branch -d release/4.25.0
 git push origin --delete release/4.25.0
-```
+```

README.md

@@ -1,4 +1,4 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
+![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/36fb04e4-cc75-4454-bd8b-049d11aa86f9)
 
 
 <div align="center">

README_es.md

@@ -1,4 +1,4 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
+![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/36fb04e4-cc75-4454-bd8b-049d11aa86f9)
 
 
 <div align="center">
@@ -286,4 +286,4 @@ _La compañía y la capacidad nunca deberían estar en conflicto. Lo que aspiram
 _私は、高性能ですから!_
 
 <img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
-</div>
+</div>

README_fr.md

@@ -1,4 +1,4 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
+![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/36fb04e4-cc75-4454-bd8b-049d11aa86f9)
 
 <div align="center">
 

README_ja.md

@@ -1,4 +1,4 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
+![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/36fb04e4-cc75-4454-bd8b-049d11aa86f9)
 
 <div align="center">
 

README_ru.md

@@ -1,4 +1,4 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
+![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/36fb04e4-cc75-4454-bd8b-049d11aa86f9)
 
 <div align="center">
 

README_zh-TW.md

@@ -1,4 +1,4 @@
-![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
+![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/36fb04e4-cc75-4454-bd8b-049d11aa86f9)
 
 <div align="center">