diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml
index 3f1e26bec..488631f21 100755
--- a/.gitea/workflows/ci-cd.yml
+++ b/.gitea/workflows/ci-cd.yml
@@ -262,11 +262,61 @@ jobs:
         pytest --version
 
         '
+    - name: Select incremental test files
+      if: github.event_name == 'pull_request'
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        set +e
+        PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
+        API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?limit=300"
+        CHANGED_FILES=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" "$API_URL"           | python3 -c "import sys,json; [print(f['filename']) for f in json.load(sys.stdin) if f['status'] != 'removed']")
+        echo "改动文件数: $(echo "$CHANGED_FILES" | grep -c . || echo 0)"
+
+        CHANGED_FILES="$CHANGED_FILES" \
+        SELECTED_TESTS_OUTPUT=/tmp/selected_tests.txt \
+        python3 scripts/ci/select_unit_tests.py
+        SELECT_EXIT=$?
+
+        if [ $SELECT_EXIT -eq 0 ]; then
+          echo "UNIT_TEST_MODE=incremental" >> $GITHUB_ENV
+          TEST_FILES=$(cat /tmp/selected_tests.txt | tr '\n' ' ')
+          echo "SELECTED_TEST_FILES=$TEST_FILES" >> $GITHUB_ENV
+          echo "增量模式: $(cat /tmp/selected_tests.txt | wc -l) 个测试文件"
+        else
+          echo "UNIT_TEST_MODE=full" >> $GITHUB_ENV
+          echo "SELECTED_TEST_FILES=tests/unit" >> $GITHUB_ENV
+          echo "全量模式"
+        fi
+
     - name: Run unit tests with coverage
       shell: sh
-      run: "set -eu\nPYTHONPATH=\"$PWD/apps/api:$PWD\" python3 -m coverage run \\\n  --source=apps/api/app,packages \\\n  --omit=\"*/migrations/*,*/tests/*,*/test_*.py,*/site-packages/*\" \\\n  --branch \\\n  -m pytest tests/unit -q\npython3 -m coverage report --show-missing\npython3 -m coverage xml -o coverage.xml\npython3 -m coverage report --fail-under=65 > /dev/null\n"
+      run: |
+        set -eu
+        if [ "${UNIT_TEST_MODE:-full}" = "incremental" ]; then
+          echo "=== 增量测试模式 ==="
+          PYTHONPATH="$PWD/apps/api:$PWD" python3 -m coverage run \
+            --source=apps/api/app,packages \
+            --omit="*/migrations/*,*/tests/*,*/test_*.py,*/site-packages/*" \
+            --branch \
+            -m pytest $SELECTED_TEST_FILES -q
+          python3 -m coverage report --show-missing
+          python3 -m coverage xml -o coverage.xml
+          # 增量模式下调低覆盖率门槛（跑的文件少覆盖率自然低，不做强校验）
+          python3 -m coverage report --fail-under=10 > /dev/null || true
+        else
+          PYTHONPATH="$PWD/apps/api:$PWD" python3 -m coverage run \
+            --source=apps/api/app,packages \
+            --omit="*/migrations/*,*/tests/*,*/test_*.py,*/site-packages/*" \
+            --branch \
+            -m pytest tests/unit -q
+          python3 -m coverage report --show-missing
+          python3 -m coverage xml -o coverage.xml
+          python3 -m coverage report --fail-under=65 > /dev/null
+        fi
     - name: Diff coverage check (增量行覆盖率)
-      if: github.event_name == 'pull_request'
+      if: github.event_name == 'pull_request' && env.HAS_APP_CHANGES == 'true'
       shell: sh
       env:
         GITHUB_TOKEN: ${{ github.token }}
@@ -284,12 +334,10 @@ jobs:
         git config user.email "ci@local"
         git config user.name "CI"
         # 拉取base分支用于对比
-        git fetch origin $BASE_BRANCH --depth=200
-        # 基于base分支创建当前分支，确保HEAD与base有共同祖先（修复no merge base问题）
-        git checkout -b ci-current origin/$BASE_BRANCH
-        # 提交当前代码（覆盖base分支上的文件）
+        git fetch origin $BASE_BRANCH --depth=100
+        # 提交当前代码
         git add -A > /dev/null 2>&1
-        git commit -m "ci-tmp" --allow-empty > /dev/null 2>&1
+        git commit -m "ci-tmp" > /dev/null 2>&1
         
         # 根据模式设置门槛
         if [ "${UNIT_TEST_MODE:-full}" = "incremental" ]; then
@@ -317,12 +365,12 @@ jobs:
           echo "   请为改动的代码添加单元测试后再提交"
           echo ""
           echo "=== 覆盖率报告 ==="
-          python3 -m diff_cover.diff_cover_tool coverage.xml             --compare-branch="origin/$BASE_BRANCH" 2>&1 | tail -30
+          python3 -m diff_cover.diff_cover_tool coverage.xml \
+            --compare-branch="origin/$BASE_BRANCH" 2>&1 | tail -30
           exit 1
         fi
         
         echo "✅ 增量覆盖率达标"
-
     - name: CI failure notification
       if: failure()
       shell: sh