Benchmark compact workflow image

Align benchmark lint cache keys
Add CI accelerator benchmark
2026-07-15 16:54:03 +00:00 · 2026-07-13 11:38:46 +01:00 · 2026-07-13 11:09:54 +01:00 · 2026-07-13 10:55:23 +01:00 · 2026-07-13 10:05:02 +01:00 · 2026-07-13 09:52:33 +01:00
29 changed files with 1167 additions and 1600 deletions
@@ -1,18 +1,12 @@
 ---
 name: ha-frontend-testing
-description: Home Assistant frontend testing and validation workflow. Use when adding or updating tests, running lint, TypeScript checks, Vitest, Playwright e2e suites, dev servers, or chart-data benchmarks.
+description: Home Assistant frontend validation workflow. Use when running lint, TypeScript checks, Vitest, Playwright e2e suites, dev servers, or chart-data benchmarks.
 ---

 # HA Frontend Testing

 Use this skill when choosing or running validation for frontend changes.

-## Test Helpers
-
- Before adding or changing tests, inspect the relevant suite's existing helpers and fixtures. Reuse them instead of duplicating setup, test data, navigation, interactions, waits, or assertions.
- When the same test flow appears more than once, move it into the closest suite-local helper with a focused interface.
- Keep one-off test behaviour in the test unless a helper makes the intent materially clearer. Do not hide the behaviour under test behind broad, configurable abstractions.
-
 ## Core Commands

 ```bash
@@ -41,25 +35,23 @@ For focused type feedback on one file, use editor diagnostics instead of a file-

 `yarn dev:serve` also serves locally and supports `-c` for the core URL and `-p` for the port. Default local serving port is 8124.

-Dev server commands support `--background`, `--status`, `--stop`, and `--logs [--follow]`. Prefer managed background mode while iterating so the watcher stays available across test runs without occupying the terminal.
+Dev server commands support `--background`, `--status`, `--stop`, and `--logs [--follow]`.

 ## Playwright E2E

-Each suite has its own dev server port. Prefer running the relevant server in the background while iterating. Playwright reuses it when the port is already running; otherwise it performs a slow full build. The rspack watcher recompiles on save, so reruns should not need a restart.
+Each suite has its own dev server port. Playwright reuses an existing server locally when the port is already running; otherwise it performs a slow full build. The rspack watcher recompiles on save, so reruns should not need a restart.

 Start the relevant suite server, then run that suite:

-| Suite   | Background server                            | Test command            |
-| ------- | -------------------------------------------- | ----------------------- |
-| App     | `yarn test:e2e:app:dev --background` on 8095 | `yarn test:e2e:app`     |
-| Demo    | `yarn dev:demo --background` on 8090         | `yarn test:e2e:demo`    |
-| Gallery | `yarn dev:gallery --background` on 8100      | `yarn test:e2e:gallery` |
+| Suite   | Server                          | Test command            |
+| ------- | ------------------------------- | ----------------------- |
+| App     | `yarn test:e2e:app:dev` on 8095 | `yarn test:e2e:app`     |
+| Demo    | `yarn dev:demo` on 8090         | `yarn test:e2e:demo`    |
+| Gallery | `yarn dev:gallery` on 8100      | `yarn test:e2e:gallery` |

-Use the same server command with `--status`, `--logs [--follow]`, or `--stop` to manage it. Server reuse and `--stop` use the `/__ha_dev_status` health check, so starting or stopping twice is harmless.
+Server reuse and `--stop` use the `/__ha_dev_status` health check, so starting or stopping twice is harmless.

-Local runs against a watched development server do not always match CI's clean build artifacts, environment, sharding, or worker configuration. Use background servers for the fast iteration loop, but confirm the relevant CI jobs complete successfully before considering E2E changes verified.
-
-Use `-g "<title>" --project=chromium` to narrow a run. `yarn test:e2e` runs all three suites in parallel when every managed server is available, otherwise it runs them sequentially to prevent cold builds racing over shared generated assets. Run suites directly; piping through output truncation hides progress and failures.
+Use `-g "<title>" --project=chromium` to narrow a run. `yarn test:e2e` runs all three suites. Run suites directly; piping through output truncation hides progress and failures.

 The app suite uses a stripped-down harness for e2e. Demo and gallery use their normal dev servers.

@@ -19,6 +19,9 @@ outputs:
  netlify_url:
    description: The deployed URL
    value: ${{ steps.deploy.outputs.netlify_url }}
+  unique_deploy_url:
+    description: The unique hash-based deployment URL for this specific build
+    value: ${{ steps.deploy.outputs.unique_deploy_url }}

 runs:
  using: composite
@@ -32,9 +35,18 @@ runs:
        NETLIFY_AUTH_TOKEN: ${{ inputs.auth-token }}
        NETLIFY_SITE_ID: ${{ inputs.site-id }}
      run: |
+        # Execute the deployment
        if [ -n "$ALIAS" ]; then
          npx -y netlify-cli deploy --dir="$DIR" --alias "$ALIAS" --json > deploy_output.json
        else
          npx -y netlify-cli deploy --dir="$DIR" --prod --json > deploy_output.json
        fi
-        echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
+
+        # Collect the urls from the deployment output
+        NETLIFY_URL=$(jq -r '.url // .deploy_url' deploy_output.json)
+        SITE_NAME=$(jq -r '.site_name' deploy_output.json)
+        DEPLOY_ID=$(jq -r '.deploy_id' deploy_output.json)
+        UNIQUE_URL="https://${DEPLOY_ID}--${SITE_NAME}.netlify.app"
+
+        echo "netlify_url=$NETLIFY_URL" >> "$GITHUB_OUTPUT"
+        echo "unique_deploy_url=$UNIQUE_URL" >> "$GITHUB_OUTPUT"
@@ -8,9 +8,6 @@ inputs:
  cache:
    description: Enable the yarn cache in setup-node
    default: "true"
-  node-modules-cache:
-    description: Restore the exact shared node_modules cache instead of installing
-    default: "false"

 runs:
  using: composite
@@ -19,25 +16,8 @@ runs:
      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
      with:
        node-version-file: ".nvmrc"
-        cache: ${{ inputs.cache == 'true' && inputs.node-modules-cache != 'true' && 'yarn' || '' }}
-
-    - name: Enable Corepack
-      shell: bash
-      run: corepack enable
-
-    - name: Restore complete dependency tree
-      if: inputs.node-modules-cache == 'true'
-      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-      with:
-        path: |
-          node_modules
-          .yarn/install-state.gz
-        fail-on-cache-miss: true
-        key: >-
-          node-modules-v1-${{ runner.os }}-${{ runner.arch }}-${{
-          hashFiles('.nvmrc', 'package.json', 'yarn.lock', '.yarnrc.yml', '.yarn/releases/**', '.yarn/patches/**') }}
+        cache: ${{ inputs.cache == 'true' && 'yarn' || '' }}

    - name: Install dependencies
-      if: inputs.node-modules-cache != 'true'
      shell: bash
      run: yarn install ${{ inputs.immutable == 'true' && '--immutable' || '' }}
@@ -0,0 +1,126 @@
+name: CI accelerator benchmark
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - workflows-global-build-image
+
+env:
+  NODE_OPTIONS: --max_old_space_size=6144
+
+permissions:
+  contents: read
+
+jobs:
+  baseline:
+    name: Baseline / ${{ matrix.workload }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        workload:
+          - lint
+          - test
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+      - name: Setup Node and install
+        uses: ./.github/actions/setup
+      - name: Check for duplicate dependencies
+        if: matrix.workload == 'lint'
+        run: yarn dedupe --check
+      - name: Build resources
+        id: build_resources
+        run: >-
+          ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data
+          ${{ matrix.workload == 'lint' && 'gather-gallery-pages' || '' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup lint cache
+        if: matrix.workload == 'lint'
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: |
+            node_modules/.cache/prettier
+            node_modules/.cache/eslint
+            node_modules/.cache/typescript
+          key: lint-${{ github.sha }}
+          restore-keys: lint-
+      - name: Run eslint
+        if: matrix.workload == 'lint'
+        run: yarn run lint:eslint --quiet
+      - name: Run tsc
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:types
+      - name: Run lit-analyzer
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:lit --quiet
+      - name: Run prettier
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:prettier
+      - name: Check dependency licenses
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:licenses
+      - name: Run tests
+        if: matrix.workload == 'test'
+        run: yarn run test
+
+  image:
+    name: Image / ${{ matrix.workload }}
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/timmo001/home-assistant-frontend-ci-images/frontend-workflow@sha256:ffa4d621b4495bf456b7ab3c632f550e329fe78c2d571167aa0899a52c4932c3
+    strategy:
+      fail-fast: false
+      matrix:
+        workload:
+          - lint
+          - test
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+      - name: Install dependencies
+        run: frontend-install
+      - name: Check for duplicate dependencies
+        if: matrix.workload == 'lint'
+        run: yarn dedupe --check
+      - name: Build resources
+        id: build_resources
+        run: >-
+          ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data
+          ${{ matrix.workload == 'lint' && 'gather-gallery-pages' || '' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup lint cache
+        if: matrix.workload == 'lint'
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: |
+            node_modules/.cache/prettier
+            node_modules/.cache/eslint
+            node_modules/.cache/typescript
+          key: lint-${{ github.sha }}
+          restore-keys: lint-
+      - name: Run eslint
+        if: matrix.workload == 'lint'
+        run: yarn run lint:eslint --quiet
+      - name: Run tsc
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:types
+      - name: Run lit-analyzer
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:lit --quiet
+      - name: Run prettier
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:prettier
+      - name: Check dependency licenses
+        if: matrix.workload == 'lint' && !cancelled() && steps.build_resources.outcome == 'success'
+        run: yarn run lint:licenses
+      - name: Run tests
+        if: matrix.workload == 'test'
+        run: yarn run test
@@ -22,88 +22,9 @@ permissions:
  contents: read

 jobs:
-  prepare-dependencies:
-    name: Prepare dependencies
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-
-      - name: Check for complete dependency tree
-        id: dependencies
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: |
-            node_modules
-            .yarn/install-state.gz
-          key: >-
-            node-modules-v1-${{ runner.os }}-${{ runner.arch }}-${{
-            hashFiles('.nvmrc', 'package.json', 'yarn.lock', '.yarnrc.yml', '.yarn/releases/**', '.yarn/patches/**') }}
-          lookup-only: true
-
-      - name: Setup Node and install
-        if: steps.dependencies.outputs.cache-hit != 'true'
-        uses: ./.github/actions/setup
-        with:
-          cache: false
-
-      - name: Save complete dependency tree
-        if: steps.dependencies.outputs.cache-hit != 'true'
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: |
-            node_modules
-            .yarn/install-state.gz
-          key: ${{ steps.dependencies.outputs.cache-primary-key }}
-
-  prepare-container-dependencies:
-    name: Prepare container dependencies
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v1.61.1-noble
-      options: --user 1001
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-
-      - name: Check for complete dependency tree
-        id: dependencies
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: |
-            node_modules
-            .yarn/install-state.gz
-          key: >-
-            node-modules-v1-${{ runner.os }}-${{ runner.arch }}-${{
-            hashFiles('.nvmrc', 'package.json', 'yarn.lock', '.yarnrc.yml', '.yarn/releases/**', '.yarn/patches/**') }}
-          lookup-only: true
-
-      - name: Setup Node and install
-        if: steps.dependencies.outputs.cache-hit != 'true'
-        uses: ./.github/actions/setup
-        with:
-          cache: false
-
-      - name: Save complete dependency tree
-        if: steps.dependencies.outputs.cache-hit != 'true'
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: |
-            node_modules
-            .yarn/install-state.gz
-          key: ${{ steps.dependencies.outputs.cache-primary-key }}
-
  # ── Build the demo once and share it across test jobs via artifact ──────────
  build-demo:
    name: Build demo
-    needs: prepare-dependencies
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
@@ -111,17 +32,14 @@ jobs:
        with:
          persist-credentials: false

-      - name: Setup Node with shared dependencies
+      - name: Setup Node and install
        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true

      - name: Build demo
        uses: ./.github/actions/build
        with:
-          target: build-demo-e2e
+          target: build-demo
          github-token: ${{ secrets.GITHUB_TOKEN }}
-          is-test: true

      - name: Upload demo build
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -134,7 +52,6 @@ jobs:
  # ── Build the e2e test app and share it via artifact ────────────────────────
  build-e2e-test-app:
    name: Build e2e test app
-    needs: prepare-dependencies
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
@@ -142,17 +59,14 @@ jobs:
        with:
          persist-credentials: false

-      - name: Setup Node with shared dependencies
+      - name: Setup Node and install
        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true

      - name: Build e2e test app
        uses: ./.github/actions/build
        with:
-          target: build-e2e-test-app-e2e
+          target: build-e2e-test-app
          github-token: ${{ secrets.GITHUB_TOKEN }}
-          is-test: true

      - name: Upload e2e test app build
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -165,7 +79,6 @@ jobs:
  # ── Build the gallery and share it via artifact ─────────────────────────────
  build-gallery:
    name: Build gallery
-    needs: prepare-dependencies
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
@@ -173,10 +86,8 @@ jobs:
        with:
          persist-credentials: false

-      - name: Setup Node with shared dependencies
+      - name: Setup Node and install
        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true

      - name: Build gallery
        uses: ./.github/actions/build
@@ -192,38 +103,41 @@ jobs:
          if-no-files-found: error
          retention-days: 3

-  # ── Run Playwright tests against Chromium ──────────────────────────────────
-  e2e-demo:
-    name: E2E demo (${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
-    needs:
-      - build-demo
-      - prepare-container-dependencies
+  # ── Run Playwright tests locally against Chromium ──────────────────────────
+  e2e-local:
+    name: E2E (local Chromium)
+    needs: [build-demo, build-e2e-test-app, build-gallery]
    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v1.61.1-noble
-      options: --user 1001 --ipc=host
-    defaults:
-      run:
-        shell: bash
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        shardIndex:
-          - 1
-          - 2
-        shardTotal:
-          - 2
+    # Fail fast if anything hangs. The whole suite should take < 15 minutes on
+    # Chromium; anything longer is almost certainly an install or webServer
+    # hang.
+    timeout-minutes: 30
    steps:
      - name: Check out files from GitHub
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false

-      - name: Setup Node with shared dependencies
+      - name: Setup Node and install
        uses: ./.github/actions/setup
+
+      # Resolve the installed Playwright version so the browser cache tracks
+      # Playwright itself, not every unrelated dependency bump.
+      - name: Resolve Playwright version
+        id: playwright-version
+        run: echo "version=$(node -p 'require("@playwright/test/package.json").version')" >> "$GITHUB_OUTPUT"
+
+      # Cache the downloaded browser build keyed on the installed Playwright
+      # version, so re-runs skip the ~170 MB download unless Playwright changes.
+      - name: Cache Playwright browsers
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
        with:
-          node-modules-cache: true
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}
+
+      - name: Install Playwright browsers
+        run: yarn playwright install --with-deps chromium
+        timeout-minutes: 10

      - name: Download demo build
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -231,133 +145,36 @@ jobs:
          name: demo-dist
          path: demo/dist/

-      - name: Run Playwright demo tests
-        run: yarn test:e2e:demo --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
-        timeout-minutes: 15
-
-      - name: Upload demo blob report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        if: always()
-        with:
-          name: blob-report-demo-${{ matrix.shardIndex }}
-          path: test/e2e/reports/demo/
-          if-no-files-found: warn
-          retention-days: 3
-
-  e2e-app:
-    name: E2E app (${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
-    needs:
-      - build-e2e-test-app
-      - prepare-container-dependencies
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v1.61.1-noble
-      options: --user 1001 --ipc=host
-    defaults:
-      run:
-        shell: bash
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        shardIndex:
-          - 1
-          - 2
-          - 3
-          - 4
-        shardTotal:
-          - 4
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-
-      - name: Setup Node with shared dependencies
-        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true
-
      - name: Download e2e test app build
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
          name: e2e-test-app-dist
          path: test/e2e/app/dist/

-      - name: Run Playwright app tests
-        run: yarn test:e2e:app --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
-        timeout-minutes: 15
-
-      - name: Upload app blob report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        if: always()
-        with:
-          name: blob-report-app-${{ matrix.shardIndex }}
-          path: test/e2e/reports/app/
-          if-no-files-found: warn
-          retention-days: 3
-
-  e2e-gallery:
-    name: E2E gallery (${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
-    needs:
-      - build-gallery
-      - prepare-container-dependencies
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v1.61.1-noble
-      options: --user 1001 --ipc=host
-    defaults:
-      run:
-        shell: bash
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        shardIndex:
-          - 1
-          - 2
-          - 3
-          - 4
-        shardTotal:
-          - 4
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-
-      - name: Setup Node with shared dependencies
-        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true
-
      - name: Download gallery build
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
          name: gallery-dist
          path: gallery/dist/

-      - name: Run Playwright gallery tests
-        run: yarn test:e2e:gallery --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+      - name: Run Playwright tests (local)
+        run: yarn test:e2e
        timeout-minutes: 15

-      - name: Upload gallery blob report
+      - name: Upload blob report
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        if: always()
        with:
-          name: blob-report-gallery-${{ matrix.shardIndex }}
-          path: test/e2e/reports/gallery/
-          if-no-files-found: warn
+          name: blob-report-local
+          path: test/e2e/reports/
          retention-days: 3

+  # ── Merge local blob reports and post PR comment ───────────────────────────
  report:
    name: Report
-    needs:
-      - e2e-demo
-      - e2e-app
-      - e2e-gallery
+    needs: [e2e-local]
    runs-on: ubuntu-latest
-    if: ${{ always() }}
+    if: ${{ !cancelled() }}
    permissions:
      contents: read
      pull-requests: write
@@ -367,31 +184,15 @@ jobs:
        with:
          persist-credentials: false

-      - name: Setup Node with shared dependencies
+      - name: Setup Node and install
        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true

-      - name: Download demo blob reports
+      - name: Download blob report (local)
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        continue-on-error: true
        with:
-          pattern: blob-report-demo-*
-          path: test/e2e/reports/demo/
-
-      - name: Download app blob reports
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        continue-on-error: true
-        with:
-          pattern: blob-report-app-*
-          path: test/e2e/reports/app/
-
-      - name: Download gallery blob reports
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        continue-on-error: true
-        with:
-          pattern: blob-report-gallery-*
-          path: test/e2e/reports/gallery/
+          name: blob-report-local
+          path: test/e2e/reports/

      - name: Stage blobs for merge
        run: node test/e2e/collect-blob-reports.mjs
@@ -408,11 +209,7 @@ jobs:
          retention-days: 14

      - name: Post report to PR
-        if: >-
-          github.event_name == 'pull_request' &&
-          (needs.e2e-demo.result == 'failure' ||
-          needs.e2e-app.result == 'failure' ||
-          needs.e2e-gallery.result == 'failure')
+        if: github.event_name == 'pull_request' && needs.e2e-local.result == 'failure'
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
@@ -420,19 +217,3 @@ jobs:
              `${process.env.GITHUB_WORKSPACE}/test/e2e/post-report-comment.mjs`
            );
            await postReportComment({ github, context, core });
-
-      - name: Check suite results
-        run: |
-          failed=0
-          for suite in \
-            "demo:${{ needs.e2e-demo.result }}" \
-            "app:${{ needs.e2e-app.result }}" \
-            "gallery:${{ needs.e2e-gallery.result }}"; do
-            name="${suite%%:*}"
-            result="${suite#*:}"
-            echo "E2E ${name}: ${result}"
-            if [ "$result" != "success" ]; then
-              failed=1
-            fi
-          done
-          exit "$failed"
@@ -232,7 +232,7 @@ module.exports.config = {
    };
  },

-  demo({ isProdBuild, latestBuild, isStatsBuild, isTestBuild }) {
+  demo({ isProdBuild, latestBuild, isStatsBuild }) {
    return {
      name: "demo" + nameSuffix(latestBuild),
      entry: {
@@ -247,7 +247,6 @@ module.exports.config = {
      isProdBuild,
      latestBuild,
      isStatsBuild,
-      isTestBuild,
    };
  },

@@ -307,7 +306,7 @@ module.exports.config = {
    };
  },

-  e2eTestApp({ isProdBuild, latestBuild, isStatsBuild, isTestBuild }) {
+  e2eTestApp({ isProdBuild, latestBuild, isStatsBuild }) {
    return {
      name: "e2e-test-app" + nameSuffix(latestBuild),
      entry: {
@@ -322,7 +321,6 @@ module.exports.config = {
      isProdBuild,
      latestBuild,
      isStatsBuild,
-      isTestBuild,
    };
  },
 };
@@ -42,22 +42,6 @@ gulp.task(
  )
 );

-gulp.task(
-  "build-demo-e2e",
-  gulp.series(
-    async function setEnv() {
-      process.env.NODE_ENV = "production";
-    },
-    "clean-demo",
-    // Cast needs to be backwards compatible and older HA has no translations
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
-    "copy-static-demo",
-    "rspack-prod-demo-e2e",
-    "gen-pages-demo-prod-e2e"
-  )
-);
-
 gulp.task(
  "analyze-demo",
  gulp.series(
@@ -39,18 +39,3 @@ gulp.task(
    "gen-pages-e2e-test-app-prod"
  )
 );
-
-gulp.task(
-  "build-e2e-test-app-e2e",
-  gulp.series(
-    async function setEnv() {
-      process.env.NODE_ENV = "production";
-    },
-    "clean-e2e-test-app",
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
-    "copy-static-e2e-test-app",
-    "rspack-prod-e2e-test-app-e2e",
-    "gen-pages-e2e-test-app-prod"
-  )
-);
@@ -225,16 +225,6 @@ gulp.task(
  )
 );

-gulp.task(
-  "gen-pages-demo-prod-e2e",
-  genPagesProdTask(
-    DEMO_PAGE_ENTRIES,
-    paths.demo_dir,
-    paths.demo_output_root,
-    paths.demo_output_latest
-  )
-);
-
 const GALLERY_PAGE_ENTRIES = { "index.html": ["entrypoint"] };

 gulp.task(
@@ -177,18 +177,6 @@ gulp.task("rspack-prod-demo", () =>
    bothBuilds(createDemoConfig, {
      isProdBuild: true,
      isStatsBuild: env.isStatsBuild(),
-      isTestBuild: env.isTestBuild(),
-    })
-  )
-);
-
-gulp.task("rspack-prod-demo-e2e", () =>
-  prodBuild(
-    createDemoConfig({
-      isProdBuild: true,
-      latestBuild: true,
-      isStatsBuild: env.isStatsBuild(),
-      isTestBuild: env.isTestBuild(),
    })
  )
 );
@@ -281,18 +269,6 @@ gulp.task("rspack-prod-e2e-test-app", () =>
    bothBuilds(createE2eTestAppConfig, {
      isProdBuild: true,
      isStatsBuild: env.isStatsBuild(),
-      isTestBuild: env.isTestBuild(),
-    })
-  )
-);
-
-gulp.task("rspack-prod-e2e-test-app-e2e", () =>
-  prodBuild(
-    createE2eTestAppConfig({
-      isProdBuild: true,
-      latestBuild: true,
-      isStatsBuild: env.isStatsBuild(),
-      isTestBuild: env.isTestBuild(),
    })
  )
 );
@@ -387,14 +387,9 @@ const createAppConfig = ({
    bundle.config.app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild })
  );

-const createDemoConfig = ({
-  isProdBuild,
-  latestBuild,
-  isStatsBuild,
-  isTestBuild,
-}) =>
+const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
  createRspackConfig(
-    bundle.config.demo({ isProdBuild, latestBuild, isStatsBuild, isTestBuild })
+    bundle.config.demo({ isProdBuild, latestBuild, isStatsBuild })
  );

 const createCastConfig = ({ isProdBuild, latestBuild }) =>
@@ -406,19 +401,9 @@ const createGalleryConfig = ({ isProdBuild, latestBuild }) =>
 const createLandingPageConfig = ({ isProdBuild, latestBuild }) =>
  createRspackConfig(bundle.config.landingPage({ isProdBuild, latestBuild }));

-const createE2eTestAppConfig = ({
-  isProdBuild,
-  latestBuild,
-  isStatsBuild,
-  isTestBuild,
-}) =>
+const createE2eTestAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
  createRspackConfig(
-    bundle.config.e2eTestApp({
-      isProdBuild,
-      latestBuild,
-      isStatsBuild,
-      isTestBuild,
-    })
+    bundle.config.e2eTestApp({ isProdBuild, latestBuild, isStatsBuild })
  );

 module.exports = {
@@ -145,7 +145,7 @@
    "@babel/preset-env": "8.0.2",
    "@bundle-stats/plugin-webpack-filter": "4.22.2",
    "@eslint/js": "10.0.1",
-    "@html-eslint/eslint-plugin": "0.63.0",
+    "@html-eslint/eslint-plugin": "0.64.0",
    "@lokalise/node-api": "16.0.0",
    "@octokit/auth-oauth-device": "8.0.3",
    "@octokit/plugin-retry": "8.1.0",
@@ -58,17 +58,6 @@
      "depNameTemplate": "rhysd/actionlint",
      "datasourceTemplate": "github-releases",
      "extractVersionTemplate": "^v(?<version>.+)$"
-    },
-    {
-      "description": "Keep Playwright CI container image up to date",
-      "customType": "regex",
-      "managerFilePatterns": ["/^\\.github/workflows/e2e\\.yaml$/"],
-      "matchStrings": [
-        "mcr\\.microsoft\\.com/playwright:(?<currentValue>v\\d+\\.\\d+\\.\\d+-noble)"
-      ],
-      "depNameTemplate": "mcr.microsoft.com/playwright",
-      "datasourceTemplate": "docker",
-      "versioningTemplate": "regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<compatibility>noble)$"
    }
  ],
  "packageRules": [
@@ -97,11 +86,6 @@
      "description": "Group date-fns with dependent timezone package",
      "groupName": "date-fns",
      "matchPackageNames": ["date-fns", "date-fns-tz"]
-    },
-    {
-      "description": "Group Playwright package and CI container updates",
-      "groupName": "Playwright",
-      "matchPackageNames": ["@playwright/test", "mcr.microsoft.com/playwright"]
    }
  ]
 }
@@ -4,29 +4,164 @@
 * Run with:
 *   yarn test:e2e:app
 */
-import { test, expect } from "@playwright/test";
-import {
-  appSidebar,
-  appSidebarConfig,
-  appSidebarPanel,
-  assertElementContent,
-  defineLinkSmokeTests,
-  defineRouteSmokeTests,
-  ensureAppSidebarPanelVisible,
-  goToPanel,
-} from "./app/src/helpers";
-import {
-  expectNoPageErrors,
-  PANEL_TIMEOUT,
-  QUICK_TIMEOUT,
-  SHELL_TIMEOUT,
-  trackPageErrors,
-} from "./helpers";
-import {
-  appRouteSmokeGroups,
-  configLinks,
-  moreInfoViewElements,
-} from "./app/src/smoke";
+import { test, expect, type Page } from "@playwright/test";
+import type { MoreInfoView } from "../../src/dialogs/more-info/const";
+import { PANEL_TIMEOUT, QUICK_TIMEOUT, SHELL_TIMEOUT } from "./helpers";
+import { e2ePanelRouteAssertions } from "./app/src/ha-test-panels";
+
+/**
+ * Each More info view renders one root element inside the dialog, plus one or
+ * more characteristic descendants that prove the view actually populated rather
+ * than rendering an empty shell. `text`, when set, asserts the element's text
+ * instead of just its presence.
+ */
+const MORE_INFO_VIEW_ELEMENTS: {
+  view: MoreInfoView;
+  element: string;
+  content: { selector: string; text?: string }[];
+}[] = [
+  {
+    view: "info",
+    element: "ha-more-info-info",
+    content: [
+      { selector: "more-info-light" },
+      { selector: "span.title", text: "Test Light" },
+    ],
+  },
+  {
+    view: "history",
+    element: "ha-more-info-history-and-logbook",
+    // The demo loads the history component but not logbook.
+    content: [{ selector: "ha-more-info-history" }],
+  },
+  {
+    view: "settings",
+    element: "ha-more-info-settings",
+    // The scenario mocks config/entity_registry/get, so the real registry
+    // panel renders instead of the "no unique ID" warning.
+    content: [{ selector: "entity-registry-settings" }],
+  },
+  {
+    view: "related",
+    element: "ha-related-items",
+    // search/related is mocked to return no relations, so the empty list
+    // renders.
+    content: [{ selector: "ha-related-items >> ha-list" }],
+  },
+  {
+    view: "add_to",
+    element: "ha-more-info-add-to",
+    // Admin users get the default add-to action list.
+    content: [{ selector: "ha-add-to-action-list" }],
+  },
+  {
+    view: "details",
+    element: "ha-more-info-details",
+    // The details view renders the state and attributes cards.
+    content: [{ selector: "ha-card" }],
+  },
+];
+
+const URL_NORMALIZATION_ASSERTIONS: {
+  name: string;
+  path: string;
+  element: string;
+  url: RegExp;
+  action?: (page: Page) => Promise<void>;
+}[] = [
+  {
+    name: "keeps the todo panel when adding the selected entity query",
+    path: "/todo",
+    element: "ha-panel-todo",
+    url: /\/\?entity_id=todo\.shopping_list#\/todo$/,
+  },
+  {
+    name: "keeps the history panel when removing the back query",
+    path: "/?back=1#/history",
+    element: "ha-panel-history, history-panel",
+    url: /\/#\/history$/,
+  },
+  {
+    name: "keeps the logbook panel when removing the back query",
+    path: "/?back=1#/logbook",
+    element: "ha-panel-logbook",
+    url: /\/#\/logbook$/,
+  },
+  {
+    name: "keeps the lovelace panel when adding the edit query",
+    path: "/lovelace",
+    element: "ha-panel-lovelace, hui-root",
+    url: /\/\?edit=1#\/lovelace\/home$/,
+    action: (page) => setLovelaceEditMode(page, true),
+  },
+  {
+    name: "keeps the lovelace panel when removing the edit query",
+    path: "/lovelace",
+    element: "ha-panel-lovelace, hui-root",
+    url: /\/#\/lovelace\/home$/,
+    action: async (page) => {
+      await setLovelaceEditMode(page, true);
+      await expect(page).toHaveURL(/\/\?edit=1#\/lovelace\/home$/, {
+        timeout: SHELL_TIMEOUT,
+      });
+      await setLovelaceEditMode(page, false);
+    },
+  },
+];
+
+interface E2ELovelaceRoot extends HTMLElement {
+  lovelace?: {
+    setEditMode: (editMode: boolean) => void;
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+// The test app is built with __DEMO__=true which enables hash-based routing.
+// Panel paths must use hash URLs: /#/lovelace, /#/energy, etc.
+// Scenario selection uses query params: /?scenario=foo (always at root).
+
+/** Navigate to a panel (hash routing) and wait for app to initialize. */
+async function goToPanel(page: Page, path: string) {
+  // Paths starting with /? are root-level (scenario selection); panel paths
+  // need to use hash routing (/#/panelname).
+  const url = path.startsWith("/?") ? path : `/#${path}`;
+  await page.goto(url);
+  await page.waitForSelector("ha-test", { state: "attached" });
+  // Wait for the app to finish initialising (hassConnected sets panels)
+  await page.waitForFunction(() => Boolean((window as any).__mockHass));
+}
+
+async function setLovelaceEditMode(page: Page, editMode: boolean) {
+  await page
+    .locator("hui-root")
+    .first()
+    .waitFor({ state: "attached", timeout: QUICK_TIMEOUT });
+  await page
+    .locator("hui-root")
+    .first()
+    .evaluate(async (el: Element, value) => {
+      const root = el as E2ELovelaceRoot;
+      const start = performance.now();
+      await new Promise<void>((resolve, reject) => {
+        const check = () => {
+          if (root.lovelace?.setEditMode) {
+            resolve();
+            return;
+          }
+          if (performance.now() - start > 2000) {
+            reject(new Error("Lovelace edit mode action was not available"));
+            return;
+          }
+          requestAnimationFrame(check);
+        };
+        check();
+      });
+      root.lovelace!.setEditMode(value);
+    }, editMode);
+}

 // ---------------------------------------------------------------------------
 // App shell
@@ -34,40 +169,60 @@ import {

 test.describe("App shell", () => {
  test("page loads and ha-test element mounts", async ({ page }) => {
-    const errors = trackPageErrors(page);
+    const errors: string[] = [];
+    page.on("pageerror", (e) => errors.push(e.message));

    await goToPanel(page, "/");

-    await expect(page.locator("ha-test")).toBeAttached({
-      timeout: QUICK_TIMEOUT,
-    });
-    expectNoPageErrors(errors, undefined, []);
+    await expect(page.locator("ha-test")).toBeAttached();
+    expect(errors).toHaveLength(0);
  });

  test("sidebar renders with expected panels", async ({ page }) => {
    await goToPanel(page, "/lovelace");

-    await Promise.all([
-      // Regular panels use #sidebar-panel-{urlPath} inside ha-sidebar's shadow root.
-      ...["lovelace", "map", "energy", "history"].map((urlPath) =>
-        expect(appSidebarPanel(page, urlPath)).toBeAttached({
-          timeout: QUICK_TIMEOUT,
-        })
-      ),
-      // Config has its own special element with id="sidebar-config".
-      expect(appSidebarConfig(page)).toBeAttached({
-        timeout: QUICK_TIMEOUT,
-      }),
-    ]);
+    // Regular panels use #sidebar-panel-{urlPath} inside ha-sidebar's shadow root
+    for (const urlPath of ["lovelace", "map", "energy", "history"]) {
+      // eslint-disable-next-line no-await-in-loop
+      await expect(
+        page.locator(
+          `ha-test >> home-assistant-main >> ha-sidebar >> #sidebar-panel-${urlPath}`
+        )
+      ).toBeAttached();
+    }
+    // Config has its own special element with id="sidebar-config"
+    await expect(
+      page.locator(
+        `ha-test >> home-assistant-main >> ha-sidebar >> #sidebar-config`
+      )
+    ).toBeAttached();
  });

  test("sidebar navigation changes the active panel", async ({ page }) => {
    await goToPanel(page, "/lovelace");

-    const historyLink = await ensureAppSidebarPanelVisible(page, "history");
+    const sidebar = page.locator(
+      "ha-test >> home-assistant-main >> ha-sidebar"
+    );
+    await expect(sidebar).toBeAttached({ timeout: SHELL_TIMEOUT });
+
+    const historyLink = sidebar.locator("#sidebar-panel-history");
+    if (!(await historyLink.isVisible().catch(() => false))) {
+      await page.locator("ha-test >> home-assistant-main").evaluate((el) => {
+        el.dispatchEvent(
+          new CustomEvent("hass-toggle-menu", {
+            detail: { open: true },
+            bubbles: true,
+            composed: true,
+          })
+        );
+      });
+    }
+
+    await expect(historyLink).toBeVisible({ timeout: SHELL_TIMEOUT });
    await historyLink.click();

-    await expect(page).toHaveURL(/\/#\/history$/, { timeout: QUICK_TIMEOUT });
+    await expect(page).toHaveURL(/\/#\/history$/, { timeout: SHELL_TIMEOUT });
    await expect(
      page.locator("ha-panel-history, history-panel").first()
    ).toBeAttached({ timeout: PANEL_TIMEOUT });
@@ -76,29 +231,34 @@ test.describe("App shell", () => {
  test("sidebar renders notification badge", async ({ page }) => {
    await goToPanel(page, "/lovelace");

-    const sidebar = appSidebar(page);
-    await expect(sidebar).toBeAttached({ timeout: QUICK_TIMEOUT });
+    const sidebar = page.locator(
+      "ha-test >> home-assistant-main >> ha-sidebar"
+    );
+    await expect(sidebar).toBeAttached({ timeout: SHELL_TIMEOUT });

    const notificationsLink = sidebar.locator("#sidebar-notifications");
-    await expect(notificationsLink).toBeAttached({ timeout: QUICK_TIMEOUT });
+    await expect(notificationsLink).toBeAttached({ timeout: SHELL_TIMEOUT });
    await expect(notificationsLink.locator(".badge").first()).toHaveText("1", {
-      timeout: QUICK_TIMEOUT,
+      timeout: SHELL_TIMEOUT,
    });
  });

  test("sidebar marks the active panel as selected", async ({ page }) => {
-    const lovelaceLink = appSidebarPanel(page, "lovelace");
-    const historyLink = appSidebarPanel(page, "history");
+    const sidebar = page.locator(
+      "ha-test >> home-assistant-main >> ha-sidebar"
+    );
+    const lovelaceLink = sidebar.locator("#sidebar-panel-lovelace");
+    const historyLink = sidebar.locator("#sidebar-panel-history");

    await goToPanel(page, "/lovelace");
    await expect(lovelaceLink).toHaveClass(/selected/, {
-      timeout: QUICK_TIMEOUT,
+      timeout: SHELL_TIMEOUT,
    });
    await expect(historyLink).not.toHaveClass(/selected/);

    await goToPanel(page, "/history");
    await expect(historyLink).toHaveClass(/selected/, {
-      timeout: QUICK_TIMEOUT,
+      timeout: SHELL_TIMEOUT,
    });
    await expect(lovelaceLink).not.toHaveClass(/selected/);
  });
@@ -111,16 +271,124 @@ test.describe("App shell", () => {
    await goToPanel(page, "/?scenario=non-admin#/lovelace");

    // Wait for the sidebar to mount before asserting on its contents.
-    await expect(appSidebar(page)).toBeAttached({ timeout: QUICK_TIMEOUT });
+    await expect(
+      page.locator("ha-test >> home-assistant-main >> ha-sidebar")
+    ).toBeAttached({ timeout: SHELL_TIMEOUT });

    // Config panel is adminOnly — should not appear for non-admin.
-    await expect(appSidebarConfig(page)).not.toBeAttached({
-      timeout: QUICK_TIMEOUT,
+    const configLink = page.locator(
+      `ha-test >> home-assistant-main >> ha-sidebar >> #sidebar-config`
+    );
+    await expect(configLink).not.toBeAttached();
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Panel navigation
+// ---------------------------------------------------------------------------
+
+test.describe("Panel navigation", () => {
+  for (const [path, element] of e2ePanelRouteAssertions) {
+    test(`renders registered panel ${path}`, async ({ page }) => {
+      await goToPanel(page, path);
+      await expect(page.locator(element).first()).toBeAttached({
+        timeout: PANEL_TIMEOUT,
+      });
+    });
+  }
+});
+
+test.describe("Panel URL normalization", () => {
+  for (const {
+    name,
+    path,
+    element,
+    url,
+    action,
+  } of URL_NORMALIZATION_ASSERTIONS) {
+    test(name, async ({ page }) => {
+      await goToPanel(page, path);
+      await action?.(page);
+      await expect(page).toHaveURL(url, { timeout: SHELL_TIMEOUT });
+      await expect(page.locator(element).first()).toBeAttached({
+        timeout: PANEL_TIMEOUT,
+      });
+    });
+  }
+});
+
+// ---------------------------------------------------------------------------
+// Tools panel (formerly Developer tools)
+// ---------------------------------------------------------------------------
+
+/**
+ * Every tool sub-page reachable under /config/tools, mapped to the custom
+ * element tools-router mounts for it (see tools-router.ts). Asserting on the
+ * specific element proves the route actually rendered its tool, not just the
+ * shared ha-panel-tools shell.
+ */
+const TOOLS_SUBPAGES: { route: string; element: string }[] = [
+  { route: "yaml", element: "tools-yaml-config" },
+  { route: "state", element: "tools-state" },
+  { route: "action", element: "tools-action" },
+  { route: "template", element: "tools-template" },
+  { route: "event", element: "tools-event" },
+  { route: "statistics", element: "tools-statistics" },
+  { route: "assist", element: "tools-assist" },
+  { route: "debug", element: "tools-debug" },
+];
+
+test.describe("Tools panel", () => {
+  test("base path renders the tools panel", async ({ page }) => {
+    await goToPanel(page, "/config/tools");
+    await expect(page.locator("ha-panel-tools")).toBeAttached({
+      timeout: PANEL_TIMEOUT,
+    });
+  });
+
+  for (const { route, element } of TOOLS_SUBPAGES) {
+    test(`renders the ${route} sub-page`, async ({ page }) => {
+      await goToPanel(page, `/config/tools/${route}`);
+      await expect(page.locator(element)).toBeAttached({
+        timeout: PANEL_TIMEOUT,
+      });
+    });
+  }
+
+  test("service is an alias for the action tool", async ({ page }) => {
+    await goToPanel(page, "/config/tools/service");
+    await expect(page.locator("tools-action")).toBeAttached({
+      timeout: PANEL_TIMEOUT,
    });
  });
 });

-defineRouteSmokeTests(appRouteSmokeGroups);
+// ---------------------------------------------------------------------------
+// Tools redirects (old developer-tools URLs)
+// ---------------------------------------------------------------------------
+
+test.describe("Tools redirects", () => {
+  // The panel moved from top-level /developer-tools (pre-2026.2) to
+  // /config/developer-tools (2026.2), then was renamed to /config/tools
+  // (2026.8). Both old locations must redirect to the new one, and deep links
+  // must keep their sub-page. See the updateRoute() redirect in
+  // src/layouts/home-assistant.ts.
+  for (const oldBase of ["/developer-tools", "/config/developer-tools"]) {
+    test(`redirects ${oldBase} to the tools panel`, async ({ page }) => {
+      await goToPanel(page, oldBase);
+      await expect(page.locator("ha-panel-tools")).toBeAttached({
+        timeout: PANEL_TIMEOUT,
+      });
+    });
+
+    test(`redirects ${oldBase}/state to the state tool`, async ({ page }) => {
+      await goToPanel(page, `${oldBase}/state`);
+      await expect(page.locator("tools-state")).toBeAttached({
+        timeout: PANEL_TIMEOUT,
+      });
+    });
+  }
+});

 // ---------------------------------------------------------------------------
 // Lovelace
@@ -149,7 +417,7 @@ test.describe("Lovelace dashboard", () => {
 // ---------------------------------------------------------------------------

 test.describe("Light more-info dialog", () => {
-  for (const { view, element, content } of moreInfoViewElements) {
+  for (const { view, element, content } of MORE_INFO_VIEW_ELEMENTS) {
    test(`opens more-info ${view} view for a light entity`, async ({
      page,
    }) => {
@@ -187,7 +455,16 @@ test.describe("Light more-info dialog", () => {

      // Each view should render its own characteristic content, not just an
      // empty shell.
-      await assertElementContent(dialog, content);
+      for (const { selector, text } of content) {
+        const locator = dialog.locator(selector).first();
+        if (text) {
+          // eslint-disable-next-line no-await-in-loop
+          await expect(locator).toContainText(text, { timeout: QUICK_TIMEOUT });
+        } else {
+          // eslint-disable-next-line no-await-in-loop
+          await expect(locator).toBeAttached({ timeout: QUICK_TIMEOUT });
+        }
+      }
    });
  }
 });
@@ -242,27 +519,144 @@ test.describe("Theming", () => {
 // ---------------------------------------------------------------------------

 test.describe("Config panel", () => {
+  const DASHBOARD_LINKS = [
+    { href: "/config/integrations", label: "Devices & services" },
+    { href: "/config/automation", label: "Automations & scenes" },
+    { href: "/config/areas", label: "Areas, labels & zones" },
+    { href: "/config/apps", label: "Apps" },
+    { href: "/config/lovelace/dashboards", label: "Dashboards" },
+    { href: "/config/voice-assistants", label: "Voice assistants" },
+    { href: "/config/matter", label: "Matter" },
+    { href: "/config/zha", label: "Zigbee" },
+    { href: "/config/zwave_js", label: "Z-Wave" },
+    { href: "/knx", label: "KNX" },
+    { href: "/config/thread", label: "Thread" },
+    { href: "/config/bluetooth", label: "Bluetooth" },
+    { href: "/config/infrared", label: "Infrared" },
+    { href: "/config/radio-frequency", label: "Radio frequency" },
+    { href: "/insteon", label: "Insteon" },
+    { href: "/config/tags", label: "Tags" },
+    { href: "/config/person", label: "People" },
+    { href: "/config/system", label: "System" },
+    { href: "/config/tools", label: "Tools" },
+    { href: "/config/info", label: "About" },
+  ];
+
+  const CONFIG_ROUTES: { path: string; element: string }[] = [
+    { path: "/config/integrations", element: "ha-config-integrations" },
+    { path: "/config/devices", element: "ha-config-devices" },
+    { path: "/config/entities", element: "ha-config-entities" },
+    { path: "/config/helpers", element: "ha-config-helpers" },
+    { path: "/config/areas", element: "ha-config-areas" },
+    { path: "/config/apps", element: "ha-config-apps" },
+    { path: "/config/app", element: "ha-config-app-dashboard" },
+    { path: "/config/automation", element: "ha-config-automation" },
+    { path: "/config/backup", element: "ha-config-backup" },
+    { path: "/config/scene", element: "ha-config-scene" },
+    { path: "/config/script", element: "ha-config-script" },
+    { path: "/config/blueprint", element: "ha-config-blueprint" },
+    { path: "/config/cloud", element: "ha-config-cloud" },
+    { path: "/config/energy", element: "ha-config-energy" },
+    { path: "/config/hardware", element: "ha-config-hardware" },
+    { path: "/config/labs", element: "ha-config-labs" },
+    { path: "/config/lovelace", element: "ha-config-lovelace" },
+    { path: "/config/person", element: "ha-config-person" },
+    { path: "/config/storage", element: "ha-config-section-storage" },
+    { path: "/config/tags", element: "ha-config-tags" },
+    { path: "/config/users", element: "ha-config-users" },
+    { path: "/config/voice-assistants", element: "ha-config-voice-assistants" },
+    { path: "/config/system", element: "ha-config-system-navigation" },
+    { path: "/config/info", element: "ha-config-info" },
+    { path: "/config/logs", element: "ha-config-logs" },
+    { path: "/config/general", element: "ha-config-section-general" },
+    { path: "/config/updates", element: "ha-config-section-updates" },
+    { path: "/config/repairs", element: "ha-config-repairs-dashboard" },
+    { path: "/config/analytics", element: "ha-config-section-analytics" },
+    { path: "/config/ai-tasks", element: "ha-config-section-ai-tasks" },
+    { path: "/config/labels", element: "ha-config-labels" },
+    { path: "/config/zone", element: "ha-config-zone" },
+    { path: "/config/network", element: "ha-config-section-network" },
+    {
+      path: "/config/application_credentials",
+      element: "ha-config-application-credentials",
+    },
+    { path: "/config/bluetooth", element: "bluetooth-config-dashboard-router" },
+    { path: "/config/dhcp", element: "dhcp-config-panel" },
+    { path: "/config/infrared", element: "infrared-config-dashboard-router" },
+    { path: "/config/matter", element: "matter-config-panel" },
+    { path: "/config/mqtt", element: "mqtt-config-panel" },
+    {
+      path: "/config/radio-frequency",
+      element: "radio-frequency-config-dashboard-router",
+    },
+    { path: "/config/ssdp", element: "ssdp-config-panel" },
+    { path: "/config/thread", element: "thread-config-panel" },
+    { path: "/config/zeroconf", element: "zeroconf-config-panel" },
+    { path: "/config/zha", element: "zha-config-dashboard-router" },
+    { path: "/config/zwave_js", element: "zwave_js-config-router" },
+  ];
+
+  const NESTED_CONFIG_ROUTES: { path: string; element: string }[] = [
+    {
+      path: "/config/integrations/dashboard",
+      element: "ha-config-integrations-dashboard",
+    },
+    {
+      path: "/config/devices/dashboard",
+      element: "ha-config-devices-dashboard",
+    },
+    { path: "/config/areas/dashboard", element: "ha-config-areas-dashboard" },
+    { path: "/config/backup/settings", element: "ha-config-backup-settings" },
+  ];
+
  test("config panel loads without JS errors", async ({ page }) => {
-    const errors = trackPageErrors(page);
+    const errors: string[] = [];
+    page.on("pageerror", (e) => errors.push(e.message));

    await goToPanel(page, "/config");
    await expect(
      page.locator("ha-panel-config, ha-config-dashboard").first()
    ).toBeAttached({ timeout: PANEL_TIMEOUT + 5_000 });

-    expectNoPageErrors(errors);
+    // Filter known pre-existing errors from vendor code
+    const realErrors = errors.filter(
+      (e) => !e.includes("ResizeObserver") && !e.includes("Non-Error")
+    );
+    expect(realErrors).toHaveLength(0);
  });

-  const getDashboard = async (page) => {
+  test("dashboard renders key settings links", async ({ page }) => {
    await goToPanel(page, "/config");
-    const dashboard = page.locator("ha-config-dashboard");
-    await expect(dashboard).toBeAttached({ timeout: QUICK_TIMEOUT });
-    return dashboard;
-  };

-  defineLinkSmokeTests(
-    "config links point to expected pages",
-    configLinks,
-    getDashboard
-  );
+    const dashboard = page.locator("ha-config-dashboard");
+    await expect(dashboard).toBeAttached({ timeout: PANEL_TIMEOUT });
+
+    for (const { href, label } of DASHBOARD_LINKS) {
+      const link = dashboard.getByRole("link", {
+        name: new RegExp(`^${label.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`),
+      });
+      // eslint-disable-next-line no-await-in-loop
+      await expect(link).toHaveAttribute("href", href, {
+        timeout: QUICK_TIMEOUT,
+      });
+    }
+  });
+
+  for (const { path, element } of CONFIG_ROUTES) {
+    test(`renders ${path}`, async ({ page }) => {
+      await goToPanel(page, path);
+      await expect(page.locator(element)).toBeAttached({
+        timeout: PANEL_TIMEOUT,
+      });
+    });
+  }
+
+  for (const { path, element } of NESTED_CONFIG_ROUTES) {
+    test(`renders ${path}`, async ({ page }) => {
+      await goToPanel(page, path);
+      await expect(page.locator(element)).toBeAttached({
+        timeout: PANEL_TIMEOUT,
+      });
+    });
+  }
 });
@@ -1,172 +0,0 @@
-import { expect, test, type Locator, type Page } from "@playwright/test";
-import {
-  defineParallelSmokeTests,
-  PANEL_TIMEOUT,
-  QUICK_TIMEOUT,
-  SHELL_TIMEOUT,
-} from "../../helpers";
-
-const APP_MAIN_SELECTOR = "ha-test >> home-assistant-main";
-const APP_SIDEBAR_SELECTOR = `${APP_MAIN_SELECTOR} >> ha-sidebar`;
-
-// The app e2e harness is built with __DEMO__=true, which enables hash routing.
-// Scenario selection uses query params at root: /?scenario=foo#/lovelace.
-export async function goToPanel(page: Page, path: string) {
-  const url = path.startsWith("/?") ? path : `/#${path}`;
-  await page.goto(url);
-  await Promise.all([
-    page.waitForSelector("ha-test", {
-      state: "attached",
-      timeout: SHELL_TIMEOUT,
-    }),
-    page.waitForFunction(
-      () => "__mockHass" in window && Boolean(window.__mockHass),
-      undefined,
-      { timeout: SHELL_TIMEOUT }
-    ),
-  ]);
-}
-
-export const appMain = (page: Page) => page.locator(APP_MAIN_SELECTOR);
-
-export const appSidebar = (page: Page) => page.locator(APP_SIDEBAR_SELECTOR);
-
-export const appSidebarPanel = (page: Page, panel: string) =>
-  appSidebar(page).locator(`#sidebar-panel-${panel}`);
-
-export const appSidebarConfig = (page: Page) =>
-  appSidebar(page).locator("#sidebar-config");
-
-export async function openAppSidebar(page: Page) {
-  await appMain(page).evaluate((el) => {
-    el.dispatchEvent(
-      new CustomEvent("hass-toggle-menu", {
-        detail: { open: true },
-        bubbles: true,
-        composed: true,
-      })
-    );
-  });
-}
-
-export async function ensureAppSidebarPanelVisible(page: Page, panel: string) {
-  await expect(appSidebar(page)).toBeAttached({ timeout: QUICK_TIMEOUT });
-
-  const link = appSidebarPanel(page, panel);
-  if (!(await link.isVisible().catch(() => false))) {
-    await openAppSidebar(page);
-  }
-  await expect(link).toBeVisible({ timeout: QUICK_TIMEOUT });
-  return link;
-}
-
-const escapeRegExp = (value: string) =>
-  value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-
-export interface LinkSmokeCase {
-  href: string;
-  label: string;
-}
-
-export async function assertLink(
-  root: Locator,
-  { href, label }: LinkSmokeCase
-) {
-  const link = root.getByRole("link", {
-    name: new RegExp(`^${escapeRegExp(label)}\\b`),
-  });
-  await expect(link).toHaveAttribute("href", href, {
-    timeout: QUICK_TIMEOUT,
-  });
-}
-
-export function defineLinkSmokeTests(
-  name: string,
-  links: LinkSmokeCase[],
-  getRoot: (page: Page) => Promise<Locator>
-) {
-  test(name, async ({ page }) => {
-    const root = await getRoot(page);
-
-    await Promise.all(
-      links.map((link) =>
-        test.step(`${link.label} links to ${link.href}`, async () => {
-          await assertLink(root, link);
-        })
-      )
-    );
-  });
-}
-
-export interface ElementContentAssertion {
-  selector: string;
-  text?: string;
-}
-
-export interface ViewElementSmokeCase<TView extends string = string> {
-  view: TView;
-  element: string;
-  content: ElementContentAssertion[];
-}
-
-export async function assertElementContent(
-  root: Locator,
-  content: ElementContentAssertion[]
-) {
-  await Promise.all(
-    content.map(({ selector, text }) => {
-      const locator = root.locator(selector).first();
-      return text
-        ? expect(locator).toContainText(text, { timeout: QUICK_TIMEOUT })
-        : expect(locator).toBeAttached({ timeout: QUICK_TIMEOUT });
-    })
-  );
-}
-
-export interface RouteSmokeCase {
-  name?: string;
-  path: string;
-  element: string;
-  url?: RegExp;
-  action?: (page: Page) => Promise<void>;
-}
-
-export interface RouteSmokeGroup {
-  name: string;
-  routes: RouteSmokeCase[];
-  testName?: (route: RouteSmokeCase) => string;
-}
-
-export const routeCase = (path: string, element: string): RouteSmokeCase => ({
-  path,
-  element,
-});
-
-export const routeCases = (routes: [string, string][]): RouteSmokeCase[] =>
-  routes.map(([path, element]) => routeCase(path, element));
-
-export const rendersRoute = (route: RouteSmokeCase) => `renders ${route.path}`;
-
-async function assertRouteSmoke(page: Page, route: RouteSmokeCase) {
-  await goToPanel(page, route.path);
-  await route.action?.(page);
-  if (route.url) {
-    await expect(page).toHaveURL(route.url, { timeout: QUICK_TIMEOUT });
-  }
-  await expect(page.locator(route.element).first()).toBeAttached({
-    timeout: PANEL_TIMEOUT,
-  });
-}
-
-export function defineRouteSmokeTests(groups: RouteSmokeGroup[]) {
-  defineParallelSmokeTests({
-    groups,
-    groupName: (group) => group.name,
-    cases: (group) => group.routes,
-    testName: (route, group) =>
-      route.name ?? group.testName?.(route) ?? rendersRoute(route),
-    run: async ({ page, smokeCase }) => {
-      await assertRouteSmoke(page, smokeCase);
-    },
-  });
-}
@@ -1,273 +0,0 @@
-import { expect, type Page } from "@playwright/test";
-import type { MoreInfoView } from "../../../../src/dialogs/more-info/const";
-import { QUICK_TIMEOUT, SHELL_TIMEOUT } from "../../helpers";
-import {
-  rendersRoute,
-  routeCase,
-  routeCases,
-  type LinkSmokeCase,
-  type RouteSmokeCase,
-  type RouteSmokeGroup,
-  type ViewElementSmokeCase,
-} from "./helpers";
-import { e2ePanelRouteAssertions } from "./ha-test-panels";
-
-// ── Config dashboard links ───────────────────────────────────────────────────
-
-export const configLinks: LinkSmokeCase[] = [
-  { href: "/config/integrations", label: "Devices & services" },
-  { href: "/config/automation", label: "Automations & scenes" },
-  { href: "/config/areas", label: "Areas, labels & zones" },
-  { href: "/config/apps", label: "Apps" },
-  { href: "/config/lovelace/dashboards", label: "Dashboards" },
-  { href: "/config/voice-assistants", label: "Voice assistants" },
-  { href: "/config/matter", label: "Matter" },
-  { href: "/config/zha", label: "Zigbee" },
-  { href: "/config/zwave_js", label: "Z-Wave" },
-  { href: "/knx", label: "KNX" },
-  { href: "/config/thread", label: "Thread" },
-  { href: "/config/bluetooth", label: "Bluetooth" },
-  { href: "/config/infrared", label: "Infrared" },
-  { href: "/config/radio-frequency", label: "Radio frequency" },
-  { href: "/insteon", label: "Insteon" },
-  { href: "/config/tags", label: "Tags" },
-  { href: "/config/person", label: "People" },
-  { href: "/config/system", label: "System" },
-  { href: "/config/tools", label: "Tools" },
-  { href: "/config/info", label: "About" },
-];
-
-// ── More-info dialog views ───────────────────────────────────────────────────
-
-export const moreInfoViewElements: ViewElementSmokeCase<MoreInfoView>[] = [
-  {
-    view: "info",
-    element: "ha-more-info-info",
-    content: [
-      { selector: "more-info-light" },
-      { selector: "span.title", text: "Test Light" },
-    ],
-  },
-  {
-    view: "history",
-    element: "ha-more-info-history-and-logbook",
-    // The demo loads the history component but not logbook.
-    content: [{ selector: "ha-more-info-history" }],
-  },
-  {
-    view: "settings",
-    element: "ha-more-info-settings",
-    // The scenario mocks config/entity_registry/get, so the real registry
-    // panel renders instead of the "no unique ID" warning.
-    content: [{ selector: "entity-registry-settings" }],
-  },
-  {
-    view: "related",
-    element: "ha-related-items",
-    // search/related is mocked to return no relations, so the empty list
-    // renders.
-    content: [{ selector: "ha-related-items >> ha-list" }],
-  },
-  {
-    view: "add_to",
-    element: "ha-more-info-add-to",
-    // Admin users get the default add-to action list.
-    content: [{ selector: "ha-add-to-action-list" }],
-  },
-  {
-    view: "details",
-    element: "ha-more-info-details",
-    // The details view renders the state and attributes cards.
-    content: [{ selector: "ha-card" }],
-  },
-];
-
-// ── Route smoke tests ────────────────────────────────────────────────────────
-
-interface E2ELovelaceRoot extends HTMLElement {
-  lovelace?: {
-    setEditMode: (editMode: boolean) => void;
-  };
-}
-
-async function setLovelaceEditMode(page: Page, editMode: boolean) {
-  await page
-    .locator("hui-root")
-    .first()
-    .waitFor({ state: "attached", timeout: QUICK_TIMEOUT });
-  await page
-    .locator("hui-root")
-    .first()
-    .evaluate(async (el: Element, value) => {
-      const root = el as E2ELovelaceRoot;
-      const start = performance.now();
-      await new Promise<void>((resolve, reject) => {
-        const check = () => {
-          if (root.lovelace?.setEditMode) {
-            resolve();
-            return;
-          }
-          if (performance.now() - start > 2000) {
-            reject(new Error("Lovelace edit mode action was not available"));
-            return;
-          }
-          requestAnimationFrame(check);
-        };
-        check();
-      });
-      root.lovelace!.setEditMode(value);
-    }, editMode);
-}
-
-const PANEL_ROUTE_ASSERTIONS = Array.from(
-  e2ePanelRouteAssertions,
-  ([path, element]) => routeCase(path, element)
-);
-
-const URL_NORMALIZATION_ASSERTIONS: RouteSmokeCase[] = [
-  {
-    name: "keeps the todo panel when adding the selected entity query",
-    path: "/todo",
-    element: "ha-panel-todo",
-    url: /\/\?entity_id=todo\.shopping_list#\/todo$/,
-  },
-  {
-    name: "keeps the history panel when removing the back query",
-    path: "/?back=1#/history",
-    element: "ha-panel-history, history-panel",
-    url: /\/#\/history$/,
-  },
-  {
-    name: "keeps the logbook panel when removing the back query",
-    path: "/?back=1#/logbook",
-    element: "ha-panel-logbook",
-    url: /\/#\/logbook$/,
-  },
-  {
-    name: "keeps the lovelace panel when removing the edit query",
-    path: "/lovelace",
-    element: "ha-panel-lovelace, hui-root",
-    url: /\/#\/lovelace\/home$/,
-    action: async (page) => {
-      await setLovelaceEditMode(page, true);
-      await expect(page).toHaveURL(/\/\?edit=1#\/lovelace\/home$/, {
-        timeout: SHELL_TIMEOUT,
-      });
-      await setLovelaceEditMode(page, false);
-    },
-  },
-];
-
-const TOOLS_SUBPAGES: { route: string; element: string }[] = [
-  { route: "yaml", element: "tools-yaml-config" },
-  { route: "state", element: "tools-state" },
-  { route: "action", element: "tools-action" },
-  { route: "template", element: "tools-template" },
-  { route: "event", element: "tools-event" },
-  { route: "statistics", element: "tools-statistics" },
-  { route: "assist", element: "tools-assist" },
-  { route: "debug", element: "tools-debug" },
-];
-
-const TOOLS_ROUTE_ASSERTIONS = [
-  routeCase("/config/tools", "ha-panel-tools"),
-  ...TOOLS_SUBPAGES.map(({ route, element }) =>
-    routeCase(`/config/tools/${route}`, element)
-  ),
-  routeCase("/config/tools/service", "tools-action"),
-];
-
-const TOOLS_REDIRECT_ASSERTIONS = [
-  ...["/developer-tools", "/config/developer-tools"].flatMap((oldBase) => [
-    routeCase(oldBase, "ha-panel-tools"),
-    routeCase(`${oldBase}/state`, "tools-state"),
-  ]),
-];
-
-const CONFIG_ROUTES = routeCases([
-  ["/config/integrations", "ha-config-integrations"],
-  ["/config/devices", "ha-config-devices"],
-  ["/config/entities", "ha-config-entities"],
-  ["/config/helpers", "ha-config-helpers"],
-  ["/config/areas", "ha-config-areas"],
-  ["/config/apps", "ha-config-apps"],
-  ["/config/app", "ha-config-app-dashboard"],
-  ["/config/automation", "ha-config-automation"],
-  ["/config/backup", "ha-config-backup"],
-  ["/config/scene", "ha-config-scene"],
-  ["/config/script", "ha-config-script"],
-  ["/config/blueprint", "ha-config-blueprint"],
-  ["/config/cloud", "ha-config-cloud"],
-  ["/config/energy", "ha-config-energy"],
-  ["/config/hardware", "ha-config-hardware"],
-  ["/config/labs", "ha-config-labs"],
-  ["/config/lovelace", "ha-config-lovelace"],
-  ["/config/person", "ha-config-person"],
-  ["/config/storage", "ha-config-section-storage"],
-  ["/config/tags", "ha-config-tags"],
-  ["/config/users", "ha-config-users"],
-  ["/config/voice-assistants", "ha-config-voice-assistants"],
-  ["/config/system", "ha-config-system-navigation"],
-  ["/config/info", "ha-config-info"],
-  ["/config/logs", "ha-config-logs"],
-  ["/config/general", "ha-config-section-general"],
-  ["/config/updates", "ha-config-section-updates"],
-  ["/config/repairs", "ha-config-repairs-dashboard"],
-  ["/config/analytics", "ha-config-section-analytics"],
-  ["/config/ai-tasks", "ha-config-section-ai-tasks"],
-  ["/config/labels", "ha-config-labels"],
-  ["/config/zone", "ha-config-zone"],
-  ["/config/network", "ha-config-section-network"],
-  ["/config/application_credentials", "ha-config-application-credentials"],
-  ["/config/bluetooth", "bluetooth-config-dashboard-router"],
-  ["/config/dhcp", "dhcp-config-panel"],
-  ["/config/infrared", "infrared-config-dashboard-router"],
-  ["/config/matter", "matter-config-panel"],
-  ["/config/mqtt", "mqtt-config-panel"],
-  ["/config/radio-frequency", "radio-frequency-config-dashboard-router"],
-  ["/config/ssdp", "ssdp-config-panel"],
-  ["/config/thread", "thread-config-panel"],
-  ["/config/zeroconf", "zeroconf-config-panel"],
-  ["/config/zha", "zha-config-dashboard-router"],
-  ["/config/zwave_js", "zwave_js-config-router"],
-]);
-
-const NESTED_CONFIG_ROUTES = routeCases([
-  ["/config/integrations/dashboard", "ha-config-integrations-dashboard"],
-  ["/config/devices/dashboard", "ha-config-devices-dashboard"],
-  ["/config/areas/dashboard", "ha-config-areas-dashboard"],
-  ["/config/backup/settings", "ha-config-backup-settings"],
-]);
-
-export const appRouteSmokeGroups: RouteSmokeGroup[] = [
-  {
-    name: "Panel navigation",
-    routes: PANEL_ROUTE_ASSERTIONS,
-    testName: (route) => `renders registered panel ${route.path}`,
-  },
-  {
-    name: "Panel URL normalization",
-    routes: URL_NORMALIZATION_ASSERTIONS,
-    testName: (route) => route.name!,
-  },
-  {
-    name: "Tools panel",
-    routes: TOOLS_ROUTE_ASSERTIONS,
-    testName: rendersRoute,
-  },
-  {
-    name: "Tools redirects",
-    routes: TOOLS_REDIRECT_ASSERTIONS,
-    testName: (route) => `redirects ${route.path}`,
-  },
-  {
-    name: "Config routes",
-    routes: CONFIG_ROUTES,
-    testName: rendersRoute,
-  },
-  {
-    name: "Nested config routes",
-    routes: NESTED_CONFIG_ROUTES,
-    testName: rendersRoute,
-  },
-];
@@ -5,29 +5,6 @@
 // Usage: node test/e2e/collect-blob-reports.mjs

 import { cpSync, mkdirSync, readdirSync, rmSync } from "fs";
-import { join, relative } from "path";
-
-const findBlobReports = (dir) => {
-  const files = [];
-  const walk = (currentDir) => {
-    for (const entry of readdirSync(currentDir, { withFileTypes: true })) {
-      const entryPath = join(currentDir, entry.name);
-      if (entry.isDirectory()) {
-        walk(entryPath);
-      } else if (entry.name.endsWith(".zip")) {
-        files.push(entryPath);
-      }
-    }
-  };
-
-  try {
-    walk(dir);
-  } catch {
-    return undefined;
-  }
-
-  return files;
-};

 const dest = "test/e2e/reports/blob";
 rmSync(dest, { recursive: true, force: true });
@@ -35,8 +12,10 @@ mkdirSync(dest, { recursive: true });

 for (const suite of ["demo", "app", "gallery"]) {
  const src = `test/e2e/reports/${suite}`;
-  const files = findBlobReports(src);
-  if (!files?.length) {
+  let files;
+  try {
+    files = readdirSync(src).filter((f) => f.endsWith(".zip"));
+  } catch {
    // Suite report directory doesn't exist (e.g. job was skipped or failed
    // before uploading). Skip gracefully.
    process.stderr.write(
@@ -45,7 +24,6 @@ for (const suite of ["demo", "app", "gallery"]) {
    continue;
  }
  for (const file of files) {
-    const name = relative(src, file).replace(/[\\/]/g, "-");
-    cpSync(file, join(dest, `${suite}-${name}`));
+    cpSync(`${src}/${file}`, `${dest}/${suite}-${file}`);
  }
 }
@@ -1,68 +1,146 @@
 import { expect, test } from "@playwright/test";
 import {
-  expectNoPageErrors,
  NAVIGATION_TIMEOUT,
  PANEL_TIMEOUT,
  QUICK_TIMEOUT,
  SHELL_TIMEOUT,
-  trackPageErrors,
+  appErrors as filterAppErrors,
 } from "./helpers";
-import {
-  activateDemoSidebarPanel,
-  demoCardSelector,
-  moreInfoCardSelector,
-  openDemoSidebar,
-  waitForDemoReady,
-} from "./demo/helpers";

 test.describe("Home Assistant Demo", () => {
-  let pageErrors: ReturnType<typeof trackPageErrors>;
+  // Collect JS errors during each test so we can assert no unexpected crashes.
+  let pageErrors: Error[] = [];

  test.beforeEach(async ({ page }) => {
-    pageErrors = trackPageErrors(page);
+    pageErrors = [];
+    page.on("pageerror", (err) => pageErrors.push(err));
    await page.goto("/");
  });

-  test("page loads and ha-demo mounts without JS errors", async ({ page }) => {
-    await waitForDemoReady(page);
+  function appErrors() {
+    return filterAppErrors(pageErrors);
+  }

-    expectNoPageErrors(pageErrors);
+  // ── 1. Page loads ──────────────────────────────────────────────────────────
+
+  test("page loads and ha-demo mounts without JS errors", async ({ page }) => {
+    // The custom element is present in the document
+    await expect(page.locator("ha-demo")).toBeAttached({
+      timeout: NAVIGATION_TIMEOUT,
+    });
+
+    // The launch screen should disappear once the app is ready
+    await expect(page.locator("#ha-launch-screen")).toBeHidden({
+      timeout: NAVIGATION_TIMEOUT,
+    });
+
+    // No unhandled JS exceptions
+    expect(appErrors()).toHaveLength(0);
  });

-  test("dashboard renders Lovelace cards", async ({ page }) => {
-    await waitForDemoReady(page);
+  // ── 2. Dashboard renders ───────────────────────────────────────────────────

-    await expect(page.locator(demoCardSelector).first()).toBeVisible({
+  test("dashboard renders Lovelace cards", async ({ page }) => {
+    await expect(page.locator("ha-demo")).toBeAttached({
+      timeout: NAVIGATION_TIMEOUT,
+    });
+    await expect(page.locator("#ha-launch-screen")).toBeHidden({
+      timeout: NAVIGATION_TIMEOUT,
+    });
+
+    const cardSelector = [
+      "hui-tile-card",
+      "hui-entity-card",
+      "hui-glance-card",
+      "hui-button-card",
+      "hui-markdown-card",
+    ].join(", ");
+
+    await expect(page.locator(cardSelector).first()).toBeVisible({
      timeout: PANEL_TIMEOUT,
    });
  });

-  test("sidebar navigation changes the active panel", async ({ page }) => {
-    await waitForDemoReady(page);
-    await openDemoSidebar(page);
-    await activateDemoSidebarPanel(page, "map");
+  // ── 3. Sidebar navigation ─────────────────────────────────────────────────

-    expectNoPageErrors(pageErrors);
+  test("sidebar navigation changes the active panel", async ({ page }) => {
+    await expect(page.locator("ha-demo")).toBeAttached({
+      timeout: NAVIGATION_TIMEOUT,
+    });
+    await expect(page.locator("#ha-launch-screen")).toBeHidden({
+      timeout: NAVIGATION_TIMEOUT,
+    });
+
+    // On narrow viewports (< 870 px — mobile / tablet) the sidebar lives
+    // inside a modal drawer that is closed by default. Open it first via
+    // the ha-menu-button in the top app-bar.
+    const menuButton = page.locator("ha-menu-button");
+    if (await menuButton.isVisible()) {
+      await menuButton.click();
+      await expect(page.locator("ha-sidebar")).toBeVisible({
+        timeout: SHELL_TIMEOUT,
+      });
+    } else {
+      await expect(page.locator("ha-sidebar")).toBeAttached({
+        timeout: NAVIGATION_TIMEOUT,
+      });
+    }
+
+    const candidatePanels = ["map", "logbook", "history", "config"];
+
+    let clicked = false;
+    for (const panel of candidatePanels) {
+      const navItem = page.locator(`#sidebar-panel-${panel}`);
+      // eslint-disable-next-line no-await-in-loop
+      const visible = await navItem.isVisible().catch(() => false);
+      if (visible) {
+        // eslint-disable-next-line no-await-in-loop
+        await navItem.click();
+        // eslint-disable-next-line no-await-in-loop
+        await expect(page).toHaveURL(new RegExp(`/${panel}`), {
+          timeout: SHELL_TIMEOUT,
+        });
+        clicked = true;
+        break;
+      }
+    }
+
+    expect(clicked, "No known sidebar panel was found to click").toBe(true);
+    expect(appErrors()).toHaveLength(0);
  });

+  // ── 4. More info dialog ───────────────────────────────────────────────────
+
  test("clicking an entity card opens the more-info dialog", async ({
    page,
  }) => {
-    await waitForDemoReady(page);
-
-    // Tile cards are the most common card type in the demo; fall back to other
-    // clickable card types in case this platform renders a different layout.
-    await expect(page.locator(moreInfoCardSelector).first()).toBeVisible({
+    await expect(page.locator("ha-demo")).toBeAttached({
      timeout: NAVIGATION_TIMEOUT,
    });
-    await page.locator(moreInfoCardSelector).first().click();
-
-    const dialog = page.locator("ha-more-info-dialog");
-    await expect(dialog).toBeAttached({ timeout: SHELL_TIMEOUT });
-    await expect(dialog.locator("span.title")).toBeVisible({
-      timeout: QUICK_TIMEOUT,
+    await expect(page.locator("#ha-launch-screen")).toBeHidden({
+      timeout: NAVIGATION_TIMEOUT,
    });

-    expectNoPageErrors(pageErrors);
+    // Tile cards are the most common card type in the demo; they open the
+    // more-info dialog on click. Fall back to other clickable card types in
+    // case the demo layout on this platform doesn't include tile cards.
+    const cardSelector =
+      "hui-tile-card, hui-entity-card, hui-button-card, hui-glance-card";
+
+    await expect(page.locator(cardSelector).first()).toBeVisible({
+      timeout: NAVIGATION_TIMEOUT,
+    });
+    await page.locator(cardSelector).first().click();
+
+    // The more-info dialog is a top-level custom element appended to the body.
+    // We verify it is attached, then confirm it rendered by checking the title
+    // span which is slotted into the light DOM and has real layout dimensions.
+    const dialog = page.locator("ha-more-info-dialog");
+    await expect(dialog).toBeAttached({ timeout: SHELL_TIMEOUT });
+
+    const title = dialog.locator("span.title");
+    await expect(title).toBeVisible({ timeout: QUICK_TIMEOUT });
+
+    expect(appErrors()).toHaveLength(0);
  });
 });
@@ -1,54 +0,0 @@
-import { expect, type Page } from "@playwright/test";
-import { NAVIGATION_TIMEOUT, SHELL_TIMEOUT } from "../helpers";
-
-export const demoCardSelector = [
-  "hui-tile-card",
-  "hui-entity-card",
-  "hui-glance-card",
-  "hui-button-card",
-  "hui-markdown-card",
-].join(", ");
-
-export const moreInfoCardSelector =
-  "hui-tile-card, hui-entity-card, hui-button-card, hui-glance-card";
-
-export async function waitForDemoReady(page: Page) {
-  await expect(page.locator("ha-demo")).toBeAttached({
-    timeout: NAVIGATION_TIMEOUT,
-  });
-  await expect(page.locator("#ha-launch-screen")).toBeHidden({
-    timeout: NAVIGATION_TIMEOUT,
-  });
-}
-
-export async function openDemoSidebar(page: Page) {
-  const menuButton = page.locator("ha-menu-button");
-  if (await menuButton.isVisible()) {
-    const modalDrawer = page.locator("ha-drawer").locator("wa-drawer");
-    await Promise.all([
-      modalDrawer.evaluate(
-        (element) =>
-          new Promise<void>((resolve) => {
-            element.addEventListener("wa-after-show", () => resolve(), {
-              once: true,
-            });
-          })
-      ),
-      menuButton.click(),
-    ]);
-    return;
-  }
-
-  await expect(page.locator("ha-sidebar")).toBeAttached({
-    timeout: NAVIGATION_TIMEOUT,
-  });
-}
-
-export async function activateDemoSidebarPanel(page: Page, panel: string) {
-  const navItem = page.locator(`#sidebar-panel-${panel}`);
-  await expect(navItem).toBeVisible({ timeout: SHELL_TIMEOUT });
-  await navItem.click();
-  await expect(page).toHaveURL(new RegExp(`/${panel}(?:/|$)`), {
-    timeout: SHELL_TIMEOUT,
-  });
-}
@@ -7,117 +7,362 @@
 * Run with:
 *   yarn test:e2e:gallery
 */
-import { test, expect } from "@playwright/test";
-import {
-  expectNoPageErrors,
-  QUICK_TIMEOUT,
-  SHELL_TIMEOUT,
-  trackPageErrors,
-} from "./helpers";
-import {
-  defineGallerySmokeTests,
-  expectGalleryDemoElement,
-  galleryLocator,
-  getGalleryDemo,
-  goToGalleryHome,
-  GALLERY_SHELL_IGNORED_PAGE_ERRORS,
-} from "./gallery/helpers";
-import { componentPages, lovelacePages, moreInfoPages } from "./gallery/pages";
+import { test, expect, type Page } from "@playwright/test";
+import { QUICK_TIMEOUT, SHELL_TIMEOUT } from "./helpers";
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/** Navigate to a gallery page via hash and wait for it to render. */
+async function goToGalleryPage(page: Page, hash: string) {
+  // First visit to let ha-gallery boot up
+  await page.goto(`/#${hash}`);
+  await page.waitForSelector("ha-gallery", { state: "attached" });
+  // Wait for the demo element to appear in ha-gallery's shadow root.
+  // The element name is derived from the hash: "components/ha-bar" → "demo-components-ha-bar".
+  // page-description is only rendered for pages that have a description field,
+  // so we cannot use it as a universal readiness signal.
+  const demoTag = `demo-${hash.replace("/", "-")}`;
+  await page.waitForFunction((tag) => {
+    const gallery = document.querySelector("ha-gallery") as any;
+    return gallery?.shadowRoot?.querySelector(tag) != null;
+  }, demoTag);
+}
+
+/** Assert a gallery page loads without console errors.
+ * Demo elements live inside ha-gallery's shadow root — use >> to pierce it.
+ */
+async function assertPageLoads(page: Page, hash: string, selector: string) {
+  const errors: string[] = [];
+  page.on("pageerror", (e) => errors.push(e.message));
+
+  await goToGalleryPage(page, hash);
+
+  // Pierce ha-gallery's shadow root with >>
+  await expect(page.locator(`ha-gallery >> ${selector}`).first()).toBeAttached({
+    timeout: SHELL_TIMEOUT,
+  });
+
+  const realErrors = errors.filter(
+    (e) => !IGNORED_ERRORS.some((re) => re.test(e))
+  );
+  expect(
+    realErrors,
+    `JS errors on ${hash}: ${realErrors.join("; ")}`
+  ).toHaveLength(0);
+}
+
+// Errors that are gallery-harness artifacts rather than bugs in the component
+// under test. The Lit-context init-error family that used to live here is gone:
+// ha-gallery now provides fallback contexts for every demo (mirroring the real
+// app's root), so context-consuming components resolve `localize`, formatters,
+// config, etc. synchronously instead of throwing during init.
+const IGNORED_ERRORS: RegExp[] = [
+  /ResizeObserver/,
+  /Non-Error/,
+  /Extension context/,
+  // Plain objects thrown by mock WebSocket/data-fetch show up as "Object".
+  /^Object$/,
+  // hui-group-entity-row calls .some() on a possibly-undefined entity_id array
+  // from mock state data — pre-existing gallery data issue.
+  /Cannot read properties of undefined \(reading 'some'\)/,
+];
+
+// ---------------------------------------------------------------------------
+// Gallery shell
+// ---------------------------------------------------------------------------

 test.describe("Gallery shell", () => {
  test("page loads and ha-gallery mounts", async ({ page }) => {
-    const errors = trackPageErrors(page);
+    const errors: string[] = [];
+    page.on("pageerror", (e) => errors.push(e.message));

-    await goToGalleryHome(page);
+    await page.goto("/");
+    await expect(page.locator("ha-gallery")).toBeAttached({
+      timeout: SHELL_TIMEOUT,
+    });

-    expectNoPageErrors(errors, undefined, GALLERY_SHELL_IGNORED_PAGE_ERRORS);
+    const realErrors = errors.filter(
+      (e) => !e.includes("ResizeObserver") && !e.includes("Non-Error")
+    );
+    expect(realErrors).toHaveLength(0);
  });

  test("sidebar renders navigation links", async ({ page }) => {
-    await goToGalleryHome(page);
-    await expect(galleryLocator(page, "ha-drawer")).toBeAttached({
+    await page.goto("/");
+    await page.waitForSelector("ha-gallery", { state: "attached" });
+    // The gallery drawer sidebar is inside ha-gallery's shadow root
+    await expect(page.locator("ha-gallery >> ha-drawer")).toBeAttached({
      timeout: QUICK_TIMEOUT,
    });
  });
 });

-defineGallerySmokeTests("Components", "components", componentPages);
-defineGallerySmokeTests("More-info dialogs", "more-info", moreInfoPages);
-defineGallerySmokeTests("Lovelace cards", "lovelace", lovelacePages);
+// ---------------------------------------------------------------------------
+// Component pages
+// ---------------------------------------------------------------------------
+
+const componentPages: { name: string; selector: string }[] = [
+  { name: "ha-alert", selector: "demo-components-ha-alert" },
+  { name: "ha-badge", selector: "demo-components-ha-badge" },
+  { name: "ha-bar", selector: "demo-components-ha-bar" },
+  { name: "ha-button", selector: "demo-components-ha-button" },
+  { name: "ha-chips", selector: "demo-components-ha-chips" },
+  { name: "ha-control-button", selector: "demo-components-ha-control-button" },
+  {
+    name: "ha-control-circular-slider",
+    selector: "demo-components-ha-control-circular-slider",
+  },
+  {
+    name: "ha-control-number-buttons",
+    selector: "demo-components-ha-control-number-buttons",
+  },
+  {
+    name: "ha-control-select-menu",
+    selector: "demo-components-ha-control-select-menu",
+  },
+  { name: "ha-control-select", selector: "demo-components-ha-control-select" },
+  { name: "ha-control-slider", selector: "demo-components-ha-control-slider" },
+  { name: "ha-control-switch", selector: "demo-components-ha-control-switch" },
+  { name: "ha-dialog", selector: "demo-components-ha-dialog" },
+  { name: "ha-dropdown", selector: "demo-components-ha-dropdown" },
+  {
+    name: "ha-expansion-panel",
+    selector: "demo-components-ha-expansion-panel",
+  },
+  { name: "ha-faded", selector: "demo-components-ha-faded" },
+  { name: "ha-form", selector: "demo-components-ha-form" },
+  { name: "ha-gauge", selector: "demo-components-ha-gauge" },
+  {
+    name: "ha-hs-color-picker",
+    selector: "demo-components-ha-hs-color-picker",
+  },
+  { name: "ha-input", selector: "demo-components-ha-input" },
+  { name: "ha-label-badge", selector: "demo-components-ha-label-badge" },
+  { name: "ha-list", selector: "demo-components-ha-list" },
+  { name: "ha-marquee-text", selector: "demo-components-ha-marquee-text" },
+  {
+    name: "ha-progress-button",
+    selector: "demo-components-ha-progress-button",
+  },
+  { name: "ha-select-box", selector: "demo-components-ha-select-box" },
+  { name: "ha-selector", selector: "demo-components-ha-selector" },
+  { name: "ha-slider", selector: "demo-components-ha-slider" },
+  { name: "ha-spinner", selector: "demo-components-ha-spinner" },
+  { name: "ha-switch", selector: "demo-components-ha-switch" },
+  { name: "ha-textarea", selector: "demo-components-ha-textarea" },
+  { name: "ha-tip", selector: "demo-components-ha-tip" },
+  { name: "ha-tooltip", selector: "demo-components-ha-tooltip" },
+  {
+    name: "ha-adaptive-dialog",
+    selector: "demo-components-ha-adaptive-dialog",
+  },
+  {
+    name: "ha-adaptive-popover",
+    selector: "demo-components-ha-adaptive-popover",
+  },
+];
+
+test.describe("Components", () => {
+  for (const { name, selector } of componentPages) {
+    test(`${name} renders without errors`, async ({ page }) => {
+      await assertPageLoads(page, `components/${name}`, selector);
+    });
+  }
+});
+
+// ---------------------------------------------------------------------------
+// More-info pages
+// ---------------------------------------------------------------------------
+
+const moreInfoPages: { name: string; selector: string }[] = [
+  { name: "light", selector: "demo-more-info-light" },
+  { name: "climate", selector: "demo-more-info-climate" },
+  { name: "cover", selector: "demo-more-info-cover" },
+  { name: "fan", selector: "demo-more-info-fan" },
+  { name: "humidifier", selector: "demo-more-info-humidifier" },
+  { name: "input-number", selector: "demo-more-info-input-number" },
+  { name: "input-text", selector: "demo-more-info-input-text" },
+  { name: "lawn-mower", selector: "demo-more-info-lawn-mower" },
+  { name: "lock", selector: "demo-more-info-lock" },
+  { name: "media-player", selector: "demo-more-info-media-player" },
+  { name: "number", selector: "demo-more-info-number" },
+  { name: "scene", selector: "demo-more-info-scene" },
+  { name: "timer", selector: "demo-more-info-timer" },
+  { name: "update", selector: "demo-more-info-update" },
+  { name: "vacuum", selector: "demo-more-info-vacuum" },
+  { name: "water-heater", selector: "demo-more-info-water-heater" },
+];
+
+test.describe("More-info dialogs", () => {
+  for (const { name, selector } of moreInfoPages) {
+    test(`more-info ${name} renders without errors`, async ({ page }) => {
+      await assertPageLoads(page, `more-info/${name}`, selector);
+    });
+  }
+});
+
+// ---------------------------------------------------------------------------
+// Lovelace card pages
+// ---------------------------------------------------------------------------
+
+const lovelacePages: { name: string; selector: string }[] = [
+  { name: "area-card", selector: "demo-lovelace-area-card" },
+  { name: "conditional-card", selector: "demo-lovelace-conditional-card" },
+  { name: "entities-card", selector: "demo-lovelace-entities-card" },
+  { name: "entity-button-card", selector: "demo-lovelace-entity-button-card" },
+  { name: "entity-filter-card", selector: "demo-lovelace-entity-filter-card" },
+  { name: "gauge-card", selector: "demo-lovelace-gauge-card" },
+  { name: "glance-card", selector: "demo-lovelace-glance-card" },
+  {
+    name: "grid-and-stack-card",
+    selector: "demo-lovelace-grid-and-stack-card",
+  },
+  { name: "iframe-card", selector: "demo-lovelace-iframe-card" },
+  { name: "light-card", selector: "demo-lovelace-light-card" },
+  { name: "map-card", selector: "demo-lovelace-map-card" },
+  { name: "markdown-card", selector: "demo-lovelace-markdown-card" },
+  { name: "media-control-card", selector: "demo-lovelace-media-control-card" },
+  { name: "media-player-row", selector: "demo-lovelace-media-player-row" },
+  { name: "picture-card", selector: "demo-lovelace-picture-card" },
+  {
+    name: "picture-elements-card",
+    selector: "demo-lovelace-picture-elements-card",
+  },
+  {
+    name: "picture-entity-card",
+    selector: "demo-lovelace-picture-entity-card",
+  },
+  {
+    name: "picture-glance-card",
+    selector: "demo-lovelace-picture-glance-card",
+  },
+  { name: "thermostat-card", selector: "demo-lovelace-thermostat-card" },
+  { name: "tile-card", selector: "demo-lovelace-tile-card" },
+  { name: "todo-list-card", selector: "demo-lovelace-todo-list-card" },
+];
+
+test.describe("Lovelace cards", () => {
+  for (const { name, selector } of lovelacePages) {
+    test(`${name} renders without errors`, async ({ page }) => {
+      await assertPageLoads(page, `lovelace/${name}`, selector);
+    });
+  }
+});
+
+// ---------------------------------------------------------------------------
+// Specific interaction tests
+// ---------------------------------------------------------------------------

 test.describe("Component interactions", () => {
  test("ha-alert renders all four types", async ({ page }) => {
-    const demo = await getGalleryDemo(page, "components/ha-alert");
+    await goToGalleryPage(page, "components/ha-alert");
+    const demo = page.locator("ha-gallery >> demo-components-ha-alert");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });

-    // The demo uses property binding (.alertType) not attribute binding, so we
-    // verify that multiple ha-alert elements are present.
+    // The demo uses property binding (.alertType) not attribute binding,
+    // so we verify that multiple ha-alert elements are present.
    const alerts = demo.locator("ha-alert");
-    await expect(alerts.nth(3)).toBeAttached({ timeout: QUICK_TIMEOUT });
+    await expect(alerts.first()).toBeAttached({ timeout: QUICK_TIMEOUT });
+    // There should be at least 4 alerts (one per type)
+    await expect(alerts)
+      .toHaveCount(4, { timeout: QUICK_TIMEOUT })
+      .catch(async () => {
+        // If not exactly 4, just verify there are some (demo may include more)
+        const count = await alerts.count();
+        expect(count).toBeGreaterThanOrEqual(4);
+      });
  });

  test("ha-button renders primary action button", async ({ page }) => {
-    const demo = await getGalleryDemo(page, "components/ha-button");
-
-    await expectGalleryDemoElement(demo, "ha-button, mwc-button");
+    await goToGalleryPage(page, "components/ha-button");
+    const demo = page.locator("ha-gallery >> demo-components-ha-button");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
+    await expect(demo.locator("ha-button, mwc-button").first()).toBeAttached({
+      timeout: QUICK_TIMEOUT,
+    });
  });

  test("ha-control-slider can be found in DOM", async ({ page }) => {
-    const demo = await getGalleryDemo(page, "components/ha-control-slider");
-
-    await expectGalleryDemoElement(demo, "ha-control-slider");
+    await goToGalleryPage(page, "components/ha-control-slider");
+    const demo = page.locator(
+      "ha-gallery >> demo-components-ha-control-slider"
+    );
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
+    await expect(demo.locator("ha-control-slider").first()).toBeAttached({
+      timeout: QUICK_TIMEOUT,
+    });
  });

  test("ha-form renders schema-driven fields", async ({ page }) => {
-    const demo = await getGalleryDemo(page, "components/ha-form");
+    await goToGalleryPage(page, "components/ha-form");
+    const demo = page.locator("ha-gallery >> demo-components-ha-form");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
+    await expect(demo.locator("ha-form").first()).toBeAttached({
+      timeout: QUICK_TIMEOUT,
+    });
+  });

-    await expectGalleryDemoElement(demo, "ha-form");
+  test("ha-dialog demo renders a dialog trigger", async ({ page }) => {
+    await goToGalleryPage(page, "components/ha-dialog");
+    const demo = page.locator("ha-gallery >> demo-components-ha-dialog");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
  });

  test("tile-card renders entity state", async ({ page }) => {
-    const demo = await getGalleryDemo(page, "lovelace/tile-card");
-
-    await expectGalleryDemoElement(demo, "hui-tile-card");
+    await goToGalleryPage(page, "lovelace/tile-card");
+    const demo = page.locator("ha-gallery >> demo-lovelace-tile-card");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
+    await expect(demo.locator("hui-tile-card").first()).toBeAttached({
+      timeout: QUICK_TIMEOUT,
+    });
  });

  test("more-info light renders controls", async ({ page }) => {
-    const demo = await getGalleryDemo(page, "more-info/light");
+    await goToGalleryPage(page, "more-info/light");
+    const demo = page.locator("ha-gallery >> demo-more-info-light");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
+    // Light more-info should contain a brightness or color-temp control
+    await expect(
+      demo
+        .locator("ha-control-slider, ha-more-info-light, more-info-content")
+        .first()
+    ).toBeAttached({ timeout: SHELL_TIMEOUT });
+  });

-    await expectGalleryDemoElement(
-      demo,
-      "ha-control-slider, ha-more-info-light, more-info-content",
-      SHELL_TIMEOUT
-    );
+  test("more-info cover renders position controls", async ({ page }) => {
+    await goToGalleryPage(page, "more-info/cover");
+    const demo = page.locator("ha-gallery >> demo-more-info-cover");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
  });

  test("ha-gauge renders a gauge element", async ({ page }) => {
-    await getGalleryDemo(page, "components/ha-gauge");
-
-    // ha-gauge page is markdown-based; gauge elements render in the description area.
-    await expect(galleryLocator(page, "ha-gauge").first()).toBeAttached({
+    await goToGalleryPage(page, "components/ha-gauge");
+    const demo = page.locator("ha-gallery >> demo-components-ha-gauge");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });
+    // ha-gauge page is markdown-based; gauge elements render in the description area
+    await expect(page.locator("ha-gallery >> ha-gauge").first()).toBeAttached({
      timeout: QUICK_TIMEOUT,
    });
  });

  test("ha-switch toggles state on click", async ({ page }) => {
-    const demo = await getGalleryDemo(page, "components/ha-switch");
+    await goToGalleryPage(page, "components/ha-switch");
+    const demo = page.locator("ha-gallery >> demo-components-ha-switch");
+    await expect(demo).toBeAttached({ timeout: SHELL_TIMEOUT });

    // Find the first interactive (non-disabled) switch. Pull its checked state
-    // from the property because ha-switch toggles via property, not attribute.
+    // from the property — ha-switch toggles via property, not the attribute.
    const switchEl = demo.locator("ha-switch:not([disabled])").first();
    await expect(switchEl).toBeAttached({ timeout: QUICK_TIMEOUT });

-    const before = await switchEl.evaluate(
-      (el: HTMLElement & { checked?: boolean }) => el.checked === true
-    );
+    const before = await switchEl.evaluate((el: any) => el.checked === true);
    await switchEl.click();
    await expect
-      .poll(
-        () =>
-          switchEl.evaluate(
-            (el: HTMLElement & { checked?: boolean }) => el.checked === true
-          ),
-        { timeout: QUICK_TIMEOUT }
-      )
+      .poll(() => switchEl.evaluate((el: any) => el.checked === true), {
+        timeout: QUICK_TIMEOUT,
+      })
      .toBe(!before);
  });
 });
@@ -1,98 +0,0 @@
-import { expect, type Locator, type Page } from "@playwright/test";
-import {
-  defineParallelSmokeTests,
-  expectNoPageErrors,
-  QUICK_TIMEOUT,
-  SHELL_TIMEOUT,
-  trackPageErrors,
-} from "../helpers";
-
-export const GALLERY_SHELL_IGNORED_PAGE_ERRORS: RegExp[] = [
-  /ResizeObserver/,
-  /Non-Error/,
-];
-
-export const GALLERY_IGNORED_PAGE_ERRORS: RegExp[] = [
-  ...GALLERY_SHELL_IGNORED_PAGE_ERRORS,
-  /Extension context/,
-  // Plain objects thrown by mock WebSocket/data-fetch show up as "Object".
-  /^Object$/,
-  // hui-group-entity-row calls .some() on a possibly-undefined entity_id array
-  // from mock state data - pre-existing gallery data issue.
-  /Cannot read properties of undefined \(reading 'some'\)/,
-];
-
-export interface GalleryPageSmokeCase {
-  name: string;
-  selector: string;
-}
-
-export const galleryLocator = (page: Page, selector: string) =>
-  page.locator(`ha-gallery >> ${selector}`);
-
-const galleryDemoTag = (hash: string) => `demo-${hash.replace(/\//g, "-")}`;
-
-async function waitForGalleryReady(page: Page) {
-  await expect(page.locator("ha-gallery")).toBeAttached({
-    timeout: SHELL_TIMEOUT,
-  });
-}
-
-export async function goToGalleryHome(page: Page) {
-  await page.goto("/");
-  await waitForGalleryReady(page);
-}
-
-export async function goToGalleryPage(page: Page, hash: string) {
-  await page.goto(`/#${hash}`);
-}
-
-async function expectGalleryPageSelector(page: Page, selector: string) {
-  const locator = galleryLocator(page, selector).first();
-  await expect(locator).toBeAttached({ timeout: SHELL_TIMEOUT });
-  return locator;
-}
-
-export async function getGalleryDemo(page: Page, hash: string) {
-  await goToGalleryPage(page, hash);
-  return expectGalleryPageSelector(page, galleryDemoTag(hash));
-}
-
-export async function assertGalleryPageLoads(
-  page: Page,
-  hash: string,
-  selector: string
-) {
-  const errors = trackPageErrors(page);
-  await goToGalleryPage(page, hash);
-  await expectGalleryPageSelector(page, selector);
-  expectNoPageErrors(errors, hash, GALLERY_IGNORED_PAGE_ERRORS);
-}
-
-export function defineGallerySmokeTests(
-  groupName: string,
-  routePrefix: string,
-  pages: GalleryPageSmokeCase[]
-) {
-  defineParallelSmokeTests({
-    groups: [{ name: groupName, routePrefix, pages }],
-    groupName: (group) => group.name,
-    cases: (group) => group.pages,
-    testName: (smokeCase) => `${smokeCase.name} renders without errors`,
-    run: async ({ page, group, smokeCase }) => {
-      await assertGalleryPageLoads(
-        page,
-        `${group.routePrefix}/${smokeCase.name}`,
-        smokeCase.selector
-      );
-    },
-  });
-}
-
-export async function expectGalleryDemoElement(
-  demo: Locator,
-  selector: string,
-  timeout = QUICK_TIMEOUT
-) {
-  await expect(demo.locator(selector).first()).toBeAttached({ timeout });
-}
@@ -1,117 +0,0 @@
-import type { GalleryPageSmokeCase } from "./helpers";
-
-export const componentPages: GalleryPageSmokeCase[] = [
-  { name: "ha-alert", selector: "demo-components-ha-alert" },
-  { name: "ha-badge", selector: "demo-components-ha-badge" },
-  { name: "ha-bar", selector: "demo-components-ha-bar" },
-  { name: "ha-button", selector: "demo-components-ha-button" },
-  { name: "ha-chips", selector: "demo-components-ha-chips" },
-  { name: "ha-control-button", selector: "demo-components-ha-control-button" },
-  {
-    name: "ha-control-circular-slider",
-    selector: "demo-components-ha-control-circular-slider",
-  },
-  {
-    name: "ha-control-number-buttons",
-    selector: "demo-components-ha-control-number-buttons",
-  },
-  {
-    name: "ha-control-select-menu",
-    selector: "demo-components-ha-control-select-menu",
-  },
-  { name: "ha-control-select", selector: "demo-components-ha-control-select" },
-  { name: "ha-control-slider", selector: "demo-components-ha-control-slider" },
-  { name: "ha-control-switch", selector: "demo-components-ha-control-switch" },
-  { name: "ha-dialog", selector: "demo-components-ha-dialog" },
-  { name: "ha-dropdown", selector: "demo-components-ha-dropdown" },
-  {
-    name: "ha-expansion-panel",
-    selector: "demo-components-ha-expansion-panel",
-  },
-  { name: "ha-faded", selector: "demo-components-ha-faded" },
-  { name: "ha-form", selector: "demo-components-ha-form" },
-  { name: "ha-gauge", selector: "demo-components-ha-gauge" },
-  {
-    name: "ha-hs-color-picker",
-    selector: "demo-components-ha-hs-color-picker",
-  },
-  { name: "ha-input", selector: "demo-components-ha-input" },
-  { name: "ha-label-badge", selector: "demo-components-ha-label-badge" },
-  { name: "ha-list", selector: "demo-components-ha-list" },
-  { name: "ha-marquee-text", selector: "demo-components-ha-marquee-text" },
-  {
-    name: "ha-progress-button",
-    selector: "demo-components-ha-progress-button",
-  },
-  { name: "ha-select-box", selector: "demo-components-ha-select-box" },
-  { name: "ha-selector", selector: "demo-components-ha-selector" },
-  { name: "ha-slider", selector: "demo-components-ha-slider" },
-  { name: "ha-spinner", selector: "demo-components-ha-spinner" },
-  { name: "ha-switch", selector: "demo-components-ha-switch" },
-  { name: "ha-textarea", selector: "demo-components-ha-textarea" },
-  { name: "ha-tip", selector: "demo-components-ha-tip" },
-  { name: "ha-tooltip", selector: "demo-components-ha-tooltip" },
-  {
-    name: "ha-adaptive-dialog",
-    selector: "demo-components-ha-adaptive-dialog",
-  },
-  {
-    name: "ha-adaptive-popover",
-    selector: "demo-components-ha-adaptive-popover",
-  },
-];
-
-export const moreInfoPages: GalleryPageSmokeCase[] = [
-  { name: "light", selector: "demo-more-info-light" },
-  { name: "climate", selector: "demo-more-info-climate" },
-  { name: "cover", selector: "demo-more-info-cover" },
-  { name: "fan", selector: "demo-more-info-fan" },
-  { name: "humidifier", selector: "demo-more-info-humidifier" },
-  { name: "input-number", selector: "demo-more-info-input-number" },
-  { name: "input-text", selector: "demo-more-info-input-text" },
-  { name: "lawn-mower", selector: "demo-more-info-lawn-mower" },
-  { name: "lock", selector: "demo-more-info-lock" },
-  { name: "media-player", selector: "demo-more-info-media-player" },
-  { name: "number", selector: "demo-more-info-number" },
-  { name: "scene", selector: "demo-more-info-scene" },
-  { name: "timer", selector: "demo-more-info-timer" },
-  { name: "update", selector: "demo-more-info-update" },
-  { name: "vacuum", selector: "demo-more-info-vacuum" },
-  { name: "water-heater", selector: "demo-more-info-water-heater" },
-];
-
-export const lovelacePages: GalleryPageSmokeCase[] = [
-  { name: "area-card", selector: "demo-lovelace-area-card" },
-  { name: "conditional-card", selector: "demo-lovelace-conditional-card" },
-  { name: "entities-card", selector: "demo-lovelace-entities-card" },
-  { name: "entity-button-card", selector: "demo-lovelace-entity-button-card" },
-  { name: "entity-filter-card", selector: "demo-lovelace-entity-filter-card" },
-  { name: "gauge-card", selector: "demo-lovelace-gauge-card" },
-  { name: "glance-card", selector: "demo-lovelace-glance-card" },
-  {
-    name: "grid-and-stack-card",
-    selector: "demo-lovelace-grid-and-stack-card",
-  },
-  { name: "iframe-card", selector: "demo-lovelace-iframe-card" },
-  { name: "light-card", selector: "demo-lovelace-light-card" },
-  { name: "map-card", selector: "demo-lovelace-map-card" },
-  { name: "markdown-card", selector: "demo-lovelace-markdown-card" },
-  { name: "media-control-card", selector: "demo-lovelace-media-control-card" },
-  { name: "media-player-row", selector: "demo-lovelace-media-player-row" },
-  { name: "picture-card", selector: "demo-lovelace-picture-card" },
-  {
-    name: "picture-elements-card",
-    selector: "demo-lovelace-picture-elements-card",
-  },
-  {
-    name: "picture-entity-card",
-    selector: "demo-lovelace-picture-entity-card",
-  },
-  {
-    name: "picture-glance-card",
-    selector: "demo-lovelace-picture-glance-card",
-  },
-  { name: "thermostat-card", selector: "demo-lovelace-thermostat-card" },
-  { name: "tile-card", selector: "demo-lovelace-tile-card" },
-  { name: "todo-list-card", selector: "demo-lovelace-todo-list-card" },
-];
@@ -1,7 +1,6 @@
 /**
 * Shared helpers and constants for Playwright e2e suites.
 */
-import { expect, test, type Page } from "@playwright/test";

 // ── Timeouts ────────────────────────────────────────────────────────────────
 // Centralised so tweaks don't require search-and-replace across spec files.
@@ -18,67 +17,21 @@ export const NAVIGATION_TIMEOUT = 30_000;

 // ── Error filtering ─────────────────────────────────────────────────────────

-type PageError = { message: string } | string;
-
-export const IGNORED_PAGE_ERRORS: RegExp[] = [
-  /ResizeObserver/,
-  /Non-Error/,
-  /Extension context/,
-];
-
-export function trackPageErrors(page: Page) {
-  const errors: PageError[] = [];
-  page.on("pageerror", (error) => errors.push(error));
-  return errors;
-}
-
-function pageErrors(errors: PageError[], ignoredErrors = IGNORED_PAGE_ERRORS) {
-  return errors
-    .map((error) => (typeof error === "string" ? error : error.message))
-    .filter((message) =>
-      ignoredErrors.every((pattern) => !pattern.test(message))
-    );
-}
-
-export function expectNoPageErrors(
-  errors: PageError[],
-  context?: string,
-  ignoredErrors = IGNORED_PAGE_ERRORS
-) {
-  const realErrors = pageErrors(errors, ignoredErrors);
-  const details = realErrors.length ? `: ${realErrors.join("; ")}` : "";
-  expect(
-    realErrors,
-    context ? `JS errors on ${context}${details}` : `JS errors${details}`
-  ).toHaveLength(0);
-}
-
-export interface DefineParallelSmokeTestsOptions<TGroup, TCase> {
-  groups: readonly TGroup[];
-  groupName: (group: TGroup) => string;
-  cases: (group: TGroup) => readonly TCase[];
-  testName: (smokeCase: TCase, group: TGroup) => string;
-  run: (context: {
-    page: Page;
-    group: TGroup;
-    smokeCase: TCase;
-  }) => Promise<void>;
-}
-
-export function defineParallelSmokeTests<TGroup, TCase>({
-  groups,
-  groupName,
-  cases,
-  testName,
-  run,
-}: DefineParallelSmokeTestsOptions<TGroup, TCase>) {
-  for (const group of groups) {
-    test.describe(groupName(group), () => {
-      for (const smokeCase of cases(group)) {
-        test(testName(smokeCase, group), async ({ page }) => {
-          await run({ page, group, smokeCase });
-        });
-      }
-    });
-  }
+/**
+ * Filter out errors known to be unrelated to the app under test:
+ *   - ResizeObserver loop notifications (browser quirk, harmless)
+ *   - Non-Error rejections (mock data throws plain objects)
+ *   - Browser extension noise
+ */
+export function appErrors(errors: { message: string }[] | string[]) {
+  const messages =
+    typeof errors[0] === "string"
+      ? (errors as string[])
+      : (errors as { message: string }[]).map((e) => e.message);
+  return messages.filter(
+    (msg) =>
+      !msg.includes("ResizeObserver") &&
+      !msg.includes("Non-Error") &&
+      !msg.includes("Extension context")
+  );
 }
@@ -1,21 +0,0 @@
-const DEFAULT_LOCAL_WORKERS = "60%";
-const VALID_WORKERS = /^[1-9]\d*%?$/;
-
-export const getE2EWorkers = (): number | string => {
-  if (process.env.CI) {
-    return 1;
-  }
-
-  const workers = process.env.E2E_WORKERS;
-  if (!workers) {
-    return DEFAULT_LOCAL_WORKERS;
-  }
-
-  if (!VALID_WORKERS.test(workers)) {
-    throw new Error(
-      `E2E_WORKERS must be a positive integer or percentage, received "${workers}".`
-    );
-  }
-
-  return workers.endsWith("%") ? workers : Number(workers);
-};
@@ -1,5 +1,4 @@
 import { defineConfig, devices } from "@playwright/test";
-import { getE2EWorkers } from "./playwright-workers";

 const APP_PORT = 8095;
 const APP_BASE_URL = `http://localhost:${APP_PORT}`;
@@ -12,10 +11,8 @@ export default defineConfig({
  expect: { timeout: 15_000 },

  retries: process.env.CI ? 1 : 0,
-  fullyParallel: true,
-  workers: getE2EWorkers(),

-  outputDir: "test-results/app",
+  outputDir: "test-results",
  reporter: [["list"], ["blob", { outputDir: "reports/app" }]],

  use: {
@@ -1,5 +1,4 @@
 import { defineConfig, devices } from "@playwright/test";
-import { getE2EWorkers } from "./playwright-workers";

 // Port 8090 matches the `develop_demo` dev server (rspack-dev-server-demo).
 // This means running `demo/script/develop_demo` and then `yarn test:e2e:local`
@@ -17,10 +16,8 @@ export default defineConfig({
  expect: { timeout: 15_000 },

  retries: process.env.CI ? 1 : 0,
-  fullyParallel: true,
-  workers: getE2EWorkers(),

-  outputDir: "test-results/demo",
+  outputDir: "test-results",
  reporter: [["list"], ["blob", { outputDir: "reports/demo" }]],

  use: {
@@ -1,5 +1,4 @@
 import { defineConfig, devices } from "@playwright/test";
-import { getE2EWorkers } from "./playwright-workers";

 const GALLERY_PORT = 8100;
 const GALLERY_BASE_URL = `http://localhost:${GALLERY_PORT}`;
@@ -12,10 +11,8 @@ export default defineConfig({
  expect: { timeout: 15_000 },

  retries: process.env.CI ? 1 : 0,
-  fullyParallel: true,
-  workers: getE2EWorkers(),

-  outputDir: "test-results/gallery",
+  outputDir: "test-results",
  reporter: [["list"], ["blob", { outputDir: "reports/gallery" }]],

  use: {
@@ -1,106 +1,16 @@
 #!/usr/bin/env node
 // Runs each e2e suite (demo, app, gallery) regardless of individual failures,
-// then collects and merges blob reports locally and exits with a non-zero code
-// if any suite failed.
+// then collects and merges blob reports and exits with a non-zero code if any
+// suite failed.
 //
 // Usage: node test/e2e/run-suites.mjs <suite> [<suite> ...]
 // Where <suite> matches a test:e2e:<suite> script in package.json,
 // e.g. "demo", "app", "gallery".
 //
-// Running suites independently avoids the && short-circuit problem where a
-// failing suite skips the remaining suites and their blob reports.
-// Set E2E_WORKERS to a number or percentage to override local workers.
-// Cold local builds run sequentially because suites share generated assets.
+// Using ; or running suites independently avoids the && short-circuit problem
+// where a failing suite skips the remaining suites and their blob reports.

-import { execFileSync, spawn } from "child_process";
-
-const TRUE_VALUES = new Set(["1", "true", "yes"]);
-
-const SUITE_SERVERS = {
-  demo: { port: 8090, suite: "demo" },
-  app: { port: 8095, suite: "e2e-app" },
-  gallery: { port: 8100, suite: "gallery" },
-};
-
-const isTruthy = (value) => TRUE_VALUES.has(value?.toLowerCase() ?? "");
-
-const hasManagedServer = async (suite) => {
-  const server = SUITE_SERVERS[suite];
-  if (!server) return false;
-
-  try {
-    const response = await fetch(
-      `http://localhost:${server.port}/__ha_dev_status`,
-      { signal: AbortSignal.timeout(1000) }
-    );
-    if (!response.ok) return false;
-    const status = await response.json();
-    return status.server === "ha-frontend-dev" && status.suite === server.suite;
-  } catch {
-    return false;
-  }
-};
-
-const formatDuration = (ms) => {
-  const totalSeconds = Math.round(ms / 1000);
-  const minutes = Math.floor(totalSeconds / 60);
-  const seconds = totalSeconds % 60;
-  return minutes ? `${minutes}m ${seconds}s` : `${seconds}s`;
-};
-
-const writePrefixed = (suite, stream, chunk, pending) => {
-  const lines = `${pending.value}${chunk}`.split(/\r?\n/);
-  pending.value = lines.pop() ?? "";
-  for (const line of lines) {
-    stream.write(`[${suite}] ${line}\n`);
-  }
-};
-
-const flushPrefixed = (suite, stream, pending) => {
-  if (!pending.value) return;
-  stream.write(`[${suite}] ${pending.value}\n`);
-  pending.value = "";
-};
-
-const runSuite = (suite, env) =>
-  new Promise((resolve) => {
-    const started = Date.now();
-    const child = spawn("yarn", [`test:e2e:${suite}`], {
-      stdio: ["ignore", "pipe", "pipe"],
-      env,
-    });
-    const pendingStdout = { value: "" };
-    const pendingStderr = { value: "" };
-    const workerLabel = env.E2E_WORKERS ? ` (workers: ${env.E2E_WORKERS})` : "";
-
-    process.stdout.write(
-      `\n--- Running suite: test:e2e:${suite}${workerLabel} ---\n`
-    );
-
-    child.stdout.on("data", (chunk) =>
-      writePrefixed(suite, process.stdout, chunk, pendingStdout)
-    );
-    child.stderr.on("data", (chunk) =>
-      writePrefixed(suite, process.stderr, chunk, pendingStderr)
-    );
-
-    child.on("error", (err) => {
-      flushPrefixed(suite, process.stdout, pendingStdout);
-      flushPrefixed(suite, process.stderr, pendingStderr);
-      process.stderr.write(`[${suite}] Failed to start: ${err.message}\n`);
-      resolve({ suite, code: 1, duration: Date.now() - started });
-    });
-
-    child.on("close", (code) => {
-      flushPrefixed(suite, process.stdout, pendingStdout);
-      flushPrefixed(suite, process.stderr, pendingStderr);
-      const duration = Date.now() - started;
-      process.stdout.write(
-        `--- Finished suite: test:e2e:${suite} (${formatDuration(duration)}) ---\n`
-      );
-      resolve({ suite, code: code ?? 1, duration });
-    });
-  });
+import { execFileSync } from "child_process";

 const suites = process.argv.slice(2);
 if (!suites.length) {
@@ -108,72 +18,32 @@ if (!suites.length) {
  process.exit(1);
 }

-const hasAllManagedServers = (
-  await Promise.all(suites.map(hasManagedServer))
-).every(Boolean);
-const sequential =
-  isTruthy(process.env.E2E_SEQUENTIAL) ||
-  (suites.length > 1 && !hasAllManagedServers);
-const skipMerge = isTruthy(process.env.E2E_SKIP_MERGE);
-const suiteWorkers =
-  !sequential &&
-  !process.env.CI &&
-  !process.env.E2E_WORKERS &&
-  suites.length > 1
-    ? `${Math.max(1, Math.floor(60 / suites.length))}%`
-    : undefined;
-const suiteEnv = suiteWorkers
-  ? { ...process.env, E2E_WORKERS: suiteWorkers }
-  : process.env;
+const failures = [];

-const results = [];
-
-if (sequential) {
-  if (!isTruthy(process.env.E2E_SEQUENTIAL)) {
-    process.stdout.write(
-      "Running suites sequentially because not all managed dev servers are available.\n"
-    );
+for (const suite of suites) {
+  process.stdout.write(`\n--- Running suite: test:e2e:${suite} ---\n`);
+  try {
+    execFileSync("yarn", [`test:e2e:${suite}`], { stdio: "inherit" });
+  } catch {
+    failures.push(suite);
  }
-  for (const suite of suites) {
-    // eslint-disable-next-line no-await-in-loop
-    results.push(await runSuite(suite, suiteEnv));
-  }
-} else {
-  results.push(
-    ...(await Promise.all(suites.map((suite) => runSuite(suite, suiteEnv))))
-  );
-}
-
-const failures = results
-  .filter(({ code }) => code !== 0)
-  .map(({ suite }) => suite);
-
-process.stdout.write("\nE2E suite timings:\n");
-for (const { suite, duration } of results) {
-  process.stdout.write(`- test:e2e:${suite}: ${formatDuration(duration)}\n`);
 }

 // Collect and merge blob reports regardless of suite outcomes.
-if (skipMerge) {
-  process.stdout.write(
-    "\nSkipping merged e2e report because E2E_SKIP_MERGE is set.\n"
-  );
-} else {
-  execFileSync("node", ["test/e2e/collect-blob-reports.mjs"], {
-    stdio: "inherit",
-  });
-  execFileSync(
-    "npx",
-    [
-      "playwright",
-      "merge-reports",
-      "-c",
-      "test/e2e/playwright.merge.config.ts",
-      "test/e2e/reports/blob",
-    ],
-    { stdio: "inherit" }
-  );
-}
+execFileSync("node", ["test/e2e/collect-blob-reports.mjs"], {
+  stdio: "inherit",
+});
+execFileSync(
+  "npx",
+  [
+    "playwright",
+    "merge-reports",
+    "-c",
+    "test/e2e/playwright.merge.config.ts",
+    "test/e2e/reports/blob",
+  ],
+  { stdio: "inherit" }
+);

 if (failures.length) {
  process.stderr.write(
@@ -2984,73 +2984,73 @@ __metadata:
  languageName: node
  linkType: hard

-"@html-eslint/core@npm:^0.63.0":
-  version: 0.63.0
-  resolution: "@html-eslint/core@npm:0.63.0"
+"@html-eslint/core@npm:^0.64.0":
+  version: 0.64.0
+  resolution: "@html-eslint/core@npm:0.64.0"
  dependencies:
-    "@html-eslint/types": "npm:^0.63.0"
+    "@html-eslint/types": "npm:^0.64.0"
    html-standard: "npm:^0.0.13"
-  checksum: 10/3fb125fa0bd7c70d9255b465c57328d01f604d201e9079ddafc5a7793b618f59d0ffe77a2aa948e4a07ac9e6f1790aea94d87c2ea266f8b91f3992a1b617e024
+  checksum: 10/682d735353acd711ee74e681b5949a35f650e425be670509e1ddca5beeb708347b9c3a740b88eb13d19f6cbf54a903e4dcc173988f6c1c6c9fd212b997df6f17
  languageName: node
  linkType: hard

-"@html-eslint/eslint-plugin@npm:0.63.0":
-  version: 0.63.0
-  resolution: "@html-eslint/eslint-plugin@npm:0.63.0"
+"@html-eslint/eslint-plugin@npm:0.64.0":
+  version: 0.64.0
+  resolution: "@html-eslint/eslint-plugin@npm:0.64.0"
  dependencies:
    "@eslint/plugin-kit": "npm:^0.4.1"
-    "@html-eslint/core": "npm:^0.63.0"
-    "@html-eslint/parser": "npm:^0.63.0"
-    "@html-eslint/template-parser": "npm:^0.63.0"
-    "@html-eslint/template-syntax-parser": "npm:^0.63.0"
-    "@html-eslint/types": "npm:^0.63.0"
+    "@html-eslint/core": "npm:^0.64.0"
+    "@html-eslint/parser": "npm:^0.64.0"
+    "@html-eslint/template-parser": "npm:^0.64.0"
+    "@html-eslint/template-syntax-parser": "npm:^0.64.0"
+    "@html-eslint/types": "npm:^0.64.0"
    "@rviscomi/capo.js": "npm:^2.1.0"
    html-standard: "npm:^0.0.13"
  peerDependencies:
    eslint: ">=8.0.0 || ^10.0.0-0"
-  checksum: 10/ba729511122ce5d20c2dca4300b88ed7ad2afae9c7c7511a9de9e0abc75cea10a22ca7943604373b486d7ac584f6624de056005f9868799c43ce88949a5b33c2
+  checksum: 10/3badf5dab3fd62be5f28ca5703004271224a684273ba419cadd7712b47fd57724f6b5ec5e3081e47c3e700fe6ae4066cd71bbde0041d2cb70b3e784a11949eec
  languageName: node
  linkType: hard

-"@html-eslint/parser@npm:^0.63.0":
-  version: 0.63.0
-  resolution: "@html-eslint/parser@npm:0.63.0"
+"@html-eslint/parser@npm:^0.64.0":
+  version: 0.64.0
+  resolution: "@html-eslint/parser@npm:0.64.0"
  dependencies:
-    "@html-eslint/template-syntax-parser": "npm:^0.63.0"
-    "@html-eslint/types": "npm:^0.63.0"
+    "@html-eslint/template-syntax-parser": "npm:^0.64.0"
+    "@html-eslint/types": "npm:^0.64.0"
    css-tree: "npm:^3.1.0"
    es-html-parser: "npm:0.3.1"
-  checksum: 10/aae7029e9e5e44e04223a5df29878c229d073b336284c81ad74bbd4ce97a80b10b4bc7d4c1d8c32a3225e7ccf13cc77d73d4197e28bb006e2ff15eed28e266cf
+  checksum: 10/7ce0205a07cbddf63959ad2bcf39cf8c4252c5a88abce20326c5b02fd13cd0d81ec6ebe569c4c57b4f9a27842ae62592ad5e47bca58d00cb91d413ad1dad98d0
  languageName: node
  linkType: hard

-"@html-eslint/template-parser@npm:^0.63.0":
-  version: 0.63.0
-  resolution: "@html-eslint/template-parser@npm:0.63.0"
+"@html-eslint/template-parser@npm:^0.64.0":
+  version: 0.64.0
+  resolution: "@html-eslint/template-parser@npm:0.64.0"
  dependencies:
-    "@html-eslint/types": "npm:^0.63.0"
+    "@html-eslint/types": "npm:^0.64.0"
    es-html-parser: "npm:0.3.1"
-  checksum: 10/64409e5b3efcb6ba1a2a001ee1cca3308bc0f99db1ed83fbc8c4f7854d4971f41219f664f3664fbc6e41b116f5ac9d27c8e5145a258250c1e1d5ecb0961f2f82
+  checksum: 10/2dcdc87c2355af6f45814217a812d54acbab7eca6edb6c0cf7ef0fbafca5a7c75c03b6f4acb2dd4f843abb2e34dae2720cd623f0ec0ccfd4570961b025f461a1
  languageName: node
  linkType: hard

-"@html-eslint/template-syntax-parser@npm:^0.63.0":
-  version: 0.63.0
-  resolution: "@html-eslint/template-syntax-parser@npm:0.63.0"
+"@html-eslint/template-syntax-parser@npm:^0.64.0":
+  version: 0.64.0
+  resolution: "@html-eslint/template-syntax-parser@npm:0.64.0"
  dependencies:
-    "@html-eslint/types": "npm:^0.63.0"
-  checksum: 10/2e0f21172bfc3762df16443a81a181d59bdef65f00eb6e2a944703cf862b994193053803609cbf3c55fc98d01a3fb82bb800d6d8c7fdbf69a6dad7a55cabf7ab
+    "@html-eslint/types": "npm:^0.64.0"
+  checksum: 10/774d319f8485cbd20b351767c693e1e281d8e3b7d8c6bf01a2db407684c0656d8789535df0f2357d9bc0df2299023d2d1045a425b72dea1144d265340cfa9031
  languageName: node
  linkType: hard

-"@html-eslint/types@npm:^0.63.0":
-  version: 0.63.0
-  resolution: "@html-eslint/types@npm:0.63.0"
+"@html-eslint/types@npm:^0.64.0":
+  version: 0.64.0
+  resolution: "@html-eslint/types@npm:0.64.0"
  dependencies:
    "@types/css-tree": "npm:^2.3.11"
    "@types/estree": "npm:^1.0.6"
    es-html-parser: "npm:0.3.1"
-  checksum: 10/892d3cde8e43546e480d327c9d9273f2590a40103616f18a6458770150b49d87e3ba44f2ded68223569a0d04fab61c693277c1a9be3f15ab69c8dabe1e302455
+  checksum: 10/9813e675f06fb950911a0b51e113ff05b3eabe73e6396a3ac2afeeab557c7608d883d092f40fd77f843f362f6cbfefa3cd45df3e0135ce71b5f9dd281eef0caa
  languageName: node
  linkType: hard

@@ -9752,7 +9752,7 @@ __metadata:
    "@fullcalendar/luxon3": "npm:6.1.21"
    "@fullcalendar/timegrid": "npm:6.1.21"
    "@home-assistant/webawesome": "npm:3.7.0-ha.0"
-    "@html-eslint/eslint-plugin": "npm:0.63.0"
+    "@html-eslint/eslint-plugin": "npm:0.64.0"
    "@lezer/highlight": "npm:1.2.3"
    "@lit-labs/motion": "npm:1.1.0"
    "@lit-labs/observers": "npm:2.1.0"
Author	SHA1	Message	Date
Aidan Timson	66c105e29c	Benchmark compact workflow image	2026-07-13 11:38:46 +01:00
Aidan Timson	0b591f60ee	Align benchmark lint cache keys	2026-07-13 11:09:54 +01:00
Aidan Timson	3b9db7c0a6	Add CI accelerator benchmark	2026-07-13 10:55:23 +01:00
renovate[bot]	58bcf1e865	Update dependency @html-eslint/eslint-plugin to v0.64.0 (#53111 )	2026-07-13 10:05:02 +01:00
Simon Lamon	196d71c4f7	Update demo deployment to output unique url again (#53091 )	2026-07-13 09:52:33 +01:00