Add Tasmota firmware update availability support

2026-05-30 00:57:19 +03:00
1409 changed files with 9959 additions and 44457 deletions
@@ -8,8 +8,39 @@ description: Reviews GitHub pull requests and provides feedback comments. This i
 ## Follow these steps:
 1. Use 'gh pr view' to get the PR details and description.
 2. Use 'gh pr diff' to see all the changes in the PR.
-3. Review the changes following the `review` skill. It is VERY IMPORTANT to follow the `review` skill instructions.
-4. Check if all existing review comments have been addressed.
+3. Analyze the code changes for:
+   - Code quality and style consistency
+   - Potential bugs or issues
+   - Performance implications
+   - Security concerns
+   - Test coverage
+   - Documentation updates if needed
+4. Ensure any existing review comments have been addressed.
+5. Generate constructive review comments in the CONSOLE. DO NOT POST TO GITHUB YOURSELF.
+
+## Verification:
+
+- After the review, run parallel subagents for each finding to double check it.
+- Spawn up to a maximum of 10 parallel subagents at a time.
+- Gather the results from the subagents and summarize them in the final review comments.
+

 ## IMPORTANT:
+- Just review. DO NOT make any changes
+- Be constructive and specific in your comments
+- Suggest improvements where appropriate
 - Only provide review feedback in the CONSOLE. DO NOT ACT ON GITHUB.
+- No need to run tests or linters, just review the code changes.
+- No need to highlight things that are already good.
+
+## Output format:
+- List specific comments for each file/line that needs attention.
+- In the end, summarize with an overall assessment (approve, request changes, or comment) and bullet point list of changes suggested, if any.
+  - Example output:
+    ```
+    Overall assessment: request changes.
+    - [CRITICAL] sensor.py:143 - Memory leak
+    - [PROBLEM] data_processing.py:87 - Inefficient algorithm
+    - [SUGGESTION] test_init.py:45 - Improve x variable name
+    ```
+  - Make sure to include the file and line number when possible in the bullet points.
@@ -1,38 +0,0 @@
---
-name: review
-description: Reviews code changes and provides constructive feedback. Should be used when a review is requested to provide a consistent review behavior and output format. This skill can be used for code reviews in general, not just for GitHub pull requests.
---
-
-# Review Code Changes
-
-## Analyze the code changes for:
- Code quality and style consistency
- Potential bugs or issues
- Performance implications
- Security concerns
- Test coverage
- Documentation updates if needed
-
-## Verification:
- After the review, run parallel subagents for each finding to double-check it.
- Spawn up to a maximum of 10 parallel subagents at a time.
- Gather the results from the subagents and summarize them in the final review comments.
-
-## IMPORTANT:
- Just review. DO NOT make any changes.
- Be constructive and specific in your comments.
- Suggest improvements where appropriate.
- No need to run tests or linters, just review the code changes.
- No need to highlight things that are already good.
-
-## Output format:
- List specific comments for each file/line that needs attention.
- In the end, summarize with an overall assessment (approve, request changes, or comment) and bullet point list of changes suggested, if any.
-  - Example output:
-    ```
-    Overall assessment: request changes.
-    - [CRITICAL] sensor.py:143 - Memory leak
-    - [PROBLEM] data_processing.py:87 - Inefficient algorithm
-    - [SUGGESTION] test_init.py:45 - Improve x variable name
-    ```
-  - Make sure to include the file and line number when possible in the bullet points.
@@ -344,13 +344,13 @@ jobs:

      - name: Login to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -380,7 +380,7 @@ jobs:
      #   2025.12.0.dev202511250240 -> tags: 2025.12.0.dev202511250240, dev
      - name: Generate Docker metadata
        id: meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
        with:
          images: ${{ matrix.registry }}/home-assistant
          sep-tags: ","
@@ -394,7 +394,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@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v3.7.1
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v3.7.1

      - name: Copy architecture images to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
@@ -523,7 +523,7 @@ jobs:
          persist-credentials: false

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -36,7 +36,7 @@
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
 #   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@97f280b14527ca95859c0facba201aeccb2c097f # v0.77.3
+#   - github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
 #
 # Container images used:
 #   - ghcr.io/github/gh-aw-firewall/agent:0.25.46
@@ -90,7 +90,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@97f280b14527ca95859c0facba201aeccb2c097f # v0.77.3
+        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -352,7 +352,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@97f280b14527ca95859c0facba201aeccb2c097f # v0.77.3
+        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -961,7 +961,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@97f280b14527ca95859c0facba201aeccb2c097f # v0.77.3
+        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -1100,7 +1100,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@97f280b14527ca95859c0facba201aeccb2c097f # v0.77.3
+        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -1325,7 +1325,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@97f280b14527ca95859c0facba201aeccb2c097f # v0.77.3
+        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -1383,7 +1383,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@97f280b14527ca95859c0facba201aeccb2c097f # v0.77.3
+        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -28,11 +28,11 @@ jobs:
          persist-credentials: false

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
        with:
          category: "/language:python"
@@ -236,7 +236,7 @@ jobs:
      - name: Detect duplicates using AI
        id: ai_detection
        if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/ai-inference@a7805884c80886efc241e94a5351df715968a0ad # v2.1.1
+        uses: actions/ai-inference@17ff458cb182449bbb2e43701fcd98f6af8f6570 # v2.1.0
        with:
          model: openai/gpt-4o
          system-prompt: |
@@ -62,7 +62,7 @@ jobs:
      - name: Detect language using AI
        id: ai_language_detection
        if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/ai-inference@a7805884c80886efc241e94a5351df715968a0ad # v2.1.1
+        uses: actions/ai-inference@17ff458cb182449bbb2e43701fcd98f6af8f6570 # v2.1.0
        with:
          model: openai/gpt-4o-mini
          system-prompt: |
@@ -20,7 +20,7 @@ jobs:
      issues: write # To lock issues
      pull-requests: write # To lock pull requests
    steps:
-      - uses: dessant/lock-threads@89ae32b08ed1a541efecbab17912962a5e38981c # v6.0.2
+      - uses: dessant/lock-threads@851cffe46851ddd2051ea7147ebdc995113241c3 # v6.0.1
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: "30"
@@ -20,36 +20,22 @@ jobs:
    permissions:
      issues: write # To label and close stale issues
      pull-requests: write # To label and close stale PRs
-      actions: write # To delete stalebot state
    steps:
-      # Generate a token for the GitHub App, we use this method to avoid
-      # hitting API limits for our GitHub actions + have a higher rate limit.
-      - name: Generate app token
-        id: token
-        # Pinned to a specific version of the action for security reasons
-        # v3.2.0
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1
-        with:
-          client-id: ${{ secrets.ISSUE_TRIAGE_APP_ID }} # zizmor: ignore[secrets-outside-env]
-          private-key: ${{ secrets.ISSUE_TRIAGE_APP_PEM }} # zizmor: ignore[secrets-outside-env]
-
      # The 60 day stale policy for PRs
      # Used for:
      # - PRs
      # - No PRs marked as no-stale
-      # The 90 day stale policy for issues
-      # Used for:
-      # - Issues
-      # - No issues marked as no-stale or help-wanted
-      - name: 60 days stale PRs policy and 90 days stale issue policy
+      # - No issues (-1)
+      - name: 60 days stale PRs policy
        uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
        with:
-          repo-token: ${{ steps.token.outputs.token }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: 60
+          days-before-close: 7
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          operations-per-run: 150
          remove-stale-when-updated: true
-          operations-per-run: 350
-          # pr policy
-          days-before-pr-stale: 60
-          days-before-pr-close: 7
          stale-pr-label: "stale"
          exempt-pr-labels: "no-stale"
          stale-pr-message: >
@@ -62,9 +48,65 @@ jobs:
            branch to ensure that it's up to date with the latest changes.

            Thank you for your contribution!
-          # issue policy
-          days-before-issue-stale: 90
-          days-before-issue-close: 7
+
+      # Generate a token for the GitHub App, we use this method to avoid
+      # hitting API limits for our GitHub actions + have a higher rate limit.
+      # This is only used for issues.
+      - name: Generate app token
+        id: token
+        # Pinned to a specific version of the action for security reasons
+        # v3.2.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1
+        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]
+
+      # The 90 day stale policy for issues
+      # Used for:
+      # - Issues
+      # - No issues marked as no-stale or help-wanted
+      # - No PRs (-1)
+      - name: 90 days stale issues
+        uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
+        with:
+          repo-token: ${{ steps.token.outputs.token }}
+          days-before-stale: 90
+          days-before-close: 7
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          operations-per-run: 250
+          remove-stale-when-updated: true
+          stale-issue-label: "stale"
+          exempt-issue-labels: "no-stale,help-wanted,needs-more-information"
+          stale-issue-message: >
+            There hasn't been any activity on this issue recently. Due to the
+            high number of incoming GitHub notifications, we have to clean some
+            of the old issues, as many of them have already been resolved with
+            the latest updates.
+
+            Please make sure to update to the latest Home Assistant version and
+            check if that solves the issue. Let us know if that works for you by
+            adding a comment 👍
+
+            This issue has now been marked as stale and will be closed if no
+            further activity occurs. Thank you for your contributions.
+
+      # The 30 day stale policy for issues
+      # Used for:
+      # - Issues that are pending more information (incomplete issues)
+      # - No Issues marked as no-stale or help-wanted
+      # - No PRs (-1)
+      - name: Needs more information stale issues policy
+        uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
+        with:
+          repo-token: ${{ steps.token.outputs.token }}
+          only-labels: "needs-more-information"
+          days-before-stale: 14
+          days-before-close: 7
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          operations-per-run: 250
+          remove-stale-when-updated: true
          stale-issue-label: "stale"
          exempt-issue-labels: "no-stale,help-wanted"
          stale-issue-message: >
@@ -137,7 +137,7 @@ jobs:
          sed -i "/uv/d" requirements_diff.txt

      - name: Build wheels
-        uses: home-assistant/wheels@34957438948e0b3dcde73c77750643dadae594f5 # 2026.06.0
+        uses: home-assistant/wheels@e5742a69d69f0e274e2689c998900c7d19652c21 # 2025.12.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
@@ -195,7 +195,7 @@ jobs:
          sed -i "/uv/d" requirements_diff.txt

      - name: Build wheels
-        uses: home-assistant/wheels@34957438948e0b3dcde73c77750643dadae594f5 # 2026.06.0
+        uses: home-assistant/wheels@e5742a69d69f0e274e2689c998900c7d19652c21 # 2025.12.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.15
+    rev: v0.15.14
    hooks:
      - id: ruff-check
        args:
@@ -96,7 +96,6 @@ homeassistant.components.aprs.*
 homeassistant.components.apsystems.*
 homeassistant.components.aqualogic.*
 homeassistant.components.aquostv.*
-homeassistant.components.aqvify.*
 homeassistant.components.aranet.*
 homeassistant.components.arcam_fmj.*
 homeassistant.components.arris_tg2492lg.*
@@ -287,7 +286,6 @@ homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
 homeassistant.components.huum.*
-homeassistant.components.hvv_departures.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.hypontech.*
@@ -162,8 +162,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/apsystems/ @mawoka-myblock @SonnenladenGmbH
 /homeassistant/components/aquacell/ @Jordi1990
 /tests/components/aquacell/ @Jordi1990
-/homeassistant/components/aqvify/ @astrandb
-/tests/components/aqvify/ @astrandb
 /homeassistant/components/aranet/ @aschmitz @thecode @anrijs
 /tests/components/aranet/ @aschmitz @thecode @anrijs
 /homeassistant/components/arcam_fmj/ @elupus
@@ -455,8 +453,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/ecovacs/ @mib1185 @edenhaus @Augar
 /homeassistant/components/ecowitt/ @pvizeli
 /tests/components/ecowitt/ @pvizeli
-/homeassistant/components/edifier_infrared/ @abmantis
-/tests/components/edifier_infrared/ @abmantis
 /homeassistant/components/efergy/ @tkdrob
 /tests/components/efergy/ @tkdrob
 /homeassistant/components/egardia/ @jeroenterheerdt
@@ -505,8 +501,6 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /tests/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /homeassistant/components/entur_public_transport/ @hfurubotten @SanderBlom
-/homeassistant/components/envertech_evt800/ @daniel-bergmann-00
-/tests/components/envertech_evt800/ @daniel-bergmann-00
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
 /homeassistant/components/ephember/ @ttroy50 @roberty99
@@ -576,8 +570,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/flo/ @dmulcahey
 /homeassistant/components/flume/ @ChrisMandich @bdraco @jeeftor
 /tests/components/flume/ @ChrisMandich @bdraco @jeeftor
-/homeassistant/components/fluss/ @fluss @Marcello17
-/tests/components/fluss/ @fluss @Marcello17
+/homeassistant/components/fluss/ @fluss
+/tests/components/fluss/ @fluss
 /homeassistant/components/flux_led/ @icemanch
 /tests/components/flux_led/ @icemanch
 /homeassistant/components/forecast_solar/ @klaasnicolaas @frenck
@@ -629,8 +623,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/generic_hygrostat/ @Shulyaka
 /homeassistant/components/geniushub/ @manzanotti
 /tests/components/geniushub/ @manzanotti
-/homeassistant/components/gentex_homelink/ @Gentex-Corporation/Homelink @rjones-gentex
-/tests/components/gentex_homelink/ @Gentex-Corporation/Homelink @rjones-gentex
+/homeassistant/components/gentex_homelink/ @niaexa @ryanjones-gentex
+/tests/components/gentex_homelink/ @niaexa @ryanjones-gentex
 /homeassistant/components/geo_json_events/ @exxamalte
 /tests/components/geo_json_events/ @exxamalte
 /homeassistant/components/geo_location/ @home-assistant/core
@@ -724,8 +718,6 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/heatmiser/ @andylockran
 /homeassistant/components/hegel/ @boazca
 /tests/components/hegel/ @boazca
-/homeassistant/components/helty/ @ebaschiera
-/tests/components/helty/ @ebaschiera
 /homeassistant/components/heos/ @andrewsayre
 /tests/components/heos/ @andrewsayre
 /homeassistant/components/here_travel_time/ @eifinger
@@ -844,8 +836,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/imgw_pib/ @bieniu
 /homeassistant/components/immich/ @mib1185
 /tests/components/immich/ @mib1185
-/homeassistant/components/imou/ @Imou-OpenPlatform
-/tests/components/imou/ @Imou-OpenPlatform
 /homeassistant/components/improv_ble/ @emontnemery
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
@@ -11,6 +11,7 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
+    CONCENTRATION_PARTS_PER_CUBIC_METER,
    PERCENTAGE,
    UV_INDEX,
    UnitOfIrradiance,
@@ -46,8 +47,6 @@ from .coordinator import (

 PARALLEL_UPDATES = 1

-PARTS_PER_CUBIC_METER = "p/m³"
-

@dataclass(frozen=True, kw_only=True)
 class AccuWeatherSensorDescription(SensorEntityDescription):
@@ -82,7 +81,7 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
    AccuWeatherSensorDescription(
        key="Grass",
        entity_registry_enabled_default=False,
-        native_unit_of_measurement=PARTS_PER_CUBIC_METER,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {
            ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
@@ -108,7 +107,7 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
    AccuWeatherSensorDescription(
        key="Mold",
        entity_registry_enabled_default=False,
-        native_unit_of_measurement=PARTS_PER_CUBIC_METER,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {
            ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
@@ -117,7 +116,7 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
    ),
    AccuWeatherSensorDescription(
        key="Ragweed",
-        native_unit_of_measurement=PARTS_PER_CUBIC_METER,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
        entity_registry_enabled_default=False,
        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {
@@ -185,7 +184,7 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
    ),
    AccuWeatherSensorDescription(
        key="Tree",
-        native_unit_of_measurement=PARTS_PER_CUBIC_METER,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
        entity_registry_enabled_default=False,
        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {
@@ -13,5 +13,5 @@
  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "quality_scale": "silver",
-  "requirements": ["actron-neo-api==0.5.12"]
+  "requirements": ["actron-neo-api==0.5.6"]
 }
@@ -72,7 +72,8 @@ async def _resolve_attachments(
            resolved_attachments.append(
                conversation.Attachment(
                    media_content_id=media_content_id,
-                    mime_type=image_data.content_type,
+                    mime_type=attachment.get("media_content_type")
+                    or image_data.content_type,
                    path=temp_filename,
                )
            )
@@ -116,6 +116,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
 async def async_migrate_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
    """Migrate old config entry."""

+    # This means the user has downgraded from a future version
+    if entry.version > 2:
+        return False
+
    # 1.1 Migrate config_entry to add advanced ssl settings
    if entry.version == 1 and entry.minor_version == 1:
        new_minor_version = 2
@@ -8,5 +8,5 @@
  "integration_type": "device",
  "iot_class": "local_polling",
  "quality_scale": "platinum",
-  "requirements": ["airos==0.6.8"]
+  "requirements": ["airos==0.6.5"]
 }
@@ -8,7 +8,6 @@ from bleak.backends.device import BLEDevice
 from bleak_retry_connector import close_stale_connections_by_address

 from homeassistant.components import bluetooth
-from homeassistant.components.bluetooth import BluetoothReachabilityIntent
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -64,16 +63,7 @@ class AirthingsBLEDataUpdateCoordinator(DataUpdateCoordinator[AirthingsDevice]):

        if not ble_device:
            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN,
-                translation_key="device_not_found",
-                translation_placeholders={
-                    "address": address,
-                    "reason": bluetooth.async_address_reachability_diagnostics(
-                        self.hass,
-                        address.upper(),
-                        BluetoothReachabilityIntent.CONNECTION,
-                    ),
-                },
+                f"Could not find Airthings device with address {address}"
            )
        self.ble_device = ble_device

@@ -54,10 +54,5 @@
        "name": "Radon longterm level"
      }
    }
-  },
-  "exceptions": {
-    "device_not_found": {
-      "message": "Could not find Airthings device with address {address}: {reason}"
-    }
  }
 }
@@ -1,10 +1,6 @@
 """The AirVisual Pro integration."""

-from homeassistant.helpers.device_registry import (
-    CONNECTION_NETWORK_MAC,
-    DeviceInfo,
-    format_mac,
-)
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

@@ -29,12 +25,6 @@ class AirVisualProEntity(CoordinatorEntity[AirVisualProCoordinator]):
        """Return device registry information for this entity."""
        return DeviceInfo(
            identifiers={(DOMAIN, self.coordinator.data["serial_number"])},
-            connections={
-                (
-                    CONNECTION_NETWORK_MAC,
-                    format_mac(self.coordinator.data["status"]["mac_address"]),
-                )
-            },
            manufacturer="AirVisual",
            model=self.coordinator.data["status"]["model"],
            name=self.coordinator.data["settings"]["node_name"],
@@ -1,5 +1,8 @@
 """Alexa Devices integration."""

+import asyncio
+import contextlib
+
 from homeassistant.const import CONF_COUNTRY, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client, config_validation as cv, httpx_client
@@ -43,17 +46,21 @@ async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bo
    async def _on_http2_reauth_required() -> None:
        entry.async_start_reauth(hass)

+    async def _cancel_http2() -> None:
+        http2_task.cancel()
+        with contextlib.suppress(asyncio.CancelledError):
+            await http2_task
+
    alexa_httpx_client = httpx_client.get_async_client(
        hass,
        alpn_protocols=SSL_ALPN_HTTP11_HTTP2,
    )

-    await coordinator.api.start_http2_processing(
-        alexa_httpx_client,
-        on_reauth_required=_on_http2_reauth_required,
+    http2_task = await coordinator.api.start_http2_processing(
+        alexa_httpx_client, on_reauth_required=_on_http2_reauth_required
    )

-    entry.async_on_unload(coordinator.api.stop_http2_processing)
+    entry.async_on_unload(_cancel_http2)

    entry.runtime_data = coordinator

@@ -65,6 +72,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bo
 async def async_migrate_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
    """Migrate old entry."""

+    if entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
    if entry.version == 1 and entry.minor_version < 3:
        if CONF_SITE in entry.data:
            # Site in data (wrong place), just move to login data
@@ -39,8 +39,11 @@ async def async_setup_entry(
 class AmazonRoutineButton(AmazonServiceEntity, ButtonEntity):
    """Button entity for Alexa routine."""

+    _attr_has_entity_name = True
+
    def __init__(self, coordinator: AmazonDevicesCoordinator, routine: str) -> None:
        """Initialize the routine button entity."""
+        self._coordinator = coordinator
        self._routine = routine
        super().__init__(
            coordinator,
@@ -49,4 +52,4 @@ class AmazonRoutineButton(AmazonServiceEntity, ButtonEntity):

    async def async_press(self) -> None:
        """Handle button press action."""
-        await self.coordinator.api.call_routine(self._routine)
+        await self._coordinator.api.call_routine(self._routine)
@@ -204,26 +204,7 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):

    async def sync_media_state(self) -> None:
        """Sync media state."""
-        try:
-            await self.api.sync_media_state()
-        except CannotAuthenticate as err:
-            raise ConfigEntryAuthFailed(
-                translation_domain=DOMAIN,
-                translation_key="invalid_auth",
-                translation_placeholders={"error": repr(err)},
-            ) from err
-        except (CannotConnect, TimeoutError) as err:
-            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN,
-                translation_key="cannot_connect_with_error",
-                translation_placeholders={"error": repr(err)},
-            ) from err
-        except (CannotRetrieveData, ValueError) as err:
-            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN,
-                translation_key="cannot_retrieve_data_with_error",
-                translation_placeholders={"error": repr(err)},
-            ) from err
+        await self.api.sync_media_state()

    async def media_state_event_handler(
        self, media_state: dict[str, AmazonMediaState]
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
  "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==14.0.0"]
+  "requirements": ["aioamazondevices==13.8.1"]
 }
@@ -1,7 +1,8 @@
 """Media player platform for Alexa Devices."""

+from dataclasses import dataclass
 from datetime import datetime
-from typing import Any
+from typing import Any, Final

 from aioamazondevices.structures import (
    AmazonMediaControls,
@@ -37,6 +38,18 @@ STANDARD_SUPPORTED_FEATURES = (
 )


+@dataclass(frozen=True, kw_only=True)
+class AmazonDevicesMediaPlayerEntityDescription(MediaPlayerEntityDescription):
+    """Describes an Alexa Devices media player entity."""
+
+
+MEDIA_PLAYERS: Final = (
+    AmazonDevicesMediaPlayerEntityDescription(
+        key="media",
+    ),
+)
+
+
 async def async_setup_entry(
    hass: HomeAssistant,
    entry: AmazonConfigEntry,
@@ -56,10 +69,9 @@ async def async_setup_entry(
                continue

            known_devices.add(serial_num)
-            new_entities.append(
-                AlexaDevicesMediaPlayer(
-                    coordinator, serial_num, MediaPlayerEntityDescription(key="media")
-                )
+            new_entities.extend(
+                AlexaDevicesMediaPlayer(coordinator, serial_num, description)
+                for description in MEDIA_PLAYERS
            )

        if new_entities:
@@ -73,6 +85,8 @@ async def async_setup_entry(
 class AlexaDevicesMediaPlayer(AmazonEntity, MediaPlayerEntity):
    """Representation of an Alexa device media player."""

+    entity_description: AmazonDevicesMediaPlayerEntityDescription
+
    _attr_name = None  # Uses the device name
    _attr_device_class = MediaPlayerDeviceClass.SPEAKER
    _attr_volume_step = 0.05
@@ -81,7 +95,7 @@ class AlexaDevicesMediaPlayer(AmazonEntity, MediaPlayerEntity):
        self,
        coordinator: AmazonDevicesCoordinator,
        serial_num: str,
-        description: MediaPlayerEntityDescription,
+        description: AmazonDevicesMediaPlayerEntityDescription,
    ) -> None:
        """Initialize."""
        self._prev_volume: int | None = None
@@ -142,11 +156,9 @@ class AlexaDevicesMediaPlayer(AmazonEntity, MediaPlayerEntity):
    @property
    def is_volume_muted(self) -> bool | None:
        """Return True if the volume is muted."""
-        if not self.volume_state or self.volume_state.volume is None:
+        if not self.volume_state:
            return None
-        # is_muted is True when Alexa has muted the device
-        # volume == 0 is where we have muted by setting volume to 0
-        return self.volume_state.is_muted or self.volume_state.volume == 0
+        return self.volume_state.volume == 0

    @property
    def media_title(self) -> str | None:
@@ -200,7 +212,7 @@ class AlexaDevicesMediaPlayer(AmazonEntity, MediaPlayerEntity):
    @property
    def media_content_type(self) -> MediaType | None:
        """Content type — tells HA what kind of media is playing."""
-        if self.state in (MediaPlayerState.PLAYING, MediaPlayerState.PAUSED):
+        if self.state in [MediaPlayerState.PLAYING, MediaPlayerState.PAUSED]:
            return MediaType.MUSIC
        return None

@@ -213,8 +225,7 @@ class AlexaDevicesMediaPlayer(AmazonEntity, MediaPlayerEntity):
        **kwargs: Any,
    ) -> None:
        """Play a piece of media."""
-        provider = media_type.value if isinstance(media_type, MediaType) else media_type
-        await self.async_call_alexa_music(media_id, provider)
+        await self.async_call_alexa_music(media_id, media_type)

    @alexa_api_call
    async def async_call_alexa_music(
@@ -248,20 +259,12 @@ class AlexaDevicesMediaPlayer(AmazonEntity, MediaPlayerEntity):
            return
        if mute:
            self._prev_volume = self.volume_state.volume
-            await self.async_set_volume_level(0)
-            return
-
-        if self.volume_state.is_muted and self._prev_volume is None:
-            # is muted by Alexa which we can see but not control
-            # when muted this way, volume is still set
-            # changing volume will unmute
-            # if HA set volume to 0 then Alexa muted we just default to 30%
-            self._prev_volume = self.volume_state.volume or 30
-        if self._prev_volume is None:
-            return
-        target_volume = self._prev_volume
+            target_volume = 0
+        else:
+            if self._prev_volume is None:
+                return
+            target_volume = self._prev_volume
        await self.async_set_volume_level(target_volume / 100)
-        self._prev_volume = None

    @alexa_api_call
    async def _send_media_command(self, command: AmazonMediaControls) -> None:
@@ -125,9 +125,6 @@
    },
    "invalid_sound_value": {
      "message": "Invalid sound {sound} specified"
-    },
-    "unknown_exception": {
-      "message": "Unknown error occurred: {error}"
    }
  },
  "selector": {
@@ -75,6 +75,10 @@ async def async_migrate_entry(hass: HomeAssistant, entry: AnovaConfigEntry) -> b
    """Migrate entry."""
    _LOGGER.debug("Migrating from version %s:%s", entry.version, entry.minor_version)

+    if entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
    if entry.version == 1 and entry.minor_version == 1:
        new_data = {**entry.data}
        if CONF_DEVICES in new_data:
@@ -178,6 +178,10 @@ async def async_migrate_entry(hass: HomeAssistant, entry: AnthropicConfigEntry)
    """Migrate entry."""
    LOGGER.debug("Migrating from version %s:%s", entry.version, entry.minor_version)

+    if entry.version > 2:
+        # This means the user has downgraded from a future version
+        return False
+
    if entry.version == 2 and entry.minor_version == 1:
        # Correct broken device migration in Home Assistant Core 2025.7.0b0-2025.7.0b1
        device_registry = dr.async_get(hass)
@@ -4,6 +4,7 @@ import base64
 from collections import deque
 from collections.abc import AsyncIterator, Callable, Iterable
 from dataclasses import dataclass, field
+from datetime import UTC, datetime
 import json
 from mimetypes import guess_file_type
 from pathlib import Path
@@ -113,7 +114,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, llm
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util import dt as dt_util, slugify
+from homeassistant.util import slugify
 from homeassistant.util.json import JsonArrayType, JsonObjectType

 from .const import (
@@ -371,7 +372,7 @@ def _convert_content(  # noqa: C901
                    )
                if (
                    content.native.container is not None
-                    and content.native.container.expires_at > dt_util.utcnow()
+                    and content.native.container.expires_at > datetime.now(UTC)
                ):
                    container_id = content.native.container.id

@@ -59,6 +59,7 @@ ATTR_EXTERNAL_URL = "external_url"
 ATTR_INTERNAL_URL = "internal_url"
 ATTR_LOCATION_NAME = "location_name"
 ATTR_INSTALLATION_TYPE = "installation_type"
+ATTR_REQUIRES_API_PASSWORD = "requires_api_password"
 ATTR_UUID = "uuid"
 ATTR_VERSION = "version"

@@ -221,7 +222,7 @@ class APIStatesView(HomeAssistantView):
            states = (
                state.as_dict_json
                for state in hass.states.async_all()
-                if entity_perm(state.entity_id, POLICY_READ)
+                if entity_perm(state.entity_id, "read")
            )
        response = web.Response(
            body=b"".join((b"[", b",".join(states), b"]")),
@@ -293,10 +294,8 @@ class APIEntityStateView(HomeAssistantView):

        # Read the state back for our response
        status_code = HTTPStatus.CREATED if is_new_state else HTTPStatus.OK
-        if (state := hass.states.get(entity_id)) is None:
-            return self.json_message(
-                "Error storing state.", HTTPStatus.INTERNAL_SERVER_ERROR
-            )
+        state = hass.states.get(entity_id)
+        assert state
        resp = self.json(state.as_dict(), status_code)

        resp.headers.add("Location", f"/api/states/{entity_id}")
@@ -6,5 +6,5 @@
  "iot_class": "cloud_push",
  "loggers": ["apprise"],
  "quality_scale": "legacy",
-  "requirements": ["apprise==1.11.0"]
+  "requirements": ["apprise==1.9.1"]
 }
@@ -1,28 +0,0 @@
-"""The Aqvify integration."""
-
-import logging
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AqvifyConfigEntry, AqvifyCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-PLATFORMS: list[Platform] = [Platform.SENSOR]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AqvifyConfigEntry) -> bool:
-    """Set up Aqvify from a config entry."""
-
-    coordinator = AqvifyCoordinator(hass, 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: AqvifyConfigEntry) -> bool:
-    """Unload Aqvify config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
@@ -1,61 +0,0 @@
-"""Config flow for the Aqvify integration."""
-
-import logging
-from typing import Any
-
-from aiohttp import ClientResponseError
-from pyaqvify import AqvifyAPI, AqvifyAuthException
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_API_KEY
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_API_KEY): str,
-    }
-)
-
-
-class AqvifyConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Aqvify."""
-
-    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:
-            hub = AqvifyAPI(
-                user_input[CONF_API_KEY],
-                websession=async_get_clientsession(self.hass),
-            )
-            try:
-                account_data = await hub.async_get_account_id()
-            except AqvifyAuthException:
-                errors["base"] = "invalid_auth"
-            except ClientResponseError:
-                errors["base"] = "cannot_connect"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                await self.async_set_unique_id(account_data.account_id)
-                self._abort_if_unique_id_configured()
-                return self.async_create_entry(title="Aqvify", data=user_input)
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=STEP_USER_DATA_SCHEMA,
-            errors=errors,
-            description_placeholders={
-                "aqvify_url": "https://app.aqvify.com/User",
-            },
-        )
@@ -1,3 +0,0 @@
-"""Constants for the Aqvify integration."""
-
-DOMAIN = "aqvify"
@@ -1,92 +0,0 @@
-"""Coordinator for Aqvify integration."""
-
-from dataclasses import dataclass
-from datetime import timedelta
-import logging
-
-from aiohttp import ClientResponseError
-from pyaqvify import AqvifyAPI, AqvifyAuthException, AqvifyDeviceData, AqvifyDevices
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_KEY
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-UPDATE_INTERVAL = timedelta(seconds=60)
-
-type AqvifyConfigEntry = ConfigEntry[AqvifyCoordinator]
-
-
-@dataclass
-class AqvifyCoordinatorData:
-    """Data class for storing coordinator data."""
-
-    devices: AqvifyDevices
-    device_data: dict[str, AqvifyDeviceData]
-
-
-class AqvifyCoordinator(DataUpdateCoordinator[AqvifyCoordinatorData]):
-    """Data update coordinator for Aqvify devices."""
-
-    config_entry: AqvifyConfigEntry
-
-    def __init__(self, hass: HomeAssistant, entry: AqvifyConfigEntry) -> None:
-        """Initialize the Aqvify data update coordinator."""
-        super().__init__(
-            hass,
-            logger=_LOGGER,
-            name=DOMAIN,
-            update_interval=UPDATE_INTERVAL,
-            config_entry=entry,
-        )
-
-        self.api_client = AqvifyAPI(
-            entry.data[CONF_API_KEY], websession=async_get_clientsession(hass)
-        )
-
-    async def _async_setup(self) -> None:
-        """Set up the coordinator."""
-        try:
-            await self.api_client.async_get_account_id()
-        except AqvifyAuthException as err:
-            raise ConfigEntryAuthFailed(f"Invalid Aqvify API key: {err}") from err
-        except (ClientResponseError, TimeoutError) as err:
-            raise ConfigEntryNotReady(
-                f"Failed to connect to Aqvify API: {err}"
-            ) from err
-
-    async def _async_update_data(self) -> AqvifyCoordinatorData:
-        """Fetch device state."""
-        try:
-            devices = await self.api_client.async_get_devices()
-        except ClientResponseError as err:
-            raise UpdateFailed(f"Error communicating with Aqvify API: {err}") from err
-        except TimeoutError as err:
-            raise UpdateFailed(f"Timeout communicating with Aqvify API: {err}") from err
-
-        device_data = {}
-        for device in devices.devices.values():
-            try:
-                device_key = str(device.device_key)
-                device_data[
-                    device_key
-                ] = await self.api_client.async_get_device_latest_data(device_key)
-            except ClientResponseError as err:
-                raise UpdateFailed(
-                    f"Error communicating with Aqvify API: {err}"
-                ) from err
-            except TimeoutError as err:
-                raise UpdateFailed(
-                    f"Timeout communicating with Aqvify API: {err}"
-                ) from err
-
-        return AqvifyCoordinatorData(
-            devices=devices,
-            device_data=device_data,
-        )
@@ -1,35 +0,0 @@
-"""Defines a base Aqvify entity."""
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AqvifyCoordinator
-
-
-class AqvifyBaseEntity(CoordinatorEntity[AqvifyCoordinator]):
-    """Defines a base Aqvify entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AqvifyCoordinator,
-        description: EntityDescription,
-        device_key: str,
-    ) -> None:
-        """Initialize the Aqvify entity."""
-        super().__init__(coordinator)
-
-        account_id = self.coordinator.config_entry.unique_id
-        self.device_key = device_key
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"{account_id}_{device_key}")},
-            name=coordinator.data.devices.devices[device_key].name,
-            manufacturer="Aqvify",
-            configuration_url="https://app.aqvify.com",
-            serial_number=device_key,
-        )
-        self._attr_unique_id = f"{account_id}_{device_key}_{description.key}"
-        self.entity_description = description
@@ -1,12 +0,0 @@
-{
-  "entity": {
-    "sensor": {
-      "meter_value": {
-        "default": "mdi:waves-arrow-up"
-      },
-      "water_level": {
-        "default": "mdi:waves"
-      }
-    }
-  }
-}
@@ -1,12 +0,0 @@
-{
-  "domain": "aqvify",
-  "name": "Aqvify",
-  "codeowners": ["@astrandb"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/aqvify",
-  "integration_type": "hub",
-  "iot_class": "cloud_polling",
-  "loggers": ["pyaqvify"],
-  "quality_scale": "bronze",
-  "requirements": ["pyaqvify==0.0.8"]
-}
@@ -1,69 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: |
-      No actions in this integration.
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: |
-      The integration does not provide any actions.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: |
-      Entities of this integration do not explicitly subscribe to events.
-  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: todo
-  config-entry-unloading: done
-  docs-configuration-parameters: todo
-  docs-installation-parameters: todo
-  entity-unavailable: todo
-  integration-owner: todo
-  log-when-unavailable: todo
-  parallel-updates: done
-  reauthentication-flow: todo
-  test-coverage: todo
-
-  # Gold
-  devices: todo
-  diagnostics: todo
-  discovery-update-info: todo
-  discovery: todo
-  docs-data-update: todo
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: todo
-  entity-device-class: todo
-  entity-disabled-by-default: todo
-  entity-translations: todo
-  exception-translations: todo
-  icon-translations: done
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: todo
-  inject-websession: todo
-  strict-typing: todo
@@ -1,79 +0,0 @@
-"""Sensor platform for Aqvify integration."""
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from datetime import datetime
-
-from pyaqvify import AqvifyDeviceData
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-    StateType,
-)
-from homeassistant.const import UnitOfLength
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AqvifyConfigEntry
-from .entity import AqvifyBaseEntity
-
-# Coordinator is used to centralize the data updates.
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class AqvifySensorEntityDescription(SensorEntityDescription):
-    """Description of an Aqvify sensor entity."""
-
-    value_fn: Callable[[AqvifyDeviceData], float | int | None]
-
-
-ENTITIES: tuple[AqvifySensorEntityDescription, ...] = (
-    AqvifySensorEntityDescription(
-        key="meter_value",
-        translation_key="meter_value",
-        native_unit_of_measurement=UnitOfLength.METERS,
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.DISTANCE,
-        suggested_display_precision=2,
-        value_fn=lambda value: value.meter_value,
-    ),
-    AqvifySensorEntityDescription(
-        key="water_level",
-        translation_key="water_level",
-        native_unit_of_measurement=UnitOfLength.METERS,
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.DISTANCE,
-        suggested_display_precision=2,
-        value_fn=lambda value: value.water_level,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AqvifyConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Aqvify sensor entities from a config entry."""
-    async_add_entities(
-        AqvifySensor(entry.runtime_data, description, device_key)
-        for description in ENTITIES
-        for device_key in entry.runtime_data.data.devices.devices
-    )
-
-
-class AqvifySensor(AqvifyBaseEntity, SensorEntity):
-    """Representation of an Aqvify sensor entity."""
-
-    entity_description: AqvifySensorEntityDescription
-
-    @property
-    def native_value(self) -> StateType | datetime | None:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(
-            self.coordinator.data.device_data[self.device_key]
-        )
@@ -1,33 +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%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "user": {
-        "data": {
-          "api_key": "API key"
-        },
-        "data_description": {
-          "api_key": "Your Aqvify API key"
-        },
-        "description": "Navigate to your [Aqvify account]({aqvify_url}), copy your API key, and paste it below."
-      }
-    }
-  },
-  "entity": {
-    "sensor": {
-      "meter_value": {
-        "name": "Meter value"
-      },
-      "water_level": {
-        "name": "Water level"
-      }
-    }
-  }
-}
@@ -4,7 +4,6 @@
  "codeowners": [],
  "dependencies": ["mqtt"],
  "documentation": "https://www.home-assistant.io/integrations/arwn",
-  "iot_class": "local_push",
-  "quality_scale": "legacy",
-  "requirements": ["arwn-client==0.2.1"]
+  "iot_class": "local_polling",
+  "quality_scale": "legacy"
 }
@@ -3,26 +3,113 @@
 import logging
 from typing import Any

-from arwn_client import parse_message
-
 from homeassistant.components import mqtt
 from homeassistant.components.sensor import (
    SensorDeviceClass,
    SensorEntity,
    SensorStateClass,
 )
+from homeassistant.const import DEGREE, UnitOfPrecipitationDepth, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import slugify
 from homeassistant.util.json import json_loads_object

 _LOGGER = logging.getLogger(__name__)

 DOMAIN = "arwn"
+
 DATA_ARWN = "arwn"
 TOPIC = "arwn/#"


+def discover_sensors(topic: str, payload: dict[str, Any]) -> list[ArwnSensor] | None:
+    """Given a topic, dynamically create the right sensor type.
+
+    Async friendly.
+    """
+    parts = topic.split("/")
+    unit = payload.get("units", "")
+    domain = parts[1]
+    if domain == "temperature":
+        name = parts[2]
+        if unit == "F":
+            unit = UnitOfTemperature.FAHRENHEIT
+        else:
+            unit = UnitOfTemperature.CELSIUS
+        return [
+            ArwnSensor(
+                topic, name, "temp", unit, device_class=SensorDeviceClass.TEMPERATURE
+            )
+        ]
+    if domain == "moisture":
+        name = f"{parts[2]} Moisture"
+        return [ArwnSensor(topic, name, "moisture", unit, "mdi:water-percent")]
+    if domain == "rain":
+        if len(parts) >= 3 and parts[2] == "today":
+            return [
+                ArwnSensor(
+                    topic,
+                    "Rain Since Midnight",
+                    "since_midnight",
+                    UnitOfPrecipitationDepth.INCHES,
+                    device_class=SensorDeviceClass.PRECIPITATION,
+                )
+            ]
+        return [
+            ArwnSensor(
+                topic + "/total",
+                "Total Rainfall",
+                "total",
+                unit,
+                device_class=SensorDeviceClass.PRECIPITATION,
+            ),
+            ArwnSensor(
+                topic + "/rate",
+                "Rainfall Rate",
+                "rate",
+                unit,
+                device_class=SensorDeviceClass.PRECIPITATION,
+            ),
+        ]
+    if domain == "barometer":
+        return [
+            ArwnSensor(topic, "Barometer", "pressure", unit, "mdi:thermometer-lines")
+        ]
+    if domain == "wind":
+        return [
+            ArwnSensor(
+                topic + "/speed",
+                "Wind Speed",
+                "speed",
+                unit,
+                device_class=SensorDeviceClass.WIND_SPEED,
+            ),
+            ArwnSensor(
+                topic + "/gust",
+                "Wind Gust",
+                "gust",
+                unit,
+                device_class=SensorDeviceClass.WIND_SPEED,
+            ),
+            ArwnSensor(
+                topic + "/dir",
+                "Wind Direction",
+                "direction",
+                DEGREE,
+                "mdi:compass",
+                device_class=SensorDeviceClass.WIND_DIRECTION,
+                state_class=SensorStateClass.MEASUREMENT_ANGLE,
+            ),
+        ]
+    return None
+
+
+def _slug(name: str) -> str:
+    return f"sensor.arwn_{slugify(name)}"
+
+
 async def async_setup_platform(
    hass: HomeAssistant,
    config: ConfigType,
@@ -31,25 +118,28 @@ async def async_setup_platform(
 ) -> None:
    """Set up the ARWN platform."""

+    # Make sure MQTT integration is enabled and the client is available
    if not await mqtt.async_wait_for_mqtt_client(hass):
        _LOGGER.error("MQTT integration is not available")
        return

    @callback
    def async_sensor_event_received(msg: mqtt.ReceiveMessage) -> None:
-        """Process MQTT events as sensors."""
-        try:
-            event = json_loads_object(msg.payload)
-            device = parse_message(msg.topic, event)
-        except Exception:  # noqa: BLE001
-            _LOGGER.debug(
-                "Failed to parse ARWN message on topic %s",
-                msg.topic,
-                exc_info=True,
-            )
-            return
+        """Process events as sensors.

-        if device is None:
+        When a new event on our topic (arwn/#) is received we map it
+        into a known kind of sensor based on topic name. If we've
+        never seen this before, we keep this sensor around in a global
+        cache. If we have seen it before, we update the values of the
+        existing sensor. Either way, we push an ha state update at the
+        end for the new event we've seen.
+
+        This lets us dynamically incorporate sensors without any
+        configuration on our side.
+        """
+        event = json_loads_object(msg.payload)
+        sensors = discover_sensors(msg.topic, event)
+        if not sensors:
            return

        if (store := hass.data.get(DATA_ARWN)) is None:
@@ -58,71 +148,22 @@ async def async_setup_platform(
        if "timestamp" in event:
            del event["timestamp"]

-        new_sensors: list[ArwnSensor] = []
-        for reading in device.readings:
-            if not reading.expose:
-                continue
-
-            unique_id = (
-                f"{msg.topic}/{reading.sensor_key}"
-                if len(device.readings) > 1
-                else msg.topic
-            )
-
-            try:
-                device_class = (
-                    SensorDeviceClass(reading.device_class)
-                    if reading.device_class
-                    else None
-                )
-            except ValueError:
-                _LOGGER.debug(
-                    "Unknown device_class=%s for sensor %s",
-                    reading.device_class,
-                    reading.sensor_name,
-                )
-                device_class = None
-
-            try:
-                state_class = (
-                    SensorStateClass(reading.state_class)
-                    if reading.state_class
-                    else None
-                )
-            except ValueError:
-                _LOGGER.debug(
-                    "Unknown state_class=%s for sensor %s",
-                    reading.state_class,
-                    reading.sensor_name,
-                )
-                state_class = None
-
-            if unique_id not in store:
-                sensor = ArwnSensor(
-                    unique_id=unique_id,
-                    name=reading.sensor_name,
-                    state_key=reading.sensor_key,
-                    units=reading.unit,
-                    icon=reading.icon,
-                    device_class=device_class,
-                    state_class=state_class,
-                    event=event,
-                )
-                store[unique_id] = sensor
+        for sensor in sensors:
+            if sensor.name not in store:
+                sensor.hass = hass
+                sensor.set_event(event)
+                store[sensor.name] = sensor
                _LOGGER.debug(
                    "Registering sensor %(name)s => %(event)s",
-                    {"name": reading.sensor_name, "event": event},
+                    {"name": sensor.name, "event": event},
                )
-                new_sensors.append(sensor)
+                async_add_entities((sensor,), True)
            else:
                _LOGGER.debug(
                    "Recording sensor %(name)s => %(event)s",
-                    {"name": reading.sensor_name, "event": event},
+                    {"name": sensor.name, "event": event},
                )
-                store[unique_id].set_event(event)
-
-        if new_sensors:
-            async_add_entities(new_sensors, True)
+                store[sensor.name].set_event(event)

    await mqtt.async_subscribe(hass, TOPIC, async_sensor_event_received, 0)

@@ -134,29 +175,29 @@ class ArwnSensor(SensorEntity):

    def __init__(
        self,
-        unique_id: str,
+        topic: str,
        name: str,
        state_key: str,
        units: str,
        icon: str | None = None,
        device_class: SensorDeviceClass | None = None,
        state_class: SensorStateClass | None = None,
-        event: dict[str, Any] | None = None,
    ) -> None:
        """Initialize the sensor."""
+        self.entity_id = _slug(name)
        self._attr_name = name
-        self._attr_unique_id = unique_id
+        # This mqtt topic for the sensor which is its uid
+        self._attr_unique_id = topic
        self._state_key = state_key
        self._attr_native_unit_of_measurement = units
        self._attr_icon = icon
        self._attr_device_class = device_class
        self._attr_state_class = state_class
-        if event is not None:
-            self._attr_extra_state_attributes = dict(event)
-            self._attr_native_value = event.get(state_key)

    def set_event(self, event: dict[str, Any]) -> None:
        """Update the sensor with the most recent event."""
-        self._attr_extra_state_attributes = dict(event)
-        self._attr_native_value = event.get(self._state_key)
+        ev: dict[str, Any] = {}
+        ev.update(event)
+        self._attr_extra_state_attributes = ev
+        self._attr_native_value = ev.get(self._state_key)
        self.async_write_ha_state()
@@ -1816,11 +1816,6 @@ class PipelineInput:
                            await self.run.text_to_speech(tts_input)

        except PipelineError as err:
-            if self.run.tts_stream:
-                # Clean up TTS stream
-                self.run.tts_stream.delete()
-                self.run.tts_stream = None
-
            self.run.process_event(
                PipelineEvent(
                    PipelineEventType.ERROR,
@@ -1890,17 +1885,15 @@ class PipelineInput:
        ):
            prepare_tasks.append(self.run.prepare_recognize_intent(self.session))

-        if prepare_tasks:
-            await asyncio.gather(*prepare_tasks)
-
-        # Do TTS prepare separately so we don't create a ResultStream if the
-        # pipeline is invalid.
        if (
            start_stage_index
            <= PIPELINE_STAGE_ORDER.index(PipelineStage.TTS)
            <= end_stage_index
        ):
-            await self.run.prepare_text_to_speech()
+            prepare_tasks.append(self.run.prepare_text_to_speech())
+
+        if prepare_tasks:
+            await asyncio.gather(*prepare_tasks)


 class PipelinePreferred(CollectionError):
@@ -3,11 +3,8 @@
 from dataclasses import asdict
 import logging
 from pathlib import Path
-import re
 from typing import Any

-from hassil.parse_expression import parse_sentence
-from hassil.parser import ParseError
 from hassil.util import (
    PUNCTUATION_END,
    PUNCTUATION_END_WORD,
@@ -167,7 +164,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                            [cv.string],
                            has_one_non_empty_item,
                            has_no_punctuation,
-                            is_valid_sentence,
                        ),
                    }
                ],
@@ -205,8 +201,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 def has_no_punctuation(value: list[str]) -> list[str]:
    """Validate result does not contain punctuation."""
    for sentence in value:
-        # Exclude {list_references} which may contain punctuation characters.
-        sentence = _remove_list_references(sentence)
        if (
            PUNCTUATION_START.search(sentence)
            or PUNCTUATION_END.search(sentence)
@@ -218,21 +212,6 @@ def has_no_punctuation(value: list[str]) -> list[str]:
    return value


-def _remove_list_references(sentence: str) -> str:
-    """Remove {list_references} from a sentence for linting."""
-    return re.sub(r"(?<!\\)\{[^{}]*\}", "", sentence)
-
-
-def is_valid_sentence(value: list[str]) -> list[str]:
-    """Validate result can be parsed by hassil."""
-    for sentence in value:
-        try:
-            parse_sentence(sentence)
-        except ParseError as err:
-            raise vol.Invalid(f"invalid sentence: {err}") from err
-    return value
-
-
 def has_one_non_empty_item(value: list[str]) -> list[str]:
    """Validate result has at least one item."""
    if len(value) < 1:
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/assist_satellite",
  "integration_type": "entity",
  "quality_scale": "internal",
-  "requirements": ["hassil==3.6.0"]
+  "requirements": ["hassil==3.5.0"]
 }
@@ -30,5 +30,5 @@
  "integration_type": "hub",
  "iot_class": "cloud_push",
  "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==9.2.7", "yalexs-ble==3.3.0"]
+  "requirements": ["yalexs==9.2.1", "yalexs-ble==3.3.0"]
 }
@@ -2,18 +2,12 @@

 import avea

-from homeassistant.components.bluetooth import (
-    BluetoothReachabilityIntent,
-    async_address_reachability_diagnostics,
-    async_ble_device_from_address,
-)
+from homeassistant.components.bluetooth import async_ble_device_from_address
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ADDRESS, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady

-from .const import DOMAIN
-
 type AveaConfigEntry = ConfigEntry[avea.Bulb]

 PLATFORMS: list[Platform] = [Platform.LIGHT]
@@ -21,20 +15,12 @@ PLATFORMS: list[Platform] = [Platform.LIGHT]

 async def async_setup_entry(hass: HomeAssistant, entry: AveaConfigEntry) -> bool:
    """Set up Avea from a config entry."""
-    address = entry.data[CONF_ADDRESS]
-    ble_device = async_ble_device_from_address(hass, address, connectable=True)
+    ble_device = async_ble_device_from_address(
+        hass, entry.data[CONF_ADDRESS], connectable=True
+    )
    if not ble_device:
        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="device_not_found",
-            translation_placeholders={
-                "address": address,
-                "reason": async_address_reachability_diagnostics(
-                    hass,
-                    address.upper(),
-                    BluetoothReachabilityIntent.CONNECTION,
-                ),
-            },
+            f"Could not find Avea device with address {entry.data[CONF_ADDRESS]}"
        )

    entry.runtime_data = avea.Bulb(ble_device)
@@ -8,7 +8,6 @@ import avea
 from bleak.exc import BleakError
 import voluptuous as vol

-from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
    BluetoothServiceInfoBleak,
    async_discovered_service_info,
@@ -67,15 +66,6 @@ def _is_avea_discovery(discovery_info: BluetoothServiceInfoBleak) -> bool:
    return AVEA_SERVICE_UUID in discovery_info.service_uuids


-def _discovery_label(discovery_info: BluetoothServiceInfoBleak) -> str:
-    """Return a label for a discovered Avea bulb."""
-    if (
-        name := _normalize_name(discovery_info.name)
-    ) and name != discovery_info.address:
-        return f"{name} ({discovery_info.address})"
-    return discovery_info.address
-
-
 class AveaConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Avea."""

@@ -160,7 +150,6 @@ class AveaConfigFlow(ConfigFlow, domain=DOMAIN):
        if discovery := self._discovery_info:
            self._discovered_devices[discovery.address] = discovery
        else:
-            await bluetooth.async_request_active_scan(self.hass)
            current_addresses = self._async_current_ids(include_ignore=False)
            for discovery in async_discovered_service_info(self.hass):
                if (
@@ -176,10 +165,11 @@ class AveaConfigFlow(ConfigFlow, domain=DOMAIN):

        if self._discovery_info:
            disc = self._discovery_info
+            label = f"{disc.name or disc.address} ({disc.address})"
            data_schema = vol.Schema(
                {
                    vol.Required(CONF_ADDRESS, default=disc.address): vol.In(
-                        {disc.address: _discovery_label(disc)}
+                        {disc.address: label}
                    )
                }
            )
@@ -188,7 +178,10 @@ class AveaConfigFlow(ConfigFlow, domain=DOMAIN):
                {
                    vol.Required(CONF_ADDRESS): vol.In(
                        {
-                            service_info.address: _discovery_label(service_info)
+                            service_info.address: (
+                                f"{service_info.name or service_info.address}"
+                                f" ({service_info.address})"
+                            )
                            for service_info in self._discovered_devices.values()
                        }
                    ),
@@ -22,11 +22,6 @@
      }
    }
  },
-  "exceptions": {
-    "device_not_found": {
-      "message": "Could not find Avea device with address {address}: {reason}"
-    }
-  },
  "issues": {
    "deprecated_yaml": {
      "description": "[%key:component::homeassistant::issues::deprecated_yaml::description%]",
@@ -1 +0,0 @@
-"""Virtual integration: Avosdim."""
@@ -1,6 +0,0 @@
-{
-  "domain": "avosdim",
-  "name": "Avosdim",
-  "integration_type": "virtual",
-  "supported_by": "motion_blinds"
-}
@@ -6,6 +6,7 @@ from blebox_uniapi.box import Box
 from blebox_uniapi.error import Error
 from blebox_uniapi.session import ApiHost

+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
    CONF_HOST,
    CONF_PASSWORD,
@@ -17,9 +18,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady

 from .const import DEFAULT_SETUP_TIMEOUT
-from .coordinator import BleBoxConfigEntry, BleBoxCoordinator
 from .helpers import get_maybe_authenticated_session

+type BleBoxConfigEntry = ConfigEntry[Box]
+
 _LOGGER = logging.getLogger(__name__)

 PLATFORMS = [
@@ -33,6 +35,8 @@ PLATFORMS = [
    Platform.UPDATE,
 ]

+PARALLEL_UPDATES = 0
+

 async def async_setup_entry(hass: HomeAssistant, entry: BleBoxConfigEntry) -> bool:
    """Set up BleBox devices from a config entry."""
@@ -54,10 +58,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BleBoxConfigEntry) -> bo
        _LOGGER.error("Identify failed at %s:%d (%s)", api_host.host, api_host.port, ex)
        raise ConfigEntryNotReady from ex

-    coordinator = BleBoxCoordinator(hass, entry, product)
-    await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
+    entry.runtime_data = product

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

@@ -11,20 +11,13 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import BleBoxConfigEntry
-from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity

-PARALLEL_UPDATES = 0
-
 BINARY_SENSOR_TYPES = (
    BinarySensorEntityDescription(
        key="moisture",
        device_class=BinarySensorDeviceClass.MOISTURE,
    ),
-    BinarySensorEntityDescription(
-        key="open",
-        device_class=BinarySensorDeviceClass.WINDOW,
-    ),
 )


@@ -34,27 +27,23 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox entry."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxBinarySensorEntity(coordinator, feature, description)
-        for feature in coordinator.box.features.get("binary_sensors", [])
+        BleBoxBinarySensorEntity(feature, description)
+        for feature in config_entry.runtime_data.features.get("binary_sensors", [])
        for description in BINARY_SENSOR_TYPES
        if description.key == feature.device_class
    ]
-    async_add_entities(entities)
+    async_add_entities(entities, True)


 class BleBoxBinarySensorEntity(BleBoxEntity[BinarySensorFeature], BinarySensorEntity):
    """Representation of a BleBox binary sensor feature."""

    def __init__(
-        self,
-        coordinator: BleBoxCoordinator,
-        feature: BinarySensorFeature,
-        description: BinarySensorEntityDescription,
+        self, feature: BinarySensorFeature, description: BinarySensorEntityDescription
    ) -> None:
        """Initialize a BleBox binary sensor feature."""
-        super().__init__(coordinator, feature)
+        super().__init__(feature)
        self.entity_description = description

    @property
@@ -2,26 +2,12 @@

 import blebox_uniapi.button

-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.components.button import ButtonEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import BleBoxConfigEntry
-from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity
-from .util import blebox_command
-
-PARALLEL_UPDATES = 1
-
-BUTTON_TYPES: dict[str, ButtonEntityDescription] = {
-    "up": ButtonEntityDescription(key="up", translation_key="up"),
-    "down": ButtonEntityDescription(key="down", translation_key="down"),
-    "fav": ButtonEntityDescription(key="fav", translation_key="fav"),
-    "open": ButtonEntityDescription(key="open", translation_key="open"),
-    "close": ButtonEntityDescription(key="close", translation_key="close"),
-}
-
-_DEFAULT_BUTTON = ButtonEntityDescription(key="button")


 async def async_setup_entry(
@@ -30,33 +16,35 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox button entry."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxButtonEntity(coordinator, feature)
-        for feature in coordinator.box.features.get("buttons", [])
+        BleBoxButtonEntity(feature)
+        for feature in config_entry.runtime_data.features.get("buttons", [])
    ]
-    async_add_entities(entities)
+    async_add_entities(entities, True)


 class BleBoxButtonEntity(BleBoxEntity[blebox_uniapi.button.Button], ButtonEntity):
    """Representation of BleBox buttons."""

-    def __init__(
-        self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.button.Button
-    ) -> None:
+    def __init__(self, feature: blebox_uniapi.button.Button) -> None:
        """Initialize a BleBox button feature."""
+        super().__init__(feature)
+        self._attr_icon = self.get_icon()

-        super().__init__(coordinator, feature)
-        self.entity_description = self._get_description()
+    def get_icon(self) -> str | None:
+        """Return icon for endpoint."""
+        if "up" in self._feature.query_string:
+            return "mdi:arrow-up-circle"
+        if "down" in self._feature.query_string:
+            return "mdi:arrow-down-circle"
+        if "fav" in self._feature.query_string:
+            return "mdi:heart-circle"
+        if "open" in self._feature.query_string:
+            return "mdi:arrow-up-circle"
+        if "close" in self._feature.query_string:
+            return "mdi:arrow-down-circle"
+        return None

-    def _get_description(self) -> ButtonEntityDescription:
-        """Return the description matching this button's query string."""
-        for key, description in BUTTON_TYPES.items():
-            if key in self._feature.query_string:
-                return description
-        return _DEFAULT_BUTTON
-
-    @blebox_command
    async def async_press(self) -> None:
        """Handle the button press."""
        await self._feature.set()
@@ -1,5 +1,6 @@
 """BleBox climate entity."""

+from datetime import timedelta
 from typing import Any

 import blebox_uniapi.climate
@@ -16,9 +17,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
-from .util import blebox_command

-PARALLEL_UPDATES = 1
+SCAN_INTERVAL = timedelta(seconds=5)

 BLEBOX_TO_HVACMODE = {
    0: HVACMode.OFF,
@@ -40,12 +40,11 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox climate entity."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxClimateEntity(coordinator, feature)
-        for feature in coordinator.box.features.get("climates", [])
+        BleBoxClimateEntity(feature)
+        for feature in config_entry.runtime_data.features.get("climates", [])
    ]
-    async_add_entities(entities)
+    async_add_entities(entities, True)


 class BleBoxClimateEntity(BleBoxEntity[blebox_uniapi.climate.Climate], ClimateEntity):
@@ -109,7 +108,6 @@ class BleBoxClimateEntity(BleBoxEntity[blebox_uniapi.climate.Climate], ClimateEn
        """Return the desired thermostat temperature."""
        return self._feature.desired

-    @blebox_command
    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
        """Set the climate entity mode."""
        if hvac_mode in [HVACMode.HEAT, HVACMode.COOL]:
@@ -118,7 +116,6 @@ class BleBoxClimateEntity(BleBoxEntity[blebox_uniapi.climate.Climate], ClimateEn

        await self._feature.async_off()

-    @blebox_command
    async def async_set_temperature(self, **kwargs: Any) -> None:
        """Set the thermostat temperature."""
        value = kwargs[ATTR_TEMPERATURE]
@@ -33,14 +33,23 @@ from .const import (
 _LOGGER = logging.getLogger(__name__)


-STEP_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_HOST, default=DEFAULT_HOST): str,
-        vol.Required(CONF_PORT, default=DEFAULT_PORT): int,
-        vol.Inclusive(CONF_USERNAME, "auth"): str,
-        vol.Inclusive(CONF_PASSWORD, "auth"): str,
-    }
-)
+def create_schema(previous_input=None):
+    """Create a schema with given values as default."""
+    if previous_input is not None:
+        host = previous_input[CONF_HOST]
+        port = previous_input[CONF_PORT]
+    else:
+        host = DEFAULT_HOST
+        port = DEFAULT_PORT
+
+    return vol.Schema(
+        {
+            vol.Required(CONF_HOST, default=host): str,
+            vol.Required(CONF_PORT, default=port): int,
+            vol.Inclusive(CONF_USERNAME, "auth"): str,
+            vol.Inclusive(CONF_PASSWORD, "auth"): str,
+        }
+    )


 LOG_MSG = {
@@ -60,44 +69,18 @@ class BleBoxConfigFlow(ConfigFlow, domain=DOMAIN):
        self.device_config: dict[str, Any] = {}

    def handle_step_exception(
-        self, exception, schema, host, port, message_id, log_fn, step_id
+        self, step, exception, schema, host, port, message_id, log_fn
    ):
        """Handle step exceptions."""
        log_fn("%s at %s:%d (%s)", LOG_MSG[message_id], host, port, exception)

        return self.async_show_form(
-            step_id=step_id,
+            step_id="user",
            data_schema=schema,
            errors={"base": message_id},
            description_placeholders={"address": f"{host}:{port}"},
        )

-    async def _async_from_host_or_form(
-        self, api_host: ApiHost, user_input: dict[str, Any], step_id: str
-    ) -> tuple[Box, None] | tuple[None, ConfigFlowResult]:
-        """Try to connect to the device; return product or an error form."""
-        schema = self.add_suggested_values_to_schema(STEP_SCHEMA, user_input)
-        host = user_input[CONF_HOST]
-        port = user_input[CONF_PORT]
-        try:
-            return await Box.async_from_host(api_host), None
-        except UnsupportedBoxVersion as ex:
-            return None, self.handle_step_exception(
-                ex, schema, host, port, UNSUPPORTED_VERSION, _LOGGER.debug, step_id
-            )
-        except UnauthorizedRequest as ex:
-            return None, self.handle_step_exception(
-                ex, schema, host, port, CANNOT_CONNECT, _LOGGER.error, step_id
-            )
-        except Error as ex:
-            return None, self.handle_step_exception(
-                ex, schema, host, port, CANNOT_CONNECT, _LOGGER.warning, step_id
-            )
-        except RuntimeError as ex:
-            return None, self.handle_step_exception(
-                ex, schema, host, port, UNKNOWN, _LOGGER.error, step_id
-            )
-
    async def async_step_zeroconf(
        self, discovery_info: ZeroconfServiceInfo
    ) -> ConfigFlowResult:
@@ -162,11 +145,12 @@ class BleBoxConfigFlow(ConfigFlow, domain=DOMAIN):
    ) -> ConfigFlowResult:
        """Handle initial user-triggered config step."""
        hass = self.hass
+        schema = create_schema(user_input)

        if user_input is None:
            return self.async_show_form(
                step_id="user",
-                data_schema=STEP_SCHEMA,
+                data_schema=schema,
                errors={},
                description_placeholders={},
            )
@@ -189,60 +173,36 @@ class BleBoxConfigFlow(ConfigFlow, domain=DOMAIN):
        api_host = ApiHost(
            host, port, DEFAULT_SETUP_TIMEOUT, websession, hass.loop, _LOGGER
        )
-        product, error = await self._async_from_host_or_form(
-            api_host, user_input, step_id="user"
-        )
-        if error is not None:
-            return error
-        assert product is not None
+        try:
+            product = await Box.async_from_host(api_host)
+
+        except UnsupportedBoxVersion as ex:
+            return self.handle_step_exception(
+                "user",
+                ex,
+                schema,
+                host,
+                port,
+                UNSUPPORTED_VERSION,
+                _LOGGER.debug,
+            )
+        except UnauthorizedRequest as ex:
+            return self.handle_step_exception(
+                "user", ex, schema, host, port, CANNOT_CONNECT, _LOGGER.error
+            )
+
+        except Error as ex:
+            return self.handle_step_exception(
+                "user", ex, schema, host, port, CANNOT_CONNECT, _LOGGER.warning
+            )
+
+        except RuntimeError as ex:
+            return self.handle_step_exception(
+                "user", ex, schema, host, port, UNKNOWN, _LOGGER.error
+            )

        # Check if configured but IP changed since
        await self.async_set_unique_id(product.unique_id, raise_on_progress=False)
        self._abort_if_unique_id_configured()

        return self.async_create_entry(title=product.name, data=user_input)
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of a BleBox device."""
-        reconfigure_entry = self._get_reconfigure_entry()
-
-        if user_input is None:
-            return self.async_show_form(
-                step_id="reconfigure",
-                data_schema=self.add_suggested_values_to_schema(
-                    STEP_SCHEMA, reconfigure_entry.data
-                ),
-            )
-
-        host = user_input[CONF_HOST]
-        port = user_input[CONF_PORT]
-
-        username = user_input.get(CONF_USERNAME)
-        password = user_input.get(CONF_PASSWORD)
-        websession = get_maybe_authenticated_session(self.hass, password, username)
-        api_host = ApiHost(
-            host, port, DEFAULT_SETUP_TIMEOUT, websession, self.hass.loop, _LOGGER
-        )
-
-        product, error = await self._async_from_host_or_form(
-            api_host, user_input, step_id="reconfigure"
-        )
-        if error is not None:
-            return error
-        assert product is not None
-
-        await self.async_set_unique_id(product.unique_id, raise_on_progress=False)
-        self._abort_if_unique_id_mismatch()
-
-        data_updates: dict[str, Any] = {CONF_HOST: host, CONF_PORT: port}
-        if username is not None:
-            data_updates[CONF_USERNAME] = username
-        if password is not None:
-            data_updates[CONF_PASSWORD] = password
-
-        return self.async_update_reload_and_abort(
-            reconfigure_entry,
-            data_updates=data_updates,
-        )
@@ -14,13 +14,6 @@ UNKNOWN = "unknown"
 DEFAULT_HOST = "192.168.0.2"
 DEFAULT_PORT = 80

-OPEN_STATUS: dict[int, str] = {
-    0: "open",
-    1: "unclosed_or_unlocked",
-    2: "ajar",
-    3: "closed_but_unlocked",
-    4: "closed",
-}

 LIGHT_MAX_KELVINS = 6500  # 154 Mireds
 LIGHT_MIN_KELVINS = 2700  # 370 Mireds
@@ -1,48 +0,0 @@
-"""DataUpdateCoordinator for BleBox devices."""
-
-from datetime import timedelta
-import logging
-
-from blebox_uniapi.box import Box
-from blebox_uniapi.error import Error
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-type BleBoxConfigEntry = ConfigEntry[BleBoxCoordinator]
-
-
-class BleBoxCoordinator(DataUpdateCoordinator[None]):
-    """Coordinator for a single BleBox device."""
-
-    config_entry: BleBoxConfigEntry
-
-    def __init__(
-        self, hass: HomeAssistant, config_entry: BleBoxConfigEntry, box: Box
-    ) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name=DOMAIN,
-            update_interval=timedelta(seconds=5),
-        )
-        self.box = box
-
-    async def _async_update_data(self) -> None:
-        """Fetch data from the BleBox device."""
-        try:
-            await self.box.async_update_data()
-        except Error as err:
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="data_update_failed",
-                translation_placeholders={"error": str(err)},
-            ) from err
@@ -17,11 +17,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import BleBoxConfigEntry
-from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity
-from .util import blebox_command
-
-PARALLEL_UPDATES = 1

 BLEBOX_TO_COVER_DEVICE_CLASSES = {
    "gate": CoverDeviceClass.GATE,
@@ -63,22 +59,19 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox entry."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxCoverEntity(coordinator, feature)
-        for feature in coordinator.box.features.get("covers", [])
+        BleBoxCoverEntity(feature)
+        for feature in config_entry.runtime_data.features.get("covers", [])
    ]
-    async_add_entities(entities)
+    async_add_entities(entities, True)


 class BleBoxCoverEntity(BleBoxEntity[blebox_uniapi.cover.Cover], CoverEntity):
    """Representation of a BleBox cover feature."""

-    def __init__(
-        self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.cover.Cover
-    ) -> None:
+    def __init__(self, feature: blebox_uniapi.cover.Cover) -> None:
        """Initialize a BleBox cover feature."""
-        super().__init__(coordinator, feature)
+        super().__init__(feature)
        self._attr_supported_features = (
            CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
        )
@@ -142,40 +135,33 @@ class BleBoxCoverEntity(BleBoxEntity[blebox_uniapi.cover.Cover], CoverEntity):
        """Return whether cover is closed."""
        return self._is_state(CoverState.CLOSED)

-    @blebox_command
    async def async_open_cover(self, **kwargs: Any) -> None:
        """Fully open the cover position."""
        await self._feature.async_open()

-    @blebox_command
    async def async_close_cover(self, **kwargs: Any) -> None:
        """Fully close the cover position."""
        await self._feature.async_close()

-    @blebox_command
    async def async_open_cover_tilt(self, **kwargs: Any) -> None:
        """Fully open the cover tilt."""
        position = 50 if self._feature.is_tilt_180 else 0
        await self._feature.async_set_tilt_position(position)

-    @blebox_command
    async def async_close_cover_tilt(self, **kwargs: Any) -> None:
        """Fully close the cover tilt."""
        # note: values are reversed
        await self._feature.async_set_tilt_position(100)

-    @blebox_command
    async def async_set_cover_position(self, **kwargs: Any) -> None:
        """Set the cover position."""
        position = kwargs[ATTR_POSITION]
        await self._feature.async_set_position(100 - position)

-    @blebox_command
    async def async_stop_cover(self, **kwargs: Any) -> None:
        """Stop the cover."""
        await self._feature.async_stop()

-    @blebox_command
    async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
        """Set the tilt position."""
        position = kwargs[ATTR_TILT_POSITION]
@@ -1,33 +0,0 @@
-"""Diagnostics support for BleBox devices."""
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-
-from . import BleBoxConfigEntry
-
-TO_REDACT = {CONF_PASSWORD, CONF_USERNAME}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: BleBoxConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    product = entry.runtime_data.box
-
-    return {
-        "entry": async_redact_data(entry.as_dict(), TO_REDACT),
-        "device": {
-            "name": product.name,
-            "type": product.type,
-            "model": product.model,
-            "unique_id": product.unique_id,
-            "firmware_version": product.firmware_version,
-            "hardware_version": product.hardware_version,
-            "available_firmware_version": product.available_firmware_version,
-            "api_version": product.api_version,
-            "last_data": product.last_data,
-        },
-    }
@@ -1,20 +1,23 @@
 """Base entity for the BleBox devices integration."""

+import logging
+
+from blebox_uniapi.error import Error
 from blebox_uniapi.feature import Feature

 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.helpers.entity import Entity

 from .const import DOMAIN
-from .coordinator import BleBoxCoordinator
+
+_LOGGER = logging.getLogger(__name__)


-class BleBoxEntity[_FeatureT: Feature](CoordinatorEntity[BleBoxCoordinator]):
+class BleBoxEntity[_FeatureT: Feature](Entity):
    """Implements a common class for entities representing a BleBox feature."""

-    def __init__(self, coordinator: BleBoxCoordinator, feature: _FeatureT) -> None:
+    def __init__(self, feature: _FeatureT) -> None:
        """Initialize a BleBox entity."""
-        super().__init__(coordinator)
        self._feature = feature
        self._attr_name = feature.full_name
        self._attr_unique_id = feature.unique_id
@@ -27,3 +30,10 @@ class BleBoxEntity[_FeatureT: Feature](CoordinatorEntity[BleBoxCoordinator]):
            sw_version=product.firmware_version,
            configuration_url=f"http://{product.address}",
        )
+
+    async def async_update(self) -> None:
+        """Update the entity state."""
+        try:
+            await self._feature.async_update()
+        except Error as ex:
+            _LOGGER.error("Updating '%s' failed: %s", self.name, ex)
@@ -1,29 +0,0 @@
-{
-  "entity": {
-    "button": {
-      "close": {
-        "default": "mdi:arrow-down-circle"
-      },
-      "down": {
-        "default": "mdi:arrow-down-circle"
-      },
-      "fav": {
-        "default": "mdi:heart-circle"
-      },
-      "open": {
-        "default": "mdi:arrow-up-circle"
-      },
-      "up": {
-        "default": "mdi:arrow-up-circle"
-      }
-    },
-    "sensor": {
-      "open_status": {
-        "default": "mdi:window-open"
-      },
-      "power_consumption": {
-        "default": "mdi:lightning-bolt"
-      }
-    }
-  }
-}
@@ -1,5 +1,6 @@
 """BleBox light entities implementation."""

+from datetime import timedelta
 import logging
 import math
 from typing import Any
@@ -19,18 +20,15 @@ from homeassistant.components.light import (
    LightEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import BleBoxConfigEntry
-from .const import DOMAIN, LIGHT_MAX_KELVINS, LIGHT_MIN_KELVINS
-from .coordinator import BleBoxCoordinator
+from .const import LIGHT_MAX_KELVINS, LIGHT_MIN_KELVINS
 from .entity import BleBoxEntity
-from .util import blebox_command

 _LOGGER = logging.getLogger(__name__)

-PARALLEL_UPDATES = 1
+SCAN_INTERVAL = timedelta(seconds=5)


 async def async_setup_entry(
@@ -39,12 +37,11 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox entry."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxLightEntity(coordinator, feature)
-        for feature in coordinator.box.features.get("lights", [])
+        BleBoxLightEntity(feature)
+        for feature in config_entry.runtime_data.features.get("lights", [])
    ]
-    async_add_entities(entities)
+    async_add_entities(entities, True)


 COLOR_MODE_MAP = {
@@ -64,11 +61,9 @@ class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
    _attr_min_color_temp_kelvin = LIGHT_MIN_KELVINS
    _attr_max_color_temp_kelvin = LIGHT_MAX_KELVINS

-    def __init__(
-        self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.light.Light
-    ) -> None:
+    def __init__(self, feature: blebox_uniapi.light.Light) -> None:
        """Initialize a BleBox light."""
-        super().__init__(coordinator, feature)
+        super().__init__(feature)
        if feature.effect_list:
            self._attr_supported_features = LightEntityFeature.EFFECT

@@ -170,7 +165,6 @@ class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
            return None
        return tuple(blebox_uniapi.light.Light.rgb_hex_to_rgb_list(rgbww_hex))

-    @blebox_command
    async def async_turn_on(self, **kwargs: Any) -> None:
        """Turn the light on."""

@@ -216,10 +210,8 @@ class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
        try:
            await self._feature.async_on(value)
        except ValueError as exc:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="bad_value",
-                translation_placeholders={"error": str(exc)},
+            raise ValueError(
+                f"Turning on '{self.name}' failed: Bad value {value}"
            ) from exc

        if effect is not None:
@@ -227,13 +219,11 @@ class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
                effect_value = self.effect_list.index(effect)
                await self._feature.async_api_command("effect", effect_value)
            except ValueError as exc:
-                raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="effect_not_found",
-                    translation_placeholders={"error": str(exc)},
+                raise ValueError(
+                    f"Turning on with effect '{self.name}' failed: {effect} not in"
+                    " effect list."
                ) from exc

-    @blebox_command
    async def async_turn_off(self, **kwargs: Any) -> None:
        """Turn the light off."""
        await self._feature.async_off()
@@ -1,8 +1,6 @@
 """BleBox sensor entities."""

-from collections.abc import Callable
-from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timedelta

 import blebox_uniapi.sensor

@@ -28,126 +26,94 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.typing import StateType

 from . import BleBoxConfigEntry
-from .const import OPEN_STATUS
-from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity

-PARALLEL_UPDATES = 0
+SCAN_INTERVAL = timedelta(seconds=5)


-@dataclass(kw_only=True, frozen=True)
-class BleBoxSensorEntityDescription(SensorEntityDescription):
-    """Describes a BleBox sensor entity."""
-
-    value_fn: Callable[[StateType], StateType] = lambda v: v
-
-
-SENSOR_TYPES: tuple[BleBoxSensorEntityDescription, ...] = (
-    BleBoxSensorEntityDescription(
+SENSOR_TYPES = (
+    SensorEntityDescription(
        key="pm1",
        device_class=SensorDeviceClass.PM1,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="pm2_5",
        device_class=SensorDeviceClass.PM25,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="pm10",
        device_class=SensorDeviceClass.PM10,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="temperature",
        device_class=SensorDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="powerConsumption",
-        translation_key="power_consumption",
        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
        suggested_display_precision=2,
+        icon="mdi:lightning-bolt",
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="wind",
        device_class=SensorDeviceClass.WIND_SPEED,
        native_unit_of_measurement=UnitOfSpeed.METERS_PER_SECOND,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="illuminance",
        device_class=SensorDeviceClass.ILLUMINANCE,
        native_unit_of_measurement=LIGHT_LUX,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="forwardActiveEnergy",
        device_class=SensorDeviceClass.ENERGY,
        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        state_class=SensorStateClass.TOTAL_INCREASING,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="reverseActiveEnergy",
        device_class=SensorDeviceClass.ENERGY,
        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        state_class=SensorStateClass.TOTAL_INCREASING,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="reactivePower",
        device_class=SensorDeviceClass.POWER,
        native_unit_of_measurement=UnitOfReactivePower.VOLT_AMPERE_REACTIVE,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="activePower",
        device_class=SensorDeviceClass.POWER,
        native_unit_of_measurement=UnitOfPower.WATT,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="apparentPower",
        device_class=SensorDeviceClass.APPARENT_POWER,
        native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="voltage",
        device_class=SensorDeviceClass.VOLTAGE,
        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="current",
        device_class=SensorDeviceClass.CURRENT,
        native_unit_of_measurement=UnitOfElectricCurrent.MILLIAMPERE,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
-    BleBoxSensorEntityDescription(
+    SensorEntityDescription(
        key="frequency",
        device_class=SensorDeviceClass.FREQUENCY,
        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    BleBoxSensorEntityDescription(
-        key="openStatus",
-        translation_key="open_status",
-        device_class=SensorDeviceClass.ENUM,
-        options=list(OPEN_STATUS.values()),
-        value_fn=lambda v: OPEN_STATUS.get(int(v)) if v is not None else None,
    ),
 )

@@ -158,35 +124,31 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox entry."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxSensorEntity(coordinator, feature, description)
-        for feature in coordinator.box.features.get("sensors", [])
+        BleBoxSensorEntity(feature, description)
+        for feature in config_entry.runtime_data.features.get("sensors", [])
        for description in SENSOR_TYPES
        if description.key == feature.device_class
    ]
-    async_add_entities(entities)
+    async_add_entities(entities, True)


 class BleBoxSensorEntity(BleBoxEntity[blebox_uniapi.sensor.BaseSensor], SensorEntity):
    """Representation of a BleBox sensor feature."""

-    entity_description: BleBoxSensorEntityDescription
-
    def __init__(
        self,
-        coordinator: BleBoxCoordinator,
        feature: blebox_uniapi.sensor.BaseSensor,
-        description: BleBoxSensorEntityDescription,
+        description: SensorEntityDescription,
    ) -> None:
        """Initialize a BleBox sensor feature."""
-        super().__init__(coordinator, feature)
+        super().__init__(feature)
        self.entity_description = description

    @property
-    def native_value(self) -> StateType:
+    def native_value(self):
        """Return the state."""
-        return self.entity_description.value_fn(self._feature.native_value)
+        return self._feature.native_value

    @property
    def last_reset(self) -> datetime | None:
@@ -2,9 +2,7 @@
  "config": {
    "abort": {
      "address_already_configured": "A BleBox device is already configured at {address}.",
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "The device identifier does not match the previously configured device."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -13,16 +11,6 @@
    },
    "flow_title": "{name} ({host})",
    "step": {
-      "reconfigure": {
-        "data": {
-          "host": "[%key:common::config_flow::data::ip%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "port": "[%key:common::config_flow::data::port%]",
-          "username": "[%key:common::config_flow::data::username%]"
-        },
-        "description": "Update the connection settings for your BleBox device.",
-        "title": "Reconfigure BleBox device"
-      },
      "user": {
        "data": {
          "host": "[%key:common::config_flow::data::ip%]",
@@ -34,38 +22,5 @@
        "title": "Set up your BleBox device"
      }
    }
-  },
-  "entity": {
-    "sensor": {
-      "open_status": {
-        "state": {
-          "ajar": "Ajar",
-          "closed": "[%key:common::state::closed%]",
-          "closed_but_unlocked": "Closed but unlocked",
-          "open": "[%key:common::state::open%]",
-          "unclosed_or_unlocked": "Unclosed or unlocked"
-        }
-      }
-    }
-  },
-  "exceptions": {
-    "bad_value": {
-      "message": "Turning on the light failed: {error}"
-    },
-    "command_failed": {
-      "message": "Failed to execute command on the BleBox device: {error}"
-    },
-    "data_update_failed": {
-      "message": "An error occurred while communicating with the BleBox device: {error}"
-    },
-    "effect_not_found": {
-      "message": "The specified light effect is not available on this device: {error}"
-    },
-    "install_failed": {
-      "message": "Failed to install firmware update on the BleBox device: {error}"
-    },
-    "update_failed": {
-      "message": "Failed to fetch firmware update information from the BleBox device: {error}"
-    }
  }
 }
@@ -1,5 +1,6 @@
 """BleBox switch implementation."""

+from datetime import timedelta
 from typing import Any

 import blebox_uniapi.switch
@@ -10,9 +11,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
-from .util import blebox_command

-PARALLEL_UPDATES = 1
+SCAN_INTERVAL = timedelta(seconds=5)


 async def async_setup_entry(
@@ -21,12 +21,11 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox switch entity."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxSwitchEntity(coordinator, feature)
-        for feature in coordinator.box.features.get("switches", [])
+        BleBoxSwitchEntity(feature)
+        for feature in config_entry.runtime_data.features.get("switches", [])
    ]
-    async_add_entities(entities)
+    async_add_entities(entities, True)


 class BleBoxSwitchEntity(BleBoxEntity[blebox_uniapi.switch.Switch], SwitchEntity):
@@ -39,12 +38,10 @@ class BleBoxSwitchEntity(BleBoxEntity[blebox_uniapi.switch.Switch], SwitchEntity
        """Return whether switch is on."""
        return self._feature.is_on

-    @blebox_command
    async def async_turn_on(self, **kwargs: Any) -> None:
        """Turn on the switch."""
        await self._feature.async_turn_on()

-    @blebox_command
    async def async_turn_off(self, **kwargs: Any) -> None:
        """Turn off the switch."""
        await self._feature.async_turn_off()
@@ -18,11 +18,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later

 from . import BleBoxConfigEntry
-from .const import DOMAIN
-from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity

-PARALLEL_UPDATES = 0
 SCAN_INTERVAL = timedelta(hours=1)


@@ -36,12 +33,11 @@ async def async_setup_entry(
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up a BleBox update entry."""
-    coordinator = config_entry.runtime_data
    entities = [
-        BleBoxUpdateEntity(coordinator, feature)
-        for feature in coordinator.box.features.get("updates", [])
+        BleBoxUpdateEntity(feature)
+        for feature in config_entry.runtime_data.features.get("updates", [])
    ]
-    async_add_entities(entities, update_before_add=True)
+    async_add_entities(entities, True)


 class BleBoxUpdateEntity(BleBoxEntity[blebox_uniapi.update.Update], UpdateEntity):
@@ -52,16 +48,9 @@ class BleBoxUpdateEntity(BleBoxEntity[blebox_uniapi.update.Update], UpdateEntity
        UpdateEntityFeature.INSTALL | UpdateEntityFeature.PROGRESS
    )

-    @property
-    def should_poll(self) -> bool:
-        """Return True because firmware versions cannot be fetched via coordinator."""
-        return True
-
-    def __init__(
-        self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.update.Update
-    ) -> None:
+    def __init__(self, feature: blebox_uniapi.update.Update) -> None:
        """Initialize the update entity."""
-        super().__init__(coordinator, feature)
+        super().__init__(feature)
        self._in_progress_old_version: str | None = None
        self._poll_cancel: CALLBACK_TYPE | None = None
        self._poll_attempts: int = 0
@@ -87,11 +76,7 @@ class BleBoxUpdateEntity(BleBoxEntity[blebox_uniapi.update.Update], UpdateEntity
        try:
            await self._feature.async_update()
        except Error as ex:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="update_failed",
-                translation_placeholders={"error": str(ex)},
-            ) from ex
+            raise HomeAssistantError(ex) from ex
        self._sync_sw_version()

    @property
@@ -126,11 +111,7 @@ class BleBoxUpdateEntity(BleBoxEntity[blebox_uniapi.update.Update], UpdateEntity
            await self._feature.async_install()
        except Error as ex:
            self._reset_progress()
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="install_failed",
-                translation_placeholders={"error": str(ex)},
-            ) from ex
+            raise HomeAssistantError(ex) from ex
        self._poll_cancel = async_call_later(
            self.hass, _POLL_INTERVAL_SECONDS, self._poll_until_updated
        )
@@ -1,34 +0,0 @@
-"""Utilities for BleBox."""
-
-from collections.abc import Awaitable, Callable, Coroutine
-from typing import Any, Concatenate
-
-from blebox_uniapi.error import Error
-
-from homeassistant.exceptions import HomeAssistantError
-
-from .const import DOMAIN
-from .entity import BleBoxEntity
-
-
-def blebox_command[_BleBoxEntityT: BleBoxEntity, **_P, _R](
-    func: Callable[Concatenate[_BleBoxEntityT, _P], Awaitable[_R]],
-) -> Callable[Concatenate[_BleBoxEntityT, _P], Coroutine[Any, Any, _R]]:
-    """Decorate BleBox calls that send commands to the device.
-
-    Catches BleBox errors and refreshes the coordinator after the command.
-    """
-
-    async def handler(self: _BleBoxEntityT, *args: _P.args, **kwargs: _P.kwargs) -> _R:
-        try:
-            return await func(self, *args, **kwargs)
-        except Error as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="command_failed",
-                translation_placeholders={"error": str(err)},
-            ) from err
-        finally:
-            await self.coordinator.async_refresh()
-
-    return handler
@@ -27,7 +27,6 @@ from bluetooth_data_tools import monotonic_time_coarse as MONOTONIC_TIME
 from habluetooth import (
    BaseHaRemoteScanner,
    BaseHaScanner,
-    BluetoothReachabilityIntent,
    BluetoothScannerDevice,
    BluetoothScanningMode,
    HaBluetoothConnector,
@@ -56,7 +55,6 @@ from . import passive_update_processor, websocket_api
 from .api import (
    _get_manager,
    async_address_present,
-    async_address_reachability_diagnostics,
    async_ble_device_from_address,
    async_clear_address_from_match_history,
    async_clear_advertisement_history,
@@ -110,14 +108,12 @@ __all__ = [
    "BluetoothCallback",
    "BluetoothCallbackMatcher",
    "BluetoothChange",
-    "BluetoothReachabilityIntent",
    "BluetoothScannerDevice",
    "BluetoothScanningMode",
    "BluetoothServiceInfo",
    "BluetoothServiceInfoBleak",
    "HaBluetoothConnector",
    "async_address_present",
-    "async_address_reachability_diagnostics",
    "async_ble_device_from_address",
    "async_clear_address_from_match_history",
    "async_clear_advertisement_history",
@@ -6,13 +6,11 @@ These APIs are the only documented way to interact with the bluetooth integratio
 import asyncio
 from asyncio import Future
 from collections.abc import Callable, Iterable
-from contextlib import ExitStack
 from typing import TYPE_CHECKING, cast

 from bleak import BleakScanner
 from habluetooth import (
    BaseHaScanner,
-    BluetoothReachabilityIntent,
    BluetoothScannerDevice,
    BluetoothScanningMode,
    HaBleakScannerWrapper,
@@ -110,14 +108,6 @@ def async_ble_device_from_address(
    return _get_manager(hass).async_ble_device_from_address(address, connectable)


-@hass_callback
-def async_address_reachability_diagnostics(
-    hass: HomeAssistant, address: str, intent: BluetoothReachabilityIntent
-) -> str:
-    """Return a human readable explanation of why an address may be unreachable."""
-    return _get_manager(hass).async_address_reachability_diagnostics(address, intent)
-
-
@hass_callback
 def async_scanner_devices_by_address(
    hass: HomeAssistant, address: str, connectable: bool = True
@@ -179,20 +169,15 @@ async def async_process_advertisements(
        if not done.done() and callback(service_info):
            done.set_result(service_info)

-    manager = _get_manager(hass)
-
-    with ExitStack() as stack:
-        unload = manager.async_register_callback(
-            _async_discovered_device, match_dict, mode
-        )
-        stack.callback(unload)
-
-        if mode == BluetoothScanningMode.ACTIVE:
-            task = hass.async_create_task(manager.async_request_active_scan(timeout))
-            stack.callback(task.cancel)
+    unload = _get_manager(hass).async_register_callback(
+        _async_discovered_device, match_dict, mode, scan_duration=timeout
+    )

+    try:
        async with asyncio.timeout(timeout):
            return await done
+    finally:
+        unload()


@hass_callback
@@ -21,6 +21,6 @@
    "bluetooth-auto-recovery==1.6.4",
    "bluetooth-data-tools==1.29.18",
    "dbus-fast==5.0.16",
-    "habluetooth==6.8.3"
+    "habluetooth==6.7.9"
  ]
 }
@@ -1,19 +1,18 @@
 """The Brands integration."""

 from collections import deque
-from collections.abc import Container, Mapping
 from http import HTTPStatus
 import logging
 from pathlib import Path
 from random import SystemRandom
 import time
-from typing import Any, Final, override
+from typing import Any, Final

-from aiohttp import ClientError, web
+from aiohttp import ClientError, hdrs, web
 import voluptuous as vol

 from homeassistant.components import websocket_api
-from homeassistant.components.http import HomeAssistantView
+from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView
 from homeassistant.core import HomeAssistant, callback, valid_domain
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -109,18 +108,23 @@ def _read_brand_file(brand_dir: Path, image: str) -> bytes | None:
 class _BrandsBaseView(HomeAssistantView):
    """Base view for serving brand images."""

-    use_query_token_for_auth = True
+    requires_auth = False

    def __init__(self, hass: HomeAssistant) -> None:
        """Initialize the view."""
        self._hass = hass
        self._cache_dir = Path(hass.config.cache_path(DOMAIN))

-    @callback
-    @override
-    def get_valid_auth_tokens(self, match_info: Mapping[str, str]) -> Container[str]:
-        """Return valid auth tokens, which can be used for query token authentication."""
-        return self._hass.data[DOMAIN]
+    def _authenticate(self, request: web.Request) -> None:
+        """Authenticate the request using Bearer token or query token."""
+        access_tokens: deque[str] = self._hass.data[DOMAIN]
+        authenticated = (
+            request[KEY_AUTHENTICATED] or request.query.get("token") in access_tokens
+        )
+        if not authenticated:
+            if hdrs.AUTHORIZATION in request.headers:
+                raise web.HTTPUnauthorized
+            raise web.HTTPForbidden

    async def _serve_from_custom_integration(
        self,
@@ -236,6 +240,8 @@ class BrandsIntegrationView(_BrandsBaseView):
        image: str,
    ) -> web.Response:
        """Handle GET request for an integration brand image."""
+        self._authenticate(request)
+
        if not valid_domain(domain) or image not in ALLOWED_IMAGES:
            return web.Response(status=HTTPStatus.NOT_FOUND)

@@ -268,6 +274,8 @@ class BrandsHardwareView(_BrandsBaseView):
        image: str,
    ) -> web.Response:
        """Handle GET request for a hardware brand image."""
+        self._authenticate(request)
+
        if not CATEGORY_RE.match(category):
            return web.Response(status=HTTPStatus.NOT_FOUND)
        # Hardware images have dynamic names like "manufacturer_model.png"
@@ -3,7 +3,6 @@
  "name": "Sony Bravia TV",
  "codeowners": ["@bieniu", "@Drafteed"],
  "config_flow": true,
-  "dependencies": ["ssdp"],
  "documentation": "https://www.home-assistant.io/integrations/braviatv",
  "integration_type": "device",
  "iot_class": "local_polling",
@@ -230,6 +230,10 @@ async def async_migrate_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) ->
        entry.minor_version,
    )

+    if entry.version > 1:
+        # Downgraded from a future version; cannot migrate.
+        return False
+
    # 1.1 -> 1.2: Add CONF_HEATING_CIRCUITS. Attempt to discover available
    # heating circuits from the device; fall back to [1] (pre-multi-circuit
    # default) if the device is unreachable or the endpoint is unsupported.
@@ -8,6 +8,6 @@
  "iot_class": "local_push",
  "loggers": ["aiostreammagic"],
  "quality_scale": "platinum",
-  "requirements": ["aiostreammagic==2.13.2"],
+  "requirements": ["aiostreammagic==2.13.1"],
  "zeroconf": ["_stream-magic._tcp.local.", "_smoip._tcp.local."]
 }
@@ -2,7 +2,7 @@

 import asyncio
 import collections
-from collections.abc import Awaitable, Callable, Container, Coroutine, Mapping
+from collections.abc import Awaitable, Callable, Coroutine
 from contextlib import suppress
 from dataclasses import asdict, dataclass
 from datetime import datetime, timedelta
@@ -12,16 +12,16 @@ import logging
 import os
 from random import SystemRandom
 import time
-from typing import Any, Final, final, override
+from typing import Any, Final, final

-from aiohttp import web
+from aiohttp import hdrs, web
 import attr
 from propcache.api import cached_property, under_cached_property
 import voluptuous as vol
 from webrtc_models import RTCIceCandidateInit

 from homeassistant.components import websocket_api
-from homeassistant.components.http import HomeAssistantView
+from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView
 from homeassistant.components.media_player import (
    ATTR_MEDIA_CONTENT_ID,
    ATTR_MEDIA_CONTENT_TYPE,
@@ -776,26 +776,30 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
 class CameraView(HomeAssistantView):
    """Base CameraView."""

-    use_query_token_for_auth = True
+    requires_auth = False

    def __init__(self, component: EntityComponent[Camera]) -> None:
        """Initialize a basic camera view."""
        self.component = component

-    @callback
-    @override
-    def get_valid_auth_tokens(self, match_info: Mapping[str, str]) -> Container[str]:
-        """Return valid auth tokens, which can be used for query token authentication."""
-        if (camera := self.component.get_entity(match_info["entity_id"])) is None:
-            return ()
-
-        return camera.access_tokens
-
    async def get(self, request: web.Request, entity_id: str) -> web.StreamResponse:
        """Start a GET request."""
        if (camera := self.component.get_entity(entity_id)) is None:
            raise web.HTTPNotFound

+        authenticated = (
+            request[KEY_AUTHENTICATED]
+            or request.query.get("token") in camera.access_tokens
+        )
+
+        if not authenticated:
+            # Attempt with invalid bearer token, raise unauthorized
+            # so ban middleware can handle it.
+            if hdrs.AUTHORIZATION in request.headers:
+                raise web.HTTPUnauthorized
+            # Invalid sigAuth or camera access token
+            raise web.HTTPForbidden
+
        if not camera.is_on:
            _LOGGER.debug("Camera is off")
            raise web.HTTPServiceUnavailable
@@ -66,10 +66,5 @@ async def get_cert_expiry_timestamp(
    except ssl.SSLError as err:
        raise ValidationFailure(err.args[0]) from err

-    if not cert or "notAfter" not in cert:
-        raise ValidationFailure(
-            f"No certificate expiration found for: {hostname}:{port}"
-        )
-
    ts_seconds = ssl.cert_time_to_seconds(cert["notAfter"])
    return dt_util.utc_from_timestamp(ts_seconds)
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/chacon_dio",
  "iot_class": "cloud_push",
  "loggers": ["dio_chacon_api"],
-  "requirements": ["dio-chacon-wifi-api==1.3.0"]
+  "requirements": ["dio-chacon-wifi-api==1.2.2"]
 }
@@ -24,7 +24,6 @@ from homeassistant.components.alexa import (
    entities as alexa_entities,
    errors as alexa_errors,
 )
-from homeassistant.components.frontend import DATA_THEMES
 from homeassistant.components.google_assistant import helpers as google_helpers
 from homeassistant.components.homeassistant import exposed_entities
 from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
@@ -509,15 +508,6 @@ class DownloadSupportPackageView(HomeAssistantView):
            "custom_integrations": custom_integrations,
        }

-    @callback
-    def _get_themes_info(self, hass: HomeAssistant) -> dict[str, Any]:
-        """Collect information about user-installed custom themes."""
-        themes: dict[str, Any] = hass.data.get(DATA_THEMES, {})
-        return {
-            "count": len(themes),
-            "themes": sorted(themes),
-        }
-
    async def _generate_markdown(
        self,
        hass: HomeAssistant,
@@ -579,25 +569,6 @@ class DownloadSupportPackageView(HomeAssistantView):
                    )
                markdown += "\n</details>\n\n"

-        # Add custom themes information
-        try:
-            themes_info = self._get_themes_info(hass)
-        except Exception:  # noqa: BLE001
-            # Broad exception catch for robustness in support package generation
-            markdown += "## Custom Themes\n\n"
-            markdown += "Unable to collect themes information\n\n"
-        else:
-            markdown += "## Custom Themes\n\n"
-            markdown += f"Custom themes: {themes_info['count']}\n\n"
-
-            if themes_info["themes"]:
-                markdown += "<details><summary>Custom themes</summary>\n\n"
-                markdown += "Name\n"
-                markdown += "---\n"
-                for theme in themes_info["themes"]:
-                    markdown += f"{theme}\n"
-                markdown += "\n</details>\n\n"
-
        for domain, domain_info in domains_info.items():
            domain_info_md = get_domain_table_markdown(domain_info)
            markdown += (
@@ -87,6 +87,10 @@ async def async_migrate_entry(
 ) -> bool:
    """Migrate old entry."""

+    if config_entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
    if config_entry.version == 1 and config_entry.minor_version == 1:
        device_registry = dr.async_get(hass)

@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/conversation",
  "integration_type": "entity",
  "quality_scale": "internal",
-  "requirements": ["hassil==3.6.0", "home-assistant-intents==2026.6.1"]
+  "requirements": ["hassil==3.5.0", "home-assistant-intents==2026.5.5"]
 }
@@ -1,11 +1,8 @@
 """Offer sentence based automation rules."""

 from collections.abc import Awaitable, Callable
-import re
 from typing import Any

-from hassil.parse_expression import parse_sentence
-from hassil.parser import ParseError
 from hassil.recognize import RecognizeResult
 from hassil.util import (
    PUNCTUATION_END,
@@ -34,8 +31,6 @@ TRIGGER_CALLBACK_TYPE = Callable[
 def has_no_punctuation(value: list[str]) -> list[str]:
    """Validate result does not contain punctuation."""
    for sentence in value:
-        # Exclude {list_references} which may contain punctuation characters.
-        sentence = _remove_list_references(sentence)
        if (
            PUNCTUATION_START.search(sentence)
            or PUNCTUATION_END.search(sentence)
@@ -47,21 +42,6 @@ def has_no_punctuation(value: list[str]) -> list[str]:
    return value


-def _remove_list_references(sentence: str) -> str:
-    """Remove {list_references} from a sentence for linting."""
-    return re.sub(r"(?<!\\)\{[^{}]*\}", "", sentence)
-
-
-def is_valid_sentence(value: list[str]) -> list[str]:
-    """Validate result can be parsed by hassil."""
-    for sentence in value:
-        try:
-            parse_sentence(sentence)
-        except ParseError as err:
-            raise vol.Invalid(f"invalid sentence: {err}") from err
-    return value
-
-
 def has_one_non_empty_item(value: list[str]) -> list[str]:
    """Validate result has at least one item."""
    if len(value) < 1:
@@ -78,11 +58,7 @@ TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
    {
        vol.Required(CONF_PLATFORM): DOMAIN,
        vol.Required(CONF_COMMAND): vol.All(
-            cv.ensure_list,
-            [cv.string],
-            has_one_non_empty_item,
-            has_no_punctuation,
-            is_valid_sentence,
+            cv.ensure_list, [cv.string], has_one_non_empty_item, has_no_punctuation
        ),
    }
 )
@@ -7,6 +7,6 @@
  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["pydaikin"],
-  "requirements": ["pydaikin==2.18.1"],
+  "requirements": ["pydaikin==2.17.2"],
  "zeroconf": ["_dkapi._tcp.local."]
 }
@@ -5,7 +5,7 @@ import logging
 from typing import Any

 from aiohttp import ClientError, ClientResponseError
-from data_grand_lyon_ha import DataGrandLyonClient, TclStop, find_tcl_stop_by_id
+from data_grand_lyon_ha import DataGrandLyonClient
 import voluptuous as vol

 from homeassistant.config_entries import (
@@ -18,12 +18,6 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import (
-    SelectOptionDict,
-    SelectSelector,
-    SelectSelectorConfig,
-    SelectSelectorMode,
-)

 from .const import (
    CONF_LINE,
@@ -49,6 +43,13 @@ STEP_RECONFIGURE_SCHEMA = vol.Schema(
    }
 )

+STEP_STOP_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_LINE): str,
+        vol.Required(CONF_STOP_ID): vol.Coerce(int),
+    }
+)
+
 STEP_VELOV_STATION_DATA_SCHEMA = vol.Schema(
    {
        vol.Required(CONF_STATION_ID): vol.Coerce(int),
@@ -178,126 +179,33 @@ class DataGrandLyonConfigFlow(ConfigFlow, domain=DOMAIN):
 class StopSubentryFlowHandler(ConfigSubentryFlow):
    """Handle a subentry flow for adding a Data Grand Lyon stop."""

-    def __init__(self) -> None:
-        """Initialize the flow."""
-        self._stops: list[TclStop] = []
-        self._selected_stop: TclStop | None = None
-        self._selected_stop_id: int | None = None
-
    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
    ) -> SubentryFlowResult:
-        """Pick a stop from the list fetched from the API, or enter one manually."""
-        if not self._stops:
-            if error := await self._async_load_stops():
-                return self.async_abort(reason=error)
+        """Handle the user step to add a new stop."""
+        entry = self._get_entry()

-        errors: dict[str, str] = {}
        if user_input is not None:
-            try:
-                stop_id = int(user_input[CONF_STOP_ID])
-            except ValueError:
-                errors[CONF_STOP_ID] = "invalid_stop_id"
-            else:
-                self._selected_stop_id = stop_id
-                self._selected_stop = find_tcl_stop_by_id(self._stops, stop_id)
-                return await self.async_step_pick_line()
+            line = user_input[CONF_LINE]
+            stop_id = user_input[CONF_STOP_ID]
+            unique_id = f"{line}_{stop_id}"

-        options = [
-            SelectOptionDict(value=str(stop.id), label=_stop_label(stop))
-            for stop in sorted(
-                self._stops, key=lambda s: (s.nom, s.commune or "", s.id or 0)
+            for subentry in entry.subentries.values():
+                if subentry.unique_id == unique_id:
+                    return self.async_abort(reason="already_configured")
+
+            name = f"{line} - Stop {stop_id}"
+            return self.async_create_entry(
+                title=name,
+                data={CONF_LINE: line, CONF_STOP_ID: stop_id},
+                unique_id=unique_id,
            )
-        ]
-        schema = vol.Schema(
-            {
-                vol.Required(CONF_STOP_ID): SelectSelector(
-                    SelectSelectorConfig(
-                        options=options,
-                        mode=SelectSelectorMode.DROPDOWN,
-                        sort=False,
-                        custom_value=True,
-                    )
-                )
-            }
-        )
+
        return self.async_show_form(
            step_id="user",
-            data_schema=schema,
-            errors=errors,
+            data_schema=STEP_STOP_DATA_SCHEMA,
        )

-    async def async_step_pick_line(
-        self, user_input: dict[str, Any] | None = None
-    ) -> SubentryFlowResult:
-        """Pick a line from the selected stop's desserte, or enter one manually."""
-        assert self._selected_stop_id is not None
-        if user_input is not None:
-            return self._create_stop(
-                line=user_input[CONF_LINE], stop_id=self._selected_stop_id
-            )
-
-        options = self._selected_stop.desserte if self._selected_stop else []
-        schema = vol.Schema(
-            {
-                vol.Required(CONF_LINE): SelectSelector(
-                    SelectSelectorConfig(
-                        options=options,
-                        mode=SelectSelectorMode.DROPDOWN,
-                        custom_value=True,
-                    )
-                )
-            }
-        )
-        return self.async_show_form(step_id="pick_line", data_schema=schema)
-
-    async def _async_load_stops(self) -> str | None:
-        """Fetch TCL stops from the API, returning an error key on failure."""
-        entry = self._get_entry()
-        session = async_get_clientsession(self.hass)
-        client = DataGrandLyonClient(
-            session=session,
-            username=entry.data[CONF_USERNAME],
-            password=entry.data[CONF_PASSWORD],
-        )
-        try:
-            self._stops = await client.get_tcl_stops()
-        except ClientResponseError as err:
-            if err.status in (401, 403):
-                return "invalid_auth"
-            return "cannot_connect"
-        except ClientError, TimeoutError:
-            return "cannot_connect"
-        except Exception:
-            _LOGGER.exception("Unexpected error fetching Data Grand Lyon TCL stops")
-            return "unknown"
-        return None
-
-    def _create_stop(self, line: str, stop_id: int) -> SubentryFlowResult:
-        """Create the stop subentry, aborting on duplicate."""
-        entry = self._get_entry()
-        unique_id = f"{line}_{stop_id}"
-        for subentry in entry.subentries.values():
-            if subentry.unique_id == unique_id:
-                return self.async_abort(reason="already_configured")
-
-        return self.async_create_entry(
-            title=f"{line} - Stop {stop_id}",
-            data={CONF_LINE: line, CONF_STOP_ID: stop_id},
-            unique_id=unique_id,
-        )
-
-
-def _stop_label(stop: TclStop) -> str:
-    label = stop.nom
-    # variable extracted to please codespell.
-    address = stop.adresse  # codespell:ignore adresse
-    if address or stop.commune:
-        label += " (" + ", ".join(filter(None, [address, stop.commune])) + ")"
-    label += f" - {stop.id}"
-
-    return label
-

 class VelovStationSubentryFlowHandler(ConfigSubentryFlow):
    """Handle a subentry flow for adding a Vélo'v station."""
@@ -7,5 +7,5 @@
  "integration_type": "service",
  "iot_class": "cloud_polling",
  "quality_scale": "platinum",
-  "requirements": ["data-grand-lyon-ha==0.8.0"]
+  "requirements": ["data-grand-lyon-ha==0.7.0"]
 }
@@ -46,30 +46,17 @@
  "config_subentries": {
    "stop": {
      "abort": {
-        "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-        "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-        "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-        "unknown": "[%key:common::config_flow::error::unknown%]"
+        "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
      },
      "entry_type": "Transit stop",
-      "error": {
-        "invalid_stop_id": "Stop ID must be a number."
-      },
      "initiate_flow": {
        "user": "Add transit stop"
      },
      "step": {
-        "pick_line": {
-          "data": {
-            "line": "Line"
-          }
-        },
        "user": {
          "data": {
-            "stop_id": "Stop"
-          },
-          "data_description": {
-            "stop_id": "Search by stop name, address or city, or enter a stop ID directly."
+            "line": "Line",
+            "stop_id": "Stop ID"
          }
        }
      }
@@ -5,7 +5,6 @@ from homeassistant.components.binary_sensor import (
    BinarySensorEntity,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -28,19 +27,7 @@ async def async_setup_entry(
                BinarySensorDeviceClass.MOISTURE,
            ),
            DemoBinarySensor(
-                "binary_2",
-                "Movement Backyard",
-                True,
-                BinarySensorDeviceClass.MOTION,
-            ),
-            DemoBinarySensor(
-                "binary_3",
-                "Outside Temperature",
-                False,
-                BinarySensorDeviceClass.BATTERY_CHARGING,
-                device_id="sensor_1",
-                entity_category=EntityCategory.DIAGNOSTIC,
-                entity_name="Battery Charging",
+                "binary_2", "Movement Backyard", True, BinarySensorDeviceClass.MOTION
            ),
        ]
    )
@@ -59,9 +46,6 @@ class DemoBinarySensor(BinarySensorEntity):
        device_name: str,
        state: bool,
        device_class: BinarySensorDeviceClass,
-        device_id: str | None = None,
-        entity_category: EntityCategory | None = None,
-        entity_name: str | None = None,
    ) -> None:
        """Initialize the demo sensor."""
        self._unique_id = unique_id
@@ -70,12 +54,10 @@ class DemoBinarySensor(BinarySensorEntity):
        self._attr_device_info = DeviceInfo(
            identifiers={
                # Serial numbers are unique identifiers within a specific domain
-                (DOMAIN, device_id or unique_id)
+                (DOMAIN, self.unique_id)
            },
            name=device_name,
        )
-        self._attr_entity_category = entity_category
-        self._attr_name = entity_name

    @property
    def unique_id(self) -> str:
@@ -20,8 +20,6 @@ from denonavr.const import (
 from denonavr.exceptions import (
    AvrCommandError,
    AvrForbiddenError,
-    AvrIncompleteResponseError,
-    AvrInvalidResponseError,
    AvrNetworkError,
    AvrProcessingError,
    AvrTimoutError,
@@ -193,17 +191,6 @@ def async_log_errors[_DenonDeviceT: DenonDevice, **_P, _R](
                    self._receiver.host,
                )
                self._attr_available = False
-        except AvrInvalidResponseError, AvrIncompleteResponseError:
-            available = False
-            if self.available:
-                _LOGGER.warning(
-                    (
-                        "Denon AVR receiver at host %s returned malformed response. "
-                        "Device is unavailable"
-                    ),
-                    self._receiver.host,
-                )
-                self._attr_available = False
        except AvrCommandError as err:
            available = False
            _LOGGER.error(
@@ -54,6 +54,10 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
        config_entry.minor_version,
    )

+    if config_entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
    if config_entry.version == 1:
        if config_entry.minor_version < 2:
            new_options = {**config_entry.options}
@@ -22,7 +22,6 @@ from .const import (  # noqa: F401
    ATTR_LOCATION_NAME,
    ATTR_MAC,
    ATTR_SOURCE_TYPE,
-    ATTR_TRACKING_TYPE,
    CONF_ASSOCIATED_ZONE,
    CONF_CONSIDER_HOME,
    CONF_NEW_DEVICE_DEFAULTS,
@@ -37,7 +36,6 @@ from .const import (  # noqa: F401
    PLATFORM_TYPE_LEGACY,
    SCAN_INTERVAL,
    SourceType,
-    TrackingType,
 )
 from .entity import (  # noqa: F401
    BaseScannerEntity,
@@ -25,18 +25,6 @@ class SourceType(StrEnum):
    BLUETOOTH_LE = "bluetooth_le"


-class TrackingType(StrEnum):
-    """Tracking type for device trackers.
-
-    Describes how the tracker determines presence: by the device's geographic
-    position (e.g. GPS) or by its connection to a known endpoint (e.g. a router
-    or beacon associated with a zone).
-    """
-
-    CONNECTION = "connection"
-    POSITION = "position"
-
-
 CONF_SCAN_INTERVAL: Final = "interval_seconds"
 SCAN_INTERVAL: Final = timedelta(seconds=12)

@@ -59,7 +47,6 @@ ATTR_IN_ZONES: Final = "in_zones"
 ATTR_LOCATION_NAME: Final = "location_name"
 ATTR_MAC: Final = "mac"
 ATTR_SOURCE_TYPE: Final = "source_type"
-ATTR_TRACKING_TYPE: Final = "tracking_type"
 ATTR_CONSIDER_HOME: Final = "consider_home"
 ATTR_IP: Final = "ip"

@@ -48,13 +48,11 @@ from .const import (
    ATTR_IP,
    ATTR_MAC,
    ATTR_SOURCE_TYPE,
-    ATTR_TRACKING_TYPE,
    CONF_ASSOCIATED_ZONE,
    CONNECTED_DEVICE_REGISTERED,
    DOMAIN,
    LOGGER,
    SourceType,
-    TrackingType,
 )

 _LOGGER = logging.getLogger(__name__)
@@ -240,9 +238,6 @@ class TrackerEntity(
    """Base class for a tracked device."""

    entity_description: TrackerEntityDescription
-    _attr_capability_attributes: dict[str, Any] = {
-        ATTR_TRACKING_TYPE: TrackingType.POSITION
-    }
    _attr_in_zones: list[str] | None = None
    _attr_latitude: float | None = None
    _attr_location_accuracy: float = 0
@@ -416,9 +411,6 @@ class BaseScannerEntity(BaseTrackerEntity):
    addresses being used to identify the device.
    """

-    _attr_capability_attributes: dict[str, Any] = {
-        ATTR_TRACKING_TYPE: TrackingType.CONNECTION
-    }
    _scanner_option_associated_zone: str = zone.ENTITY_ID_HOME
    _scanner_option_associated_zone_unsub: CALLBACK_TYPE | None = None

@@ -40,13 +40,6 @@
            "gps": "GPS",
            "router": "Router"
          }
-        },
-        "tracking_type": {
-          "name": "Tracking type",
-          "state": {
-            "connection": "Connection",
-            "position": "Position"
-          }
        }
      }
    }
@@ -16,7 +16,7 @@
  "quality_scale": "internal",
  "requirements": [
    "aiodhcpwatcher==1.2.7",
-    "aiodiscover==3.3.1",
-    "cached-ipaddress==1.1.2"
+    "aiodiscover==3.2.4",
+    "cached-ipaddress==1.1.1"
  ]
 }
@@ -51,7 +51,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DnsIPConfigEntry) -> boo
            tcp_port=entry.options[CONF_PORT],
            udp_port=entry.options[CONF_PORT],
        )
-        queries.append(resolver_ipv4.query_dns(hostname, "A"))
+        queries.append(resolver_ipv4.query(hostname, "A"))

    if entry.data[CONF_IPV6]:
        resolver_ipv6 = aiodns.DNSResolver(
@@ -59,7 +59,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DnsIPConfigEntry) -> boo
            tcp_port=entry.options[CONF_PORT_IPV6],
            udp_port=entry.options[CONF_PORT_IPV6],
        )
-        queries.append(resolver_ipv6.query_dns(hostname, "AAAA"))
+        queries.append(resolver_ipv6.query(hostname, "AAAA"))

    async def _close_resolvers() -> None:
        if resolver_ipv4 is not None:
@@ -111,6 +111,10 @@ async def async_migrate_entry(
 ) -> bool:
    """Migrate old entry to a newer version."""

+    if config_entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
    if config_entry.version < 2 and config_entry.minor_version < 2:
        _LOGGER.debug(
            "Migrating configuration from version %s.%s",
@@ -72,7 +72,7 @@ async def async_validate_hostname(
            _resolver = aiodns.DNSResolver(
                nameservers=[resolver], udp_port=port, tcp_port=port
            )
-            result = bool(await _resolver.query_dns(hostname, qtype))
+            result = bool(await _resolver.query(hostname, qtype))

        return result

@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING, Literal

 import aiodns
 from aiodns.error import DNSError
-import pycares

 from homeassistant.components.sensor import SensorEntity
 from homeassistant.const import CONF_NAME, CONF_PORT
@@ -149,7 +148,7 @@ class WanIpSensor(SensorEntity):
        response = None
        try:
            async with asyncio.timeout(10):
-                response = await self._resolver.query_dns(self.hostname, self.querytype)
+                response = await self._resolver.query(self.hostname, self.querytype)
        except TimeoutError as err:
            _LOGGER.debug("Timeout while resolving host: %s", err)
            await self._resolver.close()
@@ -158,19 +157,9 @@ class WanIpSensor(SensorEntity):
            await self._resolver.close()

        if response:
-            if TYPE_CHECKING:
-                assert all(
-                    isinstance(res.data, (pycares.ARecordData, pycares.AAAARecordData))
-                    for res in response.answer
-                )
-            _ips = []
-            for res in response.answer:
-                if TYPE_CHECKING:
-                    assert isinstance(
-                        res.data, (pycares.ARecordData, pycares.AAAARecordData)
-                    )
-                _ips.append(res.data.addr)
-            sorted_ips = sort_ips(_ips, querytype=self.querytype)
+            sorted_ips = sort_ips(
+                [res.host for res in response], querytype=self.querytype
+            )
            self._attr_native_value = sorted_ips[0]
            self._attr_extra_state_attributes["ip_addresses"] = sorted_ips
            self._attr_available = True
@@ -13,6 +13,7 @@ from dsmr_parser.clients.rfxtrx_protocol import (
 from dsmr_parser.objects import DSMRObject
 import voluptuous as vol

+from homeassistant.components import usb
 from homeassistant.config_entries import (
    ConfigEntry,
    ConfigFlow,
@@ -22,7 +23,6 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_HOST, CONF_PORT, CONF_PROTOCOL, CONF_TYPE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.selector import SerialPortSelector

 from .const import (
    CONF_DSMR_VERSION,
@@ -37,6 +37,8 @@ from .const import (
    RFXTRX_DSMR_PROTOCOL,
 )

+CONF_MANUAL_PATH = "Enter Manually"
+

 class DSMRConnection:
    """Test the connection to DSMR and receive telegram to read serial ids."""
@@ -163,6 +165,8 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):

    VERSION = 1

+    _dsmr_version: str | None = None
+
    @staticmethod
    @callback
    def async_get_options_flow(
@@ -218,13 +222,34 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
        """Step when setting up serial configuration."""
        errors: dict[str, str] = {}
        if user_input is not None:
-            data = await self.async_validate_dsmr(user_input, errors)
+            user_selection = user_input[CONF_PORT]
+            if user_selection == CONF_MANUAL_PATH:
+                self._dsmr_version = user_input[CONF_DSMR_VERSION]
+                return await self.async_step_setup_serial_manual_path()
+
+            dev_path = user_selection
+
+            validate_data = {
+                CONF_PORT: dev_path,
+                CONF_DSMR_VERSION: user_input[CONF_DSMR_VERSION],
+            }
+
+            data = await self.async_validate_dsmr(validate_data, errors)
            if not errors:
                return self.async_create_entry(title=data[CONF_PORT], data=data)

+        ports = await usb.async_scan_serial_ports(self.hass)
+        list_of_ports = {
+            port.device: f"{port.device} - {port.description or 'n/a'}"
+            f", s/n: {port.serial_number or 'n/a'}"
+            + (f" - {port.manufacturer}" if port.manufacturer else "")
+            for port in ports
+        }
+        list_of_ports[CONF_MANUAL_PATH] = CONF_MANUAL_PATH
+
        schema = vol.Schema(
            {
-                vol.Required(CONF_PORT): SerialPortSelector(),
+                vol.Required(CONF_PORT): vol.In(list_of_ports),
                vol.Required(CONF_DSMR_VERSION): vol.In(DSMR_VERSIONS),
            }
        )
@@ -234,6 +259,27 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
            errors=errors,
        )

+    async def async_step_setup_serial_manual_path(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Select path manually."""
+        if user_input is not None:
+            validate_data = {
+                CONF_PORT: user_input[CONF_PORT],
+                CONF_DSMR_VERSION: self._dsmr_version,
+            }
+
+            errors: dict[str, str] = {}
+            data = await self.async_validate_dsmr(validate_data, errors)
+            if not errors:
+                return self.async_create_entry(title=data[CONF_PORT], data=data)
+
+        schema = vol.Schema({vol.Required(CONF_PORT): str})
+        return self.async_show_form(
+            step_id="setup_serial_manual_path",
+            data_schema=schema,
+        )
+
    async def async_validate_dsmr(
        self, input_data: dict[str, Any], errors: dict[str, str]
    ) -> dict[str, Any]:
--- a/Show More
+++ b/Show More