Merge upstream/master into feat/openai-oauth-provider-source

Author: RhoninSeiei

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,8 +3,8 @@
 
 ### Modifications / 改动点
 
-<!--请总结你的改动：哪些核心文件被修改了？实现了什么功能？-->
 <!--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,7 +21,14 @@
 <!--If merged, your code will serve tens of thousands of users! Please double-check the following items before submitting.-->
 <!--如果分支被合并，您的代码将服务于数万名用户！在提交前，请核查一下几点内容。-->
 
-- [ ] 😊 如果 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.
+- [ ] 😊 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.
+  / 我的更改没有引入恶意代码。

.github/workflows/coverage_test.yml

@@ -40,6 +40,7 @@ jobs:
           pytest --cov=astrbot -v -o log_cli=true -o log_level=DEBUG
 
       - name: Upload results to Codecov
+        if: github.repository == 'AstrBotDevs/AstrBot'
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/dashboard_ci.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   build:
+    if: github.repository == 'AstrBotDevs/AstrBot'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -45,7 +46,7 @@ jobs:
 
       - name: Create GitHub Release
         if: github.event_name == 'push'
-        uses: ncipollo/release-action@v1.20.0
+        uses: ncipollo/release-action@v1.21.0
         with:
           tag: release-${{ github.sha }}
           owner: AstrBotDevs

.github/workflows/docker-image.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build-nightly-image:
-    if: github.event_name == 'schedule'
+    if: github.repository == 'AstrBotDevs/AstrBot' && github.event_name == 'schedule'
     runs-on: ubuntu-latest
     env:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -109,7 +109,7 @@ jobs:
         run: echo "Test Docker image has been built and pushed successfully"
 
   build-release-image:
-    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v'))
+    if: github.repository == 'AstrBotDevs/AstrBot' && (github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')))
     runs-on: ubuntu-latest
     env:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}

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

@@ -0,0 +1,54 @@
+name: PR Title Check
+
+on:
+  pull_request_target:
+    types: [opened, edited, reopened, synchronize]
+
+jobs:
+  title-format:
+    if: github.repository == 'AstrBotDevs/AstrBot'
+    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

@@ -20,6 +20,7 @@ permissions:
 jobs:
   build-dashboard:
     name: Build Dashboard
+    if: github.repository == 'AstrBotDevs/AstrBot'
     runs-on: ubuntu-24.04
     env:
       R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
@@ -104,6 +105,7 @@ jobs:
 
   publish-release:
     name: Publish GitHub Release
+    if: github.repository == 'AstrBotDevs/AstrBot'
     runs-on: ubuntu-24.04
     needs:
       - build-dashboard
@@ -183,6 +185,7 @@ jobs:
 
   publish-pypi:
     name: Publish PyPI
+    if: github.repository == 'AstrBotDevs/AstrBot'
     runs-on: ubuntu-24.04
     needs:
       - publish-release

.github/workflows/stale.yml

@@ -18,6 +18,7 @@ on:
 
 jobs:
   stale:
+    if: github.repository == 'AstrBotDevs/AstrBot'
     runs-on: ubuntu-latest
     permissions:
       issues: write

.github/workflows/sync-wiki.yml

@@ -18,6 +18,7 @@ concurrency:
 
 jobs:
   sync:
+    if: github.repository == 'AstrBotDevs/AstrBot'
     runs-on: ubuntu-latest
     permissions:
       contents: read

README.md

@@ -32,7 +32,7 @@
 <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>
+<a href="https://github.com/AstrBotDevs/AstrBot/issues">Issue Tracker</a> ｜
 <a href="mailto:community@astrbot.app">Email Support</a>
 </div>
 

astrbot/builtin_stars/web_searcher/main.py

@@ -567,9 +567,9 @@ async def edit_web_search_tools(
         if provider == "default":
             web_search_t = func_tool_mgr.get_func("web_search")
             fetch_url_t = func_tool_mgr.get_func("fetch_url")
-            if web_search_t:
+            if web_search_t and web_search_t.active:
                 tool_set.add_tool(web_search_t)
-            if fetch_url_t:
+            if fetch_url_t and fetch_url_t.active:
                 tool_set.add_tool(fetch_url_t)
             tool_set.remove_tool("web_search_tavily")
             tool_set.remove_tool("tavily_extract_web_page")
@@ -578,9 +578,9 @@ async def edit_web_search_tools(
         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")
-            if web_search_tavily:
+            if web_search_tavily and web_search_tavily.active:
                 tool_set.add_tool(web_search_tavily)
-            if tavily_extract_web_page:
+            if tavily_extract_web_page and tavily_extract_web_page.active:
                 tool_set.add_tool(tavily_extract_web_page)
             tool_set.remove_tool("web_search")
             tool_set.remove_tool("fetch_url")
@@ -590,9 +590,8 @@ async def edit_web_search_tools(
             try:
                 await self.ensure_baidu_ai_search_mcp(event.unified_msg_origin)
                 aisearch_tool = func_tool_mgr.get_func("AIsearch")
-                if not aisearch_tool:
-                    raise ValueError("Cannot get Baidu AI Search MCP tool.")
-                tool_set.add_tool(aisearch_tool)
+                if aisearch_tool and aisearch_tool.active:
+                    tool_set.add_tool(aisearch_tool)
                 tool_set.remove_tool("web_search")
                 tool_set.remove_tool("fetch_url")
                 tool_set.remove_tool("web_search_tavily")
@@ -602,7 +601,7 @@ async def edit_web_search_tools(
                 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:
+            if web_search_bocha and web_search_bocha.active:
                 tool_set.add_tool(web_search_bocha)
             tool_set.remove_tool("web_search")
             tool_set.remove_tool("fetch_url")