Add X-Speech-Options header

Add options dict
2026-04-20 00:19:02 +02:00 · 2026-03-09 14:31:49 -05:00 · 2026-03-09 14:14:50 -05:00
3112 changed files with 63855 additions and 190500 deletions
--- a/.claude/skills/integrations/SKILL.md
+++ b/.claude/skills/integrations/SKILL.md
@@ -620,14 +620,12 @@ rules:

 ### Config Flow Testing
 - **100% Coverage Required**: All config flow paths must be tested
- **Patch Boundaries**: Only patch library or client methods when testing config flows. Do not patch methods defined in `config_flow.py`; exercise the flow logic end-to-end.
 - **Test Scenarios**:
  - All flow initiation methods (user, discovery, import)
  - Successful configuration paths
  - Error recovery scenarios
  - Prevention of duplicate entries
  - Flow completion after errors
-  - Reauthentication/reconfigure flows

 ### Testing
 - **Integration-specific tests** (recommended):
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,7 +16,6 @@ Dockerfile.dev linguist-language=Dockerfile
 CODEOWNERS linguist-generated=true
 Dockerfile linguist-generated=true
 homeassistant/generated/*.py linguist-generated=true
-machine/* linguist-generated=true
 mypy.ini linguist-generated=true
 requirements.txt linguist-generated=true
 requirements_all.txt linguist-generated=true
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,12 +1,6 @@
 <!-- Automatically generated by gen_copilot_instructions.py, do not edit -->


-
-# Copilot code review instructions
-
- Start review comments with a short, one-sentence summary of the suggested fix.
- Do not add comments about code style, formatting or linting issues.
-
 # GitHub Copilot & Claude Code Instructions

 This repository contains the core of Home Assistant, a Python 3 based home automation application.
@@ -24,11 +18,6 @@ This repository contains the core of Home Assistant, a Python 3 based home autom

 - Python 3.14 explicitly allows `except TypeA, TypeB:` without parentheses.

-## Testing
-
-When writing or modifying tests, ensure all test function parameters have type annotations.
-Prefer concrete types (for example, `HomeAssistant`, `MockConfigEntry`, etc.) over `Any`.
-
 ## Good practices

 Integrations with Platinum or Gold level in the Integration Quality Scale reflect a high standard of code quality and maintainability. When looking for examples of something, these are good places to start. The level is indicated in the manifest.json of the integration.
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -35,7 +35,6 @@ jobs:
      channel: ${{ steps.version.outputs.channel }}
      publish: ${{ steps.version.outputs.publish }}
      architectures: ${{ env.ARCHITECTURES }}
-      base_image_version: ${{ env.BASE_IMAGE_VERSION }}
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -49,7 +48,7 @@ jobs:

      - name: Get information
        id: info
-        uses: home-assistant/actions/helpers/info@5f5b077d63a1e4c53019231409a0c4d791fb74e5 # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/info@master # zizmor: ignore[unpinned-uses]

      - name: Get version
        id: version
@@ -73,7 +72,7 @@ jobs:
      - name: Download Translations
        run: python3 -m script.translations download
        env:
-          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} # zizmor: ignore[secrets-outside-env]
+          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}

      - name: Archive translations
        shell: bash
@@ -101,7 +100,7 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
        include:
          - arch: amd64
-            os: ubuntu-24.04
+            os: ubuntu-latest
          - arch: aarch64
            os: ubuntu-24.04-arm
    steps:
@@ -182,7 +181,7 @@ jobs:
          fi

      - name: Download translations
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: translations

@@ -196,20 +195,77 @@ jobs:
        run: |
          echo "${GITHUB_SHA};${GITHUB_REF};${GITHUB_EVENT_NAME};${GITHUB_ACTOR}" > rootfs/OFFICIAL_IMAGE

-      - name: Build base image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
        with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          cosign-base-identity: "https://github.com/home-assistant/docker/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          image: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant
-          image-tags: ${{ needs.init.outputs.version }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+        with:
+          cosign-release: "v2.5.3"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+
+      - name: Build variables
+        id: vars
+        shell: bash
+        env:
+          ARCH: ${{ matrix.arch }}
+        run: |
+          echo "base_image=ghcr.io/home-assistant/${ARCH}-homeassistant-base:${BASE_IMAGE_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "cache_image=ghcr.io/home-assistant/${ARCH}-homeassistant:latest" >> "$GITHUB_OUTPUT"
+          echo "created=$(date --rfc-3339=seconds --utc)" >> "$GITHUB_OUTPUT"
+
+      - name: Verify base image signature
+        env:
+          BASE_IMAGE: ${{ steps.vars.outputs.base_image }}
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/docker/.*" \
+            "${BASE_IMAGE}"
+
+      - name: Verify cache image signature
+        id: cache
+        continue-on-error: true
+        env:
+          CACHE_IMAGE: ${{ steps.vars.outputs.cache_image }}
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/core/.*" \
+            "${CACHE_IMAGE}"
+
+      - name: Build base image
+        id: build
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: ${{ steps.vars.outputs.platform }}
          push: true
-          version: ${{ needs.init.outputs.version }}
+          cache-from: ${{ steps.cache.outcome == 'success' && steps.vars.outputs.cache_image || '' }}
+          build-args: |
+            BUILD_FROM=${{ steps.vars.outputs.base_image }}
+          tags: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
+          outputs: type=image,push=true,compression=zstd,compression-level=9,force-compression=true,oci-mediatypes=true
+          labels: |
+            io.hass.arch=${{ matrix.arch }}
+            io.hass.version=${{ needs.init.outputs.version }}
+            org.opencontainers.image.created=${{ steps.vars.outputs.created }}
+            org.opencontainers.image.version=${{ needs.init.outputs.version }}
+
+      - name: Sign image
+        env:
+          ARCH: ${{ matrix.arch }}
+          VERSION: ${{ needs.init.outputs.version }}
+          DIGEST: ${{ steps.build.outputs.digest }}
+        run: |
+          cosign sign --yes "ghcr.io/home-assistant/${ARCH}-homeassistant:${VERSION}@${DIGEST}"

  build_machine:
    name: Build ${{ matrix.machine }} machine core image
@@ -224,6 +280,7 @@ jobs:
      matrix:
        machine:
          - generic-x86-64
+          - intel-nuc
          - khadas-vim3
          - odroid-c2
          - odroid-c4
@@ -247,44 +304,45 @@ jobs:
          - machine: qemux86-64
            arch: amd64
            runs-on: ubuntu-24.04
+          # TODO: remove, intel-nuc is a legacy name for x86-64, renamed in 2021
+          - machine: intel-nuc
+            arch: amd64
+            runs-on: ubuntu-24.04
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

-      - name: Compute extra tags
-        id: tags
-        shell: bash
+      - name: Set build additional args
        env:
          VERSION: ${{ needs.init.outputs.version }}
        run: |
+          # Create general tags
          if [[ "${VERSION}" =~ d ]]; then
-            echo "extra_tags=dev" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag dev" >> $GITHUB_ENV
          elif [[ "${VERSION}" =~ b ]]; then
-            echo "extra_tags=beta" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag beta" >> $GITHUB_ENV
          else
-            echo "extra_tags=stable" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
          fi

-      - name: Build machine image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
        with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          context: machine/
-          cosign-base-identity: "https://github.com/home-assistant/core/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          file: machine/${{ matrix.machine }}
-          image: ghcr.io/home-assistant/${{ matrix.machine }}-homeassistant
-          image-tags: |
-            ${{ needs.init.outputs.version }}
-            ${{ steps.tags.outputs.extra_tags }}
-          push: true
-          version: ${{ needs.init.outputs.version }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build base image
+        uses: home-assistant/builder@6cb4fd3d1338b6e22d0958a4bcb53e0965ea63b4 # 2026.02.1
+        with:
+          image: ${{ matrix.arch }}
+          args: |
+            $BUILD_ARGS \
+            --target /data/machine \
+            --cosign \
+            --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"

  publish_ha:
    name: Publish version files
@@ -342,19 +400,19 @@ jobs:
        registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
    steps:
      - name: Install Cosign
-        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
        with:
          cosign-release: "v2.5.3"

      - name: Login to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -384,7 +442,7 @@ jobs:
      #   2025.12.0.dev202511250240 -> tags: 2025.12.0.dev202511250240, dev
      - name: Generate Docker metadata
        id: meta
-        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
        with:
          images: ${{ matrix.registry }}/home-assistant
          sep-tags: ","
@@ -398,7 +456,7 @@ jobs:
            type=semver,pattern={{major}}.{{minor}},value=${{ needs.init.outputs.version }},enable=${{ !contains(needs.init.outputs.version, 'd') && !contains(needs.init.outputs.version, 'b') }}

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v3.7.1
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.7.1

      - name: Copy architecture images to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
@@ -485,7 +543,7 @@ jobs:
          python-version-file: ".python-version"

      - name: Download translations
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: translations

@@ -527,14 +585,14 @@ jobs:
          persist-credentials: false

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build Docker image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
        with:
          context: . # So action will not pull the repository again
          file: ./script/hassfest/docker/Dockerfile
@@ -547,7 +605,7 @@ jobs:
      - name: Push Docker image
        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
        id: push
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
        with:
          context: . # So action will not pull the repository again
          file: ./script/hassfest/docker/Dockerfile
@@ -556,7 +614,7 @@ jobs:

      - name: Generate artifact attestation
        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
+        uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
        with:
          subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
          subject-digest: ${{ steps.push.outputs.digest }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -120,7 +120,7 @@ jobs:
        run: |
          echo "key=$(lsb_release -rs)-apt-${CACHE_VERSION}-${HA_SHORT_VERSION}" >> $GITHUB_OUTPUT
      - name: Filter for core changes
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
        id: core
        with:
          filters: .core_files.yaml
@@ -135,7 +135,7 @@ jobs:
          echo "Result:"
          cat .integration_paths.yaml
      - name: Filter for integration changes
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
        id: integrations
        with:
          filters: .integration_paths.yaml
@@ -609,7 +609,7 @@ jobs:
        with:
          persist-credentials: false
      - name: Dependency review
-        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
+        uses: actions/dependency-review-action@05fe4576374b728f0c523d6a13d64c25081e0803 # v4.8.3
        with:
          license-check: false # We use our own license audit checks

@@ -852,6 +852,10 @@ jobs:
    needs:
      - info
      - base
+      - gen-requirements-all
+      - hassfest
+      - prek
+      - mypy
    steps:
      - name: Restore apt cache
        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
@@ -978,7 +982,7 @@ jobs:
        run: |
          echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
      - name: Download pytest_buckets
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: pytest_buckets
      - name: Compile English translations
@@ -1387,7 +1391,7 @@ jobs:
        with:
          persist-credentials: false
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
@@ -1396,7 +1400,7 @@ jobs:
        with:
          fail_ci_if_error: true
          flags: full-suite
-          token: ${{ secrets.CODECOV_TOKEN }} # zizmor: ignore[secrets-outside-env]
+          token: ${{ secrets.CODECOV_TOKEN }}

  pytest-partial:
    name: Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
@@ -1558,7 +1562,7 @@ jobs:
        with:
          persist-credentials: false
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
@@ -1566,7 +1570,7 @@ jobs:
        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
        with:
          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }} # zizmor: ignore[secrets-outside-env]
+          token: ${{ secrets.CODECOV_TOKEN }}

  upload-test-results:
    name: Upload test results to Codecov
@@ -1587,7 +1591,7 @@ jobs:
      && needs.info.outputs.skip_coverage != 'true' && !cancelled()
    steps:
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          pattern: test-results-*
      - name: Upload test results to Codecov
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,11 +28,11 @@ jobs:
          persist-credentials: false

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
        with:
          category: "/language:python"
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -58,8 +58,8 @@ jobs:
        # v1.7.0
        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
        with:
-          app_id: ${{ secrets.ISSUE_TRIAGE_APP_ID }} # zizmor: ignore[secrets-outside-env]
-          private_key: ${{ secrets.ISSUE_TRIAGE_APP_PEM }} # zizmor: ignore[secrets-outside-env]
+          app_id: ${{ secrets.ISSUE_TRIAGE_APP_ID }}
+          private_key: ${{ secrets.ISSUE_TRIAGE_APP_PEM }}

      # The 90 day stale policy for issues
      # Used for:
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -33,6 +33,6 @@ jobs:

      - name: Upload Translations
        env:
-          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} # zizmor: ignore[secrets-outside-env]
+          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
        run: |
          python3 -m script.translations upload
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -121,12 +121,12 @@ jobs:
          persist-credentials: false

      - name: Download env_file
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: env_file

      - name: Download requirements_diff
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: requirements_diff

@@ -142,7 +142,7 @@ jobs:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }} # zizmor: ignore[secrets-outside-env]
+          wheels-key: ${{ secrets.WHEELS_KEY }}
          env-file: true
          apk: "libffi-dev;openssl-dev;yaml-dev;nasm;zlib-ng-dev"
          skip-binary: aiohttp;multidict;propcache;yarl;SQLAlchemy
@@ -172,17 +172,17 @@ jobs:
          persist-credentials: false

      - name: Download env_file
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: env_file

      - name: Download requirements_diff
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: requirements_diff

      - name: Download requirements_all_wheels
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
          name: requirements_all_wheels

@@ -200,7 +200,7 @@ jobs:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }} # zizmor: ignore[secrets-outside-env]
+          wheels-key: ${{ secrets.WHEELS_KEY }}
          env-file: true
          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-ng-dev"
          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
        exclude_types: [csv, json, html]
        exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
  - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.23.1
+    rev: v1.22.0
    hooks:
      - id: zizmor
        args:
--- a/.strict-typing
+++ b/.strict-typing
@@ -137,7 +137,6 @@ homeassistant.components.calendar.*
 homeassistant.components.cambridge_audio.*
 homeassistant.components.camera.*
 homeassistant.components.canary.*
-homeassistant.components.casper_glow.*
 homeassistant.components.cert_expiry.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
@@ -273,12 +272,10 @@ homeassistant.components.homekit_controller.storage
 homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.homeworks.*
-homeassistant.components.hr_energy_qube.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
-homeassistant.components.huum.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.hypontech.*
@@ -328,7 +325,6 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
-homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
@@ -346,7 +342,6 @@ homeassistant.components.lookin.*
 homeassistant.components.lovelace.*
 homeassistant.components.luftdaten.*
 homeassistant.components.lunatone.*
-homeassistant.components.lutron.*
 homeassistant.components.madvr.*
 homeassistant.components.manual.*
 homeassistant.components.mastodon.*
@@ -574,7 +569,6 @@ homeassistant.components.trafikverket_train.*
 homeassistant.components.trafikverket_weatherstation.*
 homeassistant.components.transmission.*
 homeassistant.components.trend.*
-homeassistant.components.trmnl.*
 homeassistant.components.tts.*
 homeassistant.components.twentemilieu.*
 homeassistant.components.unifi.*
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -15,11 +15,6 @@ This repository contains the core of Home Assistant, a Python 3 based home autom

 - Python 3.14 explicitly allows `except TypeA, TypeB:` without parentheses.

-## Testing
-
-When writing or modifying tests, ensure all test function parameters have type annotations.
-Prefer concrete types (for example, `HomeAssistant`, `MockConfigEntry`, etc.) over `Any`.
-
 ## Good practices

 Integrations with Platinum or Gold level in the Integration Quality Scale reflect a high standard of code quality and maintainability. When looking for examples of something, these are good places to start. The level is indicated in the manifest.json of the integration.
--- a/52
+++ b/52
@@ -186,8 +186,6 @@ build.json @home-assistant/supervisor
 /tests/components/auth/ @home-assistant/core
 /homeassistant/components/automation/ @home-assistant/core
 /tests/components/automation/ @home-assistant/core
-/homeassistant/components/autoskope/ @mcisk
-/tests/components/autoskope/ @mcisk
 /homeassistant/components/avea/ @pattyland
 /homeassistant/components/awair/ @ahayworth @ricohageman
 /tests/components/awair/ @ahayworth @ricohageman
@@ -214,8 +212,6 @@ build.json @home-assistant/supervisor
 /tests/components/balboa/ @garbled1 @natekspencer
 /homeassistant/components/bang_olufsen/ @mj23000
 /tests/components/bang_olufsen/ @mj23000
-/homeassistant/components/battery/ @home-assistant/core
-/tests/components/battery/ @home-assistant/core
 /homeassistant/components/bayesian/ @HarvsG
 /tests/components/bayesian/ @HarvsG
 /homeassistant/components/beewi_smartclim/ @alemuro
@@ -275,8 +271,6 @@ build.json @home-assistant/supervisor
 /tests/components/cambridge_audio/ @noahhusby
 /homeassistant/components/camera/ @home-assistant/core
 /tests/components/camera/ @home-assistant/core
-/homeassistant/components/casper_glow/ @mikeodr
-/tests/components/casper_glow/ @mikeodr
 /homeassistant/components/cast/ @emontnemery
 /tests/components/cast/ @emontnemery
 /homeassistant/components/ccm15/ @ocalvo
@@ -583,8 +577,6 @@ build.json @home-assistant/supervisor
 /tests/components/garages_amsterdam/ @klaasnicolaas
 /homeassistant/components/gardena_bluetooth/ @elupus
 /tests/components/gardena_bluetooth/ @elupus
-/homeassistant/components/gate/ @home-assistant/core
-/tests/components/gate/ @home-assistant/core
 /homeassistant/components/gdacs/ @exxamalte
 /tests/components/gdacs/ @exxamalte
 /homeassistant/components/generic/ @davet2001
@@ -737,8 +729,6 @@ build.json @home-assistant/supervisor
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
 /tests/components/honeywell/ @rdfurman @mkmer
-/homeassistant/components/hr_energy_qube/ @MattieGit
-/tests/components/hr_energy_qube/ @MattieGit
 /homeassistant/components/html5/ @alexyao2015
 /tests/components/html5/ @alexyao2015
 /homeassistant/components/http/ @home-assistant/core
@@ -753,8 +743,6 @@ build.json @home-assistant/supervisor
 /tests/components/huisbaasje/ @dennisschroer
 /homeassistant/components/humidifier/ @home-assistant/core @Shulyaka
 /tests/components/humidifier/ @home-assistant/core @Shulyaka
-/homeassistant/components/humidity/ @home-assistant/core
-/tests/components/humidity/ @home-assistant/core
 /homeassistant/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /tests/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /homeassistant/components/husqvarna_automower/ @Thomas55555
@@ -786,8 +774,6 @@ build.json @home-assistant/supervisor
 /tests/components/igloohome/ @keithle888
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
-/homeassistant/components/illuminance/ @home-assistant/core
-/tests/components/illuminance/ @home-assistant/core
 /homeassistant/components/image/ @home-assistant/core
 /tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
@@ -947,16 +933,12 @@ build.json @home-assistant/supervisor
 /tests/components/lektrico/ @lektrico
 /homeassistant/components/letpot/ @jpelgrom
 /tests/components/letpot/ @jpelgrom
-/homeassistant/components/lg_infrared/ @home-assistant/core
-/tests/components/lg_infrared/ @home-assistant/core
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
 /tests/components/lg_thinq/ @LG-ThinQ-Integration
 /homeassistant/components/libre_hardware_monitor/ @Sab44
 /tests/components/libre_hardware_monitor/ @Sab44
-/homeassistant/components/lichess/ @aryanhasgithub
-/tests/components/lichess/ @aryanhasgithub
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/liebherr/ @mettolen
@@ -986,8 +968,6 @@ build.json @home-assistant/supervisor
 /tests/components/logbook/ @home-assistant/core
 /homeassistant/components/logger/ @home-assistant/core
 /tests/components/logger/ @home-assistant/core
-/homeassistant/components/lojack/ @devinslick
-/tests/components/lojack/ @devinslick
 /homeassistant/components/london_underground/ @jpbede
 /tests/components/london_underground/ @jpbede
 /homeassistant/components/lookin/ @ANMalko @bdraco
@@ -1077,8 +1057,6 @@ build.json @home-assistant/supervisor
 /tests/components/modern_forms/ @wonderslug
 /homeassistant/components/moehlenhoff_alpha2/ @j-a-n
 /tests/components/moehlenhoff_alpha2/ @j-a-n
-/homeassistant/components/moisture/ @home-assistant/core
-/tests/components/moisture/ @home-assistant/core
 /homeassistant/components/monarch_money/ @jeeftor
 /tests/components/monarch_money/ @jeeftor
 /homeassistant/components/monoprice/ @etsinko @OnFreund
@@ -1089,8 +1067,6 @@ build.json @home-assistant/supervisor
 /tests/components/moon/ @fabaff @frenck
 /homeassistant/components/mopeka/ @bdraco
 /tests/components/mopeka/ @bdraco
-/homeassistant/components/motion/ @home-assistant/core
-/tests/components/motion/ @home-assistant/core
 /homeassistant/components/motion_blinds/ @starkillerOG
 /tests/components/motion_blinds/ @starkillerOG
 /homeassistant/components/motionblinds_ble/ @LennP @jerrybboy
@@ -1204,8 +1180,6 @@ build.json @home-assistant/supervisor
 /tests/components/nzbget/ @chriscla
 /homeassistant/components/obihai/ @dshokouhi @ejpenney
 /tests/components/obihai/ @dshokouhi @ejpenney
-/homeassistant/components/occupancy/ @home-assistant/core
-/tests/components/occupancy/ @home-assistant/core
 /homeassistant/components/octoprint/ @rfleming71
 /tests/components/octoprint/ @rfleming71
 /homeassistant/components/ohmconnect/ @robbiet480
@@ -1317,8 +1291,6 @@ build.json @home-assistant/supervisor
 /tests/components/poolsense/ @haemishkyd
 /homeassistant/components/portainer/ @erwindouna
 /tests/components/portainer/ @erwindouna
-/homeassistant/components/power/ @home-assistant/core
-/tests/components/power/ @home-assistant/core
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
 /homeassistant/components/powerfox_local/ @klaasnicolaas
@@ -1577,8 +1549,8 @@ build.json @home-assistant/supervisor
 /tests/components/sma/ @kellerza @rklomp @erwindouna
 /homeassistant/components/smappee/ @bsmappee
 /tests/components/smappee/ @bsmappee
-/homeassistant/components/smarla/ @explicatis @johannes-exp
-/tests/components/smarla/ @explicatis @johannes-exp
+/homeassistant/components/smarla/ @explicatis @rlint-explicatis
+/tests/components/smarla/ @explicatis @rlint-explicatis
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
 /homeassistant/components/smartthings/ @joostlek
@@ -1604,8 +1576,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
 /homeassistant/components/solarlog/ @Ernst79 @dontinelli
 /tests/components/solarlog/ @Ernst79 @dontinelli
-/homeassistant/components/solarman/ @solarmanpv
-/tests/components/solarman/ @solarmanpv
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
 /homeassistant/components/soma/ @ratsept
@@ -1634,6 +1604,8 @@ build.json @home-assistant/supervisor
 /tests/components/srp_energy/ @briglx
 /homeassistant/components/starline/ @anonym-tsk
 /tests/components/starline/ @anonym-tsk
+/homeassistant/components/starlink/ @boswelja
+/tests/components/starlink/ @boswelja
 /homeassistant/components/statistics/ @ThomDietrich @gjohansson-ST
 /tests/components/statistics/ @ThomDietrich @gjohansson-ST
 /homeassistant/components/steam_online/ @tkdrob
@@ -1715,8 +1687,6 @@ build.json @home-assistant/supervisor
 /tests/components/tellduslive/ @fredrike
 /homeassistant/components/teltonika/ @karlbeecken
 /tests/components/teltonika/ @karlbeecken
-/homeassistant/components/temperature/ @home-assistant/core
-/tests/components/temperature/ @home-assistant/core
 /homeassistant/components/template/ @Petro31 @home-assistant/core
 /tests/components/template/ @Petro31 @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
@@ -1762,8 +1732,6 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
-/homeassistant/components/touchline/ @mnordseth
-/tests/components/touchline/ @mnordseth
 /homeassistant/components/touchline_sl/ @jnsgruk
 /tests/components/touchline_sl/ @jnsgruk
 /homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696
@@ -1792,8 +1760,6 @@ build.json @home-assistant/supervisor
 /tests/components/trend/ @jpbede
 /homeassistant/components/triggercmd/ @rvmey
 /tests/components/triggercmd/ @rvmey
-/homeassistant/components/trmnl/ @joostlek
-/tests/components/trmnl/ @joostlek
 /homeassistant/components/tts/ @home-assistant/core
 /tests/components/tts/ @home-assistant/core
 /homeassistant/components/tuya/ @Tuya @zlinoliver
@@ -1810,8 +1776,6 @@ build.json @home-assistant/supervisor
 /tests/components/ukraine_alarm/ @PaulAnnekov
 /homeassistant/components/unifi/ @Kane610
 /tests/components/unifi/ @Kane610
-/homeassistant/components/unifi_access/ @imhotep @RaHehl
-/tests/components/unifi_access/ @imhotep @RaHehl
 /homeassistant/components/unifi_direct/ @tofuSCHNITZEL
 /homeassistant/components/unifiled/ @florisvdk
 /homeassistant/components/unifiprotect/ @RaHehl
@@ -1851,8 +1815,8 @@ build.json @home-assistant/supervisor
 /tests/components/vegehub/ @thulrus
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
-/homeassistant/components/velux/ @Julius2342 @pawlizio @wollew
-/tests/components/velux/ @Julius2342 @pawlizio @wollew
+/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
+/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
 /homeassistant/components/venstar/ @garbled1 @jhollowe
 /tests/components/venstar/ @garbled1 @jhollowe
 /homeassistant/components/versasense/ @imstevenxyz
@@ -1935,12 +1899,8 @@ build.json @home-assistant/supervisor
 /tests/components/whois/ @frenck
 /homeassistant/components/wiffi/ @mampfes
 /tests/components/wiffi/ @mampfes
-/homeassistant/components/wiim/ @Linkplay2020
-/tests/components/wiim/ @Linkplay2020
 /homeassistant/components/wilight/ @leofig-rj
 /tests/components/wilight/ @leofig-rj
-/homeassistant/components/window/ @home-assistant/core
-/tests/components/window/ @home-assistant/core
 /homeassistant/components/wirelesstag/ @sergeymaysak
 /homeassistant/components/withings/ @joostlek
 /tests/components/withings/ @joostlek
--- a/3
+++ b/3
@@ -10,6 +10,7 @@ LABEL \
    org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
    org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
    org.opencontainers.image.licenses="Apache-2.0" \
+    org.opencontainers.image.source="https://github.com/home-assistant/core" \
    org.opencontainers.image.title="Home Assistant" \
    org.opencontainers.image.url="https://www.home-assistant.io/"

@@ -29,7 +30,7 @@ RUN \
    # Verify go2rtc can be executed
    go2rtc --version \
    # Install uv
-    && pip3 install uv==0.11.1
+    && pip3 install uv==0.10.6

 WORKDIR /usr/src

--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -238,24 +238,11 @@ DEFAULT_INTEGRATIONS = {
    "timer",
    #
    # Base platforms:
-    # Note: Calendar and todo are not included to prevent them from registering
-    # their frontend panels when there are no calendar or todo integrations.
-    *(BASE_PLATFORMS - {"calendar", "todo"}),
+    *BASE_PLATFORMS,
    #
    # Integrations providing triggers and conditions for base platforms:
-    "air_quality",
-    "battery",
    "door",
    "garage_door",
-    "gate",
-    "humidity",
-    "illuminance",
-    "moisture",
-    "motion",
-    "occupancy",
-    "power",
-    "temperature",
-    "window",
 }
 DEFAULT_INTEGRATIONS_RECOVERY_MODE = {
    # These integrations are set up if recovery mode is activated.
@@ -470,7 +457,6 @@ async def async_load_base_functionality(hass: core.HomeAssistant) -> bool:
    translation.async_setup(hass)

    recovery = hass.config.recovery_mode
-    device_registry.async_setup(hass)
    try:
        await asyncio.gather(
            create_eager_task(get_internal_store_manager(hass).async_initialize()),
--- a/homeassistant/brands/bega.json
+++ b/homeassistant/brands/bega.json
@@ -1,5 +0,0 @@
-{
-  "domain": "bega",
-  "name": "BEGA",
-  "iot_standards": ["zigbee"]
-}
--- a/homeassistant/brands/lg.json
+++ b/homeassistant/brands/lg.json
@@ -1,11 +1,5 @@
 {
  "domain": "lg",
  "name": "LG",
-  "integrations": [
-    "lg_infrared",
-    "lg_netcast",
-    "lg_soundbar",
-    "lg_thinq",
-    "webostv"
-  ]
+  "integrations": ["lg_netcast", "lg_soundbar", "lg_thinq", "webostv"]
 }
--- a/homeassistant/brands/ubiquiti.json
+++ b/homeassistant/brands/ubiquiti.json
@@ -1,12 +1,5 @@
 {
  "domain": "ubiquiti",
  "name": "Ubiquiti",
-  "integrations": [
-    "airos",
-    "unifi",
-    "unifi_access",
-    "unifi_direct",
-    "unifiled",
-    "unifiprotect"
-  ]
+  "integrations": ["airos", "unifi", "unifi_direct", "unifiled", "unifiprotect"]
 }
--- a/homeassistant/components/abode/manifest.json
+++ b/homeassistant/components/abode/manifest.json
@@ -9,6 +9,6 @@
  },
  "iot_class": "cloud_push",
  "loggers": ["jaraco.abode", "lomond"],
-  "requirements": ["jaraco.abode==6.4.0"],
+  "requirements": ["jaraco.abode==6.2.1"],
  "single_config_entry": true
 }
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
    SensorDeviceClass,
    SensorEntity,
    SensorEntityDescription,
-    SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
@@ -41,7 +40,6 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
    AbodeSensorDescription(
        key="temperature",
        device_class=SensorDeviceClass.TEMPERATURE,
-        state_class=SensorStateClass.MEASUREMENT,
        native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
            device.temp_unit
        ],
@@ -50,14 +48,12 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
    AbodeSensorDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        state_class=SensorStateClass.MEASUREMENT,
        native_unit_of_measurement_fn=lambda _: PERCENTAGE,
        value_fn=lambda device: cast(float, device.humidity),
    ),
    AbodeSensorDescription(
        key="lux",
        device_class=SensorDeviceClass.ILLUMINANCE,
-        state_class=SensorStateClass.MEASUREMENT,
        native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
        value_fn=lambda device: cast(float, device.lux),
    ),
--- a/homeassistant/components/actron_air/config_flow.py
+++ b/homeassistant/components/actron_air/config_flow.py
@@ -120,7 +120,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
            return self.async_show_form(
                step_id="timeout",
            )
-        self.login_task = None
+        del self.login_task
        return await self.async_step_user()

    async def async_step_reauth(
--- a/homeassistant/components/actron_air/manifest.json
+++ b/homeassistant/components/actron_air/manifest.json
@@ -12,6 +12,6 @@
  "documentation": "https://www.home-assistant.io/integrations/actron_air",
  "integration_type": "hub",
  "iot_class": "cloud_polling",
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
  "requirements": ["actron-neo-api==0.4.1"]
 }
--- a/homeassistant/components/actron_air/quality_scale.yaml
+++ b/homeassistant/components/actron_air/quality_scale.yaml
@@ -37,7 +37,7 @@ rules:
  log-when-unavailable: done
  parallel-updates: done
  reauthentication-flow: done
-  test-coverage: done
+  test-coverage: todo

  # Gold
  devices: done
--- a/homeassistant/components/air_quality/condition.py
+++ b/homeassistant/components/air_quality/condition.py
@@ -1,134 +0,0 @@
-"""Provides conditions for air quality."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    STATE_OFF,
-    STATE_ON,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import (
-    Condition,
-    make_entity_numerical_condition,
-    make_entity_numerical_condition_with_unit,
-    make_entity_state_condition,
-)
-from homeassistant.util.unit_conversion import (
-    CarbonMonoxideConcentrationConverter,
-    MassVolumeConcentrationConverter,
-    NitrogenDioxideConcentrationConverter,
-    NitrogenMonoxideConcentrationConverter,
-    OzoneConcentrationConverter,
-    SulphurDioxideConcentrationConverter,
-    UnitlessRatioConverter,
-)
-
-
-def _make_detected_condition(
-    device_class: BinarySensorDeviceClass,
-) -> type[Condition]:
-    """Create a detected condition for a binary sensor device class."""
-    return make_entity_state_condition(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
-    )
-
-
-def _make_cleared_condition(
-    device_class: BinarySensorDeviceClass,
-) -> type[Condition]:
-    """Create a cleared condition for a binary sensor device class."""
-    return make_entity_state_condition(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
-    )
-
-
-CONDITIONS: dict[str, type[Condition]] = {
-    # Binary sensor conditions (detected/cleared)
-    "is_gas_detected": _make_detected_condition(BinarySensorDeviceClass.GAS),
-    "is_gas_cleared": _make_cleared_condition(BinarySensorDeviceClass.GAS),
-    "is_co_detected": _make_detected_condition(BinarySensorDeviceClass.CO),
-    "is_co_cleared": _make_cleared_condition(BinarySensorDeviceClass.CO),
-    "is_smoke_detected": _make_detected_condition(BinarySensorDeviceClass.SMOKE),
-    "is_smoke_cleared": _make_cleared_condition(BinarySensorDeviceClass.SMOKE),
-    # Numerical sensor conditions with unit conversion
-    "is_co_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CarbonMonoxideConcentrationConverter,
-    ),
-    "is_ozone_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        OzoneConcentrationConverter,
-    ),
-    "is_voc_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
-            )
-        },
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        MassVolumeConcentrationConverter,
-    ),
-    "is_voc_ratio_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
-            )
-        },
-        CONCENTRATION_PARTS_PER_BILLION,
-        UnitlessRatioConverter,
-    ),
-    "is_no_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenMonoxideConcentrationConverter,
-    ),
-    "is_no2_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenDioxideConcentrationConverter,
-    ),
-    "is_so2_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        SulphurDioxideConcentrationConverter,
-    ),
-    # Numerical sensor conditions without unit conversion (single-unit device classes)
-    "is_co2_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
-        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
-    ),
-    "is_pm1_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_pm25_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_pm4_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_pm10_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_n2o_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the air quality conditions."""
-    return CONDITIONS
--- a/homeassistant/components/air_quality/conditions.yaml
+++ b/homeassistant/components/air_quality/conditions.yaml
@@ -1,449 +0,0 @@
-# --- Common condition fields ---
-
-.condition_behavior: &condition_behavior
-  required: true
-  default: any
-  selector:
-    select:
-      translation_key: condition_behavior
-      options:
-        - all
-        - any
-
-# --- Unit lists for multi-unit pollutants ---
-
-.co_units: &co_units
-  - "ppb"
-  - "ppm"
-  - "mg/m³"
-  - "μg/m³"
-
-.ozone_units: &ozone_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.voc_units: &voc_units
-  - "μg/m³"
-  - "mg/m³"
-
-.voc_ratio_units: &voc_ratio_units
-  - "ppb"
-  - "ppm"
-
-.no_units: &no_units
-  - "ppb"
-  - "μg/m³"
-
-.no2_units: &no2_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.so2_units: &so2_units
-  - "ppb"
-  - "μg/m³"
-
-# --- Entity filter anchors ---
-
-.co_threshold_entity: &co_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *co_units
-  - domain: sensor
-    device_class: carbon_monoxide
-  - domain: number
-    device_class: carbon_monoxide
-
-.co2_threshold_entity: &co2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "ppm"
-  - domain: sensor
-    device_class: carbon_dioxide
-  - domain: number
-    device_class: carbon_dioxide
-
-.pm1_threshold_entity: &pm1_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm1
-  - domain: number
-    device_class: pm1
-
-.pm25_threshold_entity: &pm25_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm25
-  - domain: number
-    device_class: pm25
-
-.pm4_threshold_entity: &pm4_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm4
-  - domain: number
-    device_class: pm4
-
-.pm10_threshold_entity: &pm10_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm10
-  - domain: number
-    device_class: pm10
-
-.ozone_threshold_entity: &ozone_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *ozone_units
-  - domain: sensor
-    device_class: ozone
-  - domain: number
-    device_class: ozone
-
-.voc_threshold_entity: &voc_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_units
-  - domain: sensor
-    device_class: volatile_organic_compounds
-  - domain: number
-    device_class: volatile_organic_compounds
-
-.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_ratio_units
-  - domain: sensor
-    device_class: volatile_organic_compounds_parts
-  - domain: number
-    device_class: volatile_organic_compounds_parts
-
-.no_threshold_entity: &no_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no_units
-  - domain: sensor
-    device_class: nitrogen_monoxide
-  - domain: number
-    device_class: nitrogen_monoxide
-
-.no2_threshold_entity: &no2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no2_units
-  - domain: sensor
-    device_class: nitrogen_dioxide
-  - domain: number
-    device_class: nitrogen_dioxide
-
-.n2o_threshold_entity: &n2o_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: nitrous_oxide
-  - domain: number
-    device_class: nitrous_oxide
-
-.so2_threshold_entity: &so2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *so2_units
-  - domain: sensor
-    device_class: sulphur_dioxide
-  - domain: number
-    device_class: sulphur_dioxide
-
-# --- Number anchors for single-unit pollutants ---
-
-.co2_threshold_number: &co2_threshold_number
-  mode: box
-  unit_of_measurement: "ppm"
-
-.ugm3_threshold_number: &ugm3_threshold_number
-  mode: box
-  unit_of_measurement: "μg/m³"
-
-# --- Binary sensor targets ---
-
-.target_gas: &target_gas
-  entity:
-    - domain: binary_sensor
-      device_class: gas
-
-.target_co_binary: &target_co_binary
-  entity:
-    - domain: binary_sensor
-      device_class: carbon_monoxide
-
-.target_smoke: &target_smoke
-  entity:
-    - domain: binary_sensor
-      device_class: smoke
-
-# --- Sensor targets ---
-
-.target_co_sensor: &target_co_sensor
-  entity:
-    - domain: sensor
-      device_class: carbon_monoxide
-
-.target_co2: &target_co2
-  entity:
-    - domain: sensor
-      device_class: carbon_dioxide
-
-.target_pm1: &target_pm1
-  entity:
-    - domain: sensor
-      device_class: pm1
-
-.target_pm25: &target_pm25
-  entity:
-    - domain: sensor
-      device_class: pm25
-
-.target_pm4: &target_pm4
-  entity:
-    - domain: sensor
-      device_class: pm4
-
-.target_pm10: &target_pm10
-  entity:
-    - domain: sensor
-      device_class: pm10
-
-.target_ozone: &target_ozone
-  entity:
-    - domain: sensor
-      device_class: ozone
-
-.target_voc: &target_voc
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds
-
-.target_voc_ratio: &target_voc_ratio
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds_parts
-
-.target_no: &target_no
-  entity:
-    - domain: sensor
-      device_class: nitrogen_monoxide
-
-.target_no2: &target_no2
-  entity:
-    - domain: sensor
-      device_class: nitrogen_dioxide
-
-.target_n2o: &target_n2o
-  entity:
-    - domain: sensor
-      device_class: nitrous_oxide
-
-.target_so2: &target_so2
-  entity:
-    - domain: sensor
-      device_class: sulphur_dioxide
-
-# --- Binary sensor conditions ---
-
-.condition_binary_common: &condition_binary_common
-  fields:
-    behavior: *condition_behavior
-
-is_gas_detected:
-  <<: *condition_binary_common
-  target: *target_gas
-
-is_gas_cleared:
-  <<: *condition_binary_common
-  target: *target_gas
-
-is_co_detected:
-  <<: *condition_binary_common
-  target: *target_co_binary
-
-is_co_cleared:
-  <<: *condition_binary_common
-  target: *target_co_binary
-
-is_smoke_detected:
-  <<: *condition_binary_common
-  target: *target_smoke
-
-is_smoke_cleared:
-  <<: *condition_binary_common
-  target: *target_smoke
-
-# --- Numerical sensor conditions with unit conversion ---
-
-is_co_value:
-  target: *target_co_sensor
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *co_units
-
-is_ozone_value:
-  target: *target_ozone
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *ozone_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *ozone_units
-
-is_voc_value:
-  target: *target_voc
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *voc_units
-
-is_voc_ratio_value:
-  target: *target_voc_ratio
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_ratio_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *voc_ratio_units
-
-is_no_value:
-  target: *target_no
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *no_units
-
-is_no2_value:
-  target: *target_no2
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no2_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *no2_units
-
-is_so2_value:
-  target: *target_so2
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *so2_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *so2_units
-
-# --- Numerical sensor conditions without unit conversion ---
-
-is_co2_value:
-  target: *target_co2
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co2_threshold_entity
-          mode: is
-          number: *co2_threshold_number
-
-is_pm1_value:
-  target: *target_pm1
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm1_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_pm25_value:
-  target: *target_pm25
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm25_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_pm4_value:
-  target: *target_pm4
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm4_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_pm10_value:
-  target: *target_pm10
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm10_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_n2o_value:
-  target: *target_n2o
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *n2o_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
--- a/homeassistant/components/air_quality/icons.json
+++ b/homeassistant/components/air_quality/icons.json
@@ -1,164 +1,7 @@
 {
-  "conditions": {
-    "is_co2_value": {
-      "condition": "mdi:molecule-co2"
-    },
-    "is_co_cleared": {
-      "condition": "mdi:check-circle"
-    },
-    "is_co_detected": {
-      "condition": "mdi:molecule-co"
-    },
-    "is_co_value": {
-      "condition": "mdi:molecule-co"
-    },
-    "is_gas_cleared": {
-      "condition": "mdi:check-circle"
-    },
-    "is_gas_detected": {
-      "condition": "mdi:gas-cylinder"
-    },
-    "is_n2o_value": {
-      "condition": "mdi:factory"
-    },
-    "is_no2_value": {
-      "condition": "mdi:factory"
-    },
-    "is_no_value": {
-      "condition": "mdi:factory"
-    },
-    "is_ozone_value": {
-      "condition": "mdi:weather-sunny-alert"
-    },
-    "is_pm10_value": {
-      "condition": "mdi:blur"
-    },
-    "is_pm1_value": {
-      "condition": "mdi:blur"
-    },
-    "is_pm25_value": {
-      "condition": "mdi:blur"
-    },
-    "is_pm4_value": {
-      "condition": "mdi:blur"
-    },
-    "is_smoke_cleared": {
-      "condition": "mdi:check-circle"
-    },
-    "is_smoke_detected": {
-      "condition": "mdi:smoke-detector-variant"
-    },
-    "is_so2_value": {
-      "condition": "mdi:factory"
-    },
-    "is_voc_ratio_value": {
-      "condition": "mdi:air-filter"
-    },
-    "is_voc_value": {
-      "condition": "mdi:air-filter"
-    }
-  },
  "entity_component": {
    "_": {
      "default": "mdi:air-filter"
    }
-  },
-  "triggers": {
-    "co2_changed": {
-      "trigger": "mdi:molecule-co2"
-    },
-    "co2_crossed_threshold": {
-      "trigger": "mdi:molecule-co2"
-    },
-    "co_changed": {
-      "trigger": "mdi:molecule-co"
-    },
-    "co_cleared": {
-      "trigger": "mdi:check-circle"
-    },
-    "co_crossed_threshold": {
-      "trigger": "mdi:molecule-co"
-    },
-    "co_detected": {
-      "trigger": "mdi:molecule-co"
-    },
-    "gas_cleared": {
-      "trigger": "mdi:check-circle"
-    },
-    "gas_detected": {
-      "trigger": "mdi:gas-cylinder"
-    },
-    "n2o_changed": {
-      "trigger": "mdi:factory"
-    },
-    "n2o_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "no2_changed": {
-      "trigger": "mdi:factory"
-    },
-    "no2_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "no_changed": {
-      "trigger": "mdi:factory"
-    },
-    "no_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "ozone_changed": {
-      "trigger": "mdi:weather-sunny-alert"
-    },
-    "ozone_crossed_threshold": {
-      "trigger": "mdi:weather-sunny-alert"
-    },
-    "pm10_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm10_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "pm1_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm1_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "pm25_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm25_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "pm4_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm4_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "smoke_cleared": {
-      "trigger": "mdi:check-circle"
-    },
-    "smoke_detected": {
-      "trigger": "mdi:smoke-detector-variant"
-    },
-    "so2_changed": {
-      "trigger": "mdi:factory"
-    },
-    "so2_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "voc_changed": {
-      "trigger": "mdi:air-filter"
-    },
-    "voc_crossed_threshold": {
-      "trigger": "mdi:air-filter"
-    },
-    "voc_ratio_changed": {
-      "trigger": "mdi:air-filter"
-    },
-    "voc_ratio_crossed_threshold": {
-      "trigger": "mdi:air-filter"
-    }
  }
 }
--- a/homeassistant/components/air_quality/strings.json
+++ b/homeassistant/components/air_quality/strings.json
@@ -1,565 +0,0 @@
-{
-  "common": {
-    "condition_behavior_name": "Condition passes if",
-    "condition_threshold_name": "Threshold type",
-    "trigger_behavior_name": "Trigger when",
-    "trigger_threshold_name": "Threshold type"
-  },
-  "conditions": {
-    "is_co2_value": {
-      "description": "Tests the carbon dioxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Carbon dioxide value"
-    },
-    "is_co_cleared": {
-      "description": "Tests if one or more carbon monoxide sensors are cleared.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide cleared"
-    },
-    "is_co_detected": {
-      "description": "Tests if one or more carbon monoxide sensors are detecting carbon monoxide.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide detected"
-    },
-    "is_co_value": {
-      "description": "Tests the carbon monoxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Carbon monoxide value"
-    },
-    "is_gas_cleared": {
-      "description": "Tests if one or more gas sensors are cleared.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Gas cleared"
-    },
-    "is_gas_detected": {
-      "description": "Tests if one or more gas sensors are detecting gas.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Gas detected"
-    },
-    "is_n2o_value": {
-      "description": "Tests the nitrous oxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Nitrous oxide value"
-    },
-    "is_no2_value": {
-      "description": "Tests the nitrogen dioxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen dioxide value"
-    },
-    "is_no_value": {
-      "description": "Tests the nitrogen monoxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen monoxide value"
-    },
-    "is_ozone_value": {
-      "description": "Tests the ozone level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Ozone value"
-    },
-    "is_pm10_value": {
-      "description": "Tests the PM10 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM10 value"
-    },
-    "is_pm1_value": {
-      "description": "Tests the PM1 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM1 value"
-    },
-    "is_pm25_value": {
-      "description": "Tests the PM2.5 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM2.5 value"
-    },
-    "is_pm4_value": {
-      "description": "Tests the PM4 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM4 value"
-    },
-    "is_smoke_cleared": {
-      "description": "Tests if one or more smoke sensors are cleared.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Smoke cleared"
-    },
-    "is_smoke_detected": {
-      "description": "Tests if one or more smoke sensors are detecting smoke.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Smoke detected"
-    },
-    "is_so2_value": {
-      "description": "Tests the sulphur dioxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Sulphur dioxide value"
-    },
-    "is_voc_ratio_value": {
-      "description": "Tests the volatile organic compounds ratio of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds ratio value"
-    },
-    "is_voc_value": {
-      "description": "Tests the volatile organic compounds level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds value"
-    }
-  },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
-  "title": "Air Quality",
-  "triggers": {
-    "co2_changed": {
-      "description": "Triggers after one or more carbon dioxide levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon dioxide level changed"
-    },
-    "co2_crossed_threshold": {
-      "description": "Triggers after one or more carbon dioxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon dioxide level crossed threshold"
-    },
-    "co_changed": {
-      "description": "Triggers after one or more carbon monoxide levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon monoxide level changed"
-    },
-    "co_cleared": {
-      "description": "Triggers after one or more carbon monoxide sensors stop detecting carbon monoxide.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide cleared"
-    },
-    "co_crossed_threshold": {
-      "description": "Triggers after one or more carbon monoxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon monoxide level crossed threshold"
-    },
-    "co_detected": {
-      "description": "Triggers after one or more carbon monoxide sensors start detecting carbon monoxide.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide detected"
-    },
-    "gas_cleared": {
-      "description": "Triggers after one or more gas sensors stop detecting gas.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Gas cleared"
-    },
-    "gas_detected": {
-      "description": "Triggers after one or more gas sensors start detecting gas.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Gas detected"
-    },
-    "n2o_changed": {
-      "description": "Triggers after one or more nitrous oxide levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrous oxide level changed"
-    },
-    "n2o_crossed_threshold": {
-      "description": "Triggers after one or more nitrous oxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrous oxide level crossed threshold"
-    },
-    "no2_changed": {
-      "description": "Triggers after one or more nitrogen dioxide levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen dioxide level changed"
-    },
-    "no2_crossed_threshold": {
-      "description": "Triggers after one or more nitrogen dioxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen dioxide level crossed threshold"
-    },
-    "no_changed": {
-      "description": "Triggers after one or more nitrogen monoxide levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen monoxide level changed"
-    },
-    "no_crossed_threshold": {
-      "description": "Triggers after one or more nitrogen monoxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen monoxide level crossed threshold"
-    },
-    "ozone_changed": {
-      "description": "Triggers after one or more ozone levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Ozone level changed"
-    },
-    "ozone_crossed_threshold": {
-      "description": "Triggers after one or more ozone levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Ozone level crossed threshold"
-    },
-    "pm10_changed": {
-      "description": "Triggers after one or more PM10 levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM10 level changed"
-    },
-    "pm10_crossed_threshold": {
-      "description": "Triggers after one or more PM10 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM10 level crossed threshold"
-    },
-    "pm1_changed": {
-      "description": "Triggers after one or more PM1 levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM1 level changed"
-    },
-    "pm1_crossed_threshold": {
-      "description": "Triggers after one or more PM1 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM1 level crossed threshold"
-    },
-    "pm25_changed": {
-      "description": "Triggers after one or more PM2.5 levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM2.5 level changed"
-    },
-    "pm25_crossed_threshold": {
-      "description": "Triggers after one or more PM2.5 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM2.5 level crossed threshold"
-    },
-    "pm4_changed": {
-      "description": "Triggers after one or more PM4 levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM4 level changed"
-    },
-    "pm4_crossed_threshold": {
-      "description": "Triggers after one or more PM4 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM4 level crossed threshold"
-    },
-    "smoke_cleared": {
-      "description": "Triggers after one or more smoke sensors stop detecting smoke.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Smoke cleared"
-    },
-    "smoke_detected": {
-      "description": "Triggers after one or more smoke sensors start detecting smoke.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Smoke detected"
-    },
-    "so2_changed": {
-      "description": "Triggers after one or more sulphur dioxide levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Sulphur dioxide level changed"
-    },
-    "so2_crossed_threshold": {
-      "description": "Triggers after one or more sulphur dioxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Sulphur dioxide level crossed threshold"
-    },
-    "voc_changed": {
-      "description": "Triggers after one or more volatile organic compound levels change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds level changed"
-    },
-    "voc_crossed_threshold": {
-      "description": "Triggers after one or more volatile organic compounds levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds level crossed threshold"
-    },
-    "voc_ratio_changed": {
-      "description": "Triggers after one or more volatile organic compound ratios change.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds ratio changed"
-    },
-    "voc_ratio_crossed_threshold": {
-      "description": "Triggers after one or more volatile organic compounds ratios cross a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds ratio crossed threshold"
-    }
-  }
-}
--- a/homeassistant/components/air_quality/trigger.py
+++ b/homeassistant/components/air_quality/trigger.py
@@ -1,206 +0,0 @@
-"""Provides triggers for air quality."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    STATE_OFF,
-    STATE_ON,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.trigger import (
-    EntityTargetStateTriggerBase,
-    Trigger,
-    make_entity_numerical_state_changed_trigger,
-    make_entity_numerical_state_changed_with_unit_trigger,
-    make_entity_numerical_state_crossed_threshold_trigger,
-    make_entity_numerical_state_crossed_threshold_with_unit_trigger,
-    make_entity_target_state_trigger,
-)
-from homeassistant.util.unit_conversion import (
-    CarbonMonoxideConcentrationConverter,
-    MassVolumeConcentrationConverter,
-    NitrogenDioxideConcentrationConverter,
-    NitrogenMonoxideConcentrationConverter,
-    OzoneConcentrationConverter,
-    SulphurDioxideConcentrationConverter,
-    UnitlessRatioConverter,
-)
-
-
-def _make_detected_trigger(
-    device_class: BinarySensorDeviceClass,
-) -> type[EntityTargetStateTriggerBase]:
-    """Create a detected trigger for a binary sensor device class."""
-
-    return make_entity_target_state_trigger(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
-    )
-
-
-def _make_cleared_trigger(
-    device_class: BinarySensorDeviceClass,
-) -> type[EntityTargetStateTriggerBase]:
-    """Create a cleared trigger for a binary sensor device class."""
-
-    return make_entity_target_state_trigger(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
-    )
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    # Binary sensor triggers (detected/cleared)
-    "gas_detected": _make_detected_trigger(BinarySensorDeviceClass.GAS),
-    "gas_cleared": _make_cleared_trigger(BinarySensorDeviceClass.GAS),
-    "co_detected": _make_detected_trigger(BinarySensorDeviceClass.CO),
-    "co_cleared": _make_cleared_trigger(BinarySensorDeviceClass.CO),
-    "smoke_detected": _make_detected_trigger(BinarySensorDeviceClass.SMOKE),
-    "smoke_cleared": _make_cleared_trigger(BinarySensorDeviceClass.SMOKE),
-    # Numerical sensor triggers with unit conversion
-    "co_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CarbonMonoxideConcentrationConverter,
-    ),
-    "co_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CarbonMonoxideConcentrationConverter,
-    ),
-    "ozone_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        OzoneConcentrationConverter,
-    ),
-    "ozone_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        OzoneConcentrationConverter,
-    ),
-    "voc_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
-            )
-        },
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        MassVolumeConcentrationConverter,
-    ),
-    "voc_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
-            )
-        },
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        MassVolumeConcentrationConverter,
-    ),
-    "voc_ratio_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
-            )
-        },
-        CONCENTRATION_PARTS_PER_BILLION,
-        UnitlessRatioConverter,
-    ),
-    "voc_ratio_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
-            )
-        },
-        CONCENTRATION_PARTS_PER_BILLION,
-        UnitlessRatioConverter,
-    ),
-    "no_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenMonoxideConcentrationConverter,
-    ),
-    "no_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenMonoxideConcentrationConverter,
-    ),
-    "no2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenDioxideConcentrationConverter,
-    ),
-    "no2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenDioxideConcentrationConverter,
-    ),
-    "so2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        SulphurDioxideConcentrationConverter,
-    ),
-    "so2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        SulphurDioxideConcentrationConverter,
-    ),
-    # Numerical sensor triggers without unit conversion (single-unit device classes)
-    "co2_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
-        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
-    ),
-    "co2_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
-        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
-    ),
-    "pm1_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm1_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm25_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm25_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm4_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm4_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm10_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm10_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "n2o_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "n2o_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for air quality."""
-    return TRIGGERS
--- a/homeassistant/components/air_quality/triggers.yaml
+++ b/homeassistant/components/air_quality/triggers.yaml
@@ -1,617 +0,0 @@
-.trigger_common_fields:
-  behavior: &trigger_behavior
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
-
-# --- Unit lists for multi-unit pollutants ---
-
-.co_units: &co_units
-  - "ppb"
-  - "ppm"
-  - "mg/m³"
-  - "μg/m³"
-
-.ozone_units: &ozone_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.voc_units: &voc_units
-  - "μg/m³"
-  - "mg/m³"
-
-.voc_ratio_units: &voc_ratio_units
-  - "ppb"
-  - "ppm"
-
-.no_units: &no_units
-  - "ppb"
-  - "μg/m³"
-
-.no2_units: &no2_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.so2_units: &so2_units
-  - "ppb"
-  - "μg/m³"
-
-# --- Entity filter anchors ---
-
-.co_threshold_entity: &co_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *co_units
-  - domain: sensor
-    device_class: carbon_monoxide
-  - domain: number
-    device_class: carbon_monoxide
-
-.co2_threshold_entity: &co2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "ppm"
-  - domain: sensor
-    device_class: carbon_dioxide
-  - domain: number
-    device_class: carbon_dioxide
-
-.pm1_threshold_entity: &pm1_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm1
-  - domain: number
-    device_class: pm1
-
-.pm25_threshold_entity: &pm25_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm25
-  - domain: number
-    device_class: pm25
-
-.pm4_threshold_entity: &pm4_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm4
-  - domain: number
-    device_class: pm4
-
-.pm10_threshold_entity: &pm10_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm10
-  - domain: number
-    device_class: pm10
-
-.ozone_threshold_entity: &ozone_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *ozone_units
-  - domain: sensor
-    device_class: ozone
-  - domain: number
-    device_class: ozone
-
-.voc_threshold_entity: &voc_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_units
-  - domain: sensor
-    device_class: volatile_organic_compounds
-  - domain: number
-    device_class: volatile_organic_compounds
-
-.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_ratio_units
-  - domain: sensor
-    device_class: volatile_organic_compounds_parts
-  - domain: number
-    device_class: volatile_organic_compounds_parts
-
-.no_threshold_entity: &no_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no_units
-  - domain: sensor
-    device_class: nitrogen_monoxide
-  - domain: number
-    device_class: nitrogen_monoxide
-
-.no2_threshold_entity: &no2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no2_units
-  - domain: sensor
-    device_class: nitrogen_dioxide
-  - domain: number
-    device_class: nitrogen_dioxide
-
-.n2o_threshold_entity: &n2o_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: nitrous_oxide
-  - domain: number
-    device_class: nitrous_oxide
-
-.so2_threshold_entity: &so2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *so2_units
-  - domain: sensor
-    device_class: sulphur_dioxide
-  - domain: number
-    device_class: sulphur_dioxide
-
-# --- Number anchors for single-unit pollutants ---
-
-.co2_threshold_number: &co2_threshold_number
-  mode: box
-  unit_of_measurement: "ppm"
-
-.ugm3_threshold_number: &ugm3_threshold_number
-  mode: box
-  unit_of_measurement: "μg/m³"
-
-# Binary sensor detected/cleared trigger fields
-.trigger_binary_fields: &trigger_binary_fields
-  behavior: *trigger_behavior
-
-# --- Binary sensor targets ---
-
-.target_gas: &target_gas
-  entity:
-    - domain: binary_sensor
-      device_class: gas
-
-.target_co_binary: &target_co_binary
-  entity:
-    - domain: binary_sensor
-      device_class: carbon_monoxide
-
-.target_smoke: &target_smoke
-  entity:
-    - domain: binary_sensor
-      device_class: smoke
-
-# --- Sensor targets ---
-
-.target_co_sensor: &target_co_sensor
-  entity:
-    - domain: sensor
-      device_class: carbon_monoxide
-
-.target_co2: &target_co2
-  entity:
-    - domain: sensor
-      device_class: carbon_dioxide
-
-.target_pm1: &target_pm1
-  entity:
-    - domain: sensor
-      device_class: pm1
-
-.target_pm25: &target_pm25
-  entity:
-    - domain: sensor
-      device_class: pm25
-
-.target_pm4: &target_pm4
-  entity:
-    - domain: sensor
-      device_class: pm4
-
-.target_pm10: &target_pm10
-  entity:
-    - domain: sensor
-      device_class: pm10
-
-.target_ozone: &target_ozone
-  entity:
-    - domain: sensor
-      device_class: ozone
-
-.target_voc: &target_voc
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds
-
-.target_voc_ratio: &target_voc_ratio
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds_parts
-
-.target_no: &target_no
-  entity:
-    - domain: sensor
-      device_class: nitrogen_monoxide
-
-.target_no2: &target_no2
-  entity:
-    - domain: sensor
-      device_class: nitrogen_dioxide
-
-.target_n2o: &target_n2o
-  entity:
-    - domain: sensor
-      device_class: nitrous_oxide
-
-.target_so2: &target_so2
-  entity:
-    - domain: sensor
-      device_class: sulphur_dioxide
-
-# --- Binary sensor triggers ---
-
-gas_detected:
-  fields: *trigger_binary_fields
-  target: *target_gas
-
-gas_cleared:
-  fields: *trigger_binary_fields
-  target: *target_gas
-
-co_detected:
-  fields: *trigger_binary_fields
-  target: *target_co_binary
-
-co_cleared:
-  fields: *trigger_binary_fields
-  target: *target_co_binary
-
-smoke_detected:
-  fields: *trigger_binary_fields
-  target: *target_smoke
-
-smoke_cleared:
-  fields: *trigger_binary_fields
-  target: *target_smoke
-
-# --- Numerical sensor triggers ---
-
-# CO (multi-unit)
-co_changed:
-  target: *target_co_sensor
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *co_units
-
-co_crossed_threshold:
-  target: *target_co_sensor
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *co_units
-
-# CO2 (single-unit: ppm)
-co2_changed:
-  target: *target_co2
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co2_threshold_entity
-          mode: changed
-          number: *co2_threshold_number
-
-co2_crossed_threshold:
-  target: *target_co2
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co2_threshold_entity
-          mode: crossed
-          number: *co2_threshold_number
-
-# PM1 (single-unit: μg/m³)
-pm1_changed:
-  target: *target_pm1
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm1_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm1_crossed_threshold:
-  target: *target_pm1
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm1_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# PM2.5 (single-unit: μg/m³)
-pm25_changed:
-  target: *target_pm25
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm25_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm25_crossed_threshold:
-  target: *target_pm25
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm25_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# PM4 (single-unit: μg/m³)
-pm4_changed:
-  target: *target_pm4
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm4_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm4_crossed_threshold:
-  target: *target_pm4
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm4_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# PM10 (single-unit: μg/m³)
-pm10_changed:
-  target: *target_pm10
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm10_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm10_crossed_threshold:
-  target: *target_pm10
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm10_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# Ozone (multi-unit)
-ozone_changed:
-  target: *target_ozone
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *ozone_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *ozone_units
-
-ozone_crossed_threshold:
-  target: *target_ozone
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *ozone_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *ozone_units
-
-# VOC (multi-unit)
-voc_changed:
-  target: *target_voc
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *voc_units
-
-voc_crossed_threshold:
-  target: *target_voc
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *voc_units
-
-# VOC ratio (multi-unit)
-voc_ratio_changed:
-  target: *target_voc_ratio
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_ratio_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *voc_ratio_units
-
-voc_ratio_crossed_threshold:
-  target: *target_voc_ratio
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_ratio_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *voc_ratio_units
-
-# NO (multi-unit)
-no_changed:
-  target: *target_no
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *no_units
-
-no_crossed_threshold:
-  target: *target_no
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *no_units
-
-# NO2 (multi-unit)
-no2_changed:
-  target: *target_no2
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no2_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *no2_units
-
-no2_crossed_threshold:
-  target: *target_no2
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no2_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *no2_units
-
-# N2O (single-unit: μg/m³)
-n2o_changed:
-  target: *target_n2o
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *n2o_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-n2o_crossed_threshold:
-  target: *target_n2o
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *n2o_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# SO2 (multi-unit)
-so2_changed:
-  target: *target_so2
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *so2_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *so2_units
-
-so2_crossed_threshold:
-  target: *target_so2
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *so2_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *so2_units
--- a/homeassistant/components/airq/config_flow.py
+++ b/homeassistant/components/airq/config_flow.py
@@ -87,7 +87,7 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
            _LOGGER.debug("Successfully connected to %s", user_input[CONF_IP_ADDRESS])

            device_info = await airq.fetch_device_info()
-            await self.async_set_unique_id(device_info["id"], raise_on_progress=False)
+            await self.async_set_unique_id(device_info["id"])
            self._abort_if_unique_id_configured()

            _LOGGER.debug("Creating an entry for %s", device_info["name"])
--- a/homeassistant/components/airq/diagnostics.py
+++ b/homeassistant/components/airq/diagnostics.py
@@ -1,36 +0,0 @@
-"""Diagnostics support for air-Q."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_UNIQUE_ID
-from homeassistant.core import HomeAssistant
-
-from . import AirQConfigEntry
-
-REDACT_CONFIG = {CONF_PASSWORD, CONF_UNIQUE_ID, CONF_IP_ADDRESS, "title"}
-REDACT_DEVICE_INFO = {"identifiers", "name"}
-REDACT_COORDINATOR_DATA = {"DeviceID"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: AirQConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    coordinator = entry.runtime_data
-
-    return {
-        "config_entry": async_redact_data(entry.as_dict(), REDACT_CONFIG),
-        "device_info": async_redact_data(
-            dict(coordinator.device_info), REDACT_DEVICE_INFO
-        ),
-        "coordinator_data": async_redact_data(
-            coordinator.data, REDACT_COORDINATOR_DATA
-        ),
-        "options": {
-            "clip_negative": coordinator.clip_negative,
-            "return_average": coordinator.return_average,
-        },
-    }
--- a/homeassistant/components/airq/strings.json
+++ b/homeassistant/components/airq/strings.json
@@ -2,7 +2,6 @@
  "config": {
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "incomplete_discovery": "The discovered air-Q device did not provide a device ID. Ensure the firmware is up to date."
    },
    "error": {
--- a/homeassistant/components/aladdin_connect/init.py
+++ b/homeassistant/components/aladdin_connect/init.py
@@ -46,10 +46,19 @@ async def async_setup_entry(
        api.AsyncConfigEntryAuth(aiohttp_client.async_get_clientsession(hass), session)
    )

-    coordinator = AladdinConnectCoordinator(hass, entry, client)
-    await coordinator.async_config_entry_first_refresh()
+    try:
+        doors = await client.get_doors()
+    except aiohttp.ClientResponseError as err:
+        if 400 <= err.status < 500:
+            raise ConfigEntryAuthFailed(err) from err
+        raise ConfigEntryNotReady from err
+    except aiohttp.ClientError as err:
+        raise ConfigEntryNotReady from err

-    entry.runtime_data = coordinator
+    entry.runtime_data = {
+        door.unique_id: AladdinConnectCoordinator(hass, entry, client, door)
+        for door in doors
+    }

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

@@ -91,7 +100,7 @@ def remove_stale_devices(
    device_entries = dr.async_entries_for_config_entry(
        device_registry, config_entry.entry_id
    )
-    all_device_ids = set(config_entry.runtime_data.data)
+    all_device_ids = set(config_entry.runtime_data)

    for device_entry in device_entries:
        device_id: str | None = None
--- a/homeassistant/components/aladdin_connect/coordinator.py
+++ b/homeassistant/components/aladdin_connect/coordinator.py
@@ -11,24 +11,22 @@ from genie_partner_sdk.model import GarageDoor

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 _LOGGER = logging.getLogger(__name__)
-type AladdinConnectConfigEntry = ConfigEntry[AladdinConnectCoordinator]
+type AladdinConnectConfigEntry = ConfigEntry[dict[str, AladdinConnectCoordinator]]
 SCAN_INTERVAL = timedelta(seconds=15)


-class AladdinConnectCoordinator(DataUpdateCoordinator[dict[str, GarageDoor]]):
+class AladdinConnectCoordinator(DataUpdateCoordinator[GarageDoor]):
    """Coordinator for Aladdin Connect integration."""

-    config_entry: AladdinConnectConfigEntry
-
    def __init__(
        self,
        hass: HomeAssistant,
        entry: AladdinConnectConfigEntry,
        client: AladdinConnectClient,
+        garage_door: GarageDoor,
    ) -> None:
        """Initialize the coordinator."""
        super().__init__(
@@ -39,16 +37,18 @@ class AladdinConnectCoordinator(DataUpdateCoordinator[dict[str, GarageDoor]]):
            update_interval=SCAN_INTERVAL,
        )
        self.client = client
+        self.data = garage_door

-    async def _async_update_data(self) -> dict[str, GarageDoor]:
+    async def _async_update_data(self) -> GarageDoor:
        """Fetch data from the Aladdin Connect API."""
        try:
-            doors = await self.client.get_doors()
-        except aiohttp.ClientResponseError as err:
-            if 400 <= err.status < 500:
-                raise ConfigEntryAuthFailed(err) from err
-            raise UpdateFailed(f"Error communicating with API: {err}") from err
+            await self.client.update_door(self.data.device_id, self.data.door_number)
        except aiohttp.ClientError as err:
            raise UpdateFailed(f"Error communicating with API: {err}") from err
-
-        return {door.unique_id: door for door in doors}
+        self.data.status = self.client.get_door_status(
+            self.data.device_id, self.data.door_number
+        )
+        self.data.battery_level = self.client.get_battery_status(
+            self.data.device_id, self.data.door_number
+        )
+        return self.data
--- a/homeassistant/components/aladdin_connect/cover.py
+++ b/homeassistant/components/aladdin_connect/cover.py
@@ -7,7 +7,7 @@ from typing import Any
 import aiohttp

 from homeassistant.components.cover import CoverDeviceClass, CoverEntity
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

@@ -24,22 +24,11 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up the cover platform."""
-    coordinator = entry.runtime_data
-    known_devices: set[str] = set()
+    coordinators = entry.runtime_data

-    @callback
-    def _async_add_new_devices() -> None:
-        """Detect and add entities for new doors."""
-        current_devices = set(coordinator.data)
-        new_devices = current_devices - known_devices
-        if new_devices:
-            known_devices.update(new_devices)
-            async_add_entities(
-                AladdinCoverEntity(coordinator, door_id) for door_id in new_devices
-            )
-
-    _async_add_new_devices()
-    entry.async_on_unload(coordinator.async_add_listener(_async_add_new_devices))
+    async_add_entities(
+        AladdinCoverEntity(coordinator) for coordinator in coordinators.values()
+    )


 class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):
@@ -49,10 +38,10 @@ class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):
    _attr_supported_features = SUPPORTED_FEATURES
    _attr_name = None

-    def __init__(self, coordinator: AladdinConnectCoordinator, door_id: str) -> None:
+    def __init__(self, coordinator: AladdinConnectCoordinator) -> None:
        """Initialize the Aladdin Connect cover."""
-        super().__init__(coordinator, door_id)
-        self._attr_unique_id = door_id
+        super().__init__(coordinator)
+        self._attr_unique_id = coordinator.data.unique_id

    async def async_open_cover(self, **kwargs: Any) -> None:
        """Issue open command to cover."""
@@ -77,16 +66,16 @@ class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):
    @property
    def is_closed(self) -> bool | None:
        """Update is closed attribute."""
-        if (status := self.door.status) is None:
+        if (status := self.coordinator.data.status) is None:
            return None
        return status == "closed"

    @property
    def is_closing(self) -> bool | None:
        """Update is closing attribute."""
-        return self.door.status == "closing"
+        return self.coordinator.data.status == "closing"

    @property
    def is_opening(self) -> bool | None:
        """Update is opening attribute."""
-        return self.door.status == "opening"
+        return self.coordinator.data.status == "opening"
--- a/homeassistant/components/aladdin_connect/diagnostics.py
+++ b/homeassistant/components/aladdin_connect/diagnostics.py
@@ -20,13 +20,13 @@ async def async_get_config_entry_diagnostics(
        "config_entry": async_redact_data(config_entry.as_dict(), TO_REDACT),
        "doors": {
            uid: {
-                "device_id": door.device_id,
-                "door_number": door.door_number,
-                "name": door.name,
-                "status": door.status,
-                "link_status": door.link_status,
-                "battery_level": door.battery_level,
+                "device_id": coordinator.data.device_id,
+                "door_number": coordinator.data.door_number,
+                "name": coordinator.data.name,
+                "status": coordinator.data.status,
+                "link_status": coordinator.data.link_status,
+                "battery_level": coordinator.data.battery_level,
            }
-            for uid, door in config_entry.runtime_data.data.items()
+            for uid, coordinator in config_entry.runtime_data.items()
        },
    }
--- a/homeassistant/components/aladdin_connect/entity.py
+++ b/homeassistant/components/aladdin_connect/entity.py
@@ -1,7 +1,6 @@
 """Base class for Aladdin Connect entities."""

 from genie_partner_sdk.client import AladdinConnectClient
-from genie_partner_sdk.model import GarageDoor

 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -15,28 +14,17 @@ class AladdinConnectEntity(CoordinatorEntity[AladdinConnectCoordinator]):

    _attr_has_entity_name = True

-    def __init__(self, coordinator: AladdinConnectCoordinator, door_id: str) -> None:
+    def __init__(self, coordinator: AladdinConnectCoordinator) -> None:
        """Initialize Aladdin Connect entity."""
        super().__init__(coordinator)
-        self._door_id = door_id
-        door = self.door
+        device = coordinator.data
        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, door.unique_id)},
+            identifiers={(DOMAIN, device.unique_id)},
            manufacturer="Aladdin Connect",
-            name=door.name,
+            name=device.name,
        )
-        self._device_id = door.device_id
-        self._number = door.door_number
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return super().available and self._door_id in self.coordinator.data
-
-    @property
-    def door(self) -> GarageDoor:
-        """Return the garage door data."""
-        return self.coordinator.data[self._door_id]
+        self._device_id = device.device_id
+        self._number = device.door_number

    @property
    def client(self) -> AladdinConnectClient:
--- a/homeassistant/components/aladdin_connect/quality_scale.yaml
+++ b/homeassistant/components/aladdin_connect/quality_scale.yaml
@@ -57,7 +57,7 @@ rules:
  docs-supported-functions: done
  docs-troubleshooting: done
  docs-use-cases: done
-  dynamic-devices: done
+  dynamic-devices: todo
  entity-category: done
  entity-device-class: done
  entity-disabled-by-default: done
--- a/homeassistant/components/aladdin_connect/sensor.py
+++ b/homeassistant/components/aladdin_connect/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import PERCENTAGE, EntityCategory
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
@@ -49,24 +49,13 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up Aladdin Connect sensor devices."""
-    coordinator = entry.runtime_data
-    known_devices: set[str] = set()
+    coordinators = entry.runtime_data

-    @callback
-    def _async_add_new_devices() -> None:
-        """Detect and add entities for new doors."""
-        current_devices = set(coordinator.data)
-        new_devices = current_devices - known_devices
-        if new_devices:
-            known_devices.update(new_devices)
-            async_add_entities(
-                AladdinConnectSensor(coordinator, door_id, description)
-                for door_id in new_devices
-                for description in SENSOR_TYPES
-            )
-
-    _async_add_new_devices()
-    entry.async_on_unload(coordinator.async_add_listener(_async_add_new_devices))
+    async_add_entities(
+        AladdinConnectSensor(coordinator, description)
+        for coordinator in coordinators.values()
+        for description in SENSOR_TYPES
+    )


 class AladdinConnectSensor(AladdinConnectEntity, SensorEntity):
@@ -77,15 +66,14 @@ class AladdinConnectSensor(AladdinConnectEntity, SensorEntity):
    def __init__(
        self,
        coordinator: AladdinConnectCoordinator,
-        door_id: str,
        entity_description: AladdinConnectSensorEntityDescription,
    ) -> None:
        """Initialize the Aladdin Connect sensor."""
-        super().__init__(coordinator, door_id)
+        super().__init__(coordinator)
        self.entity_description = entity_description
-        self._attr_unique_id = f"{door_id}-{entity_description.key}"
+        self._attr_unique_id = f"{coordinator.data.unique_id}-{entity_description.key}"

    @property
    def native_value(self) -> float | None:
        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.door)
+        return self.entity_description.value_fn(self.coordinator.data)
--- a/homeassistant/components/alarm_control_panel/condition.py
+++ b/homeassistant/components/alarm_control_panel/condition.py
@@ -2,7 +2,6 @@

 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import (
    Condition,
    EntityStateConditionBase,
@@ -44,7 +43,7 @@ def make_entity_state_required_features_condition(
    class CustomCondition(EntityStateRequiredFeaturesCondition):
        """Condition for entity state changes."""

-        _domain_specs = {domain: DomainSpec()}
+        _domain = domain
        _states = {to_state}
        _required_features = required_features

--- a/homeassistant/components/alarm_control_panel/strings.json
+++ b/homeassistant/components/alarm_control_panel/strings.json
@@ -1,13 +1,16 @@
 {
  "common": {
-    "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "condition_behavior_description": "How the state should match on the targeted alarms.",
+    "condition_behavior_name": "Behavior",
+    "trigger_behavior_description": "The behavior of the targeted alarms to trigger on.",
+    "trigger_behavior_name": "Behavior"
  },
  "conditions": {
    "is_armed": {
      "description": "Tests if one or more alarms are armed.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
        }
      },
@@ -17,6 +20,7 @@
      "description": "Tests if one or more alarms are armed in away mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
        }
      },
@@ -26,6 +30,7 @@
      "description": "Tests if one or more alarms are armed in home mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
        }
      },
@@ -35,6 +40,7 @@
      "description": "Tests if one or more alarms are armed in night mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
        }
      },
@@ -44,6 +50,7 @@
      "description": "Tests if one or more alarms are armed in vacation mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
        }
      },
@@ -53,6 +60,7 @@
      "description": "Tests if one or more alarms are disarmed.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
        }
      },
@@ -62,6 +70,7 @@
      "description": "Tests if one or more alarms are triggered.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
        }
      },
@@ -164,7 +173,7 @@
          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
        }
      },
-      "name": "Arm alarm away"
+      "name": "Arm away"
    },
    "alarm_arm_custom_bypass": {
      "description": "Arms an alarm while allowing to bypass a custom area.",
@@ -174,7 +183,7 @@
          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
        }
      },
-      "name": "Arm alarm with custom bypass"
+      "name": "Arm with custom bypass"
    },
    "alarm_arm_home": {
      "description": "Arms an alarm in the home mode.",
@@ -184,7 +193,7 @@
          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
        }
      },
-      "name": "Arm alarm home"
+      "name": "Arm home"
    },
    "alarm_arm_night": {
      "description": "Arms an alarm in the night mode.",
@@ -194,7 +203,7 @@
          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
        }
      },
-      "name": "Arm alarm night"
+      "name": "Arm night"
    },
    "alarm_arm_vacation": {
      "description": "Arms an alarm in the vacation mode.",
@@ -204,7 +213,7 @@
          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
        }
      },
-      "name": "Arm alarm vacation"
+      "name": "Arm vacation"
    },
    "alarm_disarm": {
      "description": "Disarms an alarm.",
@@ -214,7 +223,7 @@
          "name": "Code"
        }
      },
-      "name": "Disarm alarm"
+      "name": "Disarm"
    },
    "alarm_trigger": {
      "description": "Triggers an alarm manually.",
@@ -224,7 +233,7 @@
          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
        }
      },
-      "name": "Trigger alarm"
+      "name": "Trigger"
    }
  },
  "title": "Alarm control panel",
@@ -233,6 +242,7 @@
      "description": "Triggers after one or more alarms become armed, regardless of the mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
        }
      },
@@ -242,6 +252,7 @@
      "description": "Triggers after one or more alarms become armed in away mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
        }
      },
@@ -251,6 +262,7 @@
      "description": "Triggers after one or more alarms become armed in home mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
        }
      },
@@ -260,6 +272,7 @@
      "description": "Triggers after one or more alarms become armed in night mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
        }
      },
@@ -269,6 +282,7 @@
      "description": "Triggers after one or more alarms become armed in vacation mode.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
        }
      },
@@ -278,6 +292,7 @@
      "description": "Triggers after one or more alarms become disarmed.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
        }
      },
@@ -287,6 +302,7 @@
      "description": "Triggers after one or more alarms become triggered.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
        }
      },
--- a/homeassistant/components/alarm_control_panel/trigger.py
+++ b/homeassistant/components/alarm_control_panel/trigger.py
@@ -2,7 +2,6 @@

 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.entity import get_supported_features
 from homeassistant.helpers.trigger import (
    EntityTargetStateTriggerBase,
@@ -45,7 +44,7 @@ def make_entity_state_trigger_required_features(
    class CustomTrigger(EntityStateTriggerRequiredFeatures):
        """Trigger for entity state changes."""

-        _domain_specs = {domain: DomainSpec()}
+        _domains = {domain}
        _to_states = {to_state}
        _required_features = required_features

--- a/homeassistant/components/alexa_devices/coordinator.py
+++ b/homeassistant/components/alexa_devices/coordinator.py
@@ -54,16 +54,7 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
            entry.data[CONF_PASSWORD],
            entry.data[CONF_LOGIN_DATA],
        )
-        device_registry = dr.async_get(hass)
-        self.previous_devices: set[str] = {
-            identifier
-            for device in device_registry.devices.get_devices_for_config_entry_id(
-                entry.entry_id
-            )
-            if device.entry_type != dr.DeviceEntryType.SERVICE
-            for identifier_domain, identifier in device.identifiers
-            if identifier_domain == DOMAIN
-        }
+        self.previous_devices: set[str] = set()

    async def _async_update_data(self) -> dict[str, AmazonDevice]:
        """Update device data."""
--- a/homeassistant/components/alexa_devices/entity.py
+++ b/homeassistant/components/alexa_devices/entity.py
@@ -1,5 +1,6 @@
 """Defines a base Alexa Devices entity."""

+from aioamazondevices.const.devices import SPEAKER_GROUP_DEVICE_TYPE
 from aioamazondevices.structures import AmazonDevice

 from homeassistant.helpers.device_registry import DeviceInfo
@@ -24,15 +25,20 @@ class AmazonEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
        """Initialize the entity."""
        super().__init__(coordinator)
        self._serial_num = serial_num
+        model = self.device.model
        self._attr_device_info = DeviceInfo(
            identifiers={(DOMAIN, serial_num)},
            name=self.device.account_name,
-            model=self.device.model,
+            model=model,
            model_id=self.device.device_type,
            manufacturer=self.device.manufacturer or "Amazon",
            hw_version=self.device.hardware_version,
-            sw_version=self.device.software_version,
-            serial_number=serial_num,
+            sw_version=(
+                self.device.software_version
+                if model != SPEAKER_GROUP_DEVICE_TYPE
+                else None
+            ),
+            serial_number=serial_num if model != SPEAKER_GROUP_DEVICE_TYPE else None,
        )
        self.entity_description = description
        self._attr_unique_id = f"{serial_num}-{description.key}"
--- a/homeassistant/components/alexa_devices/manifest.json
+++ b/homeassistant/components/alexa_devices/manifest.json
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
  "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==13.3.2"]
+  "requirements": ["aioamazondevices==13.0.0"]
 }
--- a/homeassistant/components/alexa_devices/switch.py
+++ b/homeassistant/components/alexa_devices/switch.py
@@ -101,10 +101,7 @@ class AmazonSwitchEntity(AmazonEntity, SwitchEntity):
            assert method is not None

        await method(self.device, state)
-        self.coordinator.data[self.device.serial_number].sensors[
-            self.entity_description.key
-        ].value = state
-        self.async_write_ha_state()
+        await self.coordinator.async_request_refresh()

    async def async_turn_on(self, **kwargs: Any) -> None:
        """Turn the switch on."""
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -338,7 +338,6 @@ class Analytics:

        hass = self._hass
        supervisor_info = None
-        addons_info: dict[str, Any] | None = None
        operating_system_info: dict[str, Any] = {}

        if self._data.uuid is None:
@@ -348,7 +347,6 @@ class Analytics:
        if self.supervisor:
            supervisor_info = hassio.get_supervisor_info(hass)
            operating_system_info = hassio.get_os_info(hass) or {}
-            addons_info = hassio.get_addons_info(hass) or {}

        system_info = await async_get_system_info(hass)
        integrations = []
@@ -421,10 +419,13 @@ class Analytics:

                integrations.append(integration.domain)

-            if addons_info is not None:
+            if supervisor_info is not None:
                supervisor_client = hassio.get_supervisor_client(hass)
                installed_addons = await asyncio.gather(
-                    *(supervisor_client.addons.addon_info(slug) for slug in addons_info)
+                    *(
+                        supervisor_client.addons.addon_info(addon[ATTR_SLUG])
+                        for addon in supervisor_info[ATTR_ADDONS]
+                    )
                )
                addons.extend(
                    {
--- a/homeassistant/components/analytics_insights/init.py
+++ b/homeassistant/components/analytics_insights/init.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 from dataclasses import dataclass

 from python_homeassistant_analytics import (
-    Environment,
    HomeassistantAnalyticsClient,
    HomeassistantAnalyticsConnectionError,
 )
@@ -39,7 +38,7 @@ async def async_setup_entry(
    client = HomeassistantAnalyticsClient(session=async_get_clientsession(hass))

    try:
-        integrations = await client.get_integrations(Environment.NEXT)
+        integrations = await client.get_integrations()
    except HomeassistantAnalyticsConnectionError as ex:
        raise ConfigEntryNotReady("Could not fetch integration list") from ex

--- a/homeassistant/components/androidtv_remote/manifest.json
+++ b/homeassistant/components/androidtv_remote/manifest.json
@@ -8,6 +8,6 @@
  "iot_class": "local_push",
  "loggers": ["androidtvremote2"],
  "quality_scale": "platinum",
-  "requirements": ["androidtvremote2==0.3.1"],
+  "requirements": ["androidtvremote2==0.2.3"],
  "zeroconf": ["_androidtvremote2._tcp.local."]
 }
--- a/homeassistant/components/anglian_water/coordinator.py
+++ b/homeassistant/components/anglian_water/coordinator.py
@@ -92,7 +92,6 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                _LOGGER.debug("Updating statistics for the first time")
                usage_sum = 0.0
                last_stats_time = None
-                allow_update_last_stored_hour = False
            else:
                if not meter.readings or len(meter.readings) == 0:
                    _LOGGER.debug("No recent usage statistics found, skipping update")
@@ -108,7 +107,6 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                    continue
                start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
                _LOGGER.debug("Getting statistics at %s", start)
-                stats: dict[str, list[Any]] = {}
                for end in (start + timedelta(seconds=1), None):
                    stats = await get_instance(self.hass).async_add_executor_job(
                        statistics_during_period,
@@ -129,28 +127,15 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                            "Not found, trying to find oldest statistic after %s",
                            start,
                        )
+                assert stats

-                if not stats or not stats.get(usage_statistic_id):
-                    _LOGGER.debug(
-                        "Could not find existing statistics during period lookup for %s, "
-                        "falling back to last stored statistic",
-                        usage_statistic_id,
-                    )
-                    allow_update_last_stored_hour = True
-                    last_records = last_stat[usage_statistic_id]
-                    usage_sum = float(last_records[0].get("sum") or 0.0)
-                    last_stats_time = last_records[0]["start"]
-                else:
-                    allow_update_last_stored_hour = False
-                    records = stats[usage_statistic_id]
+                def _safe_get_sum(records: list[Any]) -> float:
+                    if records and "sum" in records[0]:
+                        return float(records[0]["sum"])
+                    return 0.0

-                    def _safe_get_sum(records: list[Any]) -> float:
-                        if records and "sum" in records[0]:
-                            return float(records[0]["sum"])
-                        return 0.0
-
-                    usage_sum = _safe_get_sum(records)
-                    last_stats_time = records[0]["start"]
+                usage_sum = _safe_get_sum(stats.get(usage_statistic_id, []))
+                last_stats_time = stats[usage_statistic_id][0]["start"]

            usage_statistics = []

@@ -163,13 +148,7 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                    )
                    continue
                start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
-                if last_stats_time is not None and (
-                    start.timestamp() < last_stats_time
-                    or (
-                        start.timestamp() == last_stats_time
-                        and not allow_update_last_stored_hour
-                    )
-                ):
+                if last_stats_time is not None and start.timestamp() <= last_stats_time:
                    continue
                usage_state = max(0, read["consumption"] / 1000)
                usage_sum = max(0, read["read"])
--- a/homeassistant/components/anglian_water/manifest.json
+++ b/homeassistant/components/anglian_water/manifest.json
@@ -9,5 +9,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["pyanglianwater"],
  "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.1.2"]
+  "requirements": ["pyanglianwater==3.1.1"]
 }
--- a/homeassistant/components/anglian_water/sensor.py
+++ b/homeassistant/components/anglian_water/sensor.py
@@ -4,7 +4,6 @@ from __future__ import annotations

 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime
 from enum import StrEnum

 from pyanglianwater.meter import SmartMeter
@@ -33,14 +32,13 @@ class AnglianWaterSensor(StrEnum):
    YESTERDAY_WATER_COST = "yesterday_water_cost"
    YESTERDAY_SEWERAGE_COST = "yesterday_sewerage_cost"
    LATEST_READING = "latest_reading"
-    LAST_UPDATED = "last_updated"


@dataclass(frozen=True, kw_only=True)
 class AnglianWaterSensorEntityDescription(SensorEntityDescription):
    """Describes AnglianWater sensor entity."""

-    value_fn: Callable[[SmartMeter], float | datetime | None]
+    value_fn: Callable[[SmartMeter], float]


 ENTITY_DESCRIPTIONS: tuple[AnglianWaterSensorEntityDescription, ...] = (
@@ -78,13 +76,6 @@ ENTITY_DESCRIPTIONS: tuple[AnglianWaterSensorEntityDescription, ...] = (
        translation_key=AnglianWaterSensor.YESTERDAY_SEWERAGE_COST,
        entity_category=EntityCategory.DIAGNOSTIC,
    ),
-    AnglianWaterSensorEntityDescription(
-        key=AnglianWaterSensor.LAST_UPDATED,
-        device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=lambda entity: entity.last_updated,
-        translation_key=AnglianWaterSensor.LAST_UPDATED,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
 )


@@ -121,6 +112,6 @@ class AnglianWaterSensorEntity(AnglianWaterEntity, SensorEntity):
        self.entity_description = description

    @property
-    def native_value(self) -> float | datetime | None:
+    def native_value(self) -> float | None:
        """Return the state of the sensor."""
        return self.entity_description.value_fn(self.smart_meter)
--- a/homeassistant/components/anglian_water/strings.json
+++ b/homeassistant/components/anglian_water/strings.json
@@ -34,9 +34,6 @@
  },
  "entity": {
    "sensor": {
-      "last_updated": {
-        "name": "Last meter reading processed"
-      },
      "latest_reading": {
        "name": "Latest reading"
      },
--- a/homeassistant/components/arcam_fmj/init.py
+++ b/homeassistant/components/arcam_fmj/init.py
@@ -8,55 +8,46 @@ from typing import Any
 from arcam.fmj import ConnectionFailed
 from arcam.fmj.client import Client

+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.dispatcher import async_dispatcher_send

-from .const import DEFAULT_SCAN_INTERVAL
-from .coordinator import ArcamFmjConfigEntry, ArcamFmjCoordinator, ArcamFmjRuntimeData
+from .const import (
+    DEFAULT_SCAN_INTERVAL,
+    SIGNAL_CLIENT_DATA,
+    SIGNAL_CLIENT_STARTED,
+    SIGNAL_CLIENT_STOPPED,
+)
+
+type ArcamFmjConfigEntry = ConfigEntry[Client]

 _LOGGER = logging.getLogger(__name__)


-PLATFORMS = [Platform.BINARY_SENSOR, Platform.MEDIA_PLAYER, Platform.SENSOR]
+PLATFORMS = [Platform.MEDIA_PLAYER]


 async def async_setup_entry(hass: HomeAssistant, entry: ArcamFmjConfigEntry) -> bool:
    """Set up config entry."""
-    client = Client(entry.data[CONF_HOST], entry.data[CONF_PORT])
-
-    coordinators: dict[int, ArcamFmjCoordinator] = {}
-    for zone in (1, 2):
-        coordinator = ArcamFmjCoordinator(hass, entry, client, zone)
-        coordinators[zone] = coordinator
-
-    entry.runtime_data = ArcamFmjRuntimeData(client, coordinators)
+    entry.runtime_data = Client(entry.data[CONF_HOST], entry.data[CONF_PORT])

    entry.async_create_background_task(
-        hass,
-        _run_client(hass, entry.runtime_data, DEFAULT_SCAN_INTERVAL),
-        "arcam_fmj",
+        hass, _run_client(hass, entry.runtime_data, DEFAULT_SCAN_INTERVAL), "arcam_fmj"
    )

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
    return True


-async def async_unload_entry(hass: HomeAssistant, entry: ArcamFmjConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    """Cleanup before removing config entry."""
    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)


-async def _run_client(
-    hass: HomeAssistant,
-    runtime_data: ArcamFmjRuntimeData,
-    interval: float,
-) -> None:
-    client = runtime_data.client
-    coordinators = runtime_data.coordinators
-
+async def _run_client(hass: HomeAssistant, client: Client, interval: float) -> None:
    def _listen(_: Any) -> None:
-        for coordinator in coordinators.values():
-            coordinator.async_notify_data_updated()
+        async_dispatcher_send(hass, SIGNAL_CLIENT_DATA, client.host)

    while True:
        try:
@@ -64,21 +55,16 @@ async def _run_client(
                await client.start()

            _LOGGER.debug("Client connected %s", client.host)
+            async_dispatcher_send(hass, SIGNAL_CLIENT_STARTED, client.host)

            try:
-                for coordinator in coordinators.values():
-                    await coordinator.state.start()
-
                with client.listen(_listen):
-                    for coordinator in coordinators.values():
-                        coordinator.async_notify_connected()
                    await client.process()
            finally:
                await client.stop()

                _LOGGER.debug("Client disconnected %s", client.host)
-                for coordinator in coordinators.values():
-                    coordinator.async_notify_disconnected()
+                async_dispatcher_send(hass, SIGNAL_CLIENT_STOPPED, client.host)

        except ConnectionFailed:
            await asyncio.sleep(interval)
--- a/homeassistant/components/arcam_fmj/binary_sensor.py
+++ b/homeassistant/components/arcam_fmj/binary_sensor.py
@@ -1,68 +0,0 @@
-"""Arcam binary sensors for incoming stream info."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from arcam.fmj.state import State
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import ArcamFmjConfigEntry
-from .entity import ArcamFmjEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class ArcamFmjBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Describes an Arcam FMJ binary sensor entity."""
-
-    value_fn: Callable[[State], bool | None]
-
-
-BINARY_SENSORS: tuple[ArcamFmjBinarySensorEntityDescription, ...] = (
-    ArcamFmjBinarySensorEntityDescription(
-        key="incoming_video_interlaced",
-        translation_key="incoming_video_interlaced",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda state: (
-            vp.interlaced
-            if (vp := state.get_incoming_video_parameters()) is not None
-            else None
-        ),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ArcamFmjConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Arcam FMJ binary sensors from a config entry."""
-    coordinators = config_entry.runtime_data.coordinators
-
-    entities: list[ArcamFmjBinarySensorEntity] = []
-    for coordinator in coordinators.values():
-        entities.extend(
-            ArcamFmjBinarySensorEntity(coordinator, description)
-            for description in BINARY_SENSORS
-        )
-    async_add_entities(entities)
-
-
-class ArcamFmjBinarySensorEntity(ArcamFmjEntity, BinarySensorEntity):
-    """Representation of an Arcam FMJ binary sensor."""
-
-    entity_description: ArcamFmjBinarySensorEntityDescription
-
-    @property
-    def is_on(self) -> bool | None:
-        """Return the binary sensor value."""
-        return self.entity_description.value_fn(self.coordinator.state)
--- a/homeassistant/components/arcam_fmj/const.py
+++ b/homeassistant/components/arcam_fmj/const.py
@@ -2,6 +2,10 @@

 DOMAIN = "arcam_fmj"

+SIGNAL_CLIENT_STARTED = "arcam.client_started"
+SIGNAL_CLIENT_STOPPED = "arcam.client_stopped"
+SIGNAL_CLIENT_DATA = "arcam.client_data"
+
 EVENT_TURN_ON = "arcam_fmj.turn_on"

 DEFAULT_PORT = 50000
--- a/homeassistant/components/arcam_fmj/coordinator.py
+++ b/homeassistant/components/arcam_fmj/coordinator.py
@@ -1,97 +0,0 @@
-"""Coordinator for Arcam FMJ integration."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-import logging
-
-from arcam.fmj import ConnectionFailed
-from arcam.fmj.client import Client
-from arcam.fmj.state import State
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class ArcamFmjRuntimeData:
-    """Runtime data for Arcam FMJ integration."""
-
-    client: Client
-    coordinators: dict[int, ArcamFmjCoordinator]
-
-
-type ArcamFmjConfigEntry = ConfigEntry[ArcamFmjRuntimeData]
-
-
-class ArcamFmjCoordinator(DataUpdateCoordinator[None]):
-    """Coordinator for a single Arcam FMJ zone."""
-
-    config_entry: ArcamFmjConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: ArcamFmjConfigEntry,
-        client: Client,
-        zone: int,
-    ) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name=f"Arcam FMJ zone {zone}",
-        )
-        self.client = client
-        self.state = State(client, zone)
-        self.last_update_success = False
-
-        name = config_entry.title
-        unique_id = config_entry.unique_id or config_entry.entry_id
-        unique_id_device = unique_id
-        if zone != 1:
-            unique_id_device += f"-{zone}"
-            name += f" Zone {zone}"
-
-        self.device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id_device)},
-            manufacturer="Arcam",
-            model="Arcam FMJ AVR",
-            name=name,
-        )
-        self.zone_unique_id = f"{unique_id}-{zone}"
-
-        if zone != 1:
-            self.device_info["via_device"] = (DOMAIN, unique_id)
-
-    async def _async_update_data(self) -> None:
-        """Fetch data for manual refresh."""
-        try:
-            await self.state.update()
-        except ConnectionFailed as err:
-            raise UpdateFailed(
-                f"Connection failed during update for zone {self.state.zn}"
-            ) from err
-
-    @callback
-    def async_notify_data_updated(self) -> None:
-        """Notify that new data has been received from the device."""
-        self.async_set_updated_data(None)
-
-    @callback
-    def async_notify_connected(self) -> None:
-        """Handle client connected."""
-        self.hass.async_create_task(self.async_refresh())
-
-    @callback
-    def async_notify_disconnected(self) -> None:
-        """Handle client disconnected."""
-        self.last_update_success = False
-        self.async_update_listeners()
--- a/homeassistant/components/arcam_fmj/entity.py
+++ b/homeassistant/components/arcam_fmj/entity.py
@@ -1,28 +0,0 @@
-"""Base entity for Arcam FMJ integration."""
-
-from __future__ import annotations
-
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .coordinator import ArcamFmjCoordinator
-
-
-class ArcamFmjEntity(CoordinatorEntity[ArcamFmjCoordinator]):
-    """Base entity for Arcam FMJ."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: ArcamFmjCoordinator,
-        description: EntityDescription | None = None,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._attr_device_info = coordinator.device_info
-        self._attr_entity_registry_enabled_default = coordinator.state.zn == 1
-        self._attr_unique_id = coordinator.zone_unique_id
-        if description is not None:
-            self._attr_unique_id = f"{self._attr_unique_id}-{description.key}"
-            self.entity_description = description
--- a/homeassistant/components/arcam_fmj/icons.json
+++ b/homeassistant/components/arcam_fmj/icons.json
@@ -1,35 +0,0 @@
-{
-  "entity": {
-    "binary_sensor": {
-      "incoming_video_interlaced": {
-        "default": "mdi:reorder-horizontal"
-      }
-    },
-    "sensor": {
-      "incoming_audio_config": {
-        "default": "mdi:surround-sound"
-      },
-      "incoming_audio_format": {
-        "default": "mdi:dolby"
-      },
-      "incoming_audio_sample_rate": {
-        "default": "mdi:waveform"
-      },
-      "incoming_video_aspect_ratio": {
-        "default": "mdi:aspect-ratio"
-      },
-      "incoming_video_colorspace": {
-        "default": "mdi:palette"
-      },
-      "incoming_video_horizontal_resolution": {
-        "default": "mdi:arrow-expand-horizontal"
-      },
-      "incoming_video_refresh_rate": {
-        "default": "mdi:animation"
-      },
-      "incoming_video_vertical_resolution": {
-        "default": "mdi:arrow-expand-vertical"
-      }
-    }
-  }
-}
--- a/homeassistant/components/arcam_fmj/manifest.json
+++ b/homeassistant/components/arcam_fmj/manifest.json
@@ -7,7 +7,7 @@
  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["arcam"],
-  "requirements": ["arcam-fmj==1.8.3"],
+  "requirements": ["arcam-fmj==1.8.2"],
  "ssdp": [
    {
      "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",
--- a/homeassistant/components/arcam_fmj/media_player.py
+++ b/homeassistant/components/arcam_fmj/media_player.py
@@ -8,6 +8,7 @@ import logging
 from typing import Any

 from arcam.fmj import ConnectionFailed, SourceCodes
+from arcam.fmj.state import State

 from homeassistant.components.media_player import (
    BrowseError,
@@ -19,13 +20,20 @@ from homeassistant.components.media_player import (
    MediaType,
 )
 from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

-from .const import EVENT_TURN_ON
-from .coordinator import ArcamFmjConfigEntry, ArcamFmjCoordinator
-from .entity import ArcamFmjEntity
+from . import ArcamFmjConfigEntry
+from .const import (
+    DOMAIN,
+    EVENT_TURN_ON,
+    SIGNAL_CLIENT_DATA,
+    SIGNAL_CLIENT_STARTED,
+    SIGNAL_CLIENT_STOPPED,
+)

 _LOGGER = logging.getLogger(__name__)

@@ -36,10 +44,19 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up the configuration entry."""
-    coordinators = config_entry.runtime_data.coordinators
+
+    client = config_entry.runtime_data

    async_add_entities(
-        [ArcamFmj(coordinators[zone]) for zone in (1, 2)],
+        [
+            ArcamFmj(
+                config_entry.title,
+                State(client, zone),
+                config_entry.unique_id or config_entry.entry_id,
+            )
+            for zone in (1, 2)
+        ],
+        True,
    )


@@ -60,13 +77,21 @@ def convert_exception[**_P, _R](
    return _convert_exception


-class ArcamFmj(ArcamFmjEntity, MediaPlayerEntity):
+class ArcamFmj(MediaPlayerEntity):
    """Representation of a media device."""

-    def __init__(self, coordinator: ArcamFmjCoordinator) -> None:
+    _attr_should_poll = False
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        device_name: str,
+        state: State,
+        uuid: str,
+    ) -> None:
        """Initialize device."""
-        super().__init__(coordinator)
-        self._state = coordinator.state
+        self._state = state
+        self._attr_name = f"Zone {state.zn}"
        self._attr_supported_features = (
            MediaPlayerEntityFeature.SELECT_SOURCE
            | MediaPlayerEntityFeature.PLAY_MEDIA
@@ -77,8 +102,18 @@ class ArcamFmj(ArcamFmjEntity, MediaPlayerEntity):
            | MediaPlayerEntityFeature.TURN_OFF
            | MediaPlayerEntityFeature.TURN_ON
        )
-        if self._state.zn == 1:
+        if state.zn == 1:
            self._attr_supported_features |= MediaPlayerEntityFeature.SELECT_SOUND_MODE
+        self._attr_unique_id = f"{uuid}-{state.zn}"
+        self._attr_entity_registry_enabled_default = state.zn == 1
+        self._attr_device_info = DeviceInfo(
+            identifiers={
+                (DOMAIN, uuid),
+            },
+            manufacturer="Arcam",
+            model="Arcam FMJ AVR",
+            name=device_name,
+        )

    @property
    def state(self) -> MediaPlayerState:
@@ -87,6 +122,49 @@ class ArcamFmj(ArcamFmjEntity, MediaPlayerEntity):
            return MediaPlayerState.ON
        return MediaPlayerState.OFF

+    async def async_added_to_hass(self) -> None:
+        """Once registered, add listener for events."""
+        await self._state.start()
+        try:
+            await self._state.update()
+        except ConnectionFailed as connection:
+            _LOGGER.debug("Connection lost during addition: %s", connection)
+
+        @callback
+        def _data(host: str) -> None:
+            if host == self._state.client.host:
+                self.async_write_ha_state()
+
+        @callback
+        def _started(host: str) -> None:
+            if host == self._state.client.host:
+                self.async_schedule_update_ha_state(force_refresh=True)
+
+        @callback
+        def _stopped(host: str) -> None:
+            if host == self._state.client.host:
+                self.async_schedule_update_ha_state(force_refresh=True)
+
+        self.async_on_remove(
+            async_dispatcher_connect(self.hass, SIGNAL_CLIENT_DATA, _data)
+        )
+
+        self.async_on_remove(
+            async_dispatcher_connect(self.hass, SIGNAL_CLIENT_STARTED, _started)
+        )
+
+        self.async_on_remove(
+            async_dispatcher_connect(self.hass, SIGNAL_CLIENT_STOPPED, _stopped)
+        )
+
+    async def async_update(self) -> None:
+        """Force update of state."""
+        _LOGGER.debug("Update state %s", self.name)
+        try:
+            await self._state.update()
+        except ConnectionFailed as connection:
+            _LOGGER.debug("Connection lost during update: %s", connection)
+
    @convert_exception
    async def async_mute_volume(self, mute: bool) -> None:
        """Send mute command."""
--- a/homeassistant/components/arcam_fmj/sensor.py
+++ b/homeassistant/components/arcam_fmj/sensor.py
@@ -1,163 +0,0 @@
-"""Arcam sensors for incoming stream info."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from arcam.fmj import IncomingVideoAspectRatio, IncomingVideoColorspace
-from arcam.fmj.state import IncomingAudioConfig, IncomingAudioFormat, State
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import EntityCategory, UnitOfFrequency
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import ArcamFmjConfigEntry
-from .entity import ArcamFmjEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class ArcamFmjSensorEntityDescription(SensorEntityDescription):
-    """Describes an Arcam FMJ sensor entity."""
-
-    value_fn: Callable[[State], int | float | str | None]
-
-
-SENSORS: tuple[ArcamFmjSensorEntityDescription, ...] = (
-    ArcamFmjSensorEntityDescription(
-        key="incoming_video_horizontal_resolution",
-        translation_key="incoming_video_horizontal_resolution",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement="px",
-        suggested_display_precision=0,
-        value_fn=lambda state: (
-            vp.horizontal_resolution
-            if (vp := state.get_incoming_video_parameters()) is not None
-            else None
-        ),
-    ),
-    ArcamFmjSensorEntityDescription(
-        key="incoming_video_vertical_resolution",
-        translation_key="incoming_video_vertical_resolution",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement="px",
-        suggested_display_precision=0,
-        value_fn=lambda state: (
-            vp.vertical_resolution
-            if (vp := state.get_incoming_video_parameters()) is not None
-            else None
-        ),
-    ),
-    ArcamFmjSensorEntityDescription(
-        key="incoming_video_refresh_rate",
-        translation_key="incoming_video_refresh_rate",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        suggested_display_precision=0,
-        value_fn=lambda state: (
-            vp.refresh_rate
-            if (vp := state.get_incoming_video_parameters()) is not None
-            else None
-        ),
-    ),
-    ArcamFmjSensorEntityDescription(
-        key="incoming_video_aspect_ratio",
-        translation_key="incoming_video_aspect_ratio",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=SensorDeviceClass.ENUM,
-        options=[member.name.lower() for member in IncomingVideoAspectRatio],
-        value_fn=lambda state: (
-            vp.aspect_ratio.name.lower()
-            if (vp := state.get_incoming_video_parameters()) is not None
-            else None
-        ),
-    ),
-    ArcamFmjSensorEntityDescription(
-        key="incoming_video_colorspace",
-        translation_key="incoming_video_colorspace",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=SensorDeviceClass.ENUM,
-        options=[member.name.lower() for member in IncomingVideoColorspace],
-        value_fn=lambda state: (
-            vp.colorspace.name.lower()
-            if (vp := state.get_incoming_video_parameters()) is not None
-            and vp.colorspace is not None
-            else None
-        ),
-    ),
-    ArcamFmjSensorEntityDescription(
-        key="incoming_audio_format",
-        translation_key="incoming_audio_format",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=SensorDeviceClass.ENUM,
-        options=[member.name.lower() for member in IncomingAudioFormat],
-        value_fn=lambda state: (
-            result.name.lower()
-            if (result := state.get_incoming_audio_format()[0]) is not None
-            else None
-        ),
-    ),
-    ArcamFmjSensorEntityDescription(
-        key="incoming_audio_config",
-        translation_key="incoming_audio_config",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=SensorDeviceClass.ENUM,
-        options=[member.name.lower() for member in IncomingAudioConfig],
-        value_fn=lambda state: (
-            result.name.lower()
-            if (result := state.get_incoming_audio_format()[1]) is not None
-            else None
-        ),
-    ),
-    ArcamFmjSensorEntityDescription(
-        key="incoming_audio_sample_rate",
-        translation_key="incoming_audio_sample_rate",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        suggested_display_precision=0,
-        value_fn=lambda state: (
-            None
-            if (sample_rate := state.get_incoming_audio_sample_rate()) == 0
-            else sample_rate
-        ),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ArcamFmjConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Arcam FMJ sensors from a config entry."""
-    coordinators = config_entry.runtime_data.coordinators
-
-    entities: list[ArcamFmjSensorEntity] = []
-    for coordinator in coordinators.values():
-        entities.extend(
-            ArcamFmjSensorEntity(coordinator, description) for description in SENSORS
-        )
-    async_add_entities(entities)
-
-
-class ArcamFmjSensorEntity(ArcamFmjEntity, SensorEntity):
-    """Representation of an Arcam FMJ sensor."""
-
-    entity_description: ArcamFmjSensorEntityDescription
-
-    @property
-    def native_value(self) -> int | float | str | None:
-        """Return the sensor value."""
-        return self.entity_description.value_fn(self.coordinator.state)
--- a/homeassistant/components/arcam_fmj/strings.json
+++ b/homeassistant/components/arcam_fmj/strings.json
@@ -23,121 +23,5 @@
    "trigger_type": {
      "turn_on": "{entity_name} was requested to turn on"
    }
-  },
-  "entity": {
-    "binary_sensor": {
-      "incoming_video_interlaced": {
-        "name": "Incoming video interlaced"
-      }
-    },
-    "sensor": {
-      "incoming_audio_config": {
-        "name": "Incoming audio configuration",
-        "state": {
-          "auro_10_1": "Auro 10.1",
-          "auro_11_1": "Auro 11.1",
-          "auro_13_1": "Auro 13.1",
-          "auro_2_2_2": "Auro 2.2.2",
-          "auro_5_0": "Auro 5.0",
-          "auro_5_1": "Auro 5.1",
-          "auro_8_0": "Auro 8.0",
-          "auro_9_1": "Auro 9.1",
-          "auro_quad": "Auro quad",
-          "dual_mono": "Dual mono",
-          "dual_mono_lfe": "Dual mono + LFE",
-          "mono": "Mono",
-          "mono_lfe": "Mono + LFE",
-          "stereo_center": "Stereo center",
-          "stereo_center_lfe": "Stereo center + LFE",
-          "stereo_center_surr_lr": "Stereo center surround L/R",
-          "stereo_center_surr_lr_back_lr": "Stereo center surround L/R back L/R",
-          "stereo_center_surr_lr_back_lr_lfe": "Stereo center surround L/R back L/R + LFE",
-          "stereo_center_surr_lr_back_matrix": "Stereo center surround L/R back matrix",
-          "stereo_center_surr_lr_back_matrix_lfe": "Stereo center surround L/R back matrix + LFE",
-          "stereo_center_surr_lr_back_mono": "Stereo center surround L/R back mono",
-          "stereo_center_surr_lr_back_mono_lfe": "Stereo center surround L/R back mono + LFE",
-          "stereo_center_surr_lr_lfe": "Stereo center surround L/R + LFE",
-          "stereo_center_surr_mono": "Stereo center surround mono",
-          "stereo_center_surr_mono_lfe": "Stereo center surround mono + LFE",
-          "stereo_downmix": "Stereo downmix",
-          "stereo_downmix_lfe": "Stereo downmix + LFE",
-          "stereo_lfe": "Stereo + LFE",
-          "stereo_only": "Stereo only",
-          "stereo_only_lo_ro": "Stereo only Lo/Ro",
-          "stereo_only_lo_ro_lfe": "Stereo only Lo/Ro + LFE",
-          "stereo_surr_lr": "Stereo surround L/R",
-          "stereo_surr_lr_back_lr": "Stereo surround L/R back L/R",
-          "stereo_surr_lr_back_lr_lfe": "Stereo surround L/R back L/R + LFE",
-          "stereo_surr_lr_back_matrix": "Stereo surround L/R back matrix",
-          "stereo_surr_lr_back_matrix_lfe": "Stereo surround L/R back matrix + LFE",
-          "stereo_surr_lr_back_mono": "Stereo surround L/R back mono",
-          "stereo_surr_lr_back_mono_lfe": "Stereo surround L/R back mono + LFE",
-          "stereo_surr_lr_lfe": "Stereo surround L/R + LFE",
-          "stereo_surr_mono": "Stereo surround mono",
-          "stereo_surr_mono_lfe": "Stereo surround mono + LFE",
-          "undetected": "Undetected",
-          "unknown": "Unknown"
-        }
-      },
-      "incoming_audio_format": {
-        "name": "Incoming audio format",
-        "state": {
-          "analogue_direct": "Analogue direct",
-          "auro_3d": "Auro-3D",
-          "dolby_atmos": "Dolby Atmos",
-          "dolby_digital": "Dolby Digital",
-          "dolby_digital_ex": "Dolby Digital EX",
-          "dolby_digital_plus": "Dolby Digital Plus",
-          "dolby_digital_surround": "Dolby Digital Surround",
-          "dolby_digital_true_hd": "Dolby TrueHD",
-          "dts": "DTS",
-          "dts_96_24": "DTS 96/24",
-          "dts_core": "DTS Core",
-          "dts_es_discrete": "DTS-ES Discrete",
-          "dts_es_discrete_96_24": "DTS-ES Discrete 96/24",
-          "dts_es_matrix": "DTS-ES Matrix",
-          "dts_es_matrix_96_24": "DTS-ES Matrix 96/24",
-          "dts_hd_high_res_audio": "DTS-HD High Resolution Audio",
-          "dts_hd_master_audio": "DTS-HD Master Audio",
-          "dts_low_bit_rate": "DTS Low Bit Rate",
-          "dts_x": "DTS:X",
-          "imax_enhanced": "IMAX Enhanced",
-          "pcm": "PCM",
-          "pcm_zero": "PCM zero",
-          "undetected": "Undetected",
-          "unsupported": "Unsupported"
-        }
-      },
-      "incoming_audio_sample_rate": {
-        "name": "Incoming audio sample rate"
-      },
-      "incoming_video_aspect_ratio": {
-        "name": "Incoming video aspect ratio",
-        "state": {
-          "aspect_16_9": "16:9",
-          "aspect_4_3": "4:3",
-          "undefined": "Undefined"
-        }
-      },
-      "incoming_video_colorspace": {
-        "name": "Incoming video colorspace",
-        "state": {
-          "dolby_vision": "Dolby Vision",
-          "hdr10": "HDR10",
-          "hdr10_plus": "HDR10+",
-          "hlg": "HLG",
-          "normal": "Normal"
-        }
-      },
-      "incoming_video_horizontal_resolution": {
-        "name": "Incoming video horizontal resolution"
-      },
-      "incoming_video_refresh_rate": {
-        "name": "Incoming video refresh rate"
-      },
-      "incoming_video_vertical_resolution": {
-        "name": "Incoming video vertical resolution"
-      }
-    }
  }
 }
--- a/homeassistant/components/assist_pipeline/init.py
+++ b/homeassistant/components/assist_pipeline/init.py
@@ -137,4 +137,5 @@ async def async_pipeline_from_audio_stream(
                audio_settings=audio_settings or AudioSettings(),
            ),
        )
-        await pipeline_input.execute(validate=True)
+        await pipeline_input.validate()
+        await pipeline_input.execute()
--- a/homeassistant/components/assist_pipeline/error.py
+++ b/homeassistant/components/assist_pipeline/error.py
@@ -1,14 +1,7 @@
 """Assist pipeline errors."""

-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
 from homeassistant.exceptions import HomeAssistantError

-if TYPE_CHECKING:
-    from .pipeline import PipelineStage
-

 class PipelineError(HomeAssistantError):
    """Base class for pipeline errors."""
@@ -62,25 +55,3 @@ class IntentRecognitionError(PipelineError):

 class TextToSpeechError(PipelineError):
    """Error in text-to-speech portion of pipeline."""
-
-
-class PipelineRunValidationError(PipelineError):
-    """Error when a pipeline run is not valid."""
-
-    def __init__(self, message: str) -> None:
-        """Set error message."""
-        super().__init__("validation-error", message)
-
-
-class InvalidPipelineStagesError(PipelineRunValidationError):
-    """Error when given an invalid combination of start/end stages."""
-
-    def __init__(
-        self,
-        start_stage: PipelineStage,
-        end_stage: PipelineStage,
-    ) -> None:
-        """Set error message."""
-        super().__init__(
-            f"Invalid stage combination: start={start_stage}, end={end_stage}"
-        )
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -73,10 +73,8 @@ from .const import (
 from .error import (
    DuplicateWakeUpDetectedError,
    IntentRecognitionError,
-    InvalidPipelineStagesError,
    PipelineError,
    PipelineNotFound,
-    PipelineRunValidationError,
    SpeechToTextError,
    TextToSpeechError,
    WakeWordDetectionAborted,
@@ -494,6 +492,24 @@ PIPELINE_STAGE_ORDER = [
 ]


+class PipelineRunValidationError(Exception):
+    """Error when a pipeline run is not valid."""
+
+
+class InvalidPipelineStagesError(PipelineRunValidationError):
+    """Error when given an invalid combination of start/end stages."""
+
+    def __init__(
+        self,
+        start_stage: PipelineStage,
+        end_stage: PipelineStage,
+    ) -> None:
+        """Set error message."""
+        super().__init__(
+            f"Invalid stage combination: start={start_stage}, end={end_stage}"
+        )
+
+
@dataclass(frozen=True)
 class WakeWordSettings:
    """Settings for wake word detection."""
@@ -646,8 +662,7 @@ class PipelineRun:
        """Emit run start event."""
        self._device_id = device_id
        self._satellite_id = satellite_id
-        if self.start_stage in (PipelineStage.WAKE_WORD, PipelineStage.STT):
-            self._start_debug_recording_thread()
+        self._start_debug_recording_thread()

        data: dict[str, Any] = {
            "pipeline": self.pipeline.id,
@@ -1489,7 +1504,9 @@ class PipelineRun:

    def _start_debug_recording_thread(self) -> None:
        """Start thread to record wake/stt audio if debug_recording_dir is set."""
-        assert self.debug_recording_thread is None
+        if self.debug_recording_thread is not None:
+            # Already started
+            return

        # Directory to save audio for each pipeline run.
        # Configured in YAML for assist_pipeline.
@@ -1664,39 +1681,26 @@ class PipelineInput:
    satellite_id: str | None = None
    """Identifier of the satellite that is processing the input/output of the pipeline."""

-    async def execute(self, validate: bool = False) -> None:
+    async def execute(self) -> None:
        """Run pipeline."""
-        validation_error: PipelineError | None = None
-        if validate:
-            try:
-                await self.validate()
-            except PipelineError as err:
-                validation_error = err
-
        self.run.start(
            conversation_id=self.session.conversation_id,
            device_id=self.device_id,
            satellite_id=self.satellite_id,
        )
        current_stage: PipelineStage | None = self.run.start_stage
+        stt_audio_buffer: list[EnhancedAudioChunk] = []
+        stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
+
+        if self.stt_stream is not None:
+            if self.run.audio_settings.needs_processor:
+                # VAD/noise suppression/auto gain/volume
+                stt_processed_stream = self.run.process_enhance_audio(self.stt_stream)
+            else:
+                # Volume multiplier only
+                stt_processed_stream = self.run.process_volume_only(self.stt_stream)

        try:
-            if validation_error is not None:
-                raise validation_error
-
-            stt_audio_buffer: list[EnhancedAudioChunk] = []
-            stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
-
-            if self.stt_stream is not None:
-                if self.run.audio_settings.needs_processor:
-                    # VAD/noise suppression/auto gain/volume
-                    stt_processed_stream = self.run.process_enhance_audio(
-                        self.stt_stream
-                    )
-                else:
-                    # Volume multiplier only
-                    stt_processed_stream = self.run.process_volume_only(self.stt_stream)
-
            if current_stage == PipelineStage.WAKE_WORD:
                # wake-word-detection
                assert stt_processed_stream is not None
--- a/homeassistant/components/assist_pipeline/select.py
+++ b/homeassistant/components/assist_pipeline/select.py
@@ -78,13 +78,19 @@ class AssistPipelineSelect(SelectEntity, restore_state.RestoreEntity):
        index: int = 0,
    ) -> None:
        """Initialize a pipeline selector."""
-        if index >= 1:
-            self.entity_description = replace(
-                self.entity_description,
-                key=f"pipeline_{index + 1}",
-                translation_key="pipeline_n",
-                translation_placeholders={"index": str(index + 1)},
-            )
+        if index < 1:
+            # Keep compatibility
+            key_suffix = ""
+            placeholder = ""
+        else:
+            key_suffix = f"_{index + 1}"
+            placeholder = f" {index + 1}"
+
+        self.entity_description = replace(
+            self.entity_description,
+            key=f"pipeline{key_suffix}",
+            translation_placeholders={"index": placeholder},
+        )

        self._domain = domain
        self._unique_id_prefix = unique_id_prefix
--- a/homeassistant/components/assist_pipeline/strings.json
+++ b/homeassistant/components/assist_pipeline/strings.json
@@ -7,17 +7,11 @@
    },
    "select": {
      "pipeline": {
-        "name": "Assistant",
+        "name": "Assistant{index}",
        "state": {
          "preferred": "Preferred"
        }
      },
-      "pipeline_n": {
-        "name": "Assistant {index}",
-        "state": {
-          "preferred": "[%key:component::assist_pipeline::entity::select::pipeline::state::preferred%]"
-        }
-      },
      "vad_sensitivity": {
        "name": "Finished speaking detection",
        "state": {
--- a/homeassistant/components/assist_satellite/strings.json
+++ b/homeassistant/components/assist_satellite/strings.json
@@ -1,13 +1,16 @@
 {
  "common": {
-    "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "condition_behavior_description": "How the state should match on the targeted Assist satellites.",
+    "condition_behavior_name": "Behavior",
+    "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
+    "trigger_behavior_name": "Behavior"
  },
  "conditions": {
    "is_idle": {
      "description": "Tests if one or more Assist satellites are idle.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
        }
      },
@@ -17,6 +20,7 @@
      "description": "Tests if one or more Assist satellites are listening.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
        }
      },
@@ -26,6 +30,7 @@
      "description": "Tests if one or more Assist satellites are processing.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
        }
      },
@@ -35,6 +40,7 @@
      "description": "Tests if one or more Assist satellites are responding.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
        }
      },
@@ -75,7 +81,7 @@
  },
  "services": {
    "announce": {
-      "description": "Lets an Assist satellite announce a message.",
+      "description": "Lets a satellite announce a message.",
      "fields": {
        "media_id": {
          "description": "The media ID to announce instead of using text-to-speech.",
@@ -94,10 +100,10 @@
          "name": "Preannounce media ID"
        }
      },
-      "name": "Announce on satellite"
+      "name": "Announce"
    },
    "ask_question": {
-      "description": "Lets an Assist satellite ask a question and get the user's response.",
+      "description": "Asks a question and gets the user's response.",
      "fields": {
        "answers": {
          "description": "Possible answers to the question.",
@@ -124,10 +130,10 @@
          "name": "Question media ID"
        }
      },
-      "name": "Ask question on satellite"
+      "name": "Ask question"
    },
    "start_conversation": {
-      "description": "Starts a conversation from an Assist satellite.",
+      "description": "Starts a conversation from a satellite.",
      "fields": {
        "extra_system_prompt": {
          "description": "Provide background information to the AI about the request.",
@@ -150,42 +156,46 @@
          "name": "Message"
        }
      },
-      "name": "Start conversation on satellite"
+      "name": "Start conversation"
    }
  },
  "title": "Assist satellite",
  "triggers": {
    "idle": {
-      "description": "Triggers after one or more Assist satellites become idle after having processed a command.",
+      "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
        }
      },
      "name": "Satellite became idle"
    },
    "listening": {
-      "description": "Triggers after one or more Assist satellites start listening for a command from someone.",
+      "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
        }
      },
      "name": "Satellite started listening"
    },
    "processing": {
-      "description": "Triggers after one or more Assist satellites start processing a command after having heard it.",
+      "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
        }
      },
      "name": "Satellite started processing"
    },
    "responding": {
-      "description": "Triggers after one or more Assist satellites start responding to a command after having processed it, or start announcing something.",
+      "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
      "fields": {
        "behavior": {
+          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
        }
      },
--- a/homeassistant/components/august/init.py
+++ b/homeassistant/components/august/init.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import cast

-from aiohttp import ClientError
+from aiohttp import ClientResponseError
 from yalexs.exceptions import AugustApiAIOHTTPError
 from yalexs.manager.exceptions import CannotConnect, InvalidAuth, RequireValidation
 from yalexs.manager.gateway import Config as YaleXSConfig
@@ -13,12 +13,7 @@ from yalexs.manager.gateway import Config as YaleXSConfig
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import (
-    ConfigEntryAuthFailed,
-    ConfigEntryNotReady,
-    OAuth2TokenRequestError,
-    OAuth2TokenRequestReauthError,
-)
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr, issue_registry as ir
 from homeassistant.helpers.config_entry_oauth2_flow import (
    ImplementationUnavailableError,
@@ -50,18 +45,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: AugustConfigEntry) -> bo
    august_gateway = AugustGateway(Path(hass.config.config_dir), session, oauth_session)
    try:
        await async_setup_august(hass, entry, august_gateway)
-    except OAuth2TokenRequestReauthError as err:
-        raise ConfigEntryAuthFailed from err
    except (RequireValidation, InvalidAuth) as err:
        raise ConfigEntryAuthFailed from err
    except TimeoutError as err:
        raise ConfigEntryNotReady("Timed out connecting to august api") from err
-    except (
-        AugustApiAIOHTTPError,
-        OAuth2TokenRequestError,
-        ClientError,
-        CannotConnect,
-    ) as err:
+    except (AugustApiAIOHTTPError, ClientResponseError, CannotConnect) as err:
        raise ConfigEntryNotReady from err
    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
    return True
--- a/homeassistant/components/auth/init.py
+++ b/homeassistant/components/auth/init.py
@@ -626,7 +626,7 @@ def websocket_delete_all_refresh_tokens(
    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
    """Handle delete all refresh tokens request."""
-    current_refresh_token: RefreshToken | None = None
+    current_refresh_token: RefreshToken
    remove_failed = False
    token_type = msg.get("token_type")
    delete_current_token = msg.get("delete_current_token")
@@ -654,7 +654,7 @@ def websocket_delete_all_refresh_tokens(
    else:
        connection.send_result(msg["id"], {})

-    async def _delete_current_token_soon(current_refresh_token: RefreshToken) -> None:
+    async def _delete_current_token_soon() -> None:
        """Delete the current token after a delay.

        We do not want to delete the current token immediately as it will
@@ -675,15 +675,13 @@ def websocket_delete_all_refresh_tokens(
            # the token right away.
            hass.auth.async_remove_refresh_token(current_refresh_token)

-    if (
-        delete_current_token
-        and current_refresh_token
-        and (not limit_token_types or current_refresh_token.token_type == token_type)
+    if delete_current_token and (
+        not limit_token_types or current_refresh_token.token_type == token_type
    ):
        # Deleting the token will close the connection so we need
        # to do it with a delay in a tracked task to ensure it still
        # happens if Home Assistant is shutting down.
-        hass.async_create_task(_delete_current_token_soon(current_refresh_token))
+        hass.async_create_task(_delete_current_token_soon())


@websocket_api.websocket_command(
--- a/homeassistant/components/auth/login_flow.py
+++ b/homeassistant/components/auth/login_flow.py
@@ -115,7 +115,6 @@ def async_setup(
 ) -> None:
    """Component to allow users to login."""
    hass.http.register_view(WellKnownOAuthInfoView)
-    hass.http.register_view(WellKnownProtectedResourceView)
    hass.http.register_view(AuthProvidersView)
    hass.http.register_view(LoginFlowIndexView(hass.auth.login_flow, store_result))
    hass.http.register_view(LoginFlowResourceView(hass.auth.login_flow, store_result))
@@ -155,32 +154,6 @@ class WellKnownOAuthInfoView(HomeAssistantView):
        return self.json(metadata)


-class WellKnownProtectedResourceView(HomeAssistantView):
-    """View to host the OAuth2 Protected Resource Metadata per RFC9728."""
-
-    requires_auth = False
-    url = "/.well-known/oauth-protected-resource"
-    name = "well-known/oauth-protected-resource"
-
-    async def get(self, request: web.Request) -> web.Response:
-        """Return the protected resource metadata."""
-        hass = request.app[KEY_HASS]
-        try:
-            url_prefix = get_url(hass, require_current_request=True)
-        except NoURLAvailableError:
-            return self.json_message("No URL available", HTTPStatus.NOT_FOUND)
-
-        return self.json(
-            {
-                "resource": url_prefix,
-                "authorization_servers": [url_prefix],
-                "resource_documentation": (
-                    "https://developers.home-assistant.io/docs/auth_api"
-                ),
-            }
-        )
-
-
 class AuthProvidersView(HomeAssistantView):
    """View to get available auth providers."""

--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -118,85 +118,47 @@ SERVICE_TRIGGER = "trigger"
 NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"

 _EXPERIMENTAL_CONDITION_PLATFORMS = {
-    "air_quality",
    "alarm_control_panel",
    "assist_satellite",
-    "battery",
-    "calendar",
    "climate",
-    "counter",
-    "cover",
    "device_tracker",
-    "door",
    "fan",
-    "garage_door",
-    "gate",
    "humidifier",
-    "humidity",
-    "illuminance",
    "lawn_mower",
    "light",
    "lock",
    "media_player",
-    "moisture",
-    "motion",
-    "occupancy",
    "person",
-    "power",
-    "schedule",
-    "select",
    "siren",
    "switch",
-    "temperature",
-    "text",
-    "timer",
    "vacuum",
-    "valve",
-    "water_heater",
-    "window",
 }

 _EXPERIMENTAL_TRIGGER_PLATFORMS = {
-    "air_quality",
    "alarm_control_panel",
    "assist_satellite",
-    "battery",
+    "binary_sensor",
    "button",
    "climate",
-    "counter",
    "cover",
    "device_tracker",
    "door",
-    "event",
    "fan",
    "garage_door",
-    "gate",
    "humidifier",
-    "humidity",
-    "illuminance",
    "lawn_mower",
    "light",
    "lock",
    "media_player",
-    "moisture",
-    "motion",
-    "occupancy",
    "person",
-    "power",
    "remote",
    "scene",
    "schedule",
-    "select",
    "siren",
    "switch",
-    "temperature",
    "text",
-    "todo",
    "update",
    "vacuum",
-    "valve",
-    "water_heater",
-    "window",
 }


--- a/homeassistant/components/automation/strings.json
+++ b/homeassistant/components/automation/strings.json
@@ -78,11 +78,11 @@
  "services": {
    "reload": {
      "description": "Reloads the automation configuration.",
-      "name": "Reload automations"
+      "name": "[%key:common::action::reload%]"
    },
    "toggle": {
      "description": "Toggles (enable / disable) an automation.",
-      "name": "Toggle automation"
+      "name": "[%key:common::action::toggle%]"
    },
    "trigger": {
      "description": "Triggers the actions of an automation.",
@@ -92,7 +92,7 @@
          "name": "Skip conditions"
        }
      },
-      "name": "Trigger automation"
+      "name": "Trigger"
    },
    "turn_off": {
      "description": "Disables an automation.",
@@ -102,11 +102,11 @@
          "name": "Stop actions"
        }
      },
-      "name": "Turn off automation"
+      "name": "[%key:common::action::turn_off%]"
    },
    "turn_on": {
      "description": "Enables an automation.",
-      "name": "Turn on automation"
+      "name": "[%key:common::action::turn_on%]"
    }
  },
  "title": "Automation"
--- a/homeassistant/components/autoskope/init.py
+++ b/homeassistant/components/autoskope/init.py
@@ -1,53 +0,0 @@
-"""The Autoskope integration."""
-
-from __future__ import annotations
-
-import aiohttp
-from autoskope_client.api import AutoskopeApi
-from autoskope_client.models import CannotConnect, InvalidAuth
-
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
-from homeassistant.helpers.aiohttp_client import async_create_clientsession
-
-from .const import DEFAULT_HOST
-from .coordinator import AutoskopeConfigEntry, AutoskopeDataUpdateCoordinator
-
-PLATFORMS: list[Platform] = [Platform.DEVICE_TRACKER]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AutoskopeConfigEntry) -> bool:
-    """Set up Autoskope from a config entry."""
-    session = async_create_clientsession(hass, cookie_jar=aiohttp.CookieJar())
-
-    api = AutoskopeApi(
-        host=entry.data.get(CONF_HOST, DEFAULT_HOST),
-        username=entry.data[CONF_USERNAME],
-        password=entry.data[CONF_PASSWORD],
-        session=session,
-    )
-
-    try:
-        await api.connect()
-    except InvalidAuth as err:
-        # Raise ConfigEntryError until reauth flow is implemented (then ConfigEntryAuthFailed)
-        raise ConfigEntryError(
-            "Authentication failed, please check credentials"
-        ) from err
-    except CannotConnect as err:
-        raise ConfigEntryNotReady("Could not connect to Autoskope API") from err
-
-    coordinator = AutoskopeDataUpdateCoordinator(hass, api, entry)
-    await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AutoskopeConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
--- a/homeassistant/components/autoskope/config_flow.py
+++ b/homeassistant/components/autoskope/config_flow.py
@@ -1,89 +0,0 @@
-"""Config flow for the Autoskope integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from autoskope_client.api import AutoskopeApi
-from autoskope_client.models import CannotConnect, InvalidAuth
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.data_entry_flow import section
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.selector import (
-    TextSelector,
-    TextSelectorConfig,
-    TextSelectorType,
-)
-
-from .const import DEFAULT_HOST, DOMAIN, SECTION_ADVANCED_SETTINGS
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_USERNAME): str,
-        vol.Required(CONF_PASSWORD): TextSelector(
-            TextSelectorConfig(type=TextSelectorType.PASSWORD)
-        ),
-        vol.Required(SECTION_ADVANCED_SETTINGS): section(
-            vol.Schema(
-                {
-                    vol.Required(CONF_HOST, default=DEFAULT_HOST): TextSelector(
-                        TextSelectorConfig(type=TextSelectorType.URL)
-                    ),
-                }
-            ),
-            {"collapsed": True},
-        ),
-    }
-)
-
-
-class AutoskopeConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Autoskope."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            username = user_input[CONF_USERNAME].lower()
-            host = user_input[SECTION_ADVANCED_SETTINGS][CONF_HOST].lower()
-
-            try:
-                cv.url(host)
-            except vol.Invalid:
-                errors["base"] = "invalid_url"
-
-            if not errors:
-                await self.async_set_unique_id(f"{username}@{host}")
-                self._abort_if_unique_id_configured()
-
-                try:
-                    async with AutoskopeApi(
-                        host=host,
-                        username=username,
-                        password=user_input[CONF_PASSWORD],
-                    ):
-                        pass
-                except CannotConnect:
-                    errors["base"] = "cannot_connect"
-                except InvalidAuth:
-                    errors["base"] = "invalid_auth"
-                else:
-                    return self.async_create_entry(
-                        title=f"Autoskope ({username})",
-                        data={
-                            CONF_USERNAME: username,
-                            CONF_PASSWORD: user_input[CONF_PASSWORD],
-                            CONF_HOST: host,
-                        },
-                    )
-
-        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
-        )
--- a/homeassistant/components/autoskope/const.py
+++ b/homeassistant/components/autoskope/const.py
@@ -1,9 +0,0 @@
-"""Constants for the Autoskope integration."""
-
-from datetime import timedelta
-
-DOMAIN = "autoskope"
-
-DEFAULT_HOST = "https://portal.autoskope.de"
-SECTION_ADVANCED_SETTINGS = "advanced_settings"
-UPDATE_INTERVAL = timedelta(seconds=60)
--- a/homeassistant/components/autoskope/coordinator.py
+++ b/homeassistant/components/autoskope/coordinator.py
@@ -1,60 +0,0 @@
-"""Data update coordinator for the Autoskope integration."""
-
-from __future__ import annotations
-
-import logging
-
-from autoskope_client.api import AutoskopeApi
-from autoskope_client.models import CannotConnect, InvalidAuth, Vehicle
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN, UPDATE_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-
-type AutoskopeConfigEntry = ConfigEntry[AutoskopeDataUpdateCoordinator]
-
-
-class AutoskopeDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Vehicle]]):
-    """Class to manage fetching Autoskope data."""
-
-    config_entry: AutoskopeConfigEntry
-
-    def __init__(
-        self, hass: HomeAssistant, api: AutoskopeApi, entry: AutoskopeConfigEntry
-    ) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=DOMAIN,
-            update_interval=UPDATE_INTERVAL,
-            config_entry=entry,
-        )
-        self.api = api
-
-    async def _async_update_data(self) -> dict[str, Vehicle]:
-        """Fetch data from API endpoint."""
-        try:
-            vehicles = await self.api.get_vehicles()
-            return {vehicle.id: vehicle for vehicle in vehicles}
-
-        except InvalidAuth:
-            # Attempt to re-authenticate using stored credentials
-            try:
-                await self.api.authenticate()
-                # Retry the request after successful re-authentication
-                vehicles = await self.api.get_vehicles()
-                return {vehicle.id: vehicle for vehicle in vehicles}
-            except InvalidAuth as reauth_err:
-                raise ConfigEntryAuthFailed(
-                    f"Authentication failed: {reauth_err}"
-                ) from reauth_err
-
-        except CannotConnect as err:
-            raise UpdateFailed(f"Error communicating with API: {err}") from err
--- a/homeassistant/components/autoskope/device_tracker.py
+++ b/homeassistant/components/autoskope/device_tracker.py
@@ -1,145 +0,0 @@
-"""Support for Autoskope device tracking."""
-
-from __future__ import annotations
-
-from autoskope_client.constants import MANUFACTURER
-from autoskope_client.models import Vehicle
-
-from homeassistant.components.device_tracker import SourceType, TrackerEntity
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AutoskopeConfigEntry, AutoskopeDataUpdateCoordinator
-
-PARALLEL_UPDATES = 0
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AutoskopeConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Autoskope device tracker entities."""
-    coordinator: AutoskopeDataUpdateCoordinator = entry.runtime_data
-    tracked_vehicles: set[str] = set()
-
-    @callback
-    def update_entities() -> None:
-        """Update entities based on coordinator data."""
-        current_vehicles = set(coordinator.data.keys())
-        vehicles_to_add = current_vehicles - tracked_vehicles
-
-        if vehicles_to_add:
-            new_entities = [
-                AutoskopeDeviceTracker(coordinator, vehicle_id)
-                for vehicle_id in vehicles_to_add
-            ]
-            tracked_vehicles.update(vehicles_to_add)
-            async_add_entities(new_entities)
-
-    entry.async_on_unload(coordinator.async_add_listener(update_entities))
-    update_entities()
-
-
-class AutoskopeDeviceTracker(
-    CoordinatorEntity[AutoskopeDataUpdateCoordinator], TrackerEntity
-):
-    """Representation of an Autoskope tracked device."""
-
-    _attr_has_entity_name = True
-    _attr_name: str | None = None
-
-    def __init__(
-        self, coordinator: AutoskopeDataUpdateCoordinator, vehicle_id: str
-    ) -> None:
-        """Initialize the TrackerEntity."""
-        super().__init__(coordinator)
-        self._vehicle_id = vehicle_id
-        self._attr_unique_id = vehicle_id
-
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        if (
-            self._vehicle_id in self.coordinator.data
-            and (device_entry := self.device_entry) is not None
-            and device_entry.name != self._vehicle_data.name
-        ):
-            device_registry = dr.async_get(self.hass)
-            device_registry.async_update_device(
-                device_entry.id, name=self._vehicle_data.name
-            )
-        super()._handle_coordinator_update()
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info for the vehicle."""
-        vehicle = self.coordinator.data[self._vehicle_id]
-        return DeviceInfo(
-            identifiers={(DOMAIN, str(vehicle.id))},
-            name=vehicle.name,
-            manufacturer=MANUFACTURER,
-            model=vehicle.model,
-            serial_number=vehicle.imei,
-        )
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return (
-            super().available
-            and self.coordinator.data is not None
-            and self._vehicle_id in self.coordinator.data
-        )
-
-    @property
-    def _vehicle_data(self) -> Vehicle:
-        """Return the vehicle data for the current entity."""
-        return self.coordinator.data[self._vehicle_id]
-
-    @property
-    def latitude(self) -> float | None:
-        """Return latitude value of the device."""
-        if (vehicle := self._vehicle_data) and vehicle.position:
-            return float(vehicle.position.latitude)
-        return None
-
-    @property
-    def longitude(self) -> float | None:
-        """Return longitude value of the device."""
-        if (vehicle := self._vehicle_data) and vehicle.position:
-            return float(vehicle.position.longitude)
-        return None
-
-    @property
-    def source_type(self) -> SourceType:
-        """Return the source type of the device."""
-        return SourceType.GPS
-
-    @property
-    def location_accuracy(self) -> float:
-        """Return the location accuracy of the device in meters."""
-        if (vehicle := self._vehicle_data) and vehicle.gps_quality:
-            if vehicle.gps_quality > 0:
-                # HDOP to estimated accuracy in meters
-                # HDOP of 1-2 = good (5-10m), 2-5 = moderate (10-25m), >5 = poor (>25m)
-                return float(max(5, int(vehicle.gps_quality * 5.0)))
-        return 0.0
-
-    @property
-    def icon(self) -> str:
-        """Return the icon based on the vehicle's activity."""
-        if self._vehicle_id not in self.coordinator.data:
-            return "mdi:car-clock"
-        vehicle = self._vehicle_data
-        if vehicle.position:
-            if vehicle.position.park_mode:
-                return "mdi:car-brake-parking"
-            if vehicle.position.speed > 5:  # Moving threshold: 5 km/h
-                return "mdi:car-arrow-right"
-            return "mdi:car"
-        return "mdi:car-clock"
--- a/homeassistant/components/autoskope/manifest.json
+++ b/homeassistant/components/autoskope/manifest.json
@@ -1,11 +0,0 @@
-{
-  "domain": "autoskope",
-  "name": "Autoskope",
-  "codeowners": ["@mcisk"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/autoskope",
-  "integration_type": "hub",
-  "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
-  "requirements": ["autoskope_client==1.4.1"]
-}
--- a/homeassistant/components/autoskope/quality_scale.yaml
+++ b/homeassistant/components/autoskope/quality_scale.yaml
@@ -1,88 +0,0 @@
-# + in comment indicates requirement for quality scale
-# - in comment indicates issue to be fixed, not impacting quality scale
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: |
-      Integration does not provide custom services.
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: |
-      Integration does not provide custom services.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup: done
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: |
-      Integration does not provide custom services.
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates: done
-  reauthentication-flow:
-    status: todo
-    comment: |
-      Reauthentication flow removed for initial PR, will be added in follow-up.
-  test-coverage: done
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: |
-      Integration does not use discovery. Autoskope devices use NB-IoT/LTE-M (via IoT SIMs) and LoRaWAN.
-  discovery:
-    status: exempt
-    comment: |
-      Integration does not use discovery. Autoskope devices use NB-IoT/LTE-M (via IoT SIMs) and LoRaWAN.
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: done
-  docs-troubleshooting: done
-  docs-use-cases: done
-  dynamic-devices: done
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default:
-    status: exempt
-    comment: |
-      Only one entity type (device_tracker) is created, making this not applicable.
-  entity-translations: done
-  exception-translations: done
-  icon-translations: done
-  reconfiguration-flow:
-    status: todo
-    comment: |
-      Reconfiguration flow removed for initial PR, will be added in follow-up.
-  repair-issues: todo
-  stale-devices: done
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing:
-    status: todo
-    comment: |
-      Integration needs to be added to .strict-typing file for full compliance.
--- a/homeassistant/components/autoskope/strings.json
+++ b/homeassistant/components/autoskope/strings.json
@@ -1,52 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "invalid_url": "Invalid URL",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "user": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::username%]"
-        },
-        "data_description": {
-          "password": "The password for your Autoskope account.",
-          "username": "The username for your Autoskope account."
-        },
-        "description": "Enter your Autoskope credentials.",
-        "sections": {
-          "advanced_settings": {
-            "data": {
-              "host": "API endpoint"
-            },
-            "data_description": {
-              "host": "The URL of your Autoskope API endpoint. Only change this if you use a white-label portal."
-            },
-            "name": "Advanced settings"
-          }
-        },
-        "title": "Connect to Autoskope"
-      }
-    }
-  },
-  "issues": {
-    "cannot_connect": {
-      "description": "Home Assistant could not connect to the Autoskope API at {host}. Please check the connection details and ensure the API endpoint is reachable.\n\nError: {error}",
-      "title": "Failed to connect to Autoskope"
-    },
-    "invalid_auth": {
-      "description": "Authentication with Autoskope failed for user {username}. Please re-authenticate the integration with the correct password.",
-      "title": "Invalid Autoskope authentication"
-    },
-    "low_battery": {
-      "description": "The battery voltage for vehicle {vehicle_name} ({vehicle_id}) is low ({value}V). Consider checking or replacing the battery.",
-      "title": "Low vehicle battery ({vehicle_name})"
-    }
-  }
-}
--- a/homeassistant/components/aws_s3/backup.py
+++ b/homeassistant/components/aws_s3/backup.py
@@ -147,7 +147,7 @@ class S3BackupAgent(BackupAgent):
            if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
                await self._upload_simple(tar_filename, open_stream)
            else:
-                await self._upload_multipart(tar_filename, open_stream, on_progress)
+                await self._upload_multipart(tar_filename, open_stream)

            # Upload the metadata file
            metadata_content = json.dumps(backup.as_dict())
@@ -188,13 +188,11 @@ class S3BackupAgent(BackupAgent):
        self,
        tar_filename: str,
        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        on_progress: OnProgressCallback,
-    ) -> None:
+    ):
        """Upload a large file using multipart upload.

        :param tar_filename: The target filename for the backup.
        :param open_stream: A function returning an async iterator that yields bytes.
-        :param on_progress: A callback to report the number of uploaded bytes.
        """
        _LOGGER.debug("Starting multipart upload for %s", tar_filename)
        multipart_upload = await self._client.create_multipart_upload(
@@ -207,7 +205,6 @@ class S3BackupAgent(BackupAgent):
            part_number = 1
            buffer = bytearray()  # bytes buffer to store the data
            offset = 0  # start index of unread data inside buffer
-            bytes_uploaded = 0

            stream = await open_stream()
            async for chunk in stream:
@@ -236,8 +233,6 @@ class S3BackupAgent(BackupAgent):
                            Body=part_data.tobytes(),
                        )
                        parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                        bytes_uploaded += len(part_data)
-                        on_progress(bytes_uploaded=bytes_uploaded)
                        part_number += 1
                finally:
                    view.release()
@@ -266,8 +261,6 @@ class S3BackupAgent(BackupAgent):
                    Body=remaining_data.tobytes(),
                )
                parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                bytes_uploaded += len(remaining_data)
-                on_progress(bytes_uploaded=bytes_uploaded)

            await cast(Any, self._client).complete_multipart_upload(
                Bucket=self._bucket,
--- a/homeassistant/components/axis/hub/api.py
+++ b/homeassistant/components/axis/hub/api.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
    CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.httpx_client import get_async_client

 from ..const import LOGGER
 from ..errors import AuthenticationRequired, CannotConnect
@@ -26,7 +26,7 @@ async def get_axis_api(
    config: Mapping[str, Any],
 ) -> axis.AxisDevice:
    """Create a Axis device API."""
-    session = async_get_clientsession(hass, verify_ssl=False)
+    session = get_async_client(hass, verify_ssl=False)

    api = axis.AxisDevice(
        Configuration(
--- a/homeassistant/components/axis/manifest.json
+++ b/homeassistant/components/axis/manifest.json
@@ -29,7 +29,7 @@
  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["axis"],
-  "requirements": ["axis==68"],
+  "requirements": ["axis==66"],
  "ssdp": [
    {
      "manufacturer": "AXIS"
--- a/homeassistant/components/backblaze_b2/init.py
+++ b/homeassistant/components/backblaze_b2/init.py
@@ -74,12 +74,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: BackblazeConfigEntry) ->
            translation_domain=DOMAIN,
            translation_key="invalid_bucket_name",
        ) from err
-    except exception.BadRequest as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="bad_request",
-            translation_placeholders={"error_message": str(err)},
-        ) from err
    except (
        exception.B2ConnectionError,
        exception.B2RequestTimeout,
--- a/homeassistant/components/backblaze_b2/backup.py
+++ b/homeassistant/components/backblaze_b2/backup.py
@@ -101,7 +101,8 @@ def handle_b2_errors[T](
        try:
            return await func(*args, **kwargs)
        except B2Error as err:
-            raise BackupAgentError(f"Failed during {func.__name__}: {err}") from err
+            error_msg = f"Failed during {func.__name__}"
+            raise BackupAgentError(error_msg) from err

    return wrapper

@@ -169,7 +170,8 @@ class BackblazeBackupAgent(BackupAgent):
    async def _cleanup_failed_upload(self, filename: str) -> None:
        """Clean up a partially uploaded file after upload failure."""
        _LOGGER.warning(
-            "Attempting to delete partially uploaded backup file %s",
+            "Attempting to delete partially uploaded main backup file %s "
+            "due to metadata upload failure",
            filename,
        )
        try:
@@ -178,10 +180,11 @@ class BackblazeBackupAgent(BackupAgent):
            )
            await self._hass.async_add_executor_job(uploaded_main_file_info.delete)
        except B2Error:
-            _LOGGER.warning(
-                "Failed to clean up partially uploaded backup file %s;"
-                " manual deletion from Backblaze B2 may be required",
+            _LOGGER.debug(
+                "Failed to clean up partially uploaded main backup file %s. "
+                "Manual intervention may be required to delete it from Backblaze B2",
                filename,
+                exc_info=True,
            )
        else:
            _LOGGER.debug(
@@ -253,10 +256,9 @@ class BackblazeBackupAgent(BackupAgent):
            prefixed_metadata_filename,
        )

-        tar_uploaded = False
+        upload_successful = False
        try:
            await self._upload_backup_file(prefixed_tar_filename, open_stream, {})
-            tar_uploaded = True
            _LOGGER.debug(
                "Main backup file upload finished for %s", prefixed_tar_filename
            )
@@ -268,14 +270,15 @@ class BackblazeBackupAgent(BackupAgent):
            _LOGGER.debug(
                "Metadata file upload finished for %s", prefixed_metadata_filename
            )
-            _LOGGER.debug("Backup upload complete: %s", prefixed_tar_filename)
-            self._invalidate_caches(
-                backup.backup_id, prefixed_tar_filename, prefixed_metadata_filename
-            )
-        except B2Error:
-            if tar_uploaded:
+            upload_successful = True
+        finally:
+            if upload_successful:
+                _LOGGER.debug("Backup upload complete: %s", prefixed_tar_filename)
+                self._invalidate_caches(
+                    backup.backup_id, prefixed_tar_filename, prefixed_metadata_filename
+                )
+            else:
                await self._cleanup_failed_upload(prefixed_tar_filename)
-            raise

    def _upload_metadata_file_sync(
        self, metadata_content: bytes, filename: str
--- a/homeassistant/components/backblaze_b2/config_flow.py
+++ b/homeassistant/components/backblaze_b2/config_flow.py
@@ -174,14 +174,6 @@ class BackblazeConfigFlow(ConfigFlow, domain=DOMAIN):
                "Backblaze B2 bucket '%s' does not exist", user_input[CONF_BUCKET]
            )
            errors[CONF_BUCKET] = "invalid_bucket_name"
-        except exception.BadRequest as err:
-            _LOGGER.error(
-                "Backblaze B2 API rejected the request for Key ID '%s': %s",
-                user_input[CONF_KEY_ID],
-                err,
-            )
-            errors["base"] = "bad_request"
-            placeholders["error_message"] = str(err)
        except (
            exception.B2ConnectionError,
            exception.B2RequestTimeout,
--- a/homeassistant/components/backblaze_b2/manifest.json
+++ b/homeassistant/components/backblaze_b2/manifest.json
@@ -8,5 +8,5 @@
  "iot_class": "cloud_push",
  "loggers": ["b2sdk"],
  "quality_scale": "bronze",
-  "requirements": ["b2sdk==2.10.4"]
+  "requirements": ["b2sdk==2.10.1"]
 }
--- a/homeassistant/components/backblaze_b2/strings.json
+++ b/homeassistant/components/backblaze_b2/strings.json
@@ -6,7 +6,6 @@
      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
    },
    "error": {
-      "bad_request": "The Backblaze B2 API rejected the request: {error_message}",
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_bucket_name": "[%key:component::backblaze_b2::exceptions::invalid_bucket_name::message%]",
      "invalid_capability": "[%key:component::backblaze_b2::exceptions::invalid_capability::message%]",
@@ -61,9 +60,6 @@
    }
  },
  "exceptions": {
-    "bad_request": {
-      "message": "The Backblaze B2 API rejected the request: {error_message}"
-    },
    "cannot_connect": {
      "message": "Cannot connect to endpoint"
    },
--- a/homeassistant/components/backup/const.py
+++ b/homeassistant/components/backup/const.py
@@ -34,4 +34,4 @@ EXCLUDE_DATABASE_FROM_BACKUP = [
    "home-assistant_v2.db-wal",
 ]

-SECURETAR_CREATE_VERSION = 3
+SECURETAR_CREATE_VERSION = 2
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -12,7 +12,7 @@ import hashlib
 import io
 from itertools import chain
 import json
-from pathlib import Path, PurePath, PureWindowsPath
+from pathlib import Path, PurePath
 import shutil
 import sys
 import tarfile
@@ -32,7 +32,6 @@ from homeassistant.helpers import (
    issue_registry as ir,
    start,
 )
-from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.json import json_bytes
 from homeassistant.util import dt as dt_util, json as json_util
 from homeassistant.util.async_iterator import AsyncIteratorReader
@@ -79,8 +78,6 @@ from .util import (
    validate_password_stream,
 )

-UPLOAD_PROGRESS_DEBOUNCE_SECONDS = 1
-

@dataclass(frozen=True, kw_only=True, slots=True)
 class NewBackup:
@@ -144,7 +141,6 @@ class CreateBackupStage(StrEnum):
    ADDONS = "addons"
    AWAIT_ADDON_RESTARTS = "await_addon_restarts"
    DOCKER_CONFIG = "docker_config"
-    CLEANING_UP = "cleaning_up"
    FINISHING_FILE = "finishing_file"
    FOLDERS = "folders"
    HOME_ASSISTANT = "home_assistant"
@@ -594,49 +590,23 @@ class BackupManager:
                )
            agent = self.backup_agents[agent_id]

-            latest_uploaded_bytes = 0
-
            @callback
-            def _emit_upload_progress() -> None:
-                """Emit the latest upload progress event."""
+            def on_upload_progress(*, bytes_uploaded: int, **kwargs: Any) -> None:
+                """Handle upload progress."""
                self.async_on_backup_event(
                    UploadBackupEvent(
                        manager_state=self.state,
                        agent_id=agent_id,
-                        uploaded_bytes=latest_uploaded_bytes,
+                        uploaded_bytes=bytes_uploaded,
                        total_bytes=_backup.size,
                    )
                )

-            upload_progress_debouncer: Debouncer[None] = Debouncer(
-                self.hass,
-                LOGGER,
-                cooldown=UPLOAD_PROGRESS_DEBOUNCE_SECONDS,
-                immediate=True,
-                function=_emit_upload_progress,
-            )
-
-            @callback
-            def on_upload_progress(*, bytes_uploaded: int, **kwargs: Any) -> None:
-                """Handle upload progress."""
-                nonlocal latest_uploaded_bytes
-                latest_uploaded_bytes = bytes_uploaded
-                upload_progress_debouncer.async_schedule_call()
-
            await agent.async_upload_backup(
                open_stream=open_stream_func,
                backup=_backup,
                on_progress=on_upload_progress,
            )
-            upload_progress_debouncer.async_cancel()
-            self.async_on_backup_event(
-                UploadBackupEvent(
-                    manager_state=self.state,
-                    agent_id=agent_id,
-                    uploaded_bytes=_backup.size,
-                    total_bytes=_backup.size,
-                )
-            )
            if streamer:
                await streamer.wait()

@@ -1291,13 +1261,6 @@ class BackupManager:
                )
            # delete old backups more numerous than copies
            # try this regardless of agent errors above
-            self.async_on_backup_event(
-                CreateBackupEvent(
-                    reason=None,
-                    stage=CreateBackupStage.CLEANING_UP,
-                    state=CreateBackupState.IN_PROGRESS,
-                )
-            )
            await delete_backups_exceeding_configured_count(self)

        finally:
@@ -1957,10 +1920,7 @@ class CoreBackupReaderWriter(BackupReaderWriter):
        suggested_filename: str,
    ) -> WrittenBackup:
        """Receive a backup."""
-        safe_filename = PureWindowsPath(suggested_filename).name
-        if not safe_filename or safe_filename == "..":
-            safe_filename = "backup.tar"
-        temp_file = Path(self.temp_backup_dir, safe_filename)
+        temp_file = Path(self.temp_backup_dir, suggested_filename)

        async_add_executor_job = self._hass.async_add_executor_job
        await async_add_executor_job(make_backup_dir, self.temp_backup_dir)
--- a/homeassistant/components/backup/manifest.json
+++ b/homeassistant/components/backup/manifest.json
@@ -8,6 +8,6 @@
  "integration_type": "service",
  "iot_class": "calculated",
  "quality_scale": "internal",
-  "requirements": ["cronsim==2.7", "securetar==2026.4.0"],
+  "requirements": ["cronsim==2.7", "securetar==2026.2.0"],
  "single_config_entry": true
 }
--- a/homeassistant/components/backup/util.py
+++ b/homeassistant/components/backup/util.py
@@ -22,7 +22,6 @@ from securetar import (
    SecureTarFile,
    SecureTarReadError,
    SecureTarRootKeyContext,
-    get_archive_max_ciphertext_size,
 )

 from homeassistant.core import HomeAssistant
@@ -247,8 +246,6 @@ def decrypt_backup(
        except (DecryptError, SecureTarError, tarfile.TarError) as err:
            LOGGER.warning("Error decrypting backup: %s", err)
            error = err
-        except Abort:
-            raise
        except Exception as err:  # noqa: BLE001
            LOGGER.exception("Unexpected error when decrypting backup: %s", err)
            error = err
@@ -335,10 +332,8 @@ def encrypt_backup(
        except (EncryptError, SecureTarError, tarfile.TarError) as err:
            LOGGER.warning("Error encrypting backup: %s", err)
            error = err
-        except Abort:
-            raise
        except Exception as err:  # noqa: BLE001
-            LOGGER.exception("Unexpected error when encrypting backup: %s", err)
+            LOGGER.exception("Unexpected error when decrypting backup: %s", err)
            error = err
        else:
            # Pad the output stream to the requested minimum size
@@ -432,9 +427,7 @@ class _CipherBackupStreamer:

    def size(self) -> int:
        """Return the maximum size of the decrypted or encrypted backup."""
-        return get_archive_max_ciphertext_size(  # type: ignore[no-any-return]
-            self._backup.size, SECURETAR_CREATE_VERSION, self._num_tar_files()
-        )
+        return self._backup.size + self._num_tar_files() * tarfile.RECORDSIZE

    def _num_tar_files(self) -> int:
        """Return the number of inner tar files."""
--- a/homeassistant/components/battery/init.py
+++ b/homeassistant/components/battery/init.py
@@ -1,17 +0,0 @@
-"""Integration for battery triggers and conditions."""
-
-from __future__ import annotations
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.typing import ConfigType
-
-DOMAIN = "battery"
-CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
-
-__all__ = []
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the component."""
-    return True
--- a/homeassistant/components/battery/condition.py
+++ b/homeassistant/components/battery/condition.py
@@ -1,46 +0,0 @@
-"""Provides conditions for batteries."""
-
-from __future__ import annotations
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
-from homeassistant.const import PERCENTAGE, STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import (
-    Condition,
-    make_entity_numerical_condition,
-    make_entity_state_condition,
-)
-
-BATTERY_DOMAIN_SPECS = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.BATTERY)
-}
-BATTERY_CHARGING_DOMAIN_SPECS = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(
-        device_class=BinarySensorDeviceClass.BATTERY_CHARGING
-    )
-}
-BATTERY_PERCENTAGE_DOMAIN_SPECS = {
-    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
-}
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_ON),
-    "is_not_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_OFF),
-    "is_charging": make_entity_state_condition(BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON),
-    "is_not_charging": make_entity_state_condition(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
-    ),
-    "is_level": make_entity_numerical_condition(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS, PERCENTAGE
-    ),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for batteries."""
-    return CONDITIONS
--- a/homeassistant/components/battery/conditions.yaml
+++ b/homeassistant/components/battery/conditions.yaml
@@ -1,64 +0,0 @@
-.condition_common: &condition_common
-  target: &target_battery_binary_sensor
-    entity:
-      - domain: binary_sensor
-        device_class: battery
-  fields:
-    behavior: &condition_behavior
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
-
-.battery_threshold_entity: &battery_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "%"
-  - domain: sensor
-    device_class: battery
-  - domain: number
-    device_class: battery
-
-.battery_threshold_number: &battery_threshold_number
-  min: 0
-  max: 100
-  mode: box
-  unit_of_measurement: "%"
-
-is_low: *condition_common
-
-is_not_low: *condition_common
-
-is_charging:
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: battery_charging
-  fields:
-    behavior: *condition_behavior
-
-is_not_charging:
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: battery_charging
-  fields:
-    behavior: *condition_behavior
-
-is_level:
-  target:
-    entity:
-      - domain: sensor
-        device_class: battery
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *battery_threshold_entity
-          mode: is
-          number: *battery_threshold_number
--- a/homeassistant/components/battery/icons.json
+++ b/homeassistant/components/battery/icons.json
@@ -1,39 +0,0 @@
-{
-  "conditions": {
-    "is_charging": {
-      "condition": "mdi:battery-charging"
-    },
-    "is_level": {
-      "condition": "mdi:battery-unknown"
-    },
-    "is_low": {
-      "condition": "mdi:battery-alert"
-    },
-    "is_not_charging": {
-      "condition": "mdi:battery"
-    },
-    "is_not_low": {
-      "condition": "mdi:battery"
-    }
-  },
-  "triggers": {
-    "level_changed": {
-      "trigger": "mdi:battery-unknown"
-    },
-    "level_crossed_threshold": {
-      "trigger": "mdi:battery-alert"
-    },
-    "low": {
-      "trigger": "mdi:battery-alert"
-    },
-    "not_low": {
-      "trigger": "mdi:battery"
-    },
-    "started_charging": {
-      "trigger": "mdi:battery-charging"
-    },
-    "stopped_charging": {
-      "trigger": "mdi:battery"
-    }
-  }
-}
--- a/homeassistant/components/battery/manifest.json
+++ b/homeassistant/components/battery/manifest.json
@@ -1,8 +0,0 @@
-{
-  "domain": "battery",
-  "name": "Battery",
-  "codeowners": ["@home-assistant/core"],
-  "documentation": "https://www.home-assistant.io/integrations/battery",
-  "integration_type": "system",
-  "quality_scale": "internal"
-}
--- a/homeassistant/components/battery/strings.json
+++ b/homeassistant/components/battery/strings.json
@@ -1,133 +0,0 @@
-{
-  "common": {
-    "condition_behavior_name": "Condition passes if",
-    "condition_threshold_name": "Threshold type",
-    "trigger_behavior_name": "Trigger when",
-    "trigger_threshold_name": "Threshold type"
-  },
-  "conditions": {
-    "is_charging": {
-      "description": "Tests if one or more batteries are charging.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is charging"
-    },
-    "is_level": {
-      "description": "Tests the battery level of one or more batteries.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::battery::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Battery level"
-    },
-    "is_low": {
-      "description": "Tests if one or more batteries are low.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is low"
-    },
-    "is_not_charging": {
-      "description": "Tests if one or more batteries are not charging.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is not charging"
-    },
-    "is_not_low": {
-      "description": "Tests if one or more batteries are not low.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is not low"
-    }
-  },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
-  "title": "Battery",
-  "triggers": {
-    "level_changed": {
-      "description": "Triggers after the battery level of one or more batteries changes.",
-      "fields": {
-        "threshold": {
-          "name": "[%key:component::battery::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Battery level changed"
-    },
-    "level_crossed_threshold": {
-      "description": "Triggers after the battery level of one or more batteries crosses a threshold.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "name": "[%key:component::battery::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Battery level crossed threshold"
-    },
-    "low": {
-      "description": "Triggers after one or more batteries become low.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery low"
-    },
-    "not_low": {
-      "description": "Triggers after one or more batteries are no longer low.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery not low"
-    },
-    "started_charging": {
-      "description": "Triggers after one or more batteries start charging.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery started charging"
-    },
-    "stopped_charging": {
-      "description": "Triggers after one or more batteries stop charging.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery stopped charging"
-    }
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Hansen	a09b2e4f5f	Add X-Speech-Options header	2026-03-09 14:31:49 -05:00
Michael Hansen	25a02eb2c8	Add options dict	2026-03-09 14:14:50 -05:00