Merge remote-tracking branch 'origin/master' into pr/Raven95676/4960

Author: Raven95676

.github/workflows/code-format.yml

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

.github/workflows/dashboard_ci.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 'latest'
+          node-version: '24.13.0'
 
       - name: npm install, build
         run: |
@@ -52,4 +52,4 @@ jobs:
           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/release.yml

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

.gitignore

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

Dockerfile

@@ -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
-RUN uv pip install -r requirements.txt --no-cache-dir --system
-RUN uv pip install socksio uv pilk --no-cache-dir --system
+    && 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
 
 EXPOSE 6185
 

FIRST_NOTICE.en-US.md

@@ -0,0 +1,14 @@
+## 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

@@ -0,0 +1,14 @@
+## 欢迎使用 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)