Merge remote-tracking branch 'origin/main' into claude/add-tests-issue-1276-cTfRS

# Conflicts:
#	CHANGELOG.md

Author: JSv4

.codecov.yml

@@ -45,13 +45,17 @@ flags:
     paths:
       - frontend/src/
     carryforward: true
-  # Merged frontend flag uploaded by codecov-notify.yml after combining the
-  # three per-suite lcovs (frontend-unit, frontend-component, frontend-e2e).
-  # This is what the README badge reads so it reflects the union of all
-  # frontend test suites, not just the Vitest slice. Intentionally does NOT
+  # Merged frontend flag that the README badge reads. Populated by tagging
+  # each per-suite upload (`frontend-unit`, `frontend-component`,
+  # `frontend-e2e`) with `frontend` as an additional flag in its workflow,
+  # so Codecov aggregates the union of the three uploads server-side.
+  # `carryforward: true` is load-bearing — a backend-only commit path-filters
+  # all three producing workflows out, so without carryforward the badge
+  # would drop to "unknown" on those commits; with it, the flag reuses the
+  # last known coverage from the parent commit. Intentionally does NOT
   # match the `frontend-.*` regex used by the component_management block
   # below, so the `frontend` component keeps aggregating only the three
-  # per-suite flags and doesn't double-count this merged upload.
+  # per-suite flags and doesn't double-count this merged flag.
   frontend:
     paths:
       - frontend/src/

.github/workflows/codecov-notify.yml

@@ -8,14 +8,11 @@ name: Codecov Notify
 # the triggering SHA. Workflows that skipped due to path filters don't block
 # the notify step.
 #
-# This workflow also merges the three per-suite frontend lcov reports
-# (`frontend-unit-lcov`, `frontend-ct-lcov`, `frontend-e2e-lcov`, each
-# published as a GitHub Actions artifact by its producing job) into a
-# single lcov and uploads it to Codecov under the `frontend` flag. That
-# gives one authoritative Frontend coverage number — the README badge
-# reads it, and PR comments show the merged total alongside the per-suite
-# flags. The three individual flag uploads still happen in their own
-# workflows, so drill-in by suite continues to work.
+# The merged `frontend` flag that the README badge reads is produced
+# server-side: each per-suite frontend upload (`frontend-unit`,
+# `frontend-component`, `frontend-e2e`) is tagged with `frontend` as an
+# additional flag in its own workflow, so Codecov aggregates the union
+# of all three without any cross-workflow lcov merging here.
 
 on:
   workflow_run:
@@ -60,7 +57,6 @@ jobs:
             );
 
             let allDone = true;
-            const runIds = {};
             for (const name of expected) {
               const matching = runs
                 .filter((r) => r.name === name)
@@ -77,102 +73,13 @@ jobs:
               core.info(
                 `${name}: status=${latest.status} conclusion=${latest.conclusion} id=${latest.id}`
               );
-              runIds[name] = latest.id;
               if (latest.status !== "completed") {
                 allDone = false;
               }
             }
 
             core.setOutput("all_done", allDone ? "true" : "false");
             core.setOutput("sha", sha);
-            core.setOutput(
-              "frontend_ci_run_id",
-              runIds["Frontend CI"] || ""
-            );
-            core.setOutput(
-              "frontend_e2e_run_id",
-              runIds["Frontend E2E Integration"] || ""
-            );
-
-      # ────────────────────────────────────────────────────────────────
-      # Download per-suite lcov artifacts from each producing workflow.
-      #
-      # Each download is guarded by the producing workflow's run id (empty
-      # string when that workflow was path-filtered for this SHA), and
-      # `continue-on-error: true` tolerates a completed run that did not
-      # publish the artifact (for example, when the suite failed before
-      # the upload step ran).
-      # ────────────────────────────────────────────────────────────────
-      - name: Download unit lcov artifact
-        if: steps.check.outputs.all_done == 'true' && steps.check.outputs.frontend_ci_run_id != ''
-        continue-on-error: true
-        uses: actions/download-artifact@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ steps.check.outputs.frontend_ci_run_id }}
-          name: frontend-unit-lcov
-          path: coverage/unit
-
-      - name: Download component lcov artifact
-        if: steps.check.outputs.all_done == 'true' && steps.check.outputs.frontend_ci_run_id != ''
-        continue-on-error: true
-        uses: actions/download-artifact@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ steps.check.outputs.frontend_ci_run_id }}
-          name: frontend-ct-lcov
-          path: coverage/ct
-
-      - name: Download e2e lcov artifact
-        if: steps.check.outputs.all_done == 'true' && steps.check.outputs.frontend_e2e_run_id != ''
-        continue-on-error: true
-        uses: actions/download-artifact@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ steps.check.outputs.frontend_e2e_run_id }}
-          name: frontend-e2e-lcov
-          path: coverage/e2e
-
-      - name: Check for downloaded lcov files
-        id: lcov
-        if: steps.check.outputs.all_done == 'true'
-        run: |
-          shopt -s nullglob
-          files=(coverage/*/lcov.info)
-          if [ ${#files[@]} -eq 0 ]; then
-            echo "No lcov artifacts retrieved; skipping merged frontend upload."
-            echo "has_lcov=false" >> "$GITHUB_OUTPUT"
-          else
-            echo "Found ${#files[@]} lcov file(s):"
-            printf '  - %s\n' "${files[@]}"
-            echo "has_lcov=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Setup Node.js
-        if: steps.lcov.outputs.has_lcov == 'true'
-        uses: actions/setup-node@v6
-        with:
-          node-version: "20"
-
-      - name: Merge frontend lcov reports
-        if: steps.lcov.outputs.has_lcov == 'true'
-        run: |
-          mkdir -p coverage/merged
-          npx --yes lcov-result-merger@5 'coverage/*/lcov.info' coverage/merged/lcov.info
-          echo "Merged lcov source-file count:"
-          grep -c "^SF:" coverage/merged/lcov.info || true
-
-      - name: Upload merged frontend coverage to Codecov
-        if: steps.lcov.outputs.has_lcov == 'true'
-        uses: codecov/codecov-action@v6
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage/merged/lcov.info
-          flags: frontend
-          name: frontend-merged-coverage
-          fail_ci_if_error: false
-          disable_search: true
-          override_commit: ${{ steps.check.outputs.sha }}
 
       - name: Send notifications to Codecov
         if: steps.check.outputs.all_done == 'true'

.github/workflows/frontend-e2e.yml

@@ -208,29 +208,20 @@ jobs:
           path: frontend/playwright-report-e2e/
           if-no-files-found: ignore
 
+      # The `frontend` flag rides along so the same upload feeds both the
+      # per-suite drill-in and the merged Frontend coverage total that the
+      # README badge reads. See `frontend.yml` for the companion uploads.
       - name: Upload frontend E2E coverage to Codecov
         if: success() || failure()
         uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: frontend/coverage/e2e/lcov.info
-          flags: frontend-e2e
+          flags: frontend-e2e,frontend
           name: frontend-e2e-coverage
           fail_ci_if_error: false
           disable_search: true
 
-      # Publish the raw lcov so the cross-workflow merge job in
-      # `codecov-notify.yml` can pull it via `actions/download-artifact` and
-      # combine it with the unit + component lcovs into a single `frontend` flag.
-      - name: Upload frontend E2E lcov artifact
-        if: success() || failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: frontend-e2e-lcov
-          path: frontend/coverage/e2e/lcov.info
-          if-no-files-found: warn
-          retention-days: 7
-
       - name: Upload backend E2E coverage to Codecov
         if: success() || failure()
         uses: codecov/codecov-action@v6

.github/workflows/frontend.yml

@@ -79,27 +79,22 @@ jobs:
           yarn run test:ct --reporter=list tests/*Metadata*.ct.tsx
         continue-on-error: true
 
+      # The `frontend` flag is intentionally listed alongside
+      # `frontend-component` so the same upload feeds both the per-suite
+      # drill-in and the merged Frontend coverage total. Codecov aggregates
+      # all uploads sharing a flag server-side, so the README `flag=frontend`
+      # badge reflects the union of unit + component + e2e without any
+      # cross-workflow lcov merging on our side.
       - name: Upload CT Coverage to Codecov
         if: success() || failure()
         uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: frontend/coverage/ct/lcov.info
-          flags: frontend-component
+          flags: frontend-component,frontend
           name: frontend-ct-coverage
           fail_ci_if_error: false
-
-      # Publish the raw lcov so the cross-workflow merge job in
-      # `codecov-notify.yml` can pull it via `actions/download-artifact` and
-      # combine it with the unit + e2e lcovs into a single `frontend` flag.
-      - name: Upload CT lcov artifact
-        if: success() || failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: frontend-ct-lcov
-          path: frontend/coverage/ct/lcov.info
-          if-no-files-found: warn
-          retention-days: 7
+          disable_search: true
 
   build:
     name: Build
@@ -144,27 +139,17 @@ jobs:
         run: yarn install --frozen-lockfile
       - name: Run Unit Tests with Coverage
         run: yarn run test:coverage:unit
+      # See the CT upload above for why the `frontend` flag is listed here too.
       - name: Upload Unit Coverage to Codecov
         if: success() || failure()
         uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: frontend/coverage/unit/lcov.info
-          flags: frontend-unit
+          flags: frontend-unit,frontend
           name: frontend-unit-coverage
           fail_ci_if_error: false
-
-      # Publish the raw lcov so the cross-workflow merge job in
-      # `codecov-notify.yml` can pull it via `actions/download-artifact` and
-      # combine it with the component + e2e lcovs into a single `frontend` flag.
-      - name: Upload Unit lcov artifact
-        if: success() || failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: frontend-unit-lcov
-          path: frontend/coverage/unit/lcov.info
-          if-no-files-found: warn
-          retention-days: 7
+          disable_search: true
 
   docker-build:
     name: Build Docker Image