diff --git a/.github/actions/setup-web/action.yml b/.github/actions/setup-web/action.yml
index 1c7104a5dc..6f3b3c08b4 100644
--- a/.github/actions/setup-web/action.yml
+++ b/.github/actions/setup-web/action.yml
@@ -6,8 +6,8 @@ runs:
     - name: Setup Vite+
       uses: voidzero-dev/setup-vp@4a524139920f87f9f7080d3b8545acac019e1852 # v1.0.0
       with:
-        node-version-file: "./web/.nvmrc"
+        node-version-file: web/.nvmrc
         cache: true
+        cache-dependency-path: web/pnpm-lock.yaml
         run-install: |
-          - cwd: ./web
-            args: ['--frozen-lockfile']
+          cwd: ./web
diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
index 28e19ba6a4..6b87946221 100644
--- a/.github/workflows/api-tests.yml
+++ b/.github/workflows/api-tests.yml
@@ -2,6 +2,12 @@ name: Run Pytest
 
 on:
   workflow_call:
+    secrets:
+      CODECOV_TOKEN:
+        required: false
+
+permissions:
+  contents: read
 
 concurrency:
   group: api-tests-${{ github.head_ref || github.run_id }}
@@ -11,6 +17,8 @@ jobs:
   test:
     name: API Tests
     runs-on: ubuntu-latest
+    env:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     defaults:
       run:
         shell: bash
@@ -24,6 +32,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Setup UV and Python
@@ -79,21 +88,12 @@ jobs:
             api/tests/test_containers_integration_tests \
             api/tests/unit_tests
 
-      - name: Coverage Summary
-        run: |
-          set -x
-          # Extract coverage percentage and create a summary
-          TOTAL_COVERAGE=$(python -c 'import json; print(json.load(open("coverage.json"))["totals"]["percent_covered_display"])')
-
-          # Create a detailed coverage summary
-          echo "### Test Coverage Summary :test_tube:" >> $GITHUB_STEP_SUMMARY
-          echo "Total Coverage: ${TOTAL_COVERAGE}%" >> $GITHUB_STEP_SUMMARY
-          {
-            echo ""
-            echo "<details><summary>File-level coverage (click to expand)</summary>"
-            echo ""
-            echo '```'
-            uv run --project api coverage report -m
-            echo '```'
-            echo "</details>"
-          } >> $GITHUB_STEP_SUMMARY
+      - name: Report coverage
+        if: ${{ env.CODECOV_TOKEN != '' && matrix.python-version == '3.12' }}
+        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+        with:
+          files: ./coverage.xml
+          disable_search: true
+          flags: api
+        env:
+          CODECOV_TOKEN: ${{ env.CODECOV_TOKEN }}
diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
index ad07b53632..69023c24cc 100644
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -56,6 +56,7 @@ jobs:
     needs: check-changes
     if: needs.check-changes.outputs.api-changed == 'true'
     uses: ./.github/workflows/api-tests.yml
+    secrets: inherit
 
   web-tests:
     name: Web Tests
diff --git a/api/pytest.ini b/api/pytest.ini
index 588dafe7eb..4d5d0ab6e0 100644
--- a/api/pytest.ini
+++ b/api/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 pythonpath = .
-addopts = --cov=./api --cov-report=json --import-mode=importlib
+addopts = --cov=./api --cov-report=json --import-mode=importlib --cov-branch --cov-report=xml
 env =
     ANTHROPIC_API_KEY = sk-ant-api11-IamNotARealKeyJustForMockTestKawaiiiiiiiiii-NotBaka-ASkksz
     AZURE_OPENAI_API_BASE = https://difyai-openai.openai.azure.com
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 0000000000..54ac2a4b36
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,16 @@
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+
+flags:
+  web:
+    paths:
+      - "web/"
+    carryforward: true
+
+  api:
+    paths:
+      - "api/"
+    carryforward: true