Update pytest-sugar to 1.1.1 (#168270 )

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Capitalize "REST" abbreviation in scrape error messages (#168280 )
2026-04-15 14:16:11 +02:00 · 2026-04-15 13:07:21 +02:00 · 2026-04-15 11:36:39 +02:00 · 2026-04-15 11:21:59 +02:00 · 2026-04-15 10:50:29 +02:00 · 2026-04-15 09:59:12 +02:00
864 changed files with 32368 additions and 9787 deletions
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -0,0 +1,161 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"],
+
+  "enabledManagers": [
+    "pep621",
+    "pip_requirements",
+    "pre-commit",
+    "homeassistant-manifest"
+  ],
+
+  "pre-commit": {
+    "enabled": true
+  },
+
+  "pip_requirements": {
+    "managerFilePatterns": [
+      "/(^|/)requirements[\\w_-]*\\.txt$/",
+      "/(^|/)homeassistant/package_constraints\\.txt$/"
+    ]
+  },
+
+  "homeassistant-manifest": {
+    "managerFilePatterns": [
+      "/^homeassistant/components/[^/]+/manifest\\.json$/"
+    ]
+  },
+
+  "minimumReleaseAge": "7 days",
+  "prConcurrentLimit": 10,
+  "prHourlyLimit": 2,
+  "schedule": ["before 6am"],
+
+  "semanticCommits": "disabled",
+  "commitMessageAction": "Update",
+  "commitMessageTopic": "{{depName}}",
+  "commitMessageExtra": "to {{newVersion}}",
+
+  "automerge": false,
+
+  "vulnerabilityAlerts": {
+    "enabled": false
+  },
+
+  "packageRules": [
+    {
+      "description": "Deny all by default — allowlist below re-enables specific packages",
+      "matchPackageNames": ["*"],
+      "enabled": false
+    },
+    {
+      "description": "Core runtime dependencies (allowlisted)",
+      "matchPackageNames": [
+        "aiohttp",
+        "aiohttp-fast-zlib",
+        "aiohttp_cors",
+        "aiohttp-asyncmdnsresolver",
+        "yarl",
+        "httpx",
+        "requests",
+        "urllib3",
+        "certifi",
+        "orjson",
+        "PyYAML",
+        "Jinja2",
+        "cryptography",
+        "pyOpenSSL",
+        "PyJWT",
+        "SQLAlchemy",
+        "Pillow",
+        "attrs",
+        "uv",
+        "voluptuous",
+        "voluptuous-serialize",
+        "voluptuous-openapi",
+        "zeroconf"
+      ],
+      "enabled": true,
+      "labels": ["dependency", "core"]
+    },
+    {
+      "description": "Test dependencies (allowlisted)",
+      "matchPackageNames": [
+        "pytest",
+        "pytest-asyncio",
+        "pytest-aiohttp",
+        "pytest-cov",
+        "pytest-freezer",
+        "pytest-github-actions-annotate-failures",
+        "pytest-socket",
+        "pytest-sugar",
+        "pytest-timeout",
+        "pytest-unordered",
+        "pytest-picked",
+        "pytest-xdist",
+        "pylint",
+        "pylint-per-file-ignores",
+        "astroid",
+        "coverage",
+        "freezegun",
+        "syrupy",
+        "respx",
+        "requests-mock",
+        "ruff",
+        "codespell",
+        "yamllint",
+        "zizmor"
+      ],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "For types-* stubs, only allow patch updates. Major/minor bumps track the upstream runtime package version and must be manually coordinated with the corresponding pin.",
+      "matchPackageNames": ["/^types-/"],
+      "matchUpdateTypes": ["patch"],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "Pre-commit hook repos (allowlisted, matched by owner/repo)",
+      "matchPackageNames": [
+        "astral-sh/ruff-pre-commit",
+        "codespell-project/codespell",
+        "adrienverge/yamllint",
+        "zizmorcore/zizmor-pre-commit"
+      ],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "Group ruff pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["astral-sh/ruff-pre-commit", "ruff"],
+      "groupName": "ruff",
+      "groupSlug": "ruff"
+    },
+    {
+      "description": "Group codespell pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["codespell-project/codespell", "codespell"],
+      "groupName": "codespell",
+      "groupSlug": "codespell"
+    },
+    {
+      "description": "Group yamllint pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["adrienverge/yamllint", "yamllint"],
+      "groupName": "yamllint",
+      "groupSlug": "yamllint"
+    },
+    {
+      "description": "Group zizmor pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["zizmorcore/zizmor-pre-commit", "zizmor"],
+      "groupName": "zizmor",
+      "groupSlug": "zizmor"
+    },
+    {
+      "description": "Group pylint with astroid (their versions are linked and must move together)",
+      "matchPackageNames": ["pylint", "astroid"],
+      "groupName": "pylint",
+      "groupSlug": "pylint"
+    }
+  ]
+}
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -108,7 +108,7 @@ jobs:

      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
          repo: home-assistant/frontend
@@ -119,7 +119,7 @@ jobs:

      - name: Download nightly wheels of intents
        if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
          repo: OHF-Voice/intents-package
@@ -344,13 +344,13 @@ jobs:

      - name: Login to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.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@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -523,7 +523,7 @@ jobs:
          persist-credentials: false

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -50,9 +50,11 @@ env:
  # - 10.10.3 is the latest (as of 6 Feb 2023)
  # 10.11 is the latest long-term-support
  # - 10.11.2 is the version currently shipped with Synology (as of 11 Oct 2023)
+  # 11.4 is an LTS with support until May 2029
+  # - 11.4.9 is used in Alpine 3.23 (used in latest HA base images as of 11 Apr 2026)
  # mysql 8.0.32 does not always behave the same as MariaDB
  # and some queries that work on MariaDB do not work on MySQL
-  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3','mariadb:10.11.2','mysql:8.0.32']"
+  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3','mariadb:10.11.2','mariadb:11.4.9','mysql:8.0.32']"
  # 12 is the oldest supported version
  # - 12.14 is the latest (as of 9 Feb 2023)
  # 15 is the latest version
@@ -1062,7 +1064,9 @@ jobs:
          - 3306:3306
        env:
          MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping -uroot -ppassword" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="if command -v mariadb-admin >/dev/null; then mariadb-admin ping -uroot -ppassword; else mysqladmin ping -uroot -ppassword; fi"
+          --health-interval=5s --health-timeout=2s --health-retries=3
    needs:
      - info
      - base
--- a/.gitignore
+++ b/.gitignore
@@ -142,5 +142,6 @@ pytest_buckets.txt

 # AI tooling
 .claude/settings.local.json
+.claude/worktrees/
 .serena/

--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
      - id: ruff-format
        files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.(py|pyi)$
  - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
    hooks:
      - id: codespell
        args:
@@ -36,7 +36,7 @@ repos:
          - --branch=master
          - --branch=rc
  - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.1
+    rev: v1.38.0
    hooks:
      - id: yamllint
  - repo: https://github.com/rbubley/mirrors-prettier
--- a/.strict-typing
+++ b/.strict-typing
@@ -332,6 +332,7 @@ homeassistant.components.letpot.*
 homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
+homeassistant.components.liebherr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
 homeassistant.components.linkplay.*
--- a/30
+++ b/30
@@ -418,6 +418,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duckdns/ @tr4nt0r
 /tests/components/duckdns/ @tr4nt0r
+/homeassistant/components/duco/ @ronaldvdmeer
+/tests/components/duco/ @ronaldvdmeer
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
 /homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192
@@ -487,8 +489,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
 /homeassistant/components/ephember/ @ttroy50 @roberty99
-/homeassistant/components/epic_games_store/ @hacf-fr @Quentame
-/tests/components/epic_games_store/ @hacf-fr @Quentame
+/homeassistant/components/epic_games_store/ @Quentame
+/tests/components/epic_games_store/ @Quentame
 /homeassistant/components/epion/ @lhgravendeel
 /tests/components/epion/ @lhgravendeel
 /homeassistant/components/epson/ @pszafer
@@ -503,6 +505,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/essent/ @jaapp
 /homeassistant/components/eufylife_ble/ @bdr99
 /tests/components/eufylife_ble/ @bdr99
+/homeassistant/components/eurotronic_cometblue/ @rikroe
+/tests/components/eurotronic_cometblue/ @rikroe
 /homeassistant/components/event/ @home-assistant/core
 /tests/components/event/ @home-assistant/core
 /homeassistant/components/evohome/ @zxdavb
@@ -562,8 +566,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/fortios/ @kimfrellsen
 /homeassistant/components/foscam/ @Foscam-wangzhengyu
 /tests/components/foscam/ @Foscam-wangzhengyu
-/homeassistant/components/freebox/ @hacf-fr @Quentame
-/tests/components/freebox/ @hacf-fr @Quentame
+/homeassistant/components/freebox/ @hacf-fr/reviewers @Quentame
+/tests/components/freebox/ @hacf-fr/reviewers @Quentame
 /homeassistant/components/freedompro/ @stefano055415
 /tests/components/freedompro/ @stefano055415
 /homeassistant/components/freshr/ @SierraNL
@@ -1053,8 +1057,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/met/ @danielhiversen
 /homeassistant/components/met_eireann/ @DylanGore
 /tests/components/met_eireann/ @DylanGore
-/homeassistant/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
-/tests/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
+/homeassistant/components/meteo_france/ @hacf-fr/reviewers @oncleben31 @Quentame
+/tests/components/meteo_france/ @hacf-fr/reviewers @oncleben31 @Quentame
 /homeassistant/components/meteo_lt/ @xE1H
 /tests/components/meteo_lt/ @xE1H
 /homeassistant/components/meteoalarm/ @rolfberkenbosch
@@ -1146,8 +1150,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/netatmo/ @cgtobi
 /tests/components/netatmo/ @cgtobi
 /homeassistant/components/netdata/ @fabaff
-/homeassistant/components/netgear/ @hacf-fr @Quentame @starkillerOG
-/tests/components/netgear/ @hacf-fr @Quentame @starkillerOG
+/homeassistant/components/netgear/ @Quentame @starkillerOG
+/tests/components/netgear/ @Quentame @starkillerOG
 /homeassistant/components/netgear_lte/ @tkdrob
 /tests/components/netgear_lte/ @tkdrob
 /homeassistant/components/network/ @home-assistant/core
@@ -1690,8 +1694,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/syncthing/ @zhulik
 /homeassistant/components/syncthru/ @nielstron
 /tests/components/syncthru/ @nielstron
-/homeassistant/components/synology_dsm/ @hacf-fr @Quentame @mib1185
-/tests/components/synology_dsm/ @hacf-fr @Quentame @mib1185
+/homeassistant/components/synology_dsm/ @Quentame @mib1185
+/tests/components/synology_dsm/ @Quentame @mib1185
 /homeassistant/components/synology_srm/ @aerialls
 /homeassistant/components/system_bridge/ @timmo001
 /tests/components/system_bridge/ @timmo001
@@ -1824,6 +1828,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/unifi_access/ @imhotep @RaHehl
 /tests/components/unifi_access/ @imhotep @RaHehl
 /homeassistant/components/unifi_direct/ @tofuSCHNITZEL
+/homeassistant/components/unifi_discovery/ @RaHehl
+/tests/components/unifi_discovery/ @RaHehl
 /homeassistant/components/unifiled/ @florisvdk
 /homeassistant/components/unifiprotect/ @RaHehl
 /tests/components/unifiprotect/ @RaHehl
@@ -1871,8 +1877,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/version/ @ludeeus
 /homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
 /tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
-/homeassistant/components/vicare/ @CFenner
-/tests/components/vicare/ @CFenner
+/homeassistant/components/vicare/ @CFenner @lackas
+/tests/components/vicare/ @CFenner @lackas
 /homeassistant/components/victron_ble/ @rajlaud
 /tests/components/victron_ble/ @rajlaud
 /homeassistant/components/victron_gx/ @tomer-w
--- a/homeassistant/brands/ubiquiti.json
+++ b/homeassistant/brands/ubiquiti.json
@@ -6,6 +6,7 @@
    "unifi",
    "unifi_access",
    "unifi_direct",
+    "unifi_discovery",
    "unifiled",
    "unifiprotect"
  ]
--- a/homeassistant/components/actron_air/quality_scale.yaml
+++ b/homeassistant/components/actron_air/quality_scale.yaml
@@ -54,18 +54,12 @@ rules:
  docs-troubleshooting: done
  docs-use-cases: done
  dynamic-devices: todo
-  entity-category:
-    status: exempt
-    comment: This integration does not use entity categories.
-  entity-device-class:
-    status: exempt
-    comment: This integration does not use entity device classes.
-  entity-disabled-by-default:
-    status: exempt
-    comment: Not required for this integration at this stage.
-  entity-translations: todo
+  entity-category: done
+  entity-device-class: todo
+  entity-disabled-by-default: todo
+  entity-translations: done
  exception-translations: done
-  icon-translations: todo
+  icon-translations: done
  reconfiguration-flow: todo
  repair-issues:
    status: exempt
--- a/homeassistant/components/alexa_devices/coordinator.py
+++ b/homeassistant/components/alexa_devices/coordinator.py
@@ -54,7 +54,16 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
            entry.data[CONF_PASSWORD],
            entry.data[CONF_LOGIN_DATA],
        )
-        self.previous_devices: set[str] = set()
+        device_registry = dr.async_get(hass)
+        self.previous_devices: set[str] = {
+            identifier
+            for device in device_registry.devices.get_devices_for_config_entry_id(
+                entry.entry_id
+            )
+            if device.entry_type != dr.DeviceEntryType.SERVICE
+            for identifier_domain, identifier in device.identifiers
+            if identifier_domain == DOMAIN
+        }

    async def _async_update_data(self) -> dict[str, AmazonDevice]:
        """Update device data."""
--- a/homeassistant/components/alexa_devices/manifest.json
+++ b/homeassistant/components/alexa_devices/manifest.json
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
  "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==13.3.2"]
+  "requirements": ["aioamazondevices==13.4.1"]
 }
--- a/homeassistant/components/analytics_insights/strings.json
+++ b/homeassistant/components/analytics_insights/strings.json
@@ -11,12 +11,12 @@
      "user": {
        "data": {
          "tracked_apps": "Apps",
-          "tracked_custom_integrations": "Community integrations",
+          "tracked_custom_integrations": "Custom integrations",
          "tracked_integrations": "Integrations"
        },
        "data_description": {
          "tracked_apps": "Select the apps you want to track",
-          "tracked_custom_integrations": "Select the community integrations you want to track",
+          "tracked_custom_integrations": "Select the custom integrations you want to track",
          "tracked_integrations": "Select the integrations you want to track"
        }
      }
@@ -31,7 +31,7 @@
        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
      },
      "custom_integrations": {
-        "name": "{custom_integration_domain} (community)",
+        "name": "{custom_integration_domain} (custom)",
        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
      },
      "total_active_installations": {
--- a/homeassistant/components/anthropic/config_flow.py
+++ b/homeassistant/components/anthropic/config_flow.py
@@ -105,22 +105,6 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
    await client.models.list(timeout=10.0)


-async def get_model_list(client: anthropic.AsyncAnthropic) -> list[SelectOptionDict]:
-    """Get list of available models."""
-    try:
-        models = (await client.models.list()).data
-    except anthropic.AnthropicError:
-        models = []
-    _LOGGER.debug("Available models: %s", models)
-    return [
-        SelectOptionDict(
-            label=model_info.display_name,
-            value=model_alias(model_info.id),
-        )
-        for model_info in models
-    ]
-
-
 class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Anthropic."""

@@ -217,6 +201,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
    """Flow for managing conversation subentries."""

    options: dict[str, Any]
+    model_info: anthropic.types.ModelInfo

    @property
    def _is_new(self) -> bool:
@@ -330,15 +315,14 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
    ) -> SubentryFlowResult:
        """Manage advanced options."""
        errors: dict[str, str] = {}
+        description_placeholders: dict[str, str] = {}

        step_schema: VolDictType = {
            vol.Optional(
                CONF_CHAT_MODEL,
                default=DEFAULT[CONF_CHAT_MODEL],
            ): SelectSelector(
-                SelectSelectorConfig(
-                    options=await self._get_model_list(), custom_value=True
-                )
+                SelectSelectorConfig(options=self._get_model_list(), custom_value=True)
            ),
            vol.Optional(
                CONF_MAX_TOKENS,
@@ -363,6 +347,25 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
        if user_input is not None:
            self.options.update(user_input)

+            coordinator = self._get_entry().runtime_data
+            self.model_info, status = coordinator.get_model_info(
+                self.options[CONF_CHAT_MODEL]
+            )
+            if not status:
+                # Couldn't find the model in the cached list, try to fetch it directly
+                client = coordinator.client
+                try:
+                    self.model_info = await client.models.retrieve(
+                        self.options[CONF_CHAT_MODEL], timeout=10.0
+                    )
+                except anthropic.NotFoundError:
+                    errors[CONF_CHAT_MODEL] = "model_not_found"
+                except anthropic.AnthropicError as err:
+                    errors[CONF_CHAT_MODEL] = "api_error"
+                    description_placeholders["message"] = (
+                        err.message if isinstance(err, anthropic.APIError) else str(err)
+                    )
+
            if not errors:
                return await self.async_step_model()

@@ -372,6 +375,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
                vol.Schema(step_schema), self.options
            ),
            errors=errors,
+            description_placeholders=description_placeholders,
        )

    async def async_step_model(
@@ -501,13 +505,16 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
            last_step=True,
        )

-    async def _get_model_list(self) -> list[SelectOptionDict]:
+    def _get_model_list(self) -> list[SelectOptionDict]:
        """Get list of available models."""
-        client = anthropic.AsyncAnthropic(
-            api_key=self._get_entry().data[CONF_API_KEY],
-            http_client=get_async_client(self.hass),
-        )
-        return await get_model_list(client)
+        coordinator = self._get_entry().runtime_data
+        return [
+            SelectOptionDict(
+                label=model_info.display_name,
+                value=model_alias(model_info.id),
+            )
+            for model_info in coordinator.data or []
+        ]

    async def _get_location_data(self) -> dict[str, str]:
        """Get approximate location data of the user."""
--- a/homeassistant/components/anthropic/coordinator.py
+++ b/homeassistant/components/anthropic/coordinator.py
@@ -95,21 +95,21 @@ class AnthropicCoordinator(DataUpdateCoordinator[list[anthropic.types.ModelInfo]
                self._schedule_refresh()

    @callback
-    def get_model_info(self, model_id: str) -> anthropic.types.ModelInfo:
+    def get_model_info(self, model_id: str) -> tuple[anthropic.types.ModelInfo, bool]:
        """Get model info for a given model ID."""
        # First try: exact name match
        for model in self.data or []:
            if model.id == model_id:
-                return model
+                return model, True
        # Second try: match by alias
        alias = model_alias(model_id)
        for model in self.data or []:
            if model_alias(model.id) == alias:
-                return model
+                return model, True
        # Model not found, return safe defaults
        return anthropic.types.ModelInfo(
            type="model",
            id=model_id,
            created_at=datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC),
-            display_name=model_id,
-        )
+            display_name=alias,
+        ), False
--- a/homeassistant/components/anthropic/entity.py
+++ b/homeassistant/components/anthropic/entity.py
@@ -690,7 +690,7 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
        self.entry = entry
        self.subentry = subentry
        coordinator = entry.runtime_data
-        self.model_info = coordinator.get_model_info(
+        self.model_info, _ = coordinator.get_model_info(
            subentry.data.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])
        )
        self._attr_unique_id = subentry.subentry_id
--- a/homeassistant/components/anthropic/quality_scale.yaml
+++ b/homeassistant/components/anthropic/quality_scale.yaml
@@ -81,7 +81,10 @@ rules:
    status: exempt
    comment: |
      No entities disabled by default.
-  entity-translations: todo
+  entity-translations:
+    status: exempt
+    comment: |
+      Entities explicitly set `_attr_name` to `None`, so entity name translations are not used.
  exception-translations: done
  icon-translations: done
  reconfiguration-flow: done
--- a/homeassistant/components/anthropic/repairs.py
+++ b/homeassistant/components/anthropic/repairs.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from collections.abc import Iterator
 from typing import TYPE_CHECKING

+import anthropic
 import voluptuous as vol

 from homeassistant import data_entry_flow
@@ -18,8 +19,8 @@ from homeassistant.helpers.selector import (
    SelectSelectorConfig,
 )

-from .config_flow import get_model_list
 from .const import CONF_CHAT_MODEL, DEPRECATED_MODELS, DOMAIN
+from .coordinator import model_alias

 if TYPE_CHECKING:
    from . import AnthropicConfigEntry
@@ -61,7 +62,7 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            client = entry.runtime_data.client
            model_list = [
                model_option
-                for model_option in await get_model_list(client)
+                for model_option in await self.get_model_list(client)
                if not model_option["value"].startswith(tuple(DEPRECATED_MODELS))
            ]
            self._model_list_cache[entry.entry_id] = model_list
@@ -107,6 +108,22 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            },
        )

+    async def get_model_list(
+        self, client: anthropic.AsyncAnthropic
+    ) -> list[SelectOptionDict]:
+        """Get list of available models."""
+        try:
+            models = (await client.models.list(timeout=10.0)).data
+        except anthropic.AnthropicError:
+            models = []
+        return [
+            SelectOptionDict(
+                label=model_info.display_name,
+                value=model_alias(model_info.id),
+            )
+            for model_info in models
+        ]
+
    def _iter_deprecated_subentries(self) -> Iterator[tuple[str, str]]:
        """Yield entry/subentry pairs that use deprecated models."""
        for entry in self.hass.config_entries.async_entries(DOMAIN):
--- a/homeassistant/components/anthropic/strings.json
+++ b/homeassistant/components/anthropic/strings.json
@@ -38,6 +38,10 @@
        "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
      },
      "entry_type": "AI task",
+      "error": {
+        "api_error": "[%key:component::anthropic::config_subentries::conversation::error::api_error%]",
+        "model_not_found": "[%key:component::anthropic::config_subentries::conversation::error::model_not_found%]"
+      },
      "initiate_flow": {
        "reconfigure": "Reconfigure AI task",
        "user": "Add AI task"
@@ -98,6 +102,10 @@
        "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
      },
      "entry_type": "Conversation agent",
+      "error": {
+        "api_error": "Unable to get model info: {message}",
+        "model_not_found": "Model not found"
+      },
      "initiate_flow": {
        "reconfigure": "Reconfigure conversation agent",
        "user": "Add conversation agent"
--- a/homeassistant/components/apple_tv/binary_sensor.py
+++ b/homeassistant/components/apple_tv/binary_sensor.py
@@ -14,6 +14,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from . import SIGNAL_CONNECTED, AppleTvConfigEntry
 from .entity import AppleTVEntity

+PARALLEL_UPDATES = 0
+

 async def async_setup_entry(
    hass: HomeAssistant,
--- a/homeassistant/components/aurora_abb_powerone/config_flow.py
+++ b/homeassistant/components/aurora_abb_powerone/config_flow.py
@@ -7,9 +7,9 @@ import logging
 from typing import TYPE_CHECKING, Any

 from aurorapy.client import AuroraError, AuroraSerialClient
-import serial.tools.list_ports
 import voluptuous as vol

+from homeassistant.components import usb
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_ADDRESS, CONF_PORT
 from homeassistant.core import HomeAssistant
@@ -57,9 +57,11 @@ def validate_and_connect(
    return ret


-def scan_comports() -> tuple[list[str] | None, str | None]:
+async def async_scan_comports(
+    hass: HomeAssistant,
+) -> tuple[list[str] | None, str | None]:
    """Find and store available com ports for the GUI dropdown."""
-    com_ports = serial.tools.list_ports.comports(include_links=True)
+    com_ports = await usb.async_scan_serial_ports(hass)
    com_ports_list = []
    for port in com_ports:
        com_ports_list.append(port.device)
@@ -87,7 +89,7 @@ class AuroraABBConfigFlow(ConfigFlow, domain=DOMAIN):

        errors = {}
        if self._com_ports_list is None:
-            result = await self.hass.async_add_executor_job(scan_comports)
+            result = await async_scan_comports(self.hass)
            self._com_ports_list, self._default_com_port = result
            if self._default_com_port is None:
                return self.async_abort(reason="no_serial_ports")
--- a/homeassistant/components/aurora_abb_powerone/manifest.json
+++ b/homeassistant/components/aurora_abb_powerone/manifest.json
@@ -3,6 +3,7 @@
  "name": "Aurora ABB PowerOne Solar PV",
  "codeowners": ["@davet2001"],
  "config_flow": true,
+  "dependencies": ["usb"],
  "documentation": "https://www.home-assistant.io/integrations/aurora_abb_powerone",
  "integration_type": "device",
  "iot_class": "local_polling",
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -143,6 +143,7 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
    "occupancy",
    "person",
    "power",
+    "remote",
    "schedule",
    "select",
    "siren",
@@ -150,6 +151,8 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
    "temperature",
    "text",
    "timer",
+    "todo",
+    "update",
    "vacuum",
    "valve",
    "water_heater",
--- a/homeassistant/components/autoskope/init.py
+++ b/homeassistant/components/autoskope/init.py
@@ -8,7 +8,7 @@ from autoskope_client.models import CannotConnect, InvalidAuth

 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_create_clientsession

 from .const import DEFAULT_HOST
@@ -31,8 +31,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AutoskopeConfigEntry) ->
    try:
        await api.connect()
    except InvalidAuth as err:
-        # Raise ConfigEntryError until reauth flow is implemented (then ConfigEntryAuthFailed)
-        raise ConfigEntryError(
+        raise ConfigEntryAuthFailed(
            "Authentication failed, please check credentials"
        ) from err
    except CannotConnect as err:
--- a/homeassistant/components/autoskope/config_flow.py
+++ b/homeassistant/components/autoskope/config_flow.py
@@ -2,6 +2,7 @@

 from __future__ import annotations

+from collections.abc import Mapping
 from typing import Any

 from autoskope_client.api import AutoskopeApi
@@ -39,12 +40,39 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
    }
 )

+STEP_REAUTH_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_PASSWORD): TextSelector(
+            TextSelectorConfig(type=TextSelectorType.PASSWORD)
+        ),
+    }
+)
+

 class AutoskopeConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Autoskope."""

    VERSION = 1

+    async def _async_validate_credentials(
+        self, host: str, username: str, password: str, errors: dict[str, str]
+    ) -> bool:
+        """Validate credentials against the Autoskope API."""
+        try:
+            async with AutoskopeApi(
+                host=host,
+                username=username,
+                password=password,
+            ):
+                pass
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        except InvalidAuth:
+            errors["base"] = "invalid_auth"
+        else:
+            return True
+        return False
+
    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
@@ -63,18 +91,9 @@ class AutoskopeConfigFlow(ConfigFlow, domain=DOMAIN):
                await self.async_set_unique_id(f"{username}@{host}")
                self._abort_if_unique_id_configured()

-                try:
-                    async with AutoskopeApi(
-                        host=host,
-                        username=username,
-                        password=user_input[CONF_PASSWORD],
-                    ):
-                        pass
-                except CannotConnect:
-                    errors["base"] = "cannot_connect"
-                except InvalidAuth:
-                    errors["base"] = "invalid_auth"
-                else:
+                if await self._async_validate_credentials(
+                    host, username, user_input[CONF_PASSWORD], errors
+                ):
                    return self.async_create_entry(
                        title=f"Autoskope ({username})",
                        data={
@@ -87,3 +106,35 @@ class AutoskopeConfigFlow(ConfigFlow, domain=DOMAIN):
        return self.async_show_form(
            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
        )
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Handle initiation of re-authentication."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle re-authentication with new credentials."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            reauth_entry = self._get_reauth_entry()
+
+            if await self._async_validate_credentials(
+                reauth_entry.data[CONF_HOST],
+                reauth_entry.data[CONF_USERNAME],
+                user_input[CONF_PASSWORD],
+                errors,
+            ):
+                return self.async_update_reload_and_abort(
+                    reauth_entry,
+                    data_updates={CONF_PASSWORD: user_input[CONF_PASSWORD]},
+                )
+
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            data_schema=STEP_REAUTH_DATA_SCHEMA,
+            errors=errors,
+        )
--- a/homeassistant/components/autoskope/quality_scale.yaml
+++ b/homeassistant/components/autoskope/quality_scale.yaml
@@ -39,10 +39,7 @@ rules:
  integration-owner: done
  log-when-unavailable: todo
  parallel-updates: done
-  reauthentication-flow:
-    status: todo
-    comment: |
-      Reauthentication flow removed for initial PR, will be added in follow-up.
+  reauthentication-flow: done
  test-coverage: done
  # Gold
  devices: done
--- a/homeassistant/components/autoskope/strings.json
+++ b/homeassistant/components/autoskope/strings.json
@@ -1,7 +1,8 @@
 {
  "config": {
    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -10,6 +11,15 @@
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "step": {
+      "reauth_confirm": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "The new password for your Autoskope account."
+        },
+        "description": "Please re-enter your password for your Autoskope account."
+      },
      "user": {
        "data": {
          "password": "[%key:common::config_flow::data::password%]",
--- a/homeassistant/components/backblaze_b2/backup.py
+++ b/homeassistant/components/backblaze_b2/backup.py
@@ -101,8 +101,7 @@ def handle_b2_errors[T](
        try:
            return await func(*args, **kwargs)
        except B2Error as err:
-            error_msg = f"Failed during {func.__name__}"
-            raise BackupAgentError(error_msg) from err
+            raise BackupAgentError(f"Failed during {func.__name__}: {err}") from err

    return wrapper

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

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

    def _upload_metadata_file_sync(
        self, metadata_content: bytes, filename: str
--- a/homeassistant/components/bmw_connected_drive/strings.json
+++ b/homeassistant/components/bmw_connected_drive/strings.json
@@ -1,7 +1,7 @@
 {
  "issues": {
    "integration_removed": {
-      "description": "The BMW Connected Drive integration has been removed from Home Assistant.\n\nIn September 2025, BMW blocked third-party access to their servers by adding additional security measures. For EU-registered cars, a [community integration]({custom_component_url}) using BMW's CarData API is available as an alternative.\n\nTo resolve this issue, please remove the (now defunct) integration entries from your Home Assistant setup. [Click here to see your existing BMW Connected Drive integration entries]({entries}).",
+      "description": "The BMW Connected Drive integration has been removed from Home Assistant.\n\nIn September 2025, BMW blocked third-party access to their servers by adding additional security measures. For EU-registered cars, a community-developed [custom component]({custom_component_url}) using BMW's CarData API is available as an alternative.\n\nTo resolve this issue, please remove the (now defunct) integration entries from your Home Assistant setup. [Click here to see your existing BMW Connected Drive integration entries]({entries}).",
      "title": "The BMW Connected Drive integration has been removed"
    }
  }
--- a/homeassistant/components/bond/button.py
+++ b/homeassistant/components/bond/button.py
@@ -260,6 +260,14 @@ BUTTONS: tuple[BondButtonEntityDescription, ...] = (
    ),
 )

+PRESET_BUTTON = BondButtonEntityDescription(
+    key=Action.PRESET,
+    name="Preset",
+    translation_key="preset",
+    mutually_exclusive=None,
+    argument=None,
+)
+

 async def async_setup_entry(
    hass: HomeAssistant,
@@ -285,6 +293,8 @@ async def async_setup_entry(
            # we only add the stop action button if we add actions
            # since its not so useful if there are no actions to stop
            device_entities.append(BondButtonEntity(data, device, STOP_BUTTON))
+        if device.has_action(PRESET_BUTTON.key):
+            device_entities.append(BondButtonEntity(data, device, PRESET_BUTTON))
        entities.extend(device_entities)

    async_add_entities(entities)
--- a/homeassistant/components/bsblan/manifest.json
+++ b/homeassistant/components/bsblan/manifest.json
@@ -8,7 +8,7 @@
  "iot_class": "local_polling",
  "loggers": ["bsblan"],
  "quality_scale": "silver",
-  "requirements": ["python-bsblan==5.1.3"],
+  "requirements": ["python-bsblan==5.1.4"],
  "zeroconf": [
    {
      "name": "bsb-lan*",
--- a/homeassistant/components/chess_com/config_flow.py
+++ b/homeassistant/components/chess_com/config_flow.py
@@ -39,7 +39,9 @@ class ChessConfigFlow(ConfigFlow, domain=DOMAIN):
            else:
                await self.async_set_unique_id(str(user.player_id))
                self._abort_if_unique_id_configured()
-                return self.async_create_entry(title=user.name, data=user_input)
+                return self.async_create_entry(
+                    title=user.name or user.username, data=user_input
+                )

        return self.async_show_form(
            step_id="user",
--- a/homeassistant/components/comelit/binary_sensor.py
+++ b/homeassistant/components/comelit/binary_sensor.py
@@ -1,15 +1,18 @@
-"""Support for sensors."""
+"""Support for binary sensors."""

 from __future__ import annotations

-from typing import TYPE_CHECKING, cast
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Final, cast

-from aiocomelit.api import ComelitVedoZoneObject
-from aiocomelit.const import ALARM_ZONE, AlarmZoneState
+from aiocomelit.api import ComelitVedoAreaObject, ComelitVedoZoneObject
+from aiocomelit.const import ALARM_AREA, ALARM_ZONE, AlarmAreaState, AlarmZoneState

 from homeassistant.components.binary_sensor import (
    BinarySensorDeviceClass,
    BinarySensorEntity,
+    BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -23,12 +26,68 @@ from .utils import new_device_listener
 PARALLEL_UPDATES = 0


+@dataclass(frozen=True, kw_only=True)
+class ComelitBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Comelit binary sensor entity description."""
+
+    object_type: str
+    is_on_fn: Callable[[ComelitVedoAreaObject | ComelitVedoZoneObject], bool]
+    available_fn: Callable[[ComelitVedoAreaObject | ComelitVedoZoneObject], bool] = (
+        lambda obj: True
+    )
+
+
+BINARY_SENSOR_TYPES: Final[tuple[ComelitBinarySensorEntityDescription, ...]] = (
+    ComelitBinarySensorEntityDescription(
+        key="anomaly",
+        translation_key="anomaly",
+        object_type=ALARM_AREA,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        is_on_fn=lambda obj: cast(ComelitVedoAreaObject, obj).anomaly,
+        available_fn=lambda obj: (
+            cast(ComelitVedoAreaObject, obj).human_status != AlarmAreaState.UNKNOWN
+        ),
+    ),
+    ComelitBinarySensorEntityDescription(
+        key="presence",
+        translation_key="motion",
+        object_type=ALARM_ZONE,
+        device_class=BinarySensorDeviceClass.MOTION,
+        is_on_fn=lambda obj: cast(ComelitVedoZoneObject, obj).status_api == "0001",
+        available_fn=lambda obj: (
+            cast(ComelitVedoZoneObject, obj).human_status
+            not in {
+                AlarmZoneState.FAULTY,
+                AlarmZoneState.UNAVAILABLE,
+                AlarmZoneState.UNKNOWN,
+            }
+        ),
+    ),
+    ComelitBinarySensorEntityDescription(
+        key="faulty",
+        translation_key="faulty",
+        object_type=ALARM_ZONE,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        is_on_fn=lambda obj: (
+            cast(ComelitVedoZoneObject, obj).human_status == AlarmZoneState.FAULTY
+        ),
+        available_fn=lambda obj: (
+            cast(ComelitVedoZoneObject, obj).human_status
+            not in {
+                AlarmZoneState.UNAVAILABLE,
+                AlarmZoneState.UNKNOWN,
+            }
+        ),
+    ),
+)
+
+
 async def async_setup_entry(
    hass: HomeAssistant,
    config_entry: ComelitConfigEntry,
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Set up Comelit VEDO presence sensors."""
+    """Set up Comelit VEDO binary sensors."""

    coordinator = config_entry.runtime_data
    is_bridge = isinstance(coordinator, ComelitSerialBridge)
@@ -42,13 +101,23 @@ async def async_setup_entry(
    def _add_new_entities(new_devices: list[ObjectClassType], dev_type: str) -> None:
        """Add entities for new monitors."""
        entities = [
-            ComelitVedoBinarySensorEntity(coordinator, device, config_entry.entry_id)
+            ComelitVedoBinarySensorEntity(
+                coordinator,
+                device,
+                config_entry.entry_id,
+                description,
+            )
+            for description in BINARY_SENSOR_TYPES
            for device in coordinator.data[dev_type].values()
+            if description.object_type == dev_type
            if device in new_devices
        ]
        if entities:
            async_add_entities(entities)

+    config_entry.async_on_unload(
+        new_device_listener(coordinator, _add_new_entities, ALARM_AREA)
+    )
    config_entry.async_on_unload(
        new_device_listener(coordinator, _add_new_entities, ALARM_ZONE)
    )
@@ -59,42 +128,47 @@ class ComelitVedoBinarySensorEntity(
 ):
    """Sensor device."""

+    entity_description: ComelitBinarySensorEntityDescription
+
    _attr_has_entity_name = True
-    _attr_device_class = BinarySensorDeviceClass.MOTION

    def __init__(
        self,
        coordinator: ComelitVedoSystem | ComelitSerialBridge,
-        zone: ComelitVedoZoneObject,
+        object_data: ComelitVedoAreaObject | ComelitVedoZoneObject,
        config_entry_entry_id: str,
+        description: ComelitBinarySensorEntityDescription,
    ) -> None:
        """Init sensor entity."""
-        self._zone_index = zone.index
+        self.entity_description = description
+        self._object_index = object_data.index
+        self._object_type = description.object_type
        super().__init__(coordinator)
        # Use config_entry.entry_id as base for unique_id
        # because no serial number or mac is available
-        self._attr_unique_id = f"{config_entry_entry_id}-presence-{zone.index}"
-        self._attr_device_info = coordinator.platform_device_info(zone, "zone")
+        self._attr_unique_id = (
+            f"{config_entry_entry_id}-{description.key}-{self._object_index}"
+        )
+        self._attr_device_info = coordinator.platform_device_info(
+            object_data, "area" if self._object_type == ALARM_AREA else "zone"
+        )

    @property
-    def _zone(self) -> ComelitVedoZoneObject:
-        """Return zone object."""
+    def _object(self) -> ComelitVedoAreaObject | ComelitVedoZoneObject:
+        """Return alarm object."""
        return cast(
-            ComelitVedoZoneObject, self.coordinator.data[ALARM_ZONE][self._zone_index]
+            ComelitVedoAreaObject | ComelitVedoZoneObject,
+            self.coordinator.data[self._object_type][self._object_index],
        )

    @property
    def available(self) -> bool:
-        """Return True if alarm is available."""
-        if self._zone.human_status in [
-            AlarmZoneState.FAULTY,
-            AlarmZoneState.UNAVAILABLE,
-            AlarmZoneState.UNKNOWN,
-        ]:
+        """Return True if object is available."""
+        if not self.entity_description.available_fn(self._object):
            return False
        return super().available

    @property
    def is_on(self) -> bool:
-        """Presence detected."""
-        return self._zone.status_api == "0001"
+        """Return object binary sensor state."""
+        return self.entity_description.is_on_fn(self._object)
--- a/homeassistant/components/comelit/coordinator.py
+++ b/homeassistant/components/comelit/coordinator.py
@@ -65,6 +65,7 @@ class ComelitBaseCoordinator(DataUpdateCoordinator[T]):
        )
        device_registry = dr.async_get(self.hass)
        device_registry.async_get_or_create(
+            configuration_url=self.api.base_url,
            config_entry_id=entry.entry_id,
            identifiers={(DOMAIN, entry.entry_id)},
            model=device,
--- a/homeassistant/components/comelit/strings.json
+++ b/homeassistant/components/comelit/strings.json
@@ -64,6 +64,17 @@
    }
  },
  "entity": {
+    "binary_sensor": {
+      "anomaly": {
+        "name": "Anomaly"
+      },
+      "faulty": {
+        "name": "Faulty"
+      },
+      "motion": {
+        "name": "Motion"
+      }
+    },
    "climate": {
      "thermostat": {
        "state_attributes": {
--- a/homeassistant/components/crownstone/config_flow.py
+++ b/homeassistant/components/crownstone/config_flow.py
@@ -10,8 +10,6 @@ from crownstone_cloud.exceptions import (
    CrownstoneAuthenticationError,
    CrownstoneUnknownError,
 )
-import serial.tools.list_ports
-from serial.tools.list_ports_common import ListPortInfo
 import voluptuous as vol

 from homeassistant.components import usb
@@ -61,9 +59,11 @@ class BaseCrownstoneFlowHandler(ConfigEntryBaseFlow):
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
        """Set up a Crownstone USB dongle."""
-        list_of_ports = await self.hass.async_add_executor_job(
-            serial.tools.list_ports.comports
-        )
+        list_of_ports = [
+            p
+            for p in await usb.async_scan_serial_ports(self.hass)
+            if isinstance(p, usb.USBDevice)
+        ]
        if self.flow_type == CONFIG_FLOW:
            ports_as_string = list_ports_as_str(list_of_ports)
        else:
@@ -82,10 +82,8 @@ class BaseCrownstoneFlowHandler(ConfigEntryBaseFlow):
                else:
                    index = ports_as_string.index(selection) - 1

-                selected_port: ListPortInfo = list_of_ports[index]
-                self.usb_path = await self.hass.async_add_executor_job(
-                    usb.get_serial_by_id, selected_port.device
-                )
+                selected_port = list_of_ports[index]
+                self.usb_path = selected_port.device
                return await self.async_step_usb_sphere_config()

        return self.async_show_form(
--- a/homeassistant/components/crownstone/helpers.py
+++ b/homeassistant/components/crownstone/helpers.py
@@ -5,15 +5,14 @@ from __future__ import annotations
 from collections.abc import Sequence
 import os

-from serial.tools.list_ports_common import ListPortInfo
-
 from homeassistant.components import usb
+from homeassistant.components.usb import USBDevice

 from .const import DONT_USE_USB, MANUAL_PATH, REFRESH_LIST


 def list_ports_as_str(
-    serial_ports: Sequence[ListPortInfo], no_usb_option: bool = True
+    serial_ports: Sequence[USBDevice], no_usb_option: bool = True
 ) -> list[str]:
    """Represent currently available serial ports as string.

@@ -31,8 +30,8 @@ def list_ports_as_str(
            port.serial_number,
            port.manufacturer,
            port.description,
-            f"{hex(port.vid)[2:]:0>4}".upper() if port.vid else None,
-            f"{hex(port.pid)[2:]:0>4}".upper() if port.pid else None,
+            port.vid,
+            port.pid,
        )
        for port in serial_ports
    )
--- a/homeassistant/components/crownstone/manifest.json
+++ b/homeassistant/components/crownstone/manifest.json
@@ -1,9 +1,9 @@
 {
  "domain": "crownstone",
  "name": "Crownstone",
-  "after_dependencies": ["usb"],
  "codeowners": ["@Crownstone", "@RicArch97"],
  "config_flow": true,
+  "dependencies": ["usb"],
  "documentation": "https://www.home-assistant.io/integrations/crownstone",
  "iot_class": "cloud_push",
  "loggers": [
@@ -15,7 +15,6 @@
  "requirements": [
    "crownstone-cloud==1.4.11",
    "crownstone-sse==2.0.5",
-    "crownstone-uart==2.1.0",
-    "pyserial==3.5"
+    "crownstone-uart==2.1.0"
  ]
 }
--- a/homeassistant/components/doods/manifest.json
+++ b/homeassistant/components/doods/manifest.json
@@ -6,5 +6,5 @@
  "iot_class": "local_polling",
  "loggers": ["pydoods"],
  "quality_scale": "legacy",
-  "requirements": ["pydoods==1.0.2", "Pillow==12.1.1"]
+  "requirements": ["pydoods==1.0.2", "Pillow==12.2.0"]
 }
--- a/homeassistant/components/dsmr/config_flow.py
+++ b/homeassistant/components/dsmr/config_flow.py
@@ -4,7 +4,6 @@ from __future__ import annotations

 import asyncio
 from functools import partial
-import os
 from typing import Any

 from dsmr_parser import obis_references as obis_ref
@@ -15,9 +14,9 @@ from dsmr_parser.clients.rfxtrx_protocol import (
 )
 from dsmr_parser.objects import DSMRObject
 import serial
-import serial.tools.list_ports
 import voluptuous as vol

+from homeassistant.components import usb
 from homeassistant.config_entries import (
    ConfigEntry,
    ConfigFlow,
@@ -229,9 +228,7 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
                self._dsmr_version = user_input[CONF_DSMR_VERSION]
                return await self.async_step_setup_serial_manual_path()

-            dev_path = await self.hass.async_add_executor_job(
-                get_serial_by_id, user_selection
-            )
+            dev_path = user_selection

            validate_data = {
                CONF_PORT: dev_path,
@@ -242,9 +239,10 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
            if not errors:
                return self.async_create_entry(title=data[CONF_PORT], data=data)

-        ports = await self.hass.async_add_executor_job(serial.tools.list_ports.comports)
+        ports = await usb.async_scan_serial_ports(self.hass)
        list_of_ports = {
-            port.device: f"{port}, s/n: {port.serial_number or 'n/a'}"
+            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
        }
@@ -335,18 +333,6 @@ class DSMROptionFlowHandler(OptionsFlow):
        )


-def get_serial_by_id(dev_path: str) -> str:
-    """Return a /dev/serial/by-id match for given device if available."""
-    by_id = "/dev/serial/by-id"
-    if not os.path.isdir(by_id):
-        return dev_path
-
-    for path in (entry.path for entry in os.scandir(by_id) if entry.is_symlink()):
-        if os.path.realpath(path) == dev_path:
-            return path
-    return dev_path
-
-
 class CannotConnect(HomeAssistantError):
    """Error to indicate we cannot connect."""

--- a/homeassistant/components/dsmr/manifest.json
+++ b/homeassistant/components/dsmr/manifest.json
@@ -3,6 +3,7 @@
  "name": "DSMR Smart Meter",
  "codeowners": ["@Robbie1221"],
  "config_flow": true,
+  "dependencies": ["usb"],
  "documentation": "https://www.home-assistant.io/integrations/dsmr",
  "integration_type": "hub",
  "iot_class": "local_push",
--- a/homeassistant/components/duco/init.py
+++ b/homeassistant/components/duco/init.py
@@ -0,0 +1,34 @@
+"""The Duco integration."""
+
+from __future__ import annotations
+
+from duco import DucoClient
+
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import PLATFORMS
+from .coordinator import DucoConfigEntry, DucoCoordinator
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: DucoConfigEntry) -> bool:
+    """Set up Duco from a config entry."""
+    client = DucoClient(
+        session=async_get_clientsession(hass),
+        host=entry.data[CONF_HOST],
+    )
+
+    coordinator = DucoCoordinator(hass, entry, client)
+    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: DucoConfigEntry) -> bool:
+    """Unload a Duco config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
--- a/homeassistant/components/duco/config_flow.py
+++ b/homeassistant/components/duco/config_flow.py
@@ -0,0 +1,74 @@
+"""Config flow for the Duco integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from duco import DucoClient
+from duco.exceptions import DucoConnectionError, DucoError
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_HOST
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.device_registry import format_mac
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): str,
+    }
+)
+
+
+class DucoConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Config flow for Duco."""
+
+    VERSION = 1
+    MINOR_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:
+            try:
+                box_name, mac = await self._validate_input(user_input[CONF_HOST])
+            except DucoConnectionError:
+                errors["base"] = "cannot_connect"
+            except DucoError:
+                _LOGGER.exception("Unexpected error connecting to Duco box")
+                errors["base"] = "unknown"
+            else:
+                await self.async_set_unique_id(format_mac(mac))
+                self._abort_if_unique_id_configured()
+
+                return self.async_create_entry(
+                    title=box_name,
+                    data={CONF_HOST: user_input[CONF_HOST]},
+                )
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=STEP_USER_SCHEMA,
+            errors=errors,
+        )
+
+    async def _validate_input(self, host: str) -> tuple[str, str]:
+        """Validate the user input by connecting to the Duco box.
+
+        Returns a tuple of (box_name, mac_address).
+        """
+        client = DucoClient(
+            session=async_get_clientsession(self.hass),
+            host=host,
+        )
+        board_info = await client.async_get_board_info()
+        lan_info = await client.async_get_lan_info()
+        return board_info.box_name, lan_info.mac
--- a/homeassistant/components/duco/const.py
+++ b/homeassistant/components/duco/const.py
@@ -0,0 +1,9 @@
+"""Constants for the Duco integration."""
+
+from datetime import timedelta
+
+from homeassistant.const import Platform
+
+DOMAIN = "duco"
+PLATFORMS = [Platform.FAN, Platform.SENSOR]
+SCAN_INTERVAL = timedelta(seconds=30)
--- a/homeassistant/components/duco/coordinator.py
+++ b/homeassistant/components/duco/coordinator.py
@@ -0,0 +1,75 @@
+"""Data update coordinator for the Duco integration."""
+
+from __future__ import annotations
+
+import logging
+
+from duco import DucoClient
+from duco.exceptions import DucoConnectionError, DucoError
+from duco.models import BoardInfo, Node
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryError
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN, SCAN_INTERVAL
+
+_LOGGER = logging.getLogger(__name__)
+
+type DucoConfigEntry = ConfigEntry[DucoCoordinator]
+type DucoData = dict[int, Node]
+
+
+class DucoCoordinator(DataUpdateCoordinator[DucoData]):
+    """Coordinator for the Duco integration."""
+
+    config_entry: DucoConfigEntry
+    board_info: BoardInfo
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: DucoConfigEntry,
+        client: DucoClient,
+    ) -> None:
+        """Initialize the coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
+        self.client = client
+
+    async def _async_setup(self) -> None:
+        """Fetch board info once during initial setup."""
+        try:
+            self.board_info = await self.client.async_get_board_info()
+        except DucoConnectionError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="cannot_connect",
+                translation_placeholders={"error": repr(err)},
+            ) from err
+        except DucoError as err:
+            raise ConfigEntryError(f"Duco API error: {err}") from err
+
+    async def _async_update_data(self) -> DucoData:
+        """Fetch node data from the Duco box."""
+        try:
+            nodes = await self.client.async_get_nodes()
+        except DucoConnectionError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="cannot_connect",
+                translation_placeholders={"error": repr(err)},
+            ) from err
+        except DucoError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="api_error",
+                translation_placeholders={"error": repr(err)},
+            ) from err
+        return {node.node_id: node for node in nodes}
--- a/homeassistant/components/duco/diagnostics.py
+++ b/homeassistant/components/duco/diagnostics.py
@@ -0,0 +1,53 @@
+"""Diagnostics support for Duco."""
+
+from __future__ import annotations
+
+import asyncio
+from dataclasses import asdict
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+
+from .coordinator import DucoConfigEntry
+
+TO_REDACT = {
+    CONF_HOST,
+    "mac",
+    "host_name",
+    "serial_board_box",
+    "serial_board_comm",
+    "serial_duco_box",
+    "serial_duco_comm",
+}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: DucoConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator = entry.runtime_data
+
+    board = asdict(coordinator.board_info)
+    board.pop("time")
+
+    lan_info, duco_diags, write_remaining = await asyncio.gather(
+        coordinator.client.async_get_lan_info(),
+        coordinator.client.async_get_diagnostics(),
+        coordinator.client.async_get_write_req_remaining(),
+    )
+
+    return async_redact_data(
+        {
+            "entry_data": entry.data,
+            "board_info": board,
+            "lan_info": asdict(lan_info),
+            "nodes": {
+                str(node_id): asdict(node) for node_id, node in coordinator.data.items()
+            },
+            "duco_diagnostics": [asdict(d) for d in duco_diags],
+            "write_requests_remaining": write_remaining,
+        },
+        TO_REDACT,
+    )
--- a/homeassistant/components/duco/entity.py
+++ b/homeassistant/components/duco/entity.py
@@ -0,0 +1,52 @@
+"""Base entity for the Duco integration."""
+
+from __future__ import annotations
+
+from duco.models import Node
+
+from homeassistant.const import ATTR_VIA_DEVICE
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import DucoCoordinator
+
+
+class DucoEntity(CoordinatorEntity[DucoCoordinator]):
+    """Base class for Duco entities."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: DucoCoordinator, node: Node) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+        self._node_id = node.node_id
+        mac = coordinator.config_entry.unique_id
+        assert mac is not None
+        device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"{mac}_{node.node_id}")},
+            manufacturer="Duco",
+            model=coordinator.board_info.box_name
+            if node.general.node_type == "BOX"
+            else node.general.node_type,
+            name=node.general.name or f"Node {node.node_id}",
+        )
+        device_info.update(
+            {
+                "connections": {(CONNECTION_NETWORK_MAC, mac)},
+                "serial_number": coordinator.board_info.serial_board_box,
+            }
+            if node.general.node_type == "BOX"
+            else {ATTR_VIA_DEVICE: (DOMAIN, f"{mac}_1")}
+        )
+        self._attr_device_info = device_info
+
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return super().available and self._node_id in self.coordinator.data
+
+    @property
+    def _node(self) -> Node:
+        """Return the current node data from the coordinator."""
+        return self.coordinator.data[self._node_id]
--- a/homeassistant/components/duco/fan.py
+++ b/homeassistant/components/duco/fan.py
@@ -0,0 +1,127 @@
+"""Fan platform for the Duco integration."""
+
+from __future__ import annotations
+
+from duco.exceptions import DucoError
+from duco.models import Node, VentilationState
+
+from homeassistant.components.fan import FanEntity, FanEntityFeature
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util.percentage import percentage_to_ordered_list_item
+
+from .const import DOMAIN
+from .coordinator import DucoConfigEntry, DucoCoordinator
+from .entity import DucoEntity
+
+PARALLEL_UPDATES = 1
+
+# Permanent speed states ordered low → high.
+ORDERED_NAMED_FAN_SPEEDS: list[VentilationState] = [
+    VentilationState.CNT1,
+    VentilationState.CNT2,
+    VentilationState.CNT3,
+]
+
+PRESET_AUTO = "auto"
+
+# Upper-bound percentages for 3 speed levels: 33 / 66 / 100.
+# Using upper bounds guarantees that reading a percentage back and writing it
+# again always round-trips to the same Duco state.
+_SPEED_LEVEL_PERCENTAGES: list[int] = [
+    (i + 1) * 100 // len(ORDERED_NAMED_FAN_SPEEDS)
+    for i in range(len(ORDERED_NAMED_FAN_SPEEDS))
+]
+
+# Maps every active Duco state (including timed MAN variants) to its
+# display percentage so externally-set timed modes show the correct level.
+_STATE_TO_PERCENTAGE: dict[VentilationState, int] = {
+    VentilationState.CNT1: _SPEED_LEVEL_PERCENTAGES[0],
+    VentilationState.MAN1: _SPEED_LEVEL_PERCENTAGES[0],
+    VentilationState.MAN1x2: _SPEED_LEVEL_PERCENTAGES[0],
+    VentilationState.MAN1x3: _SPEED_LEVEL_PERCENTAGES[0],
+    VentilationState.CNT2: _SPEED_LEVEL_PERCENTAGES[1],
+    VentilationState.MAN2: _SPEED_LEVEL_PERCENTAGES[1],
+    VentilationState.MAN2x2: _SPEED_LEVEL_PERCENTAGES[1],
+    VentilationState.MAN2x3: _SPEED_LEVEL_PERCENTAGES[1],
+    VentilationState.CNT3: _SPEED_LEVEL_PERCENTAGES[2],
+    VentilationState.MAN3: _SPEED_LEVEL_PERCENTAGES[2],
+    VentilationState.MAN3x2: _SPEED_LEVEL_PERCENTAGES[2],
+    VentilationState.MAN3x3: _SPEED_LEVEL_PERCENTAGES[2],
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: DucoConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Duco fan entities."""
+    coordinator = entry.runtime_data
+
+    async_add_entities(
+        DucoVentilationFanEntity(coordinator, node)
+        for node in coordinator.data.values()
+        if node.general.node_type == "BOX"
+    )
+
+
+class DucoVentilationFanEntity(DucoEntity, FanEntity):
+    """Fan entity for the ventilation control of a Duco node."""
+
+    _attr_translation_key = "ventilation"
+    _attr_name = None
+    _attr_supported_features = FanEntityFeature.SET_SPEED | FanEntityFeature.PRESET_MODE
+    _attr_preset_modes = [PRESET_AUTO]
+    _attr_speed_count = len(ORDERED_NAMED_FAN_SPEEDS)
+
+    def __init__(self, coordinator: DucoCoordinator, node: Node) -> None:
+        """Initialize the fan entity."""
+        super().__init__(coordinator, node)
+        self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{node.node_id}"
+
+    @property
+    def percentage(self) -> int | None:
+        """Return the current speed as a percentage, or None when in AUTO mode."""
+        node = self._node
+        if node.ventilation is None:
+            return None
+        return _STATE_TO_PERCENTAGE.get(node.ventilation.state)
+
+    @property
+    def preset_mode(self) -> str | None:
+        """Return the current preset mode (auto when Duco controls, else None)."""
+        node = self._node
+        if node.ventilation is None:
+            return None
+        if node.ventilation.state not in _STATE_TO_PERCENTAGE:
+            return PRESET_AUTO
+        return None
+
+    async def async_set_preset_mode(self, preset_mode: str) -> None:
+        """Set preset mode: 'auto' hands control back to Duco."""
+        self._valid_preset_mode_or_raise(preset_mode)
+        await self._async_set_state(VentilationState.AUTO)
+
+    async def async_set_percentage(self, percentage: int) -> None:
+        """Set the fan speed as a percentage (maps to low/medium/high)."""
+        if percentage == 0:
+            await self._async_set_state(VentilationState.AUTO)
+            return
+        state = percentage_to_ordered_list_item(ORDERED_NAMED_FAN_SPEEDS, percentage)
+        await self._async_set_state(state)
+
+    async def _async_set_state(self, state: VentilationState) -> None:
+        """Send the ventilation state to the device and refresh coordinator."""
+        try:
+            await self.coordinator.client.async_set_ventilation_state(
+                self._node_id, state
+            )
+        except DucoError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="failed_to_set_state",
+                translation_placeholders={"error": repr(err)},
+            ) from err
+        await self.coordinator.async_refresh()
--- a/homeassistant/components/duco/icons.json
+++ b/homeassistant/components/duco/icons.json
@@ -0,0 +1,15 @@
+{
+  "entity": {
+    "sensor": {
+      "iaq_co2": {
+        "default": "mdi:molecule-co2"
+      },
+      "iaq_rh": {
+        "default": "mdi:water-percent"
+      },
+      "ventilation_state": {
+        "default": "mdi:tune-variant"
+      }
+    }
+  }
+}
--- a/homeassistant/components/duco/manifest.json
+++ b/homeassistant/components/duco/manifest.json
@@ -0,0 +1,12 @@
+{
+  "domain": "duco",
+  "name": "Duco",
+  "codeowners": ["@ronaldvdmeer"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/duco",
+  "integration_type": "hub",
+  "iot_class": "local_polling",
+  "loggers": ["duco"],
+  "quality_scale": "bronze",
+  "requirements": ["python-duco-client==0.3.0"]
+}
--- a/homeassistant/components/duco/quality_scale.yaml
+++ b/homeassistant/components/duco/quality_scale.yaml
@@ -0,0 +1,89 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration does not provide service actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: Integration does not provide service actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: Integration uses a coordinator; entities do not subscribe to events directly.
+  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: done
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: Integration does not provide an option flow.
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable:
+    status: done
+    comment: Handled by the DataUpdateCoordinator.
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: Integration uses a local API that requires no credentials.
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info:
+    status: todo
+    comment: >-
+      DHCP host updating to be implemented in a follow-up PR.
+      The device hostname follows the pattern duco_<last 6 chars of MAC>
+      (e.g. duco_061293), which can be used for DHCP hostname matching.
+  discovery:
+    status: todo
+    comment: >-
+      Device can be discovered via DHCP. The hostname follows the pattern
+      duco_<last 6 chars of MAC> (e.g. duco_061293). To be implemented
+      in a follow-up PR together with discovery-update-info.
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: todo
+    comment: >-
+      Users can pair new modules (CO2 sensors, humidity sensors, zone valves)
+      to their Duco box. Dynamic device support to be added in a follow-up PR.
+  entity-category: todo
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices:
+    status: todo
+    comment: >-
+      To be implemented together with dynamic device support in a follow-up PR.
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: todo
--- a/homeassistant/components/duco/sensor.py
+++ b/homeassistant/components/duco/sensor.py
@@ -0,0 +1,119 @@
+"""Sensor platform for the Duco integration."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from duco.models import Node, NodeType, VentilationState
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.const import CONCENTRATION_PARTS_PER_MILLION, PERCENTAGE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import DucoConfigEntry, DucoCoordinator
+from .entity import DucoEntity
+
+PARALLEL_UPDATES = 0
+
+
+@dataclass(frozen=True, kw_only=True)
+class DucoSensorEntityDescription(SensorEntityDescription):
+    """Duco sensor entity description."""
+
+    value_fn: Callable[[Node], int | float | str | None]
+    node_types: tuple[NodeType, ...]
+
+
+SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
+    DucoSensorEntityDescription(
+        key="ventilation_state",
+        translation_key="ventilation_state",
+        device_class=SensorDeviceClass.ENUM,
+        options=[s.lower() for s in VentilationState],
+        value_fn=lambda node: (
+            node.ventilation.state.lower() if node.ventilation else None
+        ),
+        node_types=(NodeType.BOX,),
+    ),
+    DucoSensorEntityDescription(
+        key="co2",
+        device_class=SensorDeviceClass.CO2,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        value_fn=lambda node: node.sensor.co2 if node.sensor else None,
+        node_types=(NodeType.UCCO2,),
+    ),
+    DucoSensorEntityDescription(
+        key="iaq_co2",
+        translation_key="iaq_co2",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        value_fn=lambda node: node.sensor.iaq_co2 if node.sensor else None,
+        node_types=(NodeType.UCCO2,),
+    ),
+    DucoSensorEntityDescription(
+        key="humidity",
+        device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda node: node.sensor.rh if node.sensor else None,
+        node_types=(NodeType.BSRH,),
+    ),
+    DucoSensorEntityDescription(
+        key="iaq_rh",
+        translation_key="iaq_rh",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        value_fn=lambda node: node.sensor.iaq_rh if node.sensor else None,
+        node_types=(NodeType.BSRH,),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: DucoConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Duco sensor entities."""
+    coordinator = entry.runtime_data
+
+    async_add_entities(
+        DucoSensorEntity(coordinator, node, description)
+        for node in coordinator.data.values()
+        for description in SENSOR_DESCRIPTIONS
+        if node.general.node_type in description.node_types
+    )
+
+
+class DucoSensorEntity(DucoEntity, SensorEntity):
+    """Sensor entity for a Duco node."""
+
+    entity_description: DucoSensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: DucoCoordinator,
+        node: Node,
+        description: DucoSensorEntityDescription,
+    ) -> None:
+        """Initialize the sensor entity."""
+        super().__init__(coordinator, node)
+        self.entity_description = description
+        self._attr_unique_id = (
+            f"{coordinator.config_entry.unique_id}_{node.node_id}_{description.key}"
+        )
+
+    @property
+    def native_value(self) -> int | float | str | None:
+        """Return the sensor value."""
+        return self.entity_description.value_fn(self._node)
--- a/homeassistant/components/duco/strings.json
+++ b/homeassistant/components/duco/strings.json
@@ -0,0 +1,75 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "IP address or hostname of your Duco ventilation box."
+        }
+      }
+    }
+  },
+  "entity": {
+    "fan": {
+      "ventilation": {
+        "state_attributes": {
+          "preset_mode": {
+            "state": {
+              "auto": "[%key:common::state::auto%]"
+            }
+          }
+        }
+      }
+    },
+    "sensor": {
+      "iaq_co2": {
+        "name": "CO2 air quality index"
+      },
+      "iaq_rh": {
+        "name": "Humidity air quality index"
+      },
+      "ventilation_state": {
+        "name": "Ventilation state",
+        "state": {
+          "aut1": "Automatic boost (15 min)",
+          "aut2": "Automatic boost (30 min)",
+          "aut3": "Automatic boost (45 min)",
+          "auto": "Automatic",
+          "cnt1": "Continuous low speed",
+          "cnt2": "Continuous medium speed",
+          "cnt3": "Continuous high speed",
+          "empt": "Empty house",
+          "man1": "Manual low speed (15 min)",
+          "man1x2": "Manual low speed (30 min)",
+          "man1x3": "Manual low speed (45 min)",
+          "man2": "Manual medium speed (15 min)",
+          "man2x2": "Manual medium speed (30 min)",
+          "man2x3": "Manual medium speed (45 min)",
+          "man3": "Manual high speed (15 min)",
+          "man3x2": "Manual high speed (30 min)",
+          "man3x3": "Manual high speed (45 min)"
+        }
+      }
+    }
+  },
+  "exceptions": {
+    "api_error": {
+      "message": "Unexpected error from the Duco API: {error}"
+    },
+    "cannot_connect": {
+      "message": "An error occurred while trying to connect to the Duco instance: {error}"
+    },
+    "failed_to_set_state": {
+      "message": "Failed to set ventilation state: {error}"
+    }
+  }
+}
--- a/homeassistant/components/elgato/button.py
+++ b/homeassistant/components/elgato/button.py
@@ -6,7 +6,7 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from typing import Any

-from elgato import Elgato, ElgatoError
+from elgato import Elgato

 from homeassistant.components.button import (
    ButtonDeviceClass,
@@ -15,11 +15,11 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from .coordinator import ElgatoConfigEntry, ElgatoDataUpdateCoordinator
 from .entity import ElgatoEntity
+from .helpers import elgato_exception_handler

 PARALLEL_UPDATES = 1

@@ -80,11 +80,7 @@ class ElgatoButtonEntity(ElgatoEntity, ButtonEntity):
            f"{coordinator.data.info.serial_number}_{description.key}"
        )

+    @elgato_exception_handler
    async def async_press(self) -> None:
        """Trigger button press on the Elgato device."""
-        try:
-            await self.entity_description.press_fn(self.coordinator.client)
-        except ElgatoError as error:
-            raise HomeAssistantError(
-                "An error occurred while communicating with the Elgato Light"
-            ) from error
+        await self.entity_description.press_fn(self.coordinator.client)
--- a/homeassistant/components/elgato/config_flow.py
+++ b/homeassistant/components/elgato/config_flow.py
@@ -12,6 +12,8 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_MAC
 from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo

 from .const import DOMAIN
@@ -23,7 +25,6 @@ class ElgatoFlowHandler(ConfigFlow, domain=DOMAIN):
    VERSION = 1

    host: str
-    port: int
    serial_number: str
    mac: str | None = None

@@ -70,6 +71,69 @@ class ElgatoFlowHandler(ConfigFlow, domain=DOMAIN):
        """Handle a flow initiated by zeroconf."""
        return self._async_create_entry()

+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle reconfiguration of an existing Elgato device."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            elgato = Elgato(
+                host=user_input[CONF_HOST],
+                session=async_get_clientsession(self.hass),
+            )
+
+            try:
+                info = await elgato.info()
+            except ElgatoError:
+                errors["base"] = "cannot_connect"
+            else:
+                await self.async_set_unique_id(info.serial_number)
+                self._abort_if_unique_id_mismatch(reason="different_device")
+                return self.async_update_reload_and_abort(
+                    self._get_reconfigure_entry(),
+                    data_updates={CONF_HOST: user_input[CONF_HOST]},
+                )
+
+        return self.async_show_form(
+            step_id="reconfigure",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(
+                        CONF_HOST,
+                        default=self._get_reconfigure_entry().data[CONF_HOST],
+                    ): str,
+                }
+            ),
+            errors=errors,
+        )
+
+    async def async_step_dhcp(
+        self, discovery_info: DhcpServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle DHCP discovery of a known Elgato device.
+
+        Only devices already configured (matched via ``registered_devices``)
+        reach this step. It is used to keep the stored host in sync with the
+        current IP address of the device.
+        """
+        mac = format_mac(discovery_info.macaddress)
+
+        for entry in self._async_current_entries():
+            if (entry_mac := entry.data.get(CONF_MAC)) is None or format_mac(
+                entry_mac
+            ) != mac:
+                continue
+            if entry.data[CONF_HOST] != discovery_info.ip:
+                self.hass.config_entries.async_update_entry(
+                    entry,
+                    data=entry.data | {CONF_HOST: discovery_info.ip},
+                )
+                self.hass.config_entries.async_schedule_reload(entry.entry_id)
+            return self.async_abort(reason="already_configured")
+
+        return self.async_abort(reason="no_devices_found")
+
    @callback
    def _async_show_setup_form(
        self, errors: dict[str, str] | None = None
--- a/homeassistant/components/elgato/coordinator.py
+++ b/homeassistant/components/elgato/coordinator.py
@@ -2,7 +2,15 @@

 from dataclasses import dataclass

-from elgato import BatteryInfo, Elgato, ElgatoConnectionError, Info, Settings, State
+from elgato import (
+    BatteryInfo,
+    Elgato,
+    ElgatoConnectionError,
+    ElgatoError,
+    Info,
+    Settings,
+    State,
+)

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
@@ -59,4 +67,12 @@ class ElgatoDataUpdateCoordinator(DataUpdateCoordinator[ElgatoData]):
                state=await self.client.state(),
            )
        except ElgatoConnectionError as err:
-            raise UpdateFailed(err) from err
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="communication_error",
+            ) from err
+        except ElgatoError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="unknown_error",
+            ) from err
--- a/homeassistant/components/elgato/helpers.py
+++ b/homeassistant/components/elgato/helpers.py
@@ -0,0 +1,43 @@
+"""Helpers for Elgato."""
+
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from typing import Any, Concatenate
+
+from elgato import ElgatoConnectionError, ElgatoError
+
+from homeassistant.exceptions import HomeAssistantError
+
+from .const import DOMAIN
+from .entity import ElgatoEntity
+
+
+def elgato_exception_handler[_ElgatoEntityT: ElgatoEntity, **_P](
+    func: Callable[Concatenate[_ElgatoEntityT, _P], Coroutine[Any, Any, Any]],
+) -> Callable[Concatenate[_ElgatoEntityT, _P], Coroutine[Any, Any, None]]:
+    """Decorate Elgato calls to handle Elgato exceptions.
+
+    A decorator that wraps the passed in function, catches Elgato errors,
+    and raises a translated ``HomeAssistantError``.
+    """
+
+    async def handler(
+        self: _ElgatoEntityT, *args: _P.args, **kwargs: _P.kwargs
+    ) -> None:
+        try:
+            await func(self, *args, **kwargs)
+        except ElgatoConnectionError as error:
+            self.coordinator.last_update_success = False
+            self.coordinator.async_update_listeners()
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="communication_error",
+            ) from error
+        except ElgatoError as error:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="unknown_error",
+            ) from error
+
+    return handler
--- a/homeassistant/components/elgato/light.py
+++ b/homeassistant/components/elgato/light.py
@@ -4,8 +4,6 @@ from __future__ import annotations

 from typing import Any

-from elgato import ElgatoError
-
 from homeassistant.components.light import (
    ATTR_BRIGHTNESS,
    ATTR_COLOR_TEMP_KELVIN,
@@ -14,12 +12,12 @@ from homeassistant.components.light import (
    LightEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util

 from .coordinator import ElgatoConfigEntry, ElgatoDataUpdateCoordinator
 from .entity import ElgatoEntity
+from .helpers import elgato_exception_handler

 PARALLEL_UPDATES = 1

@@ -94,17 +92,13 @@ class ElgatoLight(ElgatoEntity, LightEntity):
        """Return the state of the light."""
        return self.coordinator.data.state.on

+    @elgato_exception_handler
    async def async_turn_off(self, **kwargs: Any) -> None:
        """Turn off the light."""
-        try:
-            await self.coordinator.client.light(on=False)
-        except ElgatoError as error:
-            raise HomeAssistantError(
-                "An error occurred while updating the Elgato Light"
-            ) from error
-        finally:
-            await self.coordinator.async_refresh()
+        await self.coordinator.client.light(on=False)
+        await self.coordinator.async_request_refresh()

+    @elgato_exception_handler
    async def async_turn_on(self, **kwargs: Any) -> None:
        """Turn on the light."""
        temperature_kelvin = kwargs.get(ATTR_COLOR_TEMP_KELVIN)
@@ -137,26 +131,16 @@ class ElgatoLight(ElgatoEntity, LightEntity):
            else color_util.color_temperature_kelvin_to_mired(temperature_kelvin)
        )

-        try:
-            await self.coordinator.client.light(
-                on=True,
-                brightness=brightness,
-                hue=hue,
-                saturation=saturation,
-                temperature=temperature,
-            )
-        except ElgatoError as error:
-            raise HomeAssistantError(
-                "An error occurred while updating the Elgato Light"
-            ) from error
-        finally:
-            await self.coordinator.async_refresh()
+        await self.coordinator.client.light(
+            on=True,
+            brightness=brightness,
+            hue=hue,
+            saturation=saturation,
+            temperature=temperature,
+        )
+        await self.coordinator.async_request_refresh()

+    @elgato_exception_handler
    async def async_identify(self) -> None:
        """Identify the light, will make it blink."""
-        try:
-            await self.coordinator.client.identify()
-        except ElgatoError as error:
-            raise HomeAssistantError(
-                "An error occurred while identifying the Elgato Light"
-            ) from error
+        await self.coordinator.client.identify()
--- a/homeassistant/components/elgato/manifest.json
+++ b/homeassistant/components/elgato/manifest.json
@@ -3,6 +3,11 @@
  "name": "Elgato Light",
  "codeowners": ["@frenck"],
  "config_flow": true,
+  "dhcp": [
+    {
+      "registered_devices": true
+    }
+  ],
  "documentation": "https://www.home-assistant.io/integrations/elgato",
  "integration_type": "device",
  "iot_class": "local_polling",
--- a/homeassistant/components/elgato/quality_scale.yaml
+++ b/homeassistant/components/elgato/quality_scale.yaml
@@ -39,11 +39,7 @@ rules:
  # Gold
  devices: done
  diagnostics: done
-  discovery-update-info:
-    status: todo
-    comment: |
-      The integration doesn't update the device info based on DHCP discovery
-      of known existing devices.
+  discovery-update-info: done
  discovery: done
  docs-data-update: todo
  docs-examples: todo
@@ -64,9 +60,9 @@ rules:
  entity-device-class: done
  entity-disabled-by-default: done
  entity-translations: done
-  exception-translations: todo
+  exception-translations: done
  icon-translations: done
-  reconfiguration-flow: todo
+  reconfiguration-flow: done
  repair-issues:
    status: exempt
    comment: |
--- a/homeassistant/components/elgato/strings.json
+++ b/homeassistant/components/elgato/strings.json
@@ -2,13 +2,24 @@
  "config": {
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "different_device": "The configured Elgato device is not the same as the one at this address.",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
    },
    "flow_title": "{serial_number}",
    "step": {
+      "reconfigure": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "[%key:component::elgato::config::step::user::data_description::host%]"
+        }
+      },
      "user": {
        "data": {
          "host": "[%key:common::config_flow::data::host%]"
@@ -48,6 +59,14 @@
      }
    }
  },
+  "exceptions": {
+    "communication_error": {
+      "message": "An error occurred while communicating with the Elgato device."
+    },
+    "unknown_error": {
+      "message": "An unknown error occurred while communicating with the Elgato device."
+    }
+  },
  "services": {
    "identify": {
      "description": "Identifies an Elgato Light. Blinks the light, which can be useful for, e.g., a visual notification.",
--- a/homeassistant/components/elgato/switch.py
+++ b/homeassistant/components/elgato/switch.py
@@ -6,16 +6,16 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from typing import Any

-from elgato import Elgato, ElgatoError
+from elgato import Elgato

 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from .coordinator import ElgatoConfigEntry, ElgatoData, ElgatoDataUpdateCoordinator
 from .entity import ElgatoEntity
+from .helpers import elgato_exception_handler

 PARALLEL_UPDATES = 1

@@ -92,24 +92,14 @@ class ElgatoSwitchEntity(ElgatoEntity, SwitchEntity):
        """Return state of the switch."""
        return self.entity_description.is_on_fn(self.coordinator.data)

+    @elgato_exception_handler
    async def async_turn_on(self, **kwargs: Any) -> None:
        """Turn the entity on."""
-        try:
-            await self.entity_description.set_fn(self.coordinator.client, True)
-        except ElgatoError as error:
-            raise HomeAssistantError(
-                "An error occurred while updating the Elgato Light"
-            ) from error
-        finally:
-            await self.coordinator.async_refresh()
+        await self.entity_description.set_fn(self.coordinator.client, True)
+        await self.coordinator.async_request_refresh()

+    @elgato_exception_handler
    async def async_turn_off(self, **kwargs: Any) -> None:
        """Turn the entity off."""
-        try:
-            await self.entity_description.set_fn(self.coordinator.client, False)
-        except ElgatoError as error:
-            raise HomeAssistantError(
-                "An error occurred while updating the Elgato Light"
-            ) from error
-        finally:
-            await self.coordinator.async_refresh()
+        await self.entity_description.set_fn(self.coordinator.client, False)
+        await self.coordinator.async_request_refresh()
--- a/homeassistant/components/enphase_envoy/manifest.json
+++ b/homeassistant/components/enphase_envoy/manifest.json
@@ -8,7 +8,7 @@
  "iot_class": "local_polling",
  "loggers": ["pyenphase"],
  "quality_scale": "platinum",
-  "requirements": ["pyenphase==2.4.6"],
+  "requirements": ["pyenphase==2.4.8"],
  "zeroconf": [
    {
      "type": "_enphase-envoy._tcp.local."
--- a/homeassistant/components/epic_games_store/manifest.json
+++ b/homeassistant/components/epic_games_store/manifest.json
@@ -1,7 +1,7 @@
 {
  "domain": "epic_games_store",
  "name": "Epic Games Store",
-  "codeowners": ["@hacf-fr", "@Quentame"],
+  "codeowners": ["@Quentame"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/epic_games_store",
  "integration_type": "service",
--- a/homeassistant/components/esphome/light.py
+++ b/homeassistant/components/esphome/light.py
@@ -259,15 +259,18 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
        if (color_temp_k := kwargs.get(ATTR_COLOR_TEMP_KELVIN)) is not None:
            # Do not use kelvin_to_mired here to prevent precision loss
            color_temp_mired = 1_000_000.0 / color_temp_k
+            data["color_temperature"] = color_temp_mired
            if color_temp_modes := _filter_color_modes(
                color_modes, LightColorCapability.COLOR_TEMPERATURE
            ):
-                data["color_temperature"] = color_temp_mired
                color_modes = color_temp_modes
            else:
-                # Convert color temperature to explicit cold/warm white
-                # values to avoid ESPHome applying brightness to both
-                # master brightness and white channels (b² effect).
+                # Also send explicit cold/warm white values to avoid
+                # ESPHome applying brightness to both master brightness
+                # and white channels (b² effect). The firmware skips
+                # deriving cwww from color_temperature when the channels
+                # are already set explicitly, but still stores
+                # color_temperature so HA can read it back.
                data["cold_white"], data["warm_white"] = self._color_temp_to_cold_warm(
                    color_temp_mired
                )
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -17,9 +17,9 @@
  "mqtt": ["esphome/discover/#"],
  "quality_scale": "platinum",
  "requirements": [
-    "aioesphomeapi==44.6.2",
+    "aioesphomeapi==44.13.3",
    "esphome-dashboard-api==1.3.0",
-    "bleak-esphome==3.7.1"
+    "bleak-esphome==3.7.3"
  ],
  "zeroconf": ["_esphomelib._tcp.local."]
 }
--- a/homeassistant/components/eurotronic_cometblue/init.py
+++ b/homeassistant/components/eurotronic_cometblue/init.py
@@ -0,0 +1,81 @@
+"""Comet Blue Bluetooth integration."""
+
+from __future__ import annotations
+
+from bleak.exc import BleakError
+from eurotronic_cometblue_ha import AsyncCometBlue
+
+from homeassistant.components.bluetooth import async_ble_device_from_address
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_ADDRESS, CONF_PIN, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
+
+from .const import DOMAIN
+from .coordinator import CometBlueConfigEntry, CometBlueDataUpdateCoordinator
+
+PLATFORMS: list[Platform] = [
+    Platform.BUTTON,
+    Platform.CLIMATE,
+]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: CometBlueConfigEntry) -> bool:
+    """Set up Eurotronic Comet Blue from a config entry."""
+
+    address = entry.data[CONF_ADDRESS]
+
+    ble_device = async_ble_device_from_address(hass, entry.data[CONF_ADDRESS])
+
+    if not ble_device:
+        raise ConfigEntryNotReady(
+            f"Couldn't find a nearby device for address: {entry.data[CONF_ADDRESS]}"
+        )
+
+    cometblue_device = AsyncCometBlue(
+        device=ble_device,
+        pin=int(entry.data[CONF_PIN]),
+    )
+    try:
+        async with cometblue_device:
+            ble_device_info = await cometblue_device.get_device_info_async()
+            try:
+                # Device only returns battery level if PIN is correct
+                await cometblue_device.get_battery_async()
+            except TimeoutError as ex:
+                # This likely means PIN was incorrect on Linux and ESPHome backends
+                raise ConfigEntryError(
+                    "Failed to read battery level, likely due to incorrect PIN"
+                ) from ex
+    except BleakError as ex:
+        raise ConfigEntryNotReady(
+            f"Failed to get device info from '{cometblue_device.device.address}'"
+        ) from ex
+
+    device_registry = dr.async_get(hass)
+    device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        identifiers={(DOMAIN, address)},
+        name=f"{ble_device_info['model']} {cometblue_device.device.address}",
+        manufacturer=ble_device_info["manufacturer"],
+        model=ble_device_info["model"],
+        sw_version=ble_device_info["version"],
+    )
+
+    coordinator = CometBlueDataUpdateCoordinator(
+        hass,
+        entry,
+        cometblue_device,
+    )
+    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: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
--- a/homeassistant/components/eurotronic_cometblue/button.py
+++ b/homeassistant/components/eurotronic_cometblue/button.py
@@ -0,0 +1,61 @@
+"""Comet Blue button platform."""
+
+from __future__ import annotations
+
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
+
+from .coordinator import CometBlueConfigEntry, CometBlueDataUpdateCoordinator
+from .entity import CometBlueBluetoothEntity
+
+PARALLEL_UPDATES = 1
+
+DESCRIPTIONS = [
+    ButtonEntityDescription(
+        key="sync_time",
+        translation_key="sync_time",
+        entity_category=EntityCategory.CONFIG,
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CometBlueConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the client entities."""
+
+    coordinator = entry.runtime_data
+
+    async_add_entities(
+        [
+            CometBlueButtonEntity(coordinator, description)
+            for description in DESCRIPTIONS
+        ]
+    )
+
+
+class CometBlueButtonEntity(CometBlueBluetoothEntity, ButtonEntity):
+    """Representation of a button."""
+
+    def __init__(
+        self,
+        coordinator: CometBlueDataUpdateCoordinator,
+        description: ButtonEntityDescription,
+    ) -> None:
+        """Initialize CometBlueButtonEntity."""
+
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.address}-{description.key}"
+
+    async def async_press(self) -> None:
+        """Handle the button press."""
+        if self.entity_description.key == "sync_time":
+            await self.coordinator.send_command(
+                self.coordinator.device.set_datetime_async, {"date": dt_util.now()}
+            )
--- a/homeassistant/components/eurotronic_cometblue/climate.py
+++ b/homeassistant/components/eurotronic_cometblue/climate.py
@@ -0,0 +1,185 @@
+"""Comet Blue climate integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.climate import (
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
+    PRESET_AWAY,
+    PRESET_BOOST,
+    PRESET_COMFORT,
+    PRESET_ECO,
+    PRESET_NONE,
+    ClimateEntity,
+    ClimateEntityFeature,
+    HVACMode,
+)
+from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import CometBlueConfigEntry, CometBlueDataUpdateCoordinator
+from .entity import CometBlueBluetoothEntity
+
+PARALLEL_UPDATES = 1
+MIN_TEMP = 7.5
+MAX_TEMP = 28.5
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CometBlueConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the client entities."""
+
+    coordinator = entry.runtime_data
+    async_add_entities([CometBlueClimateEntity(coordinator)])
+
+
+class CometBlueClimateEntity(CometBlueBluetoothEntity, ClimateEntity):
+    """A Comet Blue Climate climate entity."""
+
+    _attr_min_temp = MIN_TEMP
+    _attr_max_temp = MAX_TEMP
+    _attr_name = None
+    _attr_hvac_modes = [HVACMode.AUTO, HVACMode.HEAT, HVACMode.OFF]
+    _attr_preset_modes = [
+        PRESET_COMFORT,
+        PRESET_ECO,
+        PRESET_BOOST,
+        PRESET_AWAY,
+        PRESET_NONE,
+    ]
+    _attr_supported_features: ClimateEntityFeature = (
+        ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+        | ClimateEntityFeature.PRESET_MODE
+        | ClimateEntityFeature.TURN_ON
+        | ClimateEntityFeature.TURN_OFF
+    )
+    _attr_target_temperature_step = PRECISION_HALVES
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+
+    def __init__(self, coordinator: CometBlueDataUpdateCoordinator) -> None:
+        """Initialize CometBlueClimateEntity."""
+
+        super().__init__(coordinator)
+        self._attr_unique_id = coordinator.address
+
+    @property
+    def current_temperature(self) -> float | None:
+        """Return the current temperature."""
+        return self.coordinator.data.temperatures["currentTemp"]
+
+    @property
+    def target_temperature(self) -> float | None:
+        """Return the temperature currently set to be reached."""
+        return self.coordinator.data.temperatures["manualTemp"]
+
+    @property
+    def target_temperature_high(self) -> float | None:
+        """Return the upper bound target temperature."""
+        return self.coordinator.data.temperatures["targetTempHigh"]
+
+    @property
+    def target_temperature_low(self) -> float | None:
+        """Return the lower bound target temperature."""
+        return self.coordinator.data.temperatures["targetTempLow"]
+
+    @property
+    def hvac_mode(self) -> HVACMode | None:
+        """Return hvac operation mode."""
+        if self.target_temperature == MIN_TEMP:
+            return HVACMode.OFF
+        if self.target_temperature == MAX_TEMP:
+            return HVACMode.HEAT
+        return HVACMode.AUTO
+
+    @property
+    def preset_mode(self) -> str | None:
+        """Return the current preset mode, e.g., home, away, temp."""
+        # presets have an order in which they are displayed on TRV:
+        # away, boost, comfort, eco, none (manual)
+        if (
+            self.coordinator.data.holiday.get("start") is None
+            and self.coordinator.data.holiday.get("end") is not None
+            and self.target_temperature
+            == self.coordinator.data.holiday.get("temperature")
+        ):
+            return PRESET_AWAY
+        if self.target_temperature == MAX_TEMP:
+            return PRESET_BOOST
+        if self.target_temperature == self.target_temperature_high:
+            return PRESET_COMFORT
+        if self.target_temperature == self.target_temperature_low:
+            return PRESET_ECO
+        return PRESET_NONE
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperatures."""
+
+        if self.preset_mode == PRESET_AWAY:
+            raise ServiceValidationError(
+                "Cannot adjust TRV remotely, manually disable 'holiday' mode on TRV first"
+            )
+
+        await self.coordinator.send_command(
+            self.coordinator.device.set_temperature_async,
+            {
+                "values": {
+                    # manual temperature always needs to be set, otherwise TRV will turn OFF
+                    "manualTemp": kwargs.get(ATTR_TEMPERATURE)
+                    or self.target_temperature,
+                    # other temperatures can be left unchanged by setting them to None
+                    "targetTempLow": kwargs.get(ATTR_TARGET_TEMP_LOW),
+                    "targetTempHigh": kwargs.get(ATTR_TARGET_TEMP_HIGH),
+                }
+            },
+        )
+        await self.coordinator.async_request_refresh()
+
+    async def async_set_preset_mode(self, preset_mode: str) -> None:
+        """Set new target preset mode."""
+
+        if self.preset_modes and preset_mode not in self.preset_modes:
+            raise ServiceValidationError(f"Unsupported preset_mode '{preset_mode}'")
+        if preset_mode in [PRESET_NONE, PRESET_AWAY]:
+            raise ServiceValidationError(
+                f"Unable to set preset '{preset_mode}', display only."
+            )
+        if preset_mode == PRESET_ECO:
+            return await self.async_set_temperature(
+                temperature=self.target_temperature_low
+            )
+        if preset_mode == PRESET_COMFORT:
+            return await self.async_set_temperature(
+                temperature=self.target_temperature_high
+            )
+        if preset_mode == PRESET_BOOST:
+            return await self.async_set_temperature(temperature=MAX_TEMP)
+        return None
+
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set new target hvac mode."""
+
+        if hvac_mode == HVACMode.OFF:
+            return await self.async_set_temperature(temperature=MIN_TEMP)
+        if hvac_mode == HVACMode.HEAT:
+            return await self.async_set_temperature(temperature=MAX_TEMP)
+        if hvac_mode == HVACMode.AUTO:
+            return await self.async_set_temperature(
+                temperature=self.target_temperature_low
+            )
+        raise ServiceValidationError(f"Unknown HVAC mode '{hvac_mode}'")
+
+    async def async_turn_on(self) -> None:
+        """Turn the entity on."""
+        await self.async_set_hvac_mode(HVACMode.AUTO)
+
+    async def async_turn_off(self) -> None:
+        """Turn the entity off."""
+        await self.async_set_hvac_mode(HVACMode.OFF)
--- a/homeassistant/components/eurotronic_cometblue/config_flow.py
+++ b/homeassistant/components/eurotronic_cometblue/config_flow.py
@@ -0,0 +1,186 @@
+"""Config flow for CometBlue."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from bleak.exc import BleakError
+from eurotronic_cometblue_ha import AsyncCometBlue
+from eurotronic_cometblue_ha.const import SERVICE
+from habluetooth import BluetoothServiceInfoBleak
+import voluptuous as vol
+
+from homeassistant.components.bluetooth import (
+    async_ble_device_from_address,
+    async_discovered_service_info,
+)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_ADDRESS, CONF_PIN
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)
+
+from .const import DOMAIN
+
+LOGGER = logging.getLogger(__name__)
+
+
+DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_PIN, default="000000"): vol.All(
+            TextSelector(TextSelectorConfig(type=TextSelectorType.NUMBER)),
+            vol.Length(min=6, max=6),
+        ),
+    }
+)
+
+
+def name_from_discovery(discovery: BluetoothServiceInfoBleak | None) -> str:
+    """Get the name from a discovery."""
+    if discovery is None:
+        return "Comet Blue"
+    if discovery.name == str(discovery.address):
+        return discovery.address
+    return f"{discovery.name} {discovery.address}"
+
+
+class CometBlueConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for CometBlue."""
+
+    VERSION = 1
+
+    def __init__(self) -> None:
+        """Initialize the config flow."""
+        self._discovery_info: BluetoothServiceInfoBleak | None = None
+        self._discovered_devices: dict[str, BluetoothServiceInfoBleak] = {}
+
+    async def _try_connect(self, user_input: dict[str, Any]) -> dict[str, str]:
+        """Verify connection to the device with the provided PIN and read initial data."""
+        device_address = self._discovery_info.address if self._discovery_info else ""
+        try:
+            ble_device = async_ble_device_from_address(self.hass, device_address)
+            LOGGER.info("Testing connection for device at address %s", device_address)
+            if not ble_device:
+                return {"base": "cannot_connect"}
+
+            cometblue_device = AsyncCometBlue(
+                device=ble_device,
+                pin=int(user_input[CONF_PIN]),
+            )
+
+            async with cometblue_device:
+                try:
+                    # Device only returns battery level if PIN is correct
+                    await cometblue_device.get_battery_async()
+                except TimeoutError:
+                    # This likely means PIN was incorrect on Linux and ESPHome backends
+                    LOGGER.debug(
+                        "Failed to read battery level, likely due to incorrect PIN",
+                        exc_info=True,
+                    )
+                    return {"base": "invalid_pin"}
+        except TimeoutError:
+            LOGGER.debug("Connection to device timed out", exc_info=True)
+            return {"base": "timeout_connect"}
+        except BleakError:
+            LOGGER.debug("Failed to connect to device", exc_info=True)
+            return {"base": "cannot_connect"}
+        except Exception:  # noqa: BLE001
+            LOGGER.debug("Unknown error", exc_info=True)
+            return {"base": "unknown"}
+        return {}
+
+    def _create_entry(
+        self,
+        pin: str,
+    ) -> ConfigFlowResult:
+        """Create an entry for a discovered device."""
+
+        entry_data = {
+            CONF_ADDRESS: self._discovery_info.address
+            if self._discovery_info
+            else None,
+            CONF_PIN: pin,
+        }
+
+        return self.async_create_entry(
+            title=name_from_discovery(self._discovery_info), data=entry_data
+        )
+
+    async def async_step_bluetooth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle user-confirmation of discovered device."""
+
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            errors = await self._try_connect(user_input)
+            if not errors:
+                return self._create_entry(user_input[CONF_PIN])
+
+        return self.async_show_form(
+            step_id="bluetooth_confirm",
+            data_schema=DATA_SCHEMA,
+            errors=errors,
+        )
+
+    async def async_step_bluetooth(
+        self, discovery_info: BluetoothServiceInfoBleak
+    ) -> ConfigFlowResult:
+        """Handle a flow initialized by Bluetooth discovery."""
+        address = discovery_info.address
+
+        await self.async_set_unique_id(format_mac(address))
+        self._abort_if_unique_id_configured(updates={CONF_ADDRESS: address})
+
+        self._discovery_info = discovery_info
+
+        self.context["title_placeholders"] = {
+            "name": name_from_discovery(self._discovery_info)
+        }
+        return await self.async_step_bluetooth_confirm()
+
+    async def async_step_pick_device(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the step to pick discovered device."""
+
+        current_addresses = self._async_current_ids()
+        self._discovered_devices = {
+            discovery_info.address: discovery_info
+            for discovery_info in async_discovered_service_info(
+                self.hass, connectable=True
+            )
+            if SERVICE in discovery_info.service_uuids
+            and discovery_info.address not in current_addresses
+        }
+
+        if user_input is not None:
+            address = user_input[CONF_ADDRESS]
+
+            await self.async_set_unique_id(format_mac(address))
+            self._abort_if_unique_id_configured()
+            self._discovery_info = self._discovered_devices.get(address)
+            return await self.async_step_bluetooth_confirm()
+        # Check if there is at least one device
+        if not self._discovered_devices:
+            return self.async_abort(reason="no_devices_found")
+
+        return self.async_show_form(
+            step_id="pick_device",
+            data_schema=vol.Schema(
+                {vol.Required(CONF_ADDRESS): vol.In(list(self._discovered_devices))}
+            ),
+        )
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle a flow initialized by the user."""
+
+        return await self.async_step_pick_device()
--- a/homeassistant/components/eurotronic_cometblue/const.py
+++ b/homeassistant/components/eurotronic_cometblue/const.py
@@ -0,0 +1,7 @@
+"""Constants for Cometblue BLE thermostats."""
+
+from typing import Final
+
+DOMAIN: Final = "eurotronic_cometblue"
+
+MAX_RETRIES: Final = 3
--- a/homeassistant/components/eurotronic_cometblue/coordinator.py
+++ b/homeassistant/components/eurotronic_cometblue/coordinator.py
@@ -0,0 +1,132 @@
+"""Provides the DataUpdateCoordinator for Comet Blue."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass, field
+from datetime import timedelta
+import logging
+from typing import Any
+
+from bleak.exc import BleakError
+from eurotronic_cometblue_ha import AsyncCometBlue, InvalidByteValueError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import MAX_RETRIES
+
+SCAN_INTERVAL = timedelta(minutes=5)
+LOGGER = logging.getLogger(__name__)
+COMMAND_RETRY_INTERVAL = 2.5
+
+type CometBlueConfigEntry = ConfigEntry[CometBlueDataUpdateCoordinator]
+
+
+@dataclass
+class CometBlueCoordinatorData:
+    """Data stored by the coordinator."""
+
+    temperatures: dict[str, float | int] = field(default_factory=dict)
+    holiday: dict = field(default_factory=dict)
+
+
+class CometBlueDataUpdateCoordinator(DataUpdateCoordinator[CometBlueCoordinatorData]):
+    """Class to manage fetching data."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: CometBlueConfigEntry,
+        cometblue: AsyncCometBlue,
+    ) -> None:
+        """Initialize global data updater."""
+        super().__init__(
+            hass=hass,
+            config_entry=entry,
+            logger=LOGGER,
+            name=f"Comet Blue {cometblue.client.address}",
+            update_interval=SCAN_INTERVAL,
+        )
+        self.device = cometblue
+        self.address = cometblue.client.address
+
+    async def send_command(
+        self,
+        function: Callable[..., Awaitable[dict[str, Any] | None]],
+        payload: dict[str, Any],
+    ) -> dict[str, Any] | None:
+        """Send command to device."""
+
+        LOGGER.debug("Updating device %s with '%s'", self.name, payload)
+        retry_count = 0
+        while retry_count < MAX_RETRIES:
+            try:
+                async with self.device:
+                    return await function(**payload)
+            except (InvalidByteValueError, TimeoutError, BleakError) as ex:
+                retry_count += 1
+                if retry_count >= MAX_RETRIES:
+                    raise HomeAssistantError(
+                        f"Error sending command to '{self.name}': {ex}"
+                    ) from ex
+                LOGGER.info(
+                    "Retry sending command to %s after %s (%s)",
+                    self.name,
+                    type(ex).__name__,
+                    ex,
+                )
+                await asyncio.sleep(COMMAND_RETRY_INTERVAL)
+            except ValueError as ex:
+                raise ServiceValidationError(
+                    f"Invalid payload '{payload}' for '{self.name}': {ex}"
+                ) from ex
+        return None
+
+    async def _async_update_data(self) -> CometBlueCoordinatorData:
+        """Poll the device."""
+        data: CometBlueCoordinatorData = CometBlueCoordinatorData()
+
+        retry_count = 0
+
+        while retry_count < MAX_RETRIES and not data.temperatures:
+            try:
+                async with self.device:
+                    # temperatures are required and must trigger a retry if not available
+                    if not data.temperatures:
+                        data.temperatures = await self.device.get_temperature_async()
+                    # holiday is optional and should not trigger a retry
+                    try:
+                        if not data.holiday:
+                            data.holiday = await self.device.get_holiday_async(1) or {}
+                    except InvalidByteValueError as ex:
+                        LOGGER.warning(
+                            "Failed to retrieve optional data for %s: %s (%s)",
+                            self.name,
+                            type(ex).__name__,
+                            ex,
+                        )
+            except (InvalidByteValueError, TimeoutError, BleakError) as ex:
+                retry_count += 1
+                if retry_count >= MAX_RETRIES:
+                    raise UpdateFailed(
+                        f"Error retrieving data: {ex}", retry_after=30
+                    ) from ex
+                LOGGER.info(
+                    "Retry updating %s after error: %s (%s)",
+                    self.name,
+                    type(ex).__name__,
+                    ex,
+                )
+                await asyncio.sleep(COMMAND_RETRY_INTERVAL)
+            except Exception as ex:
+                raise UpdateFailed(
+                    f"({type(ex).__name__}) {ex}", retry_after=30
+                ) from ex
+
+        # If one value was not retrieved correctly, keep the old value
+        LOGGER.debug("Received data for %s: %s", self.name, data)
+        return data
--- a/homeassistant/components/eurotronic_cometblue/entity.py
+++ b/homeassistant/components/eurotronic_cometblue/entity.py
@@ -0,0 +1,33 @@
+"""Coordinator entity base class for CometBlue."""
+
+from homeassistant.components import bluetooth
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import DOMAIN
+from .coordinator import CometBlueDataUpdateCoordinator
+
+
+class CometBlueBluetoothEntity(CoordinatorEntity[CometBlueDataUpdateCoordinator]):
+    """Coordinator entity for CometBlue."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: CometBlueDataUpdateCoordinator) -> None:
+        """Initialize coordinator entity."""
+        super().__init__(coordinator)
+        # Full DeviceInfo is added to DeviceRegistry in __init__.py, so we only
+        # set identifiers here to link the entity to the device
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, self.coordinator.address)},
+        )
+
+    @property
+    def available(self) -> bool:
+        """Return if entity is available."""
+        # As long the device is currently connectable via Bluetooth it is available, even if the last update failed.
+        # This is because Bluetooth connectivity can be intermittent and a failed update doesn't necessarily mean the device is unavailable.
+        # The BluetoothManager will check every 300s (same interval as DataUpdateCoordinator) if the device is still present and connectable.
+        return bluetooth.async_address_present(
+            self.hass, address=self.coordinator.address, connectable=True
+        )
--- a/homeassistant/components/eurotronic_cometblue/icons.json
+++ b/homeassistant/components/eurotronic_cometblue/icons.json
@@ -0,0 +1,9 @@
+{
+  "entity": {
+    "button": {
+      "sync_time": {
+        "default": "mdi:calendar-clock"
+      }
+    }
+  }
+}
--- a/homeassistant/components/eurotronic_cometblue/manifest.json
+++ b/homeassistant/components/eurotronic_cometblue/manifest.json
@@ -0,0 +1,19 @@
+{
+  "domain": "eurotronic_cometblue",
+  "name": "Eurotronic Comet Blue",
+  "bluetooth": [
+    {
+      "connectable": true,
+      "service_uuid": "47e9ee00-47e9-11e4-8939-164230d1df67"
+    }
+  ],
+  "codeowners": ["@rikroe"],
+  "config_flow": true,
+  "dependencies": ["bluetooth"],
+  "documentation": "https://www.home-assistant.io/integrations/eurotronic_cometblue",
+  "integration_type": "device",
+  "iot_class": "local_polling",
+  "loggers": ["eurotronic_cometblue_ha"],
+  "quality_scale": "bronze",
+  "requirements": ["eurotronic-cometblue-ha==1.4.0"]
+}
--- a/homeassistant/components/eurotronic_cometblue/quality_scale.yaml
+++ b/homeassistant/components/eurotronic_cometblue/quality_scale.yaml
@@ -0,0 +1,88 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: This integration does not provide actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: This integration does not provide actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: This integration does not subscribe to any 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:
+    status: exempt
+    comment: This integration does not provide actions.
+  config-entry-unloading: done
+  docs-configuration-parameters: done
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: This integration does not login to any device or service.
+  test-coverage: todo
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info:
+    status: exempt
+    comment: This integration relies on MAC-based BLE connections.
+  discovery: done
+  docs-data-update: done
+  docs-examples: todo
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: todo
+  dynamic-devices: done
+  entity-category:
+    status: exempt
+    comment: This integration only provides one primary entity.
+  entity-device-class:
+    status: exempt
+    comment: This integration does not provide sensors.
+  entity-disabled-by-default:
+    status: exempt
+    comment: This integration only provides one primary entity.
+  entity-translations:
+    status: exempt
+    comment: This integration only provides one primary entity.
+  exception-translations: todo
+  icon-translations:
+    status: exempt
+    comment: Not required.
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: Not required.
+  stale-devices:
+    status: exempt
+    comment: Only single device per config entry.
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: This integration does not make any HTTP requests.
+  strict-typing: todo
--- a/homeassistant/components/eurotronic_cometblue/strings.json
+++ b/homeassistant/components/eurotronic_cometblue/strings.json
@@ -0,0 +1,40 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "no_devices_found": "No Comet Blue Bluetooth TRVs discovered.",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_pin": "Invalid device PIN",
+      "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "step": {
+      "bluetooth_confirm": {
+        "data": {
+          "pin": "[%key:common::config_flow::data::pin%]"
+        },
+        "data_description": {
+          "pin": "6-digit device PIN"
+        }
+      },
+      "pick_device": {
+        "data": {
+          "address": "Discovered devices"
+        },
+        "data_description": {
+          "address": "Select device to continue."
+        }
+      }
+    }
+  },
+  "entity": {
+    "button": {
+      "sync_time": {
+        "name": "Sync time"
+      }
+    }
+  }
+}
--- a/homeassistant/components/evohome/init.py
+++ b/homeassistant/components/evohome/init.py
@@ -104,6 +104,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    hass.async_create_task(
        async_load_platform(hass, Platform.CLIMATE, DOMAIN, {}, config)
    )
+    hass.async_create_task(
+        async_load_platform(hass, Platform.BUTTON, DOMAIN, {}, config)
+    )
    if coordinator.tcs.hotwater:
        hass.async_create_task(
            async_load_platform(hass, Platform.WATER_HEATER, DOMAIN, {}, config)
--- a/homeassistant/components/evohome/button.py
+++ b/homeassistant/components/evohome/button.py
@@ -0,0 +1,116 @@
+"""Support for Button entities of the Evohome integration."""
+
+from __future__ import annotations
+
+import evohomeasync2 as evo
+
+from homeassistant.components.button import ButtonEntity
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+
+from .const import EVOHOME_DATA
+from .coordinator import EvoDataUpdateCoordinator
+from .entity import EvoEntity, is_valid_zone
+
+
+async def async_setup_platform(
+    hass: HomeAssistant,
+    _: ConfigType,
+    async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the button platform for Evohome."""
+
+    if discovery_info is None:
+        return
+
+    coordinator = hass.data[EVOHOME_DATA].coordinator
+    tcs = hass.data[EVOHOME_DATA].tcs
+
+    entities: list[EvoResetButtonBase] = [EvoResetSystemButton(coordinator, tcs)]
+
+    entities.extend(
+        [EvoResetZoneButton(coordinator, z) for z in tcs.zones if is_valid_zone(z)]
+    )
+
+    if tcs.hotwater:
+        entities.append(EvoResetDhwButton(coordinator, tcs.hotwater))
+
+    async_add_entities(entities)
+
+    for entity in entities:
+        await entity.update_attrs()
+
+
+class EvoResetButtonBase(EvoEntity, ButtonEntity):
+    """Button entity for system reset."""
+
+    _attr_entity_category = EntityCategory.CONFIG
+
+    _evo_state_attr_names = ()
+
+    def __init__(
+        self,
+        coordinator: EvoDataUpdateCoordinator,
+        evo_device: evo.ControlSystem | evo.HotWater | evo.Zone,
+    ) -> None:
+        """Initialize the system reset button."""
+        super().__init__(coordinator, evo_device)
+
+        # zones can be renamed, so set name in their property method
+        if isinstance(evo_device, evo.ControlSystem):
+            self._attr_name = f"Reset {evo_device.location.name}"
+        elif not isinstance(evo_device, evo.Zone):
+            self._attr_name = f"Reset {evo_device.name}"
+
+        self._attr_unique_id = f"{evo_device.id}_reset"
+
+    async def async_press(self) -> None:
+        """Reset the Evohome entity to its base operating mode."""
+        await self.coordinator.call_client_api(self._evo_device.reset())
+
+
+class EvoResetSystemButton(EvoResetButtonBase):
+    """Button entity for system reset."""
+
+    _attr_translation_key = "reset_system_mode"
+
+    _evo_device: evo.ControlSystem
+    _evo_id_attr = "system_id"
+
+
+class EvoResetDhwButton(EvoResetButtonBase):
+    """Button entity for DHW override reset."""
+
+    _attr_translation_key = "clear_dhw_override"
+
+    _evo_device: evo.HotWater
+    _evo_id_attr = "dhw_id"
+
+
+class EvoResetZoneButton(EvoResetButtonBase):
+    """Button entity for zone override reset."""
+
+    _attr_translation_key = "clear_zone_override"
+
+    _evo_device: evo.Zone
+    _evo_id_attr = "zone_id"
+
+    def __init__(
+        self,
+        coordinator: EvoDataUpdateCoordinator,
+        evo_device: evo.Zone,
+    ) -> None:
+        """Initialize the zone reset button."""
+        super().__init__(coordinator, evo_device)
+
+        if evo_device.id == evo_device.tcs.id:
+            # this system does not have a distinct ID for the zone
+            self._attr_unique_id = f"{evo_device.id}z_reset"
+
+    @property
+    def name(self) -> str:
+        """Return the name of the evohome entity."""
+        return f"Reset {self._evo_device.name}"
--- a/homeassistant/components/evohome/climate.py
+++ b/homeassistant/components/evohome/climate.py
@@ -16,8 +16,6 @@ from evohomeasync2.const import (
 from evohomeasync2.schemas.const import (
    SystemMode as EvoSystemMode,
    ZoneMode as EvoZoneMode,
-    ZoneModelType as EvoZoneModelType,
-    ZoneType as EvoZoneType,
 )

 from homeassistant.components.climate import (
@@ -43,7 +41,7 @@ from homeassistant.util import dt as dt_util

 from .const import ATTR_DURATION, ATTR_PERIOD, DOMAIN, EVOHOME_DATA, EvoService
 from .coordinator import EvoDataUpdateCoordinator
-from .entity import EvoChild, EvoEntity
+from .entity import EvoChild, EvoEntity, is_valid_zone

 _LOGGER = logging.getLogger(__name__)

@@ -70,16 +68,16 @@ HA_PRESET_TO_EVO = {v: k for k, v in EVO_PRESET_TO_HA.items()}

 async def async_setup_platform(
    hass: HomeAssistant,
-    config: ConfigType,
+    _: ConfigType,
    async_add_entities: AddEntitiesCallback,
    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Create the evohome Controller, and its Zones, if any."""
+    """Set up the climate platform for Evohome."""
+
    if discovery_info is None:
        return

    coordinator = hass.data[EVOHOME_DATA].coordinator
-    loc_idx = hass.data[EVOHOME_DATA].loc_idx
    tcs = hass.data[EVOHOME_DATA].tcs

    _LOGGER.debug(
@@ -87,16 +85,13 @@ async def async_setup_platform(
        tcs.model,
        tcs.id,
        tcs.location.name,
-        loc_idx,
+        coordinator.loc_idx,
    )

    entities: list[EvoController | EvoZone] = [EvoController(coordinator, tcs)]

    for zone in tcs.zones:
-        if (
-            zone.model == EvoZoneModelType.HEATING_ZONE
-            or zone.type == EvoZoneType.THERMOSTAT
-        ):
+        if is_valid_zone(zone):
            _LOGGER.debug(
                "Adding: %s (%s), id=%s, name=%s",
                zone.type,
@@ -189,33 +184,33 @@ class EvoZone(EvoChild, EvoClimateEntity):
        )

    async def async_clear_zone_override(self) -> None:
-        """Clear the zone's override, if any."""
+        """Clear the zone override (if any) and return to following its schedule."""
        await self.coordinator.call_client_api(self._evo_device.reset())

    async def async_set_zone_override(
        self, setpoint: float, duration: timedelta | None = None
    ) -> None:
-        """Set the zone's override (mode/setpoint)."""
+        """Override the zone's setpoint, either permanently or for a duration."""
        temperature = max(min(setpoint, self.max_temp), self.min_temp)

-        if duration is not None:
-            if duration.total_seconds() == 0:
-                await self._update_schedule()
-                until = self.setpoints.get("next_sp_from")
-            else:
-                until = dt_util.now() + duration
-        else:
+        if duration is None:
            until = None  # indefinitely
+        elif duration.total_seconds() == 0:
+            await self._update_schedule()
+            until = self.setpoints.get("next_sp_from")
+        else:
+            until = dt_util.now() + duration

        until = dt_util.as_utc(until) if until else None
+
        await self.coordinator.call_client_api(
            self._evo_device.set_temperature(temperature, until=until)
        )

    @property
-    def name(self) -> str | None:
+    def name(self) -> str:
        """Return the name of the evohome entity."""
-        return self._evo_device.name  # zones can be easily renamed
+        return self._evo_device.name  # zones can be renamed

    @property
    def hvac_mode(self) -> HVACMode | None:
@@ -330,7 +325,7 @@ class EvoController(EvoClimateEntity):
    It is assumed there is only one TCS per location, and they are thus synonymous.
    """

-    _attr_icon = "mdi:thermostat"
+    _attr_icon = "mdi:thermostat-box"
    _attr_precision = PRECISION_TENTHS

    _evo_device: evo.ControlSystem
--- a/homeassistant/components/evohome/const.py
+++ b/homeassistant/components/evohome/const.py
@@ -19,14 +19,11 @@ STORAGE_KEY: Final = DOMAIN

 CONF_LOCATION_IDX: Final = "location_idx"

-USER_DATA: Final = "user_data"
-
 SCAN_INTERVAL_DEFAULT: Final = timedelta(seconds=300)
 SCAN_INTERVAL_MINIMUM: Final = timedelta(seconds=60)

-ATTR_PERIOD: Final = "period"  # number of days
 ATTR_DURATION: Final = "duration"  # number of minutes, <24h
-
+ATTR_PERIOD: Final = "period"  # number of days
 ATTR_SETPOINT: Final = "setpoint"


@@ -39,3 +36,4 @@ class EvoService(StrEnum):
    RESET_SYSTEM = "reset_system"
    SET_ZONE_OVERRIDE = "set_zone_override"
    CLEAR_ZONE_OVERRIDE = "clear_zone_override"
+    SET_DHW_OVERRIDE = "set_dhw_override"
--- a/homeassistant/components/evohome/entity.py
+++ b/homeassistant/components/evohome/entity.py
@@ -1,4 +1,4 @@
-"""Base for evohome entity."""
+"""Support for entities of the Evohome integration."""

 from collections.abc import Mapping
 from datetime import UTC, datetime
@@ -6,6 +6,10 @@ import logging
 from typing import Any

 import evohomeasync2 as evo
+from evohomeasync2.schemas.const import (
+    ZoneModelType as EvoZoneModelType,
+    ZoneType as EvoZoneType,
+)
 from evohomeasync2.schemas.typedefs import DayOfWeekDhwT

 from homeassistant.core import callback
@@ -18,6 +22,14 @@ from .coordinator import EvoDataUpdateCoordinator
 _LOGGER = logging.getLogger(__name__)


+def is_valid_zone(zone: evo.Zone) -> bool:
+    """Check if an Evohome zone should have climate and button entities."""
+    return (
+        zone.model == EvoZoneModelType.HEATING_ZONE
+        or zone.type == EvoZoneType.THERMOSTAT
+    )
+
+
 class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):
    """Base for any evohome-compatible entity (controller, DHW, zone).

@@ -75,6 +87,10 @@ class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):

        super()._handle_coordinator_update()

+    async def update_attrs(self) -> None:
+        """Update the entity's extra state attrs."""
+        self._handle_coordinator_update()
+

 class EvoChild(EvoEntity):
    """Base for any evohome-compatible child entity (DHW, zone).
@@ -179,4 +195,4 @@ class EvoChild(EvoEntity):
    async def update_attrs(self) -> None:
        """Update the entity's extra state attrs."""
        await self._update_schedule()
-        self._handle_coordinator_update()
+        await super().update_attrs()
--- a/homeassistant/components/evohome/icons.json
+++ b/homeassistant/components/evohome/icons.json
@@ -1,4 +1,17 @@
 {
+  "entity": {
+    "button": {
+      "clear_dhw_override": {
+        "default": "mdi:water-boiler-auto"
+      },
+      "clear_zone_override": {
+        "default": "mdi:thermostat-auto"
+      },
+      "reset_system_mode": {
+        "default": "mdi:thermostat-box-auto"
+      }
+    }
+  },
  "services": {
    "clear_zone_override": {
      "service": "mdi:motion-sensor-off"
@@ -9,6 +22,9 @@
    "reset_system": {
      "service": "mdi:refresh"
    },
+    "set_dhw_override": {
+      "service": "mdi:water-heater"
+    },
    "set_system_mode": {
      "service": "mdi:pencil"
    },
--- a/homeassistant/components/evohome/services.py
+++ b/homeassistant/components/evohome/services.py
@@ -14,7 +14,8 @@ from evohomeasync2.schemas.const import (
 import voluptuous as vol

 from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
-from homeassistant.const import ATTR_MODE
+from homeassistant.components.water_heater import DOMAIN as WATER_HEATER_DOMAIN
+from homeassistant.const import ATTR_MODE, ATTR_STATE
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv, service
@@ -27,7 +28,7 @@ from .coordinator import EvoDataUpdateCoordinator
 # System service schemas (registered as domain services)
 SET_SYSTEM_MODE_SCHEMA: Final[dict[str | vol.Marker, Any]] = {
    # unsupported modes are rejected at runtime with ServiceValidationError
-    vol.Required(ATTR_MODE): cv.string,  # avoid vol.In(SystemMode)
+    vol.Required(ATTR_MODE): cv.string,  # ... so, don't use SystemMode enum here
    vol.Exclusive(ATTR_DURATION, "temporary"): vol.All(
        cv.time_period,
        vol.Range(min=timedelta(hours=0), max=timedelta(hours=24)),
@@ -49,6 +50,15 @@ SET_ZONE_OVERRIDE_SCHEMA: Final[dict[str | vol.Marker, Any]] = {
    ),
 }

+# DHW service schemas (registered as entity services)
+SET_DHW_OVERRIDE_SCHEMA: Final[dict[str | vol.Marker, Any]] = {
+    vol.Required(ATTR_STATE): cv.boolean,
+    vol.Optional(ATTR_DURATION): vol.All(
+        cv.time_period,
+        vol.Range(min=timedelta(days=0), max=timedelta(days=1)),
+    ),
+}
+

 def _register_zone_entity_services(hass: HomeAssistant) -> None:
    """Register entity-level services for zones."""
@@ -71,6 +81,19 @@ def _register_zone_entity_services(hass: HomeAssistant) -> None:
    )


+def _register_dhw_entity_services(hass: HomeAssistant) -> None:
+    """Register entity-level services for DHW zones."""
+
+    service.async_register_platform_entity_service(
+        hass,
+        DOMAIN,
+        EvoService.SET_DHW_OVERRIDE,
+        entity_domain=WATER_HEATER_DOMAIN,
+        schema=SET_DHW_OVERRIDE_SCHEMA,
+        func="async_set_dhw_override",
+    )
+
+
 def _validate_set_system_mode_params(tcs: ControlSystem, data: dict[str, Any]) -> None:
    """Validate that a set_system_mode service call is properly formed."""

@@ -156,3 +179,4 @@ def setup_service_functions(
    )

    _register_zone_entity_services(hass)
+    _register_dhw_entity_services(hass)
--- a/homeassistant/components/evohome/services.yaml
+++ b/homeassistant/components/evohome/services.yaml
@@ -4,6 +4,8 @@
 set_system_mode:
  fields:
    mode:
+      required: true
+      default: Auto
      example: Away
      selector:
        select:
@@ -19,9 +21,10 @@ set_system_mode:
      selector:
        object:
    duration:
-      example: '{"hours": 18}'
+      example: "18:00"
      selector:
-        object:
+        duration:
+          enable_second: false

 reset_system:

@@ -32,6 +35,8 @@ set_zone_override:
    entity:
      integration: evohome
      domain: climate
+      supported_features:
+        - climate.ClimateEntityFeature.TARGET_TEMPERATURE
  fields:
    setpoint:
      required: true
@@ -41,12 +46,31 @@ set_zone_override:
          max: 35.0
          step: 0.1
    duration:
-      example: '{"minutes": 135}'
+      example: "02:15"
      selector:
-        object:
+        duration:
+          enable_second: false

 clear_zone_override:
  target:
    entity:
      integration: evohome
      domain: climate
+      supported_features:
+        - climate.ClimateEntityFeature.TARGET_TEMPERATURE
+
+set_dhw_override:
+  target:
+    entity:
+      integration: evohome
+      domain: water_heater
+  fields:
+    state:
+      required: true
+      selector:
+        boolean:
+    duration:
+      example: "02:15"
+      selector:
+        duration:
+          enable_second: false
--- a/homeassistant/components/evohome/strings.json
+++ b/homeassistant/components/evohome/strings.json
@@ -4,13 +4,13 @@
      "message": "The requested system mode is not supported: {error}"
    },
    "mode_cant_be_temporary": {
-      "message": "The mode `{mode}` does not support `duration` or `period`"
+      "message": "The mode `{mode}` does not support 'Duration' or 'Period'"
    },
    "mode_cant_have_duration": {
-      "message": "The mode `{mode}` does not support `duration`; use `period` instead"
+      "message": "The mode `{mode}` does not support 'Duration'; use 'Period' instead"
    },
    "mode_cant_have_period": {
-      "message": "The mode `{mode}` does not support `period`; use `duration` instead"
+      "message": "The mode `{mode}` does not support 'Period'; use 'Duration' instead"
    },
    "mode_not_supported": {
      "message": "The mode `{mode}` is not supported by this controller"
@@ -21,7 +21,7 @@
  },
  "services": {
    "clear_zone_override": {
-      "description": "Sets a zone to follow its schedule.",
+      "description": "Sets the zone to follow its schedule.",
      "name": "Clear zone override"
    },
    "refresh_system": {
@@ -29,14 +29,28 @@
      "name": "Refresh system"
    },
    "reset_system": {
-      "description": "Sets the system to Auto mode and resets all the zones to follow their schedules. Not all Evohome systems support this feature (i.e. AutoWithReset mode).",
+      "description": "Sets the system mode to `Auto` mode and resets all the zones to follow their schedules. Not all Evohome systems support this feature (i.e. `AutoWithReset` mode).",
      "name": "Reset system"
    },
-    "set_system_mode": {
-      "description": "Sets the system mode, either indefinitely, or for a specified period of time, after which it will revert to Auto. Not all systems support all modes.",
+    "set_dhw_override": {
+      "description": "Overrides the DHW state, either indefinitely or for a specified duration, after which it will revert to following its schedule.",
      "fields": {
        "duration": {
-          "description": "The duration in hours; used only with AutoWithEco mode (up to 24 hours).",
+          "description": "The DHW will revert to its schedule after this time. If 0 the change is until the next scheduled setpoint.",
+          "name": "Duration"
+        },
+        "state": {
+          "description": "The DHW state: True (on: heat the water up to the setpoint) or False (off).",
+          "name": "State"
+        }
+      },
+      "name": "Set DHW override"
+    },
+    "set_system_mode": {
+      "description": "Sets the system mode, either indefinitely or until a specified end time, after which it will revert to `Auto`. Not all systems support all modes.",
+      "fields": {
+        "duration": {
+          "description": "The duration in hours; used only with `AutoWithEco` mode (up to 24 hours).",
          "name": "Duration"
        },
        "mode": {
@@ -44,14 +58,14 @@
          "name": "[%key:common::config_flow::data::mode%]"
        },
        "period": {
-          "description": "A period of time in days; used only with Away, DayOff, or Custom mode. The system will revert to Auto mode at midnight (up to 99 days, today is day 1).",
+          "description": "A period of time in days; used only with `Away`, `DayOff`, or `Custom` mode. The system will revert to `Auto` mode at midnight (up to 99 days, today is day 1).",
          "name": "Period"
        }
      },
      "name": "Set system mode"
    },
    "set_zone_override": {
-      "description": "Overrides a zone's setpoint, either indefinitely, or for a specified period of time, after which it will revert to following its schedule.",
+      "description": "Overrides the zone setpoint, either indefinitely or for a specified duration, after which it will revert to following its schedule.",
      "fields": {
        "duration": {
          "description": "The zone will revert to its schedule after this time. If 0 the change is until the next scheduled setpoint.",
--- a/homeassistant/components/evohome/water_heater.py
+++ b/homeassistant/components/evohome/water_heater.py
@@ -2,6 +2,7 @@

 from __future__ import annotations

+from datetime import timedelta
 import logging
 from typing import Any

@@ -39,11 +40,12 @@ EVO_STATE_TO_HA = {v: k for k, v in HA_STATE_TO_EVO.items() if k != ""}

 async def async_setup_platform(
    hass: HomeAssistant,
-    config: ConfigType,
+    _: ConfigType,
    async_add_entities: AddEntitiesCallback,
    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Create a DHW controller."""
+    """Set up the water heater platform for Evohome."""
+
    if discovery_info is None:
        return

@@ -69,7 +71,6 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
    """Base for any evohome-compatible DHW controller."""

    _attr_name = "DHW controller"
-    _attr_icon = "mdi:thermometer-lines"
    _attr_operation_list = list(HA_STATE_TO_EVO)
    _attr_supported_features = (
        WaterHeaterEntityFeature.AWAY_MODE
@@ -97,6 +98,28 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
            PRECISION_TENTHS if coordinator.client_v1 else PRECISION_WHOLE
        )

+    async def async_set_dhw_override(
+        self, state: bool, duration: timedelta | None = None
+    ) -> None:
+        """Override the DHW zone's on/off state, either permanently or for a duration."""
+
+        if duration is None:
+            until = None  # indefinitely, aka permanent override
+        elif duration.total_seconds() == 0:
+            await self._update_schedule()
+            until = self.setpoints.get("next_sp_from")
+        else:
+            until = dt_util.now() + duration
+
+        until = dt_util.as_utc(until) if until else None
+
+        if state:
+            await self.coordinator.call_client_api(self._evo_device.set_on(until=until))
+        else:
+            await self.coordinator.call_client_api(
+                self._evo_device.set_off(until=until)
+            )
+
    @property
    def current_operation(self) -> str | None:
        """Return the current operating mode (Auto, On, or Off)."""
--- a/homeassistant/components/fluss/manifest.json
+++ b/homeassistant/components/fluss/manifest.json
@@ -7,5 +7,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["fluss-api"],
  "quality_scale": "bronze",
-  "requirements": ["fluss-api==0.1.9.20"]
+  "requirements": ["fluss-api==0.2.4"]
 }
--- a/homeassistant/components/freebox/manifest.json
+++ b/homeassistant/components/freebox/manifest.json
@@ -1,7 +1,7 @@
 {
  "domain": "freebox",
  "name": "Freebox",
-  "codeowners": ["@hacf-fr", "@Quentame"],
+  "codeowners": ["@hacf-fr/reviewers", "@Quentame"],
  "config_flow": true,
  "dependencies": ["ffmpeg"],
  "documentation": "https://www.home-assistant.io/integrations/freebox",
--- a/homeassistant/components/freshr/coordinator.py
+++ b/homeassistant/components/freshr/coordinator.py
@@ -6,7 +6,7 @@ from datetime import timedelta
 from aiohttp import ClientError
 from pyfreshr import FreshrClient
 from pyfreshr.exceptions import ApiResponseError, LoginError
-from pyfreshr.models import DeviceReadings, DeviceSummary
+from pyfreshr.models import DeviceReadings, DeviceSummary, DeviceType

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
@@ -18,6 +18,12 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda

 from .const import DOMAIN, LOGGER

+_DEVICE_TYPE_NAMES: dict[DeviceType, str] = {
+    DeviceType.FRESH_R: "Fresh-r",
+    DeviceType.FORWARD: "Fresh-r Forward",
+    DeviceType.MONITOR: "Fresh-r Monitor",
+}
+
 DEVICES_SCAN_INTERVAL = timedelta(hours=1)
 READINGS_SCAN_INTERVAL = timedelta(minutes=10)

@@ -110,6 +116,12 @@ class FreshrReadingsCoordinator(DataUpdateCoordinator[DeviceReadings]):
        )
        self._device = device
        self._client = client
+        self.device_info = dr.DeviceInfo(
+            identifiers={(DOMAIN, device.id)},
+            name=_DEVICE_TYPE_NAMES.get(device.device_type, "Fresh-r"),
+            serial_number=device.id,
+            manufacturer="Fresh-r",
+        )

    @property
    def device_id(self) -> str:
--- a/homeassistant/components/freshr/entity.py
+++ b/homeassistant/components/freshr/entity.py
@@ -0,0 +1,18 @@
+"""Base entity for the Fresh-r integration."""
+
+from __future__ import annotations
+
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .coordinator import FreshrReadingsCoordinator
+
+
+class FreshrEntity(CoordinatorEntity[FreshrReadingsCoordinator]):
+    """Base class for Fresh-r entities."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: FreshrReadingsCoordinator) -> None:
+        """Initialize the Fresh-r entity."""
+        super().__init__(coordinator)
+        self._attr_device_info = coordinator.device_info
--- a/homeassistant/components/freshr/manifest.json
+++ b/homeassistant/components/freshr/manifest.json
@@ -6,6 +6,6 @@
  "documentation": "https://www.home-assistant.io/integrations/freshr",
  "integration_type": "hub",
  "iot_class": "cloud_polling",
-  "quality_scale": "silver",
+  "quality_scale": "platinum",
  "requirements": ["pyfreshr==1.2.0"]
 }
--- a/homeassistant/components/freshr/sensor.py
+++ b/homeassistant/components/freshr/sensor.py
@@ -21,12 +21,10 @@ from homeassistant.const import (
    UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity

-from .const import DOMAIN
 from .coordinator import FreshrConfigEntry, FreshrReadingsCoordinator
+from .entity import FreshrEntity

 PARALLEL_UPDATES = 0

@@ -93,12 +91,6 @@ _TEMP = FreshrSensorEntityDescription(
    value_fn=lambda r: r.temp,
 )

-_DEVICE_TYPE_NAMES: dict[DeviceType, str] = {
-    DeviceType.FRESH_R: "Fresh-r",
-    DeviceType.FORWARD: "Fresh-r Forward",
-    DeviceType.MONITOR: "Fresh-r Monitor",
-}
-
 SENSOR_TYPES: dict[DeviceType, tuple[FreshrSensorEntityDescription, ...]] = {
    DeviceType.FRESH_R: (_T1, _T2, _CO2, _HUM, _FLOW, _DP),
    DeviceType.FORWARD: (_T1, _T2, _CO2, _HUM, _FLOW, _DP, _TEMP),
@@ -131,17 +123,10 @@ async def async_setup_entry(
            descriptions = SENSOR_TYPES.get(
                device.device_type, SENSOR_TYPES[DeviceType.FRESH_R]
            )
-            device_info = DeviceInfo(
-                identifiers={(DOMAIN, device_id)},
-                name=_DEVICE_TYPE_NAMES.get(device.device_type, "Fresh-r"),
-                serial_number=device_id,
-                manufacturer="Fresh-r",
-            )
            entities.extend(
                FreshrSensor(
                    config_entry.runtime_data.readings[device_id],
                    description,
-                    device_info,
                )
                for description in descriptions
            )
@@ -151,22 +136,19 @@ async def async_setup_entry(
    config_entry.async_on_unload(coordinator.async_add_listener(_check_devices))


-class FreshrSensor(CoordinatorEntity[FreshrReadingsCoordinator], SensorEntity):
+class FreshrSensor(FreshrEntity, SensorEntity):
    """Representation of a Fresh-r sensor."""

-    _attr_has_entity_name = True
    entity_description: FreshrSensorEntityDescription

    def __init__(
        self,
        coordinator: FreshrReadingsCoordinator,
        description: FreshrSensorEntityDescription,
-        device_info: DeviceInfo,
    ) -> None:
        """Initialize the sensor."""
        super().__init__(coordinator)
        self.entity_description = description
-        self._attr_device_info = device_info
        self._attr_unique_id = f"{coordinator.device_id}_{description.key}"

    @property
--- a/homeassistant/components/fritz/sensor.py
+++ b/homeassistant/components/fritz/sensor.py
@@ -8,6 +8,7 @@ from datetime import datetime, timedelta
 import logging

 from fritzconnection.lib.fritzstatus import FritzStatus
+from requests.exceptions import RequestException

 from homeassistant.components.sensor import (
    SensorDeviceClass,
@@ -145,46 +146,65 @@ def _retrieve_link_attenuation_received_state(

 def _retrieve_cpu_temperature_state(
    status: FritzStatus, last_value: float | None
-) -> float:
+) -> float | None:
    """Return the first CPU temperature value."""
-    return status.get_cpu_temperatures()[0]  # type: ignore[no-any-return]
+    try:
+        return status.get_cpu_temperatures()[0]  # type: ignore[no-any-return]
+    except RequestException:
+        return None
+
+
+def _is_suitable_cpu_temperature(status: FritzStatus) -> bool:
+    """Return whether the CPU temperature sensor is suitable."""
+    try:
+        cpu_temp = status.get_cpu_temperatures()[0]
+    except RequestException, IndexError:
+        _LOGGER.debug("CPU temperature not supported by the device")
+        return False
+    if cpu_temp == 0:
+        _LOGGER.debug("CPU temperature returns 0°C, treating as not supported")
+        return False
+    return True


@dataclass(frozen=True, kw_only=True)
-class FritzSensorEntityDescription(SensorEntityDescription, FritzEntityDescription):
-    """Describes Fritz sensor entity."""
+class FritzConnectionSensorEntityDescription(
+    SensorEntityDescription, FritzEntityDescription
+):
+    """Describes Fritz connection sensor entity."""

    is_suitable: Callable[[ConnectionInfo], bool] = lambda info: info.wan_enabled


-SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
-    FritzSensorEntityDescription(
+@dataclass(frozen=True, kw_only=True)
+class FritzDeviceSensorEntityDescription(
+    SensorEntityDescription, FritzEntityDescription
+):
+    """Describes Fritz device sensor entity."""
+
+    is_suitable: Callable[[FritzStatus], bool] = lambda status: True
+
+
+CONNECTION_SENSOR_TYPES: tuple[FritzConnectionSensorEntityDescription, ...] = (
+    FritzConnectionSensorEntityDescription(
        key="external_ip",
        translation_key="external_ip",
        value_fn=_retrieve_external_ip_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="external_ipv6",
        translation_key="external_ipv6",
        value_fn=_retrieve_external_ipv6_state,
        is_suitable=lambda info: info.ipv6_active,
    ),
-    FritzSensorEntityDescription(
-        key="device_uptime",
-        translation_key="device_uptime",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=_retrieve_device_uptime_state,
-        is_suitable=lambda info: True,
-    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="connection_uptime",
        translation_key="connection_uptime",
        device_class=SensorDeviceClass.TIMESTAMP,
        entity_category=EntityCategory.DIAGNOSTIC,
        value_fn=_retrieve_connection_uptime_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="kb_s_sent",
        translation_key="kb_s_sent",
        state_class=SensorStateClass.MEASUREMENT,
@@ -192,7 +212,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        device_class=SensorDeviceClass.DATA_RATE,
        value_fn=_retrieve_kb_s_sent_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="kb_s_received",
        translation_key="kb_s_received",
        state_class=SensorStateClass.MEASUREMENT,
@@ -200,21 +220,21 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        device_class=SensorDeviceClass.DATA_RATE,
        value_fn=_retrieve_kb_s_received_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="max_kb_s_sent",
        translation_key="max_kb_s_sent",
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
        device_class=SensorDeviceClass.DATA_RATE,
        value_fn=_retrieve_max_kb_s_sent_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="max_kb_s_received",
        translation_key="max_kb_s_received",
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
        device_class=SensorDeviceClass.DATA_RATE,
        value_fn=_retrieve_max_kb_s_received_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="gb_sent",
        translation_key="gb_sent",
        state_class=SensorStateClass.TOTAL_INCREASING,
@@ -222,7 +242,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        device_class=SensorDeviceClass.DATA_SIZE,
        value_fn=_retrieve_gb_sent_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="gb_received",
        translation_key="gb_received",
        state_class=SensorStateClass.TOTAL_INCREASING,
@@ -230,7 +250,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        device_class=SensorDeviceClass.DATA_SIZE,
        value_fn=_retrieve_gb_received_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="link_kb_s_sent",
        translation_key="link_kb_s_sent",
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
@@ -238,7 +258,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        entity_category=EntityCategory.DIAGNOSTIC,
        value_fn=_retrieve_link_kb_s_sent_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="link_kb_s_received",
        translation_key="link_kb_s_received",
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
@@ -246,7 +266,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        entity_category=EntityCategory.DIAGNOSTIC,
        value_fn=_retrieve_link_kb_s_received_state,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="link_noise_margin_sent",
        translation_key="link_noise_margin_sent",
        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -255,7 +275,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        value_fn=_retrieve_link_noise_margin_sent_state,
        is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="link_noise_margin_received",
        translation_key="link_noise_margin_received",
        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -264,7 +284,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        value_fn=_retrieve_link_noise_margin_received_state,
        is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="link_attenuation_sent",
        translation_key="link_attenuation_sent",
        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -273,7 +293,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        value_fn=_retrieve_link_attenuation_sent_state,
        is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
    ),
-    FritzSensorEntityDescription(
+    FritzConnectionSensorEntityDescription(
        key="link_attenuation_received",
        translation_key="link_attenuation_received",
        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -282,7 +302,17 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        value_fn=_retrieve_link_attenuation_received_state,
        is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
    ),
-    FritzSensorEntityDescription(
+)
+
+DEVICE_SENSOR_TYPES: tuple[FritzDeviceSensorEntityDescription, ...] = (
+    FritzDeviceSensorEntityDescription(
+        key="device_uptime",
+        translation_key="device_uptime",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=_retrieve_device_uptime_state,
+    ),
+    FritzDeviceSensorEntityDescription(
        key="cpu_temperature",
        translation_key="cpu_temperature",
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
@@ -290,7 +320,7 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
        entity_category=EntityCategory.DIAGNOSTIC,
        state_class=SensorStateClass.MEASUREMENT,
        value_fn=_retrieve_cpu_temperature_state,
-        is_suitable=lambda info: True,
+        is_suitable=_is_suitable_cpu_temperature,
    ),
 )

@@ -305,20 +335,32 @@ async def async_setup_entry(
    avm_wrapper = entry.runtime_data

    connection_info = await avm_wrapper.async_get_connection_info()
-
    entities = [
        FritzBoxSensor(avm_wrapper, entry.title, description)
-        for description in SENSOR_TYPES
+        for description in CONNECTION_SENSOR_TYPES
        if description.is_suitable(connection_info)
    ]

+    fritz_status = avm_wrapper.fritz_status
+
+    def _generate_device_sensors() -> list[FritzBoxSensor]:
+        return [
+            FritzBoxSensor(avm_wrapper, entry.title, description)
+            for description in DEVICE_SENSOR_TYPES
+            if description.is_suitable(fritz_status)
+        ]
+
+    entities += await hass.async_add_executor_job(_generate_device_sensors)
+
    async_add_entities(entities)


 class FritzBoxSensor(FritzBoxBaseCoordinatorEntity, SensorEntity):
    """Define FRITZ!Box connectivity class."""

-    entity_description: FritzSensorEntityDescription
+    entity_description: (
+        FritzConnectionSensorEntityDescription | FritzDeviceSensorEntityDescription
+    )

    @property
    def native_value(self) -> StateType:
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -21,5 +21,5 @@
  "integration_type": "system",
  "preview_features": { "winter_mode": {} },
  "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260325.6"]
+  "requirements": ["home-assistant-frontend==20260325.7"]
 }
--- a/homeassistant/components/gardena_bluetooth/init.py
+++ b/homeassistant/components/gardena_bluetooth/init.py
@@ -2,7 +2,6 @@

 from __future__ import annotations

-import asyncio
 import logging

 from bleak.backends.device import BLEDevice
@@ -13,7 +12,8 @@ from gardena_bluetooth.exceptions import (
    CharacteristicNotFound,
    CommunicationFailure,
 )
-from gardena_bluetooth.parse import CharacteristicTime
+from gardena_bluetooth.parse import CharacteristicTime, ProductType
+from gardena_bluetooth.scan import async_get_manufacturer_data

 from homeassistant.components import bluetooth
 from homeassistant.const import CONF_ADDRESS, Platform
@@ -29,7 +29,6 @@ from .coordinator import (
    GardenaBluetoothConfigEntry,
    GardenaBluetoothCoordinator,
 )
-from .util import async_get_product_type

 PLATFORMS: list[Platform] = [
    Platform.BINARY_SENSOR,
@@ -76,11 +75,10 @@ async def async_setup_entry(

    address = entry.data[CONF_ADDRESS]

-    try:
-        async with asyncio.timeout(TIMEOUT):
-            product_type = await async_get_product_type(hass, address)
-    except TimeoutError as exception:
-        raise ConfigEntryNotReady("Unable to find product type") from exception
+    mfg_data = await async_get_manufacturer_data({address})
+    product_type = mfg_data[address].product_type
+    if product_type == ProductType.UNKNOWN:
+        raise ConfigEntryNotReady("Unable to find product type")

    client = Client(get_connection(hass, address), product_type)
    try:
--- a/homeassistant/components/gardena_bluetooth/config_flow.py
+++ b/homeassistant/components/gardena_bluetooth/config_flow.py
@@ -9,6 +9,7 @@ from gardena_bluetooth.client import Client
 from gardena_bluetooth.const import PRODUCT_NAMES, DeviceInformation, ScanService
 from gardena_bluetooth.exceptions import CharacteristicNotFound, CommunicationFailure
 from gardena_bluetooth.parse import ManufacturerData, ProductType
+from gardena_bluetooth.scan import async_get_manufacturer_data
 import voluptuous as vol

 from homeassistant.components.bluetooth import (
@@ -24,41 +25,27 @@ from .const import DOMAIN

 _LOGGER = logging.getLogger(__name__)

+_SUPPORTED_PRODUCT_TYPES = {
+    ProductType.PUMP,
+    ProductType.VALVE,
+    ProductType.WATER_COMPUTER,
+    ProductType.AUTOMATS,
+    ProductType.PRESSURE_TANKS,
+    ProductType.AQUA_CONTOURS,
+}
+

 def _is_supported(discovery_info: BluetoothServiceInfo):
    """Check if device is supported."""
    if ScanService not in discovery_info.service_uuids:
        return False

-    if not (data := discovery_info.manufacturer_data.get(ManufacturerData.company)):
+    if discovery_info.manufacturer_data.get(ManufacturerData.company) is None:
        _LOGGER.debug("Missing manufacturer data: %s", discovery_info)
        return False
-
-    manufacturer_data = ManufacturerData.decode(data)
-    product_type = ProductType.from_manufacturer_data(manufacturer_data)
-
-    if product_type not in (
-        ProductType.PUMP,
-        ProductType.VALVE,
-        ProductType.WATER_COMPUTER,
-        ProductType.AUTOMATS,
-        ProductType.PRESSURE_TANKS,
-        ProductType.AQUA_CONTOURS,
-    ):
-        _LOGGER.debug("Unsupported device: %s", manufacturer_data)
-        return False
-
    return True


-def _get_name(discovery_info: BluetoothServiceInfo):
-    data = discovery_info.manufacturer_data[ManufacturerData.company]
-    manufacturer_data = ManufacturerData.decode(data)
-    product_type = ProductType.from_manufacturer_data(manufacturer_data)
-
-    return PRODUCT_NAMES.get(product_type, "Gardena Device")
-
-
 class GardenaBluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Gardena Bluetooth."""

@@ -90,11 +77,13 @@ class GardenaBluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
    ) -> ConfigFlowResult:
        """Handle the bluetooth discovery step."""
        _LOGGER.debug("Discovered device: %s", discovery_info)
-        if not _is_supported(discovery_info):
+        data = await async_get_manufacturer_data({discovery_info.address})
+        product_type = data[discovery_info.address].product_type
+        if product_type not in _SUPPORTED_PRODUCT_TYPES:
            return self.async_abort(reason="no_devices_found")

        self.address = discovery_info.address
-        self.devices = {discovery_info.address: _get_name(discovery_info)}
+        self.devices = {discovery_info.address: PRODUCT_NAMES[product_type]}
        await self.async_set_unique_id(self.address)
        self._abort_if_unique_id_configured()
        return await self.async_step_confirm()
@@ -131,12 +120,21 @@ class GardenaBluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
            return await self.async_step_confirm()

        current_addresses = self._async_current_ids(include_ignore=False)
+        candidates = set()
        for discovery_info in async_discovered_service_info(self.hass):
            address = discovery_info.address
            if address in current_addresses or not _is_supported(discovery_info):
                continue
+            candidates.add(address)

-            self.devices[address] = _get_name(discovery_info)
+        data = await async_get_manufacturer_data(candidates)
+        for address, mfg_data in data.items():
+            if mfg_data.product_type not in _SUPPORTED_PRODUCT_TYPES:
+                continue
+            self.devices[address] = PRODUCT_NAMES[mfg_data.product_type]
+
+        # Keep selection sorted by address to ensure stable tests
+        self.devices = dict(sorted(self.devices.items(), key=lambda x: x[0]))

        if not self.devices:
            return self.async_abort(reason="no_devices_found")
--- a/homeassistant/components/gardena_bluetooth/manifest.json
+++ b/homeassistant/components/gardena_bluetooth/manifest.json
@@ -15,5 +15,5 @@
  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["bleak", "bleak_esphome", "gardena_bluetooth"],
-  "requirements": ["gardena-bluetooth==2.3.0"]
+  "requirements": ["gardena-bluetooth==2.4.0"]
 }
--- a/homeassistant/components/gardena_bluetooth/number.py
+++ b/homeassistant/components/gardena_bluetooth/number.py
@@ -142,6 +142,7 @@ DESCRIPTIONS = (
        native_min_value=0.0,
        native_max_value=359.0,
        native_step=1.0,
+        entity_category=EntityCategory.CONFIG,
        char=Spray.sector,
    ),
    GardenaBluetoothNumberEntityDescription(
@@ -153,6 +154,7 @@ DESCRIPTIONS = (
        native_max_value=100.0,
        native_step=0.1,
        char=Spray.distance,
+        entity_category=EntityCategory.CONFIG,
        scale=10.0,
    ),
 )
--- a/homeassistant/components/gardena_bluetooth/select.py
+++ b/homeassistant/components/gardena_bluetooth/select.py
@@ -13,6 +13,7 @@ from gardena_bluetooth.const import (
 from gardena_bluetooth.parse import CharacteristicInt

 from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

@@ -61,6 +62,7 @@ DESCRIPTIONS = (
        translation_key="operation_mode",
        char=AquaContour.operation_mode,
        option_to_number=_enum_to_int(AquaContour.operation_mode.enum),
+        entity_category=EntityCategory.CONFIG,
    ),
    GardenaBluetoothSelectEntityDescription(
        translation_key="active_position",
--- a/homeassistant/components/gardena_bluetooth/sensor.py
+++ b/homeassistant/components/gardena_bluetooth/sensor.py
@@ -47,10 +47,10 @@ def _get_timestamp(value: datetime | None):
    return value.replace(tzinfo=dt_util.get_default_time_zone())


-def _get_distance_ratio(value: int | None):
+def _get_distance_percentage(value: int | None) -> float | None:
    if value is None:
        return None
-    return value / 1000
+    return value / 10


@dataclass(frozen=True)
@@ -169,7 +169,7 @@ DESCRIPTIONS = (
        entity_category=EntityCategory.DIAGNOSTIC,
        native_unit_of_measurement=PERCENTAGE,
        char=Spray.current_distance,
-        get=_get_distance_ratio,
+        get=_get_distance_percentage,
    ),
    GardenaBluetoothSensorEntityDescription(
        key=Spray.current_sector.unique_id,
--- a/Show More
+++ b/Show More