Surface active HTTP config slot and reverted pending state

Consume the new active_config_type and per-slot created_at/error fields from the http/config websocket command: - Show a banner when the server is running on the built-in default config, and when a pending config was reverted or failed to apply (with the reason). "Review the change" loads the reverted values back into the form so they can be corrected and re-saved. - Only trigger the confirm/revert dialog for an active trial (a pending config without an error); a reverted/failed pending is surfaced in the form instead. - Strip the created_at/error metadata before configuring, since the backend storage schema rejects unknown keys. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-23 11:37:30 +00:00 · 2026-07-17 14:43:24 +02:00
181 changed files with 3078 additions and 6668 deletions
@@ -22,8 +22,7 @@ fireEvent(this, "show-dialog", {
 Dialog implementation requirements:

 - Use `ha-dialog`.
- Use `DialogMixin`, which implements `HassDialogNext<T>`, for new dialogs. See `src/dialogs/dialog-mixin.ts`.
- Existing dialogs may implement the legacy `HassDialog<T>` interface from `src/dialogs/make-dialog-manager.ts`.
+- Implement `HassDialog<T>`.
 - Use `@state() private _open = false` to control visibility.
 - Set `_open = true` in `showDialog()` and `_open = false` in `closeDialog()`.
 - Return `nothing` while required params are absent.
@@ -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
@@ -39,27 +33,25 @@ For focused type feedback on one file, use editor diagnostics instead of a file-

 `yarn dev` builds and watches the app, served by a running Home Assistant core configured through `development_repo`.

-`yarn dev:serve` also serves locally and supports `-c` for the core URL and `-p` for the port. The default is 8124, or 8123 in a devcontainer.
+`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. Playwright reuses an existing server locally when its configured URL responds; otherwise it performs a slow full build. When a development watcher is being reused, rspack recompiles on save and 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` |

-The custom development wrappers use `/__ha_dev_status` to identify and manage their own suites. Playwright server reuse checks the configured URL instead. Wrapper start and stop operations are idempotent for a matching suite and reject an unrelated process occupying the port.
+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.

@@ -16,7 +16,7 @@ Use this skill for all user-facing text, translations, labels, buttons, dialog c
 - Give translators enough context through key naming and placeholders.

 ```ts
-this.hass.localize("ui.panel.config.updates.updates_refreshed", {
+this.hass.localize("ui.panel.config.updates.update_available", {
  count: 5,
 });
 ```
@@ -1,41 +0,0 @@
-name: Prepare dependencies
-description: Install and cache the complete dependency tree
-
-inputs:
-  node-modules-cache-key:
-    description: Prefix for the shared node_modules cache key
-    default: node-modules-v1
-
-runs:
-  using: composite
-  steps:
-    - name: Check for complete dependency tree
-      id: dependencies
-      continue-on-error: true
-      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-      with:
-        path: |
-          node_modules
-          .yarn/install-state.gz
-        key: >-
-          ${{ inputs.node-modules-cache-key }}-${{ 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'
-      continue-on-error: true
-      uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-      with:
-        path: |
-          node_modules
-          .yarn/install-state.gz
-        key: >-
-          ${{ inputs.node-modules-cache-key }}-${{ runner.os }}-${{ runner.arch }}-${{
-          hashFiles('.nvmrc', 'package.json', 'yarn.lock', '.yarnrc.yml', '.yarn/releases/**', '.yarn/patches/**') }}
@@ -8,40 +8,16 @@ inputs:
  cache:
    description: Enable the yarn cache in setup-node
    default: "true"
-  node-modules-cache:
-    description: Restore the exact shared node_modules cache before installing
-    default: "false"
-  node-modules-cache-key:
-    description: Prefix for the shared node_modules cache key
-    default: node-modules-v1

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

    - name: Install dependencies
-      if: inputs.node-modules-cache != 'true' || steps.dependency-cache.outputs.cache-hit != 'true'
      shell: bash
      run: yarn install ${{ inputs.immutable == 'true' && '--immutable' || '' }}
@@ -15,10 +15,6 @@ updates:
    cooldown:
      default-days: 7
    open-pull-requests-limit: 10
-    groups:
-      codeql-action:
-        patterns:
-          - "github/codeql-action/*"
    labels:
      - Dependencies
      - GitHub Actions
@@ -1,21 +1,3 @@
-Agents:
-  - changed-files:
-      - any-glob-to-any-file:
-          - "**/AGENTS.md"
-          - "**/CLAUDE.md"
-          - "**/GEMINI.md"
-          - .agents/**
-          - .claude/**
-          - .github/agents/**
-          - .github/copilot-instructions.md
-          - .github/hooks/**
-          - .github/instructions/**
-          - .github/plugin.json
-          - .github/plugin/**
-          - .github/prompts/**
-          - .github/skills/**
-          - .github/workflows/copilot-setup-steps.yml
-
 Build:
  - changed-files:
      - any-glob-to-any-file:
@@ -1,7 +1,6 @@
 name: CI

 on:
-  workflow_dispatch:
  push:
    branches:
      - dev
@@ -22,30 +21,16 @@ 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: Prepare dependencies
-        uses: ./.github/actions/prepare-dependencies
-
  lint:
    name: Lint and check format
-    needs: 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: Setup Node with shared dependencies
+      - name: Setup Node and install
        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true
      - name: Check for duplicate dependencies
        run: yarn dedupe --check
      - name: Build resources
@@ -78,17 +63,14 @@ jobs:
        run: yarn run lint:licenses
  test:
    name: Run tests
-    needs: 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: Setup Node with shared dependencies
+      - name: Setup Node and install
        uses: ./.github/actions/setup
-        with:
-          node-modules-cache: true
      - name: Build resources
        run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data
        env:
@@ -98,7 +80,6 @@ jobs:
  build:
    name: Build frontend
    needs:
-      - prepare-dependencies
      - lint
      - test
    runs-on: ubuntu-latest
@@ -107,10 +88,8 @@ jobs:
        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
-        with:
-          node-modules-cache: true
      - name: Build Application
        uses: ./.github/actions/build
        with:
@@ -32,12 +32,12 @@ jobs:
          persist-credentials: false

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
+        uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
        with:
          languages: javascript-typescript
          build-mode: none

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
+        uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
        with:
          category: "/language:javascript-typescript"
@@ -22,42 +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: Prepare dependencies
-        uses: ./.github/actions/prepare-dependencies
-
-  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: Prepare dependencies
-        uses: ./.github/actions/prepare-dependencies
-        with:
-          node-modules-cache-key: node-modules-container-v1
-
  # ── 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
@@ -65,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
@@ -88,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
@@ -96,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
@@ -119,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
@@ -127,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
@@ -146,39 +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
-          node-modules-cache-key: node-modules-container-v1
+          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
@@ -186,135 +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
-          node-modules-cache-key: node-modules-container-v1
-
      - 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
-          node-modules-cache-key: node-modules-container-v1
-
      - 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
@@ -324,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
@@ -365,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: |
@@ -377,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"
@@ -10,6 +10,6 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Apply labels
-        uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0
+        uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
        with:
          sync-labels: true
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: 90 days stale policy
-        uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
+        uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 90
@@ -50,11 +50,3 @@ Detailed guidance lives in project skills under `.agents/skills/`. Load the matc
 ## Pull Requests

 When creating a pull request, use `.github/PULL_REQUEST_TEMPLATE.md` as the PR body. Preserve template sections, check only the appropriate type-of-change boxes, and do not check checklist items on behalf of the user. If the PR includes UI changes, remind the user to add screenshots or a short video.
-
-## AI policy
-
-This project follows the [Open Home Foundation AI Policy](AI_POLICY.md).
-Autonomous contributions are not accepted: a human must review, understand,
-and be able to explain every change before it is submitted. Do not open
-issues or pull requests autonomously, and do not post comments on behalf of
-a user without their review.
@@ -1,45 +0,0 @@
-# Open Home Foundation - AI Policy
-
-We support using AI (i.e., LLMs) as tools when contributing to Open Home Foundation projects. However, you are responsible for any contributions you submit, and we are responsible for any contributions we merge and release. We hold a high bar for all contributions to our projects.
-
-Our maintainers dedicate their time and expertise to reviewing contributions. Submitting AI-generated content that you have not personally reviewed and understood wastes that time and will not be accepted.
-
-## Autonomous agents
-
-**We do not allow autonomous agents to be used for contributing to our projects.** We will close any pull requests or issues that we believe were created autonomously, and may mark automated comments as spam. This includes contributions that bypass the provided issue or pull request templates.
-
-## Communication on issues, pull requests, and code reviews
-
-We don't mind if you use AI tools to help you write. However, do not have tools post unreviewed content on your behalf. Keep responses to the minimum needed to communicate your intent. We may hide any comments that we believe are unreviewed AI output.
-
-If you are opening a pull request, we expect you to be able to explain the proposed changes in your own words. This includes the pull request description and responses to questions. If you use AI to help generate the pull request summary, you must review it for technical accuracy.
-
-**Do not use AI to generate answers to questions from maintainers.** You should understand and be able to explain your own work. Using AI to improve grammar or clarity is fine, but the substance of your responses must be your own.
-
-If you wish to include context from an interaction with AI in your comments, it must be in a quote block (e.g., using `>`) and disclosed as such. It must be accompanied by your own commentary explaining the relevance and implications of the context. Do not share long snippets.
-
-## Non-native English speakers
-
-We understand that AI is useful when communicating as a non-native English speaker. Using AI to improve the grammar or clarity of text you have written yourself is fine. If you are using AI to translate your comments, please ensure the translation accurately reflects your intent. Including your original text in a details block shows the effort behind your contribution, helps maintainers verify the translation if needed, and keeps the conversation readable.
-
-## Code and documentation contributions
-
-AI can be a helpful tool for writing code and documentation. However, due to the foundational open source nature of our projects, we require a human in the loop who understands the work produced by AI.
-
-All contributions must be reviewed and understood by the contributor before submission. You should be able to explain every change in a pull request you submit. Pull requests that appear to be unreviewed AI output will be closed without review.
-
-## Our use of AI
-
-Some of our projects use AI tools to assist with code reviews, issue triaging, reporting, and other project management tasks. These tools may leave comments on pull requests or issues. As with any automated tooling, these comments are not always correct.
-
-If an AI tool leaves a comment on your contribution, treat it as you would any other review comment. If you believe it is incorrect, say so; a brief explanation is sufficient. Maintainers always have the final say. If in doubt, ask a maintainer.
-
-## Enforcement
-
-Contributions that do not follow this policy will be closed. Repeated violations may result in being blocked from contributing to OHF projects. If you believe your contribution was closed in error, you are welcome to reach out to a maintainer to discuss.
-
---
-
-The canonical version of this policy is published at
-<https://developers.home-assistant.io/docs/ai_policy>. In case of differences,
-the published version applies.
@@ -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 = {
@@ -52,15 +52,15 @@
    "@codemirror/view": "6.43.6",
    "@date-fns/tz": "1.5.0",
    "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "7.5.2",
-    "@formatjs/intl-displaynames": "7.3.13",
-    "@formatjs/intl-durationformat": "0.10.18",
+    "@formatjs/intl-datetimeformat": "7.5.0",
+    "@formatjs/intl-displaynames": "7.3.12",
+    "@formatjs/intl-durationformat": "0.10.17",
    "@formatjs/intl-getcanonicallocales": "3.2.11",
-    "@formatjs/intl-listformat": "8.3.13",
+    "@formatjs/intl-listformat": "8.3.12",
    "@formatjs/intl-locale": "5.3.10",
-    "@formatjs/intl-numberformat": "9.3.14",
-    "@formatjs/intl-pluralrules": "6.3.13",
-    "@formatjs/intl-relativetimeformat": "12.3.13",
+    "@formatjs/intl-numberformat": "9.3.13",
+    "@formatjs/intl-pluralrules": "6.3.12",
+    "@formatjs/intl-relativetimeformat": "12.3.12",
    "@fullcalendar/core": "6.1.21",
    "@fullcalendar/daygrid": "6.1.21",
    "@fullcalendar/interaction": "6.1.21",
@@ -77,7 +77,7 @@
    "@lit/task": "1.0.3",
    "@material/mwc-formfield": "patch:@material/mwc-formfield@npm%3A0.27.0#~/.yarn/patches/@material-mwc-formfield-npm-0.27.0-9528cb60f6.patch",
    "@material/mwc-list": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
-    "@material/web": "2.5.0",
+    "@material/web": "2.4.1",
    "@mdi/js": "7.4.47",
    "@mdi/svg": "7.4.47",
    "@replit/codemirror-indentation-markers": "6.5.3",
@@ -107,7 +107,7 @@
    "hls.js": "1.6.16",
    "home-assistant-js-websocket": "9.6.0",
    "idb-keyval": "6.3.0",
-    "intl-messageformat": "11.2.12",
+    "intl-messageformat": "11.2.11",
    "js-yaml": "5.2.1",
    "leaflet": "1.9.4",
    "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
@@ -146,13 +146,13 @@
    "@bundle-stats/plugin-webpack-filter": "4.22.2",
    "@eslint/js": "10.0.1",
    "@html-eslint/eslint-plugin": "0.64.0",
-    "@lokalise/node-api": "16.3.0",
+    "@lokalise/node-api": "16.1.0",
    "@octokit/auth-oauth-device": "8.0.3",
    "@octokit/plugin-retry": "8.1.0",
    "@octokit/rest": "22.0.1",
    "@playwright/test": "1.61.1",
-    "@rsdoctor/rspack-plugin": "1.6.0",
-    "@rspack/core": "2.1.4",
+    "@rsdoctor/rspack-plugin": "1.5.18",
+    "@rspack/core": "2.1.3",
    "@rspack/dev-server": "2.1.0",
    "@types/babel__plugin-transform-runtime": "7.9.5",
    "@types/chromecast-caf-receiver": "6.0.26",
@@ -196,7 +196,7 @@
    "jsdom": "29.1.1",
    "jszip": "3.10.1",
    "license-checker-rseidelsohn": "5.0.1",
-    "lint-staged": "17.1.0",
+    "lint-staged": "17.0.8",
    "lit-analyzer": "2.0.3",
    "lodash.merge": "4.6.2",
    "lodash.template": "4.18.1",
@@ -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,16 +86,6 @@
      "description": "Group date-fns with dependent timezone package",
      "groupName": "date-fns",
      "matchPackageNames": ["date-fns", "date-fns-tz"]
-    },
-    {
-      "description": "Group formatjs monorepo package",
-      "groupName": "formatjs",
-      "matchPackageNames": ["@formatjs/**"]
-    },
-    {
-      "description": "Group Playwright package and CI container updates",
-      "groupName": "Playwright",
-      "matchPackageNames": ["@playwright/test", "mcr.microsoft.com/playwright"]
    }
  ]
 }
@@ -91,14 +91,7 @@ export const STATES_OFF = ["closed", "locked", "off"];
 export const BINARY_STATE_ON = "on";
 export const BINARY_STATE_OFF = "off";

-/** Domains where we allow toggle in Lovelace.
- *  This is not strictly a list of what is possible to toggle, but the list of
- *  domains where toggle is considered the primary default behavior.
- *  Entities card uses this to determine which entities are controlled by the
- *  header toggle.
- *  Some cards use this to decide the default tap action.
- *  Use canToggleDomain/canToggleState for determining if toggling is possible.
- */
+/** Domains where we allow toggle in Lovelace. */
 export const DOMAINS_TOGGLE = new Set([
  "fan",
  "input_boolean",
@@ -1,12 +1,16 @@
 import type { HomeAssistant } from "../../types";
-import { getToggleAction } from "./get_toggle_action";

 export const canToggleDomain = (hass: HomeAssistant, domain: string) => {
  const services = hass.services[domain];
  if (!services) {
    return false;
  }
-  const actionOn = getToggleAction(domain, true);
-  const actionOff = getToggleAction(domain, false);
-  return actionOn in services && actionOff in services;
+
+  if (domain === "lock") {
+    return "lock" in services;
+  }
+  if (domain === "cover") {
+    return "open_cover" in services;
+  }
+  return "turn_on" in services;
 };
@@ -3,7 +3,6 @@ import type { HomeAssistant } from "../../types";
 import { canToggleDomain } from "./can_toggle_domain";
 import { computeStateDomain } from "./compute_state_domain";
 import { supportsFeature } from "./supports-feature";
-import { SPECIAL_TOGGLE_ACTIONS } from "./get_toggle_action";

 export const canToggleState = (hass: HomeAssistant, stateObj: HassEntity) => {
  const domain = computeStateDomain(stateObj);
@@ -26,13 +25,8 @@ export const canToggleState = (hass: HomeAssistant, stateObj: HassEntity) => {
    return false;
  }

-  if (
-    domain in SPECIAL_TOGGLE_ACTIONS &&
-    SPECIAL_TOGGLE_ACTIONS[domain].feature
-  ) {
-    return SPECIAL_TOGGLE_ACTIONS[domain].feature.every((f) =>
-      supportsFeature(stateObj, f)
-    );
+  if (domain === "climate") {
+    return supportsFeature(stateObj, 4096);
  }

  return canToggleDomain(hass, domain);
@@ -2,19 +2,19 @@ import { AITaskEntityFeature } from "../../data/ai_task";
 import { AlarmControlPanelEntityFeature } from "../../data/alarm_control_panel";
 import { AssistSatelliteEntityFeature } from "../../data/assist_satellite";
 import { CalendarEntityFeature } from "../../data/calendar";
-import { CameraEntityFeature } from "../../data/feature/camera_entity_feature";
-import { ClimateEntityFeature } from "../../data/feature/climate_entity_feature";
+import { CameraEntityFeature } from "../../data/camera";
+import { ClimateEntityFeature } from "../../data/climate";
 import { ConversationEntityFeature } from "../../data/conversation";
-import { CoverEntityFeature } from "../../data/feature/cover_entity_feature";
+import { CoverEntityFeature } from "../../data/cover";
 import { FanEntityFeature } from "../../data/fan";
 import { HumidifierEntityFeature } from "../../data/humidifier";
 import { LawnMowerEntityFeature } from "../../data/lawn_mower";
 import { LightEntityFeature } from "../../data/light";
 import { LockEntityFeature } from "../../data/lock";
-import { MediaPlayerEntityFeature } from "../../data/feature/media-player_entity_feature";
+import { MediaPlayerEntityFeature } from "../../data/media-player";
 import { NotifyEntityFeature } from "../../data/notify";
 import { RemoteEntityFeature } from "../../data/remote";
-import { SirenEntityFeature } from "../../data/feature/siren_entity_feature";
+import { SirenEntityFeature } from "../../data/siren";
 import { TodoListEntityFeature } from "../../data/todo";
 import { UpdateEntityFeature } from "../../data/update";
 import { VacuumEntityFeature } from "../../data/vacuum";
@@ -89,7 +89,7 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
    device_class: [
      "battery",
      "battery_charging",
-      "carbon_monoxide",
+      "co",
      "cold",
      "connectivity",
      "door",
@@ -227,12 +227,7 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
      "voltage",
      "volume_flow_rate",
    ],
-    state_class: [
-      "measurement",
-      "measurement_angle",
-      "total",
-      "total_increasing",
-    ],
+    state_class: ["measurement", "total", "total_increasing"],
  },
  switch: {
    device_class: ["outlet", "switch"],
@@ -1,72 +0,0 @@
-import { CameraEntityFeature } from "../../data/feature/camera_entity_feature";
-import { ClimateEntityFeature } from "../../data/feature/climate_entity_feature";
-import { CoverEntityFeature } from "../../data/feature/cover_entity_feature";
-import { MediaPlayerEntityFeature } from "../../data/feature/media-player_entity_feature";
-import { SirenEntityFeature } from "../../data/feature/siren_entity_feature";
-
-// These are domains which have nonstandard 'toggle' behavior.
-// Otherwise, any domain with a turn_on and turn_off service may be toggled.
-// If features are provided, all features must be supported.
-interface SpecialToggleAction {
-  on: string;
-  off?: string;
-  feature?: number[];
-}
-
-export const SPECIAL_TOGGLE_ACTIONS: Record<string, SpecialToggleAction> = {
-  button: {
-    on: "press",
-  },
-  camera: {
-    on: "turn_on",
-    off: "turn_off",
-    feature: [CameraEntityFeature.ON_OFF],
-  },
-  climate: {
-    on: "turn_on",
-    off: "turn_off",
-    feature: [ClimateEntityFeature.TURN_ON, ClimateEntityFeature.TURN_OFF],
-  },
-  cover: {
-    on: "open_cover",
-    off: "close_cover",
-    feature: [CoverEntityFeature.OPEN, CoverEntityFeature.CLOSE],
-  },
-  input_button: {
-    on: "press",
-  },
-  lock: {
-    on: "unlock",
-    off: "lock",
-  },
-  media_player: {
-    on: "turn_on",
-    off: "turn_off",
-    feature: [
-      MediaPlayerEntityFeature.TURN_ON,
-      MediaPlayerEntityFeature.TURN_OFF,
-    ],
-  },
-  scene: {
-    on: "turn_on",
-  },
-  siren: {
-    on: "turn_on",
-    off: "turn_off",
-    feature: [SirenEntityFeature.TURN_ON, SirenEntityFeature.TURN_OFF],
-  },
-  valve: {
-    on: "open_valve",
-    off: "close_valve",
-  },
-};
-
-// This function assumes that the passed domain can toggle, it may otherwise
-// return a service that does not exist.
-export const getToggleAction = (domain: string, onOff: boolean): string => {
-  return (
-    SPECIAL_TOGGLE_ACTIONS[domain]?.[onOff ? "on" : "off"] ||
-    SPECIAL_TOGGLE_ACTIONS[domain]?.["on"] ||
-    (onOff ? "turn_on" : "turn_off")
-  );
-};
@@ -2,7 +2,6 @@ import type { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import type { HomeAssistant } from "../../types";
 import { computeStateDomain } from "./compute_state_domain";
-import { getToggleAction } from "./get_toggle_action";

 export const computeGroupEntitiesState = (states: HassEntity[]): string => {
  if (!states.length) {
@@ -58,11 +57,14 @@ export const toggleGroupEntities = (

  const isOn = state === "on" || state === "open";

-  let service = getToggleAction(domain, !isOn);
+  let service = isOn ? "turn_off" : "turn_on";
  if (domain === "cover") {
    if (state === "opening" || state === "closing") {
      // If the cover is opening or closing, we toggle it to stop it
      service = "stop_cover";
+    } else {
+      // For covers, we use the open/close service
+      service = isOn ? "close_cover" : "open_cover";
    }
  }

@@ -1,27 +1,12 @@
-// A range smaller than this fraction of the axis magnitude is floating-point
-// noise (e.g. from summed statistics), not real precision.
-const NEGLIGIBLE_RANGE_RATIO = 1e-10;
-
 // Derive the number of decimal digits to use for Y-axis labels from the
 // observed data range. We mirror how ECharts sizes its ticks: it splits the
 // range into ~5 intervals (its default `splitNumber`) and rounds that raw
 // interval to a "nice" 1/2/3/5×10ⁿ value, then reports the decimals that nice
 // interval needs. This matches the precision ECharts actually renders, so
 // labels are neither truncated to identical values nor padded with extra zeros.
-export function computeYAxisFractionDigits(
-  min: number,
-  max: number,
-  // Bar axes render from 0, so union the extent with 0 to match.
-  includeZero = false
-): number {
-  const lo = includeZero ? Math.min(min, 0) : min;
-  const hi = includeZero ? Math.max(max, 0) : max;
-  const range = hi - lo;
+export function computeYAxisFractionDigits(min: number, max: number): number {
+  const range = max - min;
  if (!Number.isFinite(range) || range <= 0) return 1;
-  // A near-zero range is fp noise; deriving digits from it would pad the labels
-  // with a tail of zeros (e.g. "0.20000000000000"), so treat it as flat.
-  const magnitude = Math.max(Math.abs(lo), Math.abs(hi));
-  if (range <= magnitude * NEGLIGIBLE_RANGE_RATIO) return 1;
  const rawInterval = range / 5;
  const exponent = Math.floor(Math.log10(rawInterval));
  const mantissa = rawInterval / 10 ** exponent; // in [1, 10)
@@ -53,7 +38,9 @@ const resolveYAxisBound = (
 export function createYAxisPrecisionBounds(options: {
  min?: YAxisBound;
  max?: YAxisBound;
-  // Set for bar axes anchored at 0, so precision reflects the 0-based range.
+  // Axes without `scale: true` (e.g. bar charts) stay anchored at 0, so the
+  // rendered ticks span from 0 even when the data does not. Union the extent
+  // with 0 to match the labels ECharts actually draws.
  includeZero?: boolean;
  onFractionDigits: (digits: number) => void;
 }): {
@@ -65,11 +52,13 @@ export function createYAxisPrecisionBounds(options: {
    min: (values) => {
      const resolvedMin = resolveYAxisBound(min, values);
      const resolvedMax = resolveYAxisBound(max, values);
-      const extentMin = resolvedMin ?? values.min;
-      const extentMax = resolvedMax ?? values.max;
-      onFractionDigits(
-        computeYAxisFractionDigits(extentMin, extentMax, includeZero)
-      );
+      let extentMin = resolvedMin ?? values.min;
+      let extentMax = resolvedMax ?? values.max;
+      if (includeZero) {
+        extentMin = Math.min(extentMin, 0);
+        extentMax = Math.max(extentMax, 0);
+      }
+      onFractionDigits(computeYAxisFractionDigits(extentMin, extentMax));
      return resolvedMin;
    },
    max: (values) => resolveYAxisBound(max, values),
@@ -1,8 +1,8 @@
 import { AssistChip } from "@material/web/chips/internal/assist-chip";
-import { styles } from "@material/web/chips/internal/assist-styles.cssresult.js";
+import { styles } from "@material/web/chips/internal/assist-styles";

-import { styles as sharedStyles } from "@material/web/chips/internal/shared-styles.cssresult.js";
-import { styles as elevatedStyles } from "@material/web/chips/internal/elevated-styles.cssresult.js";
+import { styles as sharedStyles } from "@material/web/chips/internal/shared-styles";
+import { styles as elevatedStyles } from "@material/web/chips/internal/elevated-styles";

 import { css, html } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -1,9 +1,9 @@
-import { styles as elevatedStyles } from "@material/web/chips/internal/elevated-styles.cssresult.js";
+import { styles as elevatedStyles } from "@material/web/chips/internal/elevated-styles";
 import { FilterChip } from "@material/web/chips/internal/filter-chip";
-import { styles } from "@material/web/chips/internal/filter-styles.cssresult.js";
-import { styles as selectableStyles } from "@material/web/chips/internal/selectable-styles.cssresult.js";
-import { styles as sharedStyles } from "@material/web/chips/internal/shared-styles.cssresult.js";
-import { styles as trailingIconStyles } from "@material/web/chips/internal/trailing-icon-styles.cssresult.js";
+import { styles } from "@material/web/chips/internal/filter-styles";
+import { styles as selectableStyles } from "@material/web/chips/internal/selectable-styles";
+import { styles as sharedStyles } from "@material/web/chips/internal/shared-styles";
+import { styles as trailingIconStyles } from "@material/web/chips/internal/trailing-icon-styles";
 import { css, html } from "lit";
 import { customElement, property } from "lit/decorators";

@@ -1,8 +1,8 @@
 import { InputChip } from "@material/web/chips/internal/input-chip";
-import { styles } from "@material/web/chips/internal/input-styles.cssresult.js";
-import { styles as selectableStyles } from "@material/web/chips/internal/selectable-styles.cssresult.js";
-import { styles as sharedStyles } from "@material/web/chips/internal/shared-styles.cssresult.js";
-import { styles as trailingIconStyles } from "@material/web/chips/internal/trailing-icon-styles.cssresult.js";
+import { styles } from "@material/web/chips/internal/input-styles";
+import { styles as selectableStyles } from "@material/web/chips/internal/selectable-styles";
+import { styles as sharedStyles } from "@material/web/chips/internal/shared-styles";
+import { styles as trailingIconStyles } from "@material/web/chips/internal/trailing-icon-styles";
 import { css } from "lit";
 import { customElement } from "lit/decorators";

@@ -33,6 +33,7 @@ const HIDDEN_ATTRIBUTES = [
  "battery_level",
  "code_arm_required",
  "code_format",
+  "color_modes",
  "device_class",
  "editable",
  "effect_list",
@@ -13,7 +13,6 @@ import { forwardHaptic } from "../../data/haptics";
 import "../ha-formfield";
 import "../ha-icon-button";
 import "../ha-switch";
-import { getToggleAction } from "../../common/entity/get_toggle_action";

 const isOn = (stateObj?: HassEntity) =>
  stateObj !== undefined &&
@@ -125,10 +124,25 @@ export class HaEntityToggle extends LitElement {
    }
    forwardHaptic(this, "light");
    const stateDomain = computeStateDomain(this.stateObj);
+    let serviceDomain;
+    let service;

-    const serviceDomain =
-      stateDomain === "group" ? "homeassistant" : stateDomain;
-    const service = getToggleAction(stateDomain, turnOn);
+    if (stateDomain === "lock") {
+      serviceDomain = "lock";
+      service = turnOn ? "unlock" : "lock";
+    } else if (stateDomain === "cover") {
+      serviceDomain = "cover";
+      service = turnOn ? "open_cover" : "close_cover";
+    } else if (stateDomain === "valve") {
+      serviceDomain = "valve";
+      service = turnOn ? "open_valve" : "close_valve";
+    } else if (stateDomain === "group") {
+      serviceDomain = "homeassistant";
+      service = turnOn ? "turn_on" : "turn_off";
+    } else {
+      serviceDomain = stateDomain;
+      service = turnOn ? "turn_on" : "turn_off";
+    }

    const currentState = this.stateObj;

@@ -6,10 +6,8 @@ import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { styleMap } from "lit/directives/style-map";
-import { computeCssColor } from "../../common/color/compute-color";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
-import { stateActive } from "../../common/entity/state_active";
 import {
  stateColorBrightness,
  stateColorCss,
@@ -29,15 +27,10 @@ export class StateBadge extends LitElement {

  @property({ attribute: false }) public overrideImage?: string;

-  /**
-   * Cannot be a boolean attribute because undefined is treated different than
-   * false. When it is undefined, state is still colored for light entities.
-   * @deprecated use `color` instead
-   */
+  // Cannot be a boolean attribute because undefined is treated different than
+  // false.  When it is undefined, state is still colored for light entities.
  @property({ attribute: false }) public stateColor?: boolean;

-  // "state", "none" or a color (theme color name or CSS color). Custom colors
-  // apply when the entity is active. Takes precedence over stateColor.
  @property() public color?: string;

  // @todo Consider reworking to eliminate need for attribute since it is manipulated internally
@@ -74,17 +67,11 @@ export class StateBadge extends LitElement {
    }
  }

-  private get _color(): string | undefined {
-    if (this.color) {
-      return this.color;
-    }
-    if (this.stateColor !== undefined) {
-      return this.stateColor ? "state" : "none";
-    }
+  private get _stateColor() {
    const domain = this.stateObj
      ? computeStateDomain(this.stateObj)
      : undefined;
-    return domain === "light" ? "state" : undefined;
+    return this.stateColor ?? domain === "light";
  }

  protected render() {
@@ -144,7 +131,6 @@ export class StateBadge extends LitElement {

    if (stateObj) {
      const domain = computeDomain(stateObj.entity_id);
-      const color = this._color;
      if (this.overrideImage === undefined) {
        // hide icon if we have entity picture
        if (
@@ -161,10 +147,13 @@ export class StateBadge extends LitElement {
          }
          backgroundImage = `url(${imageUrl})`;
          this.icon = false;
-        } else if (color === "state") {
-          const stateColor = stateColorCss(stateObj);
-          if (stateColor) {
-            iconStyle.color = stateColor;
+        } else if (this.color) {
+          // Externally provided overriding color wins over state color
+          iconStyle.color = this.color;
+        } else if (this._stateColor) {
+          const color = stateColorCss(stateObj);
+          if (color) {
+            iconStyle.color = color;
          }
          if (stateObj.attributes.rgb_color) {
            iconStyle.color = `rgb(${stateObj.attributes.rgb_color.join(",")})`;
@@ -191,8 +180,6 @@ export class StateBadge extends LitElement {
              delete iconStyle.color;
            }
          }
-        } else if (color && color !== "none" && stateActive(stateObj)) {
-          iconStyle.color = computeCssColor(color);
        }
      } else if (this.overrideImage) {
        backgroundImage = `url(${this._resolveImageUrl(this.overrideImage)})`;
@@ -1,7 +1,6 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
-import { styleMap } from "lit/directives/style-map";
 import type { HomeAssistant } from "../../types";
 import "../ha-relative-time";
 import "../ha-tooltip";
@@ -24,11 +23,10 @@ class StateInfo extends LitElement {

    const name = this.hass.formatEntityName(this.stateObj, { type: "entity" });

-    // Inline style because the state-badge color API only colors active entities
    return html`<state-badge
        .stateObj=${this.stateObj}
-        .stateColor=${!this.color}
-        style=${styleMap({ color: this.color })}
+        .stateColor=${true}
+        .color=${this.color}
      ></state-badge>
      <div class="info">
        <div class="name ${this.inDialog ? "in-dialog" : ""}" .title=${name}>
@@ -57,16 +57,6 @@ interface AssistMessage {
  error?: boolean;
 }

-export const initialPromptToSubmit = (
-  prompt: string | undefined,
-  submit: boolean
-): string | undefined => (submit ? prompt?.trim() || undefined : undefined);
-
-export const assistPipelineChanged = (
-  previous: AssistPipeline | undefined,
-  current: AssistPipeline | undefined
-): boolean => previous?.id !== current?.id;
-
@customElement("ha-assist-chat")
 export class HaAssistChat extends LitElement {
  @property({ attribute: false }) public pipeline?: AssistPipeline;
@@ -77,12 +67,6 @@ export class HaAssistChat extends LitElement {
  @property({ attribute: false })
  public startListening?: boolean;

-  @property({ attribute: false })
-  public initialPrompt?: string;
-
-  @property({ attribute: false })
-  public submitInitialPrompt = false;
-
  @query("#message-input") private _messageInput!: HaInput;

  @query(".message:last-child")
@@ -115,8 +99,6 @@ export class HaAssistChat extends LitElement {

  private _conversationId: string | null = null;

-  private _initialPromptSubmitted = false;
-
  private _audioRecorder?: AudioRecorder;

  private _audioBuffer?: Int16Array[];
@@ -126,11 +108,7 @@ export class HaAssistChat extends LitElement {
  private _stt_binary_handler_id?: number | null;

  protected willUpdate(changedProperties: PropertyValues<this>): void {
-    if (
-      !this.hasUpdated ||
-      (changedProperties.has("pipeline") &&
-        assistPipelineChanged(changedProperties.get("pipeline"), this.pipeline))
-    ) {
+    if (!this.hasUpdated || changedProperties.has("pipeline")) {
      this._conversation = [
        {
          who: "hass",
@@ -160,20 +138,6 @@ export class HaAssistChat extends LitElement {
    if (changedProps.has("_conversation")) {
      this._scrollMessagesBottom();
    }
-    if (
-      !this._initialPromptSubmitted &&
-      (changedProps.has("initialPrompt") ||
-        changedProps.has("submitInitialPrompt"))
-    ) {
-      const prompt = initialPromptToSubmit(
-        this.initialPrompt,
-        this.submitInitialPrompt
-      );
-      if (prompt) {
-        this._initialPromptSubmitted = true;
-        this._processText(prompt);
-      }
-    }
  }

  public disconnectedCallback() {
@@ -1,96 +0,0 @@
-import type {
-  HaFormBaseSchema,
-  HaFormCondition,
-  HaFormDataContainer,
-  HaFormFieldCondition,
-  HaFormSchema,
-} from "./types";
-
-const isEmpty = (value: unknown): boolean =>
-  value === undefined || value === null || value === "";
-
-const matchFieldCondition = (
-  condition: HaFormFieldCondition,
-  data: HaFormDataContainer | undefined
-): boolean => {
-  const actual = data?.[condition.field];
-  switch (condition.operator ?? "eq") {
-    case "eq":
-      return actual === condition.value;
-    case "not_eq":
-      return actual !== condition.value;
-    case "in":
-      return (
-        Array.isArray(condition.value) &&
-        condition.value.includes(actual as any)
-      );
-    case "not_in":
-      return (
-        Array.isArray(condition.value) &&
-        !condition.value.includes(actual as any)
-      );
-    case "exists":
-      return !isEmpty(actual);
-    case "not_exists":
-      return isEmpty(actual);
-    default:
-      return false;
-  }
-};
-
-export const evaluateCondition = (
-  condition: HaFormCondition,
-  data: HaFormDataContainer | undefined
-): boolean => {
-  if ("condition" in condition) {
-    switch (condition.condition) {
-      case "and":
-        return condition.conditions.every((c) => evaluateCondition(c, data));
-      case "or":
-        return condition.conditions.some((c) => evaluateCondition(c, data));
-      case "not":
-        return !condition.conditions.some((c) => evaluateCondition(c, data));
-      default:
-        return false;
-    }
-  }
-  return matchFieldCondition(condition, data);
-};
-
-export const isFieldVisible = (
-  schema: HaFormSchema,
-  data: HaFormDataContainer | undefined
-): boolean => {
-  const { visible } = schema as HaFormBaseSchema;
-  if (visible === undefined || visible === true) {
-    return true;
-  }
-  if (visible === false) {
-    return false;
-  }
-  const conditions = Array.isArray(visible) ? visible : [visible];
-  return conditions.every((condition) => evaluateCondition(condition, data));
-};
-
-// Hiding a field drops its value, which can flip another field's condition, so
-// resolve the set to a fixpoint.
-export const getHiddenFields = (
-  schema: readonly HaFormSchema[],
-  data: HaFormDataContainer | undefined
-): Set<string> => {
-  const hidden = new Set<string>();
-  const evalData: HaFormDataContainer = { ...(data ?? {}) };
-  let changed = true;
-  while (changed) {
-    changed = false;
-    for (const field of schema) {
-      if (hidden.has(field.name) || isFieldVisible(field, evalData)) {
-        continue;
-      }
-      hidden.add(field.name);
-      delete evalData[field.name];
-      changed = true;
-    }
-  }
-  return hidden;
-};
@@ -2,7 +2,6 @@ import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property, queryAll } from "lit/decorators";
 import type { HomeAssistant } from "../../types";
-import { getHiddenFields } from "./conditions";
 import "./ha-form";
 import type { HaForm } from "./ha-form";
 import type {
@@ -68,24 +67,20 @@ export class HaFormGrid extends LitElement implements HaFormElement {
  }

  protected render(): TemplateResult {
-    const hiddenFields = getHiddenFields(this.schema.schema, this.data);
-
    return html`
-      ${this.schema.schema
-        .filter((item) => !hiddenFields.has(item.name))
-        .map(
-          (item) => html`
-            <ha-form
-              .hass=${this.hass}
-              .data=${this.data}
-              .schema=${[item]}
-              .disabled=${this.disabled}
-              .computeLabel=${this.computeLabel}
-              .computeHelper=${this.computeHelper}
-              .localizeValue=${this.localizeValue}
-            ></ha-form>
-          `
-        )}
+      ${this.schema.schema.map(
+        (item) => html`
+          <ha-form
+            .hass=${this.hass}
+            .data=${this.data}
+            .schema=${[item]}
+            .disabled=${this.disabled}
+            .computeLabel=${this.computeLabel}
+            .computeHelper=${this.computeHelper}
+            .localizeValue=${this.localizeValue}
+          ></ha-form>
+        `
+      )}
    `;
  }

@@ -1,12 +1,11 @@
 import type { PropertyValues, TemplateResult } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../common/dom/fire_event";
 import type { HomeAssistant } from "../../types";
 import "../ha-alert";
 import "../ha-selector/ha-selector";
-import { getHiddenFields } from "./conditions";
 import type { HaFormDataContainer, HaFormElement, HaFormSchema } from "./types";

 const LOAD_ELEMENTS = {
@@ -99,12 +98,7 @@ export class HaForm extends LitElement implements HaFormElement {
    let isValid = true;
    let firstInvalidElement: HTMLElement | undefined;

-    const hiddenFields = getHiddenFields(this.schema, this.data);
-    const visibleSchema = this.schema.filter(
-      (item) => !hiddenFields.has(item.name)
-    );
-
-    visibleSchema.forEach((item, index) => {
+    this.schema.forEach((item, index) => {
      const element = elements[index];
      if (!element) {
        return;
@@ -158,8 +152,6 @@ export class HaForm extends LitElement implements HaFormElement {
  }

  protected render(): TemplateResult {
-    const renderHiddenFields = getHiddenFields(this.schema, this.data);
-
    return html`
      <div class="root" part="root">
        ${
@@ -172,10 +164,6 @@ export class HaForm extends LitElement implements HaFormElement {
            : ""
        }
        ${this.schema.map((item) => {
-          if (renderHiddenFields.has(item.name)) {
-            return nothing;
-          }
-
          const error = getError(this.error, item);
          const warning = getWarning(this.warning, item);

@@ -22,9 +22,6 @@ export interface HaFormBaseSchema {
  default?: HaFormData;
  required?: boolean;
  disabled?: boolean;
-  // Field is visible while the condition holds (visible by default).
-  // Serializable so it can be shared with the backend and other renderers.
-  visible?: boolean | HaFormCondition | HaFormCondition[];
  description?: {
    suffix?: string;
    // This value will be set initially when form is loaded
@@ -33,36 +30,6 @@ export interface HaFormBaseSchema {
  context?: Record<string, string>;
 }

-export type HaFormConditionOperator =
-  "eq" | "not_eq" | "in" | "not_in" | "exists" | "not_exists";
-
-export interface HaFormFieldCondition {
-  field: string;
-  operator?: HaFormConditionOperator;
-  value?: HaFormData | readonly HaFormData[];
-}
-
-export interface HaFormAndCondition {
-  condition: "and";
-  conditions: readonly HaFormCondition[];
-}
-
-export interface HaFormOrCondition {
-  condition: "or";
-  conditions: readonly HaFormCondition[];
-}
-
-export interface HaFormNotCondition {
-  condition: "not";
-  conditions: readonly HaFormCondition[];
-}
-
-export type HaFormCondition =
-  | HaFormFieldCondition
-  | HaFormAndCondition
-  | HaFormOrCondition
-  | HaFormNotCondition;
-
 export interface HaFormGridSchema extends HaFormBaseSchema {
  type: "grid";
  flatten?: boolean;
@@ -1,5 +1,5 @@
 import { ListItemEl } from "@material/web/list/internal/listitem/list-item";
-import { styles } from "@material/web/list/internal/listitem/list-item-styles.cssresult.js";
+import { styles } from "@material/web/list/internal/listitem/list-item-styles";
 import { css, html, nothing, type TemplateResult } from "lit";
 import { customElement } from "lit/decorators";
 import "./ha-ripple";
@@ -1,5 +1,5 @@
 import { List } from "@material/web/list/internal/list";
-import { styles } from "@material/web/list/internal/list-styles.cssresult.js";
+import { styles } from "@material/web/list/internal/list-styles";
 import { css } from "lit";
 import { customElement } from "lit/decorators";

@@ -1,6 +1,6 @@
 import { OutlinedButton } from "@material/web/button/internal/outlined-button";
-import { styles as sharedStyles } from "@material/web/button/internal/shared-styles.cssresult.js";
-import { styles } from "@material/web/button/internal/outlined-styles.cssresult.js";
+import { styles as sharedStyles } from "@material/web/button/internal/shared-styles";
+import { styles } from "@material/web/button/internal/outlined-styles";
 import { css } from "lit";
 import { customElement } from "lit/decorators";

@@ -1,6 +1,6 @@
 import { OutlinedField } from "@material/web/field/internal/outlined-field";
-import { styles } from "@material/web/field/internal/outlined-styles.cssresult.js";
-import { styles as sharedStyles } from "@material/web/field/internal/shared-styles.cssresult.js";
+import { styles } from "@material/web/field/internal/outlined-styles";
+import { styles as sharedStyles } from "@material/web/field/internal/shared-styles";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
 import { literal } from "lit/static-html";
@@ -1,6 +1,6 @@
 import { IconButton } from "@material/web/iconbutton/internal/icon-button";
-import { styles } from "@material/web/iconbutton/internal/outlined-styles.cssresult.js";
-import { styles as sharedStyles } from "@material/web/iconbutton/internal/shared-styles.cssresult.js";
+import { styles } from "@material/web/iconbutton/internal/outlined-styles";
+import { styles as sharedStyles } from "@material/web/iconbutton/internal/shared-styles";
 import { css } from "lit";
 import { customElement } from "lit/decorators";

@@ -1,6 +1,6 @@
 import { AttachableController } from "@material/web/internal/controller/attachable-controller";
 import { Ripple } from "@material/web/ripple/internal/ripple";
-import { styles } from "@material/web/ripple/internal/ripple-styles.cssresult.js";
+import { styles } from "@material/web/ripple/internal/ripple-styles";
 import { css } from "lit";
 import { customElement } from "lit/decorators";

@@ -133,13 +133,7 @@ export class HaAreaSelector extends LitElement {
    }

    return ensureArray(this.selector.area.entity).some((filter) =>
-      filterSelectorEntities(
-        filter,
-        entity,
-        this._entitySources,
-        this.hass.entities,
-        this.hass.devices
-      )
+      filterSelectorEntities(filter, entity, this._entitySources)
    );
  };

@@ -147,13 +147,7 @@ export class HaDeviceSelector extends LitElement {

  private _filterEntities = (entity: HassEntity): boolean =>
    ensureArray(this.selector.device!.entity).some((filter) =>
-      filterSelectorEntities(
-        filter,
-        entity,
-        this._entitySources,
-        this.hass.entities,
-        this.hass.devices
-      )
+      filterSelectorEntities(filter, entity, this._entitySources)
    );
 }

@@ -2,12 +2,8 @@ import type { HassEntity } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { ConfigEntry } from "../../data/config_entries";
-import { getConfigEntries } from "../../data/config_entries";
-import { getDeviceIntegrationLookup } from "../../data/device/device_registry";
 import type { EntitySources } from "../../data/entity/entity_sources";
 import { fetchEntitySourcesWithCache } from "../../data/entity/entity_sources";
 import type { EntitySelector } from "../../data/selector";
@@ -27,8 +23,6 @@ export class HaEntitySelector extends LitElement {

  @state() private _entitySources?: EntitySources;

-  @state() private _configEntries?: ConfigEntry[];
-
  @property() public value?: any;

  @property() public label?: string;
@@ -43,38 +37,12 @@ export class HaEntitySelector extends LitElement {

  @state() private _createDomains: string[] | undefined;

-  private _deviceIntegrationLookup = memoizeOne(
-    (
-      entitySources: EntitySources,
-      entities: HomeAssistant["entities"],
-      devices: HomeAssistant["devices"],
-      configEntries?: ConfigEntry[]
-    ) =>
-      getDeviceIntegrationLookup(
-        entitySources,
-        Object.values(entities),
-        Object.values(devices),
-        configEntries
-      )
-  );
-
-  // Which async data the current filter needs to be evaluated: a top-level or
-  // device `integration` filter needs entity sources, and a `device.integration`
-  // filter additionally needs config entries (the device integration lookup is
-  // built from both).
-  private _dataNeeds = memoizeOne((selector: EntitySelector) => {
-    const filters = selector.entity?.filter
-      ? ensureArray(selector.entity.filter)
-      : [];
-    return {
-      entitySources: filters.some(
-        (f) => f.integration || f.device?.integration
-      ),
-      configEntries: filters.some((f) => f.device?.integration),
-    };
-  });
-
-  private _fetchedConfigEntries = false;
+  private _hasIntegration(selector: EntitySelector) {
+    return (
+      selector.entity?.filter &&
+      ensureArray(selector.entity.filter).some((filter) => filter.integration)
+    );
+  }

  protected willUpdate(changedProperties: PropertyValues<this>): void {
    if (changedProperties.get("selector") && this.value !== undefined) {
@@ -89,11 +57,7 @@ export class HaEntitySelector extends LitElement {
  }

  protected render() {
-    const needs = this._dataNeeds(this.selector);
-    if (
-      (needs.entitySources && !this._entitySources) ||
-      (needs.configEntries && !this._configEntries)
-    ) {
+    if (this._hasIntegration(this.selector) && !this._entitySources) {
      return nothing;
    }

@@ -132,37 +96,15 @@ export class HaEntitySelector extends LitElement {

  protected updated(changedProps: PropertyValues<this>): void {
    super.updated(changedProps);
-
-    // The connection changed (e.g. reconnect); refetch config entries.
-    const oldHass = changedProps.get("hass");
-    if (oldHass && oldHass.connection !== this.hass.connection) {
-      this._fetchedConfigEntries = false;
-      this._configEntries = undefined;
-    }
-
-    const needs = this._dataNeeds(this.selector);
-
-    if (needs.entitySources && !this._entitySources) {
+    if (
+      changedProps.has("selector") &&
+      this._hasIntegration(this.selector) &&
+      !this._entitySources
+    ) {
      fetchEntitySourcesWithCache(this.hass).then((sources) => {
        this._entitySources = sources;
      });
    }
-
-    if (needs.configEntries && !this._fetchedConfigEntries) {
-      this._fetchedConfigEntries = true;
-      getConfigEntries(this.hass)
-        .then((entries) => {
-          this._configEntries = entries;
-        })
-        .catch(() => {
-          // Fall back to no entries so the picker still renders. We keep
-          // `_fetchedConfigEntries` set so the failed fetch is not retried on
-          // every re-render; the connection-change handler above retries on
-          // reconnect.
-          this._configEntries = [];
-        });
-    }
-
    if (changedProps.has("selector")) {
      this._createDomains = computeCreateDomains(this.selector);
    }
@@ -172,25 +114,8 @@ export class HaEntitySelector extends LitElement {
    if (!this.selector?.entity?.filter) {
      return true;
    }
-    const deviceIntegrationLookup =
-      this._entitySources && this._dataNeeds(this.selector).configEntries
-        ? this._deviceIntegrationLookup(
-            this._entitySources,
-            this.hass.entities,
-            this.hass.devices,
-            this._configEntries
-          )
-        : undefined;
-
    return ensureArray(this.selector.entity.filter).some((filter) =>
-      filterSelectorEntities(
-        filter,
-        entity,
-        this._entitySources,
-        this.hass.entities,
-        this.hass.devices,
-        deviceIntegrationLookup
-      )
+      filterSelectorEntities(filter, entity, this._entitySources)
    );
  };
 }
@@ -133,13 +133,7 @@ export class HaFloorSelector extends LitElement {
    }

    return ensureArray(this.selector.floor.entity).some((filter) =>
-      filterSelectorEntities(
-        filter,
-        entity,
-        this._entitySources,
-        this.hass.entities,
-        this.hass.devices
-      )
+      filterSelectorEntities(filter, entity, this._entitySources)
    );
  };

@@ -1,23 +1,19 @@
-import { consume, type ContextType } from "@lit/context";
 import { initialState } from "@lit/task";
 import { html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { AsyncValueTask } from "../../common/controllers/async-value-task";
-import { consumeEntityState } from "../../common/decorators/consume-context-entry";
 import { fireEvent } from "../../common/dom/fire_event";
-import {
-  configContext,
-  connectionContext,
-  entitiesContext,
-} from "../../data/context";
 import { entityIcon } from "../../data/icons";
 import type { IconSelector } from "../../data/selector";
+import type { HomeAssistant } from "../../types";
 import "../ha-icon-picker";
 import "../ha-state-icon";

@customElement("ha-selector-icon")
 export class HaIconSelector extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
  @property({ attribute: false }) public selector!: IconSelector;

  @property() public value?: string;
@@ -34,21 +30,10 @@ export class HaIconSelector extends LitElement {
    icon_entity?: string;
  };

-  @state()
-  @consumeEntityState({ entityIdPath: ["context", "icon_entity"] })
-  private _stateObj?: HassEntity;
-
-  @state()
-  @consume({ context: entitiesContext, subscribe: true })
-  private _entities?: ContextType<typeof entitiesContext>;
-
-  @state()
-  @consume({ context: configContext, subscribe: true })
-  private _config?: ContextType<typeof configContext>;
-
-  @state()
-  @consume({ context: connectionContext, subscribe: true })
-  private _connection?: ContextType<typeof connectionContext>;
+  private get _stateObj(): HassEntity | undefined {
+    const iconEntity = this.context?.icon_entity;
+    return iconEntity ? this.hass.states[iconEntity] : undefined;
+  }

  private _placeholderTask = new AsyncValueTask(this, {
    task: ([
@@ -59,31 +44,19 @@ export class HaIconSelector extends LitElement {
      connection,
      stateObj,
    ]) => {
-      if (
-        placeholder ||
-        attributeIcon ||
-        !entities ||
-        !config ||
-        !connection ||
-        !stateObj
-      ) {
+      if (placeholder || attributeIcon || !stateObj) {
        return initialState;
      }
-      return entityIcon(
-        entities,
-        config.config,
-        connection.connection,
-        stateObj
-      );
+      return entityIcon(entities, config, connection, stateObj);
    },
    args: () => {
      const stateObj = this._stateObj;
      return [
        this.selector.icon?.placeholder,
        stateObj?.attributes.icon,
-        this._entities,
-        this._config,
-        this._connection,
+        this.hass.entities,
+        this.hass.config,
+        this.hass.connection,
        stateObj,
      ] as const;
    },
@@ -99,6 +72,7 @@ export class HaIconSelector extends LitElement {

    return html`
      <ha-icon-picker
+        .hass=${this.hass}
        .label=${this.label}
        .value=${this.value}
        .required=${this.required}
@@ -10,7 +10,6 @@ import type {
 } from "../../common/translations/localize";
 import type { HomeAssistant } from "../../types";
 import "../ha-form/ha-form";
-import { unitOfMeasurementOptions } from "../../data/number";

 const SELECTOR_DEFAULTS = {
  number: {
@@ -113,16 +112,6 @@ const SELECTOR_SCHEMAS = {
      name: "step",
      selector: { number: { mode: "box", step: "any" } },
    },
-    {
-      name: "unit_of_measurement",
-      selector: {
-        select: {
-          custom_value: true,
-          sort: true,
-          options: unitOfMeasurementOptions,
-        },
-      },
-    },
  ] as const,
  object: [] as const,
  color_rgb: [] as const,
@@ -93,13 +93,7 @@ export class HaTargetSelector extends LitElement {
    }

    return ensureArray(this.selector.target.entity).some((filter) =>
-      filterSelectorEntities(
-        filter,
-        entity,
-        this._entitySources,
-        this.hass.entities,
-        this.hass.devices
-      )
+      filterSelectorEntities(filter, entity, this._entitySources)
    );
  };

@@ -1,10 +1,13 @@
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { TimezoneSelector } from "../../data/selector";
+import type { HomeAssistant } from "../../types";
 import "../ha-timezone-picker";

@customElement("ha-selector-timezone")
 export class HaTimezoneSelector extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
  @property({ attribute: false }) public selector!: TimezoneSelector;

  @property() public value?: string;
@@ -20,6 +23,7 @@ export class HaTimezoneSelector extends LitElement {
  protected render() {
    return html`
      <ha-timezone-picker
+        .hass=${this.hass}
        .value=${this.value}
        .label=${this.label}
        .helper=${this.helper}
@@ -895,13 +895,7 @@ export class HaServiceControl extends LitElement {
        }
        if (targetEntities.length) {
          targetEntities = targetEntities.filter((entity) =>
-            entityMeetsTargetSelector(
-              this.hass.states[entity],
-              targetSelector,
-              undefined,
-              this.hass.entities,
-              this.hass.devices
-            )
+            entityMeetsTargetSelector(this.hass.states[entity], targetSelector)
          );
        }
        target = {
@@ -1,5 +1,5 @@
 import { SubMenu } from "@material/web/menu/internal/submenu/sub-menu";
-import { styles } from "@material/web/menu/internal/submenu/sub-menu-styles.cssresult.js";
+import { styles } from "@material/web/menu/internal/submenu/sub-menu-styles";
 import { css } from "lit";
 import { customElement } from "lit/decorators";

@@ -2,10 +2,8 @@ import { getTimeZones, timeZonesNames } from "@vvo/tzdb";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
 import { fireEvent } from "../common/dom/fire_event";
-import type { LocalizeFunc } from "../common/translations/localize";
-import type { ValueChangedEvent } from "../types";
+import type { HomeAssistant, ValueChangedEvent } from "../types";
 import "./ha-generic-picker";

 import type { PickerComboBoxItem } from "./ha-picker-combo-box";
@@ -54,8 +52,7 @@ export const getTimezoneOptions = (): PickerComboBoxItem[] => {

@customElement("ha-timezone-picker")
 export class HaTimeZonePicker extends LitElement {
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public value?: string;

@@ -85,14 +82,15 @@ export class HaTimeZonePicker extends LitElement {
  protected render() {
    const label =
      this.label ??
-      (this._localize("ui.components.timezone-picker.time_zone") ||
+      (this.hass?.localize("ui.components.timezone-picker.time_zone") ||
        "Time zone");

    return html`
      <ha-generic-picker
+        .hass=${this.hass}
        .notFoundLabel=${this._notFoundLabel}
        .emptyLabel=${
-          this._localize("ui.components.timezone-picker.no_timezones") ||
+          this.hass?.localize("ui.components.timezone-picker.no_timezones") ||
          "No time zones available"
        }
        .label=${label}
@@ -126,10 +124,9 @@ export class HaTimeZonePicker extends LitElement {

  private _notFoundLabel = (search: string) => {
    const term = html`<b>'${search}'</b>`;
-    return (
-      this._localize("ui.components.timezone-picker.no_match", { term }) ||
-      html`No time zones found for ${term}`
-    );
+    return this.hass
+      ? this.hass.localize("ui.components.timezone-picker.no_match", { term })
+      : html`No time zones found for ${term}`;
  };
 }

@@ -1,3 +1,4 @@
+import { memoize } from "@fullcalendar/core/internal";
 import { setHours, setMinutes } from "date-fns";
 import type { HassConfig } from "home-assistant-js-websocket";
 import memoizeOne from "memoize-one";
@@ -410,7 +411,7 @@ export type BackupType = "automatic" | "manual" | "app_update";

 const BACKUP_TYPE_ORDER: BackupType[] = ["automatic", "app_update", "manual"];

-export const getBackupTypes = memoizeOne((isHassio: boolean) =>
+export const getBackupTypes = memoize((isHassio: boolean) =>
  isHassio
    ? BACKUP_TYPE_ORDER
    : BACKUP_TYPE_ORDER.filter((type) => type !== "app_update")
@@ -13,7 +13,10 @@ export const STREAM_TYPE_WEB_RTC = "web_rtc";

 export type StreamType = typeof STREAM_TYPE_HLS | typeof STREAM_TYPE_WEB_RTC;

-export { CameraEntityFeature } from "./feature/camera_entity_feature";
+export enum CameraEntityFeature {
+  ON_OFF = 1,
+  STREAM = 2,
+}

 interface CameraEntityAttributes extends HassEntityAttributeBase {
  model_name: string;
@@ -68,7 +68,18 @@ export type ClimateEntity = HassEntityBase & {
  };
 };

-export { ClimateEntityFeature } from "./feature/climate_entity_feature";
+export enum ClimateEntityFeature {
+  TARGET_TEMPERATURE = 1,
+  TARGET_TEMPERATURE_RANGE = 2,
+  TARGET_HUMIDITY = 4,
+  FAN_MODE = 8,
+  PRESET_MODE = 16,
+  SWING_MODE = 32,
+  AUX_HEAT = 64,
+  TURN_OFF = 128,
+  TURN_ON = 256,
+  SWING_HORIZONTAL_MODE = 512,
+}

 const hvacModeOrdering = HVAC_MODES.reduce(
  (order, mode, index) => {
@@ -6,9 +6,17 @@ import { stateActive } from "../common/entity/state_active";
 import { supportsFeature } from "../common/entity/supports-feature";
 import type { HomeAssistantFormatters } from "../types";
 import { UNAVAILABLE } from "./entity/entity";
-import { CoverEntityFeature } from "./feature/cover_entity_feature";

-export { CoverEntityFeature };
+export enum CoverEntityFeature {
+  OPEN = 1,
+  CLOSE = 2,
+  SET_POSITION = 4,
+  STOP = 8,
+  OPEN_TILT = 16,
+  CLOSE_TILT = 32,
+  STOP_TILT = 64,
+  SET_TILT_POSITION = 128,
+}

 export const DEFAULT_COVER_FAVORITE_POSITIONS = [0, 25, 75, 100];

@@ -127,6 +127,7 @@ export const NON_NUMERIC_ATTRIBUTES = [
  "away_mode",
  "changed_by",
  "code_format",
+  "color_modes",
  "current_activity",
  "device_class",
  "editable",
@@ -176,7 +177,6 @@ export const NON_NUMERIC_ATTRIBUTES = [
  "source_type",
  "source",
  "state_class",
-  "supported_color_modes",
  "supported_features",
  "swing_mode",
  "swing_mode",
@@ -190,6 +190,7 @@ export const NON_NUMERIC_ATTRIBUTES = [
 export const STATE_CONDITION_HIDDEN_ATTRIBUTES = [
  "access_token",
  "available_modes",
+  "color_modes",
  "editable",
  "effect_list",
  "entity_picture",
@@ -206,7 +207,6 @@ export const STATE_CONDITION_HIDDEN_ATTRIBUTES = [
  "sound_mode_list",
  "source_list",
  "state_class",
-  "supported_color_modes",
  "swing_modes",
  "token",
 ];
@@ -1,4 +0,0 @@
-export enum CameraEntityFeature {
-  ON_OFF = 1,
-  STREAM = 2,
-}
@@ -1,12 +0,0 @@
-export enum ClimateEntityFeature {
-  TARGET_TEMPERATURE = 1,
-  TARGET_TEMPERATURE_RANGE = 2,
-  TARGET_HUMIDITY = 4,
-  FAN_MODE = 8,
-  PRESET_MODE = 16,
-  SWING_MODE = 32,
-  AUX_HEAT = 64,
-  TURN_OFF = 128,
-  TURN_ON = 256,
-  SWING_HORIZONTAL_MODE = 512,
-}
@@ -1,10 +0,0 @@
-export enum CoverEntityFeature {
-  OPEN = 1,
-  CLOSE = 2,
-  SET_POSITION = 4,
-  STOP = 8,
-  OPEN_TILT = 16,
-  CLOSE_TILT = 32,
-  STOP_TILT = 64,
-  SET_TILT_POSITION = 128,
-}
@@ -1,22 +0,0 @@
-export enum MediaPlayerEntityFeature {
-  PAUSE = 1,
-  SEEK = 2,
-  VOLUME_SET = 4,
-  VOLUME_MUTE = 8,
-  PREVIOUS_TRACK = 16,
-  NEXT_TRACK = 32,
-
-  TURN_ON = 128,
-  TURN_OFF = 256,
-  PLAY_MEDIA = 512,
-  VOLUME_STEP = 1024,
-  SELECT_SOURCE = 2048,
-  STOP = 4096,
-  CLEAR_PLAYLIST = 8192,
-  PLAY = 16384,
-  SHUFFLE_SET = 32768,
-  SELECT_SOUND_MODE = 65536,
-  BROWSE_MEDIA = 131072,
-  REPEAT_SET = 262144,
-  GROUPING = 524288,
-}
@@ -1,7 +0,0 @@
-export enum SirenEntityFeature {
-  TURN_ON = 1,
-  TURN_OFF = 2,
-  TONES = 4,
-  VOLUME_SET = 8,
-  DURATION = 16,
-}
@@ -1,11 +1,6 @@
 import type { Connection } from "home-assistant-js-websocket";
 import type { ShortcutItem } from "./home_shortcuts";

-export interface SurveyInteraction {
-  date: string;
-  action: "opened" | "dismissed";
-}
-
 export interface CoreFrontendUserData {
  showEntityIdPicker?: boolean;
  default_panel?: string;
@@ -21,9 +16,6 @@ export interface CoreFrontendSystemData {
  default_panel?: string;
  onboarded_version?: string;
  onboarded_date?: string;
-  surveys?: {
-    onboarding?: SurveyInteraction;
-  };
 }

 export interface HomeFrontendSystemData {
@@ -15,10 +15,26 @@ export interface HttpConfig {
  ssl_profile?: "modern" | "intermediate";
 }

+// The slot the running HTTP server was actually started with.
+export type ActiveConfigType = "stable" | "pending" | "default";
+
+// A stored config slot carries metadata alongside the editable fields:
+// - created_at: when the slot was staged
+// - error: null while healthy; set once a slot could not be applied or a
+//   pending trial was not confirmed (then it is kept for display, not retried)
+export interface HttpConfigWithMeta extends HttpConfig {
+  created_at?: string;
+  error?: string | null;
+}
+
 export interface HttpConfigState {
-  stable: HttpConfig;
-  pending: HttpConfig | null;
+  stable: HttpConfigWithMeta;
+  pending: HttpConfigWithMeta | null;
  revert_at: string | null;
+  // Added in the "active HTTP config slot" backend change; optional so the
+  // frontend keeps working against cores without it.
+  active_config_type?: ActiveConfigType;
+  default?: HttpConfigWithMeta;
 }

 export const HTTP_CONFIG_FIELDS: (keyof HttpConfig)[] = [
@@ -40,6 +56,19 @@ export interface SaveHttpConfigResult {
  restart: boolean;
 }

+// Keep only the editable fields; the backend storage schema rejects unknown
+// keys, so the created_at/error metadata that rides along on a fetched slot
+// must be dropped before configuring.
+export const stripHttpConfigMeta = (config: HttpConfig): HttpConfig => {
+  const stripped: Partial<Record<keyof HttpConfig, unknown>> = {};
+  for (const key of HTTP_CONFIG_FIELDS) {
+    if (config[key] !== undefined) {
+      stripped[key] = config[key];
+    }
+  }
+  return stripped as HttpConfig;
+};
+
 export const fetchHttpConfig = (hass: HomeAssistant) =>
  hass.callWS<HttpConfigState>({ type: "http/config" });

@@ -49,7 +78,7 @@ export const saveHttpConfig = (
 ) =>
  hass.callWS<SaveHttpConfigResult>({
    type: "http/config/configure",
-    config,
+    config: config ? stripHttpConfigMeta(config) : null,
  });

 export const promoteHttpConfig = (hass: HomeAssistant) =>
@@ -45,69 +45,6 @@ export interface MatterNodeDiagnostics {

 export type MatterPingResult = Record<string, boolean>;

-export type MatterTopologyNodeKind =
-  "matter" | "border_router" | "thread_unknown" | "wifi_ap";
-
-export type MatterTopologyStrength = "strong" | "medium" | "weak" | "none";
-
-export interface MatterTopologyDirectionInfo {
-  strength: MatterTopologyStrength;
-  lqi?: number | null;
-  rssi?: number | null;
-}
-
-export interface MatterNetworkTopologyNode {
-  id: string;
-  kind: MatterTopologyNodeKind;
-  network_type: string;
-  node_id?: number | null;
-  ha_device_id?: string | null;
-  role?: string | null;
-  available?: boolean | null;
-  is_bridge?: boolean | null;
-  ext_address?: string | null;
-  rloc16?: number | null;
-  ext_pan_id?: string | null;
-  network_name?: string | null;
-  vendor_name?: string | null;
-  model_name?: string | null;
-  last_seen?: number | null;
-}
-
-export interface MatterNetworkTopologyConnection {
-  source: string;
-  target: string;
-  network: string;
-  strength: MatterTopologyStrength;
-  source_to_target?: MatterTopologyDirectionInfo | null;
-  target_to_source?: MatterTopologyDirectionInfo | null;
-  via_route_table?: boolean | null;
-  path_cost?: number | null;
-}
-
-export interface MatterNetworkTopology {
-  collected_at: number;
-  nodes: MatterNetworkTopologyNode[];
-  connections: MatterNetworkTopologyConnection[];
-}
-
-export const fetchMatterNetworkTopology = (
-  hass: HomeAssistant,
-  refresh = false
-): Promise<MatterNetworkTopology> =>
-  hass.callWS({
-    type: "matter/network_topology",
-    refresh,
-  });
-
-export const subscribeMatterNetworkTopology = (
-  hass: HomeAssistant,
-  callback: (topology: MatterNetworkTopology) => void
-): Promise<UnsubscribeFunc> =>
-  hass.connection.subscribeMessage<MatterNetworkTopology>(callback, {
-    type: "matter/subscribe_network_topology",
-  });
-
 export interface MatterCommissioningParameters {
  setup_pin_code: number;
  setup_manual_code: string;
@@ -40,9 +40,6 @@ import type { MediaPlayerItemId } from "../components/media-player/ha-media-play
 import type { HomeAssistant, TranslationDict } from "../types";
 import { UNAVAILABLE } from "./entity/entity";
 import { isTTSMediaSource } from "./tts";
-import { MediaPlayerEntityFeature } from "./feature/media-player_entity_feature";
-
-export { MediaPlayerEntityFeature };

 interface MediaPlayerEntityAttributes extends HassEntityAttributeBase {
  media_content_id?: string;
@@ -85,6 +82,29 @@ export interface MediaPlayerEntity extends HassEntityBase {
    | "buffering";
 }

+export enum MediaPlayerEntityFeature {
+  PAUSE = 1,
+  SEEK = 2,
+  VOLUME_SET = 4,
+  VOLUME_MUTE = 8,
+  PREVIOUS_TRACK = 16,
+  NEXT_TRACK = 32,
+
+  TURN_ON = 128,
+  TURN_OFF = 256,
+  PLAY_MEDIA = 512,
+  VOLUME_STEP = 1024,
+  SELECT_SOURCE = 2048,
+  STOP = 4096,
+  CLEAR_PLAYLIST = 8192,
+  PLAY = 16384,
+  SHUFFLE_SET = 32768,
+  SELECT_SOUND_MODE = 65536,
+  BROWSE_MEDIA = 131072,
+  REPEAT_SET = 262144,
+  GROUPING = 524288,
+}
+
 export type MediaPlayerBrowseAction = "pick" | "play";

 export const BROWSER_PLAYER = "browser";
@@ -266,10 +266,6 @@ interface EntitySelectorFilter {
  unit_of_measurement?: string | readonly string[];
 }

-interface EntitySelectorEntityFilter extends EntitySelectorFilter {
-  device?: DeviceSelectorFilter;
-}
-
 export interface EntitySelectorExtraOption {
  id: string;
  primary: string;
@@ -285,7 +281,7 @@ export interface EntitySelector {
    multiple?: boolean;
    include_entities?: string[];
    exclude_entities?: string[];
-    filter?: EntitySelectorEntityFilter | readonly EntitySelectorEntityFilter[];
+    filter?: EntitySelectorFilter | readonly EntitySelectorFilter[];
    reorder?: boolean;
    extra_options?: EntitySelectorExtraOption[];
  } | null;
@@ -675,9 +671,7 @@ export const expandLabelTarget = (
      entityMeetsTargetSelector(
        hass.states[entity.entity_id],
        targetSelector,
-        entitySources,
-        hass.entities,
-        hass.devices
+        entitySources
      )
    ) {
      newEntities.push(entity.entity_id);
@@ -743,9 +737,7 @@ export const expandAreaTarget = (
      entityMeetsTargetSelector(
        hass.states[entity.entity_id],
        targetSelector,
-        entitySources,
-        hass.entities,
-        hass.devices
+        entitySources
      )
    ) {
      newEntities.push(entity.entity_id);
@@ -768,9 +760,7 @@ export const expandDeviceTarget = (
      entityMeetsTargetSelector(
        hass.states[entity.entity_id],
        targetSelector,
-        entitySources,
-        hass.entities,
-        hass.devices
+        entitySources
      )
    ) {
      newEntities.push(entity.entity_id);
@@ -811,9 +801,7 @@ export const areaMeetsTargetSelector = (
      entityMeetsTargetSelector(
        hass.states[entity.entity_id],
        targetSelector,
-        entitySources,
-        hass.entities,
-        hass.devices
+        entitySources
      )
    ) {
      return true;
@@ -861,22 +849,14 @@ export const deviceMeetsTargetSelector = (
 export const entityMeetsTargetSelector = (
  entity: HassEntity | undefined,
  targetSelector: TargetSelector,
-  entitySources?: EntitySources,
-  entities?: HomeAssistant["entities"],
-  devices?: HomeAssistant["devices"]
+  entitySources?: EntitySources
 ): boolean => {
  if (!entity) {
    return false;
  }
  if (targetSelector.target?.entity) {
    return ensureArray(targetSelector.target!.entity).some((filterEntity) =>
-      filterSelectorEntities(
-        filterEntity,
-        entity,
-        entitySources,
-        entities,
-        devices
-      )
+      filterSelectorEntities(filterEntity, entity, entitySources)
    );
  }
  return true;
@@ -915,12 +895,9 @@ export const filterSelectorDevices = (
 };

 export const filterSelectorEntities = (
-  filterEntity: EntitySelectorEntityFilter,
+  filterEntity: EntitySelectorFilter,
  entity: HassEntity,
-  entitySources?: EntitySources,
-  entityRegistry?: HomeAssistant["entities"],
-  devices?: HomeAssistant["devices"],
-  deviceIntegrationLookup?: Record<string, Set<string>>
+  entitySources?: EntitySources
 ): boolean => {
  const {
    domain: filterDomain,
@@ -928,7 +905,6 @@ export const filterSelectorEntities = (
    supported_features: filterSupportedFeature,
    unit_of_measurement: filterUnitOfMeasurement,
    integration: filterIntegration,
-    device: filterDevice,
  } = filterEntity;

  if (filterDomain) {
@@ -975,24 +951,6 @@ export const filterSelectorEntities = (
    }
  }

-  if (filterDevice) {
-    if (!entityRegistry || !devices) {
-      return false;
-    }
-
-    const deviceId = entityRegistry[entity.entity_id]?.device_id;
-    if (!deviceId) {
-      return false;
-    }
-    const device = devices[deviceId];
-    if (!device) {
-      return false;
-    }
-    if (!filterSelectorDevices(filterDevice, device, deviceIntegrationLookup)) {
-      return false;
-    }
-  }
-
  if (
    filterIntegration &&
    entitySources?.[entity.entity_id]?.domain !== filterIntegration
@@ -1062,7 +1020,7 @@ export const handleLegacyDeviceSelector = (
 export const computeCreateDomains = (
  selector: EntitySelector | TargetSelector
 ): undefined | string[] => {
-  let entityFilters: EntitySelectorEntityFilter[] | undefined;
+  let entityFilters: EntitySelectorFilter[] | undefined;

  if ("target" in selector) {
    entityFilters = ensureArray(selector.target?.entity);
@@ -1080,7 +1038,6 @@ export const computeCreateDomains = (
    !entityFilter.integration &&
    !entityFilter.device_class &&
    !entityFilter.supported_features &&
-    !entityFilter.device &&
    entityFilter.domain
      ? ensureArray(entityFilter.domain).filter((domain) =>
          isHelperDomain(domain)
@@ -1 +1,7 @@
-export { SirenEntityFeature } from "./feature/siren_entity_feature";
+export enum SirenEntityFeature {
+  TURN_ON = 1,
+  TURN_OFF = 2,
+  TONES = 4,
+  VOLUME_SET = 8,
+  DURATION = 16,
+}
@@ -149,7 +149,6 @@ export const weatherAttrIcons = {
  humidity: mdiWaterPercent,
  wind_bearing: mdiWeatherWindy,
  wind_speed: mdiWeatherWindy,
-  wind_gust_speed: mdiWeatherWindy,
  pressure: mdiGauge,
  temperature: mdiThermometer,
  uv_index: mdiSunWireless,
@@ -269,7 +268,6 @@ export const getWeatherUnit = (
      return (
        stateObj.attributes.temperature_unit || config.unit_system.temperature
      );
-    case "wind_gust_speed":
    case "wind_speed":
      return stateObj.attributes.wind_speed_unit || `${lengthUnit}/h`;
    case "cloud_coverage":
@@ -9,7 +9,6 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { isNavigationClick } from "../../common/dom/is-navigation-click";
 import "../../components/ha-alert";
 import { computeInitialHaFormData } from "../../components/ha-form/compute-initial-ha-form-data";
-import { getHiddenFields } from "../../components/ha-form/conditions";
 import "../../components/ha-form/ha-form";
 import type {
  HaFormSchema,
@@ -227,17 +226,14 @@ class StepFlowForm extends LitElement {
    const checkAllRequiredFields = (
      schema: readonly HaFormSchema[],
      data: Record<string, any>
-    ) => {
-      const hidden = getHiddenFields(schema, data);
-      return schema.every(
+    ) =>
+      schema.every(
        (field) =>
-          hidden.has(field.name) ||
-          ((!field.required || !["", undefined].includes(data[field.name])) &&
-            (field.type !== "expandable" ||
-              (!field.required && data[field.name] === undefined) ||
-              checkAllRequiredFields(field.schema, data[field.name])))
+          (!field.required || !["", undefined].includes(data[field.name])) &&
+          (field.type !== "expandable" ||
+            (!field.required && data[field.name] === undefined) ||
+            checkAllRequiredFields(field.schema, data[field.name]))
      );
-    };

    const allRequiredInfoFilledIn =
      stepData === undefined
@@ -259,14 +255,8 @@ class StepFlowForm extends LitElement {

    const flowId = this.step.flow_id;

-    const hiddenFields = getHiddenFields(this.step.data_schema, stepData);
-
    const toSendData: Record<string, unknown> = {};
    Object.keys(stepData).forEach((key) => {
-      if (hiddenFields.has(key)) {
-        // Hidden fields are not part of the submitted config
-        return;
-      }
      const value = stepData[key];
      const isEmpty = [undefined, ""].includes(value);
      const field = this.step.data_schema?.find((f) => f.name === key);
@@ -1,4 +1,4 @@
-import { mdiCommentProcessingOutline, mdiDevices } from "@mdi/js";
+import { mdiDevices } from "@mdi/js";
 import { consume } from "@lit/context";
 import Fuse from "fuse.js";
 import type { CSSResultGroup, PropertyValues } from "lit";
@@ -61,7 +61,6 @@ import { isIosApp } from "../../util/is_ios";
 import { isMac } from "../../util/is_mac";
 import { showConfirmationDialog } from "../generic/show-dialog-box";
 import { showShortcutsDialog } from "../shortcuts/show-shortcuts-dialog";
-import { showVoiceCommandDialog } from "../voice-command-dialog/show-ha-voice-command-dialog";
 import {
  effectiveQuickBarMode,
  type QuickBarParams,
@@ -70,18 +69,6 @@ import {

 const SEPARATOR = "________";

-interface AssistComboBoxItem extends PickerComboBoxItem {
-  action: "assist";
-  assistPrompt: string;
-}
-
-type QuickBarComboBoxItem =
-  | NavigationComboBoxItem
-  | ActionCommandComboBoxItem
-  | EntityComboBoxItem
-  | DevicePickerItem
-  | AssistComboBoxItem;
-
@customElement("ha-quick-bar")
 export class QuickBar extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;
@@ -303,7 +290,13 @@ export class QuickBar extends LitElement {
    `;
  }

-  private _renderRow = (item: QuickBarComboBoxItem) => {
+  private _renderRow = (
+    item:
+      | NavigationComboBoxItem
+      | ActionCommandComboBoxItem
+      | EntityComboBoxItem
+      | DevicePickerItem
+  ) => {
    if (!item) {
      return nothing;
    }
@@ -419,8 +412,8 @@ export class QuickBar extends LitElement {
  }: {
    firstIndex: number;
    lastIndex: number;
-    firstItem: QuickBarComboBoxItem | string;
-    secondItem: QuickBarComboBoxItem | string;
+    firstItem: PickerComboBoxItem | string;
+    secondItem: PickerComboBoxItem | string;
    itemsCount: number;
  }) => {
    if (
@@ -468,23 +461,7 @@ export class QuickBar extends LitElement {
      filter?: string,
      section?: QuickBarSection
    ) => {
-      const items: (string | QuickBarComboBoxItem)[] = [];
-      const prompt = filter?.trim();
-      const assistItem =
-        prompt &&
-        (!section || section === "command") &&
-        isComponentLoaded(this.hass.config, "conversation") &&
-        !this.hass.auth.external?.config.hasAssist
-          ? ({
-              id: "ask-assist",
-              action: "assist",
-              primary: this.hass.localize("ui.dialogs.quick-bar.ask_assist", {
-                query: prompt,
-              }),
-              icon_path: mdiCommentProcessingOutline,
-              assistPrompt: prompt,
-            } satisfies AssistComboBoxItem)
-          : undefined;
+      const items: (string | PickerComboBoxItem)[] = [];

      if (!section || section === "navigate") {
        let navigateItems = this._generateNavigationCommandsMemoized(
@@ -509,12 +486,10 @@ export class QuickBar extends LitElement {
        items.push(...navigateItems);
      }

-      if (!section || section === "command") {
-        let commandItems = this.hass.user?.is_admin
-          ? this._generateActionCommandsMemoized(this.hass).sort(
-              this._sortBySortingLabel
-            )
-          : [];
+      if (this.hass.user?.is_admin && (!section || section === "command")) {
+        let commandItems = this._generateActionCommandsMemoized(this.hass).sort(
+          this._sortBySortingLabel
+        );

        if (filter) {
          commandItems = this._filterGroup(
@@ -524,15 +499,12 @@ export class QuickBar extends LitElement {
          ) as ActionCommandComboBoxItem[];
        }

-        if (!section && (commandItems.length || assistItem)) {
+        if (!section && commandItems.length) {
          // show group title
          items.push(this.hass.localize("ui.dialogs.quick-bar.commands_title"));
        }

        items.push(...commandItems);
-        if (assistItem) {
-          items.push(assistItem);
-        }
      }

      if (!section || section === "entity") {
@@ -751,21 +723,10 @@ export class QuickBar extends LitElement {
      const { index, newTab } = ev.detail;
      const item = this._comboBox.virtualizerElement.items[
        index
-      ] as QuickBarComboBoxItem;
+      ] as PickerComboBoxItem;

      this._itemSelected = true;

-      if (item && "assistPrompt" in item) {
-        this.closeDialog();
-        showVoiceCommandDialog(this, this.hass, {
-          pipeline_id: "last_used",
-          start_listening: false,
-          prompt: item.assistPrompt,
-          submit: true,
-        });
-        return;
-      }
-
      // entity selected
      if (item && "stateObj" in item) {
        this.closeDialog();
@@ -58,11 +58,9 @@ export class HaVoiceCommandDialog extends LitElement {

  private _startListening = false;

-  private _prompt?: string;
-
-  private _submitPrompt = false;
-
-  public async showDialog(params: VoiceCommandDialogParams): Promise<void> {
+  public async showDialog(
+    params: Required<VoiceCommandDialogParams>
+  ): Promise<void> {
    await this._loadPipelines();
    const pipelinesIds = this._pipelines?.map((pipeline) => pipeline.id) || [];
    if (
@@ -79,9 +77,7 @@ export class HaVoiceCommandDialog extends LitElement {
      this._pipelineId = this._preferredPipeline;
    }

-    this._startListening = params.start_listening ?? false;
-    this._prompt = params.prompt;
-    this._submitPrompt = params.submit ?? false;
+    this._startListening = params.start_listening;
    this._dialogOpen = true;
    this._open = true;
  }
@@ -193,8 +189,6 @@ export class HaVoiceCommandDialog extends LitElement {
                    .hass=${this.hass}
                    .pipeline=${this._pipeline}
                    .startListening=${this._startListening}
-                    .initialPrompt=${this._prompt}
-                    .submitInitialPrompt=${this._submitPrompt}
                  >
                  </ha-assist-chat>
                `
@@ -6,8 +6,6 @@ const loadVoiceCommandDialog = () => import("./ha-voice-command-dialog");
 export interface VoiceCommandDialogParams {
  pipeline_id: "last_used" | "preferred" | string;
  start_listening?: boolean;
-  prompt?: string;
-  submit?: boolean;
 }

 export const showVoiceCommandDialog = (
@@ -33,8 +31,6 @@ export const showVoiceCommandDialog = (
      pipeline_id: dialogParams.pipeline_id,
      // Don't start listening by default for web
      start_listening: dialogParams.start_listening ?? false,
-      prompt: dialogParams.prompt,
-      submit: dialogParams.submit ?? false,
    },
  });
 };
@@ -124,7 +124,7 @@ interface EMOutgoingMessageConnectionStatus extends EMMessage {
 }

 interface EMOutgoingMessageFrontendLoaded extends EMMessage {
-  type: "frontend/loaded"; // Fired once the launch screen is removed; with hasSplashscreen this is after the first panel has rendered
+  type: "frontend/loaded"; // Fired once the launch screen is removed (connected and essential data loaded)
 }

 interface EMOutgoingMessageAppConfiguration extends EMMessage {
@@ -371,7 +371,6 @@ export interface ExternalConfig {
  appVersion?: string;
  hasEntityAddTo?: boolean; // Supports "Add to" from more-info dialog, with action coming from external app
  hasAssistSettings?: boolean; // Shows the "This device" section in voice assistant settings
-  hasSplashscreen?: boolean; // App covers the frontend with its own loading screen until frontend/loaded, so the launch screen is removed without animation
 }

 export interface ExternalEntityAddToAction {
@@ -20,7 +20,6 @@ import {
  removeLaunchScreen,
  renderLaunchScreenInfoBox,
 } from "../util/launch-screen";
-import { checkOnboardingSurveyToast } from "../util/onboarding-survey";
 import {
  registerServiceWorker,
  supportsServiceWorker,
@@ -60,8 +59,6 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {

  private _httpPendingDialogOpen = false;

-  private _onboardingSurveyChecked = false;
-
  private _panelUrl: string;

  @storage({ key: "ha-version", state: false, subscribe: false })
@@ -111,17 +108,6 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
    ) {
      this.checkHttpPendingConfig();
    }
-    if (
-      changedProps.has("hass") &&
-      !this._onboardingSurveyChecked &&
-      this.hass?.user &&
-      this.hass.systemData
-    ) {
-      this._onboardingSurveyChecked = true;
-      if (!__DEMO__) {
-        checkOnboardingSurveyToast(this, this.hass);
-      }
-    }
  }

  protected update(changedProps: PropertyValues<this>) {
@@ -133,12 +119,7 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
    ) {
      this.render = this.renderHass;
      this.update = super.update;
-      // Apps with a native splash screen keep covering the frontend until
-      // frontend/loaded, so the launch screen stays up (invisibly) until the
-      // first panel has rendered and partial-panel-resolver removes it.
-      if (!this.hass.auth.external?.config.hasSplashscreen) {
-        removeLaunchScreen();
-      }
+      removeLaunchScreen();
      this.hass.auth.external?.fireMessage({ type: "frontend/loaded" });
    }
    super.update(changedProps);
@@ -269,7 +250,14 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
      // The check re-runs on the next reconnect; ignore transient failures.
      return;
    }
-    if (!httpConfig.pending || this._httpPendingDialogOpen) {
+    // Only prompt for an active trial. A pending config with an error was
+    // already reverted/failed and is kept only for display in the config form,
+    // so it must not pop the confirm/revert dialog.
+    if (
+      !httpConfig.pending ||
+      httpConfig.pending.error ||
+      this._httpPendingDialogOpen
+    ) {
      return;
    }
    this._httpPendingDialogOpen = true;
@@ -220,8 +220,7 @@ class PartialPanelResolver extends HassRouterPage {
    ) {
      await this.rebuild();
      await this.pageRendered;
-      removeLaunchScreen(!!this.hass.auth.external?.config.hasSplashscreen);
-      this.hass.auth.external?.fireMessage({ type: "frontend/loaded" });
+      removeLaunchScreen();
    }
  }
 }
@@ -15,7 +15,6 @@ export interface ShowToastParams {
  message:
    string | { translationKey: LocalizeKeys; args?: Record<string, string> };
  action?: ToastActionParams;
-  dismiss?: () => void;
  duration?: number;
  dismissable?: boolean;
  bottomOffset?: number;
@@ -72,10 +71,7 @@ class NotificationManager extends LitElement {
    this._toast?.show();
  }

-  private _toastClosed(ev: HASSDomEvent<ToastClosedEventDetail>) {
-    if (ev.detail.reason === "dismiss") {
-      this._parameters?.dismiss?.();
-    }
+  private _toastClosed(_ev: HASSDomEvent<ToastClosedEventDetail>) {
    this._parameters = undefined;
  }

@@ -95,7 +95,7 @@ import { showMoreInfoDialog } from "../../../../../dialogs/more-info/show-ha-mor
 import { MobileAwareMixin } from "../../../../../mixins/mobile-aware-mixin";
 import { mdiHomeAssistant } from "../../../../../resources/home-assistant-logo-svg";
 import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistantRegistries, Route } from "../../../../../types";
+import type { Route } from "../../../../../types";
 import { bytesToString } from "../../../../../util/bytes-to-string";
 import { getAppDisplayName } from "../../common/app";
 import "../../components/supervisor-apps-state";
@@ -172,20 +172,10 @@ class SupervisorAppInfo extends MobileAwareMixin(LitElement) {

  public connectedCallback() {
    super.connectedCallback();
+    this._computeUpdateEntityId();
    this._startPolling();
  }

-  protected willUpdate(changedProps: PropertyValues<this>) {
-    super.willUpdate(changedProps);
-    // Registries load asynchronously and change over time; resolve the update
-    // entity reactively instead of only once on connect.
-    this._updateEntityId = this._findUpdateEntityId(
-      this.registries.devices,
-      this.registries.entities,
-      (this._currentAddon as HassioAddonDetails).slug
-    );
-  }
-
  public disconnectedCallback() {
    super.disconnectedCallback();
    this._stopPolling();
@@ -1510,24 +1500,26 @@ class SupervisorAppInfo extends MobileAwareMixin(LitElement) {
      "system_managed" in addon && addon.system_managed
  );

-  private _findUpdateEntityId = memoizeOne(
-    (
-      devices: HomeAssistantRegistries["devices"],
-      entities: HomeAssistantRegistries["entities"],
-      slug: string
-    ): string | undefined => {
-      const device = Object.values(devices).find((d) =>
-        d.identifiers.some(([domain, id]) => domain === "hassio" && id === slug)
-      );
-      if (!device) {
-        return undefined;
-      }
-      return Object.values(entities).find(
-        (e) =>
-          e.device_id === device.id && computeDomain(e.entity_id) === "update"
-      )?.entity_id;
+  private _computeUpdateEntityId() {
+    const addon = this._currentAddon as HassioAddonDetails;
+    const device = Object.values(this.registries.devices).find((d) =>
+      d.identifiers.some(
+        ([domain, id]) => domain === "hassio" && id === addon.slug
+      )
+    );
+    if (!device) {
+      return;
    }
-  );
+    const updateEntity = Object.values(this.registries.entities).find(
+      (e) =>
+        e.device_id === device.id && computeDomain(e.entity_id) === "update"
+    );
+    if (!updateEntity) {
+      return;
+    }
+
+    this._updateEntityId = updateEntity.entity_id;
+  }

  private _openUpdate() {
    showMoreInfoDialog(this, { entityId: this._updateEntityId! });
@@ -30,6 +30,7 @@ const SCHEMA = [
          "code_arm_required",
          "code_format",
          "color_mode",
+          "color_modes",
          "current_activity",
          "device_class",
          "editable",
@@ -80,6 +80,7 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
                "available_modes",
                "code_arm_required",
                "code_format",
+                "color_modes",
                "device_class",
                "editable",
                "effect_list",
@@ -179,6 +179,7 @@ class HaConfigSectionGeneral extends LitElement {
      >
        <div class="card-content">
          <ha-timezone-picker
+            .hass=${this.hass}
            .label=${this.hass.localize(
              "ui.panel.config.core.section.core.core_config.time_zone"
            )}
@@ -5,7 +5,6 @@ import {
  mdiPlus,
  mdiShape,
  mdiTune,
-  mdiVectorPolyline,
 } from "@mdi/js";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
@@ -145,10 +144,6 @@ export class MatterConfigDashboard extends LitElement {
      <ha-card class="nav-card">
        <div class="card-header">
          ${this.hass.localize("ui.panel.config.matter.panel.my_network_title")}
-          <ha-button appearance="filled" href="/config/matter/visualization">
-            <ha-svg-icon slot="start" .path=${mdiVectorPolyline}></ha-svg-icon>
-            ${this.hass.localize("ui.panel.config.matter.panel.show_map")}
-          </ha-button>
        </div>
        <div class="card-content">
          <ha-md-list>
@@ -257,9 +252,6 @@ export class MatterConfigDashboard extends LitElement {
        }

        .nav-card .card-header {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
          padding-bottom: var(--ha-space-2);
        }

@@ -27,10 +27,6 @@ class MatterConfigRouter extends HassRouterPage {
        tag: "matter-options-page",
        load: () => import("./matter-options-page"),
      },
-      visualization: {
-        tag: "matter-network-visualization",
-        load: () => import("./matter-network-visualization"),
-      },
    },
  };

@@ -1,363 +0,0 @@
-import { getDeviceArea } from "../../../../../common/entity/context/get_device_context";
-import type {
-  NetworkData,
-  NetworkLink,
-  NetworkNode,
-} from "../../../../../components/chart/ha-network-graph";
-import type {
-  MatterNetworkTopology,
-  MatterNetworkTopologyNode,
-  MatterTopologyStrength,
-} from "../../../../../data/matter";
-import type { HomeAssistant } from "../../../../../types";
-
-const CATEGORY_HOME_ASSISTANT = 0;
-const CATEGORY_BORDER_ROUTER = 1;
-const CATEGORY_ROUTER = 2;
-const CATEGORY_END_DEVICE = 3;
-const CATEGORY_WIFI_AP = 4;
-const CATEGORY_OFFLINE = 5;
-const CATEGORY_UNKNOWN = 6;
-
-const ROUTER_ROLES = new Set(["leader", "router", "reed"]);
-
-// HA is not a Matter node; the frontend synthesizes it as the graph root.
-export const HOME_ASSISTANT_NODE_ID = "ha";
-const HOME_ASSISTANT_LABEL = "Home Assistant";
-
-// 0 is never returned: a falsy link value re-enables the direction arrow
-// in ha-network-graph
-export const strengthToScale = (
-  strength?: MatterTopologyStrength | null
-): number => {
-  switch (strength) {
-    case "strong":
-      return 4;
-    case "medium":
-      return 3;
-    case "weak":
-      return 2;
-    default:
-      return 1;
-  }
-};
-
-export const strengthToColorVar = (
-  strength?: MatterTopologyStrength | null
-): string => {
-  switch (strength) {
-    case "strong":
-      return "--success-color";
-    case "medium":
-      return "--warning-color";
-    case "weak":
-      return "--error-color";
-    default:
-      return "--disabled-color";
-  }
-};
-
-const strengthToWidth = (strength?: MatterTopologyStrength | null): number =>
-  strength === "strong" ? 3 : strength === "medium" ? 2 : 1;
-
-export const getTopologyNodeCategory = (
-  node: MatterNetworkTopologyNode
-): number => {
-  if (node.kind === "border_router") {
-    return CATEGORY_BORDER_ROUTER;
-  }
-  if (node.kind === "wifi_ap") {
-    return CATEGORY_WIFI_AP;
-  }
-  if (node.kind === "thread_unknown") {
-    return CATEGORY_UNKNOWN;
-  }
-  if (node.available === false) {
-    return CATEGORY_OFFLINE;
-  }
-  return node.role && ROUTER_ROLES.has(node.role)
-    ? CATEGORY_ROUTER
-    : CATEGORY_END_DEVICE;
-};
-
-export const getTopologyNodeName = (
-  node: MatterNetworkTopologyNode,
-  hass: HomeAssistant
-): string => {
-  const device = node.ha_device_id
-    ? hass.devices[node.ha_device_id]
-    : undefined;
-  if (device) {
-    return device.name_by_user || device.name || node.id;
-  }
-  if (node.kind === "border_router") {
-    return (
-      [node.vendor_name, node.model_name].filter(Boolean).join(" ") ||
-      hass.localize("ui.panel.config.matter.visualization.border_router")
-    );
-  }
-  if (node.kind === "wifi_ap") {
-    return (
-      node.network_name ||
-      hass.localize("ui.panel.config.matter.visualization.wifi_ap")
-    );
-  }
-  if (node.kind === "thread_unknown") {
-    return hass.localize("ui.panel.config.matter.visualization.unknown_device");
-  }
-  if (node.node_id != null) {
-    return hass.localize("ui.panel.config.matter.visualization.node", {
-      node_id: node.node_id,
-    });
-  }
-  return node.id;
-};
-
-const isHub = (category: number): boolean =>
-  category === CATEGORY_BORDER_ROUTER || category === CATEGORY_WIFI_AP;
-
-export function createMatterNetworkChartData(
-  topology: MatterNetworkTopology,
-  hass: HomeAssistant,
-  element: Element
-): NetworkData {
-  const style = getComputedStyle(element);
-
-  const categoryColors = [
-    style.getPropertyValue("--primary-color"),
-    style.getPropertyValue("--deep-purple-color"),
-    style.getPropertyValue("--cyan-color"),
-    style.getPropertyValue("--teal-color"),
-    style.getPropertyValue("--indigo-color"),
-    style.getPropertyValue("--error-color"),
-    style.getPropertyValue("--disabled-color"),
-  ];
-  const categories = [
-    {
-      name: HOME_ASSISTANT_LABEL,
-      symbol: "roundRect",
-      itemStyle: { color: categoryColors[CATEGORY_HOME_ASSISTANT] },
-    },
-    {
-      name: hass.localize("ui.panel.config.matter.visualization.border_router"),
-      symbol: "roundRect",
-      itemStyle: { color: categoryColors[CATEGORY_BORDER_ROUTER] },
-    },
-    {
-      name: hass.localize("ui.panel.config.matter.visualization.router"),
-      symbol: "circle",
-      itemStyle: { color: categoryColors[CATEGORY_ROUTER] },
-    },
-    {
-      name: hass.localize("ui.panel.config.matter.visualization.end_device"),
-      symbol: "circle",
-      itemStyle: { color: categoryColors[CATEGORY_END_DEVICE] },
-    },
-    {
-      name: hass.localize("ui.panel.config.matter.visualization.wifi_ap"),
-      symbol: "roundRect",
-      itemStyle: { color: categoryColors[CATEGORY_WIFI_AP] },
-    },
-    {
-      name: hass.localize("ui.panel.config.matter.visualization.offline"),
-      symbol: "circle",
-      itemStyle: { color: categoryColors[CATEGORY_OFFLINE] },
-    },
-    {
-      name: hass.localize(
-        "ui.panel.config.matter.visualization.unknown_devices"
-      ),
-      symbol: "circle",
-      itemStyle: { color: categoryColors[CATEGORY_UNKNOWN] },
-    },
-  ];
-
-  const threadNetworks = new Set(
-    topology.nodes.map((node) => node.ext_pan_id).filter(Boolean)
-  );
-  const multiNetwork = threadNetworks.size > 1;
-
-  const nodes: NetworkNode[] = [
-    {
-      id: HOME_ASSISTANT_NODE_ID,
-      name: HOME_ASSISTANT_LABEL,
-      category: CATEGORY_HOME_ASSISTANT,
-      value: 4,
-      symbol: "roundRect",
-      symbolSize: 45,
-      polarDistance: 0,
-      fixed: true,
-      itemStyle: { color: categoryColors[CATEGORY_HOME_ASSISTANT] },
-    },
-  ];
-  const nodeCategories = new Map<string, number>();
-  topology.nodes.forEach((node) => {
-    const category = getTopologyNodeCategory(node);
-    nodeCategories.set(node.id, category);
-    const device = node.ha_device_id
-      ? hass.devices[node.ha_device_id]
-      : undefined;
-    const area = device ? getDeviceArea(device, hass.areas) : undefined;
-    const contextParts: string[] = [];
-    if (area) {
-      contextParts.push(area.name);
-    }
-    if ((multiNetwork || !area) && node.network_name) {
-      contextParts.push(node.network_name);
-    }
-    nodes.push({
-      id: node.id,
-      name: getTopologyNodeName(node, hass),
-      context: contextParts.join(" • ") || undefined,
-      category,
-      value: isHub(category) ? 3 : category === CATEGORY_ROUTER ? 2 : 1,
-      symbol: isHub(category) ? "roundRect" : "circle",
-      symbolSize: isHub(category) ? 40 : category === CATEGORY_ROUTER ? 30 : 20,
-      itemStyle: {
-        color: categoryColors[category],
-        ...(node.role === "leader"
-          ? {
-              borderColor: style.getPropertyValue("--primary-color"),
-              borderWidth: 2,
-            }
-          : {}),
-      },
-      polarDistance: isHub(category)
-        ? 0.1
-        : category === CATEGORY_ROUTER
-          ? 0.4
-          : 0.8,
-    });
-  });
-
-  const links: NetworkLink[] = [];
-  topology.connections.forEach((conn) => {
-    if (!nodeCategories.has(conn.source) || !nodeCategories.has(conn.target)) {
-      return;
-    }
-    let { source, target } = conn;
-    let forward = conn.source_to_target;
-    let reverse = conn.target_to_source;
-    if (!forward && reverse) {
-      // normalize so the arrow points in the observed direction
-      [source, target] = [target, source];
-      forward = reverse;
-      reverse = undefined;
-    }
-    const oneWay = Boolean(forward) && !reverse;
-    const asymmetric =
-      forward && reverse && forward.strength !== reverse.strength;
-    const width = strengthToWidth(conn.strength);
-    links.push({
-      source,
-      target,
-      value: strengthToScale(forward?.strength ?? conn.strength),
-      // route-table edges without per-direction info are not directional
-      reverseValue: oneWay
-        ? undefined
-        : strengthToScale(reverse?.strength ?? conn.strength),
-      symbolSize: oneWay ? width * 2 + 3 : undefined,
-      lineStyle: {
-        width,
-        color: style.getPropertyValue(strengthToColorVar(conn.strength)),
-        type:
-          oneWay || asymmetric
-            ? "dashed"
-            : !forward && conn.via_route_table
-              ? "dotted"
-              : "solid",
-      },
-      ignoreForceLayout: !(
-        isHub(nodeCategories.get(source)!) || isHub(nodeCategories.get(target)!)
-      ),
-    });
-  });
-
-  const haLink = (target: string): NetworkLink => ({
-    source: HOME_ASSISTANT_NODE_ID,
-    target,
-    value: 0,
-    symbol: "none",
-    lineStyle: {
-      width: 3,
-      color: categoryColors[CATEGORY_HOME_ASSISTANT],
-    },
-  });
-
-  // HA reaches the mesh through the border routers and Wi-Fi access points
-  const hubIds = topology.nodes
-    .filter((node) => node.kind === "border_router" || node.kind === "wifi_ap")
-    .map((node) => node.id);
-  hubIds.forEach((id) => links.push(haLink(id)));
-
-  // any node group without a border router / AP is linked straight to HA so
-  // it never floats free (HA has a direct operational path to every node)
-  const adjacency = new Map<string, Set<string>>();
-  topology.nodes.forEach((node) => adjacency.set(node.id, new Set()));
-  links.forEach((link) => {
-    if (link.source === HOME_ASSISTANT_NODE_ID) {
-      return;
-    }
-    adjacency.get(link.source)?.add(link.target);
-    adjacency.get(link.target)?.add(link.source);
-  });
-  const hubIdSet = new Set(hubIds);
-  const visited = new Set<string>();
-  topology.nodes.forEach((startNode) => {
-    if (visited.has(startNode.id)) {
-      return;
-    }
-    const component: string[] = [];
-    const queue = [startNode.id];
-    visited.add(startNode.id);
-    while (queue.length) {
-      const id = queue.shift()!;
-      component.push(id);
-      adjacency.get(id)?.forEach((next) => {
-        if (!visited.has(next)) {
-          visited.add(next);
-          queue.push(next);
-        }
-      });
-    }
-    if (component.some((id) => hubIdSet.has(id))) {
-      return;
-    }
-    const candidates = component.filter(
-      (id) => nodeCategories.get(id) !== CATEGORY_UNKNOWN
-    );
-    const representative = (candidates.length ? candidates : component).sort(
-      (a, b) => (adjacency.get(b)?.size ?? 0) - (adjacency.get(a)?.size ?? 0)
-    )[0];
-    if (representative) {
-      links.push(haLink(representative));
-    }
-  });
-
-  // keep the strongest link of every node in the force layout so
-  // nodes hang near their best connection instead of floating free
-  nodes.forEach((node) => {
-    let bestLink: NetworkLink | undefined;
-    const hasActiveLink = links.some((link) => {
-      if (link.source !== node.id && link.target !== node.id) {
-        return false;
-      }
-      if (!link.ignoreForceLayout) {
-        return true;
-      }
-      const linkValue = Math.max(link.value ?? 0, link.reverseValue ?? 0);
-      if (
-        linkValue >
-        Math.max(bestLink?.value ?? -1, bestLink?.reverseValue ?? -1)
-      ) {
-        bestLink = link;
-      }
-      return false;
-    });
-    if (!hasActiveLink && bestLink) {
-      bestLink.ignoreForceLayout = false;
-    }
-  });
-
-  return { nodes, links, categories };
-}
@@ -1,515 +0,0 @@
-import { mdiRefresh } from "@mdi/js";
-import type {
-  CallbackDataParams,
-  TopLevelFormatterParams,
-} from "echarts/types/dist/shared";
-import type { UnsubscribeFunc } from "home-assistant-js-websocket";
-import type { CSSResultGroup, TemplateResult } from "lit";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { relativeTime } from "../../../../../common/datetime/relative_time";
-import { getDeviceArea } from "../../../../../common/entity/context/get_device_context";
-import { navigate } from "../../../../../common/navigate";
-import type { LocalizeKeys } from "../../../../../common/translations/localize";
-import { throttle } from "../../../../../common/util/throttle";
-import "../../../../../components/chart/ha-network-graph";
-import "../../../../../components/ha-alert";
-import "../../../../../components/ha-icon-button";
-import "../../../../../components/ha-spinner";
-import "../../../../../components/input/ha-input-search";
-import type { HaInputSearch } from "../../../../../components/input/ha-input-search";
-import type {
-  MatterNetworkTopology,
-  MatterNetworkTopologyConnection,
-  MatterNetworkTopologyNode,
-  MatterTopologyDirectionInfo,
-} from "../../../../../data/matter";
-import {
-  fetchMatterNetworkTopology,
-  subscribeMatterNetworkTopology,
-} from "../../../../../data/matter";
-import "../../../../../layouts/hass-subpage";
-import type { HomeAssistant, Route } from "../../../../../types";
-import {
-  createMatterNetworkChartData,
-  HOME_ASSISTANT_NODE_ID,
-} from "./matter-network-data";
-
-const UPDATE_THROTTLE_TIME = 5000;
-
-@customElement("matter-network-visualization")
-export class MatterNetworkVisualization extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ type: Boolean, reflect: true }) public narrow = false;
-
-  @property({ attribute: "is-wide", type: Boolean }) public isWide = false;
-
-  @property({ attribute: false }) public route!: Route;
-
-  @state() private _topology?: MatterNetworkTopology;
-
-  @state() private _notSupported = false;
-
-  @state() private _error?: string;
-
-  @state() private _refreshing = false;
-
-  @state() private _searchFilter = "";
-
-  private _unsub?: Promise<UnsubscribeFunc>;
-
-  private _throttledUpdateTopology = throttle(
-    (topology: MatterNetworkTopology) => {
-      this._topology = topology;
-    },
-    UPDATE_THROTTLE_TIME
-  );
-
-  public connectedCallback(): void {
-    super.connectedCallback();
-    if (this.hass && !this._unsub) {
-      this._subscribe();
-    }
-  }
-
-  public disconnectedCallback(): void {
-    super.disconnectedCallback();
-    this._throttledUpdateTopology.cancel();
-    if (this._unsub) {
-      this._unsub.then((unsub) => unsub()).catch(() => undefined);
-      this._unsub = undefined;
-    }
-  }
-
-  private _subscribe(): void {
-    this._unsub = subscribeMatterNetworkTopology(this.hass, (topology) => {
-      if (!this._topology) {
-        this._topology = topology;
-      } else {
-        this._throttledUpdateTopology(topology);
-      }
-    });
-    this._unsub.catch((err: { code?: string; message?: string }) => {
-      this._unsub = undefined;
-      if (err?.code === "not_supported" || err?.code === "unknown_command") {
-        this._notSupported = true;
-      } else {
-        this._error = err?.message || String(err);
-      }
-    });
-  }
-
-  protected render() {
-    return html`
-      <hass-subpage
-        .hass=${this.hass}
-        .narrow=${this.narrow}
-        .header=${this.hass.localize(
-          "ui.panel.config.matter.visualization.header"
-        )}
-        back-path="/config/matter/dashboard"
-      >
-        ${
-          this.narrow && this._topology?.nodes.length
-            ? html`<div slot="header">${this._renderInputSearch()}</div>`
-            : nothing
-        }
-        ${this._renderContent()}
-      </hass-subpage>
-    `;
-  }
-
-  private _renderContent() {
-    if (this._notSupported) {
-      return html`<div class="center">
-        <ha-alert alert-type="info">
-          ${this.hass.localize(
-            "ui.panel.config.matter.visualization.not_supported"
-          )}
-        </ha-alert>
-      </div>`;
-    }
-    if (this._error) {
-      return html`<div class="center">
-        <ha-alert alert-type="error">
-          ${this.hass.localize(
-            "ui.panel.config.matter.visualization.error_loading",
-            { error: this._error }
-          )}
-        </ha-alert>
-      </div>`;
-    }
-    if (!this._topology) {
-      return html`<div class="center"><ha-spinner></ha-spinner></div>`;
-    }
-    if (!this._topology.nodes.length) {
-      return html`<div class="center empty">
-        ${this.hass.localize("ui.panel.config.matter.visualization.empty")}
-      </div>`;
-    }
-    return html`
-      <ha-network-graph
-        .hass=${this.hass}
-        .searchFilter=${this._searchFilter}
-        .data=${this._formatNetworkData(
-          this._topology,
-          this.hass.devices,
-          this.hass.areas,
-          this.hass.themes,
-          this.hass.language
-        )}
-        .searchableAttributes=${this._getSearchableAttributes}
-        .tooltipFormatter=${this._tooltipFormatter}
-        @chart-click=${this._handleChartClick}
-      >
-        ${!this.narrow ? this._renderInputSearch("search") : nothing}
-        <ha-icon-button
-          slot="button"
-          class="refresh-button"
-          .disabled=${this._refreshing}
-          .path=${mdiRefresh}
-          @click=${this._refreshTopology}
-          label=${this.hass.localize(
-            "ui.panel.config.matter.visualization.refresh_topology"
-          )}
-        ></ha-icon-button>
-      </ha-network-graph>
-    `;
-  }
-
-  private _renderInputSearch(slot = "") {
-    return html`<ha-input-search
-      appearance="outlined"
-      slot=${slot}
-      .value=${this._searchFilter}
-      @input=${this._handleSearchChange}
-    ></ha-input-search>`;
-  }
-
-  private _handleSearchChange(ev: InputEvent): void {
-    this._searchFilter = (ev.target as HaInputSearch).value ?? "";
-  }
-
-  private async _refreshTopology(): Promise<void> {
-    if (this._refreshing) {
-      return;
-    }
-    this._refreshing = true;
-    try {
-      this._topology = await fetchMatterNetworkTopology(this.hass, true);
-    } catch (err: unknown) {
-      this._error = (err as { message?: string })?.message || String(err);
-    } finally {
-      this._refreshing = false;
-    }
-  }
-
-  private _formatNetworkData = memoizeOne(
-    (
-      topology: MatterNetworkTopology,
-      _devices: HomeAssistant["devices"],
-      _areas: HomeAssistant["areas"],
-      // node/link colors and labels also depend on the theme and language,
-      // so both take part in the cache key even though they are read via hass
-      _themes: HomeAssistant["themes"],
-      _language: HomeAssistant["language"]
-    ) => createMatterNetworkChartData(topology, this.hass, this)
-  );
-
-  private _getTopologyNode(id: string): MatterNetworkTopologyNode | undefined {
-    return this._topology?.nodes.find((node) => node.id === id);
-  }
-
-  private _getConnection(
-    source: string,
-    target: string
-  ): MatterNetworkTopologyConnection | undefined {
-    return this._topology?.connections.find(
-      (conn) =>
-        (conn.source === source && conn.target === target) ||
-        (conn.source === target && conn.target === source)
-    );
-  }
-
-  private _getNodeName(id: string): string {
-    const node = this._getTopologyNode(id);
-    if (!node) {
-      return id;
-    }
-    const device = node.ha_device_id
-      ? this.hass.devices[node.ha_device_id]
-      : undefined;
-    if (device) {
-      return device.name_by_user || device.name || id;
-    }
-    if (node.kind === "border_router") {
-      return (
-        [node.vendor_name, node.model_name].filter(Boolean).join(" ") ||
-        this.hass.localize("ui.panel.config.matter.visualization.border_router")
-      );
-    }
-    if (node.kind === "wifi_ap") {
-      return (
-        node.network_name ||
-        this.hass.localize("ui.panel.config.matter.visualization.wifi_ap")
-      );
-    }
-    if (node.kind === "thread_unknown") {
-      return this.hass.localize(
-        "ui.panel.config.matter.visualization.unknown_device"
-      );
-    }
-    if (node.node_id != null) {
-      return this.hass.localize("ui.panel.config.matter.visualization.node", {
-        node_id: node.node_id,
-      });
-    }
-    return id;
-  }
-
-  private _getSearchableAttributes = (nodeId: string): string[] => {
-    const node = this._getTopologyNode(nodeId);
-    if (!node) {
-      return [];
-    }
-    const attributes: string[] = [];
-    if (node.node_id != null) {
-      attributes.push(String(node.node_id));
-    }
-    if (node.network_name) {
-      attributes.push(node.network_name);
-    }
-    if (node.ext_address) {
-      attributes.push(node.ext_address);
-    }
-    if (node.vendor_name) {
-      attributes.push(node.vendor_name);
-    }
-    if (node.model_name) {
-      attributes.push(node.model_name);
-    }
-    const device = node.ha_device_id
-      ? this.hass.devices[node.ha_device_id]
-      : undefined;
-    if (device?.manufacturer) {
-      attributes.push(device.manufacturer);
-    }
-    if (device?.model) {
-      attributes.push(device.model);
-    }
-    device?.connections.forEach((connection) => {
-      attributes.push(connection[1]);
-    });
-    return attributes;
-  };
-
-  private _localizeDynamic(prefix: string, value: string): string {
-    return (
-      this.hass.localize(
-        `ui.panel.config.matter.${prefix}.${value}` as LocalizeKeys
-      ) || value
-    );
-  }
-
-  private _formatDirection(direction: MatterTopologyDirectionInfo): string {
-    const strength = this._localizeDynamic(
-      "visualization.strength",
-      direction.strength
-    );
-    if (direction.lqi != null) {
-      return `${strength} (LQI ${direction.lqi})`;
-    }
-    if (direction.rssi != null) {
-      return `${strength} (RSSI ${direction.rssi} dBm)`;
-    }
-    return strength;
-  }
-
-  private _tooltipFormatter = (params: TopLevelFormatterParams) => {
-    const { dataType, data } = params as CallbackDataParams;
-    if (dataType === "edge") {
-      const { source, target } = data as { source: string; target: string };
-      const conn = this._getConnection(source, target);
-      if (!conn) {
-        return nothing;
-      }
-      const lines: TemplateResult[] = [];
-      if (conn.source_to_target) {
-        lines.push(
-          html`<br />${this._getNodeName(conn.source)} →
-            ${this._getNodeName(conn.target)}:
-            ${this._formatDirection(conn.source_to_target)}`
-        );
-      }
-      if (conn.target_to_source) {
-        lines.push(
-          html`<br />${this._getNodeName(conn.target)} →
-            ${this._getNodeName(conn.source)}:
-            ${this._formatDirection(conn.target_to_source)}`
-        );
-      }
-      if (!lines.length && conn.via_route_table) {
-        lines.push(
-          html`<br />${this.hass.localize(
-              "ui.panel.config.matter.visualization.via_route_table"
-            )}`
-        );
-      }
-      return html`<b
-          >${this._getNodeName(conn.source)} ↔
-          ${this._getNodeName(conn.target)}</b
-        >${lines}`;
-    }
-    const { id } = data as { id: string };
-    if (id === HOME_ASSISTANT_NODE_ID) {
-      return html`<b>Home Assistant</b>`;
-    }
-    const node = this._getTopologyNode(id);
-    if (!node) {
-      return nothing;
-    }
-    const device = node.ha_device_id
-      ? this.hass.devices[node.ha_device_id]
-      : undefined;
-    const area = device ? getDeviceArea(device, this.hass.areas) : undefined;
-    const lines: TemplateResult[] = [];
-    if (node.node_id != null) {
-      lines.push(
-        html`<br /><b
-            >${this.hass.localize(
-              "ui.panel.config.matter.visualization.node_id"
-            )}:</b
-          >
-          ${node.node_id}`
-      );
-    }
-    lines.push(
-      html`<br /><b
-          >${this.hass.localize(
-            "ui.panel.config.matter.visualization.network"
-          )}:</b
-        >
-        ${this._localizeDynamic("network_type", node.network_type)}${
-          node.network_name ? html` (${node.network_name})` : nothing
-        }`
-    );
-    if (node.role) {
-      lines.push(
-        html`<br /><b
-            >${this.hass.localize(
-              "ui.panel.config.matter.visualization.role"
-            )}:</b
-          >
-          ${this._localizeDynamic("visualization.roles", node.role)}`
-      );
-    }
-    if (node.available != null) {
-      lines.push(
-        html`<br /><b
-            >${this.hass.localize(
-              "ui.panel.config.matter.visualization.status"
-            )}:</b
-          >
-          ${this.hass.localize(
-            node.available
-              ? "ui.panel.config.matter.visualization.online"
-              : "ui.panel.config.matter.visualization.offline"
-          )}`
-      );
-    }
-    if (device?.manufacturer || node.vendor_name) {
-      lines.push(
-        html`<br /><b
-            >${this.hass.localize(
-              "ui.panel.config.matter.visualization.manufacturer"
-            )}:</b
-          >
-          ${device?.manufacturer || node.vendor_name}`
-      );
-    }
-    if (device?.model || node.model_name) {
-      lines.push(
-        html`<br /><b
-            >${this.hass.localize(
-              "ui.panel.config.matter.visualization.model"
-            )}:</b
-          >
-          ${device?.model || node.model_name}`
-      );
-    }
-    if (area) {
-      lines.push(
-        html`<br /><b
-            >${this.hass.localize(
-              "ui.panel.config.matter.visualization.area"
-            )}:</b
-          >
-          ${area.name}`
-      );
-    }
-    if (node.last_seen != null) {
-      lines.push(
-        html`<br /><b
-            >${this.hass.localize(
-              "ui.panel.config.matter.visualization.last_seen"
-            )}:</b
-          >
-          ${relativeTime(new Date(node.last_seen), this.hass.locale)}`
-      );
-    }
-    return html`<b>${this._getNodeName(id)}</b>${lines}`;
-  };
-
-  private _handleChartClick(e: CustomEvent): void {
-    if (
-      e.detail.dataType === "node" &&
-      e.detail.event.target.cursor === "pointer"
-    ) {
-      const { id } = e.detail.data;
-      const node = this._getTopologyNode(id);
-      if (node?.ha_device_id) {
-        navigate(`/config/devices/device/${node.ha_device_id}`);
-      }
-    }
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      css`
-        ha-network-graph {
-          height: 100%;
-        }
-        [slot="header"] {
-          display: flex;
-          align-items: center;
-        }
-        ha-input-search {
-          flex: 1;
-        }
-        .center {
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          height: 100%;
-          padding: var(--ha-space-4);
-          box-sizing: border-box;
-        }
-        ha-alert {
-          max-width: 500px;
-        }
-        .empty {
-          color: var(--secondary-text-color);
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "matter-network-visualization": MatterNetworkVisualization;
-  }
-}
@@ -19,7 +19,11 @@ import {
  HTTP_CONFIG_FIELDS,
  saveHttpConfig,
 } from "../../../data/http";
-import type { HttpConfig } from "../../../data/http";
+import type {
+  ActiveConfigType,
+  HttpConfig,
+  HttpConfigWithMeta,
+} from "../../../data/http";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
@@ -161,6 +165,11 @@ class HaConfigHttpForm extends LitElement {

  @state() private _showNoChanges = false;

+  @state() private _activeConfigType?: ActiveConfigType;
+
+  // A pending config that was reverted/failed and kept only for display.
+  @state() private _revertedPending?: HttpConfigWithMeta;
+
  @query("ha-form") private _form?: HaForm;

  @query("ha-alert") private _firstAlert?: HTMLElement;
@@ -201,6 +210,40 @@ class HaConfigHttpForm extends LitElement {
          <p class="description">
            ${this.hass.localize("ui.panel.config.network.http.description")}
          </p>
+          ${
+            this._activeConfigType === "default"
+              ? html`
+                  <ha-alert alert-type="warning">
+                    ${this.hass.localize(
+                      "ui.panel.config.network.http.running_default"
+                    )}
+                  </ha-alert>
+                `
+              : nothing
+          }
+          ${
+            this._revertedPending
+              ? html`
+                  <ha-alert alert-type="warning">
+                    ${
+                      this._revertedPending.error === "not_promoted"
+                        ? this.hass.localize(
+                            "ui.panel.config.network.http.reverted_not_confirmed"
+                          )
+                        : this.hass.localize(
+                            "ui.panel.config.network.http.reverted_failed",
+                            { error: this._revertedPending.error ?? "" }
+                          )
+                    }
+                    <ha-button slot="action" @click=${this._reviewReverted}>
+                      ${this.hass.localize(
+                        "ui.panel.config.network.http.reverted_action"
+                      )}
+                    </ha-button>
+                  </ha-alert>
+                `
+              : nothing
+          }
          ${
            portChanged
              ? html`
@@ -266,16 +309,30 @@ class HaConfigHttpForm extends LitElement {

  private async _fetchConfig(): Promise<void> {
    try {
-      // Pending is exclusively handled by the global confirm/revert dialog, so
-      // the form only ever displays stable.
-      const { stable } = await fetchHttpConfig(this.hass);
+      const { stable, pending, active_config_type } = await fetchHttpConfig(
+        this.hass
+      );
      this._stable = stable;
      this._config = { ...stable };
+      this._activeConfigType = active_config_type;
+      // An active trial pending (no error) is handled by the global
+      // confirm/revert dialog. A pending carrying an error was reverted or
+      // failed to apply and is kept only so we can surface it here.
+      this._revertedPending = pending?.error ? pending : undefined;
    } catch (err: any) {
      this._error = err.message;
    }
  }

+  private _reviewReverted(): void {
+    if (!this._revertedPending) {
+      return;
+    }
+    // Load the reverted values into the form so the user can fix and re-save.
+    this._config = { ...this._revertedPending };
+    this._revertedPending = undefined;
+  }
+
  private _computeLabel = (
    schema: SchemaUnion<ReturnType<typeof SCHEMA>>
  ): string => {
@@ -156,7 +156,6 @@ class MoveDatadiskDialog extends DirtyStateProviderMixin<MoveDatadiskFormState>(
                  .label=${this.hass.localize(
                    "ui.panel.config.storage.datadisk.select_device"
                  )}
-                  .value=${this._selectedDevice}
                  @selected=${this._selectDevice}
                  .options=${this._disks.map((disk) => ({
                    value: disk.id,
@@ -179,16 +179,6 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {

    const anyExposed = uiExposed || manExposedAlexa || manExposedGoogle;

-    const exposedToAlexa =
-      showAssistants.includes("cloud.alexa") &&
-      (alexaManual ? manExposedAlexa : this.exposed["cloud.alexa"]);
-    const exposedToGoogle =
-      showAssistants.includes("cloud.google_assistant") &&
-      (googleManual
-        ? manExposedGoogle
-        : this.exposed["cloud.google_assistant"]);
-    const exposedToAssist = this.exposed.conversation;
-
    return html`
      <ha-md-list-item>
        <h3 slot="headline">
@@ -285,24 +275,7 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
      </h3>

      <p class="description">
-        ${[
-          this.hass.localize("ui.dialogs.voice-settings.aliases_description"),
-          exposedToAlexa &&
-            this.hass.localize(
-              "ui.dialogs.voice-settings.aliases_description_alexa"
-            ),
-          exposedToGoogle &&
-            this.hass.localize(
-              "ui.dialogs.voice-settings.aliases_description_google"
-            ),
-          exposedToAssist &&
-            (exposedToAlexa || exposedToGoogle) &&
-            this.hass.localize(
-              "ui.dialogs.voice-settings.aliases_description_assist"
-            ),
-        ]
-          .filter(Boolean)
-          .join(" ")}
+        ${this.hass.localize("ui.dialogs.voice-settings.aliases_description")}
      </p>

      ${
@@ -866,10 +866,7 @@ class HaLogbookEntry extends LitElement {

        .primary {
          display: flex;
-          /* Baseline-align so a wrapped multi-line value keeps the subject and
-             the trailing time on its first line, while a single-line entry
-             stays aligned with the text. */
-          align-items: baseline;
+          align-items: center;
          gap: var(--ha-space-2);
          color: var(--primary-text-color);
        }
@@ -881,9 +878,9 @@ class HaLogbookEntry extends LitElement {
        .primary-text {
          flex: 1;
          min-width: 0;
-          /* Wrap long entries onto multiple lines instead of truncating them to
-             a single line with an ellipsis. */
-          overflow-wrap: anywhere;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
        }

        .primary > .subject {
@@ -908,12 +905,13 @@ class HaLogbookEntry extends LitElement {
        }

        .value {
-          /* Don't shrink: the subject absorbs truncation so a short state stays
-             whole. A long value wraps within its max-width instead of being cut
-             off. */
+          /* Don't shrink: the subject absorbs all truncation so a short state
+             stays whole. max-width still caps a long one. */
          flex: 0 0 auto;
          max-width: 60%;
-          overflow-wrap: anywhere;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
          text-align: end;
        }

@@ -36,30 +36,6 @@ const MEASUREMENT_VARIANTS: Variant[] = [
  },
 ];

-const MEASUREMENT_ANGLE_VARIANTS: Variant[] = [
-  {
-    labelKey: "last_24h",
-    days_to_show: 1,
-    period: "hour",
-    chart_type: "line",
-    stat_types: ["mean"],
-  },
-  {
-    labelKey: "last_7d",
-    days_to_show: 7,
-    period: "day",
-    chart_type: "line",
-    stat_types: ["mean"],
-  },
-  {
-    labelKey: "last_30d",
-    days_to_show: 30,
-    period: "day",
-    chart_type: "line",
-    stat_types: ["mean"],
-  },
-];
-
 const TOTAL_VARIANTS: Variant[] = [
  {
    labelKey: "last_7d",
@@ -84,13 +60,6 @@ const TOTAL_VARIANTS: Variant[] = [
  },
 ];

-const VARIANTS_BY_STATE_CLASS: Record<string, Variant[]> = {
-  measurement: MEASUREMENT_VARIANTS,
-  measurement_angle: MEASUREMENT_ANGLE_VARIANTS,
-  total: TOTAL_VARIANTS,
-  total_increasing: TOTAL_VARIANTS,
-};
-
 export const statisticsGraphCardSuggestions: CardSuggestionProvider<StatisticsGraphCardConfig> =
  {
    getEntitySuggestion(hass, entityId) {
@@ -98,8 +67,8 @@ export const statisticsGraphCardSuggestions: CardSuggestionProvider<StatisticsGr
      const stateObj = hass.states[entityId];
      const stateClass = stateObj?.attributes.state_class;
      if (!stateClass) return null;
-      const variants = VARIANTS_BY_STATE_CLASS[stateClass];
-      if (!variants) return null;
+      const variants =
+        stateClass === "measurement" ? MEASUREMENT_VARIANTS : TOTAL_VARIANTS;
      const suggestions: CardSuggestion<StatisticsGraphCardConfig>[] =
        variants.map((v) => ({
          label: hass.localize(`${LABEL_PREFIX}${v.labelKey}` as any),
@@ -521,7 +521,7 @@ export function generateEnergyDevicesDetailGraphData(
    true,
    generateFillBuckets(datasets, start, end, getSuggestedPeriod(start, end))
  );
-  const yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax, true);
+  const yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax);

  return {
    chartData: datasets,
@@ -119,7 +119,7 @@ export function generateEnergyGasGraphData(
    true,
    generateFillBuckets(datasets, start, end, period)
  );
-  const yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax, true);
+  const yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax);
  const chartData = datasets;
  const total = processTotal(energyData.stats, gasSources);

@@ -146,7 +146,7 @@ export function generateEnergySolarGraphData(
    end,
    compareStart,
    compareEnd,
-    yAxisFractionDigits: computeYAxisFractionDigits(yMin, yMax, true),
+    yAxisFractionDigits: computeYAxisFractionDigits(yMin, yMax),
  };
 }

--- a/Show More
+++ b/Show More