Merge branch 'master' into fix/008-questdb-sql-injection

[fix] strip NUL bytes before tdengine history insert (#4310 )
Co-authored-by: aias00 <liuhongyu@apache.org>
2026-09-17 18:19:02 +00:00 · 2026-08-17 13:50:00 +08:00 · 2026-08-17 13:46:55 +08:00 · 2026-08-17 12:41:56 +08:00 · 2026-08-17 11:33:06 +08:00 · 2026-08-17 11:05:32 +08:00
3253 changed files with 186963 additions and 53654 deletions
@@ -2545,7 +2545,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/176664901?v=4",
      "profile": "https://github.com/Saramanda9988",
      "contributions": [
-        "doc"
+        "doc",
+        "code"
      ]
    },
    {
@@ -2667,6 +2668,255 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "KOYR",
+      "name": "KOYR",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53216619?v=4",
+      "profile": "https://github.com/KOYR",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Lathika226",
+      "name": "LathikaBaddam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/178710568?v=4",
+      "profile": "https://github.com/Lathika226",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Sahil-Shadwal",
+      "name": "Sahil Shadwal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/119167601?v=4",
+      "profile": "https://shadwal.space/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BhanuNidumolu",
+      "name": "N.Bhanu Prasad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/180380413?v=4",
+      "profile": "https://github.com/BhanuNidumolu",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Prakash1185",
+      "name": "Prakash Kumar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/183058331?v=4",
+      "profile": "https://prakashh-portfolio.vercel.app/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "orangeCatDeveloper",
+      "name": "NekoPunch",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95899648?v=4",
+      "profile": "https://github.com/orangeCatDeveloper",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "wy471x",
+      "name": "wy471x",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52033069?v=4",
+      "profile": "https://wy471x.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hengyuss",
+      "name": "hengyuss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/81064732?v=4",
+      "profile": "https://github.com/hengyuss",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "moduvoice",
+      "name": "moduvoice",
+      "avatar_url": "https://avatars.githubusercontent.com/u/291867022?v=4",
+      "profile": "https://moduvoice.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "hutiefang76",
+      "name": "hutiefang76",
+      "avatar_url": "https://avatars.githubusercontent.com/u/137664623?v=4",
+      "profile": "https://github.com/hutiefang76",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ZhouYinLong-lab",
+      "name": "柳含知 Liu Hanzhi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/250777154?v=4",
+      "profile": "https://zylatent.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "wilmerdooley",
+      "name": "wilmerdooley",
+      "avatar_url": "https://avatars.githubusercontent.com/u/259930736?v=4",
+      "profile": "https://github.com/wilmerdooley",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Zmjjeff7",
+      "name": "Zhenhong Guo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/175370943?v=4",
+      "profile": "https://github.com/Zmjjeff7",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "abhyudayareddy",
+      "name": "abhyudayareddy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/54602866?v=4",
+      "profile": "https://github.com/abhyudayareddy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "neon-hippo",
+      "name": "neon-hippo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/165560498?v=4",
+      "profile": "https://github.com/neon-hippo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "P-Peaceful",
+      "name": "P_Peaceful",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52856161?v=4",
+      "profile": "https://github.com/P-Peaceful",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "zhusaidong",
+      "name": "zhusaidong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3039961?v=4",
+      "profile": "https://github.com/zhusaidong",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zhehenlu",
+      "name": "zhlu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31504542?v=4",
+      "profile": "https://github.com/zhehenlu",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "brettgervasoni",
+      "name": "brettgervasoni",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34056000?v=4",
+      "profile": "https://github.com/brettgervasoni",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Darshan-paul",
+      "name": "Darshan-paul",
+      "avatar_url": "https://avatars.githubusercontent.com/u/211450705?v=4",
+      "profile": "https://github.com/Darshan-paul",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "04cb",
+      "name": "layla",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111667698?v=4",
+      "profile": "https://github.com/04cb",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "miantalha45",
+      "name": "Talha Amjad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/155809113?v=4",
+      "profile": "https://github.com/miantalha45",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "turanalmammadov",
+      "name": "Turan Almammadov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16321061?v=4",
+      "profile": "https://turanalmammadov.com/",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "zhaoyangplus",
+      "name": "zhaoyangplus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/245090302?v=4",
+      "profile": "https://github.com/zhaoyangplus",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yexuanyang",
+      "name": "Yang Yexuan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73885401?v=4",
+      "profile": "https://github.com/yexuanyang",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "markguo123",
+      "name": "markguo123",
+      "avatar_url": "https://avatars.githubusercontent.com/u/155072651?v=4",
+      "profile": "https://github.com/markguo123",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "leo-934",
+      "name": "leo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55838224?v=4",
+      "profile": "https://github.com/leo-934",
+      "contributions": [
+        "code",
+        "doc",
+        "blog"
+      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -20,9 +20,11 @@ github:
  homepage: https://hertzbeat.apache.org/
  labels:
    - ai
+    - agent
    - llm
-    - monitoring
+    - logs
    - monitor
+    - monitoring
    - notifications
    - alerting
    - self-hosted
@@ -34,12 +36,9 @@ github:
    - uptime
    - status
    - status-page
-    - devops
    - server
    - linux
    - database
-    - mysql
-    - cloud
  enabled_merge_buttons:
    squash: true
    merge: false
@@ -1,5 +1,5 @@
 {
-    "name": "Hertzbeat DevContainer",
+    "name": "HertzBeat DevContainer",
    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
    "features": {
        "ghcr.io/devcontainers/features/java:1": {
@@ -29,7 +29,7 @@
    },
    "portsAttributes": {
        "4200": {
-            "label": "Hertzbeat Web",
+            "label": "HertzBeat Web",
            "onAutoForward": "notify"
        }
    },
@@ -1,4 +1,3 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -6,7 +5,7 @@
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,24 +14,42 @@
 # limitations under the License.
 #

-### add category
-POST http://localhost:8080/api/category/upload/test
-Content-Type: application/x-www-form-urlencoded
+# EditorConfig is awesome: https://EditorConfig.org

-description=test
+# top-most EditorConfig file
+root = true

-### modify category
-POST http://localhost:8080/api/category/modify/1
-Content-Type: application/x-www-form-urlencoded
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+# The line max length is 120, match checkstyle rules.
+max_line_length = 120
+insert_final_newline = true
+trim_trailing_whitespace = true

-name=Database monitoring&
-description=数据库监控模版
+[*.json]
+tab_width = 2
+indent_size = 2

-### delete category
-DELETE http://localhost:8080/api/category/delete/1
+[*.{yml,yaml}]
+tab_width = 2
+indent_size = 2

-### get category by isDel
-GET http://localhost:8080/api/category/all/0
+[*.xml]
+ij_xml_attribute_wrap = off
+ij_xml_text_wrap = off
+ij_xml_keep_blank_lines = 1

-### get category page by isDel
-GET http://localhost:8080/api/category/page/isDel/0?page=0&size=10
+[pom.xml]
+indent_size = 2
+
+[*.java]
+indent_size = 4
+tab_width = 4
+
+[*.js]
+indent_size = 2
+
+[*.ts]
+indent_size = 2
@@ -17,7 +17,6 @@

 /home export-ignore
 /hip export-ignore
-/template-marketplace export-ignore
 /.github export-ignore
 /.idea export-ignore
 /.devcontainer export-ignore
@@ -90,24 +90,24 @@ e2e:
 backend:
  - changed-files:
      - any-glob-to-any-file:
-          - "alerter/**/*"
-          - "collector/**/*"
-          - "common/**/*"
-          - "grafana/**/*"
-          - "manager/**/*"
-          - "push/**/*"
-          - "remoting/**/*"
-          - "warehouse/**/*"
+          - "hertzbeat-alerter/**/*"
+          - "hertzbeat-collector/**/*"
+          - "hertzbeat-common/**/*"
+          - "hertzbeat-grafana/**/*"
+          - "hertzbeat-manager/**/*"
+          - "hertzbeat-push/**/*"
+          - "hertzbeat-remoting/**/*"
+          - "hertzbeat-warehouse/**/*"

 collector:
  - changed-files:
      - any-glob-to-any-file:
-          - "collector/**/*"
+          - "hertzbeat-collector/**/*"
            
 monitoring-template:
  - changed-files:
      - any-glob-to-any-file:
-          - "manager/src/main/resources/define/**/*"
+          - "hertzbeat-manager/src/main/resources/define/**/*"

 HIP:
  - changed-files:
@@ -38,6 +38,10 @@ on:
      - 'script/**'
      - 'material/**'

+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
  backend-build:
    runs-on: ubuntu-latest
@@ -46,16 +50,58 @@ jobs:
      - uses: ./script/ci/github-actions/setup-deps

      - name: Build with Maven
-        run: mvnd clean -B package -Prelease -Dmaven.test.skip=false --file pom.xml
+        run: mvnd clean -B package -pl '!hertzbeat-e2e' -Prelease -Dmaven.test.skip=false --file pom.xml

      - name: Upload coverage reports to Codecov
        uses: codecov/codecov-action@v4.0.1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
          verbose: true

+      - name: Upload backend distribution
+        uses: actions/upload-artifact@v4
+        with:
+          name: backend-dist-${{ github.run_id }}
+          path: dist/
+          retention-days: 1
+          compression-level: 0
+
+  backend-maven-e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./script/ci/github-actions/setup-deps
+
+      - name: Build backend Maven E2E modules
+        run: |
+          mvnd clean -B package \
+            -pl hertzbeat-e2e/hertzbeat-collector-common-e2e,hertzbeat-e2e/hertzbeat-collector-kafka-e2e,hertzbeat-e2e/hertzbeat-collector-basic-e2e,hertzbeat-e2e/hertzbeat-collector-mysql-r2dbc-e2e,hertzbeat-e2e/hertzbeat-log-e2e \
+            -am \
+            -Dmaven.test.skip=false \
+            --file pom.xml
+
+      - name: Upload Maven E2E coverage reports to Codecov
+        uses: codecov/codecov-action@v4.0.1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
+          verbose: true
+
+  backend-image-e2e:
+    needs: backend-build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download backend distribution
+        uses: actions/download-artifact@v4
+        with:
+          name: backend-dist-${{ github.run_id }}
+          path: dist/
+
      - name: Build Image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a  # v7.3.0
        with:
          context: ./dist
          file: ./script/docker/server/Dockerfile
@@ -64,13 +110,10 @@ jobs:

      - name: Run E2E
        run: |
-          sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
-          sudo chmod u+x /usr/local/bin/docker-compose
-          
          cd e2e
-          sudo docker-compose version
-          sudo docker-compose up --exit-code-from testing --remove-orphans
-      
+          docker compose version
+          docker compose up --exit-code-from testing --remove-orphans
+
      # upload application logs
      - name: Upload logs & API test reports
        uses: actions/upload-artifact@v4
@@ -80,4 +123,3 @@ jobs:
          path: |
            e2e/logs/
            e2e/report/
-
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Collector Native Release
+
+run-name: Native collector release build (${{ github.ref_name }})
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build-native-collector:
+    name: Native collector (${{ matrix.platform }})
+    permissions:
+      contents: read
+    timeout-minutes: 120
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: linux-amd64
+            runner: ubuntu-24.04
+            archive_ext: tar.gz
+          - platform: linux-arm64
+            runner: ubuntu-24.04-arm
+            archive_ext: tar.gz
+          - platform: macos-amd64
+            runner: macos-13
+            archive_ext: tar.gz
+          - platform: macos-arm64
+            runner: macos-14
+            archive_ext: tar.gz
+          - platform: windows-amd64
+            runner: windows-latest
+            archive_ext: zip
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up GraalVM JDK 25
+        uses: graalvm/setup-graalvm@186d0493a2df5eb62df5ecc498883d18fd58c303  # v1.6.2
+        with:
+          distribution: graalvm-community
+          java-version: '25'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache: maven
+          native-image-job-reports: 'true'
+
+      - name: Verify toolchain
+        shell: pwsh
+        run: |
+          java -version
+          native-image --version
+          mvn -version
+
+      - name: Build native collector package
+        run: mvn -B -pl hertzbeat-collector/hertzbeat-collector-collector -am -Pnative -DskipTests package
+
+      - name: Locate native collector package
+        id: package
+        shell: pwsh
+        run: |
+          $package = Get-ChildItem -Path "dist/apache-hertzbeat-collector-native-*-${{ matrix.platform }}-bin.${{ matrix.archive_ext }}" | Select-Object -First 1
+          if (-not $package) {
+            throw "Native collector package not found for ${{ matrix.platform }}"
+          }
+          "archive=$($package.FullName)" >> $env:GITHUB_OUTPUT
+
+      - name: Upload native collector package
+        uses: actions/upload-artifact@v4
+        with:
+          name: apache-hertzbeat-collector-native-${{ matrix.platform }}
+          path: ${{ steps.package.outputs.archive }}
+          retention-days: 14
@@ -27,6 +27,10 @@ on:
    paths:
      - 'home/**'

+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
  docs-build:
    runs-on: ubuntu-latest
@@ -34,14 +38,27 @@ jobs:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: pnpm
+          cache-dependency-path: home/pnpm-lock.yaml
      - uses: actions/setup-python@v4
        with:
          python-version: '3.8'

      - name: Check Markdown
-        uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e
+        uses: DavidAnson/markdownlint-cli2-action@8de2aa07cae85fd17c0b35642db70cf5495f1d25  # v24.0.0
        with:
-          globs: './home/**/*.md'
+          globs: |
+            ./home/README.md
+            ./home/blog/**/*.md
+            ./home/docs/**/*.md
+            ./home/i18n/zh-cn/docusaurus-plugin-content-blog/**/*.md
+            ./home/i18n/zh-cn/docusaurus-plugin-content-docs/current/**/*.md

      - name: Check filenames
        run: python ./script/ci/docs/check_file_name.py ./script/ci/docs/check_file_name.json
@@ -49,14 +66,15 @@ jobs:
      - name: Dead Link Check
        run: |
          sudo npm install -g markdown-link-check@3.8.7
-          find ./home -name "*.md" > all_md_files.txt
+          find ./home/docs ./home/blog ./home/i18n/zh-cn/docusaurus-plugin-content-docs/current ./home/i18n/zh-cn/docusaurus-plugin-content-blog -name "*.md" > all_md_files.txt
+          printf '%s\n' ./home/README.md >> all_md_files.txt
          grep -vFf ./script/ci/exclude_files.txt all_md_files.txt > to_check.txt
          xargs -P 8 -a to_check.txt -I{} markdown-link-check -c ./script/ci/link_check.json -q "{}"

-      - name: NPM INSTALL
+      - name: PNPM INSTALL
        working-directory: home
-        run: npm install
+        run: pnpm install

-      - name: NPM BUILD
+      - name: PNPM BUILD
        working-directory: home
-        run: npm run build
+        run: pnpm run build
@@ -0,0 +1,94 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: DOC Deploy
+
+on:
+  # Trigger on push to master branch when home directory files are changed
+  push:
+    branches: [ master ]
+    paths:
+      - 'home/**'
+
+  # Allow manual workflow trigger
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+# Set permissions for deployment
+permissions:
+  contents: write
+
+jobs:
+  deploy:
+    name: Deploy Documentation to asf-site Branch
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout the repository code
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Setup pnpm (must run before setup-node so the pnpm cache can be configured)
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      # Setup Node.js environment
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: pnpm
+          cache-dependency-path: home/pnpm-lock.yaml
+
+      # Install dependencies in home directory
+      - name: Install Dependencies
+        working-directory: home
+        run: pnpm install --frozen-lockfile
+
+      # Build the documentation site
+      - name: Build Documentation
+        working-directory: home
+        run: pnpm run build
+        env:
+          NODE_OPTIONS: --max-old-space-size=4096
+
+      # Deploy to asf-site branch using peaceiris/actions-gh-pages
+      - name: Deploy to asf-site Branch
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./home/build
+          publish_branch: asf-site
+          force_orphan: true
+          user_name: 'github-actions[bot]'
+          user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: 'Deploy documentation to asf-site branch'
+
+      # Output deployment status
+      - name: Deployment Summary
+        run: |
+          echo "Documentation deployed successfully!"
+          echo "Deployment branch: asf-site"
+          echo "Source branch: ${{ github.ref_name }}"
+          echo "Commit SHA: ${{ github.sha }}"
@@ -30,17 +30,30 @@ on:
    paths:
      - 'web-app/**'

+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
  build:
    runs-on: ubuntu-latest
+    timeout-minutes: 30
    steps:
    - uses: actions/checkout@v4
    - uses: pnpm/action-setup@v4
      with:
        version: 10
+    - uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+        cache: pnpm
+        cache-dependency-path: web-app/pnpm-lock.yaml
    - name: Install
      working-directory: web-app
      run: pnpm install
    - name: EsLint Test
      working-directory: web-app
      run: pnpm lint:ts
+    - name: Unit Test
+      working-directory: web-app
+      run: pnpm test
@@ -26,6 +26,10 @@ on:
  pull_request:
    branches: [ master, dev ]

+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
  check-license-header:
    name: check-license-header
@@ -44,7 +44,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@4be7066ada62dd38de10e7b70166bc74ed198c30  # stable
        with:
          toolchain: ${{ env.RUST_VERSION }}
          components: rustfmt, clippy
@@ -27,6 +27,11 @@ on:
    - cron: '0 1 * * *'
  push:
    branches: [ action* ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
  check-license-header:
    name: Monitor E2E Test
@@ -36,9 +41,9 @@ jobs:
      - uses: actions/checkout@v4
      - uses: ./script/ci/github-actions/setup-deps
      - name: Build with Maven
-        run: mvn clean -B package -Prelease -Dmaven.test.skip=true --file pom.xml
+        run: mvnd -B clean package -Prelease -Dmaven.test.skip=true --file pom.xml
      - name: Build Image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a  # v7.3.0
        with:
          context: ./dist
          file: ./script/docker/server/Dockerfile
@@ -46,8 +51,6 @@ jobs:
          tags: apache/hertzbeat:test
      - name: Run K8s Monitor E2E Test
        run: |
-          sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
-          sudo chmod u+x /usr/local/bin/docker-compose
          cd e2e/k8s
-          sudo docker-compose version
-          sudo docker-compose up --exit-code-from testing --remove-orphans
+          docker compose version
+          docker compose up --exit-code-from testing --remove-orphans
@@ -23,6 +23,11 @@ on:
    - cron: '0 0 * * *'
  push:
    branches: [ action* ]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build:
@@ -34,39 +39,41 @@ jobs:
    - uses: pnpm/action-setup@v4
      with:
        version: 10
-        
+    - uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+        cache: pnpm
+        cache-dependency-path: web-app/pnpm-lock.yaml
+
    - name: Build the Frontend
      run: |
        cd web-app
        pnpm install
        pnpm package
-        
+
    - name: Build the Backend
      run: |
-        mvn clean install
-        mvn clean package -Prelease -DskipTests
-        cd hertzbeat-collector
-        mvn clean package -Pcluster -DskipTests
+        mvnd -B clean package -Prelease,cluster -Dmaven.test.skip=false --file pom.xml

-    - uses: docker/setup-qemu-action@v3
-    - uses: docker/setup-buildx-action@v3
+    - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
+    - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
    - name: Log in to Docker Hub
-      uses: docker/login-action@v3
+      uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0  # v4.4.0
      with:
        username: ${{ secrets.DOCKERHUB_USER }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}
-        
+
    - name: Build and Push Server
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a  # v7.3.0
      with:
        context: ./dist
        file: ./script/docker/server/Dockerfile
        platforms: linux/amd64,linux/arm64
        push: true
        tags: apache/hertzbeat:nightly
-        
+
    - name: Build and Push Collector
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a  # v7.3.0
      with:
        context: ./dist
        file: ./script/docker/collector/Dockerfile
@@ -56,3 +56,7 @@ application-mysql.yml
 application-pg.yml
 /package.json
 /yarn.lock
+
+# Local Codex workspace files
+.codex/
+AGENTS.md
@@ -3,5 +3,5 @@ FROM gitpod/workspace-full
 USER gitpod

 RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
-    sdk install java 17.0.3-ms && \
-    sdk default java 17.0.3-ms"
+    sdk install java 21.0.2-tem && \
+    sdk default java 21.0.2-tem"
@@ -4,7 +4,7 @@ image:
 tasks:

    - name: Run backend
-      before: cd hertzbeat-manager
+      before: cd hertzbeat-startup
      command: |
          gp sync-await setup-backend
          mvn spring-boot:run
@@ -13,7 +13,7 @@ tasks:
      before: cd web-app
      command: |
          gp sync-await setup-frontend
-          yarn start --public-host "`gp url 4200`"
+          pnpm start --public-host "`gp url 4200`"
      openMode: split-right

    - name: Setup backend
@@ -25,7 +25,7 @@ tasks:

    - name: Setup frontend
      init: |
-          cd web-app && yarn install
+          cd web-app && pnpm install
      command: |
          gp sync-done setup-frontend
          exit 0
@@ -44,7 +44,7 @@ vscode:

 ports:
    - port: 4200
-      name: Hertzbeat
+      name: HertzBeat
      onOpen: open-browser

    - port: 1157
@@ -39,6 +39,7 @@ header:
    - '**/*.js'
    - '**/*.less'
    - '**/*.txt'
+    - '**/*.st'
    - '**/target/**'
    - '.gitattributes'
    - '**/.gitignore'
@@ -15,7 +15,13 @@
 // limitations under the License.
 //
 {
-  "globs": ["home/**/*.md"],
+  "globs": [
+    "home/README.md",
+    "home/blog/**/*.md",
+    "home/docs/**/*.md",
+    "home/i18n/zh-cn/docusaurus-plugin-content-blog/**/*.md",
+    "home/i18n/zh-cn/docusaurus-plugin-content-docs/current/**/*.md"
+  ],
  "config": {
    "default": true,
    "MD001": true,
@@ -31,14 +37,15 @@
    "MD025": true,
    "MD029": true,
    "MD033": {
-      "allowed_elements": ["table", "tr", "td", "a", "img", "sub", "b", "br", "img", "tbody", "mark", "font"]
+      "allowed_elements": ["table", "tr", "td", "a", "img", "sub", "b", "br", "img", "tbody", "mark", "font", "Tabs", "TabItem"]
    },
    "MD036": false,
    "MD040": true,
    "MD045": true,
    "MD046": true,
    "MD047": true,
-    "MD052": true
+    "MD052": true,
+    "MD060": false
  },
  "ignores": [
    "**/node_modules/**",
@@ -1,10 +1,10 @@
-## Contributor Guide [中文贡献者指南](#贡献者指南)    
+## Contributor Guide [中文贡献者指南](#贡献者指南)

-> We are committed to maintaining a happy community that helps each other, welcome every contributor to join us!   
+> We are committed to maintaining a happy community that helps each other, welcome every contributor to join us!

-### Kinds of Contributions   
+### Kinds of Contributions

-> In the HertzBeat community, there are many ways to contribute:   
+> In the HertzBeat community, there are many ways to contribute:

 - 💻**Code**: Can help the community complete some tasks, write new features or fix some bugs;

@@ -20,27 +20,27 @@

 - 💬**Suggestion**: You can also make some suggestions to the project or community to promote the healthy development of the community;

-More see [Contribution Types](https://allcontributors.org/docs/en/emoji-key)    
+More see [Contribution Types](https://allcontributors.org/en/reference/emoji-key/)

-Even small corrections to typos are very welcome :)   
+Even small corrections to typos are very welcome :)

-### Getting HertzBeat up and running   
+### Getting HertzBeat up and running

 > To get HertzBeat code running on your development tools, and able to debug with breakpoints.
-> This is a front-end and back-end separation project. To start the local code, the back-end [manager](manager) and the front-end [web-app](web-app) must be started separately.  
+> This is a front-end and back-end separation project. To start the local code, the back-end [startup](hertzbeat-startup) and the front-end [web-app](web-app) must be started separately.


 #### Backend start

-1. Requires `maven3+`, `java17` and `lombok` environments
+1. Requires `maven3+`, `java25` and `lombok` environments

-2. (Optional) Modify the configuration file: `manager/src/main/resources/application.yml`
+2. (Optional) Modify the configuration file: `hertzbeat-startup/src/main/resources/application.yml`

 3. Execute under the project root directory: `mvn clean install -DskipTests`

 4. Add VM Options: `--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`

-5. Start `springboot manager` service: `manager/src/main/java/org/apache/hertzbeat/hertzbeat-manager/Manager.java`
+5. Start `springboot startup` service: `hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java`

 #### Frontend start

@@ -57,51 +57,51 @@ Even small corrections to typos are very welcome :)
 6. Browser access to localhost:4200 to start, default account/password is *admin/hertzbeat*


-### Find tasks   
+### Find tasks

-Find the issue you are interested in! On our GitHub repo issue list, we often publish some issues with the label good first issue or status: volunteer wanted. 
-These issues welcome the help of contributors. Among them, good first issues tend to have low thresholds and are suitable for novices.  
+Find the issue you are interested in! On our GitHub repo issue list, we often publish some issues with the label good first issue or status: volunteer wanted.
+These issues welcome the help of contributors. Among them, good first issues tend to have low thresholds and are suitable for novices.

-Of course, if you have a good idea, you can also propose it directly on GitHub Discussion or contact with community.  
+Of course, if you have a good idea, you can also propose it directly on GitHub Discussion or contact with community.

-### Submit Pull Request  
+### Submit Pull Request

-1. First you need to fork your target [hertzbeat repository](https://github.com/apache/hertzbeat).   
+1. First you need to fork your target [hertzbeat repository](https://github.com/apache/hertzbeat).
 2. Then download the code locally with git command:
    ```shell
-    git clone git@github.com:${YOUR_USERNAME}/hertzbeat.git #Recommended  
+    git clone git@github.com:${YOUR_USERNAME}/hertzbeat.git #Recommended
    ```
-3. After the download is complete, please refer to the getting started guide or README file of the target repository to initialize the project.  
+3. After the download is complete, please refer to the getting started guide or README file of the target repository to initialize the project.
 4. Then, you can refer to the following command to submit the code:
    ```shell
-    git checkout -b a-feature-branch #Recommended  
+    git checkout -b a-feature-branch #Recommended
    ```
-5. Submit the coed as a commit, the commit message format specification required: [module name or type name]feature or bugfix or doc: custom message.  
+5. Submit the code as a commit, the commit message format specification required: [module name or type name]feature or bugfix or doc: custom message.
    ```shell
-    git add <modified file/path> 
-    git commit -m '[docs]feature: necessary instructions' #Recommended 
+    git add <modified file/path>
+    git commit -m '[docs]feature: necessary instructions' #Recommended
    ```
-6. Push to the remote repository   
+6. Push to the remote repository
    ```shell
-    git push origin a-feature-branch   
+    git push origin a-feature-branch
    ```
-7. Then you can initiate a new PR (Pull Request) on GitHub.  
+7. Then you can initiate a new PR (Pull Request) on GitHub.

-Please note that the title of the PR needs to conform to our spec, and write the necessary description in the PR to facilitate code review by Committers and other contributors.   
+Please note that the title of the PR needs to conform to our spec, and write the necessary description in the PR to facilitate code review by Committers and other contributors.

-### Wait for the code to be merged   
+### Wait for the code to be merged

-After submitting the PR, the Committee or the community's friends will review the code you submitted (Code Review), and will propose some modification suggestions or conduct some discussions. Please pay attention to your PR in time.  
+After submitting the PR, the Committee or the community's friends will review the code you submitted (Code Review), and will propose some modification suggestions or conduct some discussions. Please pay attention to your PR in time.

-If subsequent changes are required, there is no need to initiate a new PR. After submitting a commit on the original branch and pushing it to the remote repository, the PR will be automatically updated.  
+If subsequent changes are required, there is no need to initiate a new PR. After submitting a commit on the original branch and pushing it to the remote repository, the PR will be automatically updated.

-In addition, our project has a relatively standardized and strict CI inspection process. After submitting PR, CI will be triggered. Please pay attention to whether it passes the CI inspection.  
+In addition, our project has a relatively standardized and strict CI inspection process. After submitting PR, CI will be triggered. Please pay attention to whether it passes the CI inspection.

-Finally, the Committers can merge the PR into the master branch.   
+Finally, the Committers can merge the PR into the master branch.

-### After the code is merged   
+### After the code is merged

-After the code has been merged, you can delete the development branch on both the local and remote repositories:   
+After the code has been merged, you can delete the development branch on both the local and remote repositories:

 ```shell
 git branch -d a-dev-branch
@@ -112,18 +112,18 @@ On the master/main branch, you can do the following to sync the upstream reposit

 ```shell
 git remote add upstream https://github.com/apache/hertzbeat.git #Bind the remote warehouse, if it has been executed, it does not need to be executed again
-git checkout master 
+git checkout master
 git pull upstream master
 ```

 ### HertzBeat Improvement Proposal (HIP)
 If you have major new features(e.g., support metrics push gateway, support logs monitoring), you need to write a design document known as a HertzBeat Improvement Proposal (HIP). Before starting to write a HIP, make sure you follow the process [here](https://github.com/apache/hertzbeat/tree/master/hip).

-### How to become a Committer?  
+### How to become a Committer?

-With the above steps, you are a contributor to HertzBeat. Repeat the previous steps to stay active in the community, keep at, you can become a Committer!    
+With the above steps, you are a contributor to HertzBeat. Repeat the previous steps to stay active in the community, keep at, you can become a Committer!

-### Join Discussion   
+### Join Discussion

 [Join the Mailing Lists](https://lists.apache.org/list.html?dev@hertzbeat.apache.org) : Mail to `dev-subscribe@hertzbeat.apache.org` to subscribe mailing lists.

@@ -131,32 +131,21 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.

 ## 🥐 Architecture

- **[manager](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager)** Provide monitoring management, system management basic services.
-> Provides monitoring management, monitoring configuration management, system user management, etc.
- **[collector](https://github.com/apache/hertzbeat/tree/master/collector)** Provide metrics data collection services.
-> Use common protocols to remotely collect and obtain peer-to-peer metrics data.
- **[warehouse](https://github.com/apache/hertzbeat/tree/master/warehouse)** Provide monitoring data warehousing services.
-> Metrics data management, data query, calculation and statistics.
- **[alerter](https://github.com/apache/hertzbeat/tree/master/hertzbeat-alerter)** Provide alert service.
-> Alarm calculation trigger, monitoring status linkage, alarm configuration, and alarm notification.
- **[web-app](https://github.com/apache/hertzbeat/tree/master/web-app)** Provide web ui.
-> Angular Web UI.
-
 ![hertzBeat](home/static/img/docs/hertzbeat-arch.png)

-<br>  
+<br>

 ------

 <br>

-## 贡献者指南    
+## 贡献者指南

-> 非常欢迎参与项目贡献，我们致力于维护一个互相帮助的快乐社区。  
+> 非常欢迎参与项目贡献，我们致力于维护一个互相帮助的快乐社区。

-### 贡献方式   
+### 贡献方式

-> 在 HertzBeat 社区，贡献方式有很多:  
+> 在 HertzBeat 社区，贡献方式有很多:

 - 💻**代码**：可以帮助社区完成一些任务、编写新的feature或者是修复一些bug；

@@ -170,28 +159,28 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.

 - 💡**布道**：可以帮助宣传或推广 HertzBeat 社区，在 meetup 或 summit 中演讲；

- 💬**建议**：也可以对项目或者社区提出一些建议，促进社区的良性发展；  
+- 💬**建议**：也可以对项目或者社区提出一些建议，促进社区的良性发展；

-更多贡献方式参见 [Contribution Types](https://allcontributors.org/docs/en/emoji-key)
+更多贡献方式参见 [Contribution Types](https://allcontributors.org/en/reference/emoji-key/)

-即便是小到错别字的修正我们也都非常欢迎 :)   
+即便是小到错别字的修正我们也都非常欢迎 :)

-### 让 HertzBeat 运行起来   
+### 让 HertzBeat 运行起来

-> 让 HertzBeat 的代码在您的开发工具上运行起来，并且能够断点调试。   
-> 此为前后端分离项目，本地代码启动需将后端[manager](manager)和前端[web-app](web-app)分别启动生效。
+> 让 HertzBeat 的代码在您的开发工具上运行起来，并且能够断点调试。
+> 此为前后端分离项目，本地代码启动需将后端[hertzbeat-startup](hertzbeat-startup)和前端[web-app](web-app)分别启动生效。

 #### 后端启动

-1. 需要 `maven3+`, `java17` 和 `lombok` 环境
+1. 需要 `maven3+`, `java25` 和 `lombok` 环境

-2. (可选)修改配置文件配置信息-`manager/src/main/resources/application.yml`
+2. (可选)修改配置文件配置信息-`hertzbeat-startup/src/main/resources/application.yml`

 3. 在项目根目录运行编译: `mvn clean install -DskipTests`

 4. 在 `jvm` 加入参数 `--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`

-5. 启动`springboot manager`服务 `manager/src/main/java/org/apache/hertzbeat/hertzbeat-manager/Manager.java`
+5. 启动`springboot startup`服务 `hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java`


 #### 前端启动
@@ -208,71 +197,71 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.

 6. 浏览器访问 localhost:4200 即可开始，默认账号密码 *admin/hertzbeat*

-### 寻找任务  
+### 寻找任务

 寻找您感兴趣的Issue！在我们的GitHub仓库和邮件列表中，我们经常会发布一些带有 good first issue 或者 status: volunteer wanted 标签的issue，这些issue都欢迎贡献者的帮助。
-其中good first issue往往门槛较低、适合新手。   
+其中good first issue往往门槛较低、适合新手。

-当然，如果您有好的想法，也可以直接在GitHub Discussion 中提出或者联系社区。  
+当然，如果您有好的想法，也可以直接在GitHub Discussion 中提出或者联系社区。

 ### 提交 Pull Request

 1. 首先您需要 Fork 目标仓库 [hertzbeat repository](https://github.com/apache/hertzbeat).
-2. 然后 用git命令 将代码下载到本地:  
+2. 然后 用git命令 将代码下载到本地:
    ```shell
-    git clone git@github.com:${YOUR_USERNAME}/hertzbeat.git #Recommended  
+    git clone git@github.com:${YOUR_USERNAME}/hertzbeat.git #Recommended
    ```
 3. 下载完成后，请参考目标仓库的入门指南或者 README 文件对项目进行初始化。
-4. 接着，您可以参考如下命令进行代码的提交, 切换新的分支, 进行开发:  
+4. 接着，您可以参考如下命令进行代码的提交, 切换新的分支, 进行开发:
    ```shell
-    git checkout -b a-feature-branch #Recommended  
+    git checkout -b a-feature-branch #Recommended
    ```
-5. 提交 commit , commit 描述信息需要符合约定格式: [module name or type name]feature or bugfix or doc: custom message. 
+5. 提交 commit , commit 描述信息需要符合约定格式: [module name or type name]feature or bugfix or doc: custom message.
    ```shell
-    git add <modified file/path> 
-    git commit -m '[docs]feature: necessary instructions' #Recommended 
+    git add <modified file/path>
+    git commit -m '[docs]feature: necessary instructions' #Recommended
    ```
-6. 推送到远程仓库   
+6. 推送到远程仓库
    ```shell
-    git push origin a-feature-branch   
+    git push origin a-feature-branch
    ```
 7. 然后您就可以在 GitHub 上发起新的 PR (Pull Request)。

-请注意 PR 的标题需要符合我们的规范，并且在 PR 中写上必要的说明，来方便 Committer 和其他贡献者进行代码审查。 
+请注意 PR 的标题需要符合我们的规范，并且在 PR 中写上必要的说明，来方便 Committer 和其他贡献者进行代码审查。

-### 等待PR代码被合并  
+### 等待PR代码被合并

-在提交了 PR 后，Committer 或者社区的小伙伴们会对您提交的代码进行审查（Code Review），会提出一些修改建议，或者是进行一些讨论，请及时关注您的PR。 
+在提交了 PR 后，Committer 或者社区的小伙伴们会对您提交的代码进行审查（Code Review），会提出一些修改建议，或者是进行一些讨论，请及时关注您的PR。

 若后续需要改动，不需要发起一个新的 PR，在原有的分支上提交 commit 并推送到远程仓库后，PR会自动更新。

 另外，我们的项目有比较规范和严格的 CI 检查流程，在提交 PR 之后会触发 CI，请注意是否通过 CI 检查。

-最后，Committer 可以将 PR 合并入 master 主分支。  
+最后，Committer 可以将 PR 合并入 master 主分支。

-### 代码被合并后  
+### 代码被合并后

-在代码被合并后，您就可以在本地和远程仓库删除这个开发分支了：  
+在代码被合并后，您就可以在本地和远程仓库删除这个开发分支了：

 ```shell
 git branch -d a-dev-branch
 git push origin --delete a-dev-branch
 ```

-在主分支上，您可以执行以下操作来同步上游仓库：  
+在主分支上，您可以执行以下操作来同步上游仓库：

 ```shell
 git remote add upstream https://github.com/apache/hertzbeat.git #Bind the remote warehouse, if it has been executed, it does not need to be executed again
-git checkout master 
+git checkout master
 git pull upstream master
 ```

 ### HertzBeat 改进提案 (HIP)
 如果您有重大的新特性（例如，支持指标推送网关，日志监控等），您需要编写一个被称为 HertzBeat 改进提案（HertzBeat Improvement Proposal，HIP）的设计文档。在开始编写 HIP 之前，请确保您遵循了[这里](https://github.com/apache/hertzbeat/tree/master/hip)的流程。

-### 如何成为Committer？  
+### 如何成为Committer？

-通过上述步骤，您就是 HertzBeat 的贡献者了。重复前面的步骤，在社区中保持活跃，坚持下去，您就能成为 Committer！  
+通过上述步骤，您就是 HertzBeat 的贡献者了。重复前面的步骤，在社区中保持活跃，坚持下去，您就能成为 Committer！

 ### 加入讨论交流

@@ -282,15 +271,4 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.

 ### 模块

- **[manager](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager)** 提供监控管理,系统管理基础服务
-> 提供对监控的管理，监控应用配置的管理，系统用户租户后台管理等。
- **[collector](https://github.com/apache/hertzbeat/tree/master/collector)** 提供监控数据采集服务
-> 使用通用协议远程采集获取对端指标数据。
- **[warehouse](https://github.com/apache/hertzbeat/tree/master/warehouse)** 提供监控数据仓储服务
-> 采集指标结果数据管理，数据落盘，查询，计算统计。
- **[alerter](https://github.com/apache/hertzbeat/tree/master/hertzbeat-alerter)** 提供告警服务
-> 告警计算触发，任务状态联动，告警配置，告警通知。
- **[web-app](https://github.com/apache/hertzbeat/tree/master/web-app)** 提供可视化控制台页面
-> 监控告警系统可视化控制台前端
-
-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)     
+![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
@@ -1,5 +1,5 @@
 Apache HertzBeat™
-Copyright 2024-2025 The Apache Software Foundation
+Copyright 2024-2026 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -10,7 +10,6 @@
 </p>

 [![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr)
-[![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/)
 [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://x.com/hertzbeat1024)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139)
 [![codecov](https://codecov.io/gh/apache/HertzBeat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/hertzbeat)
@@ -21,13 +20,13 @@
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/apache/hertzbeat)
 [![zread](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)](https://zread.ai/apache/hertzbeat)

-**Home: [hertzbeat.apache.org](https://hertzbeat.apache.org)**   
+**Home: [hertzbeat.apache.org](https://hertzbeat.apache.org)**
 **Email: <a href="mailto:dev-subscribe@hertzbeat.apache.org">Mail to `dev-subscribe@hertzbeat.apache.org`</a> to subscribe mailing lists**


 ## 🎡 <font color="green">Introduction</font>

-[Apache HertzBeat™](https://github.com/apache/hertzbeat) is an AI-powered next-generation open source real-time observability system. Unified metrics and logs collection, centralized alerting distribution, intelligent management and analysis. No Agent required, high performance cluster, provides powerful custom monitoring and status page building capabilities.     
+[Apache HertzBeat™](https://github.com/apache/hertzbeat) is an AI-powered next-generation open source real-time observability system. Unified metrics and logs collection, centralized alerting distribution, intelligent management and analysis. No Agent required, high performance cluster, provides powerful custom monitoring and status page building capabilities.

 ### Features

@@ -40,71 +39,25 @@
 - High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration.
 - Provides powerful status page building capabilities, easily communicate the real-time status of your service to users.

-> HertzBeat's unified platform, AI intelligence, powerful customization, multi-type support, high performance, and easy expansion, aims to help users quickly and conveniently achieve observability requirements.      
+> HertzBeat's unified platform, AI intelligence, powerful customization, multi-type support, high performance, and easy expansion, aims to help users quickly and conveniently achieve observability requirements.

 ----

 ----

-## 🥐 Architecture   
+## 🥐 Architecture

-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
+![HertzBeat](home/static/img/docs/hertzbeat-arch.png)

-## ⛄ Supported   
-
-> We define all metrics collection types such as `mysql`, `jvm`, and `k8s` as `YML` templates, allowing users to import them to support corresponding types of monitoring.
-> Welcome everyone to contribute your customized general metrics type YML template during use.
-
-
- [Website](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-website.yml), [Port Telnet](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-port.yml),
-  [Http Api](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-api.yml), [Ping Connect](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ping.yml),
-  [Jvm](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-jvm.yml), [SiteMap](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-fullsite.yml),
-  [Ssl Certificate](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ssl_cert.yml), [SpringBoot2](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-springboot2.yml),
-  [FTP Server](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ftp.yml), [SpringBoot3](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-springboot3.yml),
-  [Udp Port](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-udp_port.yml), [Dns](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dns.yml),
-  [Pop3](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-pop3.yml), [Ntp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ntp.yml),
-  [Api Code](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-api_code.yml), [Smtp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-smtp.yml),
-  [Nginx](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-nginx.yml)
- [Mysql](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mysql.yml), [PostgreSQL](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-postgresql.yml),
-  [MariaDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mariadb.yml), [Redis](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis.yml),
-  [ElasticSearch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-elasticsearch.yml), [SqlServer](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-sqlserver.yml),
-  [Oracle](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-oracle.yml), [MongoDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mongodb.yml),
-  [DM](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dm.yml), [OpenGauss](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-opengauss.yml),
-  [ClickHouse](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-clickhouse.yml), [IoTDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-iotdb.yml),
-  [Redis Cluster](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis_cluster.yml), [Redis Sentinel](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis_sentinel.yml)
-  [Doris BE](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-doris_be.yml), [Doris FE](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-doris_fe.yml),
-  [Memcached](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-memcached.yml), [NebulaGraph](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-nebula_graph.yml)
- [Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-linux.yml), [Ubuntu](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ubuntu.yml),
-  [CentOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-centos.yml), [Windows](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-windows.yml),
-  [EulerOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-euleros.yml), [Fedora CoreOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-coreos.yml),
-  [OpenSUSE](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-opensuse.yml), [Rocky Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-rockylinux.yml),
-  [Red Hat](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redhat.yml), [FreeBSD](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-freebsd.yml),
-  [AlmaLinux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-almalinux.yml), [Debian Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-debian.yml)
- [Tomcat](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-tomcat.yml), [Nacos](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-nacos.yml),
-  [Zookeeper](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-zookeeper.yml), [RabbitMQ](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-rabbitmq.yml),
-  [Flink](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-flink.yml), [Kafka](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-kafka.yml),
-  [ShenYu](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-shenyu.yml), [DynamicTp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dynamic_tp.yml),
-  [Jetty](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-jetty.yml), [ActiveMQ](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-activemq.yml),
-  [Spring Gateway](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-spring_gateway.yml), [EMQX MQTT](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-emqx.yml),
-  [AirFlow](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-airflow.yml), [Hive](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hive.yml),
-  [Spark](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-spark.yml), [Hadoop](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hadoop.yml)
- [Kubernetes](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-kubernetes.yml), [Docker](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-docker.yml)
- [CiscoSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-cisco_switch.yml), [HpeSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hpe_switch.yml),
-  [HuaweiSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-huawei_switch.yml), [TpLinkSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-tplink_switch.yml),
-  [H3cSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-h3c_switch.yml)
- And More Your Custom Template.
- Notified Support `Discord` `Slack` `Telegram` `Email` `Dingtalk` `WeChat` `FeiShu` `Webhook` `SMS` `ServerChan`.
-
-
-## 🐕 Quick Start   
+## 🐕 Quick Start

 - If you wish to deploy HertzBeat locally, please refer to the following Deployment Documentation for instructions.

-### 🍞 Install HertzBeat   
+### 🍞 Install HertzBeat

-> HertzBeat supports installation through source code, docker or package, cpu support x86/arm64.   
+> HertzBeat supports installation through source code, docker or package, cpu support x86/arm64.

-##### 1：Install quickly via docker   
+##### 1：Install quickly via docker

 1. Just one command to get started

@@ -112,7 +65,7 @@
   docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat
   ```

-2. Access `http://localhost:1157` to start, default account: `admin/hertzbeat`  
+2. Access `http://localhost:1157` to start, default account: `admin/hertzbeat`

 3. Deploy collector clusters (Optional)

@@ -126,16 +79,16 @@
   - `-e MANAGER_PORT=1158` : set the main hertzbeat server port, default 1158.


-Detailed config refer to [Install HertzBeat via Docker](https://hertzbeat.apache.org/docs/start/docker-deploy)   
+Detailed config refer to [Install HertzBeat via Docker](https://hertzbeat.apache.org/docs/start/docker-deploy)

-##### 2：Install via package  
+##### 2：Install via package

-1. Download the release package `hertzbeat-xx.tar.gz` [Download](https://hertzbeat.apache.org/docs/download)
-2. Configure the HertzBeat configuration yml file `hertzbeat/config/application.yml` (optional)  
-3. Run command `$ ./bin/startup.sh ` or `bin/startup.bat`   
-4. Access `http://localhost:1157` to start, default account: `admin/hertzbeat`  
+1. Download the release package `apache-hertzbeat-xx-bin.tar.gz` [Download](https://hertzbeat.apache.org/docs/download)
+2. Configure the HertzBeat configuration yml file `hertzbeat/config/application.yml` (optional)
+3. Run command `$ ./bin/startup.sh ` or `bin/startup.bat`
+4. Access `http://localhost:1157` to start, default account: `admin/hertzbeat`
 5. Deploy collector clusters (Optional)
-    - Download the release package `hertzbeat-collector-xx.tar.gz` to new machine [Download](https://hertzbeat.apache.org/docs/download)
+    - Download the release package `apache-hertzbeat-collector-xx-bin.tar.gz` (JVM collector) or the native collector package for your platform, such as `apache-hertzbeat-collector-native-xx-linux-amd64-bin.tar.gz` or `apache-hertzbeat-collector-native-xx-windows-amd64-bin.zip`, to the new machine [Download](https://hertzbeat.apache.org/docs/download)
    - Configure the collector configuration yml file `hertzbeat-collector/config/application.yml`: unique `identity` name, running `mode` (public or private), hertzbeat `manager-host`, hertzbeat `manager-port`
      ```yaml
      collector:
@@ -148,25 +101,27 @@ Detailed config refer to [Install HertzBeat via Docker](https://hertzbeat.apache
              manager-host: ${MANAGER_HOST:127.0.0.1}
              manager-port: ${MANAGER_PORT:1158}
      ```
-    - Run command `$ ./bin/startup.sh ` or `bin/startup.bat`
-    - Access `http://localhost:1157` and you will see the registered new collector in dashboard 
+    - If you do not provide JDBC drivers in `ext-lib`, MySQL, MariaDB, and OceanBase can use the built-in query engine and run on the native collector package as well. TiDB follows the same rule for its SQL query metric set.
+    - If `mysql-connector-j` is present in `ext-lib`, the built-in server collector or JVM collector automatically prefers JDBC after restart for MySQL, MariaDB, and OceanBase. TiDB follows the same rule for its SQL query metric set, while its HTTP metrics are unchanged. Oracle and DB2 still require the JVM collector package because they depend on external JDBC drivers.
+    - Run `$ ./bin/startup.sh ` or `bin/startup.bat` for the JVM collector package. Run `$ ./bin/startup.sh ` for Linux or macOS native collector packages, and `bin\\startup.bat` for the Windows native collector package.
+    - Access `http://localhost:1157` and you will see the registered new collector in dashboard

-Detailed config refer to [Install HertzBeat via Package](https://hertzbeat.apache.org/docs/start/package-deploy)   
+Detailed config refer to [Install HertzBeat via Package](https://hertzbeat.apache.org/docs/start/package-deploy)

-##### 3：Start via source code        
+##### 3：Start via source code

-1. Local source code debugging needs to start the back-end project `manager` and the front-end project `web-app`.  
-2. Backend：need `maven3+`, `java17`, `lombok`, add VM options in IDE: ` --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED `, then start the `manager` service. 
-3. Web：need `nodejs npm angular-cli` environment, Run `ng serve --open` in `web-app` directory after backend startup.  
-4. Access `http://localhost:4200` to start, default account: `admin/hertzbeat`  
+1. Local source code debugging needs to start the back-end project `hertzbeat-startup` and the front-end project `web-app`.
+2. Backend：need `maven3+`, `java25`, `lombok`, add VM options in IDE: ` --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED `, then start the `hertzbeat-startup` service.
+3. Web：need `nodejs` and `pnpm` environment, run `pnpm install` then `pnpm start` in `web-app` directory after backend startup.
+4. Access `http://localhost:4200` to start, default account: `admin/hertzbeat`

-Detailed steps refer to [CONTRIBUTING](CONTRIBUTING.md)        
+Detailed steps refer to [CONTRIBUTING](CONTRIBUTING.md)

-##### 4：Install All(hertzbeat+postgresql+tsdb) via Docker-compose  
+##### 4：Install All(hertzbeat+postgresql+tsdb) via Docker-compose

 Install the postgresql/mysql database, victoria-metrics/iotdb/tdengine database and hertzbeat at one time through [docker-compose deployment script](script/docker-compose).

-Detailed steps refer to [Install via Docker-Compose](script/docker-compose/README.md)      
+Detailed steps refer to [Install via Docker-Compose](script/docker-compose/README.md)

 ##### 5: Install All(hertzbeat+collector+postgresql+tsdb) via kubernetes helm charts

@@ -178,8 +133,8 @@ Detailed steps refer to [Artifact Hub](https://artifacthub.io/packages/helm/hert

 ## ✨ Contributors

-Thanks to these wonderful people, welcome to join us:     
-[Contributor Guide](CONTRIBUTING.md)   
+Thanks to these wonderful people, welcome to join us:
+[Contributor Guide](CONTRIBUTING.md)

 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
@@ -525,7 +480,7 @@ Thanks to these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yy549159265"><img src="https://avatars.githubusercontent.com/u/40821310?v=4?s=100" width="100px;" alt="yy549159265"/><br /><sub><b>yy549159265</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Tests">⚠️</a> <a href="#design-yy549159265" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cto-huhang"><img src="https://avatars.githubusercontent.com/u/53338629?v=4?s=100" width="100px;" alt="cto-huhang"/><br /><sub><b>cto-huhang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cto-huhang" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/delei"><img src="https://avatars.githubusercontent.com/u/17263766?v=4?s=100" width="100px;" alt="DeleiGuo"/><br /><sub><b>DeleiGuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Adelei" title="Bug reports">🐛</a></td>
    </tr>
    <tr>
@@ -543,6 +498,41 @@ Thanks to these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jetiaime"><img src="https://avatars.githubusercontent.com/u/93769000?v=4?s=100" width="100px;" alt="TeAmo"/><br /><sub><b>TeAmo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jetiaime" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pentium100"><img src="https://avatars.githubusercontent.com/u/27917?v=4?s=100" width="100px;" alt="pentium100"/><br /><sub><b>pentium100</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pentium100" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dedyks"><img src="https://avatars.githubusercontent.com/u/23741665?v=4?s=100" width="100px;" alt="Dedy Kurniawan Santoso"/><br /><sub><b>Dedy Kurniawan Santoso</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dedyks" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOYR"><img src="https://avatars.githubusercontent.com/u/53216619?v=4?s=100" width="100px;" alt="KOYR"/><br /><sub><b>KOYR</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KOYR" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lathika226"><img src="https://avatars.githubusercontent.com/u/178710568?v=4?s=100" width="100px;" alt="LathikaBaddam"/><br /><sub><b>LathikaBaddam</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Lathika226" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://shadwal.space/"><img src="https://avatars.githubusercontent.com/u/119167601?v=4?s=100" width="100px;" alt="Sahil Shadwal"/><br /><sub><b>Sahil Shadwal</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Sahil-Shadwal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BhanuNidumolu"><img src="https://avatars.githubusercontent.com/u/180380413?v=4?s=100" width="100px;" alt="N.Bhanu Prasad"/><br /><sub><b>N.Bhanu Prasad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=BhanuNidumolu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://prakashh-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/183058331?v=4?s=100" width="100px;" alt="Prakash Kumar"/><br /><sub><b>Prakash Kumar</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Prakash1185" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/orangeCatDeveloper"><img src="https://avatars.githubusercontent.com/u/95899648?v=4?s=100" width="100px;" alt="NekoPunch"/><br /><sub><b>NekoPunch</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=orangeCatDeveloper" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=orangeCatDeveloper" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://wy471x.github.io/"><img src="https://avatars.githubusercontent.com/u/52033069?v=4?s=100" width="100px;" alt="wy471x"/><br /><sub><b>wy471x</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wy471x" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hengyuss"><img src="https://avatars.githubusercontent.com/u/81064732?v=4?s=100" width="100px;" alt="hengyuss"/><br /><sub><b>hengyuss</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hengyuss" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://moduvoice.com/"><img src="https://avatars.githubusercontent.com/u/291867022?v=4?s=100" width="100px;" alt="moduvoice"/><br /><sub><b>moduvoice</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=moduvoice" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hutiefang76"><img src="https://avatars.githubusercontent.com/u/137664623?v=4?s=100" width="100px;" alt="hutiefang76"/><br /><sub><b>hutiefang76</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hutiefang76" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://zylatent.com/"><img src="https://avatars.githubusercontent.com/u/250777154?v=4?s=100" width="100px;" alt="柳含知 Liu Hanzhi"/><br /><sub><b>柳含知 Liu Hanzhi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZhouYinLong-lab" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/wilmerdooley"><img src="https://avatars.githubusercontent.com/u/259930736?v=4?s=100" width="100px;" alt="wilmerdooley"/><br /><sub><b>wilmerdooley</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wilmerdooley" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zmjjeff7"><img src="https://avatars.githubusercontent.com/u/175370943?v=4?s=100" width="100px;" alt="Zhenhong Guo"/><br /><sub><b>Zhenhong Guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Zmjjeff7" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/abhyudayareddy"><img src="https://avatars.githubusercontent.com/u/54602866?v=4?s=100" width="100px;" alt="abhyudayareddy"/><br /><sub><b>abhyudayareddy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=abhyudayareddy" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/neon-hippo"><img src="https://avatars.githubusercontent.com/u/165560498?v=4?s=100" width="100px;" alt="neon-hippo"/><br /><sub><b>neon-hippo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=neon-hippo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/P-Peaceful"><img src="https://avatars.githubusercontent.com/u/52856161?v=4?s=100" width="100px;" alt="P_Peaceful"/><br /><sub><b>P_Peaceful</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=P-Peaceful" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=P-Peaceful" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhusaidong"><img src="https://avatars.githubusercontent.com/u/3039961?v=4?s=100" width="100px;" alt="zhusaidong"/><br /><sub><b>zhusaidong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhusaidong" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhehenlu"><img src="https://avatars.githubusercontent.com/u/31504542?v=4?s=100" width="100px;" alt="zhlu"/><br /><sub><b>zhlu</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhehenlu" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=zhehenlu" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/brettgervasoni"><img src="https://avatars.githubusercontent.com/u/34056000?v=4?s=100" width="100px;" alt="brettgervasoni"/><br /><sub><b>brettgervasoni</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=brettgervasoni" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Darshan-paul"><img src="https://avatars.githubusercontent.com/u/211450705?v=4?s=100" width="100px;" alt="Darshan-paul"/><br /><sub><b>Darshan-paul</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Darshan-paul" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/04cb"><img src="https://avatars.githubusercontent.com/u/111667698?v=4?s=100" width="100px;" alt="layla"/><br /><sub><b>layla</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=04cb" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/miantalha45"><img src="https://avatars.githubusercontent.com/u/155809113?v=4?s=100" width="100px;" alt="Talha Amjad"/><br /><sub><b>Talha Amjad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=miantalha45" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://turanalmammadov.com/"><img src="https://avatars.githubusercontent.com/u/16321061?v=4?s=100" width="100px;" alt="Turan Almammadov"/><br /><sub><b>Turan Almammadov</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=turanalmammadov" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=turanalmammadov" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhaoyangplus"><img src="https://avatars.githubusercontent.com/u/245090302?v=4?s=100" width="100px;" alt="zhaoyangplus"/><br /><sub><b>zhaoyangplus</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhaoyangplus" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yexuanyang"><img src="https://avatars.githubusercontent.com/u/73885401?v=4?s=100" width="100px;" alt="Yang Yexuan"/><br /><sub><b>Yang Yexuan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yexuanyang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/markguo123"><img src="https://avatars.githubusercontent.com/u/155072651?v=4?s=100" width="100px;" alt="markguo123"/><br /><sub><b>markguo123</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=markguo123" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/leo-934"><img src="https://avatars.githubusercontent.com/u/55838224?v=4?s=100" width="100px;" alt="leo"/><br /><sub><b>leo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=leo-934" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=leo-934" title="Documentation">📖</a> <a href="#blog-leo-934" title="Blogposts">📝</a></td>
    </tr>
  </tbody>
 </table>
@@ -550,7 +540,7 @@ Thanks to these wonderful people, welcome to join us:
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->

-<!-- ALL-CONTRIBUTORS-LIST:END -->  
+<!-- ALL-CONTRIBUTORS-LIST:END -->

 ## 💬 Join discussion

@@ -562,14 +552,10 @@ Thanks to these wonderful people, welcome to join us:

 WeChat Group : Add friend `ahertzbeat` and invite to the group.

-WeChat Public : Search ID `usthecom`.
-
-[QQ Group](https://qm.qq.com/q/xxqecSC2cw) : Group num `1035688434`
+WeChat Official Account : Search ID `usthecom`.

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

-[Reddit Community](https://www.reddit.com/r/hertzbeat/)
-
 [Follow Us Twitter](https://x.com/hertzbeat1024)

 [Subscribe YouTube](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)
@@ -10,7 +10,6 @@
 </p>

 [![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr)
-[![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/)
 [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://x.com/hertzbeat1024)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139)
 [![codecov](https://codecov.io/gh/apache/HertzBeat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/hertzbeat)
@@ -20,13 +19,13 @@
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod&color=green)](https://gitpod.io/#https://github.com/apache/hertzbeat)


-**官网: [hertzbeat.apache.org](https://hertzbeat.apache.org)**    
+**官网: [hertzbeat.apache.org](https://hertzbeat.apache.org)**
 **邮件: <a href="mailto:dev-subscribe@hertzbeat.apache.org">发送至 ```dev-subscribe@hertzbeat.apache.org```</a>** 订阅邮件列表


 ## 🎡 <font color="green">介绍</font>

-[Apache HertzBeat™](https://github.com/apache/hertzbeat) 是 AI 驱动的下一代开源实时观测系统。指标日志统一收集，告警一站分发，智能管控分析。无需 Agent，高性能集群，提供强大的自定义监控和状态页构建能力。     
+[Apache HertzBeat™](https://github.com/apache/hertzbeat) 是 AI 驱动的下一代开源实时观测系统。指标日志统一收集，告警一站分发，智能管控分析。无需 Agent，高性能集群，提供强大的自定义监控和状态页构建能力。

 ### 特点

@@ -40,70 +39,26 @@
 - 提供强大的状态页构建能力，轻松向用户传达您产品服务的实时状态。


-> `HertzBeat`的统一平台，AI智能，强大自定义，多类型支持，高性能，易扩展，希望能帮助用户快速方便实现观测需求。    
+> `HertzBeat`的统一平台，AI智能，强大自定义，多类型支持，高性能，易扩展，希望能帮助用户快速方便实现观测需求。

 ----

 ----

-## 🥐 模块  
+## 🥐 模块

-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)      
+![hertzBeat](home/static/img/docs/hertzbeat-arch.png)

-## ⛄ 已支持    
+## 🐕 快速开始

-> 我们将监控采集类型（mysql,jvm,k8s）都定义为 `yml` 模板，用户可以导入这些模板来支持对应类型的监控!    
-> 欢迎大家一起贡献你使用过程中自定义的通用指标模板。
-
- [Website](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-website.yml), [Port Telnet](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-port.yml),
-  [Http Api](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-api.yml), [Ping Connect](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ping.yml),
-  [Jvm](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-jvm.yml), [SiteMap](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-fullsite.yml),
-  [Ssl Certificate](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ssl_cert.yml), [SpringBoot2](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-springboot2.yml),
-  [FTP Server](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ftp.yml), [SpringBoot3](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-springboot3.yml),
-  [Udp Port](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-udp_port.yml), [Dns](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dns.yml),
-  [Pop3](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-pop3.yml), [Ntp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ntp.yml),
-  [Api Code](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-api_code.yml), [Smtp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-smtp.yml),
-  [Nginx](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-nginx.yml)
- [Mysql](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mysql.yml), [PostgreSQL](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-postgresql.yml),
-  [MariaDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mariadb.yml), [Redis](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis.yml),
-  [ElasticSearch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-elasticsearch.yml), [SqlServer](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-sqlserver.yml),
-  [Oracle](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-oracle.yml), [MongoDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mongodb.yml),
-  [DM](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dm.yml), [OpenGauss](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-opengauss.yml),
-  [ClickHouse](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-clickhouse.yml), [IoTDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-iotdb.yml),
-  [Redis Cluster](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis_cluster.yml), [Redis Sentinel](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis_sentinel.yml)
-  [Doris BE](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-doris_be.yml), [Doris FE](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-doris_fe.yml),
-  [Memcached](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-memcached.yml), [NebulaGraph](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-nebula_graph.yml)
- [Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-linux.yml), [Ubuntu](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ubuntu.yml),
-  [CentOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-centos.yml), [Windows](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-windows.yml),
-  [EulerOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-euleros.yml), [Fedora CoreOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-coreos.yml),
-  [OpenSUSE](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-opensuse.yml), [Rocky Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-rockylinux.yml),
-  [Red Hat](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redhat.yml), [FreeBSD](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-freebsd.yml),
-  [AlmaLinux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-almalinux.yml), [Debian Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-debian.yml)
- [Tomcat](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-tomcat.yml), [Nacos](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-nacos.yml),
-  [Zookeeper](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-zookeeper.yml), [RabbitMQ](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-rabbitmq.yml),
-  [Flink](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-flink.yml), [Kafka](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-kafka.yml),
-  [ShenYu](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-shenyu.yml), [DynamicTp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dynamic_tp.yml),
-  [Jetty](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-jetty.yml), [ActiveMQ](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-activemq.yml),
-  [Spring Gateway](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-spring_gateway.yml), [EMQX MQTT](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-emqx.yml),
-  [AirFlow](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-airflow.yml), [Hive](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hive.yml),
-  [Spark](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-spark.yml), [Hadoop](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hadoop.yml)
- [Kubernetes](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-kubernetes.yml), [Docker](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-docker.yml)
- [CiscoSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-cisco_switch.yml), [HpeSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hpe_switch.yml),
-  [HuaweiSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-huawei_switch.yml), [TpLinkSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-tplink_switch.yml),
-  [H3cSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-h3c_switch.yml)
- 和更多自定义指标模板。
- 通知支持 `Discord` `Slack` `Telegram` `邮件` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱`。
-
-## 🐕 快速开始  
-
- 如果您是想将 HertzBeat 部署到内网环境搭建监控系统，请参考下面的部署文档进行操作。  
+- 如果您是想将 HertzBeat 部署到内网环境搭建监控系统，请参考下面的部署文档进行操作。

 ### 🍞 HertzBeat 安装
 > HertzBeat 支持通过源码安装启动，Docker 容器运行和安装包方式安装部署，CPU 架构支持 x86/arm64。

-##### 方式一：Docker 方式快速安装  
+##### 方式一：Docker 方式快速安装

-1. `docker` 环境仅需一条命令即可开始     
+1. `docker` 环境仅需一条命令即可开始

   ```shell
   docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat
@@ -127,12 +82,12 @@

 ##### 方式二：通过安装包安装

-1. 下载您系统环境对应的安装包 `hertzbeat-xx.tar.gz` [Download](https://hertzbeat.apache.org/docs/download)
+1. 下载您系统环境对应的安装包 `apache-hertzbeat-xx-bin.tar.gz` [Download](https://hertzbeat.apache.org/docs/download)
 2. 配置 HertzBeat 的配置文件 `hertzbeat/config/application.yml` (可选)
 3. 部署启动 `$ ./bin/startup.sh ` 或 `bin/startup.bat`
 4. 浏览器访问 `http://localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat`
 5. 部署采集器集群（可选）
-   - 下载采集器安装包 `hertzbeat-collector-xx.tar.gz` 到规划的另一台部署主机上 [Download](https://hertzbeat.apache.org/docs/download)
+   - 下载采集器安装包 `apache-hertzbeat-collector-xx-bin.tar.gz`（JVM 采集器）或与你目标平台匹配的 Native 采集器安装包，例如 `apache-hertzbeat-collector-native-xx-linux-amd64-bin.tar.gz`、`apache-hertzbeat-collector-native-xx-windows-amd64-bin.zip`，到规划的另一台部署主机上 [Download](https://hertzbeat.apache.org/docs/download)
   - 配置采集器的配置文件 `hertzbeat-collector/config/application.yml` 里面的连接主 HertzBeat 服务的对外 IP，端口，当前采集器名称(需保证唯一性)等参数 `identity` `mode` (public or private) `manager-host` `manager-port`
     ```yaml
     collector:
@@ -145,16 +100,18 @@
             manager-host: ${MANAGER_HOST:127.0.0.1}
             manager-port: ${MANAGER_PORT:1158}
     ```
-   - 启动 `$ ./bin/startup.sh ` 或 `bin/startup.bat`
+   - 如果没有在 `ext-lib` 中提供 JDBC 驱动，MySQL、MariaDB、OceanBase 可以直接使用内置查询引擎，也可以使用 Native 采集器安装包；TiDB 的 SQL 查询指标也遵循同样规则。
+   - 如果在 `ext-lib` 中放入了 `mysql-connector-j`，主程序内置采集器或 JVM 采集器会在重启后自动优先走 JDBC；这一点现在适用于 MySQL、MariaDB、OceanBase，TiDB 的 SQL 查询指标也遵循同样规则，而它的 HTTP 指标不受影响。Oracle、DB2 仍然必须使用 JVM 采集器安装包，因为它们依赖外置 JDBC 驱动。
+   - JVM 采集器安装包使用 `$ ./bin/startup.sh ` 或 `bin/startup.bat` 启动。Linux 或 macOS 的 Native 采集器安装包使用 `$ ./bin/startup.sh ` 启动，Windows 的 Native 采集器安装包使用 `bin\\startup.bat` 启动
   - 浏览器访问主 HertzBeat 服务 `http://localhost:1157` 查看概览页面即可看到注册上来的新采集器

 更多配置详细步骤参考 [通过安装包安装HertzBeat](https://hertzbeat.apache.org/docs/start/package-deploy)

 ##### 方式三：本地代码启动

-1. 此为前后端分离项目，本地代码调试需要分别启动后端工程 `manager` 和前端工程 `web-app`
-2. 后端：需要 `maven3+`, `java17` 和 `lombok` 环境，修改 `YML` 配置信息，添加JVM参数`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`后启动 `manager` 服务即可。
-3. 前端：需要 `nodejs npm angular-cli`环境，待本地后端启动后，在 `web-app` 目录下启动 `ng serve --open`
+1. 此为前后端分离项目，本地代码调试需要分别启动后端工程 `hertzbeat-startup` 和前端工程 `web-app`
+2. 后端：需要 `maven3+`, `java25` 和 `lombok` 环境，修改 `YML` 配置信息，添加JVM参数`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`后启动 `hertzbeat-startup` 服务即可。
+3. 前端：需要 `nodejs` 和 `pnpm` 环境，待本地后端启动后，在 `web-app` 目录下执行 `pnpm install` 再执行 `pnpm start`
 4. 浏览器访问 `http://localhost:4200` 即可开始，默认账号密码 `admin/hertzbeat`

 详细步骤参考 [参与贡献之本地代码启动](CONTRIBUTING.md)
@@ -163,7 +120,7 @@

 通过 [Docker-Compose 部署脚本](script/docker-compose) 一次性把 postgresql/mysql 数据库, victoria-metrics/iotdb/tdengine 时序数据库和 hertzbeat 安装部署。

-详细步骤参考 [通过 Docker-Compose 安装 HertzBeat](script/docker-compose/README.md)  
+详细步骤参考 [通过 Docker-Compose 安装 HertzBeat](script/docker-compose/README.md)

 ##### 方式五：Kubernetes Helm Charts 部署 hertzbeat+collector+postgresql+tsdb

@@ -175,8 +132,8 @@

 ## ✨ Contributors

-Thanks these wonderful people, welcome to join us:   
-[贡献者指南](CONTRIBUTING.md)    
+Thanks these wonderful people, welcome to join us:
+[贡献者指南](CONTRIBUTING.md)

 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
@@ -522,7 +479,7 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yy549159265"><img src="https://avatars.githubusercontent.com/u/40821310?v=4?s=100" width="100px;" alt="yy549159265"/><br /><sub><b>yy549159265</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Tests">⚠️</a> <a href="#design-yy549159265" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cto-huhang"><img src="https://avatars.githubusercontent.com/u/53338629?v=4?s=100" width="100px;" alt="cto-huhang"/><br /><sub><b>cto-huhang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cto-huhang" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/delei"><img src="https://avatars.githubusercontent.com/u/17263766?v=4?s=100" width="100px;" alt="DeleiGuo"/><br /><sub><b>DeleiGuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Adelei" title="Bug reports">🐛</a></td>
    </tr>
    <tr>
@@ -540,6 +497,41 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jetiaime"><img src="https://avatars.githubusercontent.com/u/93769000?v=4?s=100" width="100px;" alt="TeAmo"/><br /><sub><b>TeAmo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jetiaime" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pentium100"><img src="https://avatars.githubusercontent.com/u/27917?v=4?s=100" width="100px;" alt="pentium100"/><br /><sub><b>pentium100</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pentium100" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dedyks"><img src="https://avatars.githubusercontent.com/u/23741665?v=4?s=100" width="100px;" alt="Dedy Kurniawan Santoso"/><br /><sub><b>Dedy Kurniawan Santoso</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dedyks" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOYR"><img src="https://avatars.githubusercontent.com/u/53216619?v=4?s=100" width="100px;" alt="KOYR"/><br /><sub><b>KOYR</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KOYR" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lathika226"><img src="https://avatars.githubusercontent.com/u/178710568?v=4?s=100" width="100px;" alt="LathikaBaddam"/><br /><sub><b>LathikaBaddam</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Lathika226" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://shadwal.space/"><img src="https://avatars.githubusercontent.com/u/119167601?v=4?s=100" width="100px;" alt="Sahil Shadwal"/><br /><sub><b>Sahil Shadwal</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Sahil-Shadwal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BhanuNidumolu"><img src="https://avatars.githubusercontent.com/u/180380413?v=4?s=100" width="100px;" alt="N.Bhanu Prasad"/><br /><sub><b>N.Bhanu Prasad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=BhanuNidumolu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://prakashh-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/183058331?v=4?s=100" width="100px;" alt="Prakash Kumar"/><br /><sub><b>Prakash Kumar</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Prakash1185" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/orangeCatDeveloper"><img src="https://avatars.githubusercontent.com/u/95899648?v=4?s=100" width="100px;" alt="NekoPunch"/><br /><sub><b>NekoPunch</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=orangeCatDeveloper" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=orangeCatDeveloper" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://wy471x.github.io/"><img src="https://avatars.githubusercontent.com/u/52033069?v=4?s=100" width="100px;" alt="wy471x"/><br /><sub><b>wy471x</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wy471x" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hengyuss"><img src="https://avatars.githubusercontent.com/u/81064732?v=4?s=100" width="100px;" alt="hengyuss"/><br /><sub><b>hengyuss</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hengyuss" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://moduvoice.com/"><img src="https://avatars.githubusercontent.com/u/291867022?v=4?s=100" width="100px;" alt="moduvoice"/><br /><sub><b>moduvoice</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=moduvoice" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hutiefang76"><img src="https://avatars.githubusercontent.com/u/137664623?v=4?s=100" width="100px;" alt="hutiefang76"/><br /><sub><b>hutiefang76</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hutiefang76" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://zylatent.com/"><img src="https://avatars.githubusercontent.com/u/250777154?v=4?s=100" width="100px;" alt="柳含知 Liu Hanzhi"/><br /><sub><b>柳含知 Liu Hanzhi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZhouYinLong-lab" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/wilmerdooley"><img src="https://avatars.githubusercontent.com/u/259930736?v=4?s=100" width="100px;" alt="wilmerdooley"/><br /><sub><b>wilmerdooley</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wilmerdooley" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zmjjeff7"><img src="https://avatars.githubusercontent.com/u/175370943?v=4?s=100" width="100px;" alt="Zhenhong Guo"/><br /><sub><b>Zhenhong Guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Zmjjeff7" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/abhyudayareddy"><img src="https://avatars.githubusercontent.com/u/54602866?v=4?s=100" width="100px;" alt="abhyudayareddy"/><br /><sub><b>abhyudayareddy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=abhyudayareddy" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/neon-hippo"><img src="https://avatars.githubusercontent.com/u/165560498?v=4?s=100" width="100px;" alt="neon-hippo"/><br /><sub><b>neon-hippo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=neon-hippo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/P-Peaceful"><img src="https://avatars.githubusercontent.com/u/52856161?v=4?s=100" width="100px;" alt="P_Peaceful"/><br /><sub><b>P_Peaceful</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=P-Peaceful" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=P-Peaceful" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhusaidong"><img src="https://avatars.githubusercontent.com/u/3039961?v=4?s=100" width="100px;" alt="zhusaidong"/><br /><sub><b>zhusaidong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhusaidong" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhehenlu"><img src="https://avatars.githubusercontent.com/u/31504542?v=4?s=100" width="100px;" alt="zhlu"/><br /><sub><b>zhlu</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhehenlu" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=zhehenlu" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/brettgervasoni"><img src="https://avatars.githubusercontent.com/u/34056000?v=4?s=100" width="100px;" alt="brettgervasoni"/><br /><sub><b>brettgervasoni</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=brettgervasoni" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Darshan-paul"><img src="https://avatars.githubusercontent.com/u/211450705?v=4?s=100" width="100px;" alt="Darshan-paul"/><br /><sub><b>Darshan-paul</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Darshan-paul" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/04cb"><img src="https://avatars.githubusercontent.com/u/111667698?v=4?s=100" width="100px;" alt="layla"/><br /><sub><b>layla</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=04cb" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/miantalha45"><img src="https://avatars.githubusercontent.com/u/155809113?v=4?s=100" width="100px;" alt="Talha Amjad"/><br /><sub><b>Talha Amjad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=miantalha45" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://turanalmammadov.com/"><img src="https://avatars.githubusercontent.com/u/16321061?v=4?s=100" width="100px;" alt="Turan Almammadov"/><br /><sub><b>Turan Almammadov</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=turanalmammadov" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=turanalmammadov" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhaoyangplus"><img src="https://avatars.githubusercontent.com/u/245090302?v=4?s=100" width="100px;" alt="zhaoyangplus"/><br /><sub><b>zhaoyangplus</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhaoyangplus" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yexuanyang"><img src="https://avatars.githubusercontent.com/u/73885401?v=4?s=100" width="100px;" alt="Yang Yexuan"/><br /><sub><b>Yang Yexuan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yexuanyang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/markguo123"><img src="https://avatars.githubusercontent.com/u/155072651?v=4?s=100" width="100px;" alt="markguo123"/><br /><sub><b>markguo123</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=markguo123" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/leo-934"><img src="https://avatars.githubusercontent.com/u/55838224?v=4?s=100" width="100px;" alt="leo"/><br /><sub><b>leo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=leo-934" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=leo-934" title="Documentation">📖</a> <a href="#blog-leo-934" title="Blogposts">📝</a></td>
    </tr>
  </tbody>
 </table>
@@ -547,11 +539,11 @@ Thanks these wonderful people, welcome to join us:
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->

-<!-- ALL-CONTRIBUTORS-LIST:END -->  
+<!-- ALL-CONTRIBUTORS-LIST:END -->

 ## 💬 社区交流

-##### Channel 
+##### Channel

 [订阅邮件列表](https://lists.apache.org/list.html?dev@hertzbeat.apache.org) : 发送邮件至 `dev-subscribe@hertzbeat.apache.org` 来订阅邮件列表.

@@ -561,12 +553,8 @@ Thanks these wonderful people, welcome to join us:

 微信公众号 : 搜索 ID `usthecom`.

-[QQ交流群](https://qm.qq.com/q/xxqecSC2cw) : 群号 `1035688434`
-
 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

-[Reddit Community](https://www.reddit.com/r/hertzbeat/)
-
 [Follow Us Twitter](https://x.com/hertzbeat1024)

 [Subscribe YouTube](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)
@@ -7,10 +7,9 @@
 <p align="center">
 <b>Readme</b>:
 <a href="README.md">English</a> | <a href="README_CN.md">中文</a> | <b><a href="README_JP.md">日本語</a></b>
-</p>  
+</p>

 [![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr)
-[![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/)
 [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://x.com/hertzbeat1024)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139)
 [![codecov](https://codecov.io/gh/apache/HertzBeat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/hertzbeat)
@@ -20,13 +19,13 @@
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod&color=green)](https://gitpod.io/#https://github.com/apache/hertzbeat)


-**公式サイト: [hertzbeat.apache.org](https://hertzbeat.apache.org)**    
+**公式サイト: [hertzbeat.apache.org](https://hertzbeat.apache.org)**
 **メール:**　メーリングリストに登録するために、<a href="mailto:dev-subscribe@hertzbeat.apache.org">dev-subscribe@hertzbeat.apache.org</a>にメールを送ってください。


 ## 🎡 <font color="green">紹介</font>

-[Apache HertzBeat™](https://github.com/apache/hertzbeat) は AI 駆動の次世代オープンソースリアルタイム観測システムです。メトリクスとログの統一収集、アラートの一元配信、インテリジェント管理分析。エージェント不要、高性能クラスタ、強力なカスタム監視とステータスページ構築機能を提供します。     
+[Apache HertzBeat™](https://github.com/apache/hertzbeat) は AI 駆動の次世代オープンソースリアルタイム観測システムです。メトリクスとログの統一収集、アラートの一元配信、インテリジェント管理分析。エージェント不要、高性能クラスタ、強力なカスタム監視とステータスページ構築機能を提供します。

 ### 特性

@@ -39,61 +38,17 @@
 - 高性能で、コレクタークラスタの水平拡張、マルチ分離ネットワーク監視、クラウドエッジ協調をサポート。
 - 強力なステータスページ構築機能を提供し、サービスのリアルタイムステータスをユーザーに簡単に伝達。

-> `HertzBeat`の統一プラットフォーム、AI インテリジェンス、強力なカスタマイズ、多種類サポート、高性能、容易な拡張性は、ユーザーが迅速かつ便利に観測要件を実現することを支援することを目的としています。    
+> `HertzBeat`の統一プラットフォーム、AI インテリジェンス、強力なカスタマイズ、多種類サポート、高性能、容易な拡張性は、ユーザーが迅速かつ便利に観測要件を実現することを支援することを目的としています。

 ----

 ----

-## 🥐 モジュール  
+## 🥐 モジュール

-![hertzBeat](home/static/img/docs/hertzbeat-arch.png)      
+![hertzBeat](home/static/img/docs/hertzbeat-arch.png)

-## ⛄ 利用可能    
-
-> `mysql`、`Java仮想マシン`、`k8s` などのすべての監視コレクション タイプを `YML` 監視テンプレートとして定義し、ユーザーがそれらをインポートして対応するタイプの監視をサポートできるようにしています。 
-> カスタマイズされた一般的なモニターのテンプレートを提供することを歓迎します。
-
- [Website](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-website.yml), [Port Telnet](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-port.yml),
-  [Http Api](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-api.yml), [Ping Connect](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ping.yml),
-  [Jvm](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-jvm.yml), [SiteMap](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-fullsite.yml),
-  [Ssl Certificate](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ssl_cert.yml), [SpringBoot2](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-springboot2.yml),
-  [FTP Server](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ftp.yml), [SpringBoot3](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-springboot3.yml),
-  [Udp Port](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-udp_port.yml), [Dns](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dns.yml),
-  [Pop3](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-pop3.yml), [Ntp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ntp.yml),
-  [Api Code](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-api_code.yml), [Smtp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-smtp.yml),
-  [Nginx](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-nginx.yml)
- [Mysql](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mysql.yml), [PostgreSQL](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-postgresql.yml),
-  [MariaDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mariadb.yml), [Redis](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis.yml),
-  [ElasticSearch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-elasticsearch.yml), [SqlServer](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-sqlserver.yml),
-  [Oracle](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-oracle.yml), [MongoDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-mongodb.yml),
-  [DM](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dm.yml), [OpenGauss](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-opengauss.yml),
-  [ClickHouse](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-clickhouse.yml), [IoTDB](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-iotdb.yml),
-  [Redis Cluster](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis_cluster.yml), [Redis Sentinel](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redis_sentinel.yml)
-  [Doris BE](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-doris_be.yml), [Doris FE](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-doris_fe.yml),
-  [Memcached](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-memcached.yml), [NebulaGraph](https://github.com/apache/hertzbeat/blob/master/hertzbeat-manager/src/main/resources/define/app-nebula_graph.yml)
- [Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-linux.yml), [Ubuntu](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ubuntu.yml),
-  [CentOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-centos.yml), [Windows](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-windows.yml),
-  [EulerOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-euleros.yml), [Fedora CoreOS](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-coreos.yml),
-  [OpenSUSE](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-opensuse.yml), [Rocky Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-rockylinux.yml),
-  [Red Hat](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-redhat.yml), [FreeBSD](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-freebsd.yml),
-  [AlmaLinux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-almalinux.yml), [Debian Linux](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-debian.yml)
- [Tomcat](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-tomcat.yml), [Nacos](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-nacos.yml),
-  [Zookeeper](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-zookeeper.yml), [RabbitMQ](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-rabbitmq.yml),
-  [Flink](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-flink.yml), [Kafka](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-kafka.yml),
-  [ShenYu](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-shenyu.yml), [DynamicTp](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-dynamic_tp.yml),
-  [Jetty](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-jetty.yml), [ActiveMQ](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-activemq.yml),
-  [Spring Gateway](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-spring_gateway.yml), [EMQX MQTT](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-emqx.yml),
-  [AirFlow](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-airflow.yml), [Hive](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hive.yml),
-  [Spark](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-spark.yml), [Hadoop](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hadoop.yml)
- [Kubernetes](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-kubernetes.yml), [Docker](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-docker.yml)
- [CiscoSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-cisco_switch.yml), [HpeSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hpe_switch.yml),
-  [HuaweiSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-huawei_switch.yml), [TpLinkSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-tplink_switch.yml),
-  [H3cSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-h3c_switch.yml)
- その他、カスタマイズされたモニターテンプレート。
- 通知利用可能 `Discord` `Slack` `Telegram` `Email` `Dingtalk` `WeChat` `FeiShu` `Webhook` `SMS` `ServerChan`。
-
-## 🐕 クイックスタート  
+## 🐕 クイックスタート

 - HertzBeat をローカルに展開する場合は、以下のデプロイメントドキュメントを参照してください。

@@ -102,13 +57,13 @@

 ##### 方式１：Docker

-1. `docker` で以下の指令を実行します： 
+1. `docker` で以下の指令を実行します：

   ```shell
   docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat
   ```

-2. スタート：`http://localhost:4200`にアクセスします。デフォルトのアカウントとパスワード：`admin/hertzbeat`。
+2. スタート：`http://localhost:1157`にアクセスします。デフォルトのアカウントとパスワード：`admin/hertzbeat`。

 3. コレクタークラスタのデプロイメント（オプション）

@@ -122,17 +77,17 @@
    - `-e MANAGER_PORT=1158` ：メインhertzbeatサーバポート。


-詳細ステップ [通过 Docker 方式安装 HertzBeat](https://hertzbeat.apache.org/docs/start/docker-deploy)
+詳細ステップ [Dockerで HertzBeat をインストール](https://hertzbeat.apache.org/docs/start/docker-deploy)

 ##### 方式２：インストールパッケージ

-1. リリースパッケージをダウンロード `hertzbeat-xx.tar.gz` [Download](https://hertzbeat.apache.org/docs/download)
-2. HertzBeatのymlファイルを設定 `hertzbeat/config/application.yml` （オプション）
-3. コマンド`$ ./bin/startup.sh`または`bin/startup.bat`を実行
-4. スタート：`http://localhost:4200`にアクセスします。デフォルトのアカウントとパスワード：`admin/hertzbeat`
+1. リリースパッケージ `apache-hertzbeat-xx-bin.tar.gz` をダウンロードします [Download](https://hertzbeat.apache.org/docs/download)
+2. HertzBeat の設定ファイル `hertzbeat/config/application.yml` を編集します（任意）
+3. コマンド `$ ./bin/startup.sh` または `bin/startup.bat` を実行します
+4. ブラウザで `http://localhost:1157` にアクセスします。デフォルトのアカウントとパスワードは `admin/hertzbeat` です
 5. コレクタークラスタのデプロイメント（オプション）
-   - コレクターパッケージを別のホストにダウンロード `hertzbeat-collector-xx.tar.gz` [Download](https://hertzbeat.apache.org/docs/download)
-   - コレクターのymlファイルを設定 `hertzbeat-collector/config/application.yml`
+   - 別ホストにコレクターのインストールパッケージ `apache-hertzbeat-collector-xx-bin.tar.gz`（JVM コレクター）または対象プラットフォーム向けの Native コレクターパッケージ（例: `apache-hertzbeat-collector-native-xx-linux-amd64-bin.tar.gz`、`apache-hertzbeat-collector-native-xx-windows-amd64-bin.zip`）をダウンロードします [Download](https://hertzbeat.apache.org/docs/download)
+   - コレクターの設定ファイル `hertzbeat-collector/config/application.yml` を編集します
     ```yaml
     collector:
       dispatch:
@@ -148,25 +103,27 @@
     - `mode: ${MODE:public}`：実行モード(パブリッククラスタまたはプライベートクラウドエッジ)。
     - `manager-host: ${MANAGER_HOST:127.0.0.1}`：メインhertzbeatサーバーのIP。
     - `manager-port: ${MANAGER_PORT:1158}`：メインhertzbeatサーバポート。
-   - コマンド`$ ./bin/startup.sh`または`bin/startup.bat`を実行。
-   - `http://localhost:1157`にアクセスし、登録された新しいコレクターを見ることがでます。
+   - `ext-lib` に JDBC ドライバーを置かない場合、MySQL、MariaDB、OceanBase は組み込みのクエリエンジンを使って Native コレクターパッケージでも監視できます。TiDB も SQL クエリのメトリクスセットについては同じルールです。
+   - `ext-lib` に `mysql-connector-j` を置いた場合は、再起動後に組み込みサーバーコレクターまたは JVM コレクターが MySQL、MariaDB、OceanBase で自動的に JDBC を優先します。TiDB も SQL クエリのメトリクスセットについては同じルールで、HTTP メトリクスは影響を受けません。Oracle と DB2 は引き続き外部 JDBC ドライバーに依存するため、JVM コレクターパッケージを使用してください。
+   - JVM コレクターのインストールパッケージは `$ ./bin/startup.sh` または `bin/startup.bat`、Linux/macOS の Native コレクターパッケージは `$ ./bin/startup.sh`、Windows の Native コレクターパッケージは `bin\\startup.bat` で起動します。
+   - メインの HertzBeat サービス `http://localhost:1157` にアクセスすると、登録された新しいコレクターを確認できます。

-詳細ステップ [通过安装包安装HertzBeat](https://hertzbeat.apache.org/docs/start/package-deploy)
+詳細ステップ [インストールパッケージで HertzBeat をインストール](https://hertzbeat.apache.org/docs/start/package-deploy)

 ##### 方式３：ローカルの実行

-1. ローカルの実行には、バックエンドのプロジェクト`manager`とフロントエンドのプロジェクト`web-app`を起動する必要があります。
-2. バックエンド：`maven3+`、`java17`と`lombok`の環境は必要です。`YML` 設定を修正し、Java仮想マシンパラメータに`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` を追加し、`manager` を起動します。
-3. フロントエンド：`nodejs npm angular-cli`の環境は必要です。ローカルのバックエンドが立ち上がったら、`web-app` ディレクトリで `ng serve --open` というコマンドを実行します。
+1. ローカルの実行には、バックエンドのプロジェクト`hertzbeat-startup`とフロントエンドのプロジェクト`web-app`を起動する必要があります。
+2. バックエンド：`maven3+`、`Java25`、`lombok` の環境が必要です。`YML` 設定を修正し、Java 仮想マシンパラメータに `--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` を追加して `hertzbeat-startup` を起動します。
+3. フロントエンド：`nodejs` と `pnpm` の環境が必要です。ローカルのバックエンドが立ち上がったら、`web-app` ディレクトリで `pnpm install` を実行し、続けて `pnpm start` を実行します。
 4. スタート：`http://localhost:4200`にアクセスします。デフォルトのアカウントとパスワード：`admin/hertzbeat`。

 詳細ステップ [貢献ガイド](CONTRIBUTING.md)

 ##### 方式４：Docker-Compose

-[Docker-Compose 部署脚本](script/docker-compose)でpostgresql/mysqlデータベース、victoria-metrics、iotdb、またはtdengine時系列データベースとHertzbeat一括デプロイ。
+[Docker-Compose 部署脚本](script/docker-compose)でpostgresql/mysqlデータベース、victoria-metrics、iotdb、またはtdengine時系列データベースとHertzBeat一括デプロイ。

-詳細ステップ [通过 Docker-Compose 安装 HertzBeat](script/docker-compose/README.md)  
+詳細ステップ [Docker-Compose で HertzBeat をインストール](script/docker-compose/README.md)

 ##### 方式５：Kubernetes Helm Charts

@@ -178,8 +135,8 @@ Helm ChartでHertzBeatクラスタコンポーネントをKubernetesクラスタ

 ## ✨ Contributors

-Thanks these wonderful people, welcome to join us:   
-[貢献ガイド](CONTRIBUTING.md)    
+Thanks these wonderful people, welcome to join us:
+[貢献ガイド](CONTRIBUTING.md)

 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
@@ -525,7 +482,7 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yy549159265"><img src="https://avatars.githubusercontent.com/u/40821310?v=4?s=100" width="100px;" alt="yy549159265"/><br /><sub><b>yy549159265</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Tests">⚠️</a> <a href="#design-yy549159265" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cto-huhang"><img src="https://avatars.githubusercontent.com/u/53338629?v=4?s=100" width="100px;" alt="cto-huhang"/><br /><sub><b>cto-huhang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cto-huhang" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/delei"><img src="https://avatars.githubusercontent.com/u/17263766?v=4?s=100" width="100px;" alt="DeleiGuo"/><br /><sub><b>DeleiGuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Adelei" title="Bug reports">🐛</a></td>
    </tr>
    <tr>
@@ -543,6 +500,41 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jetiaime"><img src="https://avatars.githubusercontent.com/u/93769000?v=4?s=100" width="100px;" alt="TeAmo"/><br /><sub><b>TeAmo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jetiaime" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pentium100"><img src="https://avatars.githubusercontent.com/u/27917?v=4?s=100" width="100px;" alt="pentium100"/><br /><sub><b>pentium100</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pentium100" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dedyks"><img src="https://avatars.githubusercontent.com/u/23741665?v=4?s=100" width="100px;" alt="Dedy Kurniawan Santoso"/><br /><sub><b>Dedy Kurniawan Santoso</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dedyks" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOYR"><img src="https://avatars.githubusercontent.com/u/53216619?v=4?s=100" width="100px;" alt="KOYR"/><br /><sub><b>KOYR</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KOYR" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lathika226"><img src="https://avatars.githubusercontent.com/u/178710568?v=4?s=100" width="100px;" alt="LathikaBaddam"/><br /><sub><b>LathikaBaddam</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Lathika226" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://shadwal.space/"><img src="https://avatars.githubusercontent.com/u/119167601?v=4?s=100" width="100px;" alt="Sahil Shadwal"/><br /><sub><b>Sahil Shadwal</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Sahil-Shadwal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BhanuNidumolu"><img src="https://avatars.githubusercontent.com/u/180380413?v=4?s=100" width="100px;" alt="N.Bhanu Prasad"/><br /><sub><b>N.Bhanu Prasad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=BhanuNidumolu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://prakashh-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/183058331?v=4?s=100" width="100px;" alt="Prakash Kumar"/><br /><sub><b>Prakash Kumar</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Prakash1185" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/orangeCatDeveloper"><img src="https://avatars.githubusercontent.com/u/95899648?v=4?s=100" width="100px;" alt="NekoPunch"/><br /><sub><b>NekoPunch</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=orangeCatDeveloper" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=orangeCatDeveloper" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://wy471x.github.io/"><img src="https://avatars.githubusercontent.com/u/52033069?v=4?s=100" width="100px;" alt="wy471x"/><br /><sub><b>wy471x</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wy471x" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hengyuss"><img src="https://avatars.githubusercontent.com/u/81064732?v=4?s=100" width="100px;" alt="hengyuss"/><br /><sub><b>hengyuss</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hengyuss" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://moduvoice.com/"><img src="https://avatars.githubusercontent.com/u/291867022?v=4?s=100" width="100px;" alt="moduvoice"/><br /><sub><b>moduvoice</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=moduvoice" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hutiefang76"><img src="https://avatars.githubusercontent.com/u/137664623?v=4?s=100" width="100px;" alt="hutiefang76"/><br /><sub><b>hutiefang76</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hutiefang76" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://zylatent.com/"><img src="https://avatars.githubusercontent.com/u/250777154?v=4?s=100" width="100px;" alt="柳含知 Liu Hanzhi"/><br /><sub><b>柳含知 Liu Hanzhi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZhouYinLong-lab" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/wilmerdooley"><img src="https://avatars.githubusercontent.com/u/259930736?v=4?s=100" width="100px;" alt="wilmerdooley"/><br /><sub><b>wilmerdooley</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wilmerdooley" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zmjjeff7"><img src="https://avatars.githubusercontent.com/u/175370943?v=4?s=100" width="100px;" alt="Zhenhong Guo"/><br /><sub><b>Zhenhong Guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Zmjjeff7" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/abhyudayareddy"><img src="https://avatars.githubusercontent.com/u/54602866?v=4?s=100" width="100px;" alt="abhyudayareddy"/><br /><sub><b>abhyudayareddy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=abhyudayareddy" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/neon-hippo"><img src="https://avatars.githubusercontent.com/u/165560498?v=4?s=100" width="100px;" alt="neon-hippo"/><br /><sub><b>neon-hippo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=neon-hippo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/P-Peaceful"><img src="https://avatars.githubusercontent.com/u/52856161?v=4?s=100" width="100px;" alt="P_Peaceful"/><br /><sub><b>P_Peaceful</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=P-Peaceful" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=P-Peaceful" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhusaidong"><img src="https://avatars.githubusercontent.com/u/3039961?v=4?s=100" width="100px;" alt="zhusaidong"/><br /><sub><b>zhusaidong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhusaidong" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhehenlu"><img src="https://avatars.githubusercontent.com/u/31504542?v=4?s=100" width="100px;" alt="zhlu"/><br /><sub><b>zhlu</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhehenlu" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=zhehenlu" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/brettgervasoni"><img src="https://avatars.githubusercontent.com/u/34056000?v=4?s=100" width="100px;" alt="brettgervasoni"/><br /><sub><b>brettgervasoni</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=brettgervasoni" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Darshan-paul"><img src="https://avatars.githubusercontent.com/u/211450705?v=4?s=100" width="100px;" alt="Darshan-paul"/><br /><sub><b>Darshan-paul</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Darshan-paul" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/04cb"><img src="https://avatars.githubusercontent.com/u/111667698?v=4?s=100" width="100px;" alt="layla"/><br /><sub><b>layla</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=04cb" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/miantalha45"><img src="https://avatars.githubusercontent.com/u/155809113?v=4?s=100" width="100px;" alt="Talha Amjad"/><br /><sub><b>Talha Amjad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=miantalha45" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://turanalmammadov.com/"><img src="https://avatars.githubusercontent.com/u/16321061?v=4?s=100" width="100px;" alt="Turan Almammadov"/><br /><sub><b>Turan Almammadov</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=turanalmammadov" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=turanalmammadov" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhaoyangplus"><img src="https://avatars.githubusercontent.com/u/245090302?v=4?s=100" width="100px;" alt="zhaoyangplus"/><br /><sub><b>zhaoyangplus</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhaoyangplus" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yexuanyang"><img src="https://avatars.githubusercontent.com/u/73885401?v=4?s=100" width="100px;" alt="Yang Yexuan"/><br /><sub><b>Yang Yexuan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yexuanyang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/markguo123"><img src="https://avatars.githubusercontent.com/u/155072651?v=4?s=100" width="100px;" alt="markguo123"/><br /><sub><b>markguo123</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=markguo123" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/leo-934"><img src="https://avatars.githubusercontent.com/u/55838224?v=4?s=100" width="100px;" alt="leo"/><br /><sub><b>leo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=leo-934" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=leo-934" title="Documentation">📖</a> <a href="#blog-leo-934" title="Blogposts">📝</a></td>
    </tr>
  </tbody>
 </table>
@@ -550,7 +542,7 @@ Thanks these wonderful people, welcome to join us:
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->

-<!-- ALL-CONTRIBUTORS-LIST:END -->  
+<!-- ALL-CONTRIBUTORS-LIST:END -->

 ## 💬 コミュニティ交流

@@ -564,12 +556,8 @@ WeChatグループ : `ahertzbeat` を検索.

 WeChat公式アカウント : `usthecom`を検索.

-[QQグループ](https://qm.qq.com/q/xxqecSC2cw) : グループ番号　`1035688434`
-
 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

-[Reddit Community](https://www.reddit.com/r/hertzbeat/)
-
 [Follow Us Twitter](https://x.com/hertzbeat1024)

 [Subscribe YouTube](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)
@@ -1,14 +1,35 @@
 Please add the corresponding e2e (aka end-to-end) test cases if you add or update APIs.

 ## How to work
-* Start and watch the [docker-compose](https://docs.docker.com/compose/) via [the script](script/start.sh)
-* Run the e2e testing via [api-testing](https://github.com/LinuxSuRen/api-testing)
-  * It will run the test cases from top to bottom
-  * You can add the necessary asserts to it
+* Start and watch the [Docker Compose](https://docs.docker.com/compose/) environment
+  * The Compose file is `e2e/docker-compose.yml`
+  * The `testing` container uses [api-testing](https://github.com/LinuxSuRen/api-testing)
+  * The main test definition file is `e2e/testsuite.yaml`
+  * Before starting the suite locally, build the `apache/hertzbeat:test` image from the repository root:
+
+    ```bash
+    mvn clean -B package -Prelease -Dmaven.test.skip=true --file pom.xml
+    docker build -t apache/hertzbeat:test -f script/docker/server/Dockerfile ./dist
+    ```
+
+* Run the E2E tests via [api-testing](https://github.com/LinuxSuRen/api-testing)
+  * The test cases run from top to bottom
+  * You can add the necessary assertions there
+  * Test data files are under `e2e/data/`
+  * The test report is generated at `e2e/report/report.md`
+  * HertzBeat logs are written to `e2e/logs/`

 ## Run locally
-Please follow these steps if you want to run the e2e testing locally.
+Please follow these steps if you want to run the E2E tests locally.

-> Please make sure you have installed docker-compose v2
+> Please make sure that Docker Compose v2 is installed

-* Change the directory to `e2e`, then execute `./script/start.sh`
+* Build the local `apache/hertzbeat:test` image from the repository root
+* Change the directory to `e2e`, then run:
+
+  ```bash
+  docker compose up --exit-code-from testing --remove-orphans
+  ```
+
+* If your environment uses the standalone Compose binary, use `docker-compose` instead of `docker compose`
+* After the run, check `e2e/report/report.md` and `e2e/logs/` for the test result and runtime logs
@@ -5,7 +5,7 @@
      "intervals": 60,
      "tags": [],
      "app": "ftp",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
      "name": "{{.param.monitorFTP}}"
    },
    "params": [
@@ -5,7 +5,7 @@
    "intervals": 60,
    "tags": [],
    "app": "api",
-    "host": "127.0.0.1",
+    "instance": "127.0.0.1",
      "name": "{{.param.monitorHTTP}}"
  },
  "params": [
@@ -5,7 +5,7 @@
      "intervals": 60,
      "tags": [],
      "app": "ping",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
      "name": "{{.param.monitorPing}}"
    },
    "params": [
@@ -5,7 +5,7 @@
      "intervals": 60,
      "tags": [],
      "app": "port",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
      "name": "{{.param.monitorPort}}"
    },
    "params": [
@@ -5,7 +5,7 @@
      "intervals": 60,
      "tags": [],
      "app": "fullsite",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
      "name": "{{.param.monitorSiteMap}}"
    },
    "params": [
@@ -5,7 +5,7 @@
      "intervals": 60,
      "tags": [],
      "app": "ssl_cert",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
      "name": "{{.param.monitorSSL}}"
    },
    "params": [
@@ -5,7 +5,7 @@
      "intervals": 60,
      "tags": [],
      "app": "udp_port",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
      "name": "{{.param.monitorUDP}}"
    },
    "params": [
@@ -5,7 +5,7 @@
      "intervals": 60,
      "tags": [],
      "app": "website",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
      "name": "{{.param.monitorWebsite}}"
    },
    "params": [
@@ -18,7 +18,7 @@
 version: '3.8'
 services:
  testing:
-    image: ghcr.io/linuxsuren/api-testing:v0.0.17
+    image: ghcr.io/linuxsuren/api-testing:v0.0.19
    environment:
      SERVER: http://hertzbeat:1157
    container_name: e2e-testing
@@ -4,7 +4,7 @@
    "intervals": 10,
    "tags": [],
    "app": "kubernetes",
-    "host": "172.29.0.11",
+    "instance": "172.29.0.11",
    "name": "Brave_Stingray_55yR"
  },
  "collector": "",
@@ -29,6 +29,7 @@ param:
  monitorUDP: "{{randAlpha 6}}"
  monitorWebsite: "{{randAlpha 6}}"
  monitorFTP: "{{randAlpha 6}}"
+  apiTokenName: "e2e-token-{{randAlpha 6}}"
  labelName: "{{randAlpha 3}}"
 items:
 - name: login
@@ -69,6 +70,8 @@ items:
 - name: missing-auth-header
  request:
    api: /api/monitors
+    header:
+      Accept: application/json
  expect:
    statusCode: 401
 - name: createSitemapMonitor
@@ -385,6 +388,53 @@ items:
    header:
      Authorization: Bearer {{.login.data.token}}

+## API Token Management
+- name: generateApiToken
+  request:
+    api: /api/account/token/generate?name={{.apiTokenName}}&expireSeconds=-1
+    method: POST
+    header:
+      Authorization: Bearer {{.login.data.token}}
+  expect:
+    bodyFieldsExpect:
+      code: "0"
+- name: listApiTokens
+  request:
+    api: /api/account/token
+    header:
+      Authorization: Bearer {{.login.data.token}}
+  expect:
+    bodyFieldsExpect:
+      code: "0"
+      data.0.name: "{{.apiTokenName}}"
+      data.0.creator: "admin"
+- name: listApiTokensByGeneratedToken
+  request:
+    api: /api/account/token
+    header:
+      Authorization: Bearer {{.generateApiToken.data.token}}
+  expect:
+    bodyFieldsExpect:
+      code: "0"
+      data.0.name: "{{.apiTokenName}}"
+- name: useGeneratedTokenToCallApi
+  request:
+    api: /api/monitors?pageIndex=0&pageSize=8
+    header:
+      Authorization: Bearer {{.generateApiToken.data.token}}
+  expect:
+    bodyFieldsExpect:
+      code: "0"
+- name: deleteApiToken
+  request:
+    api: /api/account/token/{{(index .listApiTokens.data 0).id | int64}}
+    method: DELETE
+    header:
+      Authorization: Bearer {{.login.data.token}}
+  expect:
+    bodyFieldsExpect:
+      code: "0"
+
 ## Config
 - name: getConfigEmail
  request:
@@ -26,8 +26,8 @@
 	<artifactId>hertzbeat-ai</artifactId>
 	<version>${hertzbeat.version}</version>
 	<properties>
-		<spring-ai.version>1.0.3</spring-ai.version>
-		<java.version>17</java.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
+		<java.version>25</java.version>
 	</properties>

 	<dependencies>
@@ -59,7 +59,7 @@
        </dependency>
 		<dependency>
 			<groupId>org.apache.hertzbeat</groupId>
-			<artifactId>hertzbeat-common</artifactId>
+			<artifactId>hertzbeat-common-spring</artifactId>
 		</dependency>
        <!-- common -->
        <dependency>
@@ -78,6 +78,7 @@
 			<groupId>com.usthe.sureness</groupId>
 			<artifactId>spring-boot3-starter-sureness</artifactId>
 		</dependency>
+
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
@@ -1,246 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.ai.config;
-
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.usthe.sureness.mgt.SurenessSecurityManager;
-import com.usthe.sureness.subject.SubjectSum;
-import io.modelcontextprotocol.spec.McpError;
-import io.modelcontextprotocol.spec.McpSchema;
-import io.modelcontextprotocol.spec.McpServerSession;
-import io.modelcontextprotocol.spec.McpServerTransport;
-import io.modelcontextprotocol.spec.McpServerTransportProvider;
-import io.modelcontextprotocol.util.Assert;
-import java.io.IOException;
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.RouterFunctions;
-import org.springframework.web.servlet.function.ServerRequest;
-import org.springframework.web.servlet.function.ServerResponse;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Custom Server-Sent Events transport provider for Model Context Protocol.
- */
-@Slf4j
-public class CustomSseServerTransport implements McpServerTransportProvider {
-    private final ObjectMapper objectMapper;
-    private final String messageEndpoint;
-    private final String sseEndpoint;
-    private final String baseUrl;
-    @Getter
-    private final RouterFunction<ServerResponse> routerFunction;
-    @Setter
-    private McpServerSession.Factory sessionFactory;
-    private final Map<String, Object> sessionRequest = new HashMap<>();
-    private final ConcurrentHashMap<String, McpServerSession> sessions;
-    private volatile boolean isClosing;
-
-    public CustomSseServerTransport(ObjectMapper objectMapper, String messageEndpoint) {
-        this(objectMapper, messageEndpoint, "/sse");
-    }
-
-
-    public CustomSseServerTransport(ObjectMapper objectMapper, String messageEndpoint, String sseEndpoint) {
-        this(objectMapper, "", messageEndpoint, sseEndpoint);
-    }
-
-    public CustomSseServerTransport(ObjectMapper objectMapper, String baseUrl, String messageEndpoint, String sseEndpoint) {
-        this.sessions = new ConcurrentHashMap();
-        this.isClosing = false;
-        Assert.notNull(objectMapper, "ObjectMapper must not be null");
-        Assert.notNull(baseUrl, "Message base URL must not be null");
-        Assert.notNull(messageEndpoint, "Message endpoint must not be null");
-        Assert.notNull(sseEndpoint, "SSE endpoint must not be null");
-        this.objectMapper = objectMapper;
-        this.baseUrl = baseUrl;
-        this.messageEndpoint = messageEndpoint;
-        this.sseEndpoint = sseEndpoint;
-        this.routerFunction = RouterFunctions.route().GET(this.sseEndpoint, this::handleSseConnection).POST(this.messageEndpoint, this::handleMessage).build();
-    }
-
-    public Mono<Void> notifyClients(String method, Object params) {
-        if (this.sessions.isEmpty()) {
-            log.debug("No active sessions to broadcast message to");
-            return Mono.empty();
-        } else {
-            log.debug("Attempting to broadcast message to {} active sessions", this.sessions.size());
-            return Flux.fromIterable(this.sessions.values())
-                    .flatMap((session) -> session.sendNotification(method, params)
-                            .doOnError((e) -> log.error("Failed to send message to session {}: {}", session.getId(), e.getMessage()))
-                            .onErrorComplete())
-                    .then();
-        }
-    }
-
-    public Mono<Void> closeGracefully() {
-        return Flux.fromIterable(this.sessions.values()).doFirst(() -> {
-            this.isClosing = true;
-            log.debug("Initiating graceful shutdown with {} active sessions", this.sessions.size());
-        }).flatMap(McpServerSession::closeGracefully).then().doOnSuccess((v) -> log.debug("Graceful shutdown completed"));
-    }
-
-    private ServerResponse handleSseConnection(ServerRequest request) {
-        log.debug("Handling SSE connection for request: {}", request);
-        HttpServletRequest servletRequest = request.servletRequest();
-
-        try {
-
-            log.debug("Processing SSE connection for servlet request: {}", servletRequest);
-            log.debug("Authorization header: {}", servletRequest.getHeader("Authorization"));
-
-
-        } catch (Exception e) {
-            log.error("Authentication failed for SSE connection: {}", e.getMessage());
-            return ServerResponse.status(HttpStatus.UNAUTHORIZED).body("Unauthorized: " + e.getMessage());
-        }
-
-
-
-        if (this.isClosing) {
-            return ServerResponse.status(HttpStatus.SERVICE_UNAVAILABLE).body("Server is shutting down");
-        } else {
-            String sessionId = UUID.randomUUID().toString();
-            log.debug("Generated session ID for SSE connection: {}", sessionId);
-            log.debug("Creating new SSE connection for session: {}", sessionId);
-
-
-            return ServerResponse.sse((sseBuilder) -> {
-                sseBuilder.onComplete(() -> {
-                    log.debug("SSE connection completed for session: {}", sessionId);
-                    this.sessions.remove(sessionId);
-                });
-                sseBuilder.onTimeout(() -> {
-                    log.debug("SSE connection timed out for session: {}", sessionId);
-                    this.sessions.remove(sessionId);
-                });
-                CustomSseServerTransport.WebMvcMcpSessionTransport sessionTransport = new CustomSseServerTransport.WebMvcMcpSessionTransport(sessionId, sseBuilder);
-                McpServerSession session = this.sessionFactory.create(sessionTransport);
-                this.sessionRequest.put(sessionId, request.servletRequest());
-                this.sessions.put(sessionId, session);
-
-                try {
-                    sseBuilder.id(sessionId).event("endpoint").data(this.baseUrl + this.messageEndpoint + "?sessionId=" + sessionId);
-                } catch (Exception e) {
-                    log.error("Failed to send initial endpoint event: {}", e.getMessage());
-                    sseBuilder.error(e);
-                }
-
-            }, Duration.ZERO);
-
-        }
-    }
-
-    private ServerResponse handleMessage(ServerRequest request) {
-        if (this.isClosing) {
-            return ServerResponse.status(HttpStatus.SERVICE_UNAVAILABLE).body("Server is shutting down");
-        } else if (request.param("sessionId").isEmpty()) {
-            return ServerResponse.badRequest().body(new McpError("Session ID missing in message endpoint"));
-        } else {
-            String sessionId = (String) request.param("sessionId").get();
-            McpServerSession session = (McpServerSession) this.sessions.get(sessionId);
-            log.debug("Authorization header for message request: {}", request.servletRequest().getHeader("Authorization"));
-            SubjectSum subject = SurenessSecurityManager.getInstance().checkIn(sessionRequest.get(sessionId));
-            McpContextHolder.setSubject(subject);
-
-
-            if (session == null) {
-                return ServerResponse.status(HttpStatus.NOT_FOUND).body(new McpError("Session not found: " + sessionId));
-            } else {
-                try {
-                    String body = request.body(String.class);
-                    McpSchema.JSONRPCMessage message = McpSchema.deserializeJsonRpcMessage(this.objectMapper, body);
-                    session.handle(message).block();
-                    return ServerResponse.ok().build();
-                } catch (IOException | IllegalArgumentException e) {
-                    log.error("Failed to deserialize message: {}", ((Exception) e).getMessage());
-                    return ServerResponse.badRequest().body(new McpError("Invalid message format"));
-                } catch (Exception e) {
-                    log.error("Error handling message: {}", e.getMessage());
-                    return ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new McpError(e.getMessage()));
-                }
-            }
-        }
-    }
-
-    private class WebMvcMcpSessionTransport implements McpServerTransport {
-        private final String sessionId;
-        private final ServerResponse.SseBuilder sseBuilder;
-
-        WebMvcMcpSessionTransport(String sessionId, ServerResponse.SseBuilder sseBuilder) {
-            this.sessionId = sessionId;
-            this.sseBuilder = sseBuilder;
-            log.debug("Session transport {} initialized with SSE builder", sessionId);
-        }
-
-        public Mono<Void> sendMessage(McpSchema.JSONRPCMessage message) {
-            return Mono.fromRunnable(() -> {
-                try {
-                    String jsonText = CustomSseServerTransport.this.objectMapper.writeValueAsString(message);
-                    this.sseBuilder.id(this.sessionId).event("message").data(jsonText);
-                    log.debug("Message sent to session {}", this.sessionId);
-                } catch (Exception e) {
-                    log.error("Failed to send message to session {}: {}", this.sessionId, e.getMessage());
-                    this.sseBuilder.error(e);
-                }
-
-            });
-        }
-
-        public <T> T unmarshalFrom(Object data, TypeReference<T> typeRef) {
-            return (T) CustomSseServerTransport.this.objectMapper.convertValue(data, typeRef);
-        }
-
-        public Mono<Void> closeGracefully() {
-            return Mono.fromRunnable(() -> {
-                log.debug("Closing session transport: {}", this.sessionId);
-
-                try {
-                    this.sseBuilder.complete();
-                    log.debug("Successfully completed SSE builder for session {}", this.sessionId);
-                } catch (Exception e) {
-                    log.warn("Failed to complete SSE builder for session {}: {}", this.sessionId, e.getMessage());
-                }
-
-            });
-        }
-
-        public void close() {
-            try {
-                this.sseBuilder.complete();
-                log.debug("Successfully completed SSE builder for session {}", this.sessionId);
-            } catch (Exception e) {
-                log.warn("Failed to complete SSE builder for session {}: {}", this.sessionId, e.getMessage());
-            }
-
-        }
-    }
-}
@@ -27,7 +27,6 @@ import org.apache.hertzbeat.common.util.JsonUtil;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.openai.OpenAiChatModel;
 import org.springframework.ai.openai.OpenAiChatOptions;
-import org.springframework.ai.openai.api.OpenAiApi;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -101,21 +100,17 @@ public class LlmConfig {
            }
        }

-        OpenAiApi.Builder builder = new OpenAiApi.Builder();
-        builder.baseUrl(modelProviderConfig.getBaseUrl());
-        builder.apiKey(modelProviderConfig.getApiKey());
-        builder.completionsPath("/chat/completions");
-        
-        // Create Chat Options
+        // Create Chat Options with baseUrl and apiKey
        OpenAiChatOptions openAiChatOptions = OpenAiChatOptions.builder()
+                .baseUrl(modelProviderConfig.getBaseUrl())
+                .apiKey(modelProviderConfig.getApiKey())
                .model(modelProviderConfig.getModel())
                .temperature(0.3)
                .build();
-        
+
        // Create Chat Model
        OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
-                .openAiApi(builder.build())
-                .defaultOptions(openAiChatOptions)
+                .options(openAiChatOptions)
                .build();
        
        // Create and return ChatClient
@@ -18,14 +18,21 @@
 package org.apache.hertzbeat.ai.config;

 import com.usthe.sureness.subject.SubjectSum;
-import org.springframework.core.NamedInheritableThreadLocal;
+import com.usthe.sureness.util.SurenessContextHolder;
+import java.util.Map;
+import java.util.function.Supplier;
+import org.springframework.ai.chat.model.ToolContext;
+import org.springframework.core.NamedThreadLocal;

 /**
 * Context holder for AI agent security context.
 */
 public final class McpContextHolder {
+
+    static final String SUBJECT_CONTEXT_KEY = McpContextHolder.class.getName() + ".subject";
+
    private static final ThreadLocal<SubjectSum> subjectHolder =
-            new NamedInheritableThreadLocal<>("MCP Security and User Identification Context");
+            new NamedThreadLocal<>("MCP Security and User Identification Context");

    private McpContextHolder() {}

@@ -33,8 +40,8 @@ public final class McpContextHolder {
     * Attaches the user's context to the current thread.
     */
    public static void setSubject(SubjectSum subject) {
-        subjectHolder.set(subject);

+        subjectHolder.set(subject);
    }

    /**
@@ -44,10 +51,73 @@ public final class McpContextHolder {
        return subjectHolder.get();
    }

+    /**
+     * Creates a security context that is propagated only through the Spring AI tool invocation chain.
+     *
+     * @param subject current authenticated subject, may be {@code null}
+     * @return tool context without null values
+     */
+    public static Map<String, Object> createToolContext(SubjectSum subject) {
+        return subject == null ? Map.of() : Map.of(SUBJECT_CONTEXT_KEY, subject);
+    }
+
+    /**
+     * Retrieves and validates the authenticated subject from the Spring AI tool context.
+     *
+     * @param toolContext Spring AI tool context
+     * @return authenticated subject, or {@code null} when absent
+     */
+    public static SubjectSum getSubject(ToolContext toolContext) {
+        if (toolContext == null) {
+            return null;
+        }
+        Object subject = toolContext.getContext().get(SUBJECT_CONTEXT_KEY);
+        return subject instanceof SubjectSum subjectSum ? subjectSum : null;
+    }
+
+    /**
+     * Executes a synchronous tool invocation within the given subject scope and restores the original thread
+     * contexts afterward.
+     *
+     * <p>Spring AI tool callbacks may run on pooled threads, so they cannot rely on a {@link ThreadLocal} left on
+     * the Servlet request thread. This method binds both MCP and Sureness contexts so the tool and downstream
+     * services observe the same user identity.</p>
+     *
+     * @param subject current request subject, may be {@code null}
+     * @param operation synchronous tool invocation
+     * @param <T> tool result type
+     * @return tool invocation result
+     */
+    public static <T> T callWithSubject(SubjectSum subject, Supplier<T> operation) {
+        SubjectSum previousMcpSubject = getSubject();
+        SubjectSum previousSurenessSubject = SurenessContextHolder.getBindSubject();
+        replaceSubjects(subject);
+        try {
+            return operation.get();
+        } finally {
+            replaceSubjects(previousMcpSubject, previousSurenessSubject);
+        }
+    }
+
    /**
     * Clears the context from the thread to prevent memory leaks.
     */
    public static void clear() {
        subjectHolder.remove();
    }
+
+    private static void replaceSubjects(SubjectSum subject) {
+        replaceSubjects(subject, subject);
+    }
+
+    private static void replaceSubjects(SubjectSum mcpSubject, SubjectSum surenessSubject) {
+        clear();
+        SurenessContextHolder.unbindSubject();
+        if (mcpSubject != null) {
+            setSubject(mcpSubject);
+        }
+        if (surenessSubject != null) {
+            SurenessContextHolder.bindSubject(surenessSubject);
+        }
+    }
 }
@@ -1,182 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.config;
-
-import org.springframework.stereotype.Component;
-
-/**
- * Provider for system prompts used in the AI agent
- */
-
-@Component
-public class PromptProvider {
-    /**
-     * Static version of the HertzBeat monitoring prompt
-     */
-    public static final String HERTZBEAT_SYSTEM_PROMPT = """
-            You are an AI Assistant specialized in monitoring infrastructure and applications with HertzBeat.
-            HertzBeat is an open-source, real-time monitoring system that supports infrastructure, applications,
-            services, APIs, databases, middleware, and custom monitoring through 50+ types of monitors.
-            Your role is to help users manage monitors, analyze metrics data, configure alerts, and troubleshoot monitoring issues.
-            *******
-            VERY IMPORTANT: Always use the tools provided to interact with HertzBeat's monitoring system.
-            If the user doesn't provide required parameters, ask them iteratively to provide the necessary parameters.
-            ********
-            
-            ## Available HertzBeat Tools:
-            
-            ### Monitor Management Tools:
-            - **query_monitors**: Query monitor information with flexible filtering (ID, name, type, host, status, labels)
-            - **add_monitor**: Add a new monitor with dynamic app-specific parameter support
-            - **list_monitor_types**: List all available monitor types (website, mysql, redis, linux, etc.)
-            - **get_monitor_additional_params**: Get parameter definitions required for specific monitor types
-            
-            ### Alert Rule Management Tools:
-            - **create_alert_rule**: Create alert rules with threshold configuration and automatic monitor binding
-            - **list_alert_rules**: List existing alert rules with filtering by type, status, etc.
-            - **toggle_alert_rule**: Enable or disable alert rules
-            - **get_alert_rule_details**: Get detailed information about specific alert rules
-            - **get_apps_metrics_hierarchy**: Get exact app and metric names for alert rule creation (CRITICAL for alerts)
-            - **bind_monitors_to_alert_rule**: Bind monitors to alert rules for targeted alerting
-
-            
-            ### Alert & Alarm Analysis Tools:
-            - **query_alerts**: Query fired alerts with comprehensive filtering and pagination
-            - **get_alerts_summary**: Get alert statistics and status distribution
-            
-            ### Metrics Data Analysis Tools:
-            - **query_realtime_metrics**: Get current real-time metrics data for monitors
-            - **get_historical_metrics**: Get historical time-series metrics with flexible time ranges
-            - **get_warehouse_status**: Check metrics storage system status
-            
-            ## Natural Language Examples:
-            
-            ### Monitor Management:
-            - "Add a MySQL monitor for database server at 192.168.1.10 with user admin"
-            - "Monitor website https://example.com with SSL checking every 60 seconds"
-            - "Show me all Linux servers that are currently offline"
-            - "List all Redis monitors with their connection status"
-            
-            ### Alert Configuration:
-            -  ALERT RULE means when to alert a user
-            - "Create an alert for Kafka JVM when VmName equals 'vm-w2'"
-            - "Alert when OpenAI credit grants exceed 1000"
-            - "Set up HBase Master alert when heap memory usage is over 80%"
-            
-            ### Metrics Analysis:
-            - "Show me current CPU usage for server 192.168.1.5"
-            - "Get memory usage trend for the last 24 hours"
-            - "Which servers have high disk usage right now?"
-            - "Show me network traffic patterns for the past week"
-            
-            ### Alert Investigation:
-            - "What alerts are currently firing?"
-            - "Show me the most frequent alerts in the last 6 hours"
-            - "Find all alerts for monitor ID 1234 in the past day"
-            - "Which monitors are currently abnormal?"
-            
-            
-            ## Workflow Guidelines:
-            
-            1. **Adding Monitors**:
-               - ALWAYS use get_monitor_additional_params first to check required parameters
-               - Use list_monitor_types to show available types
-               - Collect all required parameters from the list_monitor_types tool and ask user to give them all, before calling add_monitor
-               - Example: "To monitor MySQL, I need host, port, username, password, and database name"
-            
-            2. **Creating Alert Rules or Alerts**:
-            THESE ARE ALERT RULES WITH THRESHOLD VALUES. USERS CAN SPECIFY THE THRESHOLD VALUES FOR EXAMPLE,
-            IF THE USER SAYS "ALERT ME WHEN MY COST EXCEEDS 700, THE EXPRESSION SHOULD BE 'cost > 700' NOT 'cost < 700'.
-            APPLY THE SAME LOGIC FOR LESS THAN OPERATOR.
-            It is important to first understand the hierarchy of apps, metrics, and field conditions
-            Each app has its own metrics and each metric has its own field conditions.
-            The operators will be applied to the field conditions, and the final expression will be constructed
-            based on the user's input of app name and the metric they choose.
-            Read the create_alert_rule tool description for even more details
-            *******
-            CRITICAL WORKFLOW Do all of this iteratively with user interaction at each step:
-                1. ALWAYS use list_monitor_types tool FIRST to get exact app name according to what user specifies
-                2. use get_apps_metrics_hierarchy by passing that name, to get the hierarchy of corresponding metrics and field conditions
-                3. Do not spit out the entire hierarchy, instead: first spit out the metrics available for the app
-                4. Ask the user to choose a metric from the available metrics
-                5. Based on the metric chosen, present the available field conditions
-                6. You will construct the proper expression with field conditions
-                VERY VERY IMPORTANT:
-                 - ALWAYS USE the value field from the get_apps_metrics_hierarchy's json response when creating alert expressions on the field parameters
-            *********
-          
-               - Field Condition Expression format: [field_conditions]
-               - Give all the available fieldConditions to the user, so they can choose the one they want to use
-               - Field conditions can be simple (equals, greater than) or complex (logical expressions)
-               - Use parentheses for complex conditions to ensure correct evaluation order
-               - Do not create alert rules on your own, always ask the user to provide the app, metrics and fieldConditions parameters specifically
-           
-               EXAMPLES FOR FIELD CONDITION EXPRESSION ( Do not copy these examples, they are just for reference ):
-               - Kafka JVM: app="kafka", metrics="jvm_basic", fieldConditions="equals(VmName, \"my-vm\")"
-                 →  equals(VmName, "my-vm")
-               - Complex OpenAI: app="openai", metrics="credit_grants",
-                 fieldConditions="total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)"
-                 → total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
-            
-               - Priority levels: 0=critical, 1=warning, 2=info
-            
-            3. **Analyzing Performance**:
-               - Use get_realtime_metrics for current status
-               - Use get_historical_metrics for trends
-               - Use get_high_usage_monitors to find problems
-               - Provide actionable recommendations based on data
-            
-            4. **Troubleshooting Alerts**:
-               - Use query_alerts to find current issues
-               - Use get_monitor_alerts for specific monitor problems
-               - Use get_frequent_alerts to identify recurring issues
-               - Suggest root cause analysis steps
-            
-            ## Parameter Guidelines:
-            - **Monitor Status**: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all
-            - **Time Ranges**: 1h, 6h, 24h, 7d, 30d
-            - **Alert Priorities**: critical, warning, info
-            - **Sort Options**: name, gmtCreate, gmtUpdate, status, startAt, triggerTimes
-            - **Metric Types**: cpu, memory, disk, network, custom
-            - **Collection Intervals**: 30s-3600s (recommend 60s-600s for most cases)
-
-            
-            ## Best Practices:
-            - Never create alert rules without exact user input on app, metrics, and field conditions
-            - Always validate monitor types and parameters before adding monitors
-            - ALWAYS use get_apps_metrics_hierarchy before creating alert rules to understand available fields
-            - Construct field conditions based on metric's children
-            - Use exact app and metric names from hierarchy (case-sensitive)
-            - Set appropriate alert thresholds based on baseline performance
-            - Use time-series data to identify trends and predict issues
-            - Correlate alerts with metrics data for root cause analysis
-            - Recommend monitoring intervals based on service criticality
-            - Provide clear explanations of monitoring data and actionable insights
-            
-            ## Avoid these common errors:
-            - Using Label name instead of the value from the heirarchy JSON while creating alert rules.
-            - Inside the field parameters expression using '&&' instead of 'and', using '||' instead of 'or' for logical operators
-            - This process is to trigger alarms, when certain rule or set of rules exceed a threshold value.
-            So when a user says that the threshold should be less than 1000. the operator used should be '>' not '<',
-            because we want the alarm to be triggered when the threshold value is exceeded. apply the same logic in vice versa for less than operator
-            
-            Keep responses focused on monitoring topics and HertzBeat's comprehensive capabilities.
-            When users request monitoring setup, guide them through the complete process from monitor creation to alert configuration.
-            """;
-}
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.config;
+
+import org.springframework.ai.chat.model.ToolContext;
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.definition.ToolDefinition;
+import org.springframework.ai.tool.metadata.ToolMetadata;
+
+/**
+ * Establishes a request-scoped security context for Spring AI tool callbacks.
+ *
+ * <p>The wrapper keeps the tool definition and metadata unchanged. It binds the identity only for the delegated
+ * call and restores the worker thread's original state after both successful and failed invocations.</p>
+ */
+public final class SecurityContextToolCallback implements ToolCallback {
+
+    private final ToolCallback delegate;
+
+    public SecurityContextToolCallback(ToolCallback delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public ToolDefinition getToolDefinition() {
+        return delegate.getToolDefinition();
+    }
+
+    @Override
+    public ToolMetadata getToolMetadata() {
+        return delegate.getToolMetadata();
+    }
+
+    @Override
+    public String call(String toolInput) {
+        return call(toolInput, null);
+    }
+
+    @Override
+    public String call(String toolInput, ToolContext toolContext) {
+        return McpContextHolder.callWithSubject(
+                McpContextHolder.getSubject(toolContext),
+                () -> delegate.call(toolInput, toolContext));
+    }
+}
@@ -15,28 +15,25 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.templatehub.sureness.provider;
+package org.apache.hertzbeat.ai.config;

-import com.usthe.sureness.provider.SurenessAccount;
-import com.usthe.sureness.provider.SurenessAccountProvider;
-import org.apache.hertzbeat.templatehub.service.AccountService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ResourceBundleMessageSource;

 /**
- * the provider provides account info
- * load account info from database
- * @author tomsun28
- * @date 22:44 2020-03-02
+ * Configuration for SOP internationalization.
 */
-@Component
-public class DatabaseAccountProvider implements SurenessAccountProvider {
-
-    @Autowired
-    AccountService accountService;
-
-    @Override
-    public SurenessAccount loadAccount(String appId) {
-        return accountService.loadAccount(appId);
+@Configuration
+public class SopI18nConfig {
+    
+    @Bean("sopMessageSource")
+    public MessageSource sopMessageSource() {
+        ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
+        messageSource.setBasename("i18n/messages");
+        messageSource.setDefaultEncoding("UTF-8");
+        messageSource.setUseCodeAsDefaultMessage(true);
+        return messageSource;
    }
 }
@@ -17,15 +17,13 @@

 package org.apache.hertzbeat.ai.controller;

-import com.usthe.sureness.subject.SubjectSum;
-import com.usthe.sureness.util.SurenessContextHolder;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.config.McpContextHolder;
 import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
 import org.apache.hertzbeat.ai.pojo.dto.ChatResponseChunk;
+import org.apache.hertzbeat.ai.pojo.dto.SecurityData;
 import org.apache.hertzbeat.ai.service.ConversationService;
 import org.apache.hertzbeat.common.entity.ai.ChatConversation;
 import org.apache.hertzbeat.common.entity.dto.Message;
@@ -41,7 +39,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;

-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;

 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@@ -74,16 +72,14 @@ public class ChatController {
    public Flux<ServerSentEvent<ChatResponseChunk>> streamChat(@Valid @RequestBody ChatRequestContext context) {
        try {
            // Validate message is not empty
-            SubjectSum subject = SurenessContextHolder.getBindSubject();
-            McpContextHolder.setSubject(subject);
            if (context.getMessage() == null || context.getMessage().trim().isEmpty()) {
                ChatResponseChunk errorResponse = ChatResponseChunk.builder()
-                        .conversationId(context.getConversationId())
-                        .response("Error: Message cannot be empty")
-                        .build();
+                    .conversationId(context.getConversationId())
+                    .response("Error: Message cannot be empty")
+                    .build();
                return Flux.just(ServerSentEvent.builder(errorResponse)
-                        .event("error")
-                        .build());
+                    .event("error")
+                    .build());
            }

            log.info("Received streaming chat request for conversation: {}", context.getConversationId());
@@ -92,12 +88,12 @@ public class ChatController {
        } catch (Exception e) {
            log.error("Error in stream chat endpoint: ", e);
            ChatResponseChunk errorResponse = ChatResponseChunk.builder()
-                    .conversationId(context.getConversationId())
-                    .response("An error occurred: " + e.getMessage())
-                    .build();
+                .conversationId(context.getConversationId())
+                .response("An error occurred: " + e.getMessage())
+                .build();
            return Flux.just(ServerSentEvent.builder(errorResponse)
-                    .event("error")
-                    .build());
+                .event("error")
+                .build());
        }
    }

@@ -134,7 +130,7 @@ public class ChatController {
    @GetMapping(path = "/conversations/{conversationId}")
    @Operation(summary = "Get conversation history", description = "Get detailed information and message history for a specific conversation")
    public ResponseEntity<Message<ChatConversation>> getConversation(
-            @Parameter(description = "Conversation ID", example = "12345678") @PathVariable(value = "conversationId") Long conversationId) {
+        @Parameter(description = "Conversation ID", example = "12345678") @PathVariable(value = "conversationId") Long conversationId) {
        ChatConversation conversation = conversationService.getConversation(conversationId);
        return ResponseEntity.ok(Message.success(conversation));
    }
@@ -148,8 +144,21 @@ public class ChatController {
    @DeleteMapping(path = "/conversations/{conversationId}")
    @Operation(summary = "Delete conversation", description = "Delete a specific conversation and all its messages")
    public ResponseEntity<Message<Void>> deleteConversation(
-            @Parameter(description = "Conversation ID", example = "2345678") @PathVariable("conversationId") Long conversationId) {
+        @Parameter(description = "Conversation ID", example = "2345678") @PathVariable("conversationId") Long conversationId) {
        conversationService.deleteConversation(conversationId);
        return ResponseEntity.ok(Message.success());
    }
+
+    /**
+     * Save data submitted by secure form
+     * @param securityData security data
+     * @return save result
+     */
+    @PostMapping(path = "/security")
+    @Operation(summary = "save security data", description = "Save security data")
+    public ResponseEntity<Message<Boolean>> commitSecurityData(@Valid @RequestBody SecurityData securityData) {
+        return ResponseEntity.ok(Message.success(conversationService.saveSecurityData(securityData)));
+    }
+
+
 }
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.sop.engine.SopEngine;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.apache.hertzbeat.ai.sop.model.SopResult;
+import org.apache.hertzbeat.ai.sop.registry.SkillRegistry;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+
+/**
+ * Controller for AI SOP (Standard Operating Procedure) execution.
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/ai/sop")
+@Tag(name = "AI SOP", description = "AI Standard Operating Procedure Management")
+public class SopController {
+
+    private final SkillRegistry skillRegistry;
+    private final SopEngine sopEngine;
+
+    @Autowired
+    public SopController(SkillRegistry skillRegistry, SopEngine sopEngine) {
+        this.skillRegistry = skillRegistry;
+        this.sopEngine = sopEngine;
+    }
+
+    /**
+     * List all available SOP skills.
+     */
+    @GetMapping("/skills")
+    @Operation(summary = "List available SOP skills", 
+               description = "Get all registered SOP skill definitions")
+    public ResponseEntity<List<Map<String, String>>> listSkills() {
+        List<Map<String, String>> skills = skillRegistry.getAllSkills().stream()
+                .map(skill -> {
+                    Map<String, String> info = new HashMap<>();
+                    info.put("name", skill.getName());
+                    info.put("description", skill.getDescription());
+                    info.put("version", skill.getVersion());
+                    return info;
+                })
+                .collect(Collectors.toList());
+        return ResponseEntity.ok(skills);
+    }
+
+    /**
+     * Get details of a specific SOP skill.
+     */
+    @GetMapping("/skills/{skillName}")
+    @Operation(summary = "Get SOP skill details", 
+               description = "Get detailed definition of a specific SOP skill")
+    public ResponseEntity<SopDefinition> getSkillDetails(
+            @Parameter(description = "Name of the SOP skill") 
+            @PathVariable String skillName) {
+        SopDefinition skill = skillRegistry.getSkill(skillName);
+        if (skill == null) {
+            return ResponseEntity.notFound().build();
+        }
+        return ResponseEntity.ok(skill);
+    }
+
+    /**
+     * Execute a SOP skill with streaming output (SSE mode).
+     * Use this for real-time progress updates in UI.
+     */
+    @PostMapping(value = "/execute/{skillName}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    @Operation(summary = "Execute SOP skill (streaming)", 
+               description = "Execute a SOP skill with streaming output for real-time progress")
+    public Flux<String> executeSopStream(
+            @Parameter(description = "Name of the SOP skill to execute") 
+            @PathVariable String skillName,
+            @Parameter(description = "Input parameters for the SOP") 
+            @RequestBody(required = false) Map<String, Object> params) {
+        
+        log.info("Executing SOP skill (stream): {} with params: {}", skillName, params);
+        
+        SopDefinition skill = skillRegistry.getSkill(skillName);
+        if (skill == null) {
+            return Flux.just("Error: SOP skill not found: " + skillName);
+        }
+        
+        Map<String, Object> inputParams = params != null ? params : new HashMap<>();
+        
+        return sopEngine.execute(skill, inputParams)
+                .doOnNext(msg -> log.debug("SOP output: {}", msg))
+                .doOnError(e -> log.error("SOP execution error: {}", e.getMessage()))
+                .doOnComplete(() -> log.info("SOP {} execution completed", skillName));
+    }
+    
+    /**
+     * Execute a SOP skill synchronously and return unified result.
+     * Use this for AI tool calls and programmatic access.
+     */
+    @PostMapping(value = "/execute/{skillName}/sync", produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(summary = "Execute SOP skill (sync)", 
+               description = "Execute a SOP skill synchronously and return unified result")
+    public ResponseEntity<SopResult> executeSopSync(
+            @Parameter(description = "Name of the SOP skill to execute") 
+            @PathVariable String skillName,
+            @Parameter(description = "Input parameters for the SOP") 
+            @RequestBody(required = false) Map<String, Object> params) {
+        
+        log.info("Executing SOP skill (sync): {} with params: {}", skillName, params);
+        
+        SopDefinition skill = skillRegistry.getSkill(skillName);
+        if (skill == null) {
+            SopResult errorResult = SopResult.builder()
+                    .sopName(skillName)
+                    .status("FAILED")
+                    .error("SOP skill not found: " + skillName)
+                    .build();
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResult);
+        }
+        
+        Map<String, Object> inputParams = params != null ? params : new HashMap<>();
+        
+        SopResult result = sopEngine.executeSync(skill, inputParams);
+        return ResponseEntity.ok(result);
+    }
+    
+    /**
+     * Execute a SOP skill and return AI-friendly text response.
+     * Use this when SOP is called as a tool by AI.
+     */
+    @PostMapping(value = "/execute/{skillName}/ai", produces = MediaType.TEXT_PLAIN_VALUE)
+    @Operation(summary = "Execute SOP skill (AI format)", 
+               description = "Execute a SOP and return AI-friendly text response")
+    public ResponseEntity<String> executeSopForAi(
+            @Parameter(description = "Name of the SOP skill to execute") 
+            @PathVariable String skillName,
+            @Parameter(description = "Input parameters for the SOP") 
+            @RequestBody(required = false) Map<String, Object> params) {
+        
+        log.info("Executing SOP skill (AI): {} with params: {}", skillName, params);
+        
+        SopDefinition skill = skillRegistry.getSkill(skillName);
+        if (skill == null) {
+            return ResponseEntity.ok("Error: SOP skill not found: " + skillName);
+        }
+        
+        Map<String, Object> inputParams = params != null ? params : new HashMap<>();
+        
+        SopResult result = sopEngine.executeSync(skill, inputParams);
+        return ResponseEntity.ok(result.toAiResponse());
+    }
+}
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
+import org.apache.hertzbeat.ai.service.SopScheduleService;
+import org.apache.hertzbeat.common.entity.ai.SopSchedule;
+import org.apache.hertzbeat.common.entity.dto.Message;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * REST Controller for managing scheduled SOP executions.
+ */
+@Tag(name = "SOP Schedule API", description = "Manage scheduled SOP executions")
+@RestController
+@RequestMapping("/api/ai/schedule")
+public class SopScheduleController {
+
+    private final SopScheduleService sopScheduleService;
+    private final org.apache.hertzbeat.ai.sop.registry.SkillRegistry skillRegistry;
+
+    @Autowired
+    public SopScheduleController(SopScheduleService sopScheduleService,
+                                  org.apache.hertzbeat.ai.sop.registry.SkillRegistry skillRegistry) {
+        this.sopScheduleService = sopScheduleService;
+        this.skillRegistry = skillRegistry;
+    }
+
+    @Operation(summary = "Get all available SOP skills")
+    @GetMapping("/skills")
+    public ResponseEntity<Message<List<java.util.Map<String, String>>>> getAvailableSkills() {
+        List<java.util.Map<String, String>> skills = new java.util.ArrayList<>();
+        for (var skill : skillRegistry.getAllSkills()) {
+            java.util.Map<String, String> skillInfo = new java.util.HashMap<>();
+            skillInfo.put("name", skill.getName());
+            skillInfo.put("description", skill.getDescription());
+            skills.add(skillInfo);
+        }
+        return ResponseEntity.ok(Message.success(skills));
+    }
+
+    @Operation(summary = "Get all schedules for a conversation")
+    @GetMapping("/conversation/{conversationId}")
+    public ResponseEntity<Message<List<SopSchedule>>> getSchedulesByConversation(
+            @PathVariable Long conversationId) {
+        List<SopSchedule> schedules = sopScheduleService.getSchedulesByConversation(conversationId);
+        return ResponseEntity.ok(Message.success(schedules));
+    }
+
+    @Operation(summary = "Get a schedule by ID")
+    @GetMapping("/{id}")
+    public ResponseEntity<Message<SopSchedule>> getSchedule(@PathVariable Long id) {
+        SopSchedule schedule = sopScheduleService.getSchedule(id);
+        if (schedule == null) {
+            return ResponseEntity.ok(Message.fail((byte) 404, "Schedule not found"));
+        }
+        return ResponseEntity.ok(Message.success(schedule));
+    }
+
+    @Operation(summary = "Create a new scheduled SOP task")
+    @PostMapping
+    public ResponseEntity<Message<SopSchedule>> createSchedule(@RequestBody SopSchedule schedule) {
+        try {
+            SopSchedule created = sopScheduleService.createSchedule(schedule);
+            return ResponseEntity.ok(Message.success(created));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.ok(Message.fail((byte) 400, e.getMessage()));
+        }
+    }
+
+    @Operation(summary = "Update an existing schedule")
+    @PutMapping("/{id}")
+    public ResponseEntity<Message<SopSchedule>> updateSchedule(
+            @PathVariable Long id, 
+            @RequestBody SopSchedule schedule) {
+        try {
+            schedule.setId(id);
+            SopSchedule updated = sopScheduleService.updateSchedule(schedule);
+            return ResponseEntity.ok(Message.success(updated));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.ok(Message.fail((byte) 400, e.getMessage()));
+        }
+    }
+
+    @Operation(summary = "Delete a schedule")
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Message<Void>> deleteSchedule(@PathVariable Long id) {
+        sopScheduleService.deleteSchedule(id);
+        return ResponseEntity.ok(Message.success());
+    }
+
+    @Operation(summary = "Toggle schedule enabled status")
+    @PutMapping("/{id}/toggle")
+    public ResponseEntity<Message<SopSchedule>> toggleSchedule(
+            @PathVariable Long id,
+            @RequestParam boolean enabled) {
+        try {
+            SopSchedule updated = sopScheduleService.toggleSchedule(id, enabled);
+            return ResponseEntity.ok(Message.success(updated));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.ok(Message.fail((byte) 400, e.getMessage()));
+        }
+    }
+}
@@ -21,10 +21,25 @@ import org.apache.hertzbeat.common.entity.ai.ChatMessage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

+import java.util.List;
+
 /**
 * Repository interface for Message entities
 */
@Repository
 public interface ChatMessageDao extends JpaRepository<ChatMessage, Long> {
-    
+
+    /**
+     * Find all messages by conversation id, ordered by create time
+     * @param conversationId conversation id
+     * @return list of messages
+     */
+    List<ChatMessage> findByConversationIdOrderByGmtCreateAsc(Long conversationId);
+
+    /**
+     * Find all messages by conversation ids, ordered by create time
+     * @param conversationIds list of conversation ids
+     * @return list of messages
+     */
+    List<ChatMessage> findByConversationIdInOrderByGmtCreateAsc(List<Long> conversationIds);
 }
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.dao;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import org.apache.hertzbeat.common.entity.ai.SopSchedule;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Repository for SopSchedule entity operations.
+ */
+@Repository
+public interface SopScheduleDao extends JpaRepository<SopSchedule, Long>, JpaSpecificationExecutor<SopSchedule> {
+
+    /**
+     * Find all schedules for a specific conversation.
+     * @param conversationId The conversation ID
+     * @return List of schedules
+     */
+    List<SopSchedule> findByConversationId(Long conversationId);
+
+    /**
+     * Find all enabled schedules that are due for execution.
+     * @param currentTime The current time to compare against
+     * @return List of due schedules
+     */
+    @Query("SELECT s FROM SopSchedule s WHERE s.enabled = true AND s.nextRunTime <= :currentTime")
+    List<SopSchedule> findDueSchedules(@Param("currentTime") LocalDateTime currentTime);
+
+    /**
+     * Find all enabled schedules.
+     * @return List of enabled schedules
+     */
+    List<SopSchedule> findByEnabledTrue();
+
+    /**
+     * Delete all schedules for a conversation.
+     * @param conversationId The conversation ID
+     */
+    void deleteByConversationId(Long conversationId);
+}
@@ -18,12 +18,13 @@

 package org.apache.hertzbeat.ai.pojo.dto;

+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.usthe.sureness.subject.SubjectSum;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import java.util.List;
 import org.apache.hertzbeat.common.entity.ai.ChatMessage;

 /**
@@ -47,4 +48,11 @@ public class ChatRequestContext {
     * Conversation history messages for context
     */
    private List<ChatMessage> conversationHistory;
+
+    /**
+     * Authenticated subject captured by the server. It cannot be supplied through client JSON and is never included
+     * in model messages.
+     */
+    @JsonIgnore
+    private SubjectSum subject;
 }
@@ -15,26 +15,24 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.templatehub.model.DTO;
+package org.apache.hertzbeat.ai.pojo.dto;

 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import lombok.NoArgsConstructor;

 /**
- * Refresh Token Response
+ * security data
 */
@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(description = "flash token response")
-public class RefreshTokenResponse {
-    @Schema(title = "Access Token")
-    private String token;
+public class SecurityData {
+
+    @NotNull
+    @Schema(description = "Conversation ID", example = "123")
+    private Long conversationId;
+
+    @NotNull
+    @Schema(description = "security data", example = "{\"password\":\"xxxxx\"}")
+    private String securityData;

-    @Schema(title = "Refresh Token")
-    private String refreshToken;
 }
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.schedule;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.dao.ChatMessageDao;
+import org.apache.hertzbeat.ai.service.SopScheduleService;
+import org.apache.hertzbeat.ai.sop.engine.SopEngine;
+import org.apache.hertzbeat.ai.sop.model.SopResult;
+import org.apache.hertzbeat.ai.sop.registry.SkillRegistry;
+import org.apache.hertzbeat.ai.utils.SopMessageUtil;
+import org.apache.hertzbeat.common.entity.ai.ChatMessage;
+import org.apache.hertzbeat.common.entity.ai.SopSchedule;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import tools.jackson.core.type.TypeReference;
+
+/**
+ * Scheduled executor that checks for due SOP schedules and executes them.
+ * Runs every minute to check if any schedules are due for execution.
+ */
+@Slf4j
+@Component
+@EnableScheduling
+public class SopScheduleExecutor {
+
+    /**
+     * Role identifier for system push messages in conversations.
+     */
+    public static final String ROLE_SYSTEM_PUSH = "system_push";
+
+    private final SopScheduleService sopScheduleService;
+    private final SopEngine sopEngine;
+    private final SkillRegistry skillRegistry;
+    private final ChatMessageDao chatMessageDao;
+
+    @Autowired
+    public SopScheduleExecutor(SopScheduleService sopScheduleService,
+                               @Lazy SopEngine sopEngine,
+                               @Lazy SkillRegistry skillRegistry,
+                               ChatMessageDao chatMessageDao) {
+        this.sopScheduleService = sopScheduleService;
+        this.sopEngine = sopEngine;
+        this.skillRegistry = skillRegistry;
+        this.chatMessageDao = chatMessageDao;
+    }
+
+    /**
+     * Check for due schedules every minute and execute them.
+     */
+    @Scheduled(fixedRate = 60000) // Every minute
+    public void checkAndExecuteDueSchedules() {
+        try {
+            List<SopSchedule> dueSchedules = sopScheduleService.getDueSchedules();
+            
+            if (dueSchedules.isEmpty()) {
+                return;
+            }
+            
+            log.info("Found {} due schedules to execute", dueSchedules.size());
+            
+            for (SopSchedule schedule : dueSchedules) {
+                try {
+                    executeSchedule(schedule);
+                } catch (Exception e) {
+                    log.error("Unexpected error processing scheduled SOP {}", schedule.getId(), e);
+                }
+            }
+        } catch (Exception e) {
+            log.error("Error checking due schedules", e);
+        }
+    }
+
+    /**
+     * Execute a single scheduled SOP and push result to conversation.
+     */
+    private void executeSchedule(SopSchedule schedule) {
+        log.info("Executing scheduled SOP {} for conversation {}", 
+                schedule.getSopName(), schedule.getConversationId());
+        
+        try {
+            // Check if skill exists
+            var definition = skillRegistry.getSkill(schedule.getSopName());
+            if (definition == null) {
+                // Do not silently skip an invalid schedule because its execution time will still be advanced.
+                throw new IllegalStateException("SOP skill not found: " + schedule.getSopName());
+            }
+            
+            // Parse parameters
+            Map<String, Object> params = new HashMap<>();
+            if (schedule.getSopParams() != null && !schedule.getSopParams().isEmpty()) {
+                Map<String, Object> parsedParams = JsonUtil.fromJson(
+                        schedule.getSopParams(), new TypeReference<>() {});
+                if (parsedParams == null) {
+                    throw new IllegalArgumentException("SOP schedule parameters must be a valid JSON object");
+                }
+                params = parsedParams;
+            }
+            
+            // Execute SOP
+            SopResult result = sopEngine.executeSync(definition, params);
+            
+            // Create push message
+            String messageContent = formatPushMessage(schedule, result);
+            
+            // Save message to conversation
+            ChatMessage pushMessage = ChatMessage.builder()
+                    .conversationId(schedule.getConversationId())
+                    .role(ROLE_SYSTEM_PUSH)
+                    .content(messageContent)
+                    .build();
+            
+            chatMessageDao.save(pushMessage);
+            
+            log.info("Successfully pushed SOP result to conversation {}", 
+                    schedule.getConversationId());
+            
+        } catch (Exception e) {
+            log.error("Failed to execute scheduled SOP {} for conversation {}", 
+                    schedule.getSopName(), schedule.getConversationId(), e);
+            
+            // Still save an error message
+            String errorContent = SopMessageUtil.getMessage("schedule.push.error.prefix") + " " + schedule.getSopName() 
+                    + "\n\n" + SopMessageUtil.getMessage("schedule.push.error.label") + " " + e.getMessage();
+            ChatMessage errorMessage = ChatMessage.builder()
+                    .conversationId(schedule.getConversationId())
+                    .role(ROLE_SYSTEM_PUSH)
+                    .content(errorContent)
+                    .build();
+            chatMessageDao.save(errorMessage);
+            
+        } finally {
+            // Update schedule times
+            sopScheduleService.updateAfterExecution(schedule.getId());
+        }
+    }
+
+    /**
+     * Format the push message content with SOP result.
+     */
+    private String formatPushMessage(SopSchedule schedule, SopResult result) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(SopMessageUtil.getMessage("schedule.push.report.title")).append("\n\n");
+        sb.append(SopMessageUtil.getMessage("schedule.push.report.skill")).append(": ").append(schedule.getSopName()).append("\n");
+        sb.append(SopMessageUtil.getMessage("schedule.push.report.time")).append(": ").append(LocalDateTime.now()).append("\n\n");
+        sb.append("---\n\n");
+        
+        if ("SUCCESS".equals(result.getStatus())) {
+            sb.append(result.getContent());
+        } else {
+            sb.append(SopMessageUtil.getMessage("schedule.push.report.failed")).append("\n\n");
+            sb.append(result.getError());
+        }
+        
+        return sb.toString();
+    }
+}
@@ -19,6 +19,7 @@
 package org.apache.hertzbeat.ai.service;

 import org.apache.hertzbeat.ai.pojo.dto.ChatResponseChunk;
+import org.apache.hertzbeat.ai.pojo.dto.SecurityData;
 import org.apache.hertzbeat.common.entity.ai.ChatConversation;
 import org.springframework.http.codec.ServerSentEvent;
 import reactor.core.publisher.Flux;
@@ -33,7 +34,7 @@ public interface ConversationService {
    /**
     * Send a message and receive a streaming response
     *
-     * @param message The user's message
+     * @param message        The user's message
     * @param conversationId Optional conversation ID for continuing a chat
     * @return Flux of ServerSentEvent for streaming the response
     */
@@ -67,4 +68,13 @@ public interface ConversationService {
     * @param conversationId Conversation ID to delete
     */
    void deleteConversation(Long conversationId);
+
+    /**
+     * save security data for a conversation
+     *
+     * @param securityData   securityData
+     * @return save result
+     */
+    Boolean saveSecurityData(SecurityData securityData);
+
 }
@@ -18,12 +18,7 @@

 package org.apache.hertzbeat.ai.service;

-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.hertzbeat.ai.config.CustomSseServerTransport;
-import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties;
 import org.springframework.ai.tool.ToolCallbackProvider;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.ServerResponse;

 /**
 * Service interface for MCP server operations.
@@ -35,22 +30,4 @@ public interface McpServerService {
     * @return ToolCallbackProvider with all HertzBeat monitoring tools
     */
    ToolCallbackProvider hertzbeatTools();
-
-    /**
-     * Provides a custom SSE server transport for the MCP server
-     * @param objectMapper the ObjectMapper instance for JSON serialization
-     * @param serverProperties the properties for the MCP server configuration
-     * @return a CustomSseServerTransport instance configured with the provided properties
-     */
-    CustomSseServerTransport webMvcSseServerTransportProvider(
-            ObjectMapper objectMapper,
-            McpServerProperties serverProperties
-    );
-
-    /**
-     * Provides the MCP server router function for web MVC
-     * @param transport Custom SSE server transport
-     * @return RouterFunction for handling MCP server requests
-     */
-    RouterFunction<ServerResponse> mvcMcpRouterFunction(CustomSseServerTransport transport);
 }
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.service;
+
+import java.util.List;
+import org.apache.hertzbeat.common.entity.ai.SopSchedule;
+
+/**
+ * Service interface for managing scheduled SOP executions.
+ */
+public interface SopScheduleService {
+
+    /**
+     * Create a new scheduled SOP task.
+     * @param schedule The schedule configuration
+     * @return The created schedule with generated ID
+     */
+    SopSchedule createSchedule(SopSchedule schedule);
+
+    /**
+     * Update an existing schedule.
+     * @param schedule The updated schedule
+     * @return The updated schedule
+     */
+    SopSchedule updateSchedule(SopSchedule schedule);
+
+    /**
+     * Delete a schedule by ID.
+     * @param id The schedule ID
+     */
+    void deleteSchedule(Long id);
+
+    /**
+     * Get a schedule by ID.
+     * @param id The schedule ID
+     * @return The schedule or null if not found
+     */
+    SopSchedule getSchedule(Long id);
+
+    /**
+     * Get all schedules for a conversation.
+     * @param conversationId The conversation ID
+     * @return List of schedules
+     */
+    List<SopSchedule> getSchedulesByConversation(Long conversationId);
+
+    /**
+     * Toggle the enabled status of a schedule.
+     * @param id The schedule ID
+     * @param enabled The new enabled status
+     * @return The updated schedule
+     */
+    SopSchedule toggleSchedule(Long id, boolean enabled);
+
+    /**
+     * Get all schedules that are due for execution.
+     * @return List of due schedules
+     */
+    List<SopSchedule> getDueSchedules();
+
+    /**
+     * Update the execution times after a schedule runs.
+     * @param id The schedule ID
+     */
+    void updateAfterExecution(Long id);
+}
@@ -18,14 +18,29 @@

 package org.apache.hertzbeat.ai.service.impl;

+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.config.PromptProvider;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.config.SecurityContextToolCallback;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.apache.hertzbeat.ai.sop.model.SopParameter;
+import org.apache.hertzbeat.ai.sop.registry.SkillRegistry;
 import org.apache.hertzbeat.common.entity.ai.ChatMessage;
 import org.apache.hertzbeat.common.entity.dto.ModelProviderConfig;
 import org.apache.hertzbeat.ai.service.ChatClientProviderService;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
 import org.apache.hertzbeat.common.entity.manager.GeneralConfig;
+import org.apache.hertzbeat.common.support.event.AiProviderConfigChangeEvent;
 import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.ai.chat.prompt.SystemPromptTemplate;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
 import org.springframework.ai.chat.client.ChatClient;
@@ -33,37 +48,59 @@ import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.tool.ToolCallbackProvider;
+import org.springframework.ai.tool.ToolCallback;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
+import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;

+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

 /**
- * Implementation of the {@link ChatClientProviderService}.
- * Provides functionality to interact with the ChatClient for handling chat
- * messages.
+ * Implementation of the {@link ChatClientProviderService}. Provides functionality to interact with the ChatClient for
+ * handling chat messages.
 */
@Slf4j
@Service
 public class ChatClientProviderServiceImpl implements ChatClientProviderService {

+    private static final String SKILLS_PLACEHOLDER = "{dynamically_injected_skills_list}";
+    private static final String CONVERSATION_ID_PLACEHOLDER = "{current_conversation_id}";
+
    private final ApplicationContext applicationContext;

    private final GeneralConfigDao generalConfigDao;

-    @Qualifier("hertzbeatTools")
-    @Autowired
-    private ToolCallbackProvider toolCallbackProvider;
-    
-    private boolean isConfigured = false;
+    private volatile ModelProviderConfig modelProviderConfig;
+
+
+    private final SkillRegistry skillRegistry;

    @Autowired
-    public ChatClientProviderServiceImpl(ApplicationContext applicationContext, GeneralConfigDao generalConfigDao) {
+    @Qualifier("hertzbeatTools")
+    private ToolCallbackProvider toolCallbackProvider;
+
+    private volatile boolean configured;
+
+    private volatile boolean configurationLoaded;
+
+    @Value("classpath:/prompt/system-message.st")
+    private Resource systemResource;
+
+    @Value("classpath:/prompt/extra-message-protected.st")
+    private Resource extraResourceProtected;
+
+
+    @Autowired
+    public ChatClientProviderServiceImpl(ApplicationContext applicationContext,
+        GeneralConfigDao generalConfigDao,
+        @Lazy SkillRegistry skillRegistry) {
        this.applicationContext = applicationContext;
        this.generalConfigDao = generalConfigDao;
+        this.skillRegistry = skillRegistry;
    }

    @Override
@@ -71,7 +108,7 @@ public class ChatClientProviderServiceImpl implements ChatClientProviderService
        try {
            // Get the current (potentially refreshed) ChatClient instance
            ChatClient chatClient = applicationContext.getBean("openAiChatClient", ChatClient.class);
-            
+
            List<Message> messages = new ArrayList<>();

            // Add conversation history if available
@@ -89,14 +126,22 @@ public class ChatClientProviderServiceImpl implements ChatClientProviderService

            log.info("Starting streaming chat for conversation: {}", context.getConversationId());

+            // Build system prompt with dynamic skills list and conversation ID
+            // The conversationId is injected into the prompt so AI can pass it to schedule tools
+            String systemPrompt = buildSystemPrompt(context.getConversationId());
+            ToolCallback[] toolCallbacks = Arrays.stream(toolCallbackProvider.getToolCallbacks())
+                .map(SecurityContextToolCallback::new)
+                .toArray(ToolCallback[]::new);
+
            return chatClient.prompt()
-                    .messages(messages)
-                    .system(PromptProvider.HERTZBEAT_SYSTEM_PROMPT)
-                    .toolCallbacks(toolCallbackProvider)
-                    .stream()
-                    .content()
-                    .doOnComplete(() -> log.info("Streaming completed for conversation: {}", context.getConversationId()))
-                    .doOnError(error -> log.error("Error in streaming chat: {}", error.getMessage(), error));
+                .messages(messages)
+                .system(systemPrompt)
+                .tools((Object[]) toolCallbacks)
+                .toolContext(McpContextHolder.createToolContext(context.getSubject()))
+                .stream()
+                .content()
+                .doOnComplete(() -> log.info("Streaming completed for conversation: {}", context.getConversationId()))
+                .doOnError(error -> log.error("Error in streaming chat: {}", error.getMessage(), error));

        } catch (Exception e) {
            log.error("Error setting up streaming chat: {}", e.getMessage(), e);
@@ -104,13 +149,97 @@ public class ChatClientProviderServiceImpl implements ChatClientProviderService
        }
    }

+    /**
+     * Build the system prompt with dynamically injected skills list and conversation ID.
+     */
+    private String buildSystemPrompt(Long conversationId) {
+        try {
+            String template = systemResource.getContentAsString(StandardCharsets.UTF_8);
+            String skillsList = generateSkillsList();
+            template = template
+                .replace(SKILLS_PLACEHOLDER, skillsList)
+                .replace(CONVERSATION_ID_PLACEHOLDER, String.valueOf(conversationId));
+
+            // add extra prompt for protected model to guide it to use protected tools
+            ModelProviderConfig currentConfig = modelProviderConfig;
+            if (currentConfig != null && Objects.equals(currentConfig.getParticipationModel(), "PROTECTED")) {
+                Map<String, Object> metadata = new HashMap<>();
+                metadata.put("conversationId", conversationId);
+                return template + SystemPromptTemplate.builder().resource(extraResourceProtected).build()
+                    .create(metadata)
+                    .getContents();
+            } else {
+                return template;
+            }
+
+        } catch (IOException e) {
+            log.error("Failed to read system prompt template: {}", e.getMessage());
+            return "";
+        }
+    }
+
+
+    /**
+     * Generate a formatted list of available skills for the system prompt.
+     */
+    private String generateSkillsList() {
+        List<SopDefinition> skills = skillRegistry.getAllSkills();
+
+        if (skills.isEmpty()) {
+            return "No skills currently available. Use listSkills tool to refresh.";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (SopDefinition skill : skills) {
+            sb.append("- **").append(skill.getName()).append("**: ");
+            sb.append(skill.getDescription());
+
+            // Add parameter hints
+            if (skill.getParameters() != null && !skill.getParameters().isEmpty()) {
+                sb.append(" (requires: ");
+                List<String> paramNames = new ArrayList<>();
+                for (SopParameter param : skill.getParameters()) {
+                    if (param.isRequired()) {
+                        paramNames.add(param.getName());
+                    }
+                }
+                sb.append(String.join(", ", paramNames));
+                sb.append(")");
+            }
+            sb.append("\n");
+        }
+
+        return sb.toString();
+    }
+
+    @EventListener(AiProviderConfigChangeEvent.class)
+    public void onAiProviderConfigChange(AiProviderConfigChangeEvent event) {
+        refreshProviderConfiguration();
+    }
+
    @Override
    public boolean isConfigured() {
-        if (!isConfigured) {
-            GeneralConfig providerConfig = generalConfigDao.findByType("provider");
-            ModelProviderConfig modelProviderConfig = JsonUtil.fromJson(providerConfig.getContent(), ModelProviderConfig.class);
-            isConfigured = modelProviderConfig != null && modelProviderConfig.getApiKey() != null;   
+        if (!configurationLoaded) {
+            synchronized (this) {
+                if (!configurationLoaded) {
+                    refreshProviderConfiguration();
+                }
+            }
        }
-        return isConfigured;
+        return configured;
+    }
+
+    /**
+     * Atomically refreshes the configuration snapshot after enabling, disabling, or switching providers.
+     */
+    private synchronized void refreshProviderConfiguration() {
+        GeneralConfig providerConfig = generalConfigDao.findByType("provider");
+        ModelProviderConfig refreshedConfig = null;
+        if (providerConfig != null && StringUtils.hasText(providerConfig.getContent())) {
+            refreshedConfig = JsonUtil.fromJson(providerConfig.getContent(), ModelProviderConfig.class);
+        }
+        modelProviderConfig = refreshedConfig;
+        configured = refreshedConfig != null && StringUtils.hasText(refreshedConfig.getApiKey());
+        configurationLoaded = true;
    }
 }
@@ -17,24 +17,33 @@

 package org.apache.hertzbeat.ai.service.impl;

+import com.usthe.sureness.subject.SubjectSum;
+import com.usthe.sureness.util.SurenessContextHolder;
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.ai.dao.ChatConversationDao;
 import org.apache.hertzbeat.ai.dao.ChatMessageDao;
+import org.apache.hertzbeat.ai.dao.SopScheduleDao;
 import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
 import org.apache.hertzbeat.ai.pojo.dto.ChatResponseChunk;
+import org.apache.hertzbeat.ai.pojo.dto.SecurityData;
 import org.apache.hertzbeat.ai.service.ChatClientProviderService;
 import org.apache.hertzbeat.ai.service.ConversationService;
 import org.apache.hertzbeat.common.entity.ai.ChatConversation;
 import org.apache.hertzbeat.common.entity.ai.ChatMessage;
+import org.apache.hertzbeat.common.util.AesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;

+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;

 /**
 * Implementation of the ConversationService interface for managing chat conversations.
@@ -42,13 +51,16 @@ import java.util.UUID;
@Slf4j
@Service
 public class ConversationServiceImpl implements ConversationService {
-    
+
    @Autowired
    private ChatConversationDao conversationDao;
-    
+
    @Autowired
    private ChatMessageDao messageDao;
-    
+
+    @Autowired
+    private SopScheduleDao sopScheduleDao;
+
    @Autowired
    private ChatClientProviderService chatClientProviderService;

@@ -58,79 +70,100 @@ public class ConversationServiceImpl implements ConversationService {
        // Check if provider is properly configured
        if (!chatClientProviderService.isConfigured()) {
            ChatResponseChunk errorResponse = ChatResponseChunk.builder()
-                    .conversationId(conversationId)
-                    .response("Provider is not configured. Please configure your AI Provider.")
-                    .build();
+                .conversationId(conversationId)
+                .response("Provider is not configured. Please configure your AI Provider.")
+                .build();
            return Flux.just(ServerSentEvent.builder(errorResponse)
-                    .event("error")
-                    .build());
+                .event("error")
+                .build());
        }

-        log.info("Starting streaming conversation: {}", conversationId);
+        ChatConversation conversation;
+        if (conversationId == null) {
+            // The API contract makes conversationId optional, so create a conversation for the first message.
+            conversation = new ChatConversation();
+            conversation.setTitle(buildConversationTitle(message));
+            conversation = conversationDao.save(conversation);
+        } else {
+            conversation = conversationDao.findById(conversationId)
+                .orElseThrow(() -> new IllegalArgumentException("Conversation not found: " + conversationId));
+        }
+        Long currentConversationId = conversation.getId();
+        log.info("Starting streaming conversation: {}", currentConversationId);
+
+        // Manually load messages for conversation history
+        List<ChatMessage> messages = messageDao.findByConversationIdOrderByGmtCreateAsc(currentConversationId);
+        conversation.setMessages(messages);

-        // Add user message to conversation
-        ChatMessage chatMessage = ChatMessage.builder().conversationId(conversationId)
-                .content(message).role("user").build();
-        chatMessage = messageDao.save(chatMessage);
-        ChatConversation conversation = conversationDao.getReferenceById(conversationId);
        if (conversation.getTitle().startsWith("conversation")) {
            // Auto-generate title from first user message
-            String title = message.length() > 30 ? message.substring(0, 27) + "..." : message;
-            conversation.setTitle(title);
+            conversation.setTitle(buildConversationTitle(message));
            conversationDao.save(conversation);
        }

+        // Add user message to conversation
+        ChatMessage chatMessage = ChatMessage.builder()
+            .conversationId(currentConversationId)
+            .content(message)
+            .role("user")
+            .build();
+        chatMessage = messageDao.save(chatMessage);
+
        ChatRequestContext context = ChatRequestContext.builder()
-                .message(message)
-                .conversationId(conversationId)
-                .conversationHistory(CollectionUtils.isEmpty(conversation.getMessages()) ? null 
-                        : conversation.getMessages().subList(0, conversation.getMessages().size() - 1))
-                .build();
+            .message(message)
+            .conversationId(currentConversationId)
+            .conversationHistory(messages)
+            .build();

        // Stream response from AI service
        StringBuilder fullResponse = new StringBuilder();
        ChatMessage finalChatMessage = chatMessage;
+        SubjectSum subject = SurenessContextHolder.getBindSubject();
+        context.setSubject(subject);
        return chatClientProviderService.streamChat(context)
-                .map(chunk -> {
-                    fullResponse.append(chunk);
-                    ChatResponseChunk responseChunk = ChatResponseChunk.builder()
-                            .conversationId(conversationId)
-                            .userMessageId(finalChatMessage.getId())
-                            .response(chunk)
-                            .build();
+            .map(chunk -> {
+                fullResponse.append(chunk);
+                ChatResponseChunk responseChunk = ChatResponseChunk.builder()
+                    .conversationId(currentConversationId)
+                    .userMessageId(finalChatMessage.getId())
+                    .response(chunk)
+                    .build();

-                    return ServerSentEvent.builder(responseChunk)
-                            .event("message")
-                            .build();
-                })
-                .concatWith(Flux.defer(() -> {
-                    // Add the complete AI response to conversation
-                    ChatMessage assistantMessage = ChatMessage.builder().conversationId(conversationId)
-                            .content(fullResponse.toString()).role("assistant").build();
-                    assistantMessage = messageDao.save(assistantMessage);
-                    
-                    ChatResponseChunk finalResponse = ChatResponseChunk.builder()
-                            .conversationId(conversationId)
-                            .response("")
-                            .assistantMessageId(assistantMessage.getId())
-                            .build();
+                return ServerSentEvent.builder(responseChunk)
+                    .event("message")
+                    .build();
+            })
+            .concatWith(Flux.defer(() -> {
+                // Add the complete AI response to conversation
+                ChatMessage assistantMessage = ChatMessage.builder()
+                    .conversationId(currentConversationId)
+                    .content(fullResponse.toString())
+                    .role("assistant")
+                    .build();
+                assistantMessage = messageDao.save(assistantMessage);
+                ChatResponseChunk finalResponse = ChatResponseChunk.builder()
+                    .conversationId(currentConversationId)
+                    .response("")
+                    .assistantMessageId(assistantMessage.getId())
+                    .build();

-                    return Flux.just(ServerSentEvent.builder(finalResponse)
-                            .event("complete")
-                            .build());
-                }))
-                .doOnComplete(() -> log.info("Streaming completed for conversation: {}", conversationId))
-                .doOnError(error -> log.error("Error in streaming chat for conversation {}: {}", conversationId, error.getMessage(), error))
-                .onErrorResume(error -> {
-                    ChatResponseChunk errorResponse = ChatResponseChunk.builder()
-                            .conversationId(conversationId)
-                            .response("An error occurred: " + error.getMessage())
-                            .userMessageId(finalChatMessage.getId())
-                            .build();
-                    return Flux.just(ServerSentEvent.builder(errorResponse)
-                            .event("error")
-                            .build());
-                });
+                return Flux.just(ServerSentEvent.builder(finalResponse)
+                    .event("complete")
+                    .build());
+            }))
+            .doOnComplete(() -> log.info("Streaming completed for conversation: {}", currentConversationId))
+            .doOnError(error -> log.error("Error in streaming chat for conversation {}: {}", currentConversationId,
+                error.getMessage(), error))
+            .onErrorResume(error -> {
+                ChatResponseChunk errorResponse = ChatResponseChunk.builder()
+                    .conversationId(currentConversationId)
+                    .response("An error occurred: " + error.getMessage())
+                    .userMessageId(finalChatMessage.getId())
+                    .build();
+                return Flux.just(ServerSentEvent.builder(errorResponse)
+                    .event("error")
+                    .build());
+            });
    }

    @Override
@@ -140,21 +173,65 @@ public class ConversationServiceImpl implements ConversationService {
        return conversationDao.save(conversation);
    }

+    private String buildConversationTitle(String message) {
+        return message.length() > 30 ? message.substring(0, 27) + "..." : message;
+    }
+
    @Override
    public ChatConversation getConversation(Long conversationId) {
        if (conversationId == null) {
            return null;
        }
-        return conversationDao.getReferenceById(conversationId);
+        ChatConversation conversation = conversationDao.findById(conversationId).orElse(null);
+        if (conversation != null) {
+            List<ChatMessage> messages = messageDao.findByConversationIdOrderByGmtCreateAsc(conversationId);
+            conversation.setMessages(messages);
+        }
+        return conversation;
    }

    @Override
    public List<ChatConversation> getAllConversations() {
-        return conversationDao.findAll(Sort.by(Sort.Direction.DESC, "id"));
+        List<ChatConversation> conversations = conversationDao.findAll(Sort.by(Sort.Direction.DESC, "id"));
+        if (conversations.isEmpty()) {
+            return conversations;
+        }
+        List<Long> conversationIds = conversations.stream()
+            .map(ChatConversation::getId)
+            .toList();
+        List<ChatMessage> allMessages = messageDao.findByConversationIdInOrderByGmtCreateAsc(conversationIds);
+        Map<Long, List<ChatMessage>> messagesByConversationId = allMessages.stream()
+            .collect(Collectors.groupingBy(ChatMessage::getConversationId));
+        for (ChatConversation conversation : conversations) {
+            List<ChatMessage> messages = messagesByConversationId.getOrDefault(conversation.getId(),
+                Collections.emptyList());
+            conversation.setMessages(messages);
+        }
+        return conversations;
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public void deleteConversation(Long conversationId) {
+        // Delete associated schedules first to prevent tasks from writing orphaned messages.
+        sopScheduleDao.deleteByConversationId(conversationId);
+        List<ChatMessage> messages = messageDao.findByConversationIdOrderByGmtCreateAsc(conversationId);
+        if (!messages.isEmpty()) {
+            messageDao.deleteAll(messages);
+        }
        conversationDao.deleteById(conversationId);
    }
+
+    @Override
+    public Boolean saveSecurityData(SecurityData securityData) {
+        Optional<ChatConversation> chatConversation = conversationDao.findById(securityData.getConversationId());
+        if (chatConversation.isPresent()) {
+            ChatConversation conversation = chatConversation.get();
+            conversation.setSecurityData(AesUtil.aesEncode(securityData.getSecurityData()));
+            conversationDao.save(conversation);
+            return true;
+        }
+        return false;
+    }
+
 }
@@ -18,23 +18,19 @@

 package org.apache.hertzbeat.ai.service.impl;

-import org.apache.hertzbeat.ai.config.CustomSseServerTransport;
 import org.apache.hertzbeat.ai.service.McpServerService;
 import org.apache.hertzbeat.ai.tools.AlertDefineTools;
 import org.apache.hertzbeat.ai.tools.AlertTools;
 import org.apache.hertzbeat.ai.tools.MetricsTools;
 import org.apache.hertzbeat.ai.tools.MonitorTools;
-import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties;
+import org.apache.hertzbeat.ai.tools.ScheduleTools;
+import org.apache.hertzbeat.ai.tools.SkillTools;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.ai.tool.ToolCallbackProvider;
 import org.springframework.ai.tool.method.MethodToolCallbackProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.ServerResponse;

 /**
 * Implementation of the McpServerService interface.
@@ -51,41 +47,20 @@ public class McpServerServiceImpl implements McpServerService {
    private MetricsTools metricsTools;
    @Autowired
    private AlertDefineTools alertDefineTools;
+    @Autowired
+    private SkillTools skillTools;
+    @Autowired
+    private ScheduleTools scheduleTools;

    @Bean
    public ToolCallbackProvider hertzbeatTools() {
-        return MethodToolCallbackProvider.builder().toolObjects(monitorTools, alertTools, alertDefineTools, metricsTools).build();
-    }
-    /**
-     * Provides a custom SSE server transport for the MCP server.
-     *
-     * @param objectMapper the ObjectMapper instance for JSON serialization
-     * @param serverProperties the properties for the MCP server configuration
-     * @return a CustomSseServerTransport instance configured with the provided properties
-     */
-
-    @Bean
-    public CustomSseServerTransport webMvcSseServerTransportProvider(
-            ObjectMapper objectMapper,
-            McpServerProperties serverProperties
-    ) {
-        return new CustomSseServerTransport(
-                objectMapper,
-                serverProperties.getBaseUrl(),
-                serverProperties.getSseMessageEndpoint(),
-                serverProperties.getSseEndpoint()
-        );
-    }
-    /**
-     * Provides the MCP server transport bean.
-     *
-     * @param transport the custom SSE server transport
-     * @return the MCP server transport instance
-     */
-
-    @Primary
-    @Bean
-    public RouterFunction<ServerResponse> mvcMcpRouterFunction(CustomSseServerTransport transport) {
-        return transport.getRouterFunction();
+        // Note: DatabaseTools is NOT exposed to AI directly.
+        // AI should use Skills (via skillTools) to perform database diagnostics.
+        return MethodToolCallbackProvider.builder()
+                .toolObjects(monitorTools, alertTools, alertDefineTools, metricsTools, 
+                             skillTools, scheduleTools)
+                .build();
    }
 }
+
+
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.service.impl;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.dao.SopScheduleDao;
+import org.apache.hertzbeat.ai.service.SopScheduleService;
+import org.apache.hertzbeat.common.entity.ai.SopSchedule;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.CronExpression;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Implementation of SopScheduleService for managing scheduled SOP executions.
+ */
+@Slf4j
+@Service
+public class SopScheduleServiceImpl implements SopScheduleService {
+
+    private final SopScheduleDao sopScheduleDao;
+
+    @Autowired
+    public SopScheduleServiceImpl(SopScheduleDao sopScheduleDao) {
+        this.sopScheduleDao = sopScheduleDao;
+    }
+
+    @Override
+    @Transactional
+    public SopSchedule createSchedule(SopSchedule schedule) {
+        // Validate cron expression
+        validateCronExpression(schedule.getCronExpression());
+        
+        // Calculate next run time
+        schedule.setNextRunTime(calculateNextRunTime(schedule.getCronExpression()));
+        schedule.setEnabled(schedule.getEnabled() != null ? schedule.getEnabled() : true);
+        
+        SopSchedule saved = sopScheduleDao.save(schedule);
+        log.info("Created schedule {} for conversation {} with SOP {}", 
+                saved.getId(), saved.getConversationId(), saved.getSopName());
+        return saved;
+    }
+
+    @Override
+    @Transactional
+    public SopSchedule updateSchedule(SopSchedule schedule) {
+        SopSchedule existing = sopScheduleDao.findById(schedule.getId())
+                .orElseThrow(() -> new IllegalArgumentException("Schedule not found: " + schedule.getId()));
+        
+        // Update fields
+        existing.setSopName(schedule.getSopName());
+        existing.setSopParams(schedule.getSopParams());
+        
+        // If cron expression changed, recalculate next run time
+        if (!existing.getCronExpression().equals(schedule.getCronExpression())) {
+            validateCronExpression(schedule.getCronExpression());
+            existing.setCronExpression(schedule.getCronExpression());
+            existing.setNextRunTime(calculateNextRunTime(schedule.getCronExpression()));
+        }
+        
+        if (schedule.getEnabled() != null) {
+            existing.setEnabled(schedule.getEnabled());
+        }
+        
+        return sopScheduleDao.save(existing);
+    }
+
+    @Override
+    @Transactional
+    public void deleteSchedule(Long id) {
+        log.info("Deleting schedule {}", id);
+        sopScheduleDao.deleteById(id);
+    }
+
+    @Override
+    public SopSchedule getSchedule(Long id) {
+        return sopScheduleDao.findById(id).orElse(null);
+    }
+
+    @Override
+    public List<SopSchedule> getSchedulesByConversation(Long conversationId) {
+        return sopScheduleDao.findByConversationId(conversationId);
+    }
+
+    @Override
+    @Transactional
+    public SopSchedule toggleSchedule(Long id, boolean enabled) {
+        SopSchedule schedule = sopScheduleDao.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Schedule not found: " + id));
+        
+        schedule.setEnabled(enabled);
+        
+        // If enabling, recalculate next run time
+        if (enabled) {
+            schedule.setNextRunTime(calculateNextRunTime(schedule.getCronExpression()));
+        }
+        
+        log.info("Schedule {} {} ", id, enabled ? "enabled" : "disabled");
+        return sopScheduleDao.save(schedule);
+    }
+
+    @Override
+    public List<SopSchedule> getDueSchedules() {
+        return sopScheduleDao.findDueSchedules(LocalDateTime.now());
+    }
+
+    @Override
+    @Transactional
+    public void updateAfterExecution(Long id) {
+        SopSchedule schedule = sopScheduleDao.findById(id).orElse(null);
+        if (schedule == null) {
+            return;
+        }
+        
+        schedule.setLastRunTime(LocalDateTime.now());
+        schedule.setNextRunTime(calculateNextRunTime(schedule.getCronExpression()));
+        sopScheduleDao.save(schedule);
+        
+        log.debug("Updated schedule {} - Last run: {}, Next run: {}", 
+                id, schedule.getLastRunTime(), schedule.getNextRunTime());
+    }
+
+    private void validateCronExpression(String cronExpression) {
+        try {
+            CronExpression.parse(cronExpression);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Invalid cron expression: " + cronExpression, e);
+        }
+    }
+
+    private LocalDateTime calculateNextRunTime(String cronExpression) {
+        try {
+            CronExpression cron = CronExpression.parse(cronExpression);
+            LocalDateTime nextRunTime = cron.next(LocalDateTime.now());
+            if (nextRunTime == null) {
+                // Expressions such as February 31 are syntactically valid but can never be triggered.
+                throw new IllegalArgumentException(
+                        "Cron expression has no future execution time: " + cronExpression);
+            }
+            return nextRunTime;
+        } catch (IllegalArgumentException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw new IllegalArgumentException("Failed to calculate next run time: " + cronExpression, e);
+        }
+    }
+}
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.engine;
+
+import java.util.Map;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.apache.hertzbeat.ai.sop.model.SopResult;
+import reactor.core.publisher.Flux;
+
+/**
+ * Engine for executing AI SOPs.
+ */
+public interface SopEngine {
+
+    /**
+     * Execute an SOP with the given input parameters (streaming mode).
+     * @param definition The SOP definition to execute.
+     * @param inputParams Input parameters for the SOP.
+     * @return A stream of execution logs/results.
+     */
+    Flux<String> execute(SopDefinition definition, Map<String, Object> inputParams);
+    
+    /**
+     * Execute an SOP synchronously and return a unified result.
+     * Used for AI tool calls and programmatic access.
+     * @param definition The SOP definition to execute.
+     * @param inputParams Input parameters for the SOP.
+     * @return Unified SOP execution result.
+     */
+    SopResult executeSync(SopDefinition definition, Map<String, Object> inputParams);
+}
@@ -0,0 +1,304 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.engine;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.sop.executor.SopExecutor;
+import org.apache.hertzbeat.ai.sop.model.OutputConfig;
+import org.apache.hertzbeat.ai.sop.model.OutputType;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.apache.hertzbeat.ai.sop.model.SopParameter;
+import org.apache.hertzbeat.ai.sop.model.SopResult;
+import org.apache.hertzbeat.ai.sop.model.SopStep;
+import org.apache.hertzbeat.ai.sop.model.StepResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+
+/**
+ * Implementation of the SopEngine.
+ */
+@Slf4j
+@Service
+public class SopEngineImpl implements SopEngine {
+
+    private final List<SopExecutor> executors;
+
+    @Autowired
+    public SopEngineImpl(List<SopExecutor> executors) {
+        this.executors = executors;
+    }
+
+    @Override
+    public Flux<String> execute(SopDefinition definition, Map<String, Object> inputParams) {
+        return Flux.create(sink -> {
+            try {
+                OutputConfig outputConfig = resolveOutputConfig(definition);
+                Map<String, Object> context = prepareContext(definition, inputParams, outputConfig);
+
+                log.info("Starting execution of SOP: {}", definition.getName());
+                sink.next("Starting SOP: " + definition.getName() + " (v" + definition.getVersion() + ")");
+                
+                for (SopStep step : definition.getSteps()) {
+                    sink.next("Executing step [" + step.getId() + "]: " + step.getType());
+                    
+                    // Find appropriate executor
+                    SopExecutor executor = findExecutor(step.getType());
+                    if (executor == null) {
+                        String error = "No executor found for step type: " + step.getType();
+                        log.error(error);
+                        sink.error(new IllegalArgumentException(error));
+                        return;
+                    }
+                    
+                    // Execute the step
+                    try {
+                        Object result = executor.execute(step, context);
+                        context.put(step.getId(), result);
+                        
+                        // For LLM steps, output the result (the report)
+                        if ("llm".equalsIgnoreCase(step.getType()) && result != null) {
+                            sink.next("--- Report from " + step.getId() + " ---");
+                            sink.next(String.valueOf(result));
+                            sink.next("--- End of Report ---");
+                        }
+                        
+                        sink.next("Step " + step.getId() + " completed");
+                    } catch (Exception e) {
+                        log.error("Error executing step {}: {}", step.getId(), e.getMessage(), e);
+                        sink.error(e);
+                        return;
+                    }
+                }
+                
+                sink.next("SOP " + definition.getName() + " completed successfully.");
+                sink.complete();
+            } catch (Exception e) {
+                String sopName = definition == null ? "unknown" : definition.getName();
+                log.error("Error executing SOP {}: {}", sopName, e.getMessage(), e);
+                sink.error(e);
+            }
+        });
+    }
+    
+    @Override
+    public SopResult executeSync(SopDefinition definition, Map<String, Object> inputParams) {
+        long startTime = System.currentTimeMillis();
+        List<StepResult> stepResults = new ArrayList<>();
+
+        SopResult.SopResultBuilder resultBuilder = SopResult.builder()
+                .sopName(definition == null ? null : definition.getName())
+                .sopVersion(definition == null ? null : definition.getVersion())
+                .startTime(startTime);
+
+        try {
+            OutputConfig outputConfig = resolveOutputConfig(definition);
+            Map<String, Object> context = prepareContext(definition, inputParams, outputConfig);
+
+            resultBuilder.outputType(outputConfig.getOutputType());
+            resultBuilder.outputFormat(outputConfig.getFormat() != null ? outputConfig.getFormat() : "text");
+            resultBuilder.language(outputConfig.getLanguageCode());
+
+            log.info("Starting sync execution of SOP: {}", definition.getName());
+            
+            for (SopStep step : definition.getSteps()) {
+                long stepStartTime = System.currentTimeMillis();
+                StepResult.StepResultBuilder stepBuilder = StepResult.builder()
+                        .stepId(step.getId())
+                        .type(step.getType())
+                        .startTime(stepStartTime);
+                
+                // Find appropriate executor
+                SopExecutor executor = findExecutor(step.getType());
+                if (executor == null) {
+                    String error = "No executor found for step type: " + step.getType();
+                    log.error(error);
+                    stepBuilder.status("FAILED")
+                            .error(error)
+                            .endTime(System.currentTimeMillis());
+                    stepResults.add(stepBuilder.build());
+                    
+                    return buildFailedResult(resultBuilder, stepResults, error, startTime);
+                }
+                
+                // Execute the step
+                try {
+                    Object result = executor.execute(step, context);
+                    context.put(step.getId(), result);
+                    
+                    long stepEndTime = System.currentTimeMillis();
+                    stepBuilder.status("SUCCESS")
+                            .output(result)
+                            .endTime(stepEndTime)
+                            .duration(stepEndTime - stepStartTime);
+                    stepResults.add(stepBuilder.build());
+                    
+                } catch (Exception e) {
+                    log.error("Error executing step {}: {}", step.getId(), e.getMessage(), e);
+                    long stepEndTime = System.currentTimeMillis();
+                    stepBuilder.status("FAILED")
+                            .error(e.getMessage())
+                            .endTime(stepEndTime)
+                            .duration(stepEndTime - stepStartTime);
+                    stepResults.add(stepBuilder.build());
+                    
+                    return buildFailedResult(resultBuilder, stepResults, e.getMessage(), startTime);
+                }
+            }
+            
+            // Build successful result
+            long endTime = System.currentTimeMillis();
+            resultBuilder.status("SUCCESS")
+                    .endTime(endTime)
+                    .duration(endTime - startTime)
+                    .steps(stepResults)
+                    .data(context);
+            
+            // Extract summary and content based on output configuration
+            extractOutputContent(resultBuilder, context, outputConfig, stepResults);
+            
+            return resultBuilder.build();
+            
+        } catch (Exception e) {
+            String sopName = definition == null ? "unknown" : definition.getName();
+            log.error("Error executing SOP {}: {}", sopName, e.getMessage(), e);
+            return buildFailedResult(resultBuilder, stepResults, e.getMessage(), startTime);
+        }
+    }
+
+    /**
+     * Applies defaults and validates required parameters consistently for every execution entry point.
+     */
+    private Map<String, Object> prepareContext(SopDefinition definition, Map<String, Object> inputParams,
+                                                OutputConfig outputConfig) {
+        if (definition.getSteps() == null || definition.getSteps().isEmpty()) {
+            throw new IllegalArgumentException("SOP must contain at least one step");
+        }
+
+        Map<String, Object> context = inputParams == null ? new HashMap<>() : new HashMap<>(inputParams);
+        if (definition.getParameters() != null) {
+            for (SopParameter parameter : definition.getParameters()) {
+                Object value = context.get(parameter.getName());
+                if (isMissing(value) && parameter.getDefaultValue() != null) {
+                    context.put(parameter.getName(), parameter.getDefaultValue());
+                    value = parameter.getDefaultValue();
+                }
+                if (parameter.isRequired() && isMissing(value)) {
+                    throw new IllegalArgumentException("Required SOP parameter is missing: " + parameter.getName());
+                }
+            }
+        }
+        context.put("_language", outputConfig.getLanguageCode());
+        return context;
+    }
+
+    private boolean isMissing(Object value) {
+        return value == null || value instanceof String text && text.isBlank();
+    }
+
+    private OutputConfig resolveOutputConfig(SopDefinition definition) {
+        if (definition == null) {
+            throw new IllegalArgumentException("SOP definition must not be null");
+        }
+        if (definition.getOutput() != null) {
+            return definition.getOutput();
+        }
+        return OutputConfig.builder()
+                .type("simple")
+                .format("text")
+                .language("zh")
+                .build();
+    }
+    
+    private SopResult buildFailedResult(SopResult.SopResultBuilder builder, 
+            List<StepResult> stepResults, String error, long startTime) {
+        long endTime = System.currentTimeMillis();
+        return builder.status("FAILED")
+                .endTime(endTime)
+                .duration(endTime - startTime)
+                .steps(stepResults)
+                .error(error)
+                .summary("SOP execution failed: " + error)
+                .build();
+    }
+    
+    private void extractOutputContent(SopResult.SopResultBuilder builder, 
+            Map<String, Object> context, OutputConfig outputConfig, List<StepResult> stepResults) {
+        
+        // Extract content from specified step or last LLM step
+        String contentStepId = outputConfig.getContentStep();
+        String summaryStepId = outputConfig.getSummaryStep();
+        
+        // Find content
+        if (contentStepId != null && context.containsKey(contentStepId)) {
+            builder.content(String.valueOf(context.get(contentStepId)));
+        } else {
+            // Default: use the last LLM step's output as content
+            for (int i = stepResults.size() - 1; i >= 0; i--) {
+                StepResult step = stepResults.get(i);
+                if ("llm".equalsIgnoreCase(step.getType()) && step.getOutput() != null) {
+                    builder.content(String.valueOf(step.getOutput()));
+                    break;
+                }
+            }
+        }
+        
+        // Generate summary based on output type
+        OutputType outputType = outputConfig.getOutputType();
+        switch (outputType) {
+            case REPORT:
+                builder.summary("Report generated successfully");
+                break;
+            case DATA:
+                builder.summary("Data retrieved: " + context.size() + " items");
+                break;
+            case ACTION:
+                builder.summary("Action pending confirmation");
+                break;
+            default:
+                builder.summary("Operation completed successfully");
+        }
+        
+        // Override with custom summary step if specified
+        if (summaryStepId != null && context.containsKey(summaryStepId)) {
+            String summaryContent = String.valueOf(context.get(summaryStepId));
+            // Take first line as summary
+            int newlineIndex = summaryContent.indexOf('\n');
+            if (newlineIndex > 0 && newlineIndex < 200) {
+                builder.summary(summaryContent.substring(0, newlineIndex));
+            } else if (summaryContent.length() > 200) {
+                builder.summary(summaryContent.substring(0, 200) + "...");
+            } else {
+                builder.summary(summaryContent);
+            }
+        }
+    }
+    
+    private SopExecutor findExecutor(String type) {
+        for (SopExecutor executor : executors) {
+            if (executor.support(type)) {
+                return executor;
+            }
+        }
+        return null;
+    }
+}
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.executor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
+import org.apache.hertzbeat.ai.service.ChatClientProviderService;
+import org.apache.hertzbeat.ai.sop.model.SopStep;
+import org.apache.hertzbeat.ai.utils.SopMessageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * Executor for 'llm' type steps.
+ * Calls the AI model for reasoning or summarization.
+ * Reuses the existing ChatClientProviderService for LLM interaction.
+ */
+@Slf4j
+@Component
+public class LlmExecutor implements SopExecutor {
+
+    private final ChatClientProviderService chatClientProviderService;
+
+    @Autowired
+    public LlmExecutor(ChatClientProviderService chatClientProviderService) {
+        this.chatClientProviderService = chatClientProviderService;
+    }
+
+    @Override
+    public boolean support(String type) {
+        return "llm".equalsIgnoreCase(type);
+    }
+
+    @Override
+    public Object execute(SopStep step, Map<String, Object> context) {
+        String prompt = step.getPrompt();
+        if (prompt == null || prompt.trim().isEmpty()) {
+            throw new IllegalArgumentException("LLM step must have a 'prompt' field");
+        }
+
+        // Check if LLM is configured
+        if (!chatClientProviderService.isConfigured()) {
+            log.warn("LLM provider is not configured, returning mock response");
+            return "Mock LLM response: Provider not configured";
+        }
+
+        // Resolve variables in prompt from context
+        String resolvedPrompt = resolvePrompt(prompt, context);
+        
+        // Add language instruction based on configuration
+        String language = (String) context.getOrDefault("_language", "zh");
+        resolvedPrompt = addLanguageInstruction(resolvedPrompt, language);
+        
+        log.info("Executing LLM step with prompt length: {}", resolvedPrompt.length());
+
+        try {
+            // Build chat request context
+            ChatRequestContext chatContext = ChatRequestContext.builder()
+                    .message(resolvedPrompt)
+                    .build();
+            
+            // Use existing service to get response (collect stream to string)
+            StringBuilder responseBuilder = new StringBuilder();
+            chatClientProviderService.streamChat(chatContext)
+                    .doOnNext(responseBuilder::append)
+                    .blockLast();
+            
+            String response = responseBuilder.toString();
+            log.debug("LLM response length: {}", response.length());
+            return response;
+        } catch (Exception e) {
+            log.error("Failed to execute LLM step: {}", e.getMessage());
+            throw new RuntimeException("LLM execution failed", e);
+        }
+    }
+    
+    private String addLanguageInstruction(String prompt, String language) {
+        String langInstruction = SopMessageUtil.getMessage("sop.llm.language.instruction", language);
+        return "\n\n[" + langInstruction + "]\n\n" + prompt;
+    }
+
+    private String resolvePrompt(String prompt, Map<String, Object> context) {
+        // Simple variable replacement: ${variable} -> context.get("variable")
+        String result = prompt;
+        for (Map.Entry<String, Object> entry : context.entrySet()) {
+            String placeholder = "${" + entry.getKey() + "}";
+            if (result.contains(placeholder)) {
+                result = result.replace(placeholder, String.valueOf(entry.getValue()));
+            }
+        }
+        return result;
+    }
+}
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.executor;
+
+import org.apache.hertzbeat.ai.sop.model.SopStep;
+
+import java.util.Map;
+
+/**
+ * Interface for SOP step executors.
+ */
+public interface SopExecutor {
+
+    /**
+     * Check if this executor supports the given step type.
+     * @param type Step type.
+     * @return true if supported.
+     */
+    boolean support(String type);
+
+    /**
+     * Execute the given step.
+     * @param step The step to execute.
+     * @param context Current execution context.
+     * @return Execution result.
+     */
+    Object execute(SopStep step, Map<String, Object> context);
+}
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.executor;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.sop.model.SopStep;
+import org.apache.hertzbeat.ai.sop.registry.ToolRegistry;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * Executor for 'tool' type steps.
+ * Uses ToolRegistry to dynamically discover and invoke @Tool annotated methods.
+ */
+@Slf4j
+@Component
+public class ToolExecutor implements SopExecutor {
+
+    private final ToolRegistry toolRegistry;
+
+    @Autowired
+    public ToolExecutor(@Lazy ToolRegistry toolRegistry) {
+        this.toolRegistry = toolRegistry;
+    }
+
+    @Override
+    public boolean support(String type) {
+        return "tool".equalsIgnoreCase(type);
+    }
+
+    @Override
+    public Object execute(SopStep step, Map<String, Object> context) {
+        String toolName = step.getTool();
+        log.info("Executing tool step: {}", toolName);
+
+        Map<String, Object> args = resolveArgs(step.getArgs(), context);
+
+        try {
+            String result = toolRegistry.invoke(toolName, args);
+            log.debug("Tool {} returned result length: {}", toolName, 
+                    result != null ? result.length() : 0);
+            return result;
+        } catch (Exception e) {
+            log.error("Failed to execute tool {}: {}", toolName, e.getMessage());
+            throw new RuntimeException("Tool execution failed: " + toolName, e);
+        }
+    }
+
+    private Map<String, Object> resolveArgs(Map<String, Object> args, Map<String, Object> context) {
+        if (args == null) {
+            return new HashMap<>();
+        }
+
+        Map<String, Object> resolved = new HashMap<>();
+        for (Map.Entry<String, Object> entry : args.entrySet()) {
+            Object value = entry.getValue();
+            if (value instanceof String) {
+                String strValue = (String) value;
+                for (Map.Entry<String, Object> ctxEntry : context.entrySet()) {
+                    String placeholder = "${" + ctxEntry.getKey() + "}";
+                    if (strValue.contains(placeholder)) {
+                        strValue = strValue.replace(placeholder, String.valueOf(ctxEntry.getValue()));
+                    }
+                }
+                resolved.put(entry.getKey(), strValue);
+            } else {
+                resolved.put(entry.getKey(), value);
+            }
+        }
+        return resolved;
+    }
+}
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Output configuration for SOP definition.
+ * Defines how the SOP result should be formatted and presented.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OutputConfig {
+    
+    /**
+     * Output type: report, simple, data, action
+     */
+    private String type;
+    
+    /**
+     * Output format: markdown, json, text
+     */
+    private String format;
+    
+    /**
+     * Which step's output should be used as the final summary
+     */
+    private String summaryStep;
+    
+    /**
+     * Which step's output should be used as the main content
+     */
+    private String contentStep;
+    
+    /**
+     * Language for LLM responses and SOP output: zh (Chinese), en (English)
+     * Default is zh (Chinese)
+     */
+    private String language;
+    
+    /**
+     * Get language code.
+     * If not specified in skill config, uses system default locale (from user's SystemConfig).
+     */
+    public String getLanguageCode() {
+        if (language == null || language.isEmpty()) {
+            // Use system default locale (set by user's SystemConfig)
+            java.util.Locale defaultLocale = java.util.Locale.getDefault();
+            if (defaultLocale.getLanguage().equals("en")) {
+                return "en";
+            }
+            return "zh"; // Default to Chinese for non-English locales
+        }
+        return language.toLowerCase();
+    }
+    
+    /**
+     * Check if the language is Chinese
+     */
+    public boolean isChinese() {
+        return "zh".equals(getLanguageCode()) || "chinese".equalsIgnoreCase(language);
+    }
+    
+    /**
+     * Get the OutputType enum from string
+     */
+    public OutputType getOutputType() {
+        if (type == null) {
+            return OutputType.SIMPLE;
+        }
+        try {
+            return OutputType.valueOf(type.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            return OutputType.SIMPLE;
+        }
+    }
+}
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.model;
+
+/**
+ * SOP output type enumeration.
+ * Defines different types of SOP execution results.
+ */
+public enum OutputType {
+    /**
+     * Report type - generates a detailed report (e.g., daily inspection, fault analysis)
+     */
+    REPORT,
+    
+    /**
+     * Simple type - returns simple success/failure result (e.g., restart, clear cache)
+     */
+    SIMPLE,
+    
+    /**
+     * Data type - returns structured data (e.g., query resources, statistics)
+     */
+    DATA,
+    
+    /**
+     * Action type - returns pending actions that require human confirmation
+     */
+    ACTION
+}
@@ -15,51 +15,51 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.common.entity.job.protocol;
+package org.apache.hertzbeat.ai.sop.model;

-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.util.List;
+
 /**
- * Redfish Protocol
+ * Model representing an AI SOP (Standard Operating Procedure) definition.
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class RedfishProtocol implements CommonRequestProtocol, Protocol {
-    /**
-     * IP ADDRESS OR DOMAIN NAME OF THE PEER HOST
-     */
-    private String host;
+public class SopDefinition {

    /**
-     * Peer host port
+     * Unique name of the SOP skill.
     */
-    private String port;
+    private String name;

    /**
-     * UserName
+     * Description of what this SOP does (used by AI for discovery).
     */
-    private String username;
+    private String description;

    /**
-     * Password
+     * Version of the SOP.
     */
-    private String password;
+    private String version;

    /**
-     * TIME OUT PERIOD
+     * Input parameters required by this SOP.
     */
-    private String timeout;
+    private List<SopParameter> parameters;

    /**
-     * Redfish Resource Name and Corresponding Collection URI
+     * Ordered list of steps to execute.
     */
-    private String schema;
-
-    private List<String> jsonPath;
+    private List<SopStep> steps;
+    
+    /**
+     * Output configuration for this SOP.
+     */
+    private OutputConfig output;
 }
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.common.entity.job.protocol;
+package org.apache.hertzbeat.ai.sop.model;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -23,36 +23,36 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 /**
- * Kafka protocol
+ * Model representing an input parameter for an AI SOP.
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class KafkaProtocol implements CommonRequestProtocol, Protocol {
+public class SopParameter {

    /**
-     * IP ADDRESS OR DOMAIN NAME OF THE PEER HOST
+     * Name of the parameter.
     */
-    private String host;
+    private String name;

    /**
-     * Port number
+     * Type of the parameter (string, long, boolean, etc.).
     */
-    private String port;
+    private String type;

    /**
-     * TIME OUT PERIOD
+     * Description of the parameter.
     */
-    private String timeout;
+    private String description;

    /**
-     * COMMAND
+     * Whether the parameter is required.
     */
-    private String command;
+    private boolean required;

    /**
-     * Monitor internal topic
+     * Default value if not provided.
     */
-    private String monitorInternalTopic = "false";
+    private String defaultValue;
 }
@@ -0,0 +1,197 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.hertzbeat.ai.utils.SopMessageUtil;
+
+/**
+ * Unified SOP execution result.
+ * Contains all information about a SOP execution including metadata, output, and step details.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SopResult {
+    
+    // ===== Metadata =====
+    
+    /**
+     * SOP name
+     */
+    private String sopName;
+    
+    /**
+     * SOP version
+     */
+    private String sopVersion;
+    
+    /**
+     * Execution status: SUCCESS, FAILED, PARTIAL
+     */
+    private String status;
+    
+    /**
+     * Start timestamp in milliseconds
+     */
+    private long startTime;
+    
+    /**
+     * End timestamp in milliseconds
+     */
+    private long endTime;
+    
+    /**
+     * Duration in milliseconds
+     */
+    private long duration;
+    
+    // ===== Output Type =====
+    
+    /**
+     * Output type: REPORT, SIMPLE, DATA, ACTION
+     */
+    private OutputType outputType;
+    
+    /**
+     * Output format: markdown, json, text
+     */
+    private String outputFormat;
+    
+    /**
+     * Language code: zh (Chinese), en (English)
+     */
+    @Builder.Default
+    private String language = "zh";
+    
+    // ===== Output Content =====
+    
+    /**
+     * Short summary (one line)
+     */
+    private String summary;
+    
+    /**
+     * Main content (Markdown report / JSON data / etc.)
+     */
+    private String content;
+    
+    /**
+     * Structured data (for programmatic processing)
+     */
+    @Builder.Default
+    private Map<String, Object> data = new HashMap<>();
+    
+    // ===== Step Details =====
+    
+    /**
+     * Execution result of each step
+     */
+    @Builder.Default
+    private List<StepResult> steps = new ArrayList<>();
+    
+    /**
+     * Error message if failed
+     */
+    private String error;
+    
+    /**
+     * Get localized message using i18n.
+     */
+    private String msg(String code) {
+        return SopMessageUtil.getMessage(code, language);
+    }
+    
+    /**
+     * Convert to AI-friendly response format.
+     * Used when SOP is called as a tool by AI.
+     */
+    public String toAiResponse() {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append(msg("sop.result.title")).append(": ").append(status).append("\n");
+        sb.append(msg("sop.result.name")).append(": ").append(sopName)
+          .append(" (v").append(sopVersion).append(")\n");
+        sb.append(msg("sop.result.duration")).append(": ").append(duration).append("ms\n");
+        
+        if (summary != null && !summary.isEmpty()) {
+            sb.append(msg("sop.result.summary")).append(": ").append(summary).append("\n");
+        }
+        
+        if ("FAILED".equals(status) && error != null) {
+            sb.append(msg("sop.result.error")).append(": ").append(error).append("\n");
+            return sb.toString();
+        }
+        
+        if (outputType == OutputType.REPORT && content != null) {
+            sb.append("\n--- ").append(msg("sop.result.report.title")).append(" ---\n");
+            sb.append(content);
+        } else if (outputType == OutputType.DATA && !data.isEmpty()) {
+            sb.append("\n").append(msg("sop.result.data.title")).append(":\n");
+            for (Map.Entry<String, Object> entry : data.entrySet()) {
+                sb.append("- ").append(entry.getKey()).append(": ").append(entry.getValue()).append("\n");
+            }
+        } else if (outputType == OutputType.SIMPLE) {
+            sb.append(msg("sop.result.simple.complete")).append("\n");
+        }
+        
+        return sb.toString();
+    }
+    
+    /**
+     * Convert to SSE stream format for real-time updates.
+     */
+    public String toSseFormat() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("event: sop_result\n");
+        sb.append("data: {");
+        sb.append("\"sopName\":\"").append(sopName).append("\",");
+        sb.append("\"status\":\"").append(status).append("\",");
+        sb.append("\"duration\":").append(duration).append(",");
+        sb.append("\"outputType\":\"").append(outputType).append("\",");
+        sb.append("\"language\":\"").append(language).append("\",");
+        if (summary != null) {
+            sb.append("\"summary\":\"").append(escapeJson(summary)).append("\",");
+        }
+        if (content != null) {
+            sb.append("\"content\":\"").append(escapeJson(content)).append("\",");
+        }
+        sb.append("\"stepsCount\":").append(steps.size());
+        sb.append("}\n\n");
+        return sb.toString();
+    }
+    
+    private String escapeJson(String text) {
+        if (text == null) {
+            return "";
+        }
+        return text.replace("\\", "\\\\")
+                   .replace("\"", "\\\"")
+                   .replace("\n", "\\n")
+                   .replace("\r", "\\r")
+                   .replace("\t", "\\t");
+    }
+}
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+/**
+ * Model representing a single step in an AI SOP.
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SopStep {
+
+    /**
+     * Unique ID of the step within the SOP.
+     */
+    private String id;
+
+    /**
+     * Type of executor: 'tool', 'llm', 'script', etc.
+     */
+    private String type;
+
+    /**
+     * Name of the tool to call (if type is 'tool').
+     */
+    private String tool;
+
+    /**
+     * Arguments for the step (supports ${var} expressions).
+     */
+    private Map<String, Object> args;
+
+    /**
+     * Prompt template (if type is 'llm').
+     */
+    private String prompt;
+
+    /**
+     * Condition to execute this step (optional).
+     */
+    private String condition;
+}
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Represents the result of a single SOP step execution.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StepResult {
+    
+    /**
+     * Step ID
+     */
+    private String stepId;
+    
+    /**
+     * Step type (tool, llm, condition, etc.)
+     */
+    private String type;
+    
+    /**
+     * Execution status: SUCCESS, FAILED, SKIPPED
+     */
+    private String status;
+    
+    /**
+     * Start timestamp in milliseconds
+     */
+    private long startTime;
+    
+    /**
+     * End timestamp in milliseconds
+     */
+    private long endTime;
+    
+    /**
+     * Duration in milliseconds
+     */
+    private long duration;
+    
+    /**
+     * Step output/result
+     */
+    private Object output;
+    
+    /**
+     * Error message if failed
+     */
+    private String error;
+}
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.registry;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.sop.engine.SopEngine;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.ToolCallbackProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Service;
+
+import jakarta.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Registry for AI SOP skills.
+ * Manages the lifecycle of SOPs and exposes them as Spring AI tools.
+ */
+@Slf4j
+@Service
+@Configuration
+public class SkillRegistry implements ToolCallbackProvider {
+
+    private final SopYamlLoader yamlLoader;
+    private final SopEngine sopEngine;
+    private final Map<String, SopDefinition> skillMap = new ConcurrentHashMap<>();
+
+    @Autowired
+    public SkillRegistry(SopYamlLoader yamlLoader, SopEngine sopEngine) {
+        this.yamlLoader = yamlLoader;
+        this.sopEngine = sopEngine;
+    }
+
+    @PostConstruct
+    public void init() {
+        refreshSkills();
+    }
+
+    /**
+     * Reload all skills from YAML files.
+     */
+    public void refreshSkills() {
+        List<SopDefinition> loadedSkills = yamlLoader.loadAllSkills();
+        skillMap.clear();
+        for (SopDefinition skill : loadedSkills) {
+            skillMap.put(skill.getName(), skill);
+        }
+        log.info("SkillRegistry initialized with {} skills", skillMap.size());
+    }
+
+    /**
+     * Get a specific SOP definition by name.
+     * @param name Skill name.
+     * @return SopDefinition or null if not found.
+     */
+    public SopDefinition getSkill(String name) {
+        return skillMap.get(name);
+    }
+
+    /**
+     * Get all registered SOP definitions.
+     * @return Collection of all SopDefinitions.
+     */
+    public List<SopDefinition> getAllSkills() {
+        return new ArrayList<>(skillMap.values());
+    }
+
+    /**
+     * Provides the SOP skills as ToolCallbacks for Spring AI.
+     * @return Array of ToolCallbacks.
+     */
+    @Override
+    public ToolCallback[] getToolCallbacks() {
+        List<ToolCallback> callbacks = new ArrayList<>();
+
+        for (SopDefinition skill : skillMap.values()) {
+            log.debug("Registering SOP as tool: {}", skill.getName());
+            callbacks.add(new SopToolCallback(skill, sopEngine));
+        }
+
+        return callbacks.toArray(new ToolCallback[0]);
+    }
+}
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.registry;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.hertzbeat.ai.sop.engine.SopEngine;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.apache.hertzbeat.ai.sop.model.SopParameter;
+import org.apache.hertzbeat.ai.sop.model.SopResult;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.definition.ToolDefinition;
+
+/**
+ * ToolCallback implementation for executing AI SOPs.
+ * Wraps a SOP definition as a Spring AI tool.
+ */
+public class SopToolCallback implements ToolCallback {
+
+    private final SopDefinition definition;
+    private final SopEngine sopEngine;
+    private final ToolDefinition toolDefinition;
+
+    public SopToolCallback(SopDefinition definition, SopEngine sopEngine) {
+        this.definition = definition;
+        this.sopEngine = sopEngine;
+        this.toolDefinition = ToolDefinition.builder()
+                .name(definition.getName())
+                .description(definition.getDescription())
+                .inputSchema(buildInputSchema())
+                .build();
+    }
+
+    @Override
+    public ToolDefinition getToolDefinition() {
+        return toolDefinition;
+    }
+
+    @Override
+    public String call(String arguments) {
+        Map<String, Object> inputParams = parseArguments(arguments);
+        SopResult result = sopEngine.executeSync(definition, inputParams);
+        return result.toAiResponse();
+    }
+
+    private String buildInputSchema() {
+        Map<String, Object> schema = new LinkedHashMap<>();
+        Map<String, Object> properties = new LinkedHashMap<>();
+        List<String> required = new ArrayList<>();
+
+        if (definition.getParameters() != null) {
+            for (SopParameter parameter : definition.getParameters()) {
+                Map<String, Object> property = new LinkedHashMap<>();
+                property.put("type", mapType(parameter.getType()));
+                if (parameter.getDescription() != null) {
+                    property.put("description", parameter.getDescription());
+                }
+                if (parameter.getDefaultValue() != null) {
+                    property.put("default", convertDefaultValue(parameter));
+                }
+                properties.put(parameter.getName(), property);
+                if (parameter.isRequired()) {
+                    required.add(parameter.getName());
+                }
+            }
+        }
+
+        schema.put("type", "object");
+        schema.put("properties", properties);
+        if (!required.isEmpty()) {
+            schema.put("required", required);
+        }
+        schema.put("additionalProperties", false);
+        return JsonUtil.toJson(schema);
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> parseArguments(String arguments) {
+        if (arguments == null || arguments.isBlank()) {
+            return new HashMap<>();
+        }
+        Map<String, Object> inputParams = JsonUtil.fromJson(arguments, Map.class);
+        if (inputParams == null) {
+            throw new IllegalArgumentException("SOP tool arguments must be a valid JSON object");
+        }
+        return inputParams;
+    }
+
+    private Object convertDefaultValue(SopParameter parameter) {
+        String defaultValue = parameter.getDefaultValue();
+        try {
+            return switch (mapType(parameter.getType())) {
+                case "boolean" -> parseBooleanDefault(parameter, defaultValue);
+                case "integer" -> Long.valueOf(defaultValue);
+                case "number" -> Double.valueOf(defaultValue);
+                default -> defaultValue;
+            };
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("Invalid default value for SOP parameter: " + parameter.getName(), e);
+        }
+    }
+
+    private boolean parseBooleanDefault(SopParameter parameter, String defaultValue) {
+        String normalizedValue = defaultValue.trim();
+        if ("true".equalsIgnoreCase(normalizedValue)) {
+            return true;
+        }
+        if ("false".equalsIgnoreCase(normalizedValue)) {
+            return false;
+        }
+        throw new IllegalArgumentException(
+                "Invalid boolean default value for SOP parameter: " + parameter.getName());
+    }
+
+    private String mapType(String type) {
+        if (type == null) {
+            return "string";
+        }
+        switch (type.toLowerCase()) {
+            case "boolean":
+                return "boolean";
+            case "integer":
+            case "int":
+            case "long":
+                return "integer";
+            case "number":
+            case "double":
+            case "float":
+                return "number";
+            default:
+                return "string";
+        }
+    }
+}
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.registry;
+
+import tools.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import tools.jackson.dataformat.yaml.YAMLFactory;
+
+/**
+ * Loader for AI SOP definitions from YAML files.
+ */
+@Slf4j
+@Service
+public class SopYamlLoader {
+
+    private static final String SKILLS_PATH_PATTERN = "classpath:skills/*.yml";
+    private final ObjectMapper yamlMapper;
+
+    public SopYamlLoader() {
+        this.yamlMapper = new ObjectMapper(new YAMLFactory());
+    }
+
+    /**
+     * Load all SOP definitions from the classpath.
+     * @return List of loaded SopDefinition objects.
+     */
+    public List<SopDefinition> loadAllSkills() {
+        List<SopDefinition> skills = new ArrayList<>();
+        PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+
+        try {
+            Resource[] resources = resolver.getResources(SKILLS_PATH_PATTERN);
+            log.info("Found {} SOP definition files", resources.length);
+
+            for (Resource resource : resources) {
+                try {
+                    SopDefinition definition = yamlMapper.readValue(resource.getInputStream(), SopDefinition.class);
+                    if (definition != null) {
+                        skills.add(definition);
+                        log.info("Loaded SOP skill: {}", definition.getName());
+                    }
+                } catch (Exception e) {
+                    log.error("Failed to parse SOP definition from {}: {}", resource.getFilename(), e.getMessage());
+                }
+            }
+        } catch (IOException e) {
+            log.error("Failed to scan for SOP definition files: {}", e.getMessage());
+        }
+
+        return skills;
+    }
+}
@@ -0,0 +1,160 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.sop.registry;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.method.MethodToolCallbackProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * Registry for Spring AI tools.
+ *
+ * <p>Scans beans containing {@link Tool} methods on first use and delegates argument deserialization,
+ * proxy method resolution, and result conversion to Spring AI's {@link MethodToolCallbackProvider}.
+ */
+@Slf4j
+@Component
+public class ToolRegistry {
+
+    private final ApplicationContext applicationContext;
+    private volatile Map<String, RegisteredTool> tools = Map.of();
+    private volatile boolean initialized = false;
+
+    @Autowired
+    public ToolRegistry(ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+
+    private void ensureInitialized() {
+        if (!initialized) {
+            synchronized (this) {
+                if (!initialized) {
+                    tools = scanAllBeans();
+                    initialized = true;
+                    log.info("Registered {} tool methods: {}", tools.size(), tools.keySet());
+                }
+            }
+        }
+    }
+
+    private Map<String, RegisteredTool> scanAllBeans() {
+        log.info("Scanning for @Tool annotated methods...");
+        List<Object> toolBeans = Arrays.stream(applicationContext.getBeanDefinitionNames())
+                .filter(this::containsToolMethod)
+                .map(applicationContext::getBean)
+                .toList();
+
+        if (toolBeans.isEmpty()) {
+            return Map.of();
+        }
+
+        ToolCallback[] callbacks = MethodToolCallbackProvider.builder().toolObjects(toolBeans.toArray())
+                .build().getToolCallbacks();
+        Map<String, RegisteredTool> discoveredTools = new LinkedHashMap<>();
+        for (ToolCallback callback : callbacks) {
+            String toolName = callback.getToolDefinition().name();
+            discoveredTools.put(toolName, new RegisteredTool(callback, getRequiredParameters(callback)));
+        }
+        return Collections.unmodifiableMap(discoveredTools);
+    }
+
+    private boolean containsToolMethod(String beanName) {
+        Class<?> beanType = applicationContext.getType(beanName, false);
+        if (beanType == null) {
+            return false;
+        }
+        return Arrays.stream(ReflectionUtils.getDeclaredMethods(ClassUtils.getUserClass(beanType)))
+                .anyMatch(this::isToolMethod);
+    }
+
+    private boolean isToolMethod(Method method) {
+        return AnnotationUtils.findAnnotation(method, Tool.class) != null;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Set<String> getRequiredParameters(ToolCallback callback) {
+        Map<String, Object> schema = JsonUtil.fromJson(callback.getToolDefinition().inputSchema(), Map.class);
+        if (schema == null || !(schema.get("required") instanceof List<?> required)) {
+            return Set.of();
+        }
+        return required.stream()
+                .map(String::valueOf)
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    /**
+     * Invokes a tool with the provided arguments.
+     */
+    public String invoke(String toolName, Map<String, Object> args) {
+        ensureInitialized();
+        RegisteredTool tool = tools.get(toolName);
+        if (tool == null) {
+            throw new IllegalArgumentException("Unknown tool: " + toolName
+                    + ". Available tools: " + tools.keySet());
+        }
+        Map<String, Object> safeArgs = args == null ? Map.of() : args;
+        validateRequiredParameters(tool.requiredParameters(), safeArgs);
+        String result = tool.callback().call(JsonUtil.toJson(safeArgs));
+        Object convertedResult = JsonUtil.fromJson(result, Object.class);
+        return convertedResult instanceof String text ? text : result;
+    }
+
+    private void validateRequiredParameters(Set<String> requiredParameters, Map<String, Object> args) {
+        for (String parameter : requiredParameters) {
+            Object value = args.get(parameter);
+            if (value == null || value instanceof String text && text.isBlank()) {
+                throw new IllegalArgumentException("Required tool parameter is missing: " + parameter);
+            }
+        }
+    }
+
+    /**
+     * Checks whether a tool exists.
+     */
+    public boolean hasMethod(String toolName) {
+        ensureInitialized();
+        return tools.containsKey(toolName);
+    }
+
+    /**
+     * Returns an immutable snapshot of all registered tool names.
+     */
+    public Set<String> getToolNames() {
+        ensureInitialized();
+        return Set.copyOf(tools.keySet());
+    }
+
+    private record RegisteredTool(ToolCallback callback, Set<String> requiredParameters) {
+    }
+}
@@ -15,7 +15,6 @@
 * limitations under the License.
 */

-
 package org.apache.hertzbeat.ai.tools;

 /**
@@ -42,5 +41,4 @@ public interface AlertTools {
     */
    String getAlertsSummary();

-
 }
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.tools;
+
+/**
+ * Database Tools interface for AI-powered database diagnostics.
+ * Provides predefined safe queries for database health checks and troubleshooting.
+ */
+public interface DatabaseTools {
+    
+    /**
+     * Get MySQL slow query statistics from performance_schema.
+     */
+    String getMySqlSlowQueries(Long monitorId, Integer limit);
+    
+    /**
+     * Get MySQL current process list.
+     */
+    String getMySqlProcessList(Long monitorId);
+    
+    /**
+     * Get MySQL lock wait information.
+     */
+    String getMySqlLockWaits(Long monitorId);
+    
+    /**
+     * Get MySQL global status variables.
+     */
+    String getMySqlGlobalStatus(Long monitorId, String pattern);
+    
+    /**
+     * Explain a SELECT query for performance analysis.
+     */
+    String explainQuery(Long monitorId, String query);
+}
@@ -15,7 +15,6 @@
 * limitations under the License.
 */

-
 package org.apache.hertzbeat.ai.tools;

 /**
@@ -33,16 +32,17 @@ public interface MetricsTools {

    /**
     * Get historical metrics data for a monitor
-     * @param monitorId Monitor ID
-     * @param app Monitor type (e.g., "linux", "mysql", "http")
-     * @param metrics Metrics name (e.g., "system", "cpu", "memory")
-     * @param metric Specific metric field (e.g., "usage", "used", "available")
-     * @param label Label filter for specific instances
-     * @param history Time range (e.g., "1h", "6h", "24h", "7d")
+     *
+     * @param instance Instance identifier (e.g., "ip:port", "ip", or "domain")
+     * @param app      Monitor type (e.g., "linux", "mysql", "http")
+     * @param metrics  Metrics name (e.g., "system", "cpu", "memory")
+     * @param metric   Specific metric field (e.g., "usage", "used", "available")
+     * @param label    Label filter for specific instances
+     * @param history  Time range (e.g., "1h", "6h", "24h", "7d")
     * @param interval Whether to aggregate data with intervals
     * @return Historical metrics data formatted for display
     */
-    String getHistoricalMetrics(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval);
+    String getHistoricalMetrics(String instance, String app, String metrics, String metric, String label, String history, Boolean interval);

    /**
     * Check warehouse storage server status
@@ -15,7 +15,6 @@
 * limitations under the License.
 */

-
 package org.apache.hertzbeat.ai.tools;

 import java.util.List;
@@ -27,35 +26,45 @@ public interface MonitorTools {

    /**
     * Add a new monitor with comprehensive configuration
-     * 
-     * @param name Monitor name
-     * @param app Monitor type/application (e.g., 'linux', 'mysql', 'http')
-     * @param host Target host (IP address or domain name)
-     * @param port Target port (optional, depends on monitor type)
-     * @param intervals Collection interval in seconds (default: 600)
-     * @param username Username for authentication (optional)
-     * @param password Password for authentication (optional)
-     * @param database Database name (for database monitors)
-     * @param additionalParams Additional app-specific parameters as JSON string (optional)
+     *
+     * @param name        Monitor name
+     * @param app         Monitor type/application (e.g., 'linux', 'mysql', 'http')
+     * @param intervals   Collection interval in seconds (default: 600)
+     * @param params      Monitor-specific parameters as JSON string (e.g., host, port, username, password, etc.)
     * @param description Monitor description (optional)
     * @return Result message with monitor ID if successful
     */
    String addMonitor(
-            String name, 
-            String app, 
-            String host,
-            Integer port,
-            Integer intervals,
-            String username,
-            String password,
-            String database,
-            String additionalParams,
-            String description
+        String name,
+        String app,
+        Integer intervals,
+        String params,
+        String description
    );
-    
+
+    /**
+     * Add a new monitor with comprehensive configuration, methods specifically for hertzbeat ai
+     *
+     * @param conversationId Conversation ID
+     * @param name        Monitor name
+     * @param app         Monitor type/application (e.g., 'linux', 'mysql', 'http')
+     * @param intervals   Collection interval in seconds (default: 600)
+     * @param params      Monitor-specific parameters as JSON string (e.g., host, port, username, password, etc.)
+     * @param description Monitor description (optional)
+     * @return Result message with monitor ID if successful
+     */
+    String addMonitorProtected(
+        Long conversationId,
+        String name,
+        String app,
+        Integer intervals,
+        String params,
+        String description
+    );
+
    /**
     * List all available monitor types that can be added
-     * 
+     *
     * @param language Language code for localized names (e.g., 'en-US', 'zh-CN')
     * @return Formatted string list of available monitor types with descriptions
     */
@@ -63,35 +72,36 @@ public interface MonitorTools {

    /**
     * Comprehensive monitor querying with flexible filtering, pagination, and specialized views
-     * @param ids Specific monitor IDs to retrieve (optional)
-     * @param app Monitor type filter (linux, mysql, http, etc.)
-     * @param status Monitor status (1=online, 2=offline, 3=unreachable, 0=paused, 9=all)
-     * @param search Search in monitor names or hosts (partial matching)
-     * @param labels Label filters, format: 'key1:value1,key2:value2'
-     * @param sort Sort field (name, gmtCreate, gmtUpdate, status, app)
-     * @param order Sort order (asc, desc)
-     * @param pageIndex Page number starting from 0
-     * @param pageSize Items per page (1-100 recommended)
+     *
+     * @param ids          Specific monitor IDs to retrieve (optional)
+     * @param app          Monitor type filter (linux, mysql, http, etc.)
+     * @param status       Monitor status (1=online, 2=offline, 3=unreachable, 0=paused, 9=all)
+     * @param search       Search in monitor names or hosts (partial matching)
+     * @param labels       Label filters, format: 'key1:value1,key2:value2'
+     * @param sort         Sort field (name, gmtCreate, gmtUpdate, status, app)
+     * @param order        Sort order (asc, desc)
+     * @param pageIndex    Page number starting from 0
+     * @param pageSize     Items per page (1-100 recommended)
     * @param includeStats Include status statistics summary
     * @return Comprehensive monitor information with optional statistics
     */
    String queryMonitors(
-            List<Long> ids,
-            String app,
-            Byte status,
-            String search,
-            String labels,
-            String sort,
-            String order,
-            Integer pageIndex,
-            Integer pageSize,
-            Boolean includeStats);
+        List<Long> ids,
+        String app,
+        Byte status,
+        String search,
+        String labels,
+        String sort,
+        String order,
+        Integer pageIndex,
+        Integer pageSize,
+        Boolean includeStats);

    /**
     * Get parameter definitions required for a specific monitor type
-     * 
+     *
     * @param app Monitor type/application name (e.g., 'linux', 'mysql', 'redis')
     * @return Formatted string with parameter definitions including field names, types, and requirements
     */
-    String getMonitorAdditionalParams(String app);
+    String getMonitorParams(String app);
 }
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.tools;
+
+/**
+ * Interface for AI Schedule management tools.
+ * Allows AI to create, list, and manage scheduled tasks via natural language.
+ */
+public interface ScheduleTools {
+
+    /**
+     * Create a scheduled task to execute a skill periodically.
+     * @param skillName Name of the skill to schedule (e.g., daily_inspection)
+     * @param cronExpression Cron expression for scheduling (6-digit Spring format)
+     * @param description Human-readable description of the schedule
+     * @return Confirmation message with schedule details
+     */
+    String createSchedule(String skillName, String cronExpression, String description);
+
+    /**
+     * List all scheduled tasks for the current conversation.
+     * @return List of scheduled tasks with their status
+     */
+    String listSchedules();
+
+    /**
+     * Delete a scheduled task by ID.
+     * @param scheduleId ID of the schedule to delete
+     * @return Confirmation message
+     */
+    String deleteSchedule(Long scheduleId);
+
+    /**
+     * Enable or disable a scheduled task.
+     * @param scheduleId ID of the schedule
+     * @param enabled Whether to enable or disable
+     * @return Confirmation message
+     */
+    String toggleSchedule(Long scheduleId, boolean enabled);
+}
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.tools;
+
+/**
+ * Interface for AI Skill execution tools.
+ * Provides methods to list available skills and execute them.
+ */
+public interface SkillTools {
+
+    /**
+     * List all available diagnostic skills.
+     * @return JSON string containing skill metadata (name, description, parameters)
+     */
+    String listSkills();
+
+    /**
+     * Execute a diagnostic skill.
+     * @param skillName Name of the skill to execute
+     * @param paramsJson JSON string containing skill parameters (e.g., {"monitorId": 123})
+     * @return Skill execution result. For report-type skills, returns "[[SKILL_REPORT]]\n{content}"
+     */
+    String executeSkill(String skillName, String paramsJson);
+}
@@ -17,9 +17,9 @@

 package org.apache.hertzbeat.ai.tools.impl;

-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.ObjectNode;
 import com.usthe.sureness.subject.SubjectSum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.ai.config.McpContextHolder;
@@ -51,10 +51,9 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
    @Autowired
    private AppService appService;

-
    @Override
    @Tool(name = "create_alert_rule", description = """
-            ALERT RULE means when to alert a user
+            HertzBeat: ALERT RULE means when to alert a user
            THESE ARE ALERT RULES WITH THRESHOLD VALUES. USERS CAN SPECIFY THE THRESHOLD VALUES FOR EXAMPLE,
            IF THE USER SAYS "ALERT ME WHEN MY COST EXCEEDS 700, THE EXPRESSION SHOULD BE 'cost > 700' NOT 'cost < 700'.
            APPLY THE SAME LOGIC FOR LESS THAN OPERATOR.
@@ -75,30 +74,30 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
                8. based on the user's output, conditionally call the bind_monitors_to_alert_rule tool to bind monitors to the alert rule
             VERY VERY IMPORTANT:
                 - ALWAYS USE the value field from the get_apps_metrics_hierarchy's json response when creating alert expressions on the field parameters
-            
+
            EXAMPLES FOR FIELD CONDITION EXPRESSION( Do not copy these examples, they are just for reference ):
            These are all just examples, you can take inspiration from them and create a rule based on hierarchy, always ask the user for all params, do not assume them, even for these examples:
-            
+
            1. Kafka JVM Alert:
               - App: "kafka", Metric: "jvm_basic"
               - Field condition: equals(VmName, "myVM")
               - Field condition expression: equals(VmName, "myVM")
-            
+
            2. LLM Credits Alert:
               - App: "openai", Metric: "credit_grants"
               - Field condition: total_granted > some_value
               - Field condition  expression: total_granted > 1000
-            
+
            3. HBase Master Alert:
               - App: "hbase_master", Metric: "server"
               - Field condition: heap_memory_used > 80 or some_factor<100
               - Field condition  expression: heap_memory_used > 80 or some_factor<100
-            
+
            4. Complex OpenAI Credits Alert:
               - App: "openai", Metric: "credit_grants"
               - Field condition: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
               - Field condition expression: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
-            
+
            FIELD CONDITIONS GUIDANCE:
            - Field names come from metric's children in hierarchy (leaf nodes)
            - Use the "value" field from the metric's children, not the label when creating conditions
@@ -110,7 +109,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
            - String values should be quoted: equals(VmName, "my-vm")
            - Simple conditions: heap_memory_used > 80, total_granted <= 1000
            - Complex conditions: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
-            
+
            PRIORITY LEVELS:
            - 0: Critical (immediate action required)
            - 1: Warning (attention needed, default)
@@ -197,7 +196,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
                return expressionValidation; // Return expression validation error message
            }

-            String expr = String.format("equals(__app__,\"%s\") && equals(__metrics__,\"%s\") && %s", 
+            String expr = String.format("equals(__app__,\"%s\") && equals(__metrics__,\"%s\") && %s",
                    app.trim(), metrics.trim(), fieldConditions.trim());


@@ -243,7 +242,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
                    .datasource(datasource)
                    .enable(enable)
                    .build();
-            
+
            log.debug("Current security subject for addAlertDefine: {}", subjectSum);

            alertDefineService.addAlertDefine(alertDefine);
@@ -252,9 +251,9 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
            String bindingNote = String.format(" (Use bind_monitors_to_alert_rule tool to associate specific monitors)");

            log.info("Successfully created alert rule '{}' with ID: {}", name, alertDefine.getId());
-            
+
            StringBuilder response = new StringBuilder();
-            response.append(String.format("Successfully created %s alert rule '%s' with ID: %d\n", 
+            response.append(String.format("Successfully created %s alert rule '%s' with ID: %d\n",
                    type, name, alertDefine.getId()));
            response.append(String.format("Expression: %s\n", expr));
            response.append(String.format("Priority: %d (%s)\n", priority, severityLabel));
@@ -281,7 +280,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {

    @Override
    @Tool(name = "list_alert_rules", description = """
-            List existing alert rules with filtering options.
+            HertzBeat: List existing alert rules with filtering options.
            Shows configured thresholds and alert definitions.
            """)
    public String listAlertRules(
@@ -343,7 +342,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {

    @Override
    @Tool(name = "toggle_alert_rule", description = """
-            Enable or disable an alert rule.
+            HertzBeat: Enable or disable an alert rule.
            Allows activating or deactivating threshold monitoring.
            """)
    public String toggleAlertRule(
@@ -379,10 +378,9 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
        }
    }

-
    @Override
    @Tool(name = "get_alert_rule_details", description = """
-            Get detailed information about a specific alert rule.
+            HertzBeat: Get detailed information about a specific alert rule.
            Shows complete threshold configuration and rule settings.
            """)
    public String getAlertRuleDetails(
@@ -441,10 +439,10 @@ public class AlertDefineToolsImpl implements AlertDefineTools {

    @Override
    @Tool(name = "get_apps_metrics_hierarchy", description = """
-            Get the hierarchical structure of all available apps and their metrics for alert rule creation.
+            HertzBeat: Get the hierarchical structure of all available apps and their metrics for alert rule creation.
            This tool provides the exact app name, metric name and corresponding param names according to each metric.
            Returns structured JSON data showing the complete hierarchy with field parameters for alert expressions.
-            
+
            JSON Structure:
            - app: The application name
            - description: Tool description
@@ -454,7 +452,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
              - Non-leaf nodes have: children array
             VERY IMPORTANT:
              - ALWAYS USE the value field from the field parameters when creating alert expressions.
-            
+
            This structured data is needed to create proper alert expressions.
            """)
    public String getAppsMetricsHierarchy(
@@ -494,7 +492,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {

    @Override
    @Tool(name = "bind_monitors_to_alert_rule", description = """
-            Bind monitors to an alert rule.
+            HertzBeat: Bind monitors to an alert rule.
            Call this tool if users want to bind specific monitors to their alert rule.
            Get the right monitor ids for a particular app using the query_monitors tool.
            Get the alert rule ID from the create_alert_rule tool output OR use the list_alert_rules tool with app_name search filter, if the output of create_alert_rule is not applicable.
@@ -526,7 +524,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
            // Parse monitor IDs from comma-separated string
            String[] monitorIdArray = monitorIds.split(",");
            List<String> validMonitorIds = new ArrayList<>();
-            
+
            for (String monitorId : monitorIdArray) {
                String trimmedId = monitorId.trim();
                if (!trimmedId.isEmpty()) {
@@ -538,7 +536,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
                    }
                }
            }
-            
+
            if (validMonitorIds.isEmpty()) {
                return "Error: No valid monitor IDs provided";
            }
@@ -562,19 +560,19 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
            // Get the current expression and modify it
            String currentExpr = existingRule.getExpr();
            String newExpr;
-            
+
            // Check if the expression already has __instance__ conditions
            if (currentExpr.contains("__instance__")) {
                // Extract existing monitor IDs and merge with new ones
                List<String> existingMonitorIds = UtilityClass.extractExistingMonitorIds(currentExpr);
-                
+
                // Add new monitor IDs that aren't already present
                for (String newId : validMonitorIds) {
                    if (!existingMonitorIds.contains(newId)) {
                        existingMonitorIds.add(newId);
                    }
                }
-                
+
                String updatedMonitorCondition;
                if (existingMonitorIds.size() == 1) {
                    updatedMonitorCondition = String.format("equals(__instance__, \"%s\")", existingMonitorIds.get(0));
@@ -589,31 +587,31 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
                    conditionBuilder.append(")");
                    updatedMonitorCondition = conditionBuilder.toString();
                }
-                
+
                // Replace existing __instance__ conditions with updated ones
                newExpr = UtilityClass.replaceInstanceConditions(currentExpr, updatedMonitorCondition);
-                
+
                // Update the alert rule
                existingRule.setExpr(newExpr);
                log.debug("Current security subject for modifyAlertDefine: {}", subjectSum);

                alertDefineService.modifyAlertDefine(existingRule);
-                
+
                log.info("Successfully added monitors {} to existing bindings for alert rule ID: {}", validMonitorIds, ruleId);
-                return String.format("Successfully added %d new monitor(s) to alert rule ID %d.\nTotal bound monitors: %s\nUpdated expression: %s", 
+                return String.format("Successfully added %d new monitor(s) to alert rule ID %d.\nTotal bound monitors: %s\nUpdated expression: %s",
                    validMonitorIds.size(), ruleId, String.join(", ", existingMonitorIds), newExpr);
            }
-            
+
            // Insert the monitor condition after the metrics condition
            // Pattern: equals(__app__,"app") && equals(__metrics__,"metric") && [existing_conditions]
            // Result: equals(__app__,"app") && equals(__metrics__,"metric") && [monitor_condition] && [existing_conditions]
-            
+
            if (currentExpr.matches(".*equals\\(__app__,\"[^\"]+\"\\)\\s*&&\\s*equals\\(__metrics__,\"[^\"]+\"\\)\\s*&&\\s*.*")) {
                // Find the position after the metrics condition
                String metricsPattern = "equals\\(__metrics__,\"[^\"]+\"\\)";
                java.util.regex.Pattern regex = java.util.regex.Pattern.compile(metricsPattern);
                java.util.regex.Matcher matcher = regex.matcher(currentExpr);
-                
+
                if (matcher.find()) {
                    int metricsEnd = matcher.end();
                    // Find the " && " after the metrics condition
@@ -638,7 +636,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
            alertDefineService.modifyAlertDefine(existingRule);

            log.info("Successfully bound monitors {} to alert rule ID: {}", validMonitorIds, ruleId);
-            return String.format("Successfully bound %d monitor(s) to alert rule ID %d.\nMonitor IDs: %s\nUpdated expression: %s", 
+            return String.format("Successfully bound %d monitor(s) to alert rule ID %d.\nMonitor IDs: %s\nUpdated expression: %s",
                validMonitorIds.size(), ruleId, String.join(", ", validMonitorIds), newExpr);

        } catch (Exception e) {
@@ -647,7 +645,6 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
        }
    }

-
    /**
     * Validates that the app, metric, and field conditions are valid according to hierarchy
     * @param app App name to validate
@@ -15,7 +15,6 @@
 * limitations under the License.
 */

-
 package org.apache.hertzbeat.ai.tools.impl;

 import com.usthe.sureness.subject.SubjectSum;
@@ -33,7 +32,6 @@ import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.stereotype.Service;

-
 /**
 * Implementation of Alert Tools functionality for alarm data queries and management
 */
@@ -45,7 +43,7 @@ public class AlertToolsImpl implements AlertTools {

    @Override
    @Tool(name = "query_alerts", description = """
-            Query alerts with comprehensive filtering and pagination options.
+            HertzBeat: Query alerts with comprehensive filtering and pagination options.
            
            ALERT TYPES:
            - Pass alertType='single' for individual alert instances
@@ -193,10 +191,9 @@ public class AlertToolsImpl implements AlertTools {
        }
    }

-
    @Override
    @Tool(name = "get_alerts_summary", description = """
-            Get alerts summary statistics including total counts, status distribution, and recent trends.
+            HertzBeat: Get alerts summary statistics including total counts, status distribution, and recent trends.
            Returns comprehensive overview of the current alerting status across all monitors.
            """)
    public String getAlertsSummary() {
@@ -0,0 +1,313 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.tools.impl;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.Statement;
+import java.util.List;
+import java.util.Objects;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.tools.DatabaseTools;
+import org.apache.hertzbeat.common.entity.manager.Monitor;
+import org.apache.hertzbeat.common.entity.manager.Param;
+import org.apache.hertzbeat.common.util.AesUtil;
+import org.apache.hertzbeat.common.util.CommonUtil;
+import org.apache.hertzbeat.common.util.IpDomainUtil;
+import org.apache.hertzbeat.common.util.JdbcUrlSafetyUtil;
+import org.apache.hertzbeat.manager.pojo.dto.MonitorDto;
+import org.apache.hertzbeat.manager.service.MonitorService;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Implementation of Database Tools for AI-powered database diagnostics.
+ * Provides predefined safe queries - does NOT allow arbitrary SQL execution.
+ */
+@Slf4j
+@Service
+public class DatabaseToolsImpl implements DatabaseTools {
+
+    private static final int QUERY_TIMEOUT_SECONDS = 10;
+    private static final int MAX_ROWS = 100;
+    
+    // Allowed database types
+    private static final List<String> SUPPORTED_PLATFORMS = List.of("mysql", "mariadb");
+
+    private final MonitorService monitorService;
+
+    @Autowired
+    public DatabaseToolsImpl(MonitorService monitorService) {
+        this.monitorService = monitorService;
+    }
+
+    @Override
+    @Tool(name = "get_mysql_slow_queries", description = "Get MySQL slow query statistics from performance_schema. "
+            + "Returns top N slow queries sorted by average execution time. "
+            + "Requires the monitor to be a MySQL type with proper credentials.")
+    public String getMySqlSlowQueries(
+            @ToolParam(description = "Monitor ID of the MySQL instance", required = true) Long monitorId,
+            @ToolParam(description = "Maximum number of slow queries to return (default: 10, max: 50)", required = false) Integer limit) {
+        
+        int queryLimit = (limit == null || limit <= 0) ? 10 : Math.min(limit, 50);
+        
+        String sql = "SELECT SCHEMA_NAME as db, "
+                + "DIGEST_TEXT as query, "
+                + "COUNT_STAR as exec_count, "
+                + "ROUND(AVG_TIMER_WAIT/1000000000, 2) as avg_time_ms, "
+                + "ROUND(SUM_TIMER_WAIT/1000000000, 2) as total_time_ms, "
+                + "SUM_ROWS_EXAMINED as rows_examined, "
+                + "SUM_ROWS_SENT as rows_sent "
+                + "FROM performance_schema.events_statements_summary_by_digest "
+                + "WHERE SCHEMA_NAME IS NOT NULL "
+                + "ORDER BY AVG_TIMER_WAIT DESC "
+                + "LIMIT " + queryLimit;
+        
+        return executeQuery(monitorId, sql, "MySQL Slow Query Statistics");
+    }
+
+    @Override
+    @Tool(name = "get_mysql_process_list", description = "Get MySQL current process list. "
+            + "Shows all active connections and their current state. "
+            + "Useful for identifying blocking queries or connection issues.")
+    public String getMySqlProcessList(
+            @ToolParam(description = "Monitor ID of the MySQL instance", required = true) Long monitorId) {
+        
+        String sql = "SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, "
+                + "LEFT(INFO, 200) as QUERY "
+                + "FROM information_schema.PROCESSLIST "
+                + "WHERE COMMAND != 'Sleep' "
+                + "ORDER BY TIME DESC "
+                + "LIMIT 50";
+        
+        return executeQuery(monitorId, sql, "MySQL Process List");
+    }
+
+    @Override
+    @Tool(name = "get_mysql_lock_waits", description = "Get MySQL lock wait information. "
+            + "Shows current lock waits and blocking transactions. "
+            + "Useful for diagnosing deadlocks and lock contention issues.")
+    public String getMySqlLockWaits(
+            @ToolParam(description = "Monitor ID of the MySQL instance", required = true) Long monitorId) {
+        
+        // Use performance_schema for MySQL 8.0+ (innodb_lock_waits was removed)
+        String sql = "SELECT "
+                + "r.ENGINE_TRANSACTION_ID as waiting_trx_id, "
+                + "r.THREAD_ID as waiting_thread, "
+                + "r.OBJECT_SCHEMA as waiting_schema, "
+                + "r.OBJECT_NAME as waiting_table, "
+                + "r.LOCK_TYPE as waiting_lock_type, "
+                + "r.LOCK_MODE as waiting_lock_mode, "
+                + "b.ENGINE_TRANSACTION_ID as blocking_trx_id, "
+                + "b.THREAD_ID as blocking_thread "
+                + "FROM performance_schema.data_lock_waits w "
+                + "JOIN performance_schema.data_locks b ON b.ENGINE_LOCK_ID = w.BLOCKING_ENGINE_LOCK_ID "
+                + "JOIN performance_schema.data_locks r ON r.ENGINE_LOCK_ID = w.REQUESTING_ENGINE_LOCK_ID "
+                + "LIMIT 20";
+        
+        return executeQuery(monitorId, sql, "MySQL Lock Waits");
+    }
+
+    @Override
+    @Tool(name = "get_mysql_global_status", description = "Get MySQL global status variables. "
+            + "Returns server status matching the given pattern. "
+            + "Examples: 'Slow%' for slow query stats, 'Threads%' for thread stats.")
+    public String getMySqlGlobalStatus(
+            @ToolParam(description = "Monitor ID of the MySQL instance", required = true) Long monitorId,
+            @ToolParam(description = "Pattern to filter status variables (e.g., 'Slow%', 'Threads%')", required = false) String pattern) {
+        
+        String filterPattern = (pattern == null || pattern.isEmpty()) ? "%" : pattern;
+        // Sanitize pattern to prevent SQL injection
+        filterPattern = filterPattern.replaceAll("[^a-zA-Z0-9_%]", "");
+        
+        String sql = "SHOW GLOBAL STATUS LIKE '" + filterPattern + "'";
+        
+        return executeQuery(monitorId, sql, "MySQL Global Status");
+    }
+
+    @Override
+    @Tool(name = "explain_query", description = "Explain a SELECT query for performance analysis. "
+            + "ONLY SELECT queries are allowed for security reasons. "
+            + "Returns the execution plan to help optimize the query.")
+    public String explainQuery(
+            @ToolParam(description = "Monitor ID of the MySQL instance", required = true) Long monitorId,
+            @ToolParam(description = "SELECT query to explain (must start with SELECT)", required = true) String query) {
+        
+        if (query == null || query.trim().isEmpty()) {
+            return "Error: Query cannot be empty";
+        }
+        
+        String trimmedQuery = query.trim();
+        
+        // Security check: only allow SELECT statements
+        if (!trimmedQuery.toUpperCase().startsWith("SELECT")) {
+            return "Error: Only SELECT queries are allowed for EXPLAIN. "
+                    + "The query must start with 'SELECT'.";
+        }
+        
+        // Additional security checks
+        String lowerQuery = trimmedQuery.toLowerCase();
+        if (lowerQuery.contains(";") || lowerQuery.contains("--") 
+                || lowerQuery.contains("/*") || lowerQuery.contains("*/")) {
+            return "Error: Query contains invalid characters. "
+                    + "Semicolons and comments are not allowed.";
+        }
+        
+        String sql = "EXPLAIN " + trimmedQuery;
+        
+        return executeQuery(monitorId, sql, "Query Execution Plan");
+    }
+
+    /**
+     * Execute a predefined safe query against the database.
+     */
+    private String executeQuery(Long monitorId, String sql, String title) {
+        log.info("Executing database query for monitor {}: {}", monitorId, title);
+        
+        try {
+            // Get monitor DTO which includes both monitor and params
+            MonitorDto monitorDto = monitorService.getMonitorDto(monitorId);
+            if (monitorDto == null || monitorDto.getMonitor() == null) {
+                return "Error: Monitor not found with ID: " + monitorId;
+            }
+            
+            Monitor monitor = monitorDto.getMonitor();
+            
+            if (!SUPPORTED_PLATFORMS.contains(monitor.getApp().toLowerCase())) {
+                return "Error: This tool only supports MySQL/MariaDB. "
+                        + "Current monitor type: " + monitor.getApp();
+            }
+            
+            // Get connection parameters from MonitorDto
+            List<Param> params = monitorDto.getParams();
+            if (params == null || params.isEmpty()) {
+                return "Error: Monitor has no connection parameters configured.";
+            }
+            
+            String host = getParamValue(params, "host");
+            String port = getParamValue(params, "port");
+            String database = getParamValue(params, "database");
+            String username = getParamValue(params, "username");
+            String password = getParamValue(params, "password");
+            
+            // Decrypt password if it's encrypted
+            if (password != null && AesUtil.isCiphertext(password)) {
+                password = AesUtil.aesDecode(password);
+            }
+            
+            if (host == null || username == null) {
+                return "Error: Monitor connection parameters incomplete. "
+                        + "Ensure host and username are configured.";
+            }
+            
+            // Build connection URL
+            String url = buildJdbcUrl(monitor.getApp(), host, port, database);
+            
+            // Execute query
+            return executeAndFormat(url, username, password, sql, title);
+            
+        } catch (Exception e) {
+            log.error("Error executing database query: {}", e.getMessage(), e);
+            return "Error executing query: " + e.getMessage();
+        }
+    }
+    
+    private String getParamValue(List<Param> params, String field) {
+        return params.stream()
+                .filter(p -> field.equals(p.getField()))
+                .map(Param::getParamValue)
+                .filter(Objects::nonNull)
+                .findFirst()
+                .orElse(null);
+    }
+    
+    private String buildJdbcUrl(String platform, String host, String port, String database) {
+        String effectivePort = (port == null || port.isEmpty()) ? "3306" : port;
+        // host, port and database come from monitor parameters and are concatenated into the url,
+        // so they must not carry url syntax of their own
+        String effectiveDb = JdbcUrlSafetyUtil.requireSafeDatabaseName(database);
+        if (!IpDomainUtil.validateIpDomain(host)) {
+            throw new IllegalArgumentException("Invalid database host: " + host);
+        }
+        if (!CommonUtil.isNumeric(effectivePort)) {
+            throw new IllegalArgumentException("Invalid database port: " + effectivePort);
+        }
+
+        String url = "jdbc:mysql://" + host + ":" + effectivePort + "/" + effectiveDb
+                + "?useUnicode=true&characterEncoding=utf-8&useSSL=false"
+                + "&allowPublicKeyRetrieval=true&connectTimeout=5000";
+        JdbcUrlSafetyUtil.requireSafeJdbcUrl(url);
+        return url;
+    }
+    
+    private String executeAndFormat(String url, String username, String password, 
+            String sql, String title) throws Exception {
+        
+        StringBuilder result = new StringBuilder();
+        result.append("=== ").append(title).append(" ===\n\n");
+        
+        try (Connection conn = DriverManager.getConnection(url, username, password);
+             Statement stmt = conn.createStatement()) {
+            
+            stmt.setQueryTimeout(QUERY_TIMEOUT_SECONDS);
+            stmt.setMaxRows(MAX_ROWS);
+            
+            try (ResultSet rs = stmt.executeQuery(sql)) {
+                ResultSetMetaData meta = rs.getMetaData();
+                int columnCount = meta.getColumnCount();
+                
+                // Build header
+                StringBuilder header = new StringBuilder();
+                StringBuilder separator = new StringBuilder();
+                for (int i = 1; i <= columnCount; i++) {
+                    String columnName = meta.getColumnLabel(i);
+                    header.append(String.format("%-20s", columnName));
+                    separator.append("-".repeat(20));
+                }
+                result.append(header).append("\n");
+                result.append(separator).append("\n");
+                
+                // Build rows
+                int rowCount = 0;
+                while (rs.next()) {
+                    StringBuilder row = new StringBuilder();
+                    for (int i = 1; i <= columnCount; i++) {
+                        String value = rs.getString(i);
+                        if (value == null) {
+                            value = "NULL";
+                        } else if (value.length() > 50) {
+                            value = value.substring(0, 47) + "...";
+                        }
+                        row.append(String.format("%-20s", value));
+                    }
+                    result.append(row).append("\n");
+                    rowCount++;
+                }
+                
+                result.append("\n").append("Total: ").append(rowCount).append(" rows");
+            }
+        }
+        
+        return result.toString();
+    }
+}
@@ -15,7 +15,6 @@
 * limitations under the License.
 */

-
 package org.apache.hertzbeat.ai.tools.impl;

 import com.usthe.sureness.subject.SubjectSum;
@@ -47,7 +46,7 @@ public class MetricsToolsImpl implements MetricsTools {

    @Override
    @Tool(name = "query_realtime_metrics", description = """
-            Get the supported monitor types/names from the list_monitor_types tool, make sure to use right name in the next call
+            HertzBeat: Get the supported monitor types/names from the list_monitor_types tool, make sure to use right name in the next call
            Use the query_monitors tool to find monitor IDs in case the user does not tell the id explicitly. You might have to use this multiple times based on the user's query
            Get real-time metrics data for a specific monitor.
            Returns current metrics values including CPU, memory, disk usage, etc.
@@ -144,15 +143,15 @@ public class MetricsToolsImpl implements MetricsTools {

    @Override
    @Tool(name = "get_historical_metrics", description = """
-            Get historical metrics data for analysis and trending.
+            HertzBeat: Get historical metrics data for analysis and trending.
            Returns time-series data for specified metrics over a time range.
            Use the query_monitors tool to find the correct monitor IDs/ name or type for the monitor(s) user asked the metrics for
-            Pass that name into the get_apps_metrics_hierarchy tool to get the metrics hierarchy i.e metrics and the field paramater
+            Pass that name into the get_apps_metrics_hierarchy tool to get the metrics hierarchy i.e metrics and the field parameter
            DO NOT USE THE LABEL FIELD ALWAYS USE THE VALUE FIELD FROM THE HIERARCHY JSON
            Ask user to provide the filters for labels, history and interval aggregation
            """)
    public String getHistoricalMetrics(
-            @ToolParam(description = "Monitor ID", required = true) Long monitorId,
+            @ToolParam(description = "Instance identifier (e.g., 'ip:port', 'ip', or 'domain')") String instance,
            @ToolParam(description = "Monitor type (e.g., 'linux', 'mysql', 'http')", required = true) String app,
            @ToolParam(description = "Metrics name (e.g., 'target', 'cpu', 'memory')", required = true) String metrics,
            @ToolParam(description = "Field Parameter (e.g., 'usage', 'used', 'available')", required = false) String fieldParameter,
@@ -161,7 +160,7 @@ public class MetricsToolsImpl implements MetricsTools {
            @ToolParam(description = "Whether to aggregate data with intervals", required = false) Boolean interval) {

        try {
-            log.info("Getting historical metrics for monitor {} and metrics {}", monitorId, metrics);
+            log.info("Getting historical metrics for monitor instance {} and metrics {}", instance, metrics);

            if (history == null || history.trim().isEmpty()) {
                history = "24h";
@@ -170,15 +169,15 @@ public class MetricsToolsImpl implements MetricsTools {
                interval = true;
            }

-            MetricsHistoryData historyData = metricsDataService.getMetricHistoryData(
-                    monitorId, app, metrics, fieldParameter, label, history, interval);
+            MetricsHistoryData historyData = metricsDataService.getMetricHistoryData(instance,
+                    app, metrics, fieldParameter, history, interval);

            if (historyData == null) {
-                return String.format("No historical metrics data found for monitor ID %d and metrics '%s'", monitorId, metrics);
+                return String.format("No historical metrics data found for monitor %s and metrics '%s'", instance, metrics);
            }

            StringBuilder response = new StringBuilder();
-            response.append("HISTORICAL METRICS: ").append(metrics).append(" (Monitor ID: ").append(monitorId).append(")\n");
+            response.append("HISTORICAL METRICS: ").append(metrics).append(" (Monitor ID: ").append(instance).append(")\n");
            response.append("Time Range: ").append(history).append(" | Interval Aggregation: ").append(interval).append("\n");
            response.append("=".repeat(60)).append("\n\n");

@@ -223,10 +222,9 @@ public class MetricsToolsImpl implements MetricsTools {
        }
    }

-
    @Override
    @Tool(name = "get_warehouse_status", description = """
-            Check the status of the metrics storage warehouse system.
+            HertzBeat: Check the status of the metrics storage warehouse system.
            Returns whether the metrics storage is operational and accessible.
            """)
    public String getWarehouseStatus() {
@@ -18,8 +18,17 @@
 package org.apache.hertzbeat.ai.tools.impl;

 import com.usthe.sureness.subject.SubjectSum;
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.dao.ChatConversationDao;
+import org.apache.hertzbeat.common.entity.ai.ChatConversation;
+import org.apache.hertzbeat.common.util.AesUtil;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.apache.hertzbeat.manager.pojo.dto.MonitorDto;
+import org.apache.hertzbeat.manager.pojo.dto.ParamDefineInfo;
 import org.apache.hertzbeat.manager.service.MonitorService;
 import org.apache.hertzbeat.manager.service.AppService;
 import org.apache.hertzbeat.ai.utils.UtilityClass;
@@ -31,7 +40,7 @@ import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
 import org.apache.hertzbeat.common.entity.manager.Param;
-import org.apache.hertzbeat.common.entity.manager.ParamDefine;
+import tools.jackson.core.type.TypeReference;

 import java.util.ArrayList;
 import java.util.List;
@@ -43,77 +52,79 @@ import java.util.Map;
@Slf4j
@Service
 public class MonitorToolsImpl implements MonitorTools {
+
    @Autowired
    private MonitorService monitorService;
    @Autowired
    private AppService appService;
+    @Autowired
+    private ChatConversationDao conversationDao;


    /**
-     * Tool to query monitor information with flexible filtering and pagination.
-     * Supports filtering by monitor IDs, type, status, host, labels, sorting, and
-     * pagination.
-     * Returns detailed monitor information including ID, name, type, host, and status.
+     * Tool to query monitor information with flexible filtering and pagination. Supports filtering by monitor IDs,
+     * type, status, host, labels, sorting, and pagination. Returns detailed monitor information including ID, name,
+     * type, host, and status.
     */
    @Override
-    @Tool(name = "query_monitors", description = """ 
-            Query Existing/configured monitors in HertzBeat.
-            This tool retrieves monitors based on various filters and parameters.
-            Comprehensive monitor querying with flexible filtering, pagination, and specialized views.
-            
-            MONITOR STATUSES:
-            - status=1: Online/Active monitors (healthy, responding normally)
-            - status=2: Offline monitors (not responding, connection failed)
-            - status=3: Unreachable monitors (network/connectivity issues)
-            - status=0: Paused monitors (manually disabled/suspended)
-            - status=9 or null: All monitors regardless of status (default)
-            
-            COMMON USE CASES & PARAMETER COMBINATIONS:
-            
-            1. BASIC MONITOR LISTING:
-               - Default: No parameters (shows all monitors, 8 per page)
-               - By type: app='linux' (show only Linux monitors)
-               - Search: search='web' (find monitors with 'web' in name/host)
-            
-            2. STATUS-BASED QUERIES:
-               - Healthy monitors: status=1, pageSize=50
-               - Problem monitors: status=2 or status=3, pageSize=50
-               - Offline monitors only: status=2
-               - Unreachable monitors only: status=3
-               - Paused monitors: status=0
-            
-            3. MONITORING HEALTH OVERVIEW:
-               - All statuses with statistics: status=9, includeStats=true, pageSize=100
-               - Unhealthy monitors: Pass both status=2 AND status=3 (make 2 separate calls)
-            
-            4. ADVANCED FILTERING:
-               - Specific monitor types: app='mysql', status=1 (healthy MySQL monitors)
-               - Label-based: labels='env:prod,critical:true'
-               - Host search: search='192.168' (find by IP pattern)
-               - Monitor IDs: ids=[1,2,3] (specific monitors by ID)
-            
-            5. SORTING & PAGINATION:
-               - Recently updated: sort='gmtUpdate', order='desc'
-               - Alphabetical: sort='name', order='asc'
-               - By creation: sort='gmtCreate', order='desc' (newest first)
-               - Large datasets: pageSize=50-100 for bulk operations
-            
-            RESPONSE FORMAT:
-            - includeStats=true: Adds status distribution summary at top
-            - Default: Simple list with ID, name, type, host, status
-            - Shows total count and pagination info
-            """)
+    @Tool(name = "query_monitors", description = """
+        HertzBeat: Query Existing/configured monitors in HertzBeat.
+        This tool retrieves monitors based on various filters and parameters.
+        Comprehensive monitor querying with flexible filtering, pagination, and specialized views.
+
+        MONITOR STATUSES:
+        - status=1: Online/Active monitors (healthy, responding normally)
+        - status=2: Offline monitors (not responding, connection failed)
+        - status=3: Unreachable monitors (network/connectivity issues)
+        - status=0: Paused monitors (manually disabled/suspended)
+        - status=9 or null: All monitors regardless of status (default)
+
+        COMMON USE CASES & PARAMETER COMBINATIONS:
+
+        1. BASIC MONITOR LISTING:
+           - Default: No parameters (shows all monitors, 8 per page)
+           - By type: app='linux' (show only Linux monitors)
+           - Search: search='web' (find monitors with 'web' in name/host)
+
+        2. STATUS-BASED QUERIES:
+           - Healthy monitors: status=1, pageSize=50
+           - Problem monitors: status=2 or status=3, pageSize=50
+           - Offline monitors only: status=2
+           - Unreachable monitors only: status=3
+           - Paused monitors: status=0
+
+        3. MONITORING HEALTH OVERVIEW:
+           - All statuses with statistics: status=9, includeStats=true, pageSize=100
+           - Unhealthy monitors: Pass both status=2 AND status=3 (make 2 separate calls)
+
+        4. ADVANCED FILTERING:
+           - Specific monitor types: app='mysql', status=1 (healthy MySQL monitors)
+           - Label-based: labels='env:prod,critical:true'
+           - Host search: search='192.168' (find by IP pattern)
+           - Monitor IDs: ids=[1,2,3] (specific monitors by ID)
+
+        5. SORTING & PAGINATION:
+           - Recently updated: sort='gmtUpdate', order='desc'
+           - Alphabetical: sort='name', order='asc'
+           - By creation: sort='gmtCreate', order='desc' (newest first)
+           - Large datasets: pageSize=50-100 for bulk operations
+
+        RESPONSE FORMAT:
+        - includeStats=true: Adds status distribution summary at top
+        - Default: Simple list with ID, name, type, host, status
+        - Shows total count and pagination info
+        """)
    public String queryMonitors(
-            @ToolParam(description = "Specific monitor IDs to retrieve (optional)", required = false) List<Long> ids,
-            @ToolParam(description = "Monitor type filter: 'linux', 'mysql', 'http', 'redis', etc. (optional)", required = false) String app,
-            @ToolParam(description = "Monitor status: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all (default: 9)", required = false) Byte status,
-            @ToolParam(description = "Search in monitor names or hosts (partial matching)", required = false) String search,
-            @ToolParam(description = "Label filters, format: 'key1:value1,key2:value2'", required = false) String labels,
-            @ToolParam(description = "Sort field: 'name', 'gmtCreate', 'gmtUpdate', 'status', 'app' (default: gmtCreate)", required = false) String sort,
-            @ToolParam(description = "Sort order: 'asc' (ascending) or 'desc' (descending, default)", required = false) String order,
-            @ToolParam(description = "Page number starting from 0 (default: 0)", required = false) Integer pageIndex,
-            @ToolParam(description = "Items per page: 1-100 recommended (default: 20)", required = false) Integer pageSize,
-            @ToolParam(description = "Include status statistics summary (default: false)", required = false) Boolean includeStats) {
+        @ToolParam(description = "Specific monitor IDs to retrieve (optional)", required = false) List<Long> ids,
+        @ToolParam(description = "Monitor type filter: 'linux', 'mysql', 'http', 'redis', etc. (optional)", required = false) String app,
+        @ToolParam(description = "Monitor status: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all (default: 9)", required = false) Byte status,
+        @ToolParam(description = "Search in monitor names or hosts (partial matching)", required = false) String search,
+        @ToolParam(description = "Label filters, format: 'key1:value1,key2:value2'", required = false) String labels,
+        @ToolParam(description = "Sort field: 'name', 'gmtCreate', 'gmtUpdate', 'status', 'app' (default: gmtCreate)", required = false) String sort,
+        @ToolParam(description = "Sort order: 'asc' (ascending) or 'desc' (descending, default)", required = false) String order,
+        @ToolParam(description = "Page number starting from 0 (default: 0)", required = false) Integer pageIndex,
+        @ToolParam(description = "Items per page: 1-100 recommended (default: 20)", required = false) Integer pageSize,
+        @ToolParam(description = "Include status statistics summary (default: false)", required = false) Boolean includeStats) {
        try {
            // Set defaults
            if (pageSize == null || pageSize <= 0) {
@@ -125,32 +136,32 @@ public class MonitorToolsImpl implements MonitorTools {
            if (includeStats == null) {
                includeStats = false;
            }
-            
+
            SubjectSum subjectSum = McpContextHolder.getSubject();
            log.debug("Current security subject: {}", subjectSum);

            Page<Monitor> result = monitorService.getMonitors(
-                    ids, app, search, status, sort, order, pageIndex, pageSize, labels);
+                ids, app, search, status, sort, order, pageIndex, pageSize, labels);
            log.debug("MonitorService.getMonitors result: {}", result);
-            
+
            StringBuilder response = new StringBuilder();
            response.append("MONITOR QUERY RESULTS\n");
            response.append("====================\n\n");
-            
+
            // Include statistics if requested
            if (includeStats) {
                // Get status distribution by calling with different status values
-                long onlineCount = monitorService.getMonitors(null, app, search, (byte) 1, null, null, 0, 1000, labels).getTotalElements();
-                long offlineCount = monitorService.getMonitors(null, app, search, (byte) 2, null, null, 0, 1000, labels).getTotalElements();
-                long unreachableCount = monitorService.getMonitors(null, app, search, (byte) 3, null, null, 0, 1000, labels).getTotalElements();
-                long pausedCount = monitorService.getMonitors(null, app, search, (byte) 0, null, null, 0, 1000, labels).getTotalElements();
-                
+                long onlineCount = monitorService.getMonitors(null, app, search, (byte) 1, "id", "asc", 0, 1, labels).getTotalElements();
+                long offlineCount = monitorService.getMonitors(null, app, search, (byte) 2, "id", "asc", 0, 1, labels).getTotalElements();
+                long unreachableCount = monitorService.getMonitors(null, app, search, (byte) 3, "id", "asc", 0, 1, labels).getTotalElements();
+                long pausedCount = monitorService.getMonitors(null, app, search, (byte) 0, "id", "asc", 0, 1, labels).getTotalElements();
+
                response.append("STATUS OVERVIEW:\n");
                response.append("- Online: ").append(onlineCount).append("\n");
-                response.append("- Offline: ").append(offlineCount).append("\n"); 
+                response.append("- Offline: ").append(offlineCount).append("\n");
                response.append("- Unreachable: ").append(unreachableCount).append("\n");
                response.append("- Paused: ").append(pausedCount).append("\n");
-                
+
                long total = onlineCount + offlineCount + unreachableCount + pausedCount;
                if (total > 0) {
                    double healthPercentage = (onlineCount * 100.0) / total;
@@ -158,48 +169,48 @@ public class MonitorToolsImpl implements MonitorTools {
                }
                response.append("\n");
            }
-            
+
            response.append("Query Results: ").append(result.getContent().size())
-                   .append(" monitors (Total: ").append(result.getTotalElements()).append(")\n");
-            
+                .append(" monitors (Total: ").append(result.getTotalElements()).append(")\n");
+
            if (result.getTotalPages() > 1) {
-                response.append("Page ").append(pageIndex + 1).append(" of ").append(result.getTotalPages()).append("\n");
+                response.append("Page ").append(pageIndex + 1).append(" of ").append(result.getTotalPages())
+                    .append("\n");
            }
            response.append("\n");
-            
+
            for (Monitor monitor : result.getContent()) {
                response.append("ID: ").append(monitor.getId())
-                       .append(" | Name: ").append(monitor.getName())
-                       .append(" | Type: ").append(monitor.getApp())
-                       .append(" | Host: ").append(monitor.getHost())
-                       .append(" | Status: ").append(UtilityClass.getStatusText(monitor.getStatus()));
-                       
+                    .append(" | Name: ").append(monitor.getName())
+                    .append(" | Type: ").append(monitor.getApp())
+                    .append(" | Instance: ").append(monitor.getInstance())
+                    .append(" | Status: ").append(UtilityClass.getStatusText(monitor.getStatus()));
+
                // Add creation date for better context
                if (monitor.getGmtCreate() != null) {
                    response.append(" | Created: ").append(monitor.getGmtCreate().toString(), 0, 10);
                }
                response.append("\n");
            }
-            
+
            if (result.getContent().isEmpty()) {
                response.append("No monitors found matching the specified criteria.\n");
                response.append("Try adjusting your filters or search terms.");
            }
-            
+
            return response.toString();
        } catch (Exception e) {
            return "Error retrieving monitors: " + e.getMessage();
        }
    }

-
    @Override
    @Tool(name = "add_monitor", description = """
-            Add a new monitoring target to HertzBeat with comprehensive configuration.
+            HertzBeat: Add a new monitoring target to HertzBeat with comprehensive configuration.
            This tool dynamically handles different parameter requirements for each monitor type.
-            
+
            This tool creates monitors with proper app-specific parameters.
-            
+
            *********
            VERY IMPORTANT:
            ALWAYS use get_monitor_additional_params to check the additional required parameters for the chosen type before adding a monitor or even mentioning it.
@@ -207,41 +218,80 @@ public class MonitorToolsImpl implements MonitorTools {
            Use the information obtained from this to query user for parameters.
            If the User has not given any parameters, ask them to provide the necessary parameters, until all the necessary parameters are provided.
            **********
-            
+
            Examples of natural language requests this tool handles:
            - "Monitor website example.com with HTTPS on port 443"
            - "Add MySQL monitoring for database server at 192.168.1.10 with user admin"
            - "Monitor Linux server health on host server.company.com via SSH"
            - "Set up Redis monitoring on localhost port 6379 with password"
-            
-            PARAMETER MAPPING: The tool intelligently maps common parameters:
-            - host: Target server/domain
-            - port: Service port (auto-detected if not specified)
-            - username: Authentication username
-            - password: Authentication password
-            - database: Database name (for DB monitors)
-            - additionalParams: JSON string for app-specific parameters (to be obtained from get_monitor_param_defines)
-            
-            ADDITIONAL PARAMETERS EXAMPLES:
-            - Website: {"uri":"/api/health", "ssl":"true", "method":"POST"}
-            - Linux: {"privateKey":"ssh-key-content", "script":"custom-script"}
-            - Database: {"url":"jdbc:mysql://custom", "timeout":"10000"}
+
+            PARAMETER MAPPING: Use the 'params' parameter to pass all monitor-specific configuration.
+            The params should be a JSON string containing key-value pairs for the monitor type.
+            Use get_monitor_additional_params tool to see what parameters are required for each monitor type.
+
+            PARAMS EXAMPLES:
+            - Website: {"host":"example.com", "port":"443", "uri":"/api/health", "ssl":"true", "method":"GET"}
+            - Linux: {"host":"192.168.1.10", "port":"22", "username":"root", "password":"xxx"}
+            - MySQL: {"host":"db.server.com", "port":"3306", "username":"admin", "password":"xxx", "database":"mydb"}
+            - Redis: {"host":"redis.server.com", "port":"6379", "password":"xxx"}
            """)
    public String addMonitor(
-            @ToolParam(description = "Monitor name (required)", required = true) String name,
-            @ToolParam(description = "Monitor type: website, mysql, postgresql, redis, linux, windows, etc.", required = true) String app,
-            @ToolParam(description = "Target host: IP address or domain name", required = true) String host,
-            @ToolParam(description = "Target port (optional, auto-detected if not specified)", required = false) Integer port,
-            @ToolParam(description = "Collection interval in seconds (default: 600)", required = false) Integer intervals,
-            @ToolParam(description = "Username for authentication (optional)", required = false) String username,
-            @ToolParam(description = "Password for authentication (optional)", required = false) String password,
-            @ToolParam(description = "Database name (for database monitors)", required = false) String database,
-            @ToolParam(description = "Additional app-specific parameters as JSON: {\"uri\":\"/api\", \"ssl\":\"true\", \"method\":\"POST\"}", required = false) String additionalParams,
-            @ToolParam(description = "Monitor description (optional)", required = false) String description) {
-        
+        @ToolParam(description = "Monitor name (required)", required = true) String name,
+        @ToolParam(description = "Monitor type: website, mysql, postgresql, redis, linux, windows, etc.", required = true) String app,
+        @ToolParam(description = "Collection interval in seconds (default: 600)", required = false) Integer intervals,
+        @ToolParam(description = "Monitor-specific parameters as JSON string. "
+            + "Use get_monitor_additional_params to see required fields. "
+            + "Example: {\"host\":\"192.168.1.1\", \"port\":\"22\", \"username\":\"root\"}",
+            required = true) String params,
+        @ToolParam(description = "Monitor description (optional)", required = false) String description) {
+        return addMonitorProtected(null, name, app, intervals, params, description);
+    }
+
+    @Override
+    @Tool(name = "add_monitor_protected", description = """
+        HertzBeat: Add a new monitoring target to HertzBeat with comprehensive configuration.
+        This tool dynamically handles different parameter requirements for each monitor type.
+
+        This tool creates monitors with proper app-specific parameters.
+
+        *********
+        VERY IMPORTANT:
+        ALWAYS use get_monitor_additional_params to check the additional required parameters for the chosen type before adding a monitor or even mentioning it.
+        Use list_monitor_types tool to see available monitor type names to use here in the app parameter.
+        Use the information obtained from this to query user for parameters.
+        If the User has not given any parameters, ask them to provide the necessary parameters, until all the necessary parameters are provided.
+        If the conversation ID is unknown, please call the `add_monitor` method.
+        **********
+
+        Examples of natural language requests this tool handles:
+        - "Monitor website example.com with HTTPS on port 443"
+        - "Add MySQL monitoring for database server at 192.168.1.10 with user admin"
+        - "Monitor Linux server health on host server.company.com via SSH"
+        - "Set up Redis monitoring on localhost port 6379 with password"
+
+        PARAMETER MAPPING: Use the 'params' parameter to pass all monitor-specific configuration.
+        The params should be a JSON string containing key-value pairs for the monitor type.
+        Use get_monitor_additional_params tool to see what parameters are required for each monitor type.
+
+        PARAMS EXAMPLES:
+        - Website: {"host":"example.com", "port":"443", "uri":"/api/health", "ssl":"true", "method":"GET"}
+        - Linux: {"host":"192.168.1.10", "port":"22", "username":"root", "password":"xxx"}
+        - MySQL: {"host":"db.server.com", "port":"3306", "username":"admin", "password":"xxx", "database":"mydb"}
+        - Redis: {"host":"redis.server.com", "port":"6379", "password":"xxx"}
+        """)
+    public String addMonitorProtected(
+        @ToolParam(description = "The id for current conversation (required)", required = true) Long conversationId,
+        @ToolParam(description = "Monitor name (required)", required = true) String name,
+        @ToolParam(description = "Monitor type: website, mysql, postgresql, redis, linux, windows, etc.", required = true) String app,
+        @ToolParam(description = "Collection interval in seconds (default: 600)", required = false) Integer intervals,
+        @ToolParam(description = "Monitor-specific parameters as JSON string. "
+            + "Use get_monitor_additional_params to see required fields. "
+            + "Example: {\"host\":\"192.168.1.1\", \"port\":\"22\", \"username\":\"root\"}",
+            required = true) String params,
+        @ToolParam(description = "Monitor description (optional)", required = false) String description) {
        try {
-            log.info("Adding monitor: name={}, app={}, host={}", name, app, host);
-            
+            log.info("Adding monitor: name={}, app={}", name, app);
+
            // Validate required parameters
            if (name == null || name.trim().isEmpty()) {
                return "Error: Monitor name is required";
@@ -249,128 +299,168 @@ public class MonitorToolsImpl implements MonitorTools {
            if (app == null || app.trim().isEmpty()) {
                return "Error: Monitor type/application is required";
            }
-            if (host == null || host.trim().isEmpty()) {
-                return "Error: Host is required";
+            if (params == null || params.trim().isEmpty()) {
+                return "Error: Monitor params is required. Use get_monitor_additional_params to see required fields for this monitor type.";
            }
-            
+
            // Set defaults
            if (intervals == null || intervals < 10) {
                intervals = 600;
            }
-            
+            // Parse params to extract host and port for instance
+            List<Param> paramList = parseParams(params);
+
+            // Query and add sensitive parameters
+            if (conversationId != null) {
+                Optional<ChatConversation> chatConversation = conversationDao.findById(conversationId);
+                if (chatConversation.isPresent() && StringUtils.isNotEmpty(chatConversation.get().getSecurityData())) {
+                    List<Param> securityParams = JsonUtil.fromJson(
+                        AesUtil.aesDecode(chatConversation.get().getSecurityData()),
+                        new TypeReference<List<Param>>() {
+                        });
+                    if (CollectionUtils.isNotEmpty(securityParams)) {
+                        paramList.addAll(securityParams);
+                    }
+                }
+            }
+            String host = paramList.stream()
+                    .filter(p -> "host".equals(p.getField()))
+                    .map(Param::getParamValue)
+                    .findFirst()
+                    .orElse("");
+            String port = paramList.stream()
+                    .filter(p -> "port".equals(p.getField()))
+                    .map(Param::getParamValue)
+                    .findFirst()
+                    .orElse(null);
+
+            String instance = (port != null && !port.isEmpty()) ? host.trim() + ":" + port : host.trim();
+
            // Create Monitor entity
            Monitor monitor = Monitor.builder()
                    .name(name.trim())
                    .app(app.toLowerCase().trim())
-                    .host(host.trim())
+                    .instance(instance)
                    .intervals(intervals)
                    .status((byte) 1)
                    .type((byte) 0)
                    .description(description != null ? description.trim() : "")
                    .build();
-            
-            List<Param> params = createBasicParams(host, port, username, password, database, additionalParams);
-            
+
            // Validate that all required parameters for this monitor type are provided
            try {
-                SubjectSum subjectSum = McpContextHolder.getSubject();
-                log.debug("Current security subject for getMonitorParamDefines: {}", subjectSum);
-
-                List<ParamDefine> requiredParams = appService.getAppParamDefines(app.toLowerCase().trim());
-                log.info("Checking required parameters for monitor type '{}': {}", app, requiredParams);
-                List<String> missingParams = new ArrayList<>();
-                
-                for (ParamDefine paramDefine : requiredParams) {
-                    if (paramDefine.isRequired()) {
-                        String fieldName = paramDefine.getField();
-                        boolean hasParam = params.stream()
-                                .anyMatch(param -> fieldName.equals(param.getField()));
-                        if (!hasParam) {
-                            missingParams.add(fieldName);
-                        }
-                    }
+                MonitorDto monitorDto = new MonitorDto();
+                monitorDto.setMonitor(monitor);
+                monitorDto.setParams(paramList);
+                monitorService.validate(monitorDto, false);
+            } catch (IllegalArgumentException argumentException) {
+                if (argumentException.getMessage().contains("required")) {
+                    return String.format("Error: %s. "
+                            + "Or use get_monitor_additional_params tool to see all required parameters.",
+                        argumentException.getMessage());
+                } else {
+                    return String.format("Error: %s. ", argumentException.getMessage());
                }
-                
-                if (!missingParams.isEmpty()) {
-                    return String.format("Error: Missing required parameters for monitor type '%s': %s. "
-                            + "Use get_monitor_additional_params tool to see all required parameters.", 
-                            app, String.join(", ", missingParams));
-                }
-            } catch (Exception e) {
-                log.warn("Could not validate required parameters for monitor type '{}': {}", app, e.getMessage());
            }
-            
-            // Call monitor service - it handles all the complexity (validation, defaults, app-specific logic)
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for addMonitor: {}", subjectSum);
+            monitorService.addMonitor(monitor, paramList, null, null);
+            log.info("Successfully added monitor '{}' with ID: {}", monitor.getName(), monitor.getId());
+            return String.format("Successfully added %s monitor '%s' with ID: %d (Instance: %s, Interval: %d seconds)",
+                    app.toUpperCase(), monitor.getName(), monitor.getId(), monitor.getInstance(), monitor.getIntervals());

-            monitorService.addMonitor(monitor, params, null, null);
-            Long monitorId = monitor.getId();
-            
-            log.info("Successfully added monitor '{}' with ID: {}", name, monitorId);
-            return String.format("Successfully added %s monitor '%s' with ID: %d (Host: %s, Interval: %d seconds)", 
-                    app.toUpperCase(), name, monitorId, host, intervals);
-            
        } catch (Exception e) {
            log.error("Failed to add monitor '{}': {}", name, e.getMessage(), e);
            return "Error adding monitor '" + name + "': " + e.getMessage();
        }
    }
-    
+
    /**
-     * Create basic parameter list from user inputs
+     * Parse params JSON string to list of Param objects
     */
-    private List<Param> createBasicParams(String host, Integer port, String username, 
-                                         String password, String database, String additionalParams) {
-        List<Param> params = new ArrayList<>();
-        
-        // Add host (always required)
-        params.add(Param.builder().field("host").paramValue(host.trim()).type((byte) 1).build());
-        
-        // Add optional common parameters
-        if (port != null) {
-            params.add(Param.builder().field("port").paramValue(port.toString()).type((byte) 0).build());
+    private List<Param> parseParams(String params) {
+        List<Param> paramList = new ArrayList<>();
+
+        if (params == null || params.trim().isEmpty()) {
+            return paramList;
        }
-        if (username != null && !username.trim().isEmpty()) {
-            params.add(Param.builder().field("username").paramValue(username.trim()).type((byte) 1).build());
-        }
-        if (password != null && !password.trim().isEmpty()) {
-            params.add(Param.builder().field("password").paramValue(password.trim()).type((byte) 2).build());
-        }
-        if (database != null && !database.trim().isEmpty()) {
-            params.add(Param.builder().field("database").paramValue(database.trim()).type((byte) 1).build());
-        }
-        
-        // Parse additional parameters if provided
-        if (additionalParams != null && !additionalParams.trim().isEmpty()) {
-            try {
-                String cleaned = additionalParams.trim().replaceAll("[{}]", "");
-                String[] pairs = cleaned.split(",");
-                for (String pair : pairs) {
-                    String[] keyValue = pair.split(":");
-                    if (keyValue.length == 2) {
-                        String key = keyValue[0].trim().replaceAll("\"", "");
-                        String value = keyValue[1].trim().replaceAll("\"", "");
-                        params.add(Param.builder().field(key).paramValue(value).type((byte) 1).build());
-                    }
+
+        try {
+            String cleaned = params.trim();
+            // Remove outer braces if present
+            if (cleaned.startsWith("{") && cleaned.endsWith("}")) {
+                cleaned = cleaned.substring(1, cleaned.length() - 1);
+            }
+
+            // Split by comma, but handle values that might contain commas within quotes
+            List<String> pairs = splitJsonPairs(cleaned);
+
+            for (String pair : pairs) {
+                int colonIndex = pair.indexOf(':');
+                if (colonIndex > 0) {
+                    String key = pair.substring(0, colonIndex).trim().replaceAll("\"", "");
+                    String value = pair.substring(colonIndex + 1).trim().replaceAll("\"", "");
+
+                    // Determine param type based on field name
+                    byte paramType = determineParamType(key);
+                    paramList.add(Param.builder().field(key).paramValue(value).type(paramType).build());
                }
-            } catch (Exception e) {
-                log.warn("Failed to parse additionalParams: {}", e.getMessage());
+            }
+        } catch (Exception e) {
+            log.warn("Failed to parse params: {}", e.getMessage());
+        }
+
+        return paramList;
+    }
+
+    /**
+     * Split JSON key-value pairs, handling quoted values that may contain commas
+     */
+    private List<String> splitJsonPairs(String json) {
+        List<String> pairs = new ArrayList<>();
+        StringBuilder current = new StringBuilder();
+        boolean inQuotes = false;
+
+        for (char c : json.toCharArray()) {
+            if (c == '"') {
+                inQuotes = !inQuotes;
+                current.append(c);
+            } else if (c == ',' && !inQuotes) {
+                if (current.length() > 0) {
+                    pairs.add(current.toString().trim());
+                    current = new StringBuilder();
+                }
+            } else {
+                current.append(c);
            }
        }
-        
-        return params;
+
+        if (current.length() > 0) {
+            pairs.add(current.toString().trim());
+        }
+
+        return pairs;
    }
-    
+
+    /**
+     * Determine param type based on field name
+     */
+    private byte determineParamType(String fieldName) {
+        if ("password".equalsIgnoreCase(fieldName) || "privateKey".equalsIgnoreCase(fieldName)) {
+            return (byte) 2; // Password type
+        } else if ("port".equalsIgnoreCase(fieldName) || "timeout".equalsIgnoreCase(fieldName)) {
+            return (byte) 0; // Number type
+        }
+        return (byte) 1; // Default string type
+    }
+
    @Override
    @Tool(name = "list_monitor_types", description = """
-            List all available monitor types that can be added to HertzBeat.
+            HertzBeat: List all available monitor types that can be added to HertzBeat.
            This tool shows all supported monitor types with their display names.
            Use this to see what types of monitors you can create with the add_monitor tool.
            """)
    public String listMonitorTypes(
            @ToolParam(description = "Language code for localized names (en-US, zh-CN, etc.). Default: en-US", required = false) String language) {
-        
+
        try {
            log.info("Listing available monitor types for language: {}", language);
            SubjectSum subjectSum = McpContextHolder.getSubject();
@@ -383,20 +473,20 @@ public class MonitorToolsImpl implements MonitorTools {

            // Get available monitor types from app service
            Map<String, String> monitorTypes = appService.getI18nApps(language);
-            
+
            if (monitorTypes == null || monitorTypes.isEmpty()) {
                return "No monitor types are currently available.";
            }
-            
+
            // Format the response as a nice list
            StringBuilder response = new StringBuilder();
            response.append("Available Monitor Types (Total: ").append(monitorTypes.size()).append("):\n\n");
-            
+
            // Sort monitor types alphabetically by key
            List<Map.Entry<String, String>> sortedTypes = monitorTypes.entrySet().stream()
                    .sorted(Map.Entry.comparingByKey())
                    .toList();
-            
+
            for (Map.Entry<String, String> entry : sortedTypes) {
                String typeKey = entry.getKey();
                String displayName = entry.getValue();
@@ -404,28 +494,28 @@ public class MonitorToolsImpl implements MonitorTools {
                       .append(" - ").append(displayName)
                       .append("\n");
            }
-            
+
            response.append("\nTo add a monitor, use the add_monitor tool with one of these types as the 'app' parameter.");

            log.info("Successfully listed {} monitor types", monitorTypes);
            return response.toString();
-            
+
        } catch (Exception e) {
            log.error("Failed to list monitor types: {}", e.getMessage(), e);
            return "Error retrieving monitor types: " + e.getMessage();
        }
    }
-    
+
    @Override
-    @Tool(name = "get_monitor_additional_params", description = """
-            Get the parameter definitions required for a specific monitor type.
+    @Tool(name = "get_monitor_params", description = """
+            HertzBeat: Get the parameter definitions required for a specific monitor type.
            This tool shows what parameters are needed when adding a monitor of the specified type,
            ALWAYS use this before adding a monitor to understand what parameters the user needs to provide.
            Use the app parameter to specify the monitor type/application name (e.g., 'linux', 'mysql', 'redis') this can be obtained from the list_monitor_types tool.
            """)
-    public String getMonitorAdditionalParams(
+    public String getMonitorParams(
            @ToolParam(description = "Monitor type/application name (e.g., 'linux', 'mysql', 'redis')", required = true) String app) {
-        
+
        try {
            log.info("Getting parameter definitions for monitor type: {}", app);
            SubjectSum subjectSum = McpContextHolder.getSubject();
@@ -437,69 +527,67 @@ public class MonitorToolsImpl implements MonitorTools {
            }

            // Get parameter definitions from app service
-            List<ParamDefine> paramDefines = appService.getAppParamDefines(app.toLowerCase().trim());
-            
+            List<ParamDefineInfo> paramDefines = appService.getAppParamDefines(app.toLowerCase().trim());
+
            if (paramDefines == null || paramDefines.isEmpty()) {
                return String.format("No parameter definitions found for monitor type '%s'. "
                   + "This monitor type may not exist or may not require additional parameters.", app);
            }
-            
+
            // Format the response
            StringBuilder response = new StringBuilder();
-            response.append(String.format("Parameter Definitions for Monitor Type '%s' (Total: %d):\n\n", 
+            response.append(String.format("Parameter Definitions for Monitor Type '%s' (Total: %d):\n\n",
                app, paramDefines.size()));
-            
-            for (ParamDefine paramDefine : paramDefines) {
+
+            for (ParamDefineInfo paramDefine : paramDefines) {
                response.append("• Field: ").append(paramDefine.getField()).append("\n");
-                
+
                // Add display name if available
                if (paramDefine.getName() != null && !paramDefine.getName().toString().trim().isEmpty()) {
                    response.append("  Name: ").append(paramDefine.getName()).append("\n");
                }
-                
+
                // Add type
                if (paramDefine.getType() != null && !paramDefine.getType().trim().isEmpty()) {
                    response.append("  Type: ").append(paramDefine.getType()).append("\n");
                }
-                
+
                // Add required status
                response.append("  Required: ").append(paramDefine.isRequired() ? "Yes" : "No").append("\n");
-                
+
                // Add default value if present
                if (paramDefine.getDefaultValue() != null && !paramDefine.getDefaultValue().trim().isEmpty()) {
                    response.append("  Default: ").append(paramDefine.getDefaultValue()).append("\n");
                }
-                
+
                // Add validation range if present
                if (paramDefine.getRange() != null && !paramDefine.getRange().trim().isEmpty()) {
                    response.append("  Range: ").append(paramDefine.getRange()).append("\n");
                }
-                
+
                // Add limit if present
                if (paramDefine.getLimit() != null) {
                    response.append("  Limit: ").append(paramDefine.getLimit()).append("\n");
                }
-                
+
                // Add placeholder text if present
                if (paramDefine.getPlaceholder() != null && !paramDefine.getPlaceholder().trim().isEmpty()) {
                    response.append("  Placeholder: ").append(paramDefine.getPlaceholder()).append("\n");
                }
-                
+
                response.append("\n");
            }
-            
+
            response.append("To add a monitor of this type, use the add_monitor tool with these parameters.\n");
            response.append(String.format("Example: add_monitor(name='my-monitor', app='%s', host='your-host', ...)", app));
-            
+
            log.info("Successfully retrieved {} parameter definitions for monitor type: {}", paramDefines.size(), app);
            return response.toString();
-            
+
        } catch (Exception e) {
            log.error("Failed to get parameter definitions for monitor type '{}': {}", app, e.getMessage(), e);
            return "Error retrieving parameter definitions for monitor type '" + app + "': " + e.getMessage();
        }
    }

-
-
 }
@@ -0,0 +1,333 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.tools.impl;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.service.SopScheduleService;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.apache.hertzbeat.ai.sop.model.SopParameter;
+import org.apache.hertzbeat.ai.sop.registry.SkillRegistry;
+import org.apache.hertzbeat.ai.utils.SopMessageUtil;
+import org.apache.hertzbeat.ai.tools.ScheduleTools;
+import org.apache.hertzbeat.common.entity.ai.SopSchedule;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import tools.jackson.core.type.TypeReference;
+
+/**
+ * Implementation of ScheduleTools for AI-driven schedule management.
+ * Allows AI to create and manage scheduled tasks through natural language.
+ * 
+ * The conversationId is injected into the System Prompt so AI can pass it
+ * when calling these tools.
+ */
+@Slf4j
+@Service
+public class ScheduleToolsImpl implements ScheduleTools {
+
+    private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    private final SopScheduleService scheduleService;
+    private final SkillRegistry skillRegistry;
+
+    @Autowired
+    public ScheduleToolsImpl(@Lazy SopScheduleService scheduleService, 
+                             @Lazy SkillRegistry skillRegistry) {
+        this.scheduleService = scheduleService;
+        this.skillRegistry = skillRegistry;
+    }
+
+    @Override
+    @Tool(name = "createScheduleForConversation",
+          description = "Create a scheduled task to automatically execute a skill at specified times. "
+                  + "IMPORTANT: You must pass the conversationId from the system context (shown as 'Current Conversation ID' in the prompt). "
+                  + "The cron expression should be in 6-digit Spring format: 'seconds minutes hours dayOfMonth month dayOfWeek'. "
+                  + "Common examples: '0 0 9 * * ?' (daily at 9:00), '0 30 8 * * MON-FRI' (weekdays at 8:30).")
+    public String createSchedule(
+            @ToolParam(description = "Name of the skill to schedule (e.g., 'daily_inspection', 'mysql_slow_query_diagnosis')", 
+                       required = true) String skillName,
+            @ToolParam(description = "Cron expression in 6-digit Spring format. Examples: '0 0 9 * * ?' for daily 9am", 
+                       required = true) String cronExpression,
+            @ToolParam(description = "Human-readable description of what this schedule does", 
+                       required = false) String description) {
+        // This method signature is kept for interface compatibility
+        // AI should use createScheduleWithConversation instead
+        return SopMessageUtil.getMessage("schedule.error.use.with.conversation");
+    }
+
+    /**
+     * Create schedule with explicit conversationId - the primary method AI should call.
+     */
+    @Tool(name = "createScheduleWithConversation",
+          description = "Create a scheduled task for a specific conversation. "
+                  + "Use the conversationId from the system context. "
+                  + "Pass skill parameters as a JSON object when the skill requires inputs. "
+                  + "The cron expression should be in 6-digit Spring format.")
+    public String createScheduleWithConversation(
+            @ToolParam(description = "Conversation ID from the system context", required = true) Long conversationId,
+            @ToolParam(description = "Name of the skill to schedule (e.g., 'daily_inspection')", required = true) String skillName,
+            @ToolParam(description = "Cron expression in Spring format (e.g., '0 0 9 * * ?')", required = true) String cronExpression,
+            @ToolParam(description = "Description of the schedule", required = false) String description,
+            @ToolParam(description = "Skill parameters as a JSON object (e.g., '{\"monitorId\":123}')",
+                       required = false) String paramsJson) {
+
+        log.info("AI creating schedule: conversationId={}, skill={}, cron={}, desc={}", 
+                 conversationId, skillName, cronExpression, description);
+
+        // Validate skill exists
+        SopDefinition skill = skillRegistry.getSkill(skillName);
+        if (skill == null) {
+            String available = String.join(", ", 
+                    skillRegistry.getAllSkills().stream()
+                            .map(s -> s.getName())
+                            .toList());
+            return SopMessageUtil.getMessage("schedule.error.skill.not.found", 
+                    new Object[]{skillName, available}, null);
+        }
+
+        if (conversationId == null || conversationId <= 0) {
+            return SopMessageUtil.getMessage("schedule.error.invalid.conversation");
+        }
+
+        try {
+            Map<String, Object> params = parseSkillParams(paramsJson);
+            validateRequiredParameters(skill, params);
+            String serializedParams = params.isEmpty() ? null : JsonUtil.toJson(params);
+
+            // Parameters are part of a schedule's identity so the same skill and cron can target different inputs.
+            List<SopSchedule> existing = scheduleService.getSchedulesByConversation(conversationId);
+            boolean duplicate = existing.stream()
+                    .anyMatch(schedule -> Objects.equals(schedule.getSopName(), skillName)
+                            && Objects.equals(schedule.getCronExpression(), cronExpression)
+                            && hasSameParams(schedule.getSopParams(), params));
+            if (duplicate) {
+                return SopMessageUtil.getMessage("schedule.create.duplicate", 
+                        new Object[]{skillName, cronExpression}, null)
+                        + "\n\n" + SopMessageUtil.getMessage("schedule.create.duplicate.hint");
+            }
+
+            SopSchedule schedule = new SopSchedule();
+            schedule.setConversationId(conversationId);
+            schedule.setSopName(skillName);
+            schedule.setCronExpression(cronExpression);
+            schedule.setSopParams(serializedParams);
+            schedule.setEnabled(true);
+
+            SopSchedule created = scheduleService.createSchedule(schedule);
+
+            StringBuilder response = new StringBuilder();
+            response.append(SopMessageUtil.getMessage("schedule.create.success")).append("\n\n");
+            response.append("**").append(SopMessageUtil.getMessage("schedule.detail.title")).append("**:\n");
+            response.append("- **").append(SopMessageUtil.getMessage("schedule.detail.skill")).append("**: ").append(skillName).append("\n");
+            response.append("- **").append(SopMessageUtil.getMessage("schedule.detail.cron")).append("**: ").append(cronExpression).append("\n");
+            response.append("- **").append(SopMessageUtil.getMessage("schedule.detail.id")).append("**: ").append(created.getId()).append("\n");
+            response.append("- **").append(SopMessageUtil.getMessage("schedule.detail.status")).append("**: ").append(SopMessageUtil.getMessage("schedule.detail.enabled")).append("\n");
+            
+            if (created.getNextRunTime() != null) {
+                response.append("- **").append(SopMessageUtil.getMessage("schedule.detail.next.run")).append("**: ").append(created.getNextRunTime().format(TIME_FORMATTER)).append("\n");
+            }
+
+            if (description != null && !description.isEmpty()) {
+                response.append("- **").append(SopMessageUtil.getMessage("schedule.detail.description")).append("**: ").append(description).append("\n");
+            }
+
+            response.append("\n").append(SopMessageUtil.getMessage("schedule.create.effective"));
+
+            return response.toString();
+
+        } catch (IllegalArgumentException e) {
+            return SopMessageUtil.getMessage("schedule.error.create.failed") + ": " + e.getMessage();
+        } catch (Exception e) {
+            log.error("Failed to create schedule", e);
+            return SopMessageUtil.getMessage("schedule.error.create.failed") + ": " + e.getMessage();
+        }
+    }
+
+    private Map<String, Object> parseSkillParams(String paramsJson) {
+        if (paramsJson == null || paramsJson.isBlank()) {
+            return Map.of();
+        }
+        Map<String, Object> params;
+        try {
+            params = JsonUtil.fromJson(paramsJson, new TypeReference<>() {});
+        } catch (RuntimeException e) {
+            throw new IllegalArgumentException("Skill parameters must be a valid JSON object", e);
+        }
+        if (params == null) {
+            throw new IllegalArgumentException("Skill parameters must be a valid JSON object");
+        }
+        return params;
+    }
+
+    private void validateRequiredParameters(SopDefinition skill, Map<String, Object> params) {
+        if (skill.getParameters() == null) {
+            return;
+        }
+        for (SopParameter parameter : skill.getParameters()) {
+            Object value = params.get(parameter.getName());
+            if (isMissing(value)) {
+                value = parameter.getDefaultValue();
+            }
+            if (parameter.isRequired() && isMissing(value)) {
+                throw new IllegalArgumentException(
+                        "Required skill parameter is missing: " + parameter.getName());
+            }
+        }
+    }
+
+    private boolean isMissing(Object value) {
+        return value == null || value instanceof String text && text.isBlank();
+    }
+
+    private boolean hasSameParams(String existingJson, Map<String, Object> params) {
+        if (existingJson == null || existingJson.isBlank()) {
+            return params.isEmpty();
+        }
+        try {
+            Map<String, Object> existingParams = JsonUtil.fromJson(existingJson, new TypeReference<>() {});
+            return Objects.equals(existingParams, params);
+        } catch (RuntimeException e) {
+            log.warn("Failed to parse parameters of an existing schedule", e);
+            return false;
+        }
+    }
+
+    @Override
+    @Tool(name = "listSchedulesForConversation",
+          description = "List all scheduled tasks for a specific conversation. "
+                  + "Use the conversationId from the system context.")
+    public String listSchedules() {
+        // This method signature is kept for interface compatibility
+        return SopMessageUtil.getMessage("schedule.error.use.with.conversation");
+    }
+
+    @Tool(name = "listSchedulesWithConversation",
+          description = "List all scheduled tasks for a specific conversation.")
+    public String listSchedulesWithConversation(
+            @ToolParam(description = "Conversation ID from the system context", required = true) Long conversationId) {
+        
+        log.info("AI listing schedules for conversation: {}", conversationId);
+
+        if (conversationId == null || conversationId <= 0) {
+            return SopMessageUtil.getMessage("schedule.error.invalid.conversation");
+        }
+
+        try {
+            List<SopSchedule> schedules = scheduleService.getSchedulesByConversation(conversationId);
+
+            if (schedules.isEmpty()) {
+                return SopMessageUtil.getMessage("schedule.list.empty") + "\n\n" 
+                        + SopMessageUtil.getMessage("schedule.list.hint");
+            }
+
+            StringBuilder sb = new StringBuilder();
+            sb.append("**").append(SopMessageUtil.getMessage("schedule.list.title")).append("** (")
+              .append(SopMessageUtil.getMessage("schedule.list.count", new Object[]{schedules.size()}, null))
+              .append("):\n\n");
+
+            for (SopSchedule schedule : schedules) {
+                String statusLabel = schedule.getEnabled() 
+                        ? SopMessageUtil.getMessage("schedule.detail.enabled")
+                        : SopMessageUtil.getMessage("schedule.detail.disabled");
+                
+                sb.append("### ").append(schedule.getId()).append(". ").append(schedule.getSopName());
+                sb.append(" (").append(statusLabel).append(")\n");
+                sb.append("- **").append(SopMessageUtil.getMessage("schedule.detail.cron")).append("**: `").append(schedule.getCronExpression()).append("`\n");
+                sb.append("- **").append(SopMessageUtil.getMessage("schedule.detail.status")).append("**: ").append(statusLabel).append("\n");
+                
+                if (schedule.getLastRunTime() != null) {
+                    sb.append("- **").append(SopMessageUtil.getMessage("schedule.detail.last.run")).append("**: ").append(schedule.getLastRunTime().format(TIME_FORMATTER)).append("\n");
+                }
+                if (schedule.getNextRunTime() != null) {
+                    sb.append("- **").append(SopMessageUtil.getMessage("schedule.detail.next.run")).append("**: ").append(schedule.getNextRunTime().format(TIME_FORMATTER)).append("\n");
+                }
+                sb.append("\n");
+            }
+
+            return sb.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to list schedules", e);
+            return "Error: " + e.getMessage();
+        }
+    }
+
+    @Override
+    @Tool(name = "deleteSchedule",
+          description = "Delete a scheduled task by its ID. Use listSchedulesForConversation first to find the task ID.")
+    public String deleteSchedule(
+            @ToolParam(description = "ID of the schedule to delete", required = true) Long scheduleId) {
+
+        log.info("AI deleting schedule: {}", scheduleId);
+
+        try {
+            SopSchedule schedule = scheduleService.getSchedule(scheduleId);
+            if (schedule == null) {
+                return SopMessageUtil.getMessage("schedule.error.not.found", new Object[]{scheduleId}, null);
+            }
+
+            String skillName = schedule.getSopName();
+            scheduleService.deleteSchedule(scheduleId);
+
+            return SopMessageUtil.getMessage("schedule.delete.success", new Object[]{scheduleId, skillName}, null);
+
+        } catch (Exception e) {
+            log.error("Failed to delete schedule {}", scheduleId, e);
+            return "Error: " + e.getMessage();
+        }
+    }
+
+    @Override
+    @Tool(name = "toggleSchedule",
+          description = "Enable or disable a scheduled task. Use listSchedulesForConversation first to find the task ID.")
+    public String toggleSchedule(
+            @ToolParam(description = "ID of the schedule to toggle", required = true) Long scheduleId,
+            @ToolParam(description = "true to enable, false to disable", required = true) boolean enabled) {
+
+        log.info("AI toggling schedule {} to enabled={}", scheduleId, enabled);
+
+        try {
+            SopSchedule schedule = scheduleService.getSchedule(scheduleId);
+            if (schedule == null) {
+                return SopMessageUtil.getMessage("schedule.error.not.found", new Object[]{scheduleId}, null);
+            }
+
+            SopSchedule updated = scheduleService.toggleSchedule(scheduleId, enabled);
+
+            String messageKey = enabled ? "schedule.toggle.enabled" : "schedule.toggle.disabled";
+            String statusLabel = enabled 
+                    ? SopMessageUtil.getMessage("schedule.detail.enabled")
+                    : SopMessageUtil.getMessage("schedule.detail.disabled");
+            
+            return SopMessageUtil.getMessage(messageKey, new Object[]{scheduleId, updated.getSopName()}, null)
+                    + "\n\n" + SopMessageUtil.getMessage("schedule.toggle.status") + ": " + statusLabel;
+
+        } catch (Exception e) {
+            log.error("Failed to toggle schedule {}", scheduleId, e);
+            return "Error: " + e.getMessage();
+        }
+    }
+}
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.tools.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.sop.engine.SopEngine;
+import org.apache.hertzbeat.ai.sop.model.OutputType;
+import org.apache.hertzbeat.ai.sop.model.SopDefinition;
+import org.apache.hertzbeat.ai.sop.model.SopParameter;
+import org.apache.hertzbeat.ai.sop.model.SopResult;
+import org.apache.hertzbeat.ai.sop.registry.SkillRegistry;
+import org.apache.hertzbeat.ai.tools.SkillTools;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+/**
+ * Implementation of SkillTools for AI-driven skill execution.
+ * Provides a unified interface for AI to discover and execute diagnostic skills.
+ */
+@Slf4j
+@Service
+public class SkillToolsImpl implements SkillTools {
+
+    /**
+     * Marker prefix for report-type outputs that should be displayed directly to users.
+     * When AI returns content with this prefix, frontend should render it directly
+     * without waiting for AI to process it further.
+     */
+    public static final String SKILL_REPORT_MARKER = "[[SKILL_REPORT]]";
+
+    private final SkillRegistry skillRegistry;
+    private final SopEngine sopEngine;
+
+    @Autowired
+    public SkillToolsImpl(@Lazy SkillRegistry skillRegistry, @Lazy SopEngine sopEngine) {
+        this.skillRegistry = skillRegistry;
+        this.sopEngine = sopEngine;
+    }
+
+    @Override
+    @Tool(name = "listSkills",
+          description = "List all available diagnostic skills. Returns skill names, descriptions, "
+                  + "and required parameters. Use this to discover what diagnostic capabilities are available "
+                  + "before executing a skill with executeSkill.")
+    public String listSkills() {
+        List<SopDefinition> skills = skillRegistry.getAllSkills();
+        
+        if (skills.isEmpty()) {
+            return "No diagnostic skills available.";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("Available Diagnostic Skills:\n\n");
+
+        for (SopDefinition skill : skills) {
+            sb.append("- **").append(skill.getName()).append("**\n");
+            sb.append("  Description: ").append(skill.getDescription()).append("\n");
+            sb.append("  Version: ").append(skill.getVersion()).append("\n");
+            
+            // List required parameters
+            if (skill.getParameters() != null && !skill.getParameters().isEmpty()) {
+                sb.append("  Parameters:\n");
+                for (SopParameter param : skill.getParameters()) {
+                    sb.append("    - ").append(param.getName());
+                    if (param.isRequired()) {
+                        sb.append(" (required)");
+                    }
+                    sb.append(": ").append(param.getDescription()).append("\n");
+                }
+            }
+            sb.append("\n");
+        }
+
+        sb.append("Usage: Call executeSkill with skillName and params (JSON format).\n");
+        sb.append("Example: executeSkill(\"mysql_slow_query_diagnosis\", \"{\\\"monitorId\\\": 123}\")");
+
+        return sb.toString();
+    }
+
+
+    @Override
+    @Tool(name = "executeSkill",
+          description = "Execute a diagnostic skill. For skills requiring monitorId, first use queryMonitors "
+                  + "to find the target monitor's ID. Report-type skills will return results directly to the user "
+                  + "without further AI processing. Use listSkills to see available skills.")
+    public String executeSkill(
+            @ToolParam(description = "Name of the skill to execute (e.g., mysql_slow_query_diagnosis)", 
+                       required = true) String skillName,
+            @ToolParam(description = "JSON string with skill parameters (e.g., {\"monitorId\": 123})", 
+                       required = false) String paramsJson) {
+
+        log.info("Executing skill: {} with params: {}", skillName, paramsJson);
+
+        // Get skill definition
+        SopDefinition skill = skillRegistry.getSkill(skillName);
+        if (skill == null) {
+            String available = skillRegistry.getAllSkills().stream()
+                    .map(SopDefinition::getName)
+                    .collect(Collectors.joining(", "));
+            return "Error: Skill '" + skillName + "' not found. Available skills: " + available;
+        }
+
+        // Parse parameters
+        Map<String, Object> params = parseParams(paramsJson);
+        if (params == null) {
+            return "Error: Skill parameters must be a valid JSON object.";
+        }
+
+        // Validate required parameters
+        if (skill.getParameters() != null) {
+            for (SopParameter paramDef : skill.getParameters()) {
+                if (paramDef.isRequired()) {
+                    Object value = params.get(paramDef.getName());
+                    if (value == null || value instanceof String text && text.isBlank()) {
+                        return "Error: Required parameter '" + paramDef.getName() + "' is missing. "
+                                + "Description: " + paramDef.getDescription();
+                    }
+                }
+            }
+        }
+
+        try {
+            // Execute the skill
+            SopResult result = sopEngine.executeSync(skill, params);
+
+            // Check output type
+            if ("SUCCESS".equals(result.getStatus())
+                    && result.getOutputType() == OutputType.REPORT
+                    && result.getContent() != null) {
+                // Report type: return with marker for direct display to user
+                log.info("Skill {} returned report-type output, marking for direct display", skillName);
+                return SKILL_REPORT_MARKER + "\n" + result.getContent();
+            }
+
+            // For other types, return AI-friendly format for further processing
+            return result.toAiResponse();
+
+        } catch (Exception e) {
+            log.error("Failed to execute skill {}: {}", skillName, e.getMessage(), e);
+            return "Error executing skill '" + skillName + "': " + e.getMessage();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> parseParams(String paramsJson) {
+        if (paramsJson == null || paramsJson.trim().isEmpty()) {
+            return new HashMap<>();
+        }
+
+        try {
+            return JsonUtil.fromJson(paramsJson, Map.class);
+        } catch (Exception e) {
+            log.warn("Failed to parse params JSON: {}", paramsJson);
+            return null;
+        }
+    }
+}
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.utils;
+
+import java.util.Locale;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Component;
+
+/**
+ * Utility class for SOP internationalization messages.
+ * Provides static access to MessageSource for POJOs like SopResult.
+ */
+@Component
+public class SopMessageUtil {
+    
+    private static MessageSource messageSource;
+    
+    public SopMessageUtil(@Qualifier("sopMessageSource") MessageSource messageSource) {
+        SopMessageUtil.messageSource = messageSource;
+    }
+    
+    /**
+     * Get message by code using current locale.
+     */
+    public static String getMessage(String code) {
+        return getMessage(code, null, null);
+    }
+    
+    /**
+     * Get message by code for specific language.
+     * @param code message code
+     * @param language language code: "zh", "en"
+     */
+    public static String getMessage(String code, String language) {
+        return getMessage(code, null, language);
+    }
+    
+    /**
+     * Get message by code with arguments for specific language.
+     */
+    public static String getMessage(String code, Object[] args, String language) {
+        if (messageSource == null) {
+            return code;
+        }
+        
+        Locale locale;
+        if ("en".equalsIgnoreCase(language) || "english".equalsIgnoreCase(language)) {
+            locale = Locale.ENGLISH;
+        } else if ("zh".equalsIgnoreCase(language) || "chinese".equalsIgnoreCase(language)) {
+            locale = Locale.CHINESE;
+        } else {
+            // Use system default locale (set by user's SystemConfig)
+            // instead of LocaleContextHolder which only works in HTTP request context
+            locale = Locale.getDefault();
+        }
+        
+        try {
+            return messageSource.getMessage(code, args, code, locale);
+        } catch (Exception e) {
+            return code;
+        }
+    }
+    
+    /**
+     * Get locale from language code.
+     */
+    public static Locale getLocale(String language) {
+        if ("en".equalsIgnoreCase(language) || "english".equalsIgnoreCase(language)) {
+            return Locale.ENGLISH;
+        }
+        return Locale.CHINESE;
+    }
+}
@@ -17,10 +17,8 @@

 package org.apache.hertzbeat.ai.utils;

-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;

 import java.time.Instant;
@@ -29,9 +27,14 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.hertzbeat.manager.pojo.dto.Hierarchy;
+import tools.jackson.databind.ObjectMapper;

 /**
 * Utility class providing helper methods for field expression validation, parsing,
@@ -42,13 +45,21 @@ import org.apache.hertzbeat.manager.pojo.dto.Hierarchy;
@Slf4j
@lombok.experimental.UtilityClass
 public class UtilityClass {
-    
+
+    private static final Pattern SINGLE_EQUALS_PATTERN = Pattern.compile("(?<![<>=!])=(?!=)");
+    private static final Pattern UPPERCASE_LOGICAL_PATTERN = Pattern.compile("\\b(AND|OR)\\b");
+    private static final Pattern FUNCTION_FIELD_PATTERN = Pattern.compile(
+            "!?\\b(?:equals|contains|matches|exists)\\s*\\(\\s*([a-zA-Z_][a-zA-Z0-9_]*)");
+    private static final Pattern COMPARISON_FIELD_PATTERN = Pattern.compile(
+            "(?:^|[\\s(])([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?:>=|<=|==|!=|>|<)");
+    private static final Pattern QUOTED_VALUE_PATTERN = Pattern.compile("\"[^\"]*\"|'[^']*'");
+
    /**
     * Validates the syntax of field conditions expression
     * @param fieldConditions Field conditions string to validate
     * @return "VALID" if syntax is correct, error message otherwise
     */
-    
+
    public String validateExpressionSyntax(String fieldConditions) {
        try {
            log.debug("Validating expression syntax: {}", fieldConditions);
@@ -112,31 +123,26 @@ public class UtilityClass {
     * Validates that only supported operators are used
     */
    public String validateOperators(String fieldConditions) {
-        // Define supported operators for different field types
-        String[] numericOperators = {">", "<", ">=", "<=", "==", "!=", "exists()", "!exists()"};
-        String[] stringOperators = {"equals(", "contains(", "matches(", "exists()", "!equals(", "!contains(", "!matches(", "!exists()"};
-        String[] logicalOperators = {" and ", " or "};
-
        // Remove quotes and function calls temporarily for operator checking
        String tempExpression = fieldConditions
                .replaceAll("\"[^\"]*\"", "VALUE") // Remove quoted strings
                .replaceAll("'[^']*'", "VALUE")    // Remove single quoted strings
                .replaceAll("\\w+\\([^)]*\\)", "FUNCTION"); // Remove function calls

-        // Check for invalid operators (common mistakes)
-        String[] invalidOperators = {"&&", "||", "AND", "OR", "=", "!="};
-        for (String invalidOp : invalidOperators) {
-            if (tempExpression.contains(invalidOp)) {
-                if (invalidOp.equals("&&") || invalidOp.equals("||")) {
-                    return String.format("Error: Use 'and'/'or' instead of '%s' for logical operations", invalidOp);
-                }
-                if (invalidOp.equals("AND") || invalidOp.equals("OR")) {
-                    return String.format("Error: Use lowercase '%s' for logical operations", invalidOp.toLowerCase());
-                }
-                if (invalidOp.equals("=")) {
-                    return "Error: Use '==' for equality comparison, not '='";
-                }
-            }
+        if (tempExpression.contains("&&") || tempExpression.contains("||")) {
+            String invalidOp = tempExpression.contains("&&") ? "&&" : "||";
+            return String.format("Error: Use 'and'/'or' instead of '%s' for logical operations", invalidOp);
+        }
+
+        Matcher uppercaseLogicalMatcher = UPPERCASE_LOGICAL_PATTERN.matcher(tempExpression);
+        if (uppercaseLogicalMatcher.find()) {
+            return String.format("Error: Use lowercase '%s' for logical operations",
+                    uppercaseLogicalMatcher.group(1).toLowerCase());
+        }
+
+        // Reject only a standalone equals sign without rejecting >=, <=, ==, or !=.
+        if (SINGLE_EQUALS_PATTERN.matcher(tempExpression).find()) {
+            return "Error: Use '==' for equality comparison, not '='";
        }

        // Check for unsupported special characters that might indicate syntax errors
@@ -151,11 +157,6 @@ public class UtilityClass {
     * Validates logical connectors syntax
     */
    public String validateLogicalConnectors(String fieldConditions) {
-        // Check for proper spacing around logical operators
-        if (fieldConditions.matches(".*(\\S(and|or)\\S).*")) {
-            return "Error: Logical operators 'and'/'or' must be surrounded by spaces";
-        }
-
        // Check for consecutive logical operators
        if (fieldConditions.matches(".*(and\\s+and|or\\s+or|and\\s+or\\s+and|or\\s+and\\s+or).*")) {
            return "Error: Consecutive logical operators found. Use parentheses to group conditions properly.";
@@ -238,7 +239,7 @@ public class UtilityClass {

        String[] pairs = input.split(",");
        for (String pair : pairs) {
-            String[] keyValue = pair.split(":");
+            String[] keyValue = pair.split(":", 2);
            if (keyValue.length == 2) {
                result.put(keyValue[0].trim(), keyValue[1].trim());
            }
@@ -300,34 +301,22 @@ public class UtilityClass {
     * Handles simple cases like "field > 80", "equals(field, 'value')", complex expressions
     */
    public List<String> extractFieldNamesFromConditions(String fieldConditions) {
-        List<String> fieldNames = new ArrayList<>();
+        Set<String> fieldNames = new LinkedHashSet<>();

-        // Split by logical operators (and, or) and parentheses, but preserve the field names
-        // This is a simple implementation - could be enhanced with a proper parser
-        String[] parts = fieldConditions.split("\\s+(and|or|&&|\\|\\|)\\s+|[()]+");
-
-        for (String part : parts) {
-            part = part.trim();
-            if (part.isEmpty()) {
-                continue;
-            }
-
-            // Handle equals() function: equals(fieldName, "value")
-            if (part.contains("equals(")) {
-                String fieldName = extractFieldFromEquals(part);
-                if (fieldName != null && !fieldNames.contains(fieldName)) {
-                    fieldNames.add(fieldName);
-                }
-            } else {
-                // Handle simple comparisons: fieldName > value, fieldName <= value
-                String fieldName = extractFieldFromComparison(part);
-                if (fieldName != null && !fieldNames.contains(fieldName)) {
-                    fieldNames.add(fieldName);
-                }
-            }
+        // Extract the first function argument without splitting parentheses and bypassing field validation.
+        Matcher functionMatcher = FUNCTION_FIELD_PATTERN.matcher(fieldConditions);
+        while (functionMatcher.find()) {
+            fieldNames.add(functionMatcher.group(1));
        }

-        return fieldNames;
+        // Remove quoted values before scanning comparisons to avoid treating text such as "value > 1" as a field.
+        Matcher comparisonMatcher = COMPARISON_FIELD_PATTERN.matcher(
+                QUOTED_VALUE_PATTERN.matcher(fieldConditions).replaceAll(""));
+        while (comparisonMatcher.find()) {
+            fieldNames.add(comparisonMatcher.group(1));
+        }
+
+        return new ArrayList<>(fieldNames);
    }

    /**
@@ -392,7 +381,8 @@ public class UtilityClass {
        } else {
            // Category, app, or metric node
            // Determine node type based on children
-            boolean hasLeafChildren = hierarchy.getChildren().stream()
+            List<Hierarchy> children = hierarchy.getChildren();
+            boolean hasLeafChildren = children != null && children.stream()
                    .anyMatch(child -> child.getIsLeaf() != null && child.getIsLeaf());

            if (hasLeafChildren) {
@@ -403,9 +393,9 @@ public class UtilityClass {
                node.put("description", "Application with available metrics");
            }

-            if (hierarchy.getChildren() != null && !hierarchy.getChildren().isEmpty()) {
+            if (children != null && !children.isEmpty()) {
                ArrayNode childrenArray = mapper.createArrayNode();
-                for (Hierarchy child : hierarchy.getChildren()) {
+                for (Hierarchy child : children) {
                    childrenArray.add(formatHierarchyAsJson(mapper, child));
                }
                node.set("children", childrenArray);
@@ -415,7 +405,7 @@ public class UtilityClass {

        return node;
    }
-    
+
    /**
     * Format timestamp to readable format
     */
@@ -0,0 +1,68 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# SOP Result Messages - Default (Chinese)
+sop.result.title=SOP执行结果
+sop.result.name=SOP名称
+sop.result.duration=耗时
+sop.result.summary=摘要
+sop.result.error=错误
+sop.result.report.title=详细报告
+sop.result.data.title=返回数据
+sop.result.simple.complete=操作已完成。
+sop.result.report.success=报告生成成功
+sop.result.data.success=数据获取成功
+sop.result.action.pending=等待确认操作
+sop.result.operation.success=操作已完成
+
+# LLM Language Instructions
+sop.llm.language.instruction=重要：请使用中文回复。
+
+# Schedule Messages
+schedule.create.success=已成功创建定时任务！
+schedule.create.duplicate=该定时任务已存在（技能: {0}, 执行时间: {1}），无需重复创建。
+schedule.create.duplicate.hint=如需创建不同时间的任务，请指定不同的执行时间。
+schedule.detail.title=任务详情
+schedule.detail.skill=技能
+schedule.detail.cron=执行时间
+schedule.detail.id=任务ID
+schedule.detail.status=状态
+schedule.detail.enabled=已启用
+schedule.detail.disabled=已停用
+schedule.detail.next.run=下次执行
+schedule.detail.last.run=上次执行
+schedule.detail.description=描述
+schedule.create.effective=任务已创建并立即生效，系统将在设定时间自动执行。
+schedule.list.title=当前定时任务列表
+schedule.list.count=共 {0} 个
+schedule.list.empty=当前对话没有定时任务。
+schedule.list.hint=您可以说「每天早上9点执行每日巡检」来创建定时任务。
+schedule.delete.success=已删除定时任务 #{0} ({1})
+schedule.toggle.enabled=已启用定时任务 #{0} ({1})
+schedule.toggle.disabled=已停用定时任务 #{0} ({1})
+schedule.toggle.status=当前状态
+schedule.error.skill.not.found=技能 ''{0}'' 不存在。可用技能: {1}
+schedule.error.invalid.conversation=无效的会话ID，请从系统上下文传递正确的conversationId。
+schedule.error.not.found=未找到ID为 {0} 的定时任务。
+schedule.error.create.failed=创建定时任务失败
+schedule.error.use.with.conversation=请使用 createScheduleWithConversation 并传递 conversationId 参数。
+
+# Schedule Push Messages
+schedule.push.error.prefix=定时任务执行失败:
+schedule.push.error.label=错误:
+schedule.push.report.title=**定时任务执行报告**
+schedule.push.report.skill=**技能**
+schedule.push.report.time=**执行时间**
+schedule.push.report.failed=**执行失败**
@@ -0,0 +1,68 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# SOP Result Messages - English
+sop.result.title=SOP Execution Result
+sop.result.name=SOP Name
+sop.result.duration=Duration
+sop.result.summary=Summary
+sop.result.error=Error
+sop.result.report.title=Detailed Report
+sop.result.data.title=Returned Data
+sop.result.simple.complete=Operation completed successfully.
+sop.result.report.success=Report generated successfully
+sop.result.data.success=Data retrieved successfully
+sop.result.action.pending=Action pending confirmation
+sop.result.operation.success=Operation completed successfully
+
+# LLM Language Instructions
+sop.llm.language.instruction=IMPORTANT: Please respond in English.
+
+# Schedule Messages
+schedule.create.success=Schedule created successfully!
+schedule.create.duplicate=This schedule already exists (skill: {0}, cron: {1}). No need to create a duplicate.
+schedule.create.duplicate.hint=To create a task at different time, please specify a different schedule time.
+schedule.detail.title=Task Details
+schedule.detail.skill=Skill
+schedule.detail.cron=Schedule Time
+schedule.detail.id=Task ID
+schedule.detail.status=Status
+schedule.detail.enabled=Enabled
+schedule.detail.disabled=Disabled
+schedule.detail.next.run=Next Run
+schedule.detail.last.run=Last Run
+schedule.detail.description=Description
+schedule.create.effective=Task created and effective immediately. The system will execute it at the scheduled time.
+schedule.list.title=Scheduled Tasks List
+schedule.list.count=Total: {0}
+schedule.list.empty=No scheduled tasks in current conversation.
+schedule.list.hint=You can say "Run daily inspection every morning at 9am" to create a scheduled task.
+schedule.delete.success=Deleted schedule #{0} ({1})
+schedule.toggle.enabled=Enabled schedule #{0} ({1})
+schedule.toggle.disabled=Disabled schedule #{0} ({1})
+schedule.toggle.status=Current Status
+schedule.error.skill.not.found=Skill ''{0}'' not found. Available skills: {1}
+schedule.error.invalid.conversation=Invalid conversation ID. Please pass the correct conversationId from system context.
+schedule.error.not.found=Schedule with ID {0} not found.
+schedule.error.create.failed=Failed to create schedule
+schedule.error.use.with.conversation=Please use createScheduleWithConversation with conversationId parameter.
+
+# Schedule Push Messages
+schedule.push.error.prefix=Scheduled task execution failed:
+schedule.push.error.label=Error:
+schedule.push.report.title=**Scheduled Task Execution Report**
+schedule.push.report.skill=**Skill**
+schedule.push.report.time=**Execution Time**
+schedule.push.report.failed=**Execution Failed**
@@ -0,0 +1,68 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# SOP Result Messages - Chinese
+sop.result.title=SOP执行结果
+sop.result.name=SOP名称
+sop.result.duration=耗时
+sop.result.summary=摘要
+sop.result.error=错误
+sop.result.report.title=详细报告
+sop.result.data.title=返回数据
+sop.result.simple.complete=操作已完成。
+sop.result.report.success=报告生成成功
+sop.result.data.success=数据获取成功
+sop.result.action.pending=等待确认操作
+sop.result.operation.success=操作已完成
+
+# LLM Language Instructions
+sop.llm.language.instruction=重要：请使用中文回复。
+
+# Schedule Messages
+schedule.create.success=已成功创建定时任务！
+schedule.create.duplicate=该定时任务已存在（技能: {0}, 执行时间: {1}），无需重复创建。
+schedule.create.duplicate.hint=如需创建不同时间的任务，请指定不同的执行时间。
+schedule.detail.title=任务详情
+schedule.detail.skill=技能
+schedule.detail.cron=执行时间
+schedule.detail.id=任务ID
+schedule.detail.status=状态
+schedule.detail.enabled=已启用
+schedule.detail.disabled=已停用
+schedule.detail.next.run=下次执行
+schedule.detail.last.run=上次执行
+schedule.detail.description=描述
+schedule.create.effective=任务已创建并立即生效，系统将在设定时间自动执行。
+schedule.list.title=当前定时任务列表
+schedule.list.count=共 {0} 个
+schedule.list.empty=当前对话没有定时任务。
+schedule.list.hint=您可以说「每天早上9点执行每日巡检」来创建定时任务。
+schedule.delete.success=已删除定时任务 #{0} ({1})
+schedule.toggle.enabled=已启用定时任务 #{0} ({1})
+schedule.toggle.disabled=已停用定时任务 #{0} ({1})
+schedule.toggle.status=当前状态
+schedule.error.skill.not.found=技能 ''{0}'' 不存在。可用技能: {1}
+schedule.error.invalid.conversation=无效的会话ID，请从系统上下文传递正确的conversationId。
+schedule.error.not.found=未找到ID为 {0} 的定时任务。
+schedule.error.create.failed=创建定时任务失败
+schedule.error.use.with.conversation=请使用 createScheduleWithConversation 并传递 conversationId 参数。
+
+# Schedule Push Messages
+schedule.push.error.prefix=定时任务执行失败:
+schedule.push.error.label=错误:
+schedule.push.report.title=**定时任务执行报告**
+schedule.push.report.skill=**技能**
+schedule.push.report.time=**执行时间**
+schedule.push.report.failed=**执行失败**
@@ -0,0 +1,140 @@
+# IMPORTANT
+The following information requires special attention. In case of any conflict with previous content, the below shall prevail
+
+- **NEVER ask for sensitive parameters in conversation** (passwords, keys, tokens, credentials)
+- **NEVER include sensitive information in tool call parameters**
+- **NEVER assume all parameters can be collected via conversation**
+
+You need to use this tool when creating a monitor: `add_monitor_protected`
+- **add_monitor_protected**: Add a new monitor with dynamic app-specific parameter support,In addition to the parameters provided by the user, a system-provided parameter, conversationId, is also required, with a value of {conversationId}.
+
+## Special Scenario Handling:
+
+### Scenario 1: User provides sensitive information
+User: "The password is 123456"
+AI: "Thank you, but for security reasons, passwords should not be transmitted through conversation. The system will display a secure form for you to enter this information safely."
+
+### Scenario 2: Uncertain parameter classification
+If unsure whether a parameter is sensitive:
+1. Assume it's sensitive
+2. Guide to secure form
+3. Prioritize user data protection
+
+### Scenario 3: Mixed parameter requirements
+When both public and private parameters are needed:
+1. Collect all public parameters first
+2. Then guide to secure form for private parameters
+3. Provide clear progress indicators
+
+## Tool Usage Security Specifications:
+
+### add_monitor tool
+- Only collect public parameters through conversation
+- Private parameters are added to tool calls directly by the system
+- Ensure tool calls never expose sensitive data
+- When you want to ask users for data, please ask for all the parameters that need to be filled in at once.
+
+### Other tools
+- Most tools don't involve sensitive data
+- If they do, follow the same principles
+- Prioritize data security in all interactions
+
+## Complete Monitor Addition Workflow (Secure Version):
+
+1. **Identify requirement**: What does the user want to monitor?
+2. **Determine type**: Use `list_monitor_types` to find matching monitor type
+3. **Get parameter definitions**: Use `get_monitor_additional_params` to see required parameters
+4. **Collect public parameters**:
+   - Ask for one public parameter at a time
+   - Confirm each parameter value
+5. **Trigger secure phase**:
+   - When all public parameters are complete
+   - Inform user about private parameters
+   - Instruct system to display secure form
+6. **Complete creation**: System handles remaining process
+
+## Example Dialogue (Secure Monitor Addition):
+
+User: "I want to monitor my MySQL database"
+AI: (Uses `list_monitor_types` and `get_monitor_additional_params`)
+AI: "I can help you set up MySQL monitoring. First, I need some information:
+    1. What is the database host address,prot number, monitor name and check interval"
+User: "address is  192.168.1.10", "port is 3306", "monitor name is Production Database", "check interval is 60 seconds"
+AI: "[Secure Form Required]
+     Private parameters requiring secure collection:
+     - password (database password)
+     Please complete configuration via the secure form."
+---
+
+## Security and Privacy Principles
+1. **Never collect sensitive information through conversation**: Passwords, keys, tokens, and other private data must be collected via secure forms
+2. **Parameter classification**: Clearly distinguish between public parameters (collectible via conversation) and private parameters (collectible only via secure forms)
+3. **Secure interaction flow**: Public parameters collected through conversation, private parameters collected through secure forms
+NEVER ASK FOR SENSITIVE PARAMETERS - use secure forms instead, If the user has completed the security form, it is considered that the user has filled in all the private parameters, and no further requests for access will be made.
+
+## Secure Interaction Protocol
+
+### Parameter Classification Guide
+- **Public parameters** (collectible via conversation):
+  - Hostnames, IP addresses, port numbers
+  - Monitor names, labels, tags
+  - Check intervals, timeout settings
+  - Protocol types, URLs, paths
+  - Threshold values, alert names
+
+- **Private parameters** (must be collected via secure forms):
+  - Passwords (password, passwd, pwd)
+  - Keys (key, secret, token, credential)
+  - Certificate files (certificate, private_key, ssl_key)
+  - Access tokens (access_token, api_token, bearer_token)
+  - Database connection strings with authentication
+  - API keys, secret keys
+  - Any parameter containing "secret", "key", "token", "credential", or "password"
+
+### Secure Response Patterns
+Use these patterns when interacting with users:
+
+#### Pattern 1: Normal Parameter Collection
+[Continuing Collection]
+Current progress: [collected parameters]
+Remaining parameters: [parameters name]
+Please provide: [specific information]
+
+#### Pattern 2: Private Parameters Required
+Private parameters requiring secure collection:
+[private_parameter1] (description)
+[private_parameter2] (description)
+Please complete configuration via the secure form.
+(In order to display the form correctly, you must strictly output secure form data in the following format)
+```json
+SecureForm:\{
+  "showSecureForm": true,
+  "publicParams": \{ ... \},
+  "privateParams": [
+  \{
+              "id": ...,
+              "app":...,
+              "name": \{
+                  "zh-CN": "...",
+                  "en-US": "...",
+                  "ja-JP": "...",
+                  "pt-BR": "...",
+                  "zh-TW": "..."
+              \},
+              "field": "...",
+              "type": "password",
+              "required": ...,
+              "defaultValue": ...,
+              "placeholder": null,
+              "range": null,
+              "limit": null,
+              "options": nul,
+              "keyAlias": null,
+              "valueAlias": null,
+              "hide": false,
+              "depend": null
+          \}
+  ],
+  "monitorType": "..."
+\}
+```
@@ -0,0 +1,206 @@
+You are an AI Assistant specialized in monitoring infrastructure and applications with HertzBeat.
+HertzBeat is an open-source, real-time monitoring system that supports infrastructure, applications,
+services, APIs, databases, middleware, and custom monitoring through 50+ types of monitors.
+Your role is to help users manage monitors, analyze metrics data, configure alerts, and troubleshoot monitoring issues.
+*******
+VERY IMPORTANT: Always use the tools provided to interact with HertzBeat's monitoring system.
+If the user doesn't provide required parameters, ask them iteratively to provide the necessary parameters.
+********
+
+## Available HertzBeat Tools:
+
+### Monitor Management Tools:
+- **query_monitors**: Query monitor information with flexible filtering (ID, name, type, host, status, labels)
+- **add_monitor**: Add a new monitor with dynamic app-specific parameter support
+- **list_monitor_types**: List all available monitor types (website, mysql, redis, linux, etc.)
+- **get_monitor_additional_params**: Get parameter definitions required for specific monitor types
+
+### Alert Rule Management Tools:
+- **create_alert_rule**: Create alert rules with threshold configuration and automatic monitor binding
+- **list_alert_rules**: List existing alert rules with filtering by type, status, etc.
+- **toggle_alert_rule**: Enable or disable alert rules
+- **get_alert_rule_details**: Get detailed information about specific alert rules
+- **get_apps_metrics_hierarchy**: Get exact app and metric names for alert rule creation (CRITICAL for alerts)
+- **bind_monitors_to_alert_rule**: Bind monitors to alert rules for targeted alerting
+
+
+### Alert & Alarm Analysis Tools:
+- **query_alerts**: Query fired alerts with comprehensive filtering and pagination
+- **get_alerts_summary**: Get alert statistics and status distribution
+
+### Metrics Data Analysis Tools:
+- **query_realtime_metrics**: Get current real-time metrics data for monitors
+- **get_historical_metrics**: Get historical time-series metrics with flexible time ranges
+- **get_warehouse_status**: Check metrics storage system status
+
+### AI Skills (SOP Workflows):
+You have access to automated skills that can perform complex multi-step operations.
+
+**Available Skills:**
+{dynamically_injected_skills_list}
+
+**Skill Types:**
+- Diagnostic: Analyze issues and provide recommendations
+- Operational: Execute predefined operational procedures  
+- Reporting: Generate comprehensive reports
+- Automation: Automated response and remediation
+
+**Usage Guidelines:**
+1. Match user intent to available skills
+2. For skills requiring monitorId, first use query_monitors to find the target
+3. Execute using: executeSkill(skillName, paramsJson)
+4. Report-type skills return results directly to the user
+
+If no skill matches, use individual tools to assist the user.
+
+### Scheduled Task Management:
+You can help users create scheduled tasks to automatically execute skills at specified times.
+
+**Current Conversation ID: {current_conversation_id}**
+(Use this ID when calling schedule tools that require conversationId)
+
+**Available Schedule Tools:**
+- **createScheduleForConversation**: Create a new scheduled task (requires conversationId, skillName, cronExpression)
+- **listSchedulesForConversation**: List all scheduled tasks for a conversation
+- **deleteSchedule**: Delete a scheduled task by ID
+- **toggleSchedule**: Enable or disable a scheduled task
+
+**Natural Language Time to Cron Conversion:**
+When users describe times in natural language, convert them to 6-digit Spring Cron format:
+`seconds minutes hours dayOfMonth month dayOfWeek`
+
+Common conversions:
+- "daily at 9am" → `0 0 9 * * ?`
+- "daily at 6pm" → `0 0 18 * * ?`
+- "every Monday at 9am" → `0 0 9 ? * MON`
+- "weekdays at 8:30am" → `0 30 8 ? * MON-FRI`
+- "first day of each month" → `0 0 0 1 * ?`
+- "every hour" → `0 0 * * * ?`
+- "every 30 minutes" → `0 */30 * * * ?`
+
+**Workflow:**
+1. When user wants to schedule a skill, identify the skill name and time
+2. Convert natural language time to Cron expression
+3. **Important**: Only create NEW schedules the user explicitly requests in this message. Do NOT recreate schedules from conversation history.
+4. Use createScheduleWithConversation tool with the current conversation ID ({current_conversation_id})
+5. Confirm creation with task details and next run time
+
+
+## Natural Language Examples:
+
+### Monitor Management:
+- "Add a MySQL monitor for database server at 192.168.1.10 with user admin"
+- "Monitor website https://example.com with SSL checking every 60 seconds"
+- "Show me all Linux servers that are currently offline"
+- "List all Redis monitors with their connection status"
+
+### Alert Configuration:
+- ALERT RULE means when to alert a user
+- "Create an alert for Kafka JVM when VmName equals 'vm-w2'"
+- "Alert when OpenAI credit grants exceed 1000"
+- "Set up HBase Master alert when heap memory usage is over 80%"
+
+### Metrics Analysis:
+- "Show me current CPU usage for server 192.168.1.5"
+- "Get memory usage trend for the last 24 hours"
+- "Which servers have high disk usage right now?"
+- "Show me network traffic patterns for the past week"
+
+### Alert Investigation:
+- "What alerts are currently firing?"
+- "Show me the most frequent alerts in the last 6 hours"
+- "Find all alerts for monitor ID 1234 in the past day"
+- "Which monitors are currently abnormal?"
+
+### Scheduled Tasks:
+- "Run daily inspection every morning at 9am"
+- "Set up a weekly system health check every Monday morning"
+- "List all scheduled tasks"
+- "Disable schedule 1"
+- "Delete schedule 2"
+## Workflow Guidelines:
+
+1. **Adding Monitors**:
+   - ALWAYS use get_monitor_additional_params first to check required parameters
+   - Use list_monitor_types to show available types
+   - Collect all required parameters from the list_monitor_types tool and ask user to give them all, before calling add_monitor
+   - Example: "To monitor MySQL, I need host, port, username, password, and database name"
+
+### 2. Creating Alert Rules or Alerts:
+THESE ARE ALERT RULES WITH THRESHOLD VALUES. USERS CAN SPECIFY THE THRESHOLD VALUES FOR EXAMPLE,
+IF THE USER SAYS "ALERT ME WHEN MY COST EXCEEDS 700, THE EXPRESSION SHOULD BE 'cost > 700' NOT 'cost < 700'.
+APPLY THE SAME LOGIC FOR LESS THAN OPERATOR.
+It is important to first understand the hierarchy of apps, metrics, and field conditions
+Each app has its own metrics and each metric has its own field conditions.
+The operators will be applied to the field conditions, and the final expression will be constructed
+based on the user's input of app name and the metric they choose.
+Read the create_alert_rule tool description for even more details
+*******
+CRITICAL WORKFLOW Do all of this iteratively with user interaction at each step:
+    1. ALWAYS use list_monitor_types tool FIRST to get exact app name according to what user specifies
+    2. use get_apps_metrics_hierarchy by passing that name, to get the hierarchy of corresponding metrics and field conditions
+    3. Do not spit out the entire hierarchy, instead: first spit out the metrics available for the app
+    4. Ask the user to choose a metric from the available metrics
+    5. Based on the metric chosen, present the available field conditions
+    6. You will construct the proper expression with field conditions
+    VERY VERY IMPORTANT:
+     - ALWAYS USE the value field from the get_apps_metrics_hierarchy's json response when creating alert expressions on the field parameters
+*********
+
+   - Field Condition Expression format: [field_conditions]
+   - Give all the available fieldConditions to the user, so they can choose the one they want to use
+   - Field conditions can be simple (equals, greater than) or complex (logical expressions)
+   - Use parentheses for complex conditions to ensure correct evaluation order
+   - Do not create alert rules on your own, always ask the user to provide the app, metrics and fieldConditions parameters specifically
+
+   EXAMPLES FOR FIELD CONDITION EXPRESSION ( Do not copy these examples, they are just for reference ):
+   - Kafka JVM: app="kafka", metrics="jvm_basic", fieldConditions="equals(VmName, "my-vm")"
+     →  equals(VmName, "my-vm")
+   - Complex OpenAI: app="openai", metrics="credit_grants",
+     fieldConditions="total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)"
+     → total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
+
+   - Priority levels: 0=critical, 1=warning, 2=info
+
+### 3. Analyzing Performance:
+   - Use `get_realtime_metrics` for current status
+   - Use `get_historical_metrics` for trends
+   - Use `get_high_usage_monitors` to find problems
+   - Provide actionable recommendations based on data
+
+### 4. Troubleshooting Alerts:
+   - Use `query_alerts` to find current issues
+   - Use `get_monitor_alerts` for specific monitor problems
+   - Use `get_frequent_alerts` to identify recurring issues
+   - Suggest root cause analysis steps
+
+## Parameter Guidelines:
+- **Monitor Status**: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all
+- **Time Ranges**: 1h, 6h, 24h, 7d, 30d
+- **Alert Priorities**: critical, warning, info
+- **Sort Options**: name, gmtCreate, gmtUpdate, status, startAt, triggerTimes
+- **Metric Types**: cpu, memory, disk, network, custom
+- **Collection Intervals**: 30s-3600s (recommend 60s-600s for most cases)
+
+
+## Best Practices:
+- Never create alert rules without exact user input on app, metrics, and field conditions
+- Always validate monitor types and parameters before adding monitors
+- ALWAYS use get_apps_metrics_hierarchy before creating alert rules to understand available fields
+- Construct field conditions based on metric's children
+- Use exact app and metric names from hierarchy (case-sensitive)
+- Set appropriate alert thresholds based on baseline performance
+- Use time-series data to identify trends and predict issues
+- Correlate alerts with metrics data for root cause analysis
+- Recommend monitoring intervals based on service criticality
+- Provide clear explanations of monitoring data and actionable insights
+
+## Avoid these common errors:
+- Using Label name instead of the value from the hierarchy JSON while creating alert rules.
+- Inside the field parameters expression using '&&' instead of 'and', using '||' instead of 'or' for logical operators
+- This process is to trigger alarms, when certain rule or set of rules exceed a threshold value.
+So when a user says that the threshold should be less than 1000. the operator used should be '>' not '<',
+because we want the alarm to be triggered when the threshold value is exceeded. apply the same logic in vice versa for less than operator
+
+Keep responses focused on monitoring topics and HertzBeat's comprehensive capabilities.
+When users request monitoring setup, guide them through the complete process from monitor creation to alert configuration.
@@ -0,0 +1,85 @@
+# AI SOP Engine
+
+The AI SOP (Standard Operating Procedure) Engine enables defining and executing automated workflows through YAML configuration.
+
+## Features
+
+- **YAML-based Definition**: Define workflows declaratively
+- **Multiple Step Types**: `tool` (call HertzBeat tools), `llm` (AI reasoning)
+- **Unified Output**: Consistent result structure with `SopResult`
+- **I18n Support**: Multi-language output (zh/en)
+- **Multiple APIs**: Streaming (SSE), Sync (JSON), AI-friendly (Text)
+
+## Quick Start
+
+### 1. Define a Skill
+
+Create `skills/my_skill.yml`:
+
+```yaml
+name: my_skill
+description: "My custom skill"
+version: "1.0"
+
+output:
+  type: report      # report/simple/data/action
+  format: markdown
+  language: zh      # zh/en
+
+steps:
+  - id: get_data
+    type: tool
+    tool: queryMonitors
+    args:
+      status: 9
+      
+  - id: analyze
+    type: llm
+    prompt: |
+      Analyze: ${get_data}
+```
+
+### 2. Execute
+
+```bash
+# Streaming (SSE)
+POST /api/ai/sop/execute/{skillName}
+
+# Sync (JSON)
+POST /api/ai/sop/execute/{skillName}/sync
+
+# AI Format (Text)
+POST /api/ai/sop/execute/{skillName}/ai
+```
+
+## Output Types
+
+| Type | Use Case |
+|------|----------|
+| `report` | Daily inspection, analysis |
+| `simple` | Restart, clear cache |
+| `data` | Query, statistics |
+| `action` | Pending confirmation |
+
+## Architecture
+
+```
+YAML Definition → SkillRegistry → SopEngine → Executors → SopResult
+                                      ↓
+                               ToolExecutor / LlmExecutor
+                                      ↓
+                               ToolRegistry (auto-discover @Tool methods)
+```
+
+## Adding New Tools
+
+Just add `@Tool` annotation to your method - no other code changes needed:
+
+```java
+@Tool(name = "myNewTool", description = "...")
+public String myNewTool(@ToolParam(...) Long param) {
+    // implementation
+}
+```
+
+ToolRegistry auto-discovers all `@Tool` methods at runtime.
--- a/Show More
+++ b/Show More